199 files changed, 62702 insertions, 36674 deletions

diff --git a/.gitignore b/.gitignore
index f2f7f51a..e33b96ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,8 @@ depcomp
 install-sh
 missing
 libtool
+cscope.out
+tags
 .deps
 .libs
 
diff --git a/AUTHORS b/AUTHORS
index b4fbee6c..d6a6a62c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,12 +17,14 @@ AUTHORS (merged projects & commands):
 
       fallocate:       Eric Sandeen <sandeen@redhat.com>
                        Karel Zak <kzak@redhat.com>
+      findmnt:         Karel Zak <kzak@redhat.com>
       flock:           H. Peter Anvin <hpa@zytor.com>
       getopt:          Frodo Looijaard <frodol@dds.nl>
       hwclock:         Bryan Henderson <bryanh@giraffe-data.com>
       ipcmk:           Hayden James <hayden.james@gmail.com>
       ldattach:        Tilman Schmidt <tilman@imap.cc>
       libblkid:        Theodore Ts'o <tytso@mit.edu>
+      libmount:        Karel Zak <kzak@redhat.com>
       libuuid:         Theodore Ts'o <tytso@mit.edu>
       lscpu:           Cai Qian <qcai@redhat.com>
       rtcwake:         David Brownell <david-b@pacbell.net>
@@ -43,6 +45,8 @@ CONTRIBUTORS:
 
       A. Costa <agcosta@gis.net>
       Adam Jackson <ajax@redhat.com>
+      Adrian Knoth <adi@drcomp.erfurt.thur.de>
+      Ævar Arnfjörð Bjarmason <avarab@gmail.com>
       Alain Guibert <alguibert+ulng@free.fr>
       Alan Curry <pacman@TheWorld.com>
       Alexey Gladkov <legion@altlinux.ru>
@@ -50,6 +54,7 @@ CONTRIBUTORS:
       Américo Wang <xiyou.wangcong@gmail.com>
       Andreas Dilger <adilger@sun.com>
       Andrew McGill <list2008@lunch.za.net>
+      Andrew Nayenko <resver@gmail.com>
       Andrzej Krzysztofowicz <ankry@mif.pg.gda.pl>
       Arif E. Nugroho <arif_endro@yahoo.com>
       Arkadiusz Miskiewicz <arekm@maven.pl>
@@ -60,13 +65,16 @@ CONTRIBUTORS:
       Benno Schulenberg <bensberg@justemail.net>
       Bernardo Innocenti <bernie@codewiz.org>
       Bernhard Walle <bwalle@suse.de>
+      Bryn M. Reeves <bmr@errorists.org>
       Cai Qian <qcai@redhat.com>
+      Chow Loong Jin <hyperair@ubuntu.com>
       Christophe Blaess <Christophe@Blaess.fr>
       Christoph Hellwig <hch@infradead.org>
       Chris Webb <chris@arachsys.com>
       Claus Hindsgaul <claus_h@image.dk>
       Cliff Wickman <cpw@sgi.com>
       Clytie Siddall <clytie@riverland.net.au>
+      Colin Watson <cjwatson@canonical.com>
       Corentin Chary <corentincj@iksaif.net>
       Cristian Rodríguez <crrodriguez@opensuse.org>
       Daisuke Yamashita <yamad@mb.infoweb.ne.jp>
@@ -83,26 +91,34 @@ CONTRIBUTORS:
       Flávio Leitner <fleitner@redhat.com>
       Florentin Duneau <fduneau@gmail.com>
       Florian Zumbiehl <florz@florz.de>
+      Francesco Cosoleto <cosoleto@gmail.com>
       Frédéric Bothamy <frederic.bothamy@free.fr>
       Gabor Kelemen <kelemeng@gnome.hu>
       Gabriel Barazer <gabriel@oxeva.fr>
       Gabriel Burt <gburt@novell.com>
       Guan Xin <guanx.bac@gmail.com>
       Guillem Jover <guillem@hadrons.org>
+      Hajime Taira <htaira@redhat.com>
       Hamish Coleman <hamish@zot.org>
       Hayden James <hayden.james@gmail.com>
       Hendrik Lönngren <wikibugs@googlemail.com>
+      Henne Vogelsang <hvogel@opensuse.org>
       H. Peter Anvin <hpa@zytor.com>
       Hugh Dickins <hugh@veritas.com>
       Imre Kaloz <kaloz@openwrt.org>
       Jakob Unterwurzacher <jakobunt@gmail.com>
       Jakub Bogusz <qboosh@pld-linux.org>
       James Youngman <jay@gnu.org>
+      Jan Kara <jack@suse.cz>
       Jan Sarenik <jsarenik@redhat.com>
+      Jason Borden <jborden@bluehost.com>
       Jason Vas Dias <jvdias@redhat.com>
       Jeff Mahoney <jeffm@suse.com>
+      Jeroen Oortwijn <oortwijn@gmail.com>
+      Jim Meyering <jim@meyering.net>
       Jim Meyering <meyering@redhat.com>
       John Keeping <john.keeping@lineone.net>
+      Jon Ringle <jon@ringle.org>
       Josep Puigdemont <josep.puigdemont@gmail.com>
       Justin B Rye <jbr@edlug.org.uk>
       KaiGai Kohei <kaigai@kaigai.gr.jp>
@@ -116,6 +132,7 @@ CONTRIBUTORS:
       LaMont Jones <lamont@mmjgroup.com>
       Lauri Nurmi <lanurmi@iki.fi>
       Lawrence Rust <lawrence@softsystem.co.uk>
+      Linus Torvalds <torvalds@linux-foundation.org>
       Li Zefan <lizf@cn.fujitsu.com>
       Lubomir Kundrak <lkundrak@redhat.com>
       Luciano Chavez <lnx1138@us.ibm.com>
@@ -123,6 +140,7 @@ CONTRIBUTORS:
       Makoto Kato <makoto.kt@gmail.com>
       Marco Colombo <m.colombo@ed.ac.uk>
       Marco d'Itri <md@Linux.IT>
+      Marek Otahal <markotahal@gmail.com>
       Mark McLoughlin <markmc@redhat.com>
       Martin Schlemmer <azarah@gentoo.org>
       Martin Schulze <joey@infodrom.org>
@@ -130,6 +148,7 @@ CONTRIBUTORS:
       Masatake YAMATO <jet@gyve.org>
       Matthew Garrett <mjg59@srcf.ucam.org>
       Matthias Koenig <mkoenig@suse.de>
+      Matthias König <mk@phasorlab.de>
       maximilian attems <max@stro.at>
       Maxim Levitsky <maximlevitsky@gmail.com>
       Maxim V. Dziumanenko <mvd@mylinux.com.ua>
@@ -139,10 +158,13 @@ CONTRIBUTORS:
       Mike Frysinger <vapier@gentoo.org>
       Mike Hommey <mh@glandium.org>
       Mikel Olasagasti <hey_neken@mundurat.net>
+      Mikel Olasagasti Uranga <hey_neken@mundurat.net>
       Mikhail Gusarov <dottedmag@dottedmag.net>
+      Miklos Szeredi <miklos@szeredi.hu>
       Miklos Szeredi <mszeredi@suse.cz>
       Milan Broz <mbroz@redhat.com>
       Moritz Muehlenhoff <jmm@inutil.org>
+      M.S.Colclough <m.s.colclough@bham.ac.uk>
       Nicolas Provost <nprovost@quadriv.com>
       Nilgün Belma Bugüner <nilgun@buguner.name.tr>
       Norbert Buchmuller <norbi@nix.hu>
@@ -150,6 +172,7 @@ CONTRIBUTORS:
       Olivier Blin <blino@mandriva.com>
       Pádraig Brady <P@draigBrady.com>
       Pascal Terjan <pterjan@cmoi.fasmz.org>
+      Pascal Terjan <pterjan@mandriva.com>
       Paul Fox <pgf@laptop.org>
       Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
       Pavel Maryanov <acid_jack@ukr.net>
@@ -159,7 +182,10 @@ CONTRIBUTORS:
       Peter Jones <pjones@redhat.com>
       Peter Volkov <pva@gentoo.org>
       Petr Pisar <petr.pisar@atlas.cz>
+      Petr Uzel <petr.uzel@suse.cz>
       Phan Vinh Thinh <teppi82@gmail.com>
+      Phillip Susi <psusi@cfl.rr.com>
+      Pierre Hauweele <antegallya@gmail.com>
       Rajeev V. Pillai <rajeevvp@gmail.com>
       Ram Pai <linuxram@us.ibm.com>
       Randy Dunlap <randy.dunlap@oracle.com>
@@ -183,10 +209,15 @@ CONTRIBUTORS:
       Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
       Sven Jost <sven.jost@googlemail.com>
       Theodore Ts'o <tytso@mit.edu>
+      Thomas Fehr <fehr@suse.de>
       Tilman Schmidt <tilman@imap.cc>
+      Timo Juhani Lindfors <timo.lindfors@iki.fi>
       Tom Prince <tom.prince@ualberta.net>
       Valerie Aurora <vaurora@redhat.com>
       Vincent Deffontaines <vincent@gryzor.com>
+      Vladimir Brednikov <vbrednikov@gmail.com>
       Volker Schatz <oss@volkerschatz.com>
+      Yann Droneaud <yann@droneaud.fr>
+      Yoshihiro Takahashi <ytakahashi@miraclelinux.com>
       Yu Zhiguo <yuzg@cn.fujitsu.com>
       Zdenek Behan <rain@matfyz.cz>
diff --git a/DEPRECATED b/DEPRECATED
index a4236017..f5202434 100644
--- a/DEPRECATED
+++ b/DEPRECATED
@@ -53,8 +53,3 @@ Why:	nobody uses this implementation
 What:	shutdown(1)
 Why:	nobody uses this implementation
 
-----------------------------
-
-What:	rdev(8), ramsize(8), vidmode(8) and  rootflags(8)
-Why:	i386 specific and probably useless
-
diff --git a/Makefile.am b/Makefile.am
index f332510a..c489665f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,26 @@
 include $(top_srcdir)/config/include-Makefile.am
 
+SHLIBS_DIRS =
+
+if BUILD_LIBUUID
+SHLIBS_DIRS += shlibs/uuid
+endif
+
+if BUILD_LIBBLKID
+SHLIBS_DIRS += shlibs/blkid
+endif
+
+if BUILD_LIBMOUNT
+SHLIBS_DIRS += shlibs/mount
+endif
+
 SUBDIRS = \
 	include \
 	disk-utils \
 	fdisk \
 	getopt \
 	lib \
-	shlibs \
+	$(SHLIBS_DIRS) \
 	login-utils \
 	misc-utils \
 	po \
diff --git a/NEWS b/NEWS
index 4f276644..28d58622 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+util-linux-ng 2.18: Jun 30 2010
+* see docs/v2.18-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ChangeLog
+
+util-linux-ng 2.18-rc2: Jun 18 2010
+* see docs/v2.18-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc2-ChangeLog
+
+util-linux-ng 2.18-rc1: Jun 7 2010
+* see docs/v2.18-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc1-ChangeLog
+
 util-linux-ng 2.17: Jan 8 2010
 * see docs/v2.17-ReleaseNotes or complete changelog at
   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-ChangeLog
diff --git a/README.devel b/README.devel
index d8135743..3ffc9c08 100644
--- a/README.devel
+++ b/README.devel
@@ -4,19 +4,19 @@
 
 AUTOTOOLS:
 
-     * "./autogen.sh" generates all necessary files (run it after checkout from
-       git)
+     * "./autogen.sh" generates all files needed to compile and install the code
+       (run it after checkout from git)
 
-     * "make distclean" removes all unnecessary files, but code is still possible
-       recompile by "./configure; make"
+     * "make distclean" removes all unnecessary files, but the code can still be
+       recompiled with "./configure; make"
 
-     * "make dist-gzip" (or -bzip2) creates tarball which is possible use without
-      autogen.sh
+     * "make dist-gzip" (or -bzip2) creates a tarball that can be configured and
+       compiled without running "./autogen.sh"
 
 
 PATCHES:
 
-     * send your patches to the mailing list or to upstream maintainer
+     * send your patches to the mailing list or to the upstream maintainer
        (see the AUTHORS file)
 
      * diff -u
diff --git a/README.licensing b/README.licensing
index 0f4fef08..6beb96eb 100644
--- a/README.licensing
+++ b/README.licensing
@@ -1,6 +1,6 @@
 
-The project utils-linux-ng doesn't use same license for all code. There are
-code with:
+The project util-linux-ng doesn't use the same license for all of the code.
+There is code under:
 
    * GPLv3+ (GNU General Public License version 3, or any later version)
 
@@ -14,7 +14,7 @@ code with:
 
    * Public Domain
 
-Please, check source code for more details. A license is usually at the start
+Please, check the source code for more details. A license is usually at the start
 of each source file.
 
 The /COPYING file (GPLv2+) is the default license for code without an explicitly
diff --git a/TODO b/TODO
index f73c78a3..020e6ea0 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,9 @@
 libblkid
 --------
 
+ - remove strerrr() from debug messages (use %m) to make BLKID_DEBUG= output
+   thread-safe
+
  - add -<BE|LE> suffix to test images for native-endian filesystems (e.g. swap)
    and add support for such functionality to tests/ts/blkid/low-probe
 
@@ -56,6 +59,10 @@ fdisk(s)
 misc
 ----
 
+ * switch_root:
+     - move all mountpoints to the newroot (there are hardcoded /proc /sys and /dev paths now)
+     - add --dont-move[=<list of dirs>] options
+
  * partx: add to it an option to make it usable in shell scripts without having
    to parse its output with sed
 
@@ -160,9 +167,6 @@ misc
 	(though I am not really sure how much people us minix fs ;-)
 	This might require some major code cleanup in mkfs.minix.
 
- * rtcwake does not support wake from S5/off
-   http://bugzilla.redhat.com/show_bug.cgi?id=449115
-
  * add SELinux security contexts support to the 'ipcs' utility
    http://bugzilla.redhat.com/show_bug.cgi?id=225342
 
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index e13bb8ee..e7dbd34e 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -22,6 +22,7 @@ ul_libblkid_incdir = $(ul_libblkid_builddir)
 $(ul_libblkid_la):
 	$(MAKE) -C $(ul_libblkid_builddir)
 
+
 # uuid
 ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src
 ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src
@@ -30,3 +31,14 @@ ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la
 $(ul_libuuid_la):
 	$(MAKE) -C $(ul_libuuid_builddir)
 
+
+# mount
+ul_libmount_srcdir = $(top_srcdir)/shlibs/mount/src
+ul_libmount_builddir = $(top_builddir)/shlibs/mount/src
+ul_libmount_la = $(top_builddir)/shlibs/mount/src/libmount.la
+
+# mount.h is generated by ./configure script and stored in build directory
+ul_libmount_incdir = $(ul_libmount_builddir)
+
+$(ul_libmount_la):
+	$(MAKE) -C $(ul_libmount_builddir)
diff --git a/configure.ac b/configure.ac
index 7fe2d111..eaa5945f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(util-linux-ng, 2.17, kzak@redhat.com)
+AC_INIT(util-linux-ng, 2.18, kzak@redhat.com)
 
 AC_PREREQ(2.60)
 
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([check-news -Wall foreign 1.9 dist-bzip2])
+AM_INIT_AUTOMAKE([check-news -Wall foreign 1.10 dist-bzip2])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
                             [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
@@ -22,7 +22,7 @@ PACKAGE_VERSION_RELEASE=0
 
 dnl libblkid version
 LIBBLKID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
-LIBBLKID_DATE="08-Jan-2010"
+LIBBLKID_DATE="30-Jun-2010"
 LIBBLKID_LT_MAJOR=1
 LIBBLKID_LT_MINOR=1
 LIBBLKID_LT_MICRO=0
@@ -35,6 +35,13 @@ LIBUUID_LT_MINOR=3
 LIBUUID_LT_MICRO=0
 LIBUUID_VERSION_INFO=`expr $LIBUUID_LT_MAJOR + $LIBUUID_LT_MINOR`:$LIBUUID_LT_MICRO:$LIBUUID_LT_MINOR
 
+dnl libmount version
+LIBMOUNT_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
+LIBMOUNT_LT_MAJOR=1
+LIBMOUNT_LT_MINOR=1
+LIBMOUNT_LT_MICRO=0
+LIBMOUNT_VERSION_INFO=`expr $LIBMOUNT_LT_MAJOR + $LIBMOUNT_LT_MINOR`:$LIBMOUNT_LT_MICRO:$LIBMOUNT_LT_MINOR
+
 # Check whether exec_prefix=/usr:
 case $exec_prefix:$prefix in
 NONE:NONE | NONE:/usr | /usr:*)
@@ -181,6 +188,9 @@ AC_CHECK_FUNCS(
 	srandom \
 	setresgid \
 	setresuid \
+	strndup \
+	strnlen \
+	strnchr \
 	inotify_init \
 	prctl \
 	posix_fadvise \
@@ -390,6 +400,23 @@ AM_CONDITIONAL(HAVE_BLKID, test "x$have_blkid" = xyes)
 
 AC_ARG_VAR([BLKID_LIBS_STATIC], [-l options for linking statically with blkid])
 
+
+AC_ARG_ENABLE([libmount],
+  AS_HELP_STRING([--disable-libmount], [do not build libmount]),
+  [], enable_libmount=yes
+)
+
+case "$enable_libblkid:$enable_libmount" in
+no:yes)
+  AC_MSG_ERROR([cannot enable libmount when libblkid is disabled]) ;;
+esac
+
+AC_SUBST([LIBMOUNT_VERSION])
+AC_SUBST([LIBMOUNT_VERSION_INFO])
+AC_DEFINE_UNQUOTED(LIBMOUNT_VERSION, "$LIBMOUNT_VERSION", [libmount version string])
+AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$enable_libmount" = xyes)
+
+
 UTIL_CHECK_LIB(util, openpty)
 UTIL_CHECK_LIB(termcap, tgetnum)
 
@@ -415,6 +442,7 @@ if test "x$with_ncurses" != xno; then
     if test "x$with_ncurses" = xauto; then
       UTIL_CHECK_LIB(ncursesw, initscr, ncurses)
       if test "x$have_ncurses" = xyes; then
+        AC_CHECK_HEADERS([ncursesw/ncurses.h])
         NCURSES_LIBS="-lncursesw"
       fi
     fi
@@ -443,7 +471,15 @@ AM_CONDITIONAL(HAVE_TINFO, test "x$have_tinfo" = xyes)
 
 use_slang=no
 if test "x$with_slang" = xyes; then
-  AC_CHECK_HEADERS([slcurses.h slang/slcurses.h], [use_slang=yes])
+  AC_CHECK_HEADERS([slang.h slang/slang.h])
+  AC_CHECK_HEADERS([slcurses.h slang/slcurses.h],
+                   [use_slang=yes], [], [
+#ifdef HAVE_SLANG_H
+#include <slang.h>
+#elif defined(HAVE_SLANG_SLANG_H)
+#include <slang/slang.h>
+#endif
+])
   if test "x$use_slang" = xno; then
     AC_MSG_ERROR([slang selected but slcurses.h not found])
   fi
@@ -682,6 +718,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 ])
 
 
+AC_CHECK_TYPES([cpu_set_t], [have_cpu_set_t=yes], [], [[
+#include <sched.h>
+]])
+
+AM_CONDITIONAL(HAVE_CPU_SET_T, [test "x$have_cpu_set_t" = xyes])
+
+AC_CHECK_DECLS([CPU_ALLOC], [], [], [[
+#include <sched.h>
+]])
+
+
 dnl UTIL_SET_ARCH(ARCHNAME, PATTERN)
 dnl ---------------------------------
 AC_DEFUN([UTIL_SET_ARCH], [
@@ -878,13 +925,6 @@ AC_ARG_ENABLE([raw],
 AM_CONDITIONAL(BUILD_RAW, test "x$enable_raw" = xyes)
 
 
-AC_ARG_ENABLE([rdev],
-  AS_HELP_STRING([--enable-rdev], [build rdev on i386]),
-  [], enable_rdev=no
-)
-AM_CONDITIONAL(BUILD_RDEV, test "x$enable_rdev" = xyes)
-
-
 AC_ARG_ENABLE([rename],
   AS_HELP_STRING([--disable-rename], [do not build rename]),
   [], enable_rename=yes
@@ -1118,11 +1158,16 @@ shlibs/blkid/src/superblocks/Makefile
 shlibs/blkid/src/topology/Makefile
 shlibs/blkid/src/partitions/Makefile
 shlibs/blkid/samples/Makefile
+shlibs/mount/mount.pc
+shlibs/mount/Makefile
+shlibs/mount/src/Makefile
+shlibs/mount/src/mount.h
+shlibs/mount/docs/Makefile
+shlibs/mount/docs/version.xml
 shlibs/uuid/uuid.pc
 shlibs/uuid/Makefile
 shlibs/uuid/man/Makefile
 shlibs/uuid/src/Makefile
-shlibs/Makefile
 sys-utils/Makefile
 tests/commands.sh
 tests/helpers/Makefile
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 67aeae40..664c9980 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-utils_common = ../lib/blkdev.c
+utils_common = $(top_srcdir)/lib/blkdev.c
 if LINUX
-utils_common += ../lib/linux_version.c
+utils_common += $(top_srcdir)/lib/linux_version.c
 endif
 
 if HAVE_UUID
@@ -28,7 +28,7 @@ swaplabel_SOURCES = swaplabel.c $(utils_common)
 swaplabel_LDADD = $(uuid_ldadd)
 swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
 
-mkswap_SOURCES = mkswap.c $(utils_common) ../lib/wholedisk.c
+mkswap_SOURCES = mkswap.c $(utils_common) $(top_srcdir)/lib/wholedisk.c
 mkswap_LDADD = $(uuid_ldadd)
 mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
 
@@ -52,7 +52,7 @@ endif
 if BUILD_ELVTUNE
 sbin_PROGRAMS += elvtune
 dist_man_MANS += elvtune.8
-elvtune_SOURCES = elvtune.c ../lib/linux_version.c
+elvtune_SOURCES = elvtune.c $(top_srcdir)/lib/linux_version.c
 endif
 
 if HAVE_RAW
@@ -66,7 +66,7 @@ if BUILD_CRAMFS
 cramfs_common = $(utils_common) cramfs.h cramfs_common.c cramfs_common.h
 sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
 fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
-mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) ../lib/md5.c
+mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) $(top_srcdir)/lib/md5.c
 fsck_cramfs_LDADD = -lz
 mkfs_cramfs_LDADD = -lz
 endif
diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index eeaf2f5c..cf594d12 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -177,7 +177,7 @@ usage(void) {
 	int i;
 	fputc('\n', stderr);
 	fprintf(stderr, _("Usage:\n"));
-	fprintf(stderr, "  %s -V\n", progname);
+	fprintf(stderr, _("  %s -V\n"), progname);
 	fprintf(stderr, _("  %s --report [devices]\n"), progname);
 	fprintf(stderr, _("  %s [-v|-q] commands devices\n"), progname);
 	fputc('\n', stderr);
@@ -235,7 +235,7 @@ main(int argc, char **argv) {
 
 	/* -V not together with commands */
 	if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-		printf("%s (%s)\n", progname, PACKAGE_STRING);
+		printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 		exit(0);
 	}
 
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index 80bfcb95..1a78b20f 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -104,6 +104,7 @@ for the ext2 file system.
 .BR mkfs.bfs (8),
 .BR mkfs.ext2 (8),
 .BR mkfs.ext3 (8),
+.BR mkfs.ext4 (8),
 .BR mkfs.minix (8),
 .BR mkfs.msdos (8),
 .BR mkfs.vfat (8),
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index c52afbd7..5f01f2ba 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -149,7 +149,7 @@ die(char *str) {
 
 static void
 usage(void) {
-	fprintf(stderr, "%s (%s)\n", program_name, PACKAGE_STRING);
+	fprintf(stderr, _("%s (%s)\n"), program_name, PACKAGE_STRING);
 	fprintf(stderr,
 		_("Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"),
 		  program_name);
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index cdb2a442..283a933d 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -27,10 +27,10 @@ The
 argument will usually be a disk partition (something like
 .IR /dev/sdb7 )
 but can also be a file.
-The Linux kernel does not look at partition Id's, but
+The Linux kernel does not look at partition IDs, but
 many installation scripts will assume that partitions
 of hex type 82 (LINUX_SWAP) are meant to be swap partitions.
-(\fBWarning: Solaris also uses this type. Be careful not to kill
+(\fBWarning: Solaris also uses this type.  Be careful not to kill
 your Solaris partitions.\fP)
 
 The
@@ -39,39 +39,39 @@ parameter is superfluous but retained for backwards compatibility.
 (It specifies the desired size of the swap area in 1024-byte blocks.
 .B mkswap
 will use the entire partition or file if it is omitted.
-Specifying it is unwise - a typo may destroy your disk.)
+Specifying it is unwise -- a typo may destroy your disk.)
 
 The
 .I PSZ
-parameter specifies the page size to use. It is almost always
+parameter specifies the page size to use.  It is almost always
 unnecessary (even unwise) to specify it, but certain old libc
 versions lie about the page size, so it is possible that
 .B mkswap
-gets it wrong. The symptom is that a subsequent
+gets it wrong.  The symptom is that a subsequent
 .B swapon
-fails because no swap signature is found. Typical values for
+fails because no swap signature is found.  Typical values for
 .I PSZ
 are 4096 or 8192.
 
 After creating the swap area, you need the
 .B swapon
-command to start using it. Usually swap areas are listed in
+command to start using it.  Usually swap areas are listed in
 .I /etc/fstab
 so that they can be taken into use at boot time by a
 .B swapon -a
 command in some boot script.
 
 .SH WARNING
-The swap header does not touch the first block. A boot loader or disk label
-can be there, but it is not recommended setup. The recommended setup is to
+The swap header does not touch the first block.  A boot loader or disk label
+can be there, but it is not a recommended setup.  The recommended setup is to
 use a separate partition for a Linux swap area.
 
-.B mkswap like many others mkfs-like utils erases the first block to remove
+.B mkswap, like many others mkfs-like utils, erases the first block to remove
 .B old on-disk filesystems.
 
 .B mkswap
 refuses to erase the first block on a device with a disk
-label (SUN, BSD, ...) or on whole disk (e.g. /dev/sda).
+label (SUN, BSD, ...) or on a whole disk (e.g. /dev/sda).
 
 .SH OPTIONS
 .TP
@@ -81,43 +81,45 @@ before creating the swap area.
 If any are found, the count is printed.
 .TP
 .B \-f
-Force - go ahead even if the command is stupid.
+Force -- go ahead even if the command is stupid.
 This allows the creation of a swap area larger than the file
 or partition it resides on.
 
-Without this option
+Without this option,
 .B mkswap
 will refuse to erase the first block on a device with a partition table or on
-whole disk (e.g. /dec/sda).
-.TP
-.BI \-p \ PSZ
-Specify the page size to use.
+a whole disk (e.g. /dev/sda).
 .TP
 .BI \-L \ label
-Specify a label, to allow swapon by label.
-(Only for new style swap areas.)
+Specify a label, to allow
+.B swapon
+by label.
 .TP
-.BR \-v0 , \ \-v1
-Specify the swap space version. This option is deprecated and \-v1 is
-supported only.
-
-The kernel has not supported v0 swap space format since 2.5.22. The new version
-v1 is supported since 2.1.117.
-
+.BI \-p \ PSZ
+Specify the page size (in bytes) to use.  This option is usually unnecessary,
+.B mkswap
+reads the size from the kernel.
 .TP
 .BI \-U \ uuid
-Specify the uuid to use. The default is to generate UUIDs.
+Specify the uuid to use.  The default is to generate a UUID.
+.TP
+.BR \-v1
+Specify the swap-space version.  The old \-v0 option has become obsolete
+and now only \-v1 is supported.
+
+The kernel has not supported v0 swap-space format since 2.5.22.
+The new version v1 is supported since 2.1.117.
 
 .SH NOTES
 The maximum useful size of a swap area depends on the architecture and
 the kernel version.
-It is roughly 2GiB on i386, PPC, m68k, ARM, 1GiB on sparc, 512MiB on mips,
-128GiB on alpha and 3TiB on sparc64. For kernels after 2.3.3 there is no
+It is roughly 2GiB on i386, PPC, m68k and ARM, 1GiB on sparc, 512MiB on mips,
+128GiB on alpha, and 3TiB on sparc64.  For kernels after 2.3.3 there is no
 such limitation.
 
-Note that before 2.1.117 the kernel allocated one byte for each page,
-while it now allocates two bytes, so that taking a swap area of 2 GiB
-in use might require 2 MiB of kernel memory.
+Note that before version 2.1.117 the kernel allocated one byte for each page,
+while it now allocates two bytes, so that taking into use a swap area of 2 GiB
+might require 2 MiB of kernel memory.
 
 Presently, Linux allows 32 swap areas (this was 8 before Linux 2.4.10).
 The areas in use can be seen in the file
@@ -128,10 +130,10 @@ The areas in use can be seen in the file
 refuses areas smaller than 10 pages.
 
 If you don't know the page size that your machine uses, you may be
-able to look it up with "cat /proc/cpuinfo" (or you may not -
+able to look it up with "cat /proc/cpuinfo" (or you may not --
 the contents of this file depend on architecture and kernel version).
 
-To setup a swap file, it is necessary to create that file before
+To set up a swap file, it is necessary to create that file before
 initializing it with
 .BR mkswap ,
 e.g. using a command like
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 09a9a0a4..93378076 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -145,7 +145,6 @@ is_sparc64(void) {
 static int user_pagesize;
 static int pagesize;
 static unsigned long *signature_page = NULL;
-struct swap_header_v1 *p;
 
 static void
 init_signature_page(void) {
@@ -154,7 +153,7 @@ init_signature_page(void) {
 
 	if (user_pagesize) {
 		if ((user_pagesize & (user_pagesize-1)) ||
-		    user_pagesize < 1024) {
+		    user_pagesize < sizeof(struct swap_header_v1_2) + 10) {
 			fprintf(stderr, _("Bad user-specified page size %d\n"),
 				user_pagesize);
 			exit(1);
@@ -167,9 +166,12 @@ init_signature_page(void) {
 				  "instead of the system value %d\n"),
 				pagesize, kernel_pagesize);
 
-	signature_page = (unsigned long *) malloc(pagesize);
-	memset(signature_page, 0, pagesize);
-	p = (struct swap_header_v1 *) signature_page;
+	signature_page = (unsigned long *) calloc(1, pagesize);
+	if (!signature_page) {
+		fprintf(stderr, _("%s: calloc() failed: %s\n"),
+					program_name, strerror(errno));
+		exit(1);
+	}
 }
 
 static void
@@ -294,6 +296,8 @@ die(const char *str) {
 
 static void
 page_bad(int page) {
+	struct swap_header_v1_2 *p = (struct swap_header_v1_2 *) signature_page;
+
 	if (badpages == MAX_BADPAGES)
 		die(_("too many bad pages"));
 	p->badpages[badpages] = page;
@@ -393,7 +397,7 @@ zap_bootbits(int fd, const char *devname, int force, int is_blkdev)
 			if (!pr)
 				die(_("unable to alloc new libblkid probe"));
 			if (blkid_probe_set_device(pr, fd, 0, 0))
-				die(_("unable to assign device to liblkid probe"));
+				die(_("unable to assign device to libblkid probe"));
 
 			blkid_probe_enable_partitions(pr, 1);
 			blkid_probe_enable_superblocks(pr, 0);
@@ -439,6 +443,7 @@ zap_bootbits(int fd, const char *devname, int force, int is_blkdev)
 int
 main(int argc, char ** argv) {
 	struct stat statbuf;
+	struct swap_header_v1_2 *hdr;
 	int i;
 	unsigned long long maxpages;
 	unsigned long long goodpages;
@@ -627,9 +632,10 @@ main(int argc, char ** argv) {
 
 	zap_bootbits(DEV, device_name, force, S_ISBLK(statbuf.st_mode));
 
-	p->version = 1;
-	p->last_page = PAGES-1;
-	p->nr_badpages = badpages;
+	hdr = (struct swap_header_v1_2 *) signature_page;
+	hdr->version = 1;
+	hdr->last_page = PAGES - 1;
+	hdr->nr_badpages = badpages;
 
 	if (badpages > PAGES - MIN_GOODPAGES)
 		die(_("Unable to set up swap-space: unreadable"));
diff --git a/docs/v2.18-ReleaseNotes b/docs/v2.18-ReleaseNotes
new file mode 100644
index 00000000..47f590ee
--- /dev/null
+++ b/docs/v2.18-ReleaseNotes
@@ -0,0 +1,468 @@
+Util-linux-ng 2.18 Release Notes
+================================
+
+The util-linux-ng package does not contain rdev(8), ramsize(8), 
+vidmode(8) and rootflags(8) anymore. 
+
+The fdisk(8) command does not use DOS-compatible mode and cylinders as display
+units by default. The old deprecated DOS behavior could be enabled by 'c' and
+'u' fdisk commands or from command line by '-c=dos -u=cylinders' options.
+
+Release highlights
+------------------
+
+libmount:
+  - this NEW LIBRARY is designed to be used in low-level utils like
+    mount(8) and /sbin/mount.<type> helpers as well as in some other
+    projects.
+
+  - the library API is still officially unstable. The library provides
+    fstab, mtab and mountinfo parser, routines for work with parsed 
+    data and mount options, mtab locking, etc. The high-level API for 
+    mount(2) is planned for the next major release. For more details see:
+    http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/3239
+
+  - the utils like mount(8) or umount(8) are not linked with the library
+    yet. This change is planned for util-linux-ng-2.19.
+
+findmnt(8):
+  - this NEW COMMAND is a command line interface to the libmount library 
+    for work with mountinfo, fstab and mtab files
+
+fsfreeze(8):
+   - this NEW COMMAND is very simple wrapper around FIFREEZE/FITHAW ioctls
+
+swaplabel(8):
+   - this NEW COMMAND allows to change swaparea UUID and label
+
+blkid(8):
+  - supports new command line option "-i" to print I/O Limits
+
+  - supports new command line option "-n" to restrict probing functions to 
+    defined list of superblock types (names).
+
+  - returns details from partition table (type, flags, uuid, ...)
+
+chrt(1):
+  - supports new command line option "-R/--reset-on-fork" to enable 
+    SCHED_RESET_ON_FORK flag
+
+fdisk(8):
+  - supports new command line option "-c" to switch off DOS mode
+  - uses 1MiB offset for the first partition
+    (all these changes are already in the release 2.17.2)
+
+hwclock(8):
+  - supports new command line option "--predict" to predict what the RTC will 
+    read at time given by the --date option based on the adjtime file.
+
+ldattach(8):
+  - supports new command line option "-i/--iflag" to sets the specified bits 
+    in the c_iflag word of the serial line.
+
+fallocate(1), losetup(8) and mount(8):
+  - the options --offset, --length or --sizelimit support suffixes
+    (MiB, GiB, ...) and hex numbers
+
+umount(8):
+  - supports new command line option "--fake" to avoid umount(2) syscall
+
+
+Stable maintenance releases between v2.17 and v2.18
+---------------------------------------------------
+
+util-linux-ng 2.17.1 [22-Feb-2010]
+
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17.1-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17.1-ChangeLog
+
+util-linux-ng 2.17.2 [22-Mar-2010]
+
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17.2-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17.2-ChangeLog
+
+
+Changes between v2.17 and v2.18
+-------------------------------
+
+ For more details see ChangeLog files at:
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/
+
+addpart:
+   - use atoll() for parsing command line arguments  [Thomas Fehr]
+blkid:
+   - add \n to the "-o udev" output when probe more devices  [Karel Zak]
+   - add 'export' output format  [Karel Zak]
+   - add -i option to print I/O limits  [Karel Zak]
+   - add -n <list> option  [Karel Zak]
+   - add newline when only one value is printed  [Karel Zak]
+   - cleanup -u <list> parsing  [Karel Zak]
+   - cleanup man page  [Karel Zak]
+   - encode PART_ENTRY_TYPE  [Karel Zak]
+   - export ID_PART_ENTRY_* variables for udev  [Karel Zak]
+   - fix #ifdef HAVE_TERMIO[S]_H  [Karel Zak]
+   - fix blkid_probe_lookup_value() usage  [Karel Zak]
+   - improve RAIDs and tiny devices probing  [Karel Zak]
+   - probe for PT, don't probe for FS on small whole-disks  [Karel Zak]
+   - remove _ENC from ID_PART_ENTRY_{NAME,TYPE} variables  [Karel Zak]
+   - remove duplicate option from man page  [Karel Zak]
+   - report open() errors in low-level probing  [Karel Zak]
+   - support suffixes for -O <offset> and -S <size>  [Karel Zak]
+   - update man page/usage()  [Karel Zak]
+blockdev:
+   - reduce usage text width  [Francesco Cosoleto]
+build-sys:
+   - add missing tests for libuuid and libblkid  [Karel Zak]
+   - cleanup lib{mount,blkid} building  [Karel Zak]
+   - improved check for fallocate()  [Yann Droneaud]
+   - minor changes for GNU/Hurd  [Samuel Thibault]
+   - release++ (v2.18-rc1)  [Karel Zak]
+   - release++ (v2.18-rc2)  [Karel Zak]
+   - remove duplicate #includes  [Karel Zak]
+   - replace ../ with $top_srcdir  [Karel Zak]
+   - update include/Makefile.am  [Karel Zak]
+   - use include/list.h  [Karel Zak]
+cal:
+   - factor out and update multibyte alignment code  [Pádraig Brady]
+   - fix first day of the week calculation on BE systems  [Karel Zak]
+   - remove unnecessary info from man page  [Karel Zak]
+cfdisk:
+   - fix warning  implicit declaration of function ‘wcwidth’  [Karel Zak]
+   - set '[New]' as default item on menu for non allocated space instead of '[Help]'.  [Francesco Cosoleto]
+   - set '[Quit]' as default menu item on first run instead of '[Bootable]'.  [Francesco Cosoleto]
+   - support non-ascii characters in input  [Karel Zak]
+   - use libblkid  [Matthias König]
+chrt:
+   - add --reset-on-fork  [Karel Zak]
+   - add --verbose to man page, correct -V for --version, alphabetize  [Benno Schulenberg]
+   - add support for SCHED_RESET_ON_FORK  [Adrian Knoth]
+   - change two messages into four translatable sentences  [Benno Schulenberg]
+   - slice help text into manageable chunks for translators  [Benno Schulenberg]
+docs:
+   - fix umount --fake note in ReleaseNotes  [Karel Zak]
+   - update  ReleaseNotes  [Karel Zak]
+   - update AUTHORS file  [Karel Zak]
+   - update TODO  [Karel Zak]
+   - update TODO file  [Karel Zak]
+   - update tests/README  [Karel Zak]
+   - update v2.18 ReleaseNotes  [Karel Zak]
+fallocate:
+   - check for number of arguments  [Karel Zak]
+   - support suffixes for --offset and --lenght  [Karel Zak]
+fdisk:
+   - add -c option (switch off DOS mode)  [Karel Zak]
+   - cleanup alignment, default to 1MiB offset  [Karel Zak]
+   - cleanup help, add -h option  [Karel Zak]
+   - cleanup warnings  [Karel Zak]
+   - correctly truncate and align translated partition names  [Pádraig Brady]
+   - disable DOS mode and cylinders by default  [Karel Zak]
+   - don't check alignment_offset against geometry  [Karel Zak]
+   - don't include scsi.h  [Karel Zak]
+   - don't use 1MiB grain on small devices  [Karel Zak]
+   - extend -c and -u options to support old DOS stuff  [Karel Zak]
+   - fallback for topology values  [Karel Zak]
+   - fix 'p' output for sun label  [Karel Zak]
+   - fix -b <sectorsize>  [Karel Zak]
+   - fix ALIGN_UP  [Karel Zak]
+   - fix check_alignment()  [Karel Zak]
+   - fix default first sector  [Karel Zak]
+   - improve 'move begin of partition' command  [Karel Zak]
+   - improve add partition dialog  [Karel Zak]
+   - improve the description of -c and -u options on man page  [Benno Schulenberg]
+   - remove erroneous <size> argument from -u option in help text  [Benno Schulenberg]
+   - replace bzero with memset  [Jon Ringle]
+   - swap VTOC values for warning messages  [Karel Zak]
+   - untangle the reporting of deprecated mode and unit  [Benno Schulenberg]
+   - use "optimal I/O size" in warnings  [Karel Zak]
+   - use 1MiB offset and grain always when possible  [Karel Zak]
+   - use more elegant way to count and check alignment  [Karel Zak]
+   - use optimal_io_size  [Karel Zak]
+findmnt:
+   - add man page  [Karel Zak]
+   - add new command  [Karel Zak]
+   - add tree support  [Karel Zak]
+   - add {fs,vfs}-options columns  [Karel Zak]
+   - don't swap source and target for tags  [Karel Zak]
+   - minor coding style fixes  [Karel Zak]
+   - move from /sbin to /bin  [Karel Zak]
+   - rewrite to use lib/tt.c  [Karel Zak]
+   - small change in usage()  [Karel Zak]
+   - ungettextize the directions and fix spelling  [Benno Schulenberg]
+fsck:
+   - fix typo in fsck.8  [Francesco Cosoleto]
+fsck/mkfs/mount:
+   - unify default search paths for helpers  [Mike Frysinger]
+fsfreeze:
+   - new command  [Hajime Taira]
+git:
+   - ignore index files generated by ctags and cscope  [Petr Uzel]
+hwclock:
+   - add --predict for predicting RTC reading at a given time  [Timo Juhani Lindfors]
+include:
+   - add min/max macros  [Karel Zak]
+   - move shlibs/.../list.h to the include/ directory  [Karel Zak]
+ionice:
+   - fix typo  [Pierre Hauweele]
+   - non-cryptic error message when ionice can't execvp  [Ævar Arnfjörð Bjarmason]
+ipcrm:
+   - remove redundant message in case of invalid option  [Francesco Cosoleto]
+ipcs:
+   - add missing "PIDs" to related shared memory header text  [Francesco Cosoleto]
+   - advise translators a different output format  [Francesco Cosoleto]
+   - get rid of colons from header strings for consistency  [Francesco Cosoleto]
+   - reorganize help and usage texts  [Francesco Cosoleto]
+ldattach:
+   - add --iflag command line option  [Tilman Schmidt]
+   - create a generic functions for name=value tables  [Karel Zak]
+   - prints help to stdout  [Karel Zak]
+lib:
+   - add #ifndef around min() max() macros  [Karel Zak]
+   - add fallback for libc (uClibc) without CPU_ALLOC  [Karel Zak]
+   - add mangle.c for mtab (fstab or swaps) encoding  [Karel Zak]
+   - add strtosize() function  [Karel Zak]
+   - add tt.c (Tree and Table output)  [Karel Zak]
+   - avoid compilation failure on rawhide  [Jim Meyering]
+   - fix blkdev_find_size()  [Karel Zak]
+   - remove unwanted debug messages  [Karel Zak]
+   - tt.c  don't print header for empty table  [Karel Zak]
+   - tt.c - fix minimal width of column  [Karel Zak]
+   - use fstat() as fallback in blkdev_get_size()  [Karel Zak]
+libblkid:
+   - Add initial support for BeFS detection  [Jeroen Oortwijn]
+   - Add probing function for BeFS  [Jeroen Oortwijn]
+   - add PART_ENTRY_{SCHEME,NUMBER}  [Karel Zak]
+   - add blkid_openat(), cleanup blkid_fstatat()  [Karel Zak]
+   - add blkid_partition_set_type()  [Karel Zak]
+   - add blkid_partlist_get_table()  [Karel Zak]
+   - add blkid_probe_all_removable()  [Karel Zak]
+   - add blkid_probe_get_{offset,fd} functions  [Karel Zak]
+   - add exFAT file system detection support  [Andrew Nayenko]
+   - add generic functions for sysfs attributes  [Karel Zak]
+   - add microsecond resolution for cache entries  [Karel Zak]
+   - add minimal sizes for OCFS and GFS  [Karel Zak]
+   - add mnt_iter_get_direction()  [Karel Zak]
+   - add partial support for superblock binary API  [Karel Zak]
+   - add paths and tags cache  [Karel Zak]
+   - add sanity checks for FAT to DOS PT parser  [Karel Zak]
+   - add support for PART_ENTRY_* values  [Karel Zak]
+   - add support for partition flags/attributes  [Karel Zak]
+   - add ultrix PT support  [Karel Zak]
+   - avoid probing CDs for RAID  [M.S.Colclough]
+   - call read() per FAT root dir entry  [Karel Zak]
+   - cleanup fstat() usage  [Karel Zak]
+   - cleanup some docs  [Karel Zak]
+   - cleanup superblocks_safeprobe()  [Karel Zak]
+   - cleanup usage of empty topology values  [Karel Zak]
+   - disable read-ahead when probing device files  [Linus Torvalds]
+   - don't call read() per FAT dir-entry on large disks  [Karel Zak]
+   - don't gather PART_ENTRY_* values for binary interface  [Karel Zak]
+   - don't probe for GPT and Unixware PT on floppies  [Karel Zak]
+   - don't probe for nested PT on tiny disks (<=1.44MiB)  [Karel Zak]
+   - don't return error on empty files  [Karel Zak]
+   - don't use fstat() in blkid_get_dev_size()  [Karel Zak]
+   - export functions to get whole-disk devno  [Karel Zak]
+   - fix 'partno' usage  [Karel Zak]
+   - fix LUKS version  [Karel Zak]
+   - fix ZSF detection  [Andreas Dilger]
+   - fix blkid_partlist_devno_to_partition() for extended partitions  [Karel Zak]
+   - fix collision between RAID and PT probing  [Karel Zak]
+   - fix display of device size  [Karel Zak]
+   - fix infinite loop when probe chain bails out early  [Colin Watson]
+   - fix readline usage  [Karel Zak]
+   - fix segfault in drdb  [Matthias König]
+   - fix some typos  [Milan Broz]
+   - improbe DDF detection  [Karel Zak]
+   - improve MD 0.90 detection  [Karel Zak]
+   - improve MD 0.90.0 detection (use sb->size)  [Karel Zak]
+   - improve MD 1.0 detection, add UUID_SUB  [Karel Zak]
+   - improve Sun VTOC  [Karel Zak]
+   - improve ZFS detection and add LABEL and UUID extraction  [Andreas Dilger]
+   - minor fixes in befs.c  [Karel Zak]
+   - more robust minix probing  [Karel Zak]
+   - optimize UDF label reading  [Karel Zak]
+   - prevent overflow in BeFS  [Jeroen Oortwijn]
+   - probe for (non-linux) RAIDs on whole devices only  [Karel Zak]
+   - read whole SB buffer (69kB) on large disks  [Karel Zak]
+   - read() optimization for small devices  [Karel Zak]
+   - remove "0x" prefix from DRBD UUID  [Karel Zak]
+   - reset BLKID_TINY_DEV flag in blkid_probe_set_device  [Pascal Terjan]
+   - reset superblocks result after error  [Karel Zak]
+   - restrict RAID/FS proving for small devices (1.4MiB)  [Karel Zak]
+   - rewrite blkid_probe_get_buffer()  [Karel Zak]
+   - set correct offsets for TuxOnIce signature  [Chow Loong Jin]
+   - set minimal size for jfs, reiser, swap and zfs  [Karel Zak]
+   - support alignment_offset=-1  [Karel Zak]
+   - tiny change in debug output  [Karel Zak]
+   - export magic strings from raids  [Karel Zak]
+   - move getsize.c code to lib/  [Karel Zak]
+libmount:
+   - add #warning libmount API is not stable yet!  [Karel Zak]
+   - add basic dirs  [Karel Zak]
+   - add basic utils  [Karel Zak]
+   - add debug support  [Karel Zak]
+   - add docs  [Karel Zak]
+   - add fstab/mtab/mountinfo lookup routines  [Karel Zak]
+   - add fstab/mtab/mountinfo parsing routines  [Karel Zak]
+   - add list routines and generic iterator  [Karel Zak]
+   - add mnt_cache_find_tag_value()  [Karel Zak]
+   - add mnt_entry  [Karel Zak]
+   - add mnt_match_{fstype,options} functions  [Karel Zak]
+   - add mnt_optstr_* functions  [Karel Zak]
+   - add mtab locking code  [Karel Zak]
+   - add new debug messages  [Karel Zak]
+   - add optls (options container)  [Karel Zak]
+   - add support for userdata and work with VFS tree  [Karel Zak]
+   - add test_version  [Karel Zak]
+   - add version.c  [Karel Zak]
+   - another Makefile.am fix  [Karel Zak]
+   - cleanup cache flags and debug messages  [Karel Zak]
+   - cleanup docs  [Karel Zak]
+   - don't build tests by default  [Karel Zak]
+   - export mnt_init_debug()  [Karel Zak]
+   - fix Makefile.am  [Karel Zak]
+   - fix mnt_fs_match_source()  [Karel Zak]
+   - fix name of mnt_fs_get_*_optstr()  [Karel Zak]
+   - fix some gtkdoc warnings  [Karel Zak]
+   - merge vfs and fs options more carefully  [Karel Zak]
+   - proper tests definition in Makefile.am  [Karel Zak]
+   - read devno, ID and parent ID from /proc/self/mountinfo  [Karel Zak]
+   - remove mnt_open_device()  [Karel Zak]
+   - rename mnt_optls_iterate_options()  [Karel Zak]
+   - update symbols table  [Karel Zak]
+   - use mangle function from lib/  [Karel Zak]
+logger:
+   - add note about 'kern' to the man page  [Karel Zak]
+login:
+   - check that after tty reopen we still work with a terminal  [Karel Zak]
+   - don't link PAMed version with libcrypt  [Karel Zak]
+   - use fd instead of pathname for update tty's owner and permissions  [Yann Droneaud]
+losetup:
+   - support suffixes and hex numbers for --offset and --sizelimit  [Karel Zak]
+lscpu:
+   - add CPU_EQUAL_S definition for old/obscure libc  [Karel Zak]
+   - cleanup path_scanstr()  [Karel Zak]
+   - cleanup used names  [Karel Zak]
+   - fix CPU_EQUAL_S macro  [Karel Zak]
+   - fix cpuid opcode detection  [Henne Vogelsang]
+   - fix typo in lscpu.1  [Francesco Cosoleto]
+   - fix typo, "faild" to "failed"  [Benno Schulenberg]
+   - gettextize "CPU(s)"  [Francesco Cosoleto]
+   - improve --sysroot code  [Karel Zak]
+   - replace LC_MESSAGES with LC_ALL in setlocate()  [Francesco Cosoleto]
+   - use cpuset masks, read data for all CPUs  [Karel Zak]
+messages:
+   - gettextize a few skipped or forgotten ones  [Benno Schulenberg]
+mkswap:
+   - add a note that -p is uncecessary  [Karel Zak]
+   - don't call blkdev_find_size()  [Karel Zak]
+   - don't use too small user-specified page size  [Karel Zak]
+   - fixed strtoll() usage  [Yann Droneaud]
+   - more robust strtoull() usage  [Karel Zak]
+   - move write_all() to include/writeall.h  [Karel Zak]
+   - tweak the man page  [Benno Schulenberg]
+   - use calloc(), remove obsolete v1 header usage  [Karel Zak]
+   - zap bootbits on regular files  [Karel Zak]
+mount:
+   - add notes about -o remount,ro,bind to mount.8  [Karel Zak]
+   - advise users to use "modprobe", not "insmod"  [Karel Zak]
+   - automatically detect and loop-mount regular files  [Karel Zak]
+   - detect when kernel silently adds MS_RDONLY flag  [Petr Uzel]
+   - don't create loopdev for MS_BIND  [Karel Zak]
+   - fix coding style  [Karel Zak]
+   - fix information about XFS log buffers in mount.8  [Christoph Hellwig]
+   - fix memory leak  [Petr Uzel]
+   - fix typo in comment  [Petr Uzel]
+   - fix typos in mount.8  [Petr Uzel]
+   - more explicitly explain fstab usage in mount.8  [Karel Zak]
+   - more robust offset= and sizelimit= parsing  [Karel Zak]
+   - posix option of vfat is obsolete  [Yoshihiro Takahashi]
+   - properly ignore comments in /etc/filesystems  [Mike Frysinger]
+   - report ambivalent FS detection, improve brute force detection  [Karel Zak]
+   - revert ugly ENOMEDIUM support  [Karel Zak]
+   - support suffixes for offset= and sizelimit=  [Karel Zak]
+   - update documentation about barrier mount options  [Jan Kara]
+   - use %u for uid_t and gid_t  [Karel Zak]
+   - use auto-loopdev for all known filesystems  [Karel Zak]
+   - use unmangle/mangle() from lib  [Karel Zak]
+   - warn users that mtab is read-only  [Karel Zak]
+namei:
+   - fix man page formatting  [Vladimir Brednikov]
+partx:
+   - do not add nonexistent partitions  [Phillip Susi]
+   - fix infinite loop  [Karel Zak]
+po:
+   - merge changes  [Karel Zak]
+   - update cs.po (from translationproject.org)  [Petr Pisar]
+   - update es.po (from translationproject.org)  [Santiago Vila Doncel]
+   - update eu.po (from translationproject.org)  [Mikel Olasagasti Uranga]
+   - update id.po (from translationproject.org)  [Arif E. Nugroho]
+   - update ja.po (from translationproject.org)  [Makoto Kato]
+   - update list of files  [Karel Zak]
+   - update nl.po (from translationproject.org)  [Benno Schulenberg]
+   - update pl.po (from translationproject.org)  [Jakub Bogusz]
+   - update vi.po (from translationproject.org)  [Clytie Siddall]
+rdev:
+   - remove this deprecated command  [Karel Zak]
+rtcwake:
+   - add --dry-run option  [Karel Zak]
+   - add disable action for rtc alarm  [Marek Otahal]
+   - add disable action to rtcwake man page  [Marek Otahal]
+   - does miss the "off" option  [Karel Zak]
+script:
+   - optionally compile with libutempter to update utmp  [Karel Zak]
+   - preserve child exit status  [Karel Zak]
+sfdisk:
+   - make sure writes make it to disk in write_partitions()  [Bryn M. Reeves]
+swaplabel:
+   - fix typo in man page  [Karel Zak]
+   - new command  [Jason Borden]
+swapon:
+   - fix swapsize calculation  [Karel Zak]
+   - move DELETED_SUFFIX to include/pathnames.h  [Karel Zak]
+   - remove " (deleted)" from filenames from /proc/swaps  [Karel Zak]
+   - use unmangle() for filenames from /proc/swaps  [Karel Zak]
+taskset:
+   - add NLS support, use err.h, cleanup  [Karel Zak]
+   - move NR_CPUS determination to lib/cpuset.c  [Karel Zak]
+   - move bitmap routines to lib/cpuset.c  [Karel Zak]
+   - use libc based cpu_set_t  [Karel Zak]
+tests:
+   - add BeFS test image  [Karel Zak]
+   - add blkid test for TuxOnIce  [Karel Zak]
+   - add blkid tests for RAID1  [Karel Zak]
+   - add cpuset regression test  [Karel Zak]
+   - add fdisk alignment tests  [Karel Zak]
+   - add lscpu dump from Dell R710, 8-core Nehalem w/HT (RHEL 5.5)  [Karel Zak]
+   - added tests against strtosize  [Yann Droneaud]
+   - explicitly use --chunk and --metadata in MD test  [Karel Zak]
+   - fix RAIDs tests  [Karel Zak]
+   - fix and update old fdisk tests  [Karel Zak]
+   - fix whitespaces  [Karel Zak]
+   - mount cramfs read-only  [Karel Zak]
+   - update FS test images  [Karel Zak]
+   - update blkid test for raid1  [Karel Zak]
+   - update blkid/md-raid1-* tests  [Karel Zak]
+   - update fdisk tests  [Karel Zak]
+   - update ipcs/headers test  [Francesco Cosoleto]
+   - update lscpu  [Karel Zak]
+   - update lscpu test  [Karel Zak]
+   - use POSIX locale  [Yann Droneaud]
+textual:
+   - fix typos  [Karel Zak]
+   - fix typos, and rephrase some things for clarity  [Benno Schulenberg]
+   - slightly improve two README files  [Benno Schulenberg]
+umount:
+   - add --fake option to umount(8)  [Miklos Szeredi]
+   - do not sync() as the kernel does it by itself  [Petr Uzel]
+unshare:
+   - drop potential euid privileges before exec  [Karel Zak]
+uuidd:
+   - spell the plural of "UUID" consistently as "UUIDs"  [Benno Schulenberg]
+wipefs:
+   - cleanup usage() and man page  [Karel Zak]
+   - fix license (GPL -> GPLv2+)  [Karel Zak]
+   - fix mem usage  [Karel Zak]
+   - fix memory leaks  [Karel Zak]
+   - ignore devices with partition table  [Karel Zak]
+   - print warning is PT detected  [Karel Zak]
+   - support suffixes for --offset  [Karel Zak]
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
index 7b87d6cf..36871f3c 100644
--- a/fdisk/Makefile.am
+++ b/fdisk/Makefile.am
@@ -3,10 +3,11 @@ include $(top_srcdir)/config/include-Makefile.am
 EXTRA_DIST = README.fdisk README.cfdisk sfdisk.examples partitiontype.c
 
 fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \
-	../lib/blkdev.c ../lib/wholedisk.c ../lib/mbsalign.c
+	$(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \
+	$(top_srcdir)/lib/mbsalign.c
 
 if LINUX
-fdisk_common += ../lib/linux_version.c
+fdisk_common += $(top_srcdir)/lib/linux_version.c
 endif
 
 if !ARCH_M68K
@@ -53,7 +54,7 @@ endif
 if USE_SLANG
 sbin_PROGRAMS += cfdisk
 dist_man_MANS += cfdisk.8
-cfdisk_SOURCES = cfdisk.c $(fdisk_common) ../lib/mbsalign.c
+cfdisk_SOURCES = cfdisk.c $(fdisk_common)
 cfdisk_CFLAGS = $(cflags_blkid)
 cfdisk_LDADD = -lslang $(ldadd_blkid)
 else
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index b1eaceeb..e7955fe5 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -64,15 +64,25 @@
 #include <errno.h>
 #include <getopt.h>
 #include <fcntl.h>
+
+#ifdef HAVE_SLANG_H
+#include <slang.h>
+#elif defined(HAVE_SLANG_SLANG_H)
+#include <slang/slang.h>
+#endif
+
 #ifdef HAVE_SLCURSES_H
 #include <slcurses.h>
 #elif defined(HAVE_SLANG_SLCURSES_H)
 #include <slang/slcurses.h>
+#elif defined(HAVE_NCURSESW_NCURSES_H) && defined(HAVE_WIDECHAR)
+#include <ncursesw/ncurses.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>
 #include <string.h>
@@ -93,6 +103,7 @@
 #include "common.h"
 #include "gpt.h"
 #include "mbsalign.h"
+#include "widechar.h"
 
 #ifdef __GNU__
 #define DEFAULT_DEVICE "/dev/hd0"
@@ -410,6 +421,11 @@ fdexit(int ret) {
     exit(ret);
 }
 
+/*
+ * Note that @len is size of @str buffer.
+ *
+ * Returns number of read bytes (without \0).
+ */
 static int
 get_string(char *str, int len, char *def) {
     size_t cells = 0, i = 0;
@@ -430,7 +446,8 @@ get_string(char *str, int len, char *def) {
 
     refresh();
 
-#if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
+#if !defined(HAVE_SLCURSES_H) && !defined(HAVE_SLANG_SLCURSES_H) && \
+    defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
     while ((key = get_wch(&c)) != ERR &&
 	   c != '\r' && c != '\n' && c != KEY_ENTER) {
 #else
@@ -460,7 +477,7 @@ get_string(char *str, int len, char *def) {
 	    break;
 	default:
 #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
-	    if (i < len && iswprint(c)) {
+	    if (i + 1 < len && iswprint(c)) {
 		wchar_t wc = (wchar_t) c;
 		char s[MB_CUR_MAX + 1];
 		int  sz = wctomb(s, wc);
@@ -480,7 +497,7 @@ get_string(char *str, int len, char *def) {
 			putchar(BELL);
 	    }
 #else
-	    if (i < len && isprint(c)) {
+	    if (i + 1 < len && isprint(c)) {
 	        mvaddch(y, x + cells, c);
 		if (use_def) {
 		    clrtoeol();
@@ -2393,7 +2410,7 @@ change_id(int i) {
 
     sprintf(def, "%02X", new_id);
     mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: "));
-    if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT)
+    if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT)
 	return;
 
     if (len != GS_DEFAULT) {
diff --git a/fdisk/fdisk.8 b/fdisk/fdisk.8
index 30dc9678..a2d8e434 100644
--- a/fdisk/fdisk.8
+++ b/fdisk/fdisk.8
@@ -3,7 +3,7 @@
 .\" May be distributed under the GNU General Public License
 .TH FDISK 8 "11 June 1998" "Linux 2.0" "Linux Programmer's Manual"
 .SH NAME
-fdisk \- Partition table manipulator for Linux
+fdisk \- partition table manipulator for Linux
 .SH SYNOPSIS
 .B fdisk
 .RB [ \-uc ]
@@ -28,19 +28,34 @@ fdisk \- Partition table manipulator for Linux
 .sp
 .B fdisk \-h
 .SH DESCRIPTION
+.B fdisk
+(in the first form of invocation)
+is a menu-driven program for creation and manipulation of
+partition tables.
+It understands DOS-type partition tables and BSD- or SUN-type disklabels.
+
+.B fdisk
+does not understand GUID partition tables (GPTs) and it is not designed
+for large partitions.  In these cases, use the more advanced GNU
+.BR parted (8).
+
+.B fdisk
+does not use DOS-compatible mode and cylinders as display units by default.
+The old deprecated DOS behavior can be enabled with
+the '-c=dos -u=cylinders' command-line options.
+
 Hard disks can be divided into one or more logical disks called
 .IR partitions .
-This division is described in the
-.I "partition table"
+This division is recorded in the
+.IR "partition table" ,
 found in sector 0 of the disk.
-
-In the BSD world one talks about `disk slices' and a `disklabel'.
+(In the BSD world one talks about `disk slices' and a `disklabel'.)
 
 Linux needs at least one partition, namely for its root file system.
 It can use swap files and/or swap partitions, but the latter are more
-efficient. So, usually one will want a second Linux partition
+efficient.  So, usually one will want a second Linux partition
 dedicated as swap partition.
-On Intel compatible hardware, the BIOS that boots the system
+On Intel-compatible hardware, the BIOS that boots the system
 can often only access the first 1024 cylinders of the disk.
 For this reason people with large disks often create a third partition,
 just a few MB large, typically mounted on
@@ -50,68 +65,56 @@ so as to make sure that this stuff is accessible to the BIOS.
 There may be reasons of security, ease of administration and backup,
 or testing, to use more than the minimum number of partitions.
 
-.B fdisk
-(in the first form of invocation)
-is a menu driven program for creation and manipulation of
-partition tables.
-It understands DOS type partition tables and BSD or SUN type disklabels.
-
-.B fdisk
-doesn't understand GUID Partition Table (GPT) and
-it is not designed for large partitions. In particular case use more advanced GNU
-.BR parted (8).
-
+.SH DEVICES
 The
 .I device
-is usually /dev/sda, /dev/sdb or so. A device name refers to the entire disk.
-The old systems without libata (a library used inside the Linux kernel to
+is usually /dev/sda, /dev/sdb or so.  A device name refers to the entire disk.
+Old systems without libata (a library used inside the Linux kernel to
 support ATA host controllers and devices) make a difference between IDE and
-SCSI disks. In such a case the device name will be /dev/hd* (IDE) or /dev/sd*
+SCSI disks.  In such cases the device name will be /dev/hd* (IDE) or /dev/sd*
 (SCSI).
 
 The
 .I partition
-is a
-.I device
-name followed by a partition number.  For example,
-.B /dev/sda1
+is a device name followed by a partition number.  For example, /dev/sda1
 is the first partition on the first hard disk in the system.
 See also Linux kernel documentation (the Documentation/devices.txt file).
 
-A BSD/SUN type disklabel can describe 8 partitions,
+.SH DISK LABELS
+A BSD/SUN-type disklabel can describe 8 partitions,
 the third of which should be a `whole disk' partition.
 Do not start a partition that actually uses its first sector
 (like a swap partition) at cylinder 0, since that will
 destroy the disklabel.
 
-An IRIX/SGI type disklabel can describe 16 partitions,
+An IRIX/SGI-type disklabel can describe 16 partitions,
 the eleventh of which should be an entire `volume' partition,
 while the ninth should be labeled `volume header'.
 The volume header will also cover the partition table, i.e.,
 it starts at block zero and extends by default over five cylinders.
 The remaining space in the volume header may be used by header
 directory entries.  No partitions may overlap with the volume header.
-Also do not change its type and make some file system on it, since
+Also do not change its type or make some filesystem on it, since
 you will lose the partition table.  Use this type of label only when
 working with Linux on IRIX/SGI machines or IRIX/SGI disks under Linux.
 
-A DOS type partition table can describe an unlimited number
-of partitions. In sector 0 there is room for the description
-of 4 partitions (called `primary'). One of these may be an
+A DOS-type partition table can describe an unlimited number
+of partitions.  In sector 0 there is room for the description
+of 4 partitions (called `primary').  One of these may be an
 extended partition; this is a box holding logical partitions,
 with descriptors found in a linked list of sectors, each
 preceding the corresponding logical partitions.
 The four primary partitions, present or not, get numbers 1-4.
 Logical partitions start numbering from 5.
 
-In a DOS type partition table the starting offset and the size
+In a DOS-type partition table the starting offset and the size
 of each partition is stored in two ways: as an absolute number
-of sectors (given in 32 bits) and as a Cylinders/Heads/Sectors
-triple (given in 10+8+6 bits). The former is OK - with 512-byte
-sectors this will work up to 2 TB. The latter has two different
-problems. First of all, these C/H/S fields can be filled only
+of sectors (given in 32 bits), and as a Cylinders/Heads/Sectors
+triple (given in 10+8+6 bits).  The former is OK -- with 512-byte
+sectors this will work up to 2 TB.  The latter has two
+problems.  First, these C/H/S fields can be filled only
 when the number of heads and the number of sectors per track
-are known. Secondly, even if we know what these numbers should be,
+are known.  And second, even if we know what these numbers should be,
 the 24 bits that are available do not suffice.
 DOS uses C/H/S only, Windows uses both, Linux never uses C/H/S.
 
@@ -121,19 +124,19 @@ will obtain the disk geometry automatically.  This is not
 necessarily the physical disk geometry (indeed, modern disks do not
 really have anything like a physical geometry, certainly not something
 that can be described in simplistic Cylinders/Heads/Sectors form),
-but is the disk geometry that MS-DOS uses for the partition table.
+but it is the disk geometry that MS-DOS uses for the partition table.
 
 Usually all goes well by default, and there are no problems if
-Linux is the only system on the disk. However, if the disk has
+Linux is the only system on the disk.  However, if the disk has
 to be shared with other operating systems, it is often a good idea
 to let an fdisk from another operating system make at least one
-partition. When Linux boots it looks at the partition table, and
+partition.  When Linux boots it looks at the partition table, and
 tries to deduce what (fake) geometry is required for good
 cooperation with other systems.
 
 Whenever a partition table is printed out, a consistency check is performed
 on the partition table entries.  This check verifies that the physical and
-logical start and end points are identical, and that the partition starts
+logical start and end points are identical, and that each partition starts
 and ends on a cylinder boundary (except for the first partition).
 
 Some versions of MS-DOS create a first partition which does not begin
@@ -141,11 +144,11 @@ on a cylinder boundary, but on sector 2 of the first cylinder.
 Partitions beginning in cylinder 1 cannot begin on a cylinder boundary, but
 this is unlikely to cause difficulty unless you have OS/2 on your machine.
 
-A sync() and a BLKRRPART ioctl() (reread partition table from disk)
+A sync() and an ioctl(BLKRRPART) (reread partition table from disk)
 are performed before exiting when the partition table has been updated.
 Long ago it used to be necessary to reboot after the use of fdisk.
-I do not think this is the case anymore - indeed, rebooting too quickly
-might cause loss of not-yet-written data. Note that both the kernel
+I do not think this is the case anymore -- indeed, rebooting too quickly
+might cause loss of not-yet-written data.  Note that both the kernel
 and the disk hardware may buffer data.
 
 .SH "DOS 6.x WARNING"
@@ -180,24 +183,25 @@ program and Linux partitions with the Linux fdisk or Linux cfdisk program.
 .SH OPTIONS
 .TP
 .BI "\-b " sectorsize
-Specify the sector size of the disk. Valid values are 512, 1024, 2048 or 4096.
-(Recent kernels know the sector size. Use this only on old kernels or
-to override the kernel's ideas.) Since util-linux-ng 2.17 fdisk differentiates
-between logical and physical sector size. This option changes both sector sizes to
+Specify the sector size of the disk.  Valid values are 512, 1024, 2048 or 4096.
+(Recent kernels know the sector size.  Use this only on old kernels or
+to override the kernel's ideas.)  Since util-linux-ng-2.17, fdisk differentiates
+between logical and physical sector size.  This option changes both sector sizes to
 .IB sectorsize .
 .TP
-.BI \-h
-Print help and then exit.
-.TP
-.BI \-c
-Switch off DOS-compatible mode. (Recommended)
+.BI "\-c"[=mode]
+Specify the compatiblity mode, 'dos' or 'nondos'.  The default is non-DOS
+mode.  For backward compatibility, it is possible to use the option without
+the <mode> argument -- then the default is used.  Note that the optional
+<mode> argument cannot be separated from the -c option by a space, the correct
+form is for example '-c=dos'.
 .TP
 .BI "\-C " cyls
 Specify the number of cylinders of the disk.
 I have no idea why anybody would want to do so.
 .TP
 .BI "\-H " heads
-Specify the number of heads of the disk. (Not the physical number,
+Specify the number of heads of the disk.  (Not the physical number,
 of course, but the number used for partition tables.)
 Reasonable values are 255 and 16.
 .TP
@@ -207,20 +211,24 @@ Specify the number of sectors per track of the disk.
 partition tables.)
 A reasonable value is 63.
 .TP
+.BI \-h
+Print help and then exit.
+.TP
 .B \-l
 List the partition tables for the specified devices and then exit.
 If no devices are given, those mentioned in
 .I /proc/partitions
 (if that exists) are used.
 .TP
-.B \-u
-When listing partition tables, give sizes in sectors instead
-of cylinders.
+.BI "\-s " partition...
+Print the size (in blocks) of each given partition.
 .TP
-.BI "\-s " partition
-The
-.I size
-of the partition (in blocks) is printed on the standard output.
+.BI "\-u"[=unit]
+When listing partition tables, show sizes in 'sectors' or in 'cylinders'.  The
+default is to show sizes in sectors.  For backward compatibility, it is possible
+to use the option without the <units> argument -- then the default is used.
+Note that the optional <unit> argument cannot be separated from the -u option
+by a space, the correct form is for example '-u=cylinders'.
 .TP
 .B \-v
 Print version number of
@@ -237,14 +245,14 @@ Try them in the order
 .B cfdisk
 is a beautiful program that has strict requirements on
 the partition tables it accepts, and produces high quality partition
-tables. Use it if you can.
+tables.  Use it if you can.
 .B fdisk
 is a buggy program that does fuzzy things - usually it happens to
-produce reasonable results. Its single advantage is that it has
+produce reasonable results.  Its single advantage is that it has
 some support for BSD disk labels and other non-DOS partition tables.
 Avoid it if you can.
 .B sfdisk
-is for hackers only - the user interface is terrible, but it is
+is for hackers only -- the user interface is terrible, but it is
 more correct than fdisk and more powerful than both fdisk and cfdisk.
 Moreover, it can be used noninteractively.)
 .PP
@@ -253,7 +261,7 @@ These days there also is
 The cfdisk interface is nicer, but parted does much more: it not only
 resizes partitions, but also the filesystems that live in them.
 .PP
-The IRIX/SGI type disklabel is currently not supported by the kernel.
+The IRIX/SGI-type disklabel is currently not supported by the kernel.
 Moreover, IRIX/SGI header directories are not fully supported yet.
 .PP
 The option `dump partition table to file' is missing.
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 0126e67b..6572c51d 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -204,7 +204,7 @@ int	fd,				/* the disk */
 	ext_index,			/* the prime extended partition */
 	listing = 0,			/* no aborts for fdisk -l */
 	nowarn = 0,			/* no warnings for fdisk -l/-s */
-	dos_compatible_flag = ~0,
+	dos_compatible_flag = 0,	/* disabled by default */
 	dos_changed = 0,
 	partitions = 4;			/* maximum partition + 1 */
 
@@ -220,7 +220,7 @@ unsigned int	heads,
 	sector_factor = 1,
 	user_set_sector_size = 0,
 	units_per_sector = 1,
-	display_in_cyl_units = 1;
+	display_in_cyl_units = 0;
 
 unsigned long long total_number_of_sectors;	/* (!) 512-byte sectors */
 unsigned long grain = DEFAULT_SECTOR_SIZE,
@@ -259,14 +259,14 @@ void fatal(enum failure why) {
 " fdisk [options] -l <disk> list partition table(s)\n"
 " fdisk -s <partition>      give partition size(s) in blocks\n"
 "\nOptions:\n"
-" -b <size>                 sector size (512, 1024, 2048 or 4096)\n"
-" -c                        switch off DOS-compatible mode\n"
-" -h                        print help\n"
-" -u <size>                 give sizes in sectors instead of cylinders\n"
-" -v                        print version\n"
-" -C <number>               specify the number of cylinders\n"
-" -H <number>               specify the number of heads\n"
-" -S <number>               specify the number of sectors per track\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
 "\n");
 			break;
 		case unable_to_open:
@@ -764,7 +764,7 @@ void update_units(void)
 	if (display_in_cyl_units && cyl_units)
 		units_per_sector = cyl_units;
 	else
-		units_per_sector = 1; 	/* in sectors */
+		units_per_sector = 1;	/* in sectors */
 }
 
 static void
@@ -796,18 +796,12 @@ warn_alignment(void) {
 "the physical sector size. Aligning to a physical sector (or optimal\n"
 "I/O) size boundary is recommended, or performance may be impacted.\n"));
 
-	if (dos_compatible_flag) {
+	if (dos_compatible_flag)
 		fprintf(stderr, _("\n"
 "WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
-"         switch off the mode (command 'c')"));
-
-		if (display_in_cyl_units)
-			fprintf(stderr, _(" and change display units to\n"
-"         sectors (command 'u').\n"));
-		else
-			fprintf(stderr, ".\n");
+"         switch off the mode (with command 'c')."));
 
-	 } else if (display_in_cyl_units)
+	if (display_in_cyl_units)
 		fprintf(stderr, _("\n"
 "WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
 "         change units to sectors.\n"));
@@ -1615,8 +1609,11 @@ void change_units(void)
 {
 	display_in_cyl_units = !display_in_cyl_units;
 	update_units();
-	printf(_("Changing display/entry units to %s\n"),
-		str_units(PLURAL));
+
+	if (display_in_cyl_units)
+		printf(_("Changing display/entry units to cylinders (DEPRECATED!)\n"));
+	else
+		printf(_("Changing display/entry units to sectors\n"));
 }
 
 static void
@@ -1636,7 +1633,7 @@ static void
 toggle_dos_compatibility_flag(void) {
 	dos_compatible_flag = ~dos_compatible_flag;
 	if (dos_compatible_flag)
-		printf(_("DOS Compatibility flag is set\n"));
+		printf(_("DOS Compatibility flag is set (DEPRECATED!)\n"));
 	else
 		printf(_("DOS Compatibility flag is not set\n"));
 
@@ -1804,7 +1801,7 @@ change_sysid(void) {
  * Lubkin Oct.  1991). */
 
 static void
-long2chs(ulong ls, unsigned int *c, unsigned int *h, unsigned int *s) {
+long2chs(unsigned long ls, unsigned int *c, unsigned int *h, unsigned int *s) {
 	int spc = heads * sectors;
 
 	*c = ls / spc;
@@ -2925,7 +2922,7 @@ main(int argc, char **argv) {
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	while ((c = getopt(argc, argv, "b:cC:hH:lsS:uvV")) != -1) {
+	while ((c = getopt(argc, argv, "b:c::C:hH:lsS:u::vV")) != -1) {
 		switch (c) {
 		case 'b':
 			/* Ugly: this sector size is really per device,
@@ -2943,7 +2940,12 @@ main(int argc, char **argv) {
 			user_cylinders = atoi(optarg);
 			break;
 		case 'c':
-			dos_compatible_flag = 0;
+			dos_compatible_flag = 0;	/* default */
+
+			if (optarg && !strcmp(optarg, "=dos"))
+				dos_compatible_flag = ~0;
+			else if (optarg && strcmp(optarg, "=nondos"))
+				fatal(usage);
 			break;
 		case 'h':
 			fatal(help);
@@ -2965,7 +2967,11 @@ main(int argc, char **argv) {
 			opts = 1;
 			break;
 		case 'u':
-			display_in_cyl_units = 0;
+			display_in_cyl_units = 0;		/* default */
+			if (optarg && strcmp(optarg, "=cylinders") == 0)
+				display_in_cyl_units = !display_in_cyl_units;
+			else if (optarg && strcmp(optarg, "=sectors"))
+				fatal(usage);
 			break;
 		case 'V':
 		case 'v':
diff --git a/fsck/Makefile.am b/fsck/Makefile.am
index 203d36b0..b0949e25 100644
--- a/fsck/Makefile.am
+++ b/fsck/Makefile.am
@@ -3,8 +3,8 @@ include $(top_srcdir)/config/include-Makefile.am
 sbin_PROGRAMS = fsck
 dist_man_MANS = fsck.8
 
-fsck_SOURCES = base_device.c fsck.c fsck.h ../lib/ismounted.c \
-	       ../lib/fsprobe.c ../lib/canonicalize.c
+fsck_SOURCES = base_device.c fsck.c fsck.h $(top_srcdir)/lib/ismounted.c \
+	       $(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/canonicalize.c
 fsck_LDADD =
 fsck_CFLAGS = $(AM_CFLAGS)
 
diff --git a/fsck/fsck.8 b/fsck/fsck.8
index fd1e7e23..027fb3fe 100644
--- a/fsck/fsck.8
+++ b/fsck/fsck.8
@@ -354,7 +354,7 @@ option as of this writing.
 .SH AUTHOR
 Theodore Ts'o (tytso@mit.edu)
 .SH AVAILABILITY
-The blkid command is part of the util-linux-ng package and is available from
+The fsck command is part of the util-linux-ng package and is available from
 ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
 .SH FILES
 .IR /etc/fstab .
diff --git a/include/Makefile.am b/include/Makefile.am
index 067523d7..3b93acd0 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,27 +1,30 @@
 include $(top_srcdir)/config/include-Makefile.am
 
 dist_noinst_HEADERS = \
-	c.h \
 	bitops.h \
 	blkdev.h \
 	canonicalize.h \
 	carefulputc.h \
+	c.h \
+	cpuset.h \
+	crc32.h \
 	env.h \
 	fsprobe.h \
 	ismounted.h \
 	linux_reboot.h \
 	linux_version.h \
-	md5.h \
+	list.h \
+	mangle.h \
 	mbsalign.h \
+	md5.h \
 	nls.h \
 	pathnames.h \
 	setproctitle.h \
+	strtosize.h \
 	swapheader.h \
+	tt.h \
 	usleep.h \
 	wholedisk.h \
 	widechar.h \
-	crc32.h \
-	mangle.h \
-	strtosize.h \
-	xstrncpy.h \
-	writeall.h
+	writeall.h \
+	xstrncpy.h
diff --git a/include/blkdev.h b/include/blkdev.h
index 34e4e924..0eea01cd 100644
--- a/include/blkdev.h
+++ b/include/blkdev.h
@@ -45,6 +45,11 @@
 #define BLKPBSZGET _IO(0x12,123)
 #endif
 
+#ifndef FIFREEZE
+#define FIFREEZE   _IOWR('X', 119, int)    /* Freeze */
+#define FITHAW     _IOWR('X', 120, int)    /* Thaw */
+#endif
+
 #ifndef HDIO_GETGEO
 # ifdef __linux__
 #  define HDIO_GETGEO 0x0301
diff --git a/include/cpuset.h b/include/cpuset.h
new file mode 100644
index 00000000..93646605
--- /dev/null
+++ b/include/cpuset.h
@@ -0,0 +1,75 @@
+#ifndef UTIL_LINUX_CPUSET_H
+#define UTIL_LINUX_CPUSET_H
+
+#include <sched.h>
+
+/*
+ * Fallback for old or obscure libcs without dynamically allocated cpusets
+ *
+ * The following macros are based on code from glibc.
+ *
+ * The GNU C Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ */
+#if !HAVE_DECL_CPU_ALLOC
+
+# define CPU_ZERO_S(setsize, cpusetp) \
+  do {									      \
+    size_t __i;								      \
+    size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
+    __cpu_mask *__bits = (cpusetp)->__bits;				      \
+    for (__i = 0; __i < __imax; ++__i)					      \
+      __bits[__i] = 0;							      \
+  } while (0)
+
+# define CPU_SET_S(cpu, setsize, cpusetp) \
+   ({ size_t __cpu = (cpu);						      \
+      __cpu < 8 * (setsize)						      \
+      ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]		      \
+	 |= __CPUMASK (__cpu))						      \
+      : 0; })
+
+# define CPU_ISSET_S(cpu, setsize, cpusetp) \
+   ({ size_t __cpu = (cpu);						      \
+      __cpu < 8 * (setsize)						      \
+      ? ((((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)]	      \
+	  & __CPUMASK (__cpu))) != 0					      \
+      : 0; })
+
+# define CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
+   ({ __cpu_mask *__arr1 = (cpusetp1)->__bits;				      \
+      __cpu_mask *__arr2 = (cpusetp2)->__bits;				      \
+      size_t __imax = (setsize) / sizeof (__cpu_mask);			      \
+      size_t __i;							      \
+      for (__i = 0; __i < __imax; ++__i)				      \
+	if (__arr1[__i] != __arr2[__i])					      \
+	  break;							      \
+      __i == __imax; })
+
+extern int __cpuset_count_s(size_t setsize, const cpu_set_t *set);
+# define CPU_COUNT_S(setsize, cpusetp)	__cpuset_count_s(setsize, cpusetp)
+
+# define CPU_ALLOC_SIZE(count) \
+	  ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
+# define CPU_ALLOC(count)	(malloc(CPU_ALLOC_SIZE(count)))
+# define CPU_FREE(cpuset)	(free(cpuset))
+
+#endif /* !HAVE_DECL_CPU_ALLOC */
+
+
+#define cpuset_nbits(setsize)	(8 * (setsize))
+
+extern int get_max_number_of_cpus(void);
+
+extern cpu_set_t *cpuset_alloc(int ncpus, size_t *setsize, size_t *nbits);
+extern void cpuset_free(cpu_set_t *set);
+
+extern char *cpulist_create(char *str, size_t len, cpu_set_t *set, size_t setsize);
+extern int cpulist_parse(const char *str, cpu_set_t *set, size_t setsize);
+
+extern char *cpumask_create(char *str, size_t len, cpu_set_t *set, size_t setsize);
+extern int cpumask_parse(const char *str, cpu_set_t *set, size_t setsize);
+
+#endif /* UTIL_LINUX_CPUSET_H */
diff --git a/shlibs/blkid/src/list.h b/include/list.h
index c1cbfec5..7648c3c0 100644
--- a/shlibs/blkid/src/list.h
+++ b/include/list.h
@@ -1,10 +1,14 @@
-#if !defined(_BLKID_LIST_H) && !defined(LIST_HEAD)
-#define _BLKID_LIST_H
+/*
+ * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ * Copyright (C) 1999-2008 by Theodore Ts'o
+ *
+ * (based on list.h from e2fsprogs)
+ */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#if !defined(_LIBMOUNT_LIST_H) && !defined(LIST_HEAD)
+#define _LIBMOUNT_LIST_H
 
+/* TODO: use AC_C_INLINE */
 #ifdef __GNUC__
 #define _INLINE_ static __inline__
 #else                         /* For Watcom C */
@@ -122,6 +126,16 @@ _INLINE_ int list_empty(struct list_head *head)
 }
 
 /**
+ * list_last_entry - tests whether is entry last in the list
+ * @entry:	the entry to test.
+ * @head:	the list to test.
+ */
+_INLINE_ int list_last_entry(struct list_head *entry, struct list_head *head)
+{
+	return head->prev == entry;
+}
+
+/**
  * list_splice - join two lists
  * @list:	the new list to add.
  * @head:	the place to add it in the first list.
@@ -160,6 +174,14 @@ _INLINE_ void list_splice(struct list_head *list, struct list_head *head)
 	for (pos = (head)->next; pos != (head); pos = pos->next)
 
 /**
+ * list_for_each_backwardly - iterate over elements in a list in reverse
+ * @pos:	the &struct list_head to use as a loop counter.
+ * @head:	the head for your list.
+ */
+#define list_for_each_backwardly(pos, head) \
+	for (pos = (head)->prev; pos != (head); pos = pos->prev)
+
+/**
  * list_for_each_safe - iterate over elements in a list, but don't dereference
  *                      pos after the body is done (in case it is freed)
  * @pos:	the &struct list_head to use as a loop counter.
@@ -172,8 +194,4 @@ _INLINE_ void list_splice(struct list_head *list, struct list_head *head)
 
 #undef _INLINE_
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _BLKID_LIST_H */
+#endif /* __LIBFSPROBE_LIST_H__ */
diff --git a/include/pathnames.h b/include/pathnames.h
index 7d57c528..c0572954 100644
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -79,6 +79,7 @@
 #define _PATH_PROC_MOUNTS	"/proc/mounts"
 #define _PATH_PROC_PARTITIONS	"/proc/partitions"
 #define _PATH_PROC_DEVICES	"/proc/devices"
+#define _PATH_PROC_MOUNTINFO	"/proc/self/mountinfo"
 
 #define _PATH_SYS_BLOCK		"/sys/block"
 
diff --git a/include/tt.h b/include/tt.h
new file mode 100644
index 00000000..bf24d550
--- /dev/null
+++ b/include/tt.h
@@ -0,0 +1,71 @@
+/*
+ * Prints table or tree. See lib/table.c for more details and example.
+ *
+ * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+#ifndef UTIL_LINUX_TT_H
+#define UTIL_LINUX_TT_H
+
+#include "list.h"
+
+enum {
+	TT_FL_TRUNCATE   = (1 << 1),
+	TT_FL_TREE       = (1 << 2),
+	TT_FL_RAW        = (1 << 3),
+	TT_FL_ASCII      = (1 << 4),
+	TT_FL_NOHEADINGS = (1 << 5)
+};
+
+struct tt {
+	int	ncols;		/* number of columns */
+	int	termwidth;	/* terminal width */
+	int	flags;
+
+	struct list_head	tb_columns;
+	struct list_head	tb_lines;
+
+	const struct tt_symbols	*symbols;
+};
+
+struct tt_column {
+	const char *name;	/* header */
+	int	seqnum;
+
+	int	width;		/* real column width */
+	int	width_min;	/* minimal width (width of header) */
+	double	width_hint;	/* hint (N < 1 is in percent of termwidth) */
+
+	int	flags;
+
+	struct list_head	cl_columns;
+};
+
+struct tt_line {
+	struct tt	*table;
+	char const	**data;
+
+	struct list_head	ln_lines;	/* table lines */
+
+	struct list_head	ln_branch;	/* begin of branch (head of ln_children) */
+	struct list_head	ln_children;
+
+	struct tt_line	*parent;
+};
+
+extern struct tt *tt_new_table(int flags);
+extern void tt_free_table(struct tt *tb);
+extern int tt_print_table(struct tt *tb);
+
+extern struct tt_column *tt_define_column(struct tt *tb, const char *name,
+						double whint, int flags);
+
+extern struct tt_column *tt_get_column(struct tt *tb, int colnum);
+
+extern struct tt_line *tt_add_line(struct tt *tb, struct tt_line *parent);
+
+extern int tt_line_set_data(struct tt_line *ln, int colnum, const char *data);
+
+#endif /* UTIL_LINUX_TT_H */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0f008b30..2a185f34 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,13 +3,22 @@ include $(top_srcdir)/config/include-Makefile.am
 AM_CPPFLAGS += -DTEST_PROGRAM
 
 noinst_PROGRAMS = test_blkdev test_ismounted test_wholedisk test_mangle \
-		  test_strtosize
+		  test_strtosize test_tt
+if LINUX
+if HAVE_CPU_SET_T
+noinst_PROGRAMS += test_cpuset
+endif
+endif
 
 test_blkdev_SOURCES = blkdev.c
 test_ismounted_SOURCES = ismounted.c
 test_wholedisk_SOURCES = wholedisk.c
 test_mangle_SOURCES = mangle.c
 test_strtosize_SOURCES = strtosize.c
+if LINUX
+test_cpuset_SOURCES = cpuset.c
+endif
+test_tt_SOURCES = tt.c
 
 if LINUX
 test_blkdev_SOURCES += linux_version.c
diff --git a/lib/cpuset.c b/lib/cpuset.c
new file mode 100644
index 00000000..27b23498
--- /dev/null
+++ b/lib/cpuset.c
@@ -0,0 +1,380 @@
+/*
+ * Terminology:
+ *
+ *	cpuset	- (libc) cpu_set_t data structure represents set of CPUs
+ *	cpumask	- string with hex mask (e.g. "0x00000001")
+ *	cpulist - string with CPU ranges (e.g. "0-3,5,7,8")
+ *
+ * Based on code from taskset.c and Linux kernel.
+ *
+ * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <sched.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/syscall.h>
+
+#include "cpuset.h"
+
+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 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 const char *nexttoken(const char *q,  int sep)
+{
+	if (q)
+		q = strchr(q, sep);
+	if (q)
+		q++;
+	return q;
+}
+
+/*
+ * Number of bits in a CPU bitmask on current system
+ */
+int get_max_number_of_cpus(void)
+{
+	int n, cpus = 2048;
+	size_t setsize;
+	cpu_set_t *set = cpuset_alloc(cpus, &setsize, NULL);
+
+	if (!set)
+		return -1;	/* error */
+
+	for (;;) {
+		CPU_ZERO_S(setsize, set);
+
+		/* the library version does not return size of cpumask_t */
+		n = syscall(SYS_sched_getaffinity, 0, setsize, set);
+
+		if (n < 0 && errno == EINVAL && cpus < 1024 * 1024) {
+			cpuset_free(set);
+			cpus *= 2;
+			set = cpuset_alloc(cpus, &setsize, NULL);
+			if (!set)
+				return -1;	/* error */
+			continue;
+		}
+		cpuset_free(set);
+		return n * 8;
+	}
+	return -1;
+}
+
+/*
+ * Allocates a new set for ncpus and returns size in bytes and size in bits
+ */
+cpu_set_t *cpuset_alloc(int ncpus, size_t *setsize, size_t *nbits)
+{
+	cpu_set_t *set = CPU_ALLOC(ncpus);
+
+	if (!set)
+		return NULL;
+	if (setsize)
+		*setsize = CPU_ALLOC_SIZE(ncpus);
+	if (nbits)
+		*nbits = cpuset_nbits(CPU_ALLOC_SIZE(ncpus));
+	return set;
+}
+
+void cpuset_free(cpu_set_t *set)
+{
+	CPU_FREE(set);
+}
+
+#if !HAVE_DECL_CPU_ALLOC
+/* Please, use CPU_COUNT_S() macro. This is fallback */
+int __cpuset_count_s(size_t setsize, const cpu_set_t *set)
+{
+	int s = 0;
+	const __cpu_mask *p = set->__bits;
+	const __cpu_mask *end = &set->__bits[setsize / sizeof (__cpu_mask)];
+
+	while (p < end) {
+		__cpu_mask l = *p++;
+
+		if (l == 0)
+			continue;
+# if LONG_BIT > 32
+		l = (l & 0x5555555555555555ul) + ((l >> 1) & 0x5555555555555555ul);
+		l = (l & 0x3333333333333333ul) + ((l >> 2) & 0x3333333333333333ul);
+		l = (l & 0x0f0f0f0f0f0f0f0ful) + ((l >> 4) & 0x0f0f0f0f0f0f0f0ful);
+		l = (l & 0x00ff00ff00ff00fful) + ((l >> 8) & 0x00ff00ff00ff00fful);
+		l = (l & 0x0000ffff0000fffful) + ((l >> 16) & 0x0000ffff0000fffful);
+		l = (l & 0x00000000fffffffful) + ((l >> 32) & 0x00000000fffffffful);
+# else
+		l = (l & 0x55555555ul) + ((l >> 1) & 0x55555555ul);
+		l = (l & 0x33333333ul) + ((l >> 2) & 0x33333333ul);
+		l = (l & 0x0f0f0f0ful) + ((l >> 4) & 0x0f0f0f0ful);
+		l = (l & 0x00ff00fful) + ((l >> 8) & 0x00ff00fful);
+		l = (l & 0x0000fffful) + ((l >> 16) & 0x0000fffful);
+# endif
+		s += l;
+	}
+	return s;
+}
+#endif
+
+/*
+ * Returns human readable representation of the cpuset. The output format is
+ * a list of CPUs with ranges (for example, "0,1,3-9").
+ */
+char *cpulist_create(char *str, size_t len,
+			cpu_set_t *set, size_t setsize)
+{
+	int i;
+	char *ptr = str;
+	int entry_made = 0;
+	size_t max = cpuset_nbits(setsize);
+
+	for (i = 0; i < max; i++) {
+		if (CPU_ISSET_S(i, setsize, set)) {
+			int j, rlen;
+			int run = 0;
+			entry_made = 1;
+			for (j = i + 1; j < max; j++) {
+				if (CPU_ISSET_S(j, setsize, set))
+					run++;
+				else
+					break;
+			}
+			if (!run)
+				rlen = snprintf(ptr, len, "%d,", i);
+			else if (run == 1) {
+				rlen = snprintf(ptr, len, "%d,%d,", i, i + 1);
+				i++;
+			} else {
+				rlen = snprintf(ptr, len, "%d-%d,", i, i + run);
+				i += run;
+			}
+			if (rlen < 0 || rlen + 1 > len)
+				return NULL;
+			ptr += rlen;
+			len -= rlen;
+		}
+	}
+	ptr -= entry_made;
+	*ptr = '\0';
+
+	return str;
+}
+
+/*
+ * Returns string with CPU mask.
+ */
+char *cpumask_create(char *str, size_t len,
+			cpu_set_t *set, size_t setsize)
+{
+	char *ptr = str;
+	char *ret = NULL;
+	int cpu;
+
+	for (cpu = cpuset_nbits(setsize) - 4; cpu >= 0; cpu -= 4) {
+		char val = 0;
+
+		if (len == (ptr - str))
+			break;
+
+		if (CPU_ISSET_S(cpu, setsize, set))
+			val |= 1;
+		if (CPU_ISSET_S(cpu + 1, setsize, set))
+			val |= 2;
+		if (CPU_ISSET_S(cpu + 2, setsize, set))
+			val |= 4;
+		if (CPU_ISSET_S(cpu + 3, setsize, set))
+			val |= 8;
+
+		if (!ret && val)
+			ret = ptr;
+		*ptr++ = val_to_char(val);
+	}
+	*ptr = '\0';
+	return ret ? ret : ptr - 1;
+}
+
+/*
+ * Parses string with list of CPU ranges.
+ */
+int cpumask_parse(const char *str, cpu_set_t *set, size_t setsize)
+{
+	int len = strlen(str);
+	const char *ptr = str + len - 1;
+	int cpu = 0;
+
+	/* skip 0x, it's all hex anyway */
+	if (len > 1 && !memcmp(str, "0x", 2L))
+		str += 2;
+
+	CPU_ZERO_S(setsize, set);
+
+	while (ptr >= str) {
+		char val;
+
+		/* cpu masks in /sys uses comma as a separator */
+		if (*ptr == ',')
+			ptr--;
+
+		val = char_to_val(*ptr);
+		if (val == (char) -1)
+			return -1;
+		if (val & 1)
+			CPU_SET_S(cpu, setsize, set);
+		if (val & 2)
+			CPU_SET_S(cpu + 1, setsize, set);
+		if (val & 4)
+			CPU_SET_S(cpu + 2, setsize, set);
+		if (val & 8)
+			CPU_SET_S(cpu + 3, setsize, set);
+		len--;
+		ptr--;
+		cpu += 4;
+	}
+
+	return 0;
+}
+
+/*
+ * Parses string with CPUs mask.
+ */
+int cpulist_parse(const char *str, cpu_set_t *set, size_t setsize)
+{
+	const char *p, *q;
+	q = str;
+
+	CPU_ZERO_S(setsize, set);
+
+	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_S(a, setsize, set);
+			a += s;
+		}
+	}
+
+	return 0;
+}
+
+#ifdef TEST_PROGRAM
+
+#include <err.h>
+#include <getopt.h>
+
+int main(int argc, char *argv[])
+{
+	cpu_set_t *set;
+	size_t setsize, buflen, nbits;
+	char *buf, *mask = NULL, *range = NULL;
+	int ncpus = 2048, rc, c;
+
+	struct option longopts[] = {
+	    { "ncpus", 1, 0, 'n' },
+	    { "mask",  1, 0, 'm' },
+	    { "range", 1, 0, 'r' },
+	    { NULL,    0, 0, 0 }
+	};
+
+	while ((c = getopt_long(argc, argv, "n:m:r:", longopts, NULL)) != -1) {
+		switch(c) {
+		case 'n':
+			ncpus = atoi(optarg);
+			break;
+		case 'm':
+			mask = strdup(optarg);
+			break;
+		case 'r':
+			range = strdup(optarg);
+			break;
+		default:
+			goto usage_err;
+		}
+	}
+
+	if (!mask && !range)
+		goto usage_err;
+
+	set = cpuset_alloc(ncpus, &setsize, &nbits);
+	if (!set)
+		err(EXIT_FAILURE, "failed to allocate cpu set");
+
+	/*
+	fprintf(stderr, "ncpus: %d, cpuset bits: %zd, cpuset bytes: %zd\n",
+			ncpus, nbits, setsize);
+	*/
+
+	buflen = 7 * nbits;
+	buf = malloc(buflen);
+	if (!buf)
+		err(EXIT_FAILURE, "failed to allocate cpu set buffer");
+
+	if (mask)
+		rc = cpumask_parse(mask, set, setsize);
+	else
+		rc = cpulist_parse(range, set, setsize);
+
+	if (rc)
+		errx(EXIT_FAILURE, "failed to parse string: %s", mask ? : range);
+
+	printf("%-15s = %15s ", mask ? : range,
+				cpumask_create(buf, buflen, set, setsize));
+	printf("[%s]\n", cpulist_create(buf, buflen, set, setsize));
+
+	free(buf);
+	cpuset_free(set);
+
+	return EXIT_SUCCESS;
+
+usage_err:
+	fprintf(stderr,
+		"usage: %s [--ncpus <num>] --mask <mask> | --range <list>",
+		program_invocation_short_name);
+	exit(EXIT_FAILURE);
+}
+#endif
diff --git a/lib/ismounted.c b/lib/ismounted.c
index 94fe425c..592df308 100644
--- a/lib/ismounted.c
+++ b/lib/ismounted.c
@@ -11,14 +11,21 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
+#if HAVE_MNTENT_H
 #include <mntent.h>
+#endif
 #include <string.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <sys/param.h>
+#ifdef __APPLE__
+#include <sys/ucred.h>
+#include <sys/mount.h>
+#endif
 
 #include "pathnames.h"
 #include "ismounted.h"
+#include "c.h"
 
 #ifdef HAVE_MNTENT_H
 /*
diff --git a/lib/tt.c b/lib/tt.c
new file mode 100644
index 00000000..7d87bf54
--- /dev/null
+++ b/lib/tt.c
@@ -0,0 +1,725 @@
+/*
+ * TT - Table or Tree, features:
+ * - column width could be defined as absolute or relative to the terminal width
+ * - allows to truncate or wrap data in columns
+ * - prints tree if parent->child relation is defined
+ * - draws the tree by ASCII or UTF8 lines (depends on terminal setting)
+ *
+ * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <termios.h>
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#include "nls.h"
+#include "widechar.h"
+#include "c.h"
+#include "tt.h"
+
+struct tt_symbols {
+	const char *branch;
+	const char *vert;
+	const char *right;
+};
+
+static const struct tt_symbols ascii_tt_symbols = {
+	.branch = "|-",
+	.vert	= "| ",
+	.right	= "`-",
+};
+
+#ifdef HAVE_WIDECHAR
+#define	mbs_width(_s)	mbstowcs(NULL, _s, 0)
+
+#define UTF_V	"\342\224\202"	/* U+2502, Vertical line drawing char */
+#define UTF_VR	"\342\224\234"	/* U+251C, Vertical and right */
+#define UTF_H	"\342\224\200"	/* U+2500, Horizontal */
+#define UTF_UR	"\342\224\224"	/* U+2514, Up and right */
+
+static const struct tt_symbols utf8_tt_symbols = {
+	.branch = UTF_VR UTF_H,
+	.vert   = UTF_V " ",
+	.right	= UTF_UR UTF_H,
+};
+
+#else /* !HAVE_WIDECHAR */
+# define mbs_width       strlen(_s)
+#endif /* !HAVE_WIDECHAR */
+
+#define is_last_column(_tb, _cl) \
+		list_last_entry(&(_cl)->cl_columns, &(_tb)->tb_columns)
+
+/* TODO: move to lib/mbalign.c */
+#ifdef HAVE_WIDECHAR
+static size_t wc_truncate (wchar_t *wc, size_t width)
+{
+  size_t cells = 0;
+  int next_cells = 0;
+
+  while (*wc)
+    {
+      next_cells = wcwidth (*wc);
+      if (next_cells == -1) /* non printable */
+        {
+          *wc = 0xFFFD; /* L'\uFFFD' (replacement char) */
+          next_cells = 1;
+        }
+      if (cells + next_cells > width)
+        break;
+      cells += next_cells;
+      wc++;
+    }
+  *wc = L'\0';
+  return cells;
+}
+#endif
+
+
+/* TODO: move to lib/mbalign.c */
+static size_t mbs_truncate(char *str, size_t width)
+{
+	size_t bytes = strlen(str) + 1;
+#ifdef HAVE_WIDECHAR
+	size_t sz = mbs_width(str);
+	wchar_t *wcs = NULL;
+	int rc = -1;
+
+	if (sz <= width)
+		return sz;		/* truncate is unnecessary */
+
+	if (sz == (size_t) -1)
+		goto done;
+
+	wcs = malloc(sz * sizeof(wchar_t));
+	if (!wcs)
+		goto done;
+
+	if (!mbstowcs(wcs, str, sz))
+		goto done;
+	rc = wc_truncate(wcs, width);
+	wcstombs(str, wcs, bytes);
+done:
+	free(wcs);
+	return rc;
+#else
+	if (width < bytes) {
+		str[width] = '\0';
+		return width;
+	}
+	return bytes;			/* truncate is unnecessary */
+#endif
+}
+
+/*
+ * @flags: TT_FL_* flags (usually TT_FL_{ASCII,RAW})
+ *
+ * Returns: newly allocated table
+ */
+struct tt *tt_new_table(int flags)
+{
+	struct tt *tb;
+
+	tb = calloc(1, sizeof(struct tt));
+	if (!tb)
+		return NULL;
+
+	tb->flags = flags;
+	INIT_LIST_HEAD(&tb->tb_lines);
+	INIT_LIST_HEAD(&tb->tb_columns);
+
+#ifdef HAVE_WIDECHAR
+	if (!(flags & TT_FL_ASCII) && !strcmp(nl_langinfo(CODESET), "UTF-8"))
+		tb->symbols = &utf8_tt_symbols;
+	else
+#endif
+		tb->symbols = &ascii_tt_symbols;
+	return tb;
+}
+
+void tt_free_table(struct tt *tb)
+{
+	if (!tb)
+		return;
+	while (!list_empty(&tb->tb_lines)) {
+		struct tt_line *ln = list_entry(tb->tb_lines.next,
+						struct tt_line, ln_lines);
+		list_del(&ln->ln_lines);
+		free(ln->data);
+		free(ln);
+	}
+	while (!list_empty(&tb->tb_columns)) {
+		struct tt_column *cl = list_entry(tb->tb_columns.next,
+						struct tt_column, cl_columns);
+		list_del(&cl->cl_columns);
+		free(cl);
+	}
+	free(tb);
+}
+
+/*
+ * @tb: table
+ * @name: column header
+ * @whint: column width hint (absolute width: N > 1; relative width: N < 1)
+ * @flags: usually TT_FL_{TREE,TRUNCATE}
+ *
+ * The column is necessary to address (for example for tt_line_set_data()) by
+ * sequential number. The first defined column has the colnum = 0. For example:
+ *
+ *	tt_define_column(tab, "FOO", 0.5, 0);		// colnum = 0
+ *	tt_define_column(tab, "BAR", 0.5, 0);		// colnum = 1
+ *      .
+ *      .
+ *	tt_line_set_data(line, 0, "foo-data");		// FOO column
+ *	tt_line_set_data(line, 1, "bar-data");		// BAR column
+ *
+ * Returns: newly allocated column definition
+ */
+struct tt_column *tt_define_column(struct tt *tb, const char *name,
+					double whint, int flags)
+{
+	struct tt_column *cl;
+
+	if (!tb)
+		return NULL;
+	cl = calloc(1, sizeof(*cl));
+	if (!cl)
+		return NULL;
+
+	cl->name = name;
+	cl->width_hint = whint;
+	cl->flags = flags;
+	cl->seqnum = tb->ncols++;
+
+	if (flags & TT_FL_TREE)
+		tb->flags |= TT_FL_TREE;
+
+	INIT_LIST_HEAD(&cl->cl_columns);
+	list_add_tail(&cl->cl_columns, &tb->tb_columns);
+	return cl;
+}
+
+/*
+ * @tb: table
+ * @parent: parental line or NULL
+ *
+ * Returns: newly allocate line
+ */
+struct tt_line *tt_add_line(struct tt *tb, struct tt_line *parent)
+{
+	struct tt_line *ln = NULL;
+
+	if (!tb || !tb->ncols)
+		goto err;
+	ln = calloc(1, sizeof(*ln));
+	if (!ln)
+		goto err;
+	ln->data = calloc(tb->ncols, sizeof(char *));
+	if (!ln->data)
+		goto err;
+
+	ln->table = tb;
+	ln->parent = parent;
+	INIT_LIST_HEAD(&ln->ln_lines);
+	INIT_LIST_HEAD(&ln->ln_children);
+	INIT_LIST_HEAD(&ln->ln_branch);
+
+	list_add_tail(&ln->ln_lines, &tb->tb_lines);
+
+	if (parent)
+		list_add_tail(&ln->ln_children, &parent->ln_branch);
+	return ln;
+err:
+	free(ln);
+	return NULL;
+}
+
+/*
+ * @tb: table
+ * @colnum: number of column (0..N)
+ *
+ * Returns: pointer to column or NULL
+ */
+struct tt_column *tt_get_column(struct tt *tb, int colnum)
+{
+	struct list_head *p;
+
+	list_for_each(p, &tb->tb_columns) {
+		struct tt_column *cl =
+				list_entry(p, struct tt_column, cl_columns);
+		if (cl->seqnum == colnum)
+			return cl;
+	}
+	return NULL;
+}
+
+/*
+ * @ln: line
+ * @colnum: number of column (0..N)
+ * @data: printable data
+ *
+ * Stores data that will be printed to the table cell.
+ */
+int tt_line_set_data(struct tt_line *ln, int colnum, const char *data)
+{
+	struct tt_column *cl;
+
+	if (!ln)
+		return -1;
+	cl = tt_get_column(ln->table, colnum);
+	if (!cl)
+		return -1;
+	ln->data[cl->seqnum] = data;
+	return 0;
+}
+
+static int get_terminal_width(void)
+{
+#ifdef TIOCGSIZE
+	struct ttysize	t_win;
+#endif
+#ifdef TIOCGWINSZ
+	struct winsize	w_win;
+#endif
+        const char	*cp;
+
+#ifdef TIOCGSIZE
+	if (ioctl (0, TIOCGSIZE, &t_win) == 0)
+		return t_win.ts_cols;
+#endif
+#ifdef TIOCGWINSZ
+	if (ioctl (0, TIOCGWINSZ, &w_win) == 0)
+		return w_win.ws_col;
+#endif
+        cp = getenv("COLUMNS");
+	if (cp)
+		return strtol(cp, NULL, 10);
+	return 0;
+}
+
+static char *line_get_ascii_art(struct tt_line *ln, char *buf, size_t *bufsz)
+{
+	const char *art;
+	size_t len;
+
+	if (!ln->parent)
+		return buf;
+
+	buf = line_get_ascii_art(ln->parent, buf, bufsz);
+	if (!buf)
+		return NULL;
+
+	if (list_last_entry(&ln->ln_children, &ln->parent->ln_branch))
+		art = " ";
+	else
+		art = ln->table->symbols->vert;
+
+	len = strlen(art);
+	if (*bufsz < len)
+		return NULL;	/* no space, internal error */
+
+	memcpy(buf, art, len);
+	*bufsz -= len;
+	return buf + len;
+}
+
+static char *line_get_data(struct tt_line *ln, struct tt_column *cl,
+				char *buf, size_t bufsz)
+{
+	const char *data = ln->data[cl->seqnum];
+	const struct tt_symbols *sym;
+	char *p = buf;
+
+	memset(buf, 0, bufsz);
+
+	if (!data)
+		return NULL;
+	if (!(cl->flags & TT_FL_TREE)) {
+		strncpy(buf, data, bufsz);
+		buf[bufsz - 1] = '\0';
+		return buf;
+	}
+	if (ln->parent) {
+		p = line_get_ascii_art(ln->parent, buf, &bufsz);
+		if (!p)
+			return NULL;
+	}
+
+	sym = ln->table->symbols;
+
+	if (!ln->parent)
+		snprintf(p, bufsz, "%s", data);			/* root node */
+	else if (list_last_entry(&ln->ln_children, &ln->parent->ln_branch))
+		snprintf(p, bufsz, "%s%s", sym->right, data);	/* last chaild */
+	else
+		snprintf(p, bufsz, "%s%s", sym->branch, data);	/* any child */
+
+	return buf;
+}
+
+static void recount_widths(struct tt *tb, char *buf, size_t bufsz)
+{
+	struct list_head *p;
+	int width = 0, trunc_only;
+
+	/* set width according to the size of data
+	 */
+	list_for_each(p, &tb->tb_columns) {
+		struct tt_column *cl =
+				list_entry(p, struct tt_column, cl_columns);
+		struct list_head *lp;
+
+		list_for_each(lp, &tb->tb_lines) {
+			struct tt_line *ln =
+				list_entry(lp, struct tt_line, ln_lines);
+
+			char *data = line_get_data(ln, cl, buf, bufsz);
+			size_t len = data ? mbs_width(data) : 0;
+
+			if (cl->width < len)
+				cl->width = len;
+		}
+	}
+
+	/* set minimal width (= size of column header)
+	 */
+	list_for_each(p, &tb->tb_columns) {
+		struct tt_column *cl =
+				list_entry(p, struct tt_column, cl_columns);
+
+		cl->width_min = mbs_width(cl->name);
+
+		if (cl->width < cl->width_min)
+			cl->width = cl->width_min;
+		else if (cl->width_hint >= 1 &&
+			 cl->width_min < (int) cl->width_hint)
+			cl->width = (int) cl->width_hint;
+
+		width += cl->width + (is_last_column(tb, cl) ? 0 : 1);
+	}
+
+	if (width == tb->termwidth)
+		goto leave;
+	if (width < tb->termwidth) {
+		/* cool, use the extra space for the last column */
+		struct tt_column *cl = list_entry(
+			tb->tb_columns.prev, struct tt_column, cl_columns);
+
+		cl->width += tb->termwidth - width;
+		goto leave;
+	}
+
+	/* bad, we have to reduce output width, this is done in two steps:
+	 * 1/ reduce columns with a relative width and with truncate flag
+	 * 2) reduce columns with a relative width without truncate flag
+	 */
+	trunc_only = 1;
+	while(width > tb->termwidth) {
+		int org = width;
+
+		list_for_each(p, &tb->tb_columns) {
+			struct tt_column *cl =
+				list_entry(p, struct tt_column, cl_columns);
+
+			if (width <= tb->termwidth)
+				break;
+			if (cl->width_hint > 1)
+				continue;	/* never truncate columns with absolute sizes */
+			if (cl->flags & TT_FL_TREE)
+				continue;	/* never truncate the tree */
+			if (trunc_only && !(cl->flags & TT_FL_TRUNCATE))
+				continue;
+			if (cl->width == cl->width_min)
+				continue;
+			if (cl->width > cl->width_hint * tb->termwidth) {
+				cl->width--;
+				width--;
+			}
+		}
+		if (org == width) {
+			if (trunc_only)
+				trunc_only = 0;
+			else
+				break;
+		}
+	}
+leave:
+/*
+	fprintf(stderr, "terminal: %d, output: %d\n", tb->termwidth, width);
+
+	list_for_each(p, &tb->tb_columns) {
+		struct tt_column *cl =
+			list_entry(p, struct tt_column, cl_columns);
+
+		fprintf(stderr, "width: %s=%d [%d]\n",
+			cl->name, cl->width,
+			cl->width_hint > 1 ? (int) cl->width_hint :
+					     (int) (cl->width_hint * tb->termwidth));
+	}
+*/
+	return;
+}
+
+/* note that this function modifies @data
+ */
+static void print_data(struct tt *tb, struct tt_column *cl, char *data)
+{
+	size_t len, i;
+	int width;
+
+	if (!data)
+		data = "";
+
+	/* raw mode */
+	if (tb->flags & TT_FL_RAW) {
+		fputs(data, stdout);
+		if (!is_last_column(tb, cl))
+			fputc(' ', stdout);
+		return;
+	}
+
+	/* note that 'len' and 'width' are number of cells, not bytes */
+	len = mbs_width(data);
+
+	if (!len || len == (size_t) -1) {
+		len = 0;
+		data = NULL;
+	}
+	width = cl->width;
+
+	if (is_last_column(tb, cl) && len < width)
+		width = len;
+
+	/* truncate data */
+	if (len > width && (cl->flags & TT_FL_TRUNCATE)) {
+		len = mbs_truncate(data, width);
+		if (!data || len == (size_t) -1) {
+			len = 0;
+			data = NULL;
+		}
+	}
+	if (data)
+		fputs(data, stdout);
+	for (i = len; i < width; i++)
+		fputc(' ', stdout);		/* padding */
+
+	if (!is_last_column(tb, cl)) {
+		if (len > width && !(cl->flags & TT_FL_TRUNCATE)) {
+			fputc('\n', stdout);
+			for (i = 0; i <= cl->seqnum; i++) {
+				struct tt_column *x = tt_get_column(tb, i);
+				printf("%*s ", -x->width, " ");
+			}
+		} else
+			fputc(' ', stdout);	/* columns separator */
+	}
+}
+
+static void print_line(struct tt_line *ln, char *buf, size_t bufsz)
+{
+	struct list_head *p;
+
+	/* set width according to the size of data
+	 */
+	list_for_each(p, &ln->table->tb_columns) {
+		struct tt_column *cl =
+				list_entry(p, struct tt_column, cl_columns);
+
+		print_data(ln->table, cl, line_get_data(ln, cl, buf, bufsz));
+	}
+	fputc('\n', stdout);
+}
+
+static void print_header(struct tt *tb, char *buf, size_t bufsz)
+{
+	struct list_head *p;
+
+	if ((tb->flags & TT_FL_NOHEADINGS) || list_empty(&tb->tb_lines))
+		return;
+
+	/* set width according to the size of data
+	 */
+	list_for_each(p, &tb->tb_columns) {
+		struct tt_column *cl =
+				list_entry(p, struct tt_column, cl_columns);
+
+		strncpy(buf, cl->name, bufsz);
+		buf[bufsz - 1] = '\0';
+		print_data(tb, cl, buf);
+	}
+	fputc('\n', stdout);
+}
+
+static void print_table(struct tt *tb, char *buf, size_t bufsz)
+{
+	struct list_head *p;
+
+	print_header(tb, buf, bufsz);
+
+	list_for_each(p, &tb->tb_lines) {
+		struct tt_line *ln = list_entry(p, struct tt_line, ln_lines);
+
+		print_line(ln, buf, bufsz);
+	}
+}
+
+static void print_tree_line(struct tt_line *ln, char *buf, size_t bufsz)
+{
+	struct list_head *p;
+
+	print_line(ln, buf, bufsz);
+
+	if (list_empty(&ln->ln_branch))
+		return;
+
+	/* print all children */
+	list_for_each(p, &ln->ln_branch) {
+		struct tt_line *chld =
+				list_entry(p, struct tt_line, ln_children);
+		print_tree_line(chld, buf, bufsz);
+	}
+}
+
+static void print_tree(struct tt *tb, char *buf, size_t bufsz)
+{
+	struct list_head *p;
+
+	print_header(tb, buf, bufsz);
+
+	list_for_each(p, &tb->tb_lines) {
+		struct tt_line *ln = list_entry(p, struct tt_line, ln_lines);
+
+		if (ln->parent)
+			continue;
+
+		print_tree_line(ln, buf, bufsz);
+	}
+}
+
+/*
+ * @tb: table
+ *
+ * Prints the table to stdout
+ */
+int tt_print_table(struct tt *tb)
+{
+	char *line;
+
+	if (!tb)
+		return -1;
+	if (!tb->termwidth) {
+		tb->termwidth = get_terminal_width();
+		if (tb->termwidth <= 0)
+			tb->termwidth = 80;
+	}
+	line = malloc(tb->termwidth);
+	if (!line)
+		return -1;
+	if (!(tb->flags & TT_FL_RAW))
+		recount_widths(tb, line, tb->termwidth);
+	if (tb->flags & TT_FL_TREE)
+		print_tree(tb, line, tb->termwidth);
+	else
+		print_table(tb, line, tb->termwidth);
+
+	free(line);
+	return 0;
+}
+
+#ifdef TEST_PROGRAM
+#include <err.h>
+#include <errno.h>
+
+enum { MYCOL_NAME, MYCOL_FOO, MYCOL_BAR, MYCOL_PATH };
+
+int main(int argc, char *argv[])
+{
+	struct tt *tb;
+	struct tt_line *ln, *pr, *root;
+	int flags = 0, notree = 0, i;
+
+	if (argc == 2 && !strcmp(argv[1], "--help")) {
+		printf("%s [--ascii | --raw | --list]\n",
+				program_invocation_short_name);
+		return EXIT_SUCCESS;
+	} else if (argc == 2 && !strcmp(argv[1], "--ascii"))
+		flags |= TT_FL_ASCII;
+	else if (argc == 2 && !strcmp(argv[1], "--raw")) {
+		flags |= TT_FL_RAW;
+		notree = 1;
+	} else if (argc == 2 && !strcmp(argv[1], "--list"))
+		notree = 1;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	tb = tt_new_table(flags);
+	if (!tb)
+		err(EXIT_FAILURE, "table initialization failed");
+
+	tt_define_column(tb, "NAME", 0.3, notree ? 0 : TT_FL_TREE);
+	tt_define_column(tb, "FOO", 0.3, TT_FL_TRUNCATE);
+	tt_define_column(tb, "BAR", 0.3, 0);
+	tt_define_column(tb, "PATH", 0.3, 0);
+
+	for (i = 0; i < 2; i++) {
+		root = ln = tt_add_line(tb, NULL);
+		tt_line_set_data(ln, MYCOL_NAME, "AAA");
+		tt_line_set_data(ln, MYCOL_FOO, "a-foo-foo");
+		tt_line_set_data(ln, MYCOL_BAR, "barBar-A");
+		tt_line_set_data(ln, MYCOL_PATH, "/mnt/AAA");
+
+		pr = ln = tt_add_line(tb, ln);
+		tt_line_set_data(ln, MYCOL_NAME, "AAA.A");
+		tt_line_set_data(ln, MYCOL_FOO, "a.a-foo-foo");
+		tt_line_set_data(ln, MYCOL_BAR, "barBar-A.A");
+		tt_line_set_data(ln, MYCOL_PATH, "/mnt/AAA/A");
+
+		ln = tt_add_line(tb, pr);
+		tt_line_set_data(ln, MYCOL_NAME, "AAA.A.AAA");
+		tt_line_set_data(ln, MYCOL_FOO, "a.a.a-foo-foo");
+		tt_line_set_data(ln, MYCOL_BAR, "barBar-A.A.A");
+		tt_line_set_data(ln, MYCOL_PATH, "/mnt/AAA/A/AAA");
+
+		ln = tt_add_line(tb, root);
+		tt_line_set_data(ln, MYCOL_NAME, "AAA.B");
+		tt_line_set_data(ln, MYCOL_FOO, "a.b-foo-foo");
+		tt_line_set_data(ln, MYCOL_BAR, "barBar-A.B");
+		tt_line_set_data(ln, MYCOL_PATH, "/mnt/AAA/B");
+
+		ln = tt_add_line(tb, pr);
+		tt_line_set_data(ln, MYCOL_NAME, "AAA.A.BBB");
+		tt_line_set_data(ln, MYCOL_FOO, "a.a.b-foo-foo");
+		tt_line_set_data(ln, MYCOL_BAR, "barBar-A.A.BBB");
+		tt_line_set_data(ln, MYCOL_PATH, "/mnt/AAA/A/BBB");
+
+		ln = tt_add_line(tb, pr);
+		tt_line_set_data(ln, MYCOL_NAME, "AAA.A.CCC");
+		tt_line_set_data(ln, MYCOL_FOO, "a.a.c-foo-foo");
+		tt_line_set_data(ln, MYCOL_BAR, "barBar-A.A.CCC");
+		tt_line_set_data(ln, MYCOL_PATH, "/mnt/AAA/A/CCC");
+
+		ln = tt_add_line(tb, root);
+		tt_line_set_data(ln, MYCOL_NAME, "AAA.C");
+		tt_line_set_data(ln, MYCOL_FOO, "a.c-foo-foo");
+		tt_line_set_data(ln, MYCOL_BAR, "barBar-A.C");
+		tt_line_set_data(ln, MYCOL_PATH, "/mnt/AAA/C");
+	}
+
+	tt_print_table(tb);
+	tt_free_table(tb);
+
+	return EXIT_SUCCESS;
+}
+#endif
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index 6e11abec..a6c50922 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -47,8 +47,8 @@ login_ldadd_common =
 chfn_SOURCES = chfn.c $(chfn_chsh_common)
 chsh_SOURCES = chsh.c $(chfn_chsh_common)
 chfn_chsh_common = islocal.c setpwnam.c islocal.h my_crypt.h setpwnam.h \
-	../lib/env.c
-login_SOURCES = login.c login.h my_crypt.h ../lib/setproctitle.c
+	$(top_srcdir)/lib/env.c
+login_SOURCES = login.c login.h my_crypt.h $(top_srcdir)/lib/setproctitle.c
 newgrp_SOURCES = newgrp.c my_crypt.h
 vipw_SOURCES = vipw.c setpwnam.h
 
diff --git a/login-utils/chfn.1 b/login-utils/chfn.1
index 9328cc82..b63ce683 100644
--- a/login-utils/chfn.1
+++ b/login-utils/chfn.1
@@ -38,6 +38,10 @@ program.  The Linux
 command will display four pieces of information that can be changed by
 .BR chfn :
 your real name, your work room and phone, and your home phone.
+
+.B chfn
+is used to change local entries only. Use ypchfn, lchfn or any other
+implementation for non-local entries.
 .SS COMMAND LINE
 Any of the four pieces of information can be specified on the command
 line.  If no information is given on the command line,
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index df8cbea8..691c4f6f 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -142,8 +142,7 @@ int main (int argc, char **argv) {
     }
 
     if (!(is_local(oldf.username))) {
-       fprintf (stderr, _("%s: can only change local entries; use yp%s instead.\n"),
-           whoami, whoami);
+       fprintf (stderr, _("%s: can only change local entries.\n"), whoami);
        exit(1);
     }
 
diff --git a/login-utils/chsh.1 b/login-utils/chsh.1
index 6e00df31..bc9bc432 100644
--- a/login-utils/chsh.1
+++ b/login-utils/chsh.1
@@ -27,6 +27,10 @@ is used to change your login shell.
 If a shell is not given on the command line,
 .B chsh
 prompts for one.
+
+.B chsh
+is used to change local entries only. Use ypchsh, lchsh or any other
+implementation for non-local entries.
 .SS VALID SHELLS
 .B chsh
 will accept the full pathname of any executable file on the system.
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 08b1e0d2..a893ef99 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -128,8 +128,7 @@ main (int argc, char *argv[]) {
     }
 
     if (!(is_local(pw->pw_name))) {
-       fprintf (stderr, _("%s: can only change local entries; use yp%s instead.\n"),
-           whoami, whoami);
+       fprintf (stderr, _("%s: can only change local entries.\n"), whoami);
        exit(1);
     }
 
diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c
index cc844c90..8cff848c 100644
--- a/login-utils/simpleinit.c
+++ b/login-utils/simpleinit.c
@@ -935,7 +935,7 @@ static void process_command (const struct command_struct *command)
 		execlp (get_path (victim->first_service->name),
 			victim->first_service->name, "stop", NULL);
 		snprintf (txt, sizeof(txt),
-			_("error stopping service: \"%s\"\n"),
+			_("error at stopping service \"%s\"\n"),
 			 victim->first_service->name);
 		err (txt);
 		_exit (SIG_NOT_STOPPED);
@@ -1067,7 +1067,7 @@ static int run_command (const char *file, const char *name, pid_t pid)
 	    for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
 	    execlp (get_path (file), service->name, "start", NULL);
 	    snprintf (txt, sizeof(txt),
-		_("error running programme: \"%s\"\n"), service->name);
+		_("error at starting service \"%s\"\n"), service->name);
 	    err (txt);
 	    _exit (SIG_FAILED);
 	    break;
diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
index 5d34a50d..a39caaf3 100644
--- a/misc-utils/.gitignore
+++ b/misc-utils/.gitignore
@@ -17,3 +17,4 @@ uuidd
 findfs
 blkid
 wipefs
+findmnt
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index ca272560..6a16f999 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -10,7 +10,7 @@ usrbin_exec_PROGRAMS = cal ddate logger look mcookie \
 	namei script whereis scriptreplay
 EXTRA_DIST += README.cal README.ddate README.namei README.namei2
 
-mcookie_SOURCES = mcookie.c ../lib/md5.c
+mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c
 script_LDADD =
 
 usrbin_exec_SCRIPTS = chkdupexe
@@ -36,12 +36,13 @@ endif
 if BUILD_LIBBLKID
 sbin_PROGRAMS += blkid findfs wipefs
 dist_man_MANS += blkid.8 findfs.8 wipefs.8
-blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c ../lib/strtosize.c
+blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \
+		$(top_srcdir)/lib/strtosize.c
 blkid_LDADD = $(ul_libblkid_la)
 blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 findfs_LDADD = $(ul_libblkid_la)
 findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
-wipefs_SOURCES = wipefs.c ../lib/strtosize.c
+wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strtosize.c
 wipefs_LDADD = $(ul_libblkid_la)
 wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 if HAVE_STATIC_BLKID
@@ -53,6 +54,14 @@ blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 endif
 endif
 
+if BUILD_LIBMOUNT
+bin_PROGRAMS += findmnt
+dist_man_MANS += findmnt.8
+findmnt_LDADD = $(ul_libmount_la)
+findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
+findmnt_SOURCES = findmnt.c $(top_srcdir)/lib/tt.c
+endif
+
 cal_SOURCES = cal.c $(top_srcdir)/lib/mbsalign.c
 if HAVE_TINFO
 cal_LDADD = -ltinfo @NCURSES_LIBS@
diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8
index d42074f0..8968bb29 100644
--- a/misc-utils/blkid.8
+++ b/misc-utils/blkid.8
@@ -33,8 +33,6 @@ blkid \- command\-line utility to locate/print block device attributes
 
 .B blkid
 .RB -p
-.RB [ \-s
-.IR tag ]
 .RB [ \-O
 .IR offset ]
 .RB [ \-S
@@ -54,8 +52,6 @@ blkid \- command\-line utility to locate/print block device attributes
 
 .B blkid
 .RB -i
-.RB [ \-s
-.IR tag ]
 .RB [ \-o
 .IR format ]
 .RB [ \-s
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 48af7674..f94df06a 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -268,11 +268,8 @@ static void print_udev_format(const char *name, const char *value, size_t sz)
 	} else if (!strcmp(name, "PART_ENTRY_NAME") ||
 		  !strcmp(name, "PART_ENTRY_TYPE")) {
 
-		blkid_safe_string(value, safe, sizeof(safe));
-		printf("ID_%s=%s\n", name, safe);
-
 		blkid_encode_string(value, enc, sizeof(enc));
-		printf("ID_%s_ENC=%s\n", name, enc);
+		printf("ID_%s=%s\n", name, enc);
 
 	} else if (!strncmp(name, "PART_ENTRY_", 11))
 		printf("ID_%s=%s\n", name, value);
diff --git a/misc-utils/cal.1 b/misc-utils/cal.1
index f11f605a..6edb7052 100644
--- a/misc-utils/cal.1
+++ b/misc-utils/cal.1
@@ -92,12 +92,6 @@ calendar for that month is a bit unusual.
 A
 .Nm
 command appeared in Version 6 AT&T UNIX.
-.Sh OTHER VERSIONS
-Several much more elaborate versions of this program exist,
-with support for colors, holidays, birthdays, reminders and
-appointments, etc. For example, try the cal from
-http://home.sprynet.com/~cbagwell/projects.html
-or GNU gcal.
 .Sh AVAILABILITY
 The cal command is part of the util-linux-ng package and is available from
 ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
new file mode 100644
index 00000000..e1cb8ff2
--- /dev/null
+++ b/misc-utils/findmnt.8
@@ -0,0 +1,150 @@
+.\" -*- nroff -*-
+.TH FINDMNT 8 "Apr 2010" "Version 1.0"
+.SH NAME
+findmnt \- find a filesystem
+.SH SYNOPSIS
+.B findmnt
+.RB [ options ]
+.sp
+.B findmnt
+.RB [ options ]
+.IR device | mountpoint
+.sp
+.B findmnt
+.RB [ options ]
+.RB [ \--source ]
+.IR device
+.RB [ \--target ]
+.IR mountpoint
+.SH DESCRIPTION
+.B findmnt
+will list all mounted filesytems or search for a filesystem.  The
+.B findmnt
+command is able to search in
+.IR /etc/fstab ,
+.IR /etc/mtab
+or
+.IR /proc/self/mountinfo .
+If
+.IR device
+or
+.IR mountpoint
+is not given, all filesystems are shown.
+.PP
+The command prints all mounted filesystems in the tree-like format by default.
+.SH OPTIONS
+.IP "\fB\-h, \-\-help\fP"
+Print help and exit.
+.IP "\fB\-s, \-\-fstab\fP"
+Search in
+.IR /etc/fstab .
+The output is in the list format (see --list).
+.IP "\fB\-m, \-\-mtab\fP"
+Search in
+.IR /etc/mtab .
+The output is in the list format (see --list).
+.IP "\fB\-k, \-\-kernel\fP"
+Search in
+.IR /proc/self/mountinfo .
+The output is in the tree-like format.  This is the default.
+.IP "\fB\-c, \-\-canonicalize\fP"
+Canonicalize all printed paths.
+.IP "\fB\-d, \-\-direction \fIword\fP"
+The search direction -
+.IR forward
+or
+.IR backward .
+.IP "\fB\-e, \-\-evaluate\fP"
+Convert all tags (LABEL or UUID) to the device names.
+.IP "\fB\-f, \-\-first-only\fP"
+Print the first matching filesystem only.
+.IP "\fB\-i, \-\-invert\fP"
+Invert the sense of matching.
+.IP "\fB\-l, \-\-list\fP"
+Use the list output format.
+.IP "\fB\-n, \-\-noheadings\fP"
+Do not print a header line.
+.IP "\fB\-u, \-\-notruncate\fP"
+Do not truncate text in columns.  The default is to not truncate the
+.BR TARGET ,
+.BR SOURCE ,
+.BR UUID
+and
+.BR LABEL
+columns.  This option disables text truncation also in all other columns.
+.IP "\fB\-O, \-\-options \fIlist\fP"
+Used to limit the set of printed filesystems.  More than one option
+may be specified in a comma-separated list.  The
+.B \-t
+and
+.B \-O
+options are cumulative in effect.  It is different from
+.B \-t
+in that each option is matched exactly; a leading
+.I no
+at the beginning
+of one option does not negate the rest.  For more details see
+.BR mount (8).
+.IP "\fB\-o, \-\-output \fIlist\fP"
+Define output columns.  Currently supported are
+.BR SOURCE ,
+.BR TARGET ,
+.BR FSTYPE ,
+.BR OPTIONS ,
+.BR VFS-OPTIONS ,
+.BR FS-OPTIONS ,
+.BR LABEL
+and
+.BR UUID .
+The
+.BR TARGET
+column contains tree formatting if the
+.B \-\-list
+or
+.B \-\-raw
+options are not specified.
+.IP "\fB\-r, \-\-raw\fP"
+Use raw output format.
+.IP "\fB\-a, \-\-ascii\fP"
+Use ascii characters for tree formatting.
+.IP "\fB\-t, \-\-types \fIlist\fP"
+Used to limit the set of printed filesystems.  More than one type may be
+specified in a comma-separated list.  The list of filesystem types can be
+prefixed with
+.I no
+to specify the filesystem types on which no action should be taken.  For
+more details see
+.BR mount (8).
+.IP "\fB\-S, \-\-source \fIspec\fP"
+Explicitly define the mount source.  Supported are device, LABEL= or UUID=.
+.IP "\fB\-T, \-\-target \fIdir\fP"
+Explicitly define the mount target (mountpoint directory).
+.SH EXAMPLES
+.IP "\fBfindmnt \-\-fstab \-t nfs\fP"
+Prints all nfs filesystems defined in
+.IR /etc/fstab .
+.IP "\fBfindmnt \-\-fstab /mnt/foo\fP"
+Prints all
+.IR /etc/fstab
+filesystems where the mountpoint directory is /mnt/foo.  It also prints bind mounts where /mnt/foo
+is a source.
+.IP "\fBfindmnt \-\-fstab --target /mnt/foo\fP"
+Prints all
+.IR /etc/fstab
+filesystems where the mountpoint directory is /mnt/foo.
+.IP "\fBfindmnt --fstab --evaluate\fP"
+Prints all
+.IR /etc/fstab
+filesystems and converts LABEL= and UUID= tags to the real device names.
+.IP "\fBfindmnt -n --raw --evaluate --output=target LABEL=/boot
+Prints only the mountpoint where the filesystem with label "/boot" is mounted.
+.SH AUTHORS
+.nf
+Karel Zak <kzak@redhat.com>
+.fi
+.SH SEE ALSO
+.BR mount (8),
+.BR fstab (5)
+.SH AVAILABILITY
+The findmnt command is part of the util-linux-ng package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
new file mode 100644
index 00000000..4138480f
--- /dev/null
+++ b/misc-utils/findmnt.c
@@ -0,0 +1,740 @@
+/*
+ * findmnt(8)
+ *
+ * Copyright (C) 2010 Red Hat, Inc. All rights reserved.
+ * Written by Karel Zak <kzak@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it would 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
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <err.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+#include <termios.h>
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#include <assert.h>
+
+#define USE_UNSTABLE_LIBMOUNT_API
+#include <mount.h>
+
+#include "pathnames.h"
+#include "nls.h"
+#include "c.h"
+#include "tt.h"
+
+/* flags */
+enum {
+	FL_EVALUATE	= (1 << 1),
+	FL_CANONICALIZE = (1 << 2),
+	FL_FIRSTONLY	= (1 << 3),
+	FL_INVERT	= (1 << 4),
+	FL_NOSWAPMATCH	= (1 << 6),
+};
+
+/* column IDs */
+enum {
+	COL_SOURCE,
+	COL_TARGET,
+	COL_FSTYPE,
+	COL_OPTIONS,
+	COL_VFS_OPTIONS,
+	COL_FS_OPTIONS,
+	COL_LABEL,
+	COL_UUID,
+
+	__NCOLUMNS
+};
+
+/* column names */
+struct colinfo {
+	const char	*name;		/* header */
+	double		whint;		/* width hint (N < 1 is in percent of termwidth) */
+	int		truncate;	/* boolean */
+	const char	*match;		/* pattern for match_func() */
+};
+
+/* columns descriptions */
+struct colinfo infos[__NCOLUMNS] = {
+	[COL_SOURCE]  = { "SOURCE",     0.25, FALSE },
+	[COL_TARGET]  = { "TARGET",     0.30, FALSE },
+	[COL_FSTYPE]  = { "FSTYPE",     0.10, TRUE },
+	[COL_OPTIONS] = { "OPTIONS",    0.10, TRUE },
+	[COL_VFS_OPTIONS] = { "VFS-OPTIONS", 0.20, TRUE },
+	[COL_FS_OPTIONS] = { "FS-OPTIONS", 0.10, TRUE },
+	[COL_LABEL]   = { "LABEL",      0.10, FALSE },
+	[COL_UUID]    = { "UUID",         36, FALSE },
+};
+
+/* global flags */
+int flags;
+
+/* array with IDs of enabled columns */
+int columns[__NCOLUMNS];
+int ncolumns;
+
+/* libmount cache */
+mnt_cache *cache;
+
+static int get_column_id(int num)
+{
+	assert(num < ncolumns);
+	assert(columns[num] < __NCOLUMNS);
+	return columns[num];
+}
+
+static struct colinfo *get_column_info(int num)
+{
+	return &infos[ get_column_id(num) ];
+}
+
+static const char *column_id_to_name(int id)
+{
+	assert(id < __NCOLUMNS);
+	return infos[id].name;
+}
+
+static const char *get_column_name(int num)
+{
+	return get_column_info(num)->name;
+}
+
+static float get_column_whint(int num)
+{
+	return get_column_info(num)->whint;
+}
+
+static int get_column_truncate(int num)
+{
+	return get_column_info(num)->truncate;
+}
+
+static const char *get_match(int id)
+{
+	assert(id < __NCOLUMNS);
+	return infos[id].match;
+}
+
+static void set_match(int id, const char *match)
+{
+	assert(id < __NCOLUMNS);
+	infos[id].match = match;
+}
+
+/*
+ * "findmnt" without any filter
+ */
+static int is_listall_mode(void)
+{
+	return (!get_match(COL_SOURCE) &&
+		!get_match(COL_TARGET) &&
+		!get_match(COL_FSTYPE) &&
+		!get_match(COL_OPTIONS));
+}
+
+/*
+ * findmnt --first-only <devname|TAG=|mountpoint>
+ *
+ * ... it works like "mount <devname|TAG=|mountpoint>"
+ */
+static int is_mount_compatible_mode(void)
+{
+	if (!get_match(COL_SOURCE))
+	       return 0;		/* <devname|TAG=|mountpoint> is required */
+	if (get_match(COL_FSTYPE) || get_match(COL_OPTIONS))
+		return 0;		/* cannot be restricted by -t or -O */
+	if (!(flags & FL_FIRSTONLY))
+		return 0;		/* we have to return the first entry only */
+
+	return 1;			/* ok */
+}
+
+static void set_all_columns_truncate(int set)
+{
+	int i;
+
+	for (i = 0; i < __NCOLUMNS; i++)
+		infos[i].truncate = set;
+}
+
+/*
+ * converts @name to column ID
+ */
+static int column_name_to_id(const char *name, size_t namesz)
+{
+	int i;
+
+	for (i = 0; i < __NCOLUMNS; i++) {
+		const char *cn = column_id_to_name(i);
+
+		if (!strncasecmp(name, cn, namesz) && !*(cn + namesz))
+			return i;
+	}
+	warnx(_("unknown column: %s"), name);
+	return -1;
+}
+
+/*
+ * parses list of columns from @str and add IDs to columns[]
+ */
+static int set_columns(const char *str)
+{
+	const char *begin = NULL, *p;
+
+	ncolumns = 0;
+
+	if (!str || !*str)
+		return -1;
+
+	ncolumns = 0;
+
+	for (p = str; p && *p; p++) {
+		const char *end = NULL;
+		int id;
+
+		if (!begin)
+			begin = p;		/* begin of the column name */
+		if (*p == ',')
+			end = p;		/* terminate the name */
+		if (*(p + 1) == '\0')
+			end = p + 1;		/* end of string */
+		if (!begin || !end)
+			continue;
+		if (end <= begin)
+			return -1;
+
+		id = column_name_to_id(begin, end - begin);
+		if (id == -1)
+			return -1;
+		columns[ ncolumns++ ] = id;
+		begin = NULL;
+		if (end && !*end)
+			break;
+	}
+	return 0;
+}
+
+/* Returns LABEL or UUID */
+static const char *get_tag(mnt_fs *fs, const char *tagname)
+{
+	const char *t, *v, *res;
+
+	if (!mnt_fs_get_tag(fs, &t, &v) && !strcmp(t, tagname))
+		res = v;
+	else {
+		res = mnt_fs_get_source(fs);
+		if (res)
+			res = mnt_resolve_spec(res, cache);
+		if (res)
+			res = mnt_cache_find_tag_value(cache, res, tagname);
+	}
+
+	return res;
+}
+
+/* reads FS data from libmount */
+static const char *get_data(mnt_fs *fs, int num)
+{
+	const char *str = NULL;
+
+	switch(get_column_id(num)) {
+	case COL_SOURCE:
+		/* dir or dev */
+		str = mnt_fs_get_srcpath(fs);
+
+		if (str && (flags & FL_CANONICALIZE))
+			str = mnt_resolve_path(str, cache);
+		if (!str) {
+			str = mnt_fs_get_source(fs);
+
+			if (str && (flags & FL_EVALUATE))
+				str = mnt_resolve_spec(str, cache);
+		}
+		break;
+	case COL_TARGET:
+		str = mnt_fs_get_target(fs);
+		break;
+	case COL_FSTYPE:
+		str = mnt_fs_get_fstype(fs);
+		break;
+	case COL_OPTIONS:
+		str = mnt_fs_get_optstr(fs);
+		break;
+	case COL_VFS_OPTIONS:
+		str = mnt_fs_get_vfs_optstr(fs);
+		break;
+	case COL_FS_OPTIONS:
+		str = mnt_fs_get_fs_optstr(fs);
+		break;
+	case COL_UUID:
+		str = get_tag(fs, "UUID");
+		break;
+	case COL_LABEL:
+		str = get_tag(fs, "LABEL");
+		break;
+	default:
+		break;
+	}
+	return str;
+}
+
+/* adds one line to the output @tab */
+static struct tt_line *add_line(struct tt *tt, mnt_fs *fs,
+					struct tt_line *parent)
+{
+	int i;
+	struct tt_line *line = tt_add_line(tt, parent);
+
+	if (!line) {
+		warn(_("failed to add line to output"));
+		return NULL;
+	}
+	for (i = 0; i < ncolumns; i++)
+		tt_line_set_data(line, i, get_data(fs, i));
+
+	return line;
+}
+
+/* reads filesystems from @tb (libmount) and fillin @tab (output table) */
+static int create_treenode(struct tt *tt, mnt_tab *tb,
+				mnt_fs *fs, struct tt_line *parent_line)
+{
+	mnt_fs *chld = NULL;
+	mnt_iter *itr = NULL;
+	struct tt_line *line;
+	int rc = -1;
+
+	if (!fs) {
+		/* first call, get root FS */
+		if (mnt_tab_get_root_fs(tb, &fs))
+			goto leave;
+		parent_line = NULL;
+	}
+
+	itr = mnt_new_iter(MNT_ITER_FORWARD);
+	if (!itr)
+		goto leave;
+
+	line = add_line(tt, fs, parent_line);
+	if (!line)
+		goto leave;
+
+	/*
+	 * add all children to the output table
+	 */
+	while(mnt_tab_next_child_fs(tb, itr, fs, &chld) == 0) {
+		if (create_treenode(tt, tb, chld, line))
+			goto leave;
+	}
+	rc = 0;
+leave:
+	mnt_free_iter(itr);
+	return rc;
+}
+
+/* calls libmount fstab/mtab/mountinfo parser */
+static mnt_tab *parse_tabfile(const char *path)
+{
+	mnt_tab *tb = mnt_new_tab(path);
+	if (!tb) {
+		warn(_("failed to initialize libmount tab"));
+		return NULL;
+	}
+	if (mnt_tab_parse_file(tb) != 0) {
+		mnt_free_tab(tb);
+		warn(_("can't read: %s"), path);
+		return NULL;
+	}
+	if (mnt_tab_get_nerrs(tb)) {
+		char buf[BUFSIZ];
+		mnt_tab_strerror(tb, buf, sizeof(buf));
+		warnx(_("%s: parse error: %s"), path, buf);
+	}
+
+	return tb;
+}
+
+/* filter function for libmount (mnt_tab_find_next_fs()) */
+static int match_func(mnt_fs *fs, void *data)
+{
+	int rc = flags & FL_INVERT ? 1 : 0;
+	const char *m;
+
+	m = get_match(COL_TARGET);
+	if (m && !mnt_fs_match_target(fs, m, cache))
+		return rc;
+
+	m = get_match(COL_SOURCE);
+	if (m && !mnt_fs_match_source(fs, m, cache))
+		return rc;
+
+	m = get_match(COL_FSTYPE);
+	if (m && !mnt_fs_match_fstype(fs, m))
+		return rc;
+
+	m = get_match(COL_OPTIONS);
+	if (m && !mnt_fs_match_options(fs, m))
+		return rc;
+
+	return !rc;
+}
+
+/* iterate over filesystems in @tb */
+static mnt_fs *get_next_fs(mnt_tab *tb, mnt_iter *itr)
+{
+	mnt_fs *fs = NULL;
+
+	if (is_listall_mode()) {
+		/*
+		 * Print whole file
+		 */
+		mnt_tab_next_fs(tb, itr, &fs);
+
+	} else if (is_mount_compatible_mode()) {
+		/*
+		 * Look up for FS in the same way how mount(8) searchs in fstab
+		 *
+		 *   findmnt -f <spec>
+		 */
+		fs = mnt_tab_find_source(tb, get_match(COL_SOURCE),
+					mnt_iter_get_direction(itr));
+		if (!fs)
+			fs = mnt_tab_find_target(tb, get_match(COL_SOURCE),
+					mnt_iter_get_direction(itr));
+	} else {
+		/*
+		 * Look up for all matching entries
+		 *
+		 *    findmnt [-l] <source> <target> [-O <options>] [-t <types>]
+		 *    findmnt [-l] <spec> [-O <options>] [-t <types>]
+		 */
+again:
+		mnt_tab_find_next_fs(tb, itr, match_func,  NULL, &fs);
+
+		if (!fs &&
+		    !(flags & FL_NOSWAPMATCH) &&
+		    !get_match(COL_TARGET) && get_match(COL_SOURCE)) {
+
+			/* swap 'spec' and target. */
+			set_match(COL_TARGET, get_match(COL_SOURCE));
+			set_match(COL_SOURCE, NULL);
+			mnt_reset_iter(itr, -1);
+
+			goto again;
+		}
+	}
+
+	return fs;
+}
+
+static int __attribute__((__noreturn__)) usage(FILE *out)
+{
+	fprintf(out, _(
+	"\nUsage:\n"
+	" %1$s [options]\n"
+	" %1$s [options] <device> | <mountpoint>\n"
+	" %1$s [options] <device> <mountpoint>\n"
+	" %1$s [options] [--source <device>] [--target <mountpoint>]\n"),
+		program_invocation_short_name);
+
+	fprintf(out, _(
+	"\nOptions:\n"
+	" -s, --fstab            search in static table of filesystems\n"
+	" -m, --mtab             search in table of mounted filesystems\n"
+	" -k, --kernel           search in kernel table of mounted \n"
+        "                        filesystems (default)\n\n"
+
+	" -c, --canonicalize     canonicalize printed paths\n"
+	" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+	" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+        " -f, --first-only       print the first found filesystem only\n"
+	" -h, --help             print this help\n"
+	" -i, --invert           invert sense of matching\n"
+	" -l, --list             use list format ouput\n"
+	" -n, --noheadings       don't print headings\n"
+	" -u, --notruncate       don't truncate text in columns\n"
+	" -O, --options <list>   limit the set of filesystems by mount options\n"
+	" -o, --output <list>    output columns\n"
+	" -r, --raw              use raw format output\n"
+	" -a, --ascii            use ascii chars for tree formatting\n"
+	" -t, --types <list>     limit the set of filesystem by FS types\n"
+	" -S, --source <string>  device, LABEL= or UUID=device\n"
+	" -T, --target <string>  mountpoint\n\n"));
+
+	fprintf(out, _("\nFor more information see findmnt(1).\n"));
+
+	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
+static int __attribute__((__noreturn__))
+errx_mutually_exclusive(const char *opts)
+{
+	errx(EXIT_FAILURE, "%s %s", opts, _("options are mutually exclusive"));
+}
+
+int main(int argc, char *argv[])
+{
+	/* libmount */
+	mnt_tab *tb = NULL;
+	mnt_iter *itr = NULL;
+	mnt_fs *fs = NULL;
+	char *tabfile = NULL;
+	int direction = MNT_ITER_FORWARD;
+
+	/* table.h */
+	struct tt *tt = NULL;
+	int tt_flags = 0;
+
+	int i, c, rc = EXIT_FAILURE;
+
+	struct option longopts[] = {
+	    { "ascii",        0, 0, 'a' },
+	    { "canonicalize", 0, 0, 'c' },
+	    { "direction",    1, 0, 'd' },
+	    { "evaluate",     0, 0, 'e' },
+	    { "first-only",   0, 0, 'f' },
+	    { "fstab",        0, 0, 's' },
+	    { "help",         0, 0, 'h' },
+	    { "invert",       0, 0, 'i' },
+	    { "kernel",       0, 0, 'k' },
+	    { "list",         0, 0, 'l' },
+	    { "mtab",         0, 0, 'm' },
+	    { "noheadings",   0, 0, 'n' },
+	    { "notruncate",   0, 0, 'u' },
+	    { "options",      1, 0, 'O' },
+	    { "output",       1, 0, 'o' },
+	    { "raw",          0, 0, 'r' },
+	    { "types",        1, 0, 't' },
+	    { "source",       1, 0, 'S' },
+	    { "target",       1, 0, 'T' },
+
+	    { NULL,           0, 0, 0 }
+	};
+
+	assert(ARRAY_SIZE(columns) == __NCOLUMNS);
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	/* default enabled columns */
+	columns[ncolumns++] = COL_TARGET;
+	columns[ncolumns++] = COL_SOURCE;
+	columns[ncolumns++] = COL_FSTYPE;
+	columns[ncolumns++] = COL_OPTIONS;
+
+	/* default output format */
+	tt_flags |= TT_FL_TREE;
+
+	while ((c = getopt_long(argc, argv,
+				"cd:ehifo:O:klmnrst:uS:T:", longopts, NULL)) != -1) {
+		switch(c) {
+		case 'a':
+			tt_flags |= TT_FL_ASCII;
+			break;
+		case 'c':
+			flags |= FL_CANONICALIZE;
+			break;
+		case 'd':
+			if (!strcmp(optarg, "forward"))
+				direction = MNT_ITER_FORWARD;
+			else if (!strcmp(optarg, "backward"))
+				direction = MNT_ITER_BACKWARD;
+			else
+				errx(EXIT_FAILURE,
+					_("unknown direction '%s'"), optarg);
+			break;
+		case 'e':
+			flags |= FL_EVALUATE;
+			break;
+		case 'h':
+			usage(stdout);
+			break;
+		case 'i':
+			flags |= FL_INVERT;
+			break;
+		case 'f':
+			flags |= FL_FIRSTONLY;
+			break;
+		case 'u':
+			set_all_columns_truncate(FALSE);
+			break;
+		case 'o':
+			if (set_columns(optarg))
+				exit(EXIT_FAILURE);
+			break;
+		case 'O':
+			set_match(COL_OPTIONS, optarg);
+			break;
+		case 'm':		/* mtab */
+			if (tabfile)
+				errx_mutually_exclusive("--{fstab,mtab,kernel}");
+			tabfile = _PATH_MOUNTED;
+			tt_flags &= ~TT_FL_TREE;
+			break;
+		case 's':		/* fstab */
+			if (tabfile)
+				errx_mutually_exclusive("--{fstab,mtab,kernel}");
+			tabfile = _PATH_MNTTAB;
+			tt_flags &= ~TT_FL_TREE;
+			break;
+		case 'k':		/* kernel (mountinfo) */
+			if (tabfile)
+				 errx_mutually_exclusive("--{fstab,mtab,kernel}");
+			tabfile = _PATH_PROC_MOUNTINFO;
+			break;
+		case 't':
+			set_match(COL_FSTYPE, optarg);
+			break;
+		case 'r':
+			tt_flags &= ~TT_FL_TREE;	/* disable the default */
+			tt_flags |= TT_FL_RAW;		/* enable raw */
+			break;
+		case 'l':
+			if (tt_flags & TT_FL_RAW)
+				errx_mutually_exclusive("--{raw,list}");
+
+			tt_flags &= ~TT_FL_TREE; /* disable the default */
+			break;
+		case 'n':
+			tt_flags |= TT_FL_NOHEADINGS;
+			break;
+		case 'S':
+			set_match(COL_SOURCE, optarg);
+			flags |= FL_NOSWAPMATCH;
+			break;
+		case 'T':
+			set_match(COL_TARGET, optarg);
+			flags |= FL_NOSWAPMATCH;
+			break;
+		default:
+			usage(stderr);
+			break;
+		}
+	}
+
+	if (!tabfile) {
+		tabfile = _PATH_PROC_MOUNTINFO;
+
+		if (access(tabfile, R_OK)) {		/* old kernel? */
+			tabfile = _PATH_PROC_MOUNTS;
+			tt_flags &= ~TT_FL_TREE;
+		}
+	}
+	if (optind < argc && (get_match(COL_SOURCE) || get_match(COL_TARGET)))
+		errx(EXIT_FAILURE, _(
+			"options --target and --source can't be used together "
+			"with command line element that is not an option"));
+
+	if (optind < argc)
+		set_match(COL_SOURCE, argv[optind++]);	/* dev/tag/mountpoint */
+	if (optind < argc)
+		set_match(COL_TARGET, argv[optind++]);	/* mountpoint */
+
+	if (!is_listall_mode() || (flags & FL_FIRSTONLY))
+		tt_flags &= ~TT_FL_TREE;
+
+	if (!(flags & FL_NOSWAPMATCH) &&
+	    !get_match(COL_TARGET) && get_match(COL_SOURCE)) {
+		/*
+		 * Check if we can swap source and target, it's
+		 * not possible if the source is LABEL=/UUID=
+		 */
+		const char *x = get_match(COL_SOURCE);
+
+		if (!strncmp(x, "LABEL=", 6) || !strncmp(x, "UUID=", 5))
+			flags |= FL_NOSWAPMATCH;
+	}
+
+	/*
+	 * initialize libmount
+	 */
+	mnt_init_debug(0);
+
+	tb = parse_tabfile(tabfile);
+	if (!tb)
+		goto leave;
+
+	itr = mnt_new_iter(direction);
+	if (!itr) {
+		warn(_("failed to initialize libmount iterator"));
+		goto leave;
+	}
+
+	cache = mnt_new_cache();
+	if (!cache) {
+		warn(_("failed to initialize libmount cache"));
+		goto leave;
+	}
+	mnt_tab_set_cache(tb, cache);
+
+	/*
+	 * initialize output formatting (tt.h)
+	 */
+	tt = tt_new_table(tt_flags);
+	if (!tt) {
+		warn(_("failed to initialize output table"));
+		goto leave;
+	}
+
+	for (i = 0; i < ncolumns; i++) {
+		int fl = get_column_truncate(i) ? TT_FL_TRUNCATE : 0;
+
+		if (get_column_id(i) == COL_TARGET && (tt_flags & TT_FL_TREE))
+			fl |= TT_FL_TREE;
+
+		if (!tt_define_column(tt, get_column_name(i),
+					get_column_whint(i), fl)) {
+			warn(_("failed to initialize output column"));
+			goto leave;
+		}
+	}
+
+	/*
+	 * Fill in data to the output table
+	 */
+	if (tt_flags & TT_FL_TREE) {
+		if (create_treenode(tt, tb, NULL, NULL))
+			goto leave;
+	} else {
+		while((fs = get_next_fs(tb, itr))) {
+			if (!add_line(tt, fs, NULL))
+				goto leave;
+			if (flags & FL_FIRSTONLY)
+				break;
+		}
+	}
+
+	/*
+	 * Print the output table
+	 */
+	tt_print_table(tt);
+	rc = EXIT_SUCCESS;
+leave:
+	tt_free_table(tt);
+
+	mnt_free_tab(tb);
+	mnt_free_cache(cache);
+	mnt_free_iter(itr);
+
+	return rc;
+}
diff --git a/misc-utils/look.c b/misc-utils/look.c
index 9e255965..54fbb918 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -186,6 +186,9 @@ look(char *front, char *back)
 
 	if (front)
 		print_from(front, back);
+
+	free(comparbuf);
+
 	return (front ? 0 : 1);
 }
 
diff --git a/misc-utils/namei.1 b/misc-utils/namei.1
index a54fa8ac..fc10781b 100644
--- a/misc-utils/namei.1
+++ b/misc-utils/namei.1
@@ -9,26 +9,26 @@ namei - follow a pathname until a terminal point is found
 .RI [ options ]
 .IR  pathname ...
 .SH DESCRIPTION
-.B Namei
+.B namei
 uses its arguments as pathnames to any type
 of Unix file (symlinks, files, directories, and so forth).
-.B Namei
-then follows each pathname until a terminal
-point is found (a file, directory, char device, etc).
-If it finds a symbolic link, we show the link, and start
+.B namei
+then follows each pathname until an endpoint
+is found (a file, a directory, a device node, etc).
+If it finds a symbolic link, it shows the link, and starts
 following it, indenting the output to show the context.
 .PP
-This program is useful for finding a "too many levels of
+This program is useful for finding "too many levels of
 symbolic links" problems.
 .PP
-For each line output,
+For each line of output,
 .B namei
-outputs a the following characters to identify the file types found:
+uses the following characters to identify the file type found:
 .LP
 .nf
-   f: = the pathname we are currently trying to resolve
+   f: = the pathname currently being resolved
     d = directory
-    l = symbolic link (both the link and it's contents are output)
+    l = symbolic link (both the link and its contents are output)
     s = socket
     b = block device
     c = character device
@@ -37,12 +37,12 @@ outputs a the following characters to identify the file types found:
     ? = an error of some kind
 .fi
 .PP
-.B Namei
+.B namei
 prints an informative message when
 the maximum number of symbolic links this system can have has been exceeded.
 .SH OPTIONS
 .IP "\fB\-l, \-\-long\fP"
-Use a long listing format (same as -m -o -v).
+Use the long listing format (same as -m -o -v).
 .IP "\fB\-m, \-\-modes\fP"
 Show the mode bits of each file type in the style of ls(1),
 for example 'rwxr-xr-x'.
@@ -51,9 +51,9 @@ Show owner and group name of each file.
 .IP "\fB\-n, \-\-nosymlinks\fP"
 Don't follow symlinks.
 .IP "\fB\-v, \-\-vertical\fP"
-Vertical align of modes and owners.
+Vertically align the modes and owners.
 .IP "\fB\-x, \-\-mountpoints\fP"
-Show mount point directories with a 'D', rather than a 'd'.
+Show mountpoint directories with a 'D' rather than a 'd'.
 .SH AUTHOR
 The original
 .B namei
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index 3c465e43..6853e1ec 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -325,6 +325,9 @@ add_namei(struct namei *parent, const char *orgpath, int start, struct namei **l
 
 	if (last)
 		*last = nm;
+
+	free(path);
+
 	return first;
 }
 
diff --git a/misc-utils/script.c b/misc-utils/script.c
index 2028db66..9367fafb 100644
--- a/misc-utils/script.c
+++ b/misc-utils/script.c
@@ -59,7 +59,7 @@
 
 #include "nls.h"
 
-#ifdef HAVE_LIBUTIL
+#if HAVE_LIBUTIL && HAVE_PTY_H
 #include <pty.h>
 #endif
 
@@ -91,7 +91,7 @@ struct	termios tt;
 struct	winsize win;
 int	lb;
 int	l;
-#ifndef HAVE_LIBUTIL
+#if !HAVE_LIBUTIL || !HAVE_PTY_H
 char	line[] = "/dev/ptyXX";
 #endif
 int	aflg = 0;
@@ -467,7 +467,7 @@ done() {
 
 void
 getmaster() {
-#ifdef HAVE_LIBUTIL
+#if HAVE_LIBUTIL && HAVE_PTY_H
 	(void) tcgetattr(0, &tt);
 	(void) ioctl(0, TIOCGWINSZ, (char *)&win);
 	if (openpty(&master, &slave, NULL, &tt, &win) < 0) {
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index 33e650fe..adb8028f 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -27,9 +27,9 @@ uuidd \- UUID generation daemon
 The
 .B uuidd
 daemon is used by the UUID library to generate
-universally unique identifiers (UUIDs), especially time-based UUID's
+universally unique identifiers (UUIDs), especially time-based UUIDs,
 in a secure and guaranteed-unique fashion, even in the face of large
-numbers of threads trying to grab UUID's running on different CPU's.
+numbers of threads running on different CPUs trying to grab UUIDs.
 .SH OPTIONS
 .TP
 .B \-d
@@ -38,13 +38,13 @@ Run
 in debugging mode.  This prevents uuidd from running as a daemon.
 .TP
 .B \-k
-If a currently uuidd daemon is running, kill it.
+If currently a uuidd daemon is running, kill it.
 .TP
 .BI \-n " number"
 When issuing a test request to a running uuidd, request a bulk response
 of
 .I number
-UUID's.
+UUIDs.
 .TP
 .BI \-p  " pidfile"
 Specify the pathname where the pid file should be written.  By default,
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 74bab693..716a5824 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -241,7 +241,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 	fd_pidfile = open(pidfile_path, O_CREAT | O_RDWR, 0664);
 	if (fd_pidfile < 0) {
 		if (!quiet)
-			fprintf(stderr, "Failed to open/create %s: %s\n",
+			fprintf(stderr, _("Failed to open/create %s: %s\n"),
 				pidfile_path, strerror(errno));
 		exit(1);
 	}
@@ -258,7 +258,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 		if ((errno == EAGAIN) || (errno == EINTR))
 			continue;
 		if (!quiet)
-			fprintf(stderr, "Failed to lock %s: %s\n",
+			fprintf(stderr, _("Failed to lock %s: %s\n"),
 				pidfile_path, strerror(errno));
 		exit(1);
 	}
@@ -359,7 +359,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 				printf(_("operation %d, incoming num = %d\n"),
 				       op, num);
 		} else if (debug)
-			printf("operation %d\n", op);
+			printf(_("operation %d\n"), op);
 
 		switch(op) {
 		case UUIDD_OP_GETPID:
@@ -412,7 +412,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
 			uuid__generate_random((unsigned char *) reply_buf +
 					      sizeof(num), &num);
 			if (debug) {
-				printf(_("Generated %d UUID's:\n"), num);
+				printf(_("Generated %d UUIDs:\n"), num);
 				for (i=0, cp=reply_buf+sizeof(num);
 				     i < num; i++, cp+=16) {
 					uuid_unparse((unsigned char *)cp, str);
@@ -531,9 +531,9 @@ int main(int argc, char **argv)
 
 			uuid_unparse((unsigned char *) buf, str);
 
-			printf(_("%s and subsequent %d UUID's\n"), str, num);
+			printf(_("%s and subsequent %d UUIDs\n"), str, num);
 		} else {
-			printf(_("List of UUID's:\n"));
+			printf(_("List of UUIDs:\n"));
 			cp = buf + 4;
 			if (ret != (int) (sizeof(num) + num*sizeof(uu)))
 				goto unexpected_size;
diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1
index 18e33de7..32c98f1d 100644
--- a/misc-utils/uuidgen.1
+++ b/misc-utils/uuidgen.1
@@ -22,9 +22,9 @@ all UUIDs created on the local system,
 and among UUIDs created on other systems in the past
 and in the future.
 .PP
-There are two types of UUID's which
+There are two types of UUIDs which
 .B uuidgen
-can generate: time-based UUID's and random-based UUID's.  By
+can generate: time-based UUIDs and random-based UUIDs.  By
 default
 .B uuidgen
 will generate a random-based UUID if a high-quality random number
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 4d850501..c0b29f0e 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -174,7 +174,7 @@ get_offset_from_probe(struct wipe_desc *wp, blkid_probe pr, int zap)
 		wp->usage = xstrdup(usage);
 		wp->type = xstrdup(type);
 
-		wp->magic = xmalloc(wp->len);
+		wp->magic = xmalloc(len);
 		memcpy(wp->magic, mag, len);
 		wp->len = len;
 
@@ -256,8 +256,8 @@ do_wipe_offset(int fd, struct wipe_desc *wp, const char *fname, int noact)
 	size_t len;
 
 	if (!wp->type) {
-		warnx(_("can't found a magic string at offset "
-				"0x%jx - ignore."), wp->offset);
+		warnx(_("no magic string found at offset "
+			"0x%jx -- ignored"), wp->offset);
 		return 0;
 	}
 
@@ -303,13 +303,30 @@ do_wipe(struct wipe_desc *wp, const char *fname, int noact)
 	return 0;
 }
 
+static void
+free_wipe(struct wipe_desc *wp)
+{
+	while (wp) {
+		struct wipe_desc *next = wp->next;
+
+		free(wp->usage);
+		free(wp->type);
+		free(wp->magic);
+		free(wp->label);
+		free(wp->uuid);
+		free(wp);
+
+		wp = next;
+	}
+}
+
 static loff_t
 strtoll_offset(const char *str)
 {
 	uintmax_t sz;
 
 	if (strtosize(str, &sz))
-		errx(EXIT_FAILURE, _("invalid offset '%s' value specified"), str);
+		errx(EXIT_FAILURE, _("invalid offset value '%s' specified"), str);
 	return sz;
 }
 
@@ -322,8 +339,8 @@ usage(FILE *out)
 
 	fprintf(out, _(
 	" -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-	" -h, --help          this help\n"
-	" -n, --no-act        everything to be done except for the write() call\n"
+	" -h, --help          show this help text\n"
+	" -n, --no-act        do everything except the actual write() call\n"
 	" -o, --offset <num>  offset to erase, in bytes\n"
 	" -p, --parsable      print out in parsable instead of printable format\n"));
 
@@ -391,6 +408,8 @@ main(int argc, char **argv)
 			do_wipe(wp, fname, noact);
 		else
 			print_all(wp, mode);
+
+		free_wipe(wp);
 	}
 	return EXIT_SUCCESS;
 }
diff --git a/mount/Makefile.am b/mount/Makefile.am
index 1fbdfe82..5ff4fc9e 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon
 dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
 
 # generic sources for all programs (mount, umount, losetup)
-srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h rmd160.c
+srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c
 
 # generic header for mount and umount
 hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
@@ -15,8 +15,9 @@ hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
 
 # generic sources for mount and umount
 srcs_mount = fstab.c mount_mntent.c getusername.c lomount.c devname.c devname.h \
-	$(srcs_common) $(hdrs_mount) ../lib/env.c ../lib/linux_version.c \
-	../lib/blkdev.c ../lib/fsprobe.c ../lib/mangle.c
+	$(srcs_common) $(hdrs_mount) $(top_srcdir)/lib/env.c \
+	$(top_srcdir)/lib/linux_version.c $(top_srcdir)/lib/blkdev.c \
+	$(top_srcdir)/lib/fsprobe.c $(top_srcdir)/lib/mangle.c
 
 # generic flags for all programs (except losetup)
 # -- note that pkg-config autoconf macros (pkg.m4) does not differentiate
@@ -26,7 +27,8 @@ ldadd_static =
 cflags_common = $(AM_CFLAGS)
 ldflags_static = -all-static
 
-mount_SOURCES = mount.c $(srcs_mount) ../lib/setproctitle.c ../lib/strtosize.c
+mount_SOURCES = mount.c $(srcs_mount) $(top_srcdir)/lib/setproctitle.c \
+		$(top_srcdir)/lib/strtosize.c
 mount_CFLAGS = $(SUID_CFLAGS) $(cflags_common)
 mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 mount_LDADD = $(ldadd_common)
@@ -36,13 +38,14 @@ umount_CFLAGS = $(SUID_CFLAGS) $(cflags_common)
 umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 umount_LDADD = $(ldadd_common)
 
-swapon_SOURCES = swapon.c swap_constants.h ../lib/linux_version.c \
-	../lib/blkdev.c ../lib/fsprobe.c ../lib/canonicalize.c \
-	../lib/mangle.c
+swapon_SOURCES = swapon.c swap_constants.h $(top_srcdir)/lib/linux_version.c \
+		$(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/fsprobe.c \
+		$(top_srcdir)/lib/canonicalize.c $(top_srcdir)/lib/mangle.c
 swapon_CFLAGS = $(cflags_common)
 swapon_LDADD = $(ldadd_common)
 
-losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h ../lib/strtosize.c
+losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h \
+		$(top_srcdir)/lib/strtosize.c
 losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
 
 mount_static_LDADD =
diff --git a/mount/mount.8 b/mount/mount.8
index bf5a419a..4146958a 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -359,6 +359,21 @@ changed by a separate remount command, for example:
 .I newdir
 .RE
 
+Note that behavior of the remount operation depends on the /etc/mtab file. The
+first command stores the 'bind' flag to the /etc/mtab file and the second
+command reads the flag from the file.  If you have a system without the
+/etc/mtab file or if you explicitly define source and target for the remount
+command (then mount(8) does not read /etc/mtab), then you have to use bind flag
+(or option) for the remount command too. For example:
+
+.RS
+.br
+.B mount --bind
+.I olddir newdir
+.br
+.B mount -o remount,ro,bind
+.I olddir newdir
+.RE
 .RE
 
 .B The move operation.
@@ -387,7 +402,7 @@ private, slave or unbindable. A shared mount provides ability to create mirrors
 of that mount such that mounts and umounts within any of the mirrors propagate
 to the other mirror. A slave mount receives propagation from its master, but
 any not vice-versa.  A private mount carries no propagation abilities.  A
-unbindable mount is a private mount which cannot cloned through a bind
+unbindable mount is a private mount which cannot be cloned through a bind
 operation. Detailed semantics is documented in Documentation/sharedsubtree.txt
 file in the kernel source tree.
 
@@ -1391,7 +1406,7 @@ small amount of time to see if any other transactions can piggyback on the
 synchronous write. The algorithm used is designed to automatically tune for
 the speed of the disk, by measuring the amount of time (on average) that it
 takes to finish committing a transaction. Call this time the "commit time".
-If the time that the transactoin has been running is less than the commit time,
+If the time that the transaction has been running is less than the commit time,
 ext4 will try sleeping for the commit time to see if other operations will join
 the transaction. The commit time is capped by the max_batch_time, which
 defaults to 15000us (15ms). This optimization can be turned off entirely by
@@ -1423,7 +1438,7 @@ If auto_da_alloc is enabled, ext4 will detect the replace-via-rename and
 replace-via-truncate patterns and force that any delayed allocation blocks are
 allocated such that at the next journal commit, in the default data=ordered
 mode, the data blocks of the new file are forced to disk before the rename()
-operation is commited.  This provides roughly the same level of guarantees as
+operation is committed.  This provides roughly the same level of guarantees as
 ext3, and avoids the "zero-length" problem that can happen when a system
 crashes before the delayed allocation blocks are forced to disk.
 
@@ -2425,13 +2440,7 @@ was specified.
 .BI logbufs= value
 Set the number of in-memory log buffers.  Valid numbers range
 from 2-8 inclusive.
-The default value is 8 buffers for filesystems with a
-blocksize of 64KiB, 4 buffers for filesystems with a blocksize
-of 32KiB, 3 buffers for filesystems with a blocksize of 16KiB
-and 2 buffers for all other configurations.  Increasing the
-number of buffers may increase performance on some workloads
-at the cost of the memory used for the additional log buffers
-and their associated control structures.
+The default value is 8 buffers for any recent kernel.
 .TP
 .BI logbsize= value
 Set the size of each in-memory log buffer.
@@ -2439,8 +2448,7 @@ Size may be specified in bytes, or in kilobytes with a "k" suffix.
 Valid sizes for version 1 and version 2 logs are 16384 (16k) and
 32768 (32k).  Valid sizes for version 2 logs also include
 65536 (64k), 131072 (128k) and 262144 (256k).
-The default value for machines with more than 32MiB of memory
-is 32768, machines with less memory use 16384 by default.
+The default value for any recent kernel is 32768.
 .TP
 \fBlogdev=\fP\fIdevice\fP and \fBrtdev=\fP\fIdevice\fP
 Use an external log (metadata journal) and/or real-time device.
diff --git a/mount/mount.c b/mount/mount.c
index 26a8afed..a412bc37 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -326,11 +326,11 @@ append_opt(char *s, const char *opt, const char *val)
 }
 
 static char *
-append_numopt(char *s, const char *opt, long num)
+append_numopt(char *s, const char *opt, unsigned int num)
 {
 	char buf[32];
 
-	snprintf(buf, sizeof(buf), "%ld", num);
+	snprintf(buf, sizeof(buf), "%u", num);
 	return append_opt(s, opt, buf);
 }
 
@@ -1139,8 +1139,9 @@ loop_check(const char **spec, const char **type, int *flags,
    * file as a mount(2) source argument. A filesystem that is able to mount
    * regular files could be implemented.
    */
-  if (!*loop && (!*type || strcmp(*type, "auto") == 0 ||
-			   fsprobe_known_fstype(*type))) {
+  if (!*loop && !(*flags & (MS_BIND | MS_MOVE | MS_PROPAGATION)) &&
+      (!*type || strcmp(*type, "auto") == 0 || fsprobe_known_fstype(*type))) {
+
     struct stat st;
     if (stat(*loopfile, &st) == 0)
       *loop = S_ISREG(st.st_mode);
@@ -1152,7 +1153,8 @@ loop_check(const char **spec, const char **type, int *flags,
       if (verbose)
 	printf(_("mount: skipping the setup of a loop device\n"));
     } else {
-      int loop_opts = SETLOOP_AUTOCLEAR; /* always attempt autoclear */
+      /* use autoclear loopdev on system without regular mtab only */
+      int loop_opts = mtab_is_writable() ? 0 : SETLOOP_AUTOCLEAR;
       int res;
 
       if (*flags & MS_RDONLY)
@@ -1440,7 +1442,7 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
   }
 
   /* Kernel allows to use MS_RDONLY for bind mounts, but the read-only request
-   * could be silently ignored. Check it to avoid 'ro' in ntab and 'rw' in
+   * could be silently ignored. Check it to avoid 'ro' in mtab and 'rw' in
    * /proc/mounts.
    */
   if (!fake && mnt5_res == 0 &&
@@ -1450,17 +1452,31 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
       flags &= ~MS_RDONLY;
   }
 
+  /* Kernel can silently add MS_RDONLY flag when mounting file system that
+   * does not have write support. Check this to avoid 'ro' in /proc/mounts
+   * and 'rw' in mtab.
+   */
+  if (!fake && mnt5_res == 0 &&
+      !(flags & (MS_RDONLY | MS_PROPAGATION | MS_MOVE)) &&
+      is_readonly(node)) {
+
+      printf(_("mount: warning: %s seems to be mounted read-only.\n"), node);
+      flags |= MS_RDONLY;
+  }
+
   if (fake || mnt5_res == 0) {
       /* Mount succeeded, report this (if verbose) and write mtab entry.  */
 
       if (!(mounttype & MS_PROPAGATION)) {
+	      char *mtab_opts = fix_opts_string (flags & ~MS_NOMTAB, extra_opts, user);
 	      update_mtab_entry(loop ? loopfile : spec,
 			node,
 			types ? types : "unknown",
-			fix_opts_string (flags & ~MS_NOMTAB, extra_opts, user),
+			mtab_opts,
 			flags,
 			freq,
 			pass);
+	      free (mtab_opts);
       }
 
       block_signals (SIG_UNBLOCK);
@@ -1731,12 +1747,12 @@ usersubst(const char *opts) {
 
 	s = "uid=useruid";
 	if (opts && (w = strstr(opts, s)) != NULL) {
-		sprintf(id, "uid=%d", getuid());
+		sprintf(id, "uid=%u", getuid());
 		opts = subst_string(opts, w, strlen(s), id);
 	}
 	s = "gid=usergid";
 	if (opts && (w = strstr(opts, s)) != NULL) {
-		sprintf(id, "gid=%d", getgid());
+		sprintf(id, "gid=%u", getgid());
 		opts = subst_string(opts, w, strlen(s), id);
 	}
 	return xstrdup(opts);
@@ -1820,6 +1836,41 @@ mounted (const char *spec0, const char *node0) {
 	return ret;
 }
 
+/* returns 0 if not mounted, 1 if mounted and -1 in case of error */
+static int
+is_fstab_entry_mounted(struct mntentchn *mc, int verbose)
+{
+	struct stat st;
+
+	if (mounted(mc->m.mnt_fsname, mc->m.mnt_dir))
+		goto yes;
+
+	/* extra care for loop devices */
+	if ((strstr(mc->m.mnt_opts, "loop=") ||
+	     (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode)))) {
+
+		char *p = strstr(mc->m.mnt_opts, "offset=");
+		uintmax_t offset = 0;
+
+		if (p && strtosize(p + 7, &offset) != 0) {
+			if (verbose)
+				printf(_("mount: ignore %s "
+					"(unparsable offset= option)\n"),
+					mc->m.mnt_fsname);
+			return -1;
+		}
+		if (is_mounted_same_loopfile(mc->m.mnt_dir, mc->m.mnt_fsname, offset))
+			goto yes;
+	}
+
+	return 0;
+yes:
+	if (verbose)
+		printf(_("mount: %s already mounted on %s\n"),
+			       mc->m.mnt_fsname, mc->m.mnt_dir);
+	return 1;
+}
+
 /* avoid using stat() on things we are not going to mount anyway.. */
 static int
 has_noauto (const char *opts) {
@@ -1865,16 +1916,8 @@ do_mount_all (char *types, char *options, char *test_opts) {
 		if (matching_type (mc->m.mnt_type, types)
 		    && matching_opts (mc->m.mnt_opts, test_opts)
 		    && !streq (mc->m.mnt_dir, "/")
-		    && !streq (mc->m.mnt_dir, "root")) {
-
-			if (mounted (mc->m.mnt_fsname, mc->m.mnt_dir)) {
-				if (verbose)
-					printf(_("mount: %s already mounted "
-						 "on %s\n"),
-					       mc->m.mnt_fsname,
-					       mc->m.mnt_dir);
-				continue;
-			}
+		    && !streq (mc->m.mnt_dir, "root")
+		    && !is_fstab_entry_mounted(mc, verbose)) {
 
 			mtmp = (struct mntentchn *) xmalloc(sizeof(*mtmp));
 			*mtmp = *mc;
@@ -2306,8 +2349,8 @@ main(int argc, char *argv[]) {
 		printf("mount: mtab path:  \"%s\"\n", _PATH_MOUNTED);
 		printf("mount: lock path:  \"%s\"\n", _PATH_MOUNTED_LOCK);
 		printf("mount: temp path:  \"%s\"\n", _PATH_MOUNTED_TMP);
-		printf("mount: UID:        %d\n", getuid());
-		printf("mount: eUID:       %d\n", geteuid());
+		printf("mount: UID:        %u\n", getuid());
+		printf("mount: eUID:       %u\n", geteuid());
 	}
 
 	argc -= optind;
@@ -2338,7 +2381,7 @@ main(int argc, char *argv[]) {
 			if (ruid == 0 && euid != 0)
 				/* user is root, but setuid to non-root */
 				die (EX_USAGE, _("mount: only root can do that "
-					"(effective UID is %d)"), euid);
+					"(effective UID is %u)"), euid);
 
 			die (EX_USAGE, _("mount: only root can do that"));
 		}
diff --git a/mount/swapon.8 b/mount/swapon.8
index 25fc5e81..a3ebc97c 100644
--- a/mount/swapon.8
+++ b/mount/swapon.8
@@ -167,6 +167,18 @@ automatically detects and rewrites swap space signature with old software
 suspend data (e.g S1SUSPEND, S2SUSPEND, ...). The problem is that if we don't
 do it, then we get data corruption the next time an attempt at unsuspending is
 made.
+.PP
+.B swapon
+may not work correctly when using a swap file with some versions of btrfs.
+This is due to the swap file implementation in the kernel expecting to be able
+to write to the file directly, without the assistance of the file system.
+Since btrfs is a copy-on-write file system, the file location may not be
+static and corruption can result. Btrfs actively disallows the use of files
+on its file systems by refusing to map the file. This can be seen in the system
+log as "swapon: swapfile has holes." One possible workaround is to map the
+file to a loopback device. This will allow the file system to determine the
+mapping properly but may come with a performance impact.
+
 .SH SEE ALSO
 .BR swapon (2),
 .BR swapoff (2),
diff --git a/mount/swapon.c b/mount/swapon.c
index 4ee3c2f7..c7006550 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -425,7 +425,7 @@ swapon_checks(const char *special)
 		unsigned long long swapsize =
 				swap_get_size(hdr, special, pagesize);
 		if (verbose)
-			warnx("%s: pagesize=%d, swapsize=%llu, devsize=%llu",
+			warnx(_("%s: pagesize=%d, swapsize=%llu, devsize=%llu"),
 				special, pagesize, swapsize, devsize);
 
 		if (swapsize > devsize) {
@@ -663,7 +663,7 @@ main_swapon(int argc, char *argv[]) {
 			++verbose;
 			break;
 		case 'V':		/* version */
-			printf("%s: (%s)\n", progname, PACKAGE_STRING);
+			printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 			exit(0);
 		case 0:
 			break;
@@ -715,7 +715,7 @@ main_swapoff(int argc, char *argv[]) {
 			++verbose;
 			break;
 		case 'V':		/* version */
-			printf("%s (%s)\n", progname, PACKAGE_STRING);
+			printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 			exit(0);
 		case 'L':
 			addl(optarg);
diff --git a/mount/umount.c b/mount/umount.c
index 6786ac57..5bd53604 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -275,7 +275,7 @@ umount_one (const char *spec, const char *node, const char *type,
 	if (res >= 0) {
 		/* Umount succeeded */
 		if (verbose)
-			printf (_("%s umounted\n"), spec);
+			printf (_("%s has been unmounted\n"), spec);
 
 		/* Free any loop devices that we allocated ourselves */
 		if (mc) {
@@ -379,7 +379,6 @@ umount_all (char *types, char *test_opts) {
 	  }
      }
 
-     sync ();
      return errors;
 }
 
@@ -491,13 +490,13 @@ umount_file (char *arg) {
 	int ok;
 
 	if (!*arg) {		/* "" would be expanded to `pwd` */
-		die(2, _("Cannot umount \"\"\n"));
+		die(2, _("Cannot unmount \"\"\n"));
 		return 0;
 	}
 
 	file = canonicalize(arg); /* mtab paths are canonicalized */
 	if (verbose > 1)
-		printf(_("Trying to umount %s\n"), file);
+		printf(_("Trying to unmount %s\n"), file);
 
 	mc = getmntdirbackward(file, NULL);
 	if (!mc) {
@@ -515,8 +514,8 @@ umount_file (char *arg) {
 			if (strcmp(file, mc1->m.mnt_fsname)) {
 				/* Something was stacked over `file' on the
 				   same mount point. */
-				die(EX_FAIL, _("umount: cannot umount %s -- %s is "
-				    "mounted over it on the same point."),
+				die(EX_FAIL, _("umount: cannot unmount %s -- %s is "
+				    "mounted over it on the same point"),
 				    file, mc1->m.mnt_fsname);
 			}
 		}
diff --git a/partx/Makefile.am b/partx/Makefile.am
index 238f3228..36163aa9 100644
--- a/partx/Makefile.am
+++ b/partx/Makefile.am
@@ -4,10 +4,10 @@ if BUILD_PARTX
 
 usrsbin_exec_PROGRAMS = addpart delpart partx
 partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c \
-		efi.h gpt.h crc32.h partx.h dos.h ../lib/blkdev.c
+		efi.h gpt.h crc32.h partx.h dos.h $(top_srcdir)/lib/blkdev.c
 
 if LINUX
-partx_SOURCES += ../lib/linux_version.c
+partx_SOURCES += $(top_srcdir)/lib/linux_version.c
 endif
 
 dist_man_MANS = addpart.8 delpart.8 partx.8
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4ca65c8a..24644bb5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,6 +11,7 @@ disk-utils/mkfs.cramfs.c
 disk-utils/mkfs.minix.c
 disk-utils/mkswap.c
 disk-utils/raw.c
+disk-utils/swaplabel.c
 fdisk/cfdisk.c
 fdisk/fdiskaixlabel.c
 fdisk/fdiskbsdlabel.c
@@ -33,13 +34,18 @@ hwclock/kd.c
 hwclock/rtc.c
 lib/blkdev.c
 lib/canonicalize.c
+lib/cpuset.c
 lib/crc32.c
 lib/env.c
 lib/fsprobe.c
 lib/ismounted.c
 lib/linux_version.c
+lib/mangle.c
+lib/mbsalign.c
 lib/md5.c
 lib/setproctitle.c
+lib/strtosize.c
+lib/tt.c
 lib/wholedisk.c
 login-utils/agetty.c
 login-utils/checktty.c
@@ -62,6 +68,7 @@ misc-utils/blkid.c
 misc-utils/cal.c
 misc-utils/ddate.c
 misc-utils/findfs.c
+misc-utils/findmnt.c
 misc-utils/kill.c
 misc-utils/logger.c
 misc-utils/look.c
@@ -122,16 +129,20 @@ shlibs/blkid/src/partitions/partitions.c
 shlibs/blkid/src/partitions/sgi.c
 shlibs/blkid/src/partitions/solaris_x86.c
 shlibs/blkid/src/partitions/sun.c
+shlibs/blkid/src/partitions/ultrix.c
 shlibs/blkid/src/partitions/unixware.c
 shlibs/blkid/src/probe.c
 shlibs/blkid/src/read.c
 shlibs/blkid/src/resolve.c
 shlibs/blkid/src/save.c
 shlibs/blkid/src/superblocks/adaptec_raid.c
+shlibs/blkid/src/superblocks/befs.c
 shlibs/blkid/src/superblocks/bfs.c
 shlibs/blkid/src/superblocks/btrfs.c
 shlibs/blkid/src/superblocks/cramfs.c
 shlibs/blkid/src/superblocks/ddf_raid.c
+shlibs/blkid/src/superblocks/drbd.c
+shlibs/blkid/src/superblocks/exfat.c
 shlibs/blkid/src/superblocks/ext.c
 shlibs/blkid/src/superblocks/gfs.c
 shlibs/blkid/src/superblocks/hfs.c
@@ -178,6 +189,20 @@ shlibs/blkid/src/topology/topology.c
 shlibs/blkid/src/tst_types.c
 shlibs/blkid/src/verify.c
 shlibs/blkid/src/version.c
+shlibs/mount/src/cache.c
+shlibs/mount/src/fs.c
+shlibs/mount/src/init.c
+shlibs/mount/src/iter.c
+shlibs/mount/src/lock.c
+shlibs/mount/src/optent.c
+shlibs/mount/src/optls.c
+shlibs/mount/src/optmap.c
+shlibs/mount/src/optstr.c
+shlibs/mount/src/tab.c
+shlibs/mount/src/tab_parse.c
+shlibs/mount/src/test.c
+shlibs/mount/src/utils.c
+shlibs/mount/src/version.c
 shlibs/uuid/src/clear.c
 shlibs/uuid/src/compare.c
 shlibs/uuid/src/copy.c
@@ -196,13 +221,13 @@ sys-utils/cytune.c
 sys-utils/dmesg.c
 sys-utils/fallocate.c
 sys-utils/flock.c
+sys-utils/fsfreeze.c
 sys-utils/ipcmk.c
 sys-utils/ipcrm.c
 sys-utils/ipcs.c
 sys-utils/ldattach.c
 sys-utils/lscpu.c
 sys-utils/pivot_root.c
-sys-utils/rdev.c
 sys-utils/readprofile.c
 sys-utils/renice.c
 sys-utils/rtcwake.c
diff --git a/po/ca.po b/po/ca.po
index cfe8c714..cfa271c7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre3\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2005-09-17 13:40+0200\n"
 "Last-Translator: Josep Puigdemont <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -108,6 +108,11 @@ msgstr "torna a llegir la taula de particions"
 msgid "Usage:\n"
 msgstr "Forma d'ús:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ senyal ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -128,6 +133,17 @@ msgstr "Ordres disponibles:\n"
 msgid "get size in 512-byte sectors"
 msgstr "aconsegueix la mida en octets"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -230,15 +246,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "forma d'ús: %s [ -n ] dispositiu\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -341,7 +348,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
@@ -973,7 +980,7 @@ msgstr "no es pot fer \"stat\" al dispositiu %s"
 msgid "%s is not a block special device"
 msgstr "%s no es un dispositiu de bloc especial"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "%s no es pot obrir"
@@ -997,7 +1004,7 @@ msgstr "massa nodes d'identificació; el màxim és de 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "no hi ha prou espai, com a mínim es necessiten %lu blocs"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositiu: %s\n"
@@ -1073,7 +1080,7 @@ msgstr ""
 "Forma d'ús: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu "
 "[mida]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1311,7 +1318,7 @@ msgstr "no s'ha pogut cercar durant la comprovació de blocs"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Hi ha valors estranys a do_check: probablement hi ha errors\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "no s'ha pogut cercar a check_blocks"
 
@@ -1397,177 +1404,184 @@ msgstr ""
 "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:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "no s'ha pogut bifurcar\n"
+
+#: disk-utils/mkswap.c:197
 #, 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:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "S'ha truncat l'etiqueta.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "sense etiqueta, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "sense uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Forma d'ús: %s [-c] [-v0|-v1] [-pMIDAPÀG] [-L etiqueta] /dev/_nom_ [blocs]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "hi ha massa pàgines incorrectes"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "S'ha esgotat la memòria"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "una pàgina incorrecta\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu pàgines incorrectes\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "no s'ha pogut rebobinar el dispositiu d'intercanvi"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr ""
 "no s'ha pogut assignar memòria intermèdia per als nodes d'identificació"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
 msgstr ""
+"no s'ha pogut assignar memòria intermèdia per als nodes d'identificació"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "no s'ha pogut netejar el sector d'arrencada"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   imprimeix la taula de particions BSD"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   mostra totes les etiquetes del disc"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   mostra totes les etiquetes del disc"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: error: versió desconeguda %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "S'ha produït un error en tancar el fitxer\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: error: no es pot especificar l'espai d'intercanvi enlloc?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: error: la mida %lu es més gran que a la mida del dispositiu %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: error: l'espai d'intercanvi ha de tenir com a mínim %ldkB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: avís: l'espai d'intercanvi s'ha truncat a %ldkB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "No s'intentarà crear cap dispositiu d'intercanvi a '%s'"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s ja està muntat; no s'hi crearà cap sistema de fitxers."
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "No s'ha pogut configurar l'espai d'intercanvi: no es pot llegir"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "S'està configurant l'espai d'intercanvi versió %d, mida = %llu kB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "no s'ha pogut escriure la pàgina de la signatura"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "no s'ha pogut fer fsync"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "no es pot fer stat per a %s"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "no s'ha pogut escriure els nodes d'identificació"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
@@ -1630,63 +1644,109 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "s'ha produït un error en aturar el servei: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Inutilitzable"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "no s'ha pogut rebobinar el dispositiu d'intercanvi"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Espai lliure"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: aquesta partició no existeix\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: error: versió desconeguda %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "s'ha produït un error en cercar a write_tables"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "S'ha canviat la informació del finger.\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Inutilitzable"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Espai lliure"
 
-#: fdisk/cfdisk.c:415
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "El disc s'ha modificat.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Arrenqueu de nou el sistema per a assegurar-vos de que la taula de "
 "particions s'ha actualitzat correctament.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1699,232 +1759,232 @@ msgstr ""
 "DOS 6.x, consulteu la pàgina del manual de cfdisk\n"
 "per a informació addicional.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ERROR FATAL"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Premeu una tecla per a sortir del cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "No s'ha pogut cercar a la unitat de disc"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "No s'ha pogut llegir la unitat de disc"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "No s'ha pogut escriure a la unitat de disc"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Hi ha massa particions"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "La partició comença abans del sector 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "La partició acaba abans del sector 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "La partició comença despres de la fí del disc"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "La partició acaba despres de la fí del disc"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partició acaba en l'últim cilindre parcial"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "les particions lògiques no estan en l'ordre del disc"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "les particions lògiques s'encavalquen"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "les particions lògiques ampliades s'encavalquen"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Error intern en crear una unitat lògica sense partició estesa !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "No s'ha pogut crear cap unitat lògica; es crearan dues particions esteses"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "L'element del menú és massa llarg; l'aspecte del menú pot ser estrany."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "El menú no té direcció; l'opció per defecte és horitzontal."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Tecla no permesa"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Premeu una tecla per a continuar"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primària"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Crea una nova partició primària"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Lògica"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Crea una nova partició lògica"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "No creïs cap partició"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Error intern !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Mida (en MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Principi"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Afegeix partició al principi de l'espai lliure"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Afegeix partició al final de l'espai lliure"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "No hi ha espai per crear la partició estesa"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "No hi ha cap taula de particions.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr ""
 "No hi ha cap taula de particions. S'està començant amb una taula buida."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "La signatura a la taula de particions és errònia"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Es desconeix el tipus de taula de particions"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 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:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Heu especificat més cilindres dels que caben al disc"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "No s'ha pogut obrir la unitat de disc"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "S'ha obert un disc de només lectura; no teniu permís per a escriure-hi"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "No s'ha pogut obtenir la mida del disc"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Partició primària incorrecta"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Partició lògica incorrecta"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Avís: Això pot destruir les dades del disc!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 #, fuzzy
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "Esteu segur que voleu escriure la taula de particions al disc? (sí o no): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "No s'ha escrit la taula de particions al disc"
 
 # FIXME: és possible que no es puga introduir l'accent. jm
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "sí"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Escriviu «sí» o «no»"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "S'està escrivint la taula de particions al disc..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "S'ha escrit la taula de particions del disc"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1933,88 +1993,88 @@ msgstr ""
 "S'ha escrit la taula de particions, però no s'ha pogut rellegir.  Arrenqueu "
 "de nou per actualitzar-la."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "No hi ha particions primàries marcades com a d'arrencada. La MBR del DOS no "
 "podrà arrencar."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 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 a d'arrencada. La MBR del DOS "
 "no podrà arrencar."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Escriviu el nom del fitxer o premeu la tecla de retorn per visualitzar-ho en "
 "pantalla: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "No s'ha pogut obrir el fitxer '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unitat de disc: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Cap   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Lòg"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primària"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Lògica"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Arrencada"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Cap"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Taula de particions per a %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Primer      Últim\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -2022,7 +2082,7 @@ msgstr ""
 " # Tipus      Sector      Sector   Despl.    Longitud  (ID) T. de sist. "
 "fitx.  Senyal.\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2033,469 +2093,469 @@ msgstr ""
 "-- -----      ------      ------   ------    --------  "
 "----------------------  ------\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ---Inici---        ----Final----      Inici     Nombre de\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, fuzzy
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr " # Senyal Cap Sec  Cil   ID  Cap  Sec  Cil     Sector    Sectors\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ------ --- ---  ---   --  ---  ---  ---     ------    ------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Crues"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Imprimeix la taula utilitzant el format de dades crues"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sectors"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Imprimeix la taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Taula"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Imprimeix només la taula de particions"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "No imprimeixes la taula"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla d'ajuda per a cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Això és el cfdisk, un programa per a la partició de discs basat en"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "curses, que us permet crear, suprimir i modificar particions del"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "disc dur."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright © 1994-1999 Kevin E. Martin i aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Ordre       Significat"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-----       ----------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Fixa el senyalador d'arrencada a la partició actual"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Suprimeix l'actual partició"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Canvia paràmetres de cilindres, capçals i sectors per pista"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             Avís: Aquesta opció només l'hauria d'usar aquells qui"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             saben el que es fan."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximitza la utilització de disc de la partició actual"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Aquesta opció pot fer la partició incompatible"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             amb DOS, OS/2..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Crea una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Imprimeix la taula de particions a la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Hi ha diversos formats diferents per a la partició"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             entre els quals podeu escollir:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Dades crues (exactament el que s'escriurà al disc)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Taula ordenada per sectors"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Taula en format cru"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Surt del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Canvia el tipus del sistema de fitxers"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Canvia les unitats de la mida visualitzava de la partició"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, sectors i cilindres"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Com que això destruirà les dades del disc, ho haureu"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             de confirmar o denegar escrivint «sí» o"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "              «no»"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Fletxa amunt Desplaça el cursor a l'anterior partició"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Fletxa avall Desplaça el cursor a la següent partició"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Redibuixa la pantalla"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Imprimeix aquesta pantalla"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: Totes les ordres es poden escriure en majúscules o"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "minúscules (excepte W per a escriure)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cilindres"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Canvia la geometria dels cilindres"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Capçals"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Canvia la geometria dels capçals"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Canvia la geometria dels sectors"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Fet"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "S'ha finalitzat el canvi de geometria"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Introduïu el nombre de cilindres: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Valor dels cilindres no permès"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Introduïu el nombre de capçals: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Valor dels capçals no permès"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Introduïu el nombre de sectors per pista: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Valor dels sectors no permès"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Introduïu el tipus del sistema de fitxers: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "No es pot canviar el tipus del sistema de fitxers a buit"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "No es pot canviar el tipus del sistema de fitxers a estès"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Lòg"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconegut (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unitat de disc: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Mida: %lld octets, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Mida: %lld octets, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Capçals: %d   Sectors per pista: %d   Cilindres: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Senyaladors"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Tipus part."
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Tipus Sis.Fitx."
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Sectors"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cilindres"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Mida (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Mida (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Arrencable"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Commuta el senyalador d'arrencada de la partició actual"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Suprimeix la partició actual"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Canvia la geometria del disc (només usuaris experts)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Mostra la pantalla d'ajuda"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximitza la utilització del disc en la partició actual (només usuaris "
 "experts)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Crea una nova partició des de l'espai lliure"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Imprimeix"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "Imprimeix la taula de particions a la pantalla o en un fitxer"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Surt"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Surt del programa sense escriure la taula de particions"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Tipus"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Canvia el tipus del sistema de fitxers (DOS, Linux, OS/2, etc.)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Unitats"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Canvia les unitats de la mida de la partició (MB, sectors, cilindres)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Escriu"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Escriu la taula de particions al disc (això pot destruir les dades)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Aquesta partició no es pot fer arrencable"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "No es pot suprimir una partició buida"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "No es pot maximitzar aquesta partició"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Aquesta partició és inutilitzable"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Aquesta partició ja està en ús"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "No es pot canviar el tipus d'una partició buida"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "No hi ha més particions"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Ordre no permesa"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994-2002 Kevin E. Martin i aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2567,9 +2627,9 @@ msgstr ""
 "\n"
 "Etiqueta BSD per al dispositiu: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Acció de l'ordre"
 
@@ -2589,9 +2649,9 @@ msgstr "   i   instal·la el carregador d'arrencada"
 msgid "   l   list known filesystem types"
 msgstr "   l   llista els tipus de sistemes de fitxers coneguts"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   imprimeix aquest menú"
 
@@ -2603,14 +2663,14 @@ msgstr "   n   afegeix una nova partició BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   imprimeix la taula de particions BSD"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   surt sense desar els canvis"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   torna al menú principal"
 
@@ -2654,14 +2714,14 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Ordre d'etiqueta de disc BSD (m per a l'ajuda): "
 
 # Parla d'etiquetes, segurament és femení
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Primera %s"
 
 # Parla d'etiquetes, segurament és femení
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Última %s o +mida o +midaM o +midaK"
@@ -2809,7 +2869,7 @@ msgstr "sectors/pista"
 msgid "tracks/cylinder"
 msgstr "pistes/cilindre"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cilindres"
@@ -2870,7 +2930,7 @@ msgstr "S'ha instal·lat el carregador a %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partició (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "S'ha creat el màxim nombre de particions\n"
@@ -2894,226 +2954,209 @@ msgstr ""
 "\n"
 "S'estan sincronitzant els discs.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"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:260
-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 ""
-"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"
-"    o: fdisk /dev/rd/c0d0 o: fdisk /dev/ida/c0d0  (per als dispositius "
-"RAID)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "No s'ha pogut obrir %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "No s'ha pogut llegir %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "No s'ha pogut cercar en %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "No s'ha pogut escriure %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "No s'ha pogut executar ioctl BLKGETSIZE a %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "No s'ha pogut assignar més memòria\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Error fatal\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   estableix un senyalador de només lectura"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   edita l'etiqueta de disc bsd"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   estableix senyalador de muntable"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   suprimeix una partició"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   llista els tipus de particions conegudes"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   afegeix una nova partició"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   crea una nova taula de particions DOS buida"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   imprimeix la taula de particions"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   crea una etiqueta de disc Sun nova"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   canvia l'identificador del sistema d'una partició"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   canvia les unitats de visualització/entrada"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   verifica la taula de particions"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   escriu la taula al disc i surt"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   funcions addicionals (només experts)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   selecciona la partició d'arrencada"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   edita l'entrada del fitxer d'arrencada"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   selecciona la partició d'intercanvi sgi"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   estableix un senyalador d'arrencada"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   estableix el senyalador de compatibilitat amb DOS"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   canvia el nombre de cilindres alternatius"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   canvia el nombre de cilindres"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   imprimeix les dades crues a la taula de particions"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   canvia el nombre de sectors addicionals per cilindre"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   canvia el nombre de capçals"
 
 # FIXME
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   canvia el factor d'entrellaçat"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   canvia velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   canvia el nombre de sectors per pista"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   canvia el nombre de cilindres físics"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   desplaça les dades d'una partició a l'inici"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   llista les particions esteses"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   crea una taula de particions IRIX (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   arregla l'ordre de les particions"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u   canvia les unitats de visualització/entrada"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Heu de definir els"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "capçals"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sectors"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3122,31 +3165,11 @@ msgstr ""
 "%s%s.\n"
 "Podeu fer això des del menú de funcions addicionals.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " i "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"El nombre de cilindres per a aquest disc està establert en %d.\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:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3157,38 +3180,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplaçament incorrecte en particions primàries esteses\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3197,34 +3219,34 @@ 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:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 "Avís: hi ha un punter d'enllaç addicional a la taula de particions %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Avís: s'està ignorant les dades addicionals de la taula de particions %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Avís: partició buida\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3237,28 +3259,19 @@ msgstr ""
 "d'aquesta operació, l'anterior contingut no es podrà recuperar.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: la mida del sector és %d (no %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "No podreu escriure la taula de particions.\n"
 
 # 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3267,7 +3280,7 @@ msgstr ""
 "Aquest disc té tan màgia DOS com BSD.\n"
 "Empreu l'ordre «b» per anar al mode BSD.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3276,17 +3289,17 @@ msgstr ""
 "El dispositiu no conté ni taula de particions DOS vàlida, ni cap etiqueta de "
 "disc Sun, SGI o OSF\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Error intern\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "S'està ignorant la partició estesa addicional %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3295,7 +3308,7 @@ msgstr ""
 "Avís: el senyalador 0x%04x invàlid de la taula de particions %d es corregirà "
 "amb w(escriu)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3304,95 +3317,100 @@ msgstr ""
 "\n"
 "s'ha obtingut EOF tres vegades - s'està sortint...\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Codi hex. (escriviu L per veure la llista de codis): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, valor per defecte %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "S'està utilitzant el valor per defecte %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "El valor està fora del rang.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Nombre de partició"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Avís: la partició %d no té tipus\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "S'ha seleccionat la partició %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Encara no hi ha cap partició definida.\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Ja s'han definit totes les particions primàries.\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cilindre"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "S'està canviant les unitats de visualització/entrada a %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "S'està canviant les unitats de visualització/entrada a %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "Avís: la partició %d és una partició estesa\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "S'ha establert el senyalador de compatibilitat amb DOS\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "No s'ha establert el senyalador de compatibilitat amb DOS\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partició %d encara no existeix.\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3405,7 +3423,7 @@ msgstr ""
 "particions del tipus 0. Les podeu suprimir amb\n"
 "l'ordre «d».\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3414,7 +3432,7 @@ msgstr ""
 "No podeu convertir una partició a estesa, o al revés, primer\n"
 "cal que l'esborreu.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3426,7 +3444,7 @@ msgstr ""
 "Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3438,62 +3456,62 @@ msgstr ""
 "espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "S'ha canviat el tipus del sistema de la partició %d per %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     físic=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lògic=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, 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:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "ha de ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "ha de ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "La partició %i no comença en el límit del cilindre:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3502,7 +3520,7 @@ msgstr ""
 "\n"
 "Disc %s: %ld MB, %lld octets\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3511,34 +3529,39 @@ msgstr ""
 "\n"
 "Disc %s: %ld.%ld GB, %lld octets\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d capçals, %d sectors/pista, %d cilindres"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", total %llu sectors"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 "Unitats = %s de %d * %d = %d octets\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "mida de node d'identificació incorrecte"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3547,14 +3570,14 @@ msgstr ""
 "Res a fer. L'ordenament ja és correcte.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Fet\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3564,16 +3587,16 @@ msgstr ""
 "Això no sembla cap taula de particions\n"
 "Probablement heu seleccionat un dispositiu incorrecte.\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Arrenc.   Inici         Final    Blocs    Id  Sistema\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Dispositiu"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3582,7 +3605,7 @@ msgstr ""
 "\n"
 "Les entrades a la taula de particions no estan en l'ordre del disc\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3593,88 +3616,88 @@ msgstr ""
 "Disc %s: %d capçals, %d sectors, %d cilindres\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "N. IA Cap Sect Cil Cap Sect Cil     Inici      Mida ID\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Avís: la partició %d conté el sector 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, 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"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partició %d: el sector %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partició %d: el cilindre %d supera el màxim %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partició %d: sectors anteriors %d difereixen del total %d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Avís: inici de dades incorrecte en la partició %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Avís: la partició %d cavalca amb la partició %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Avís: la partició %d està buida\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "El total de sectors assignats %d supera el màxim de %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld sectors no assignats\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "No hi ha cap sector lliure disponible\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3687,7 +3710,7 @@ msgstr ""
 "\t particions DOS (Useu o).\n"
 "\tAvís: Això destruirà el contingut actual del disc.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3700,22 +3723,22 @@ msgstr ""
 "\t particions DOS (Useu o).\n"
 "\tAvís: Això destruirà el contingut actual del disc.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "S'usen totes les particions lògiques\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "S'està afegint una partició primària\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3726,20 +3749,20 @@ msgstr ""
 "%s\n"
 "   p   partició primària (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   lògica (5 o superior)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   estesa"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, 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:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3748,12 +3771,12 @@ msgstr ""
 "S'ha modificat la taula de particions.\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "S'està cridant ioctl() per rellegir la taula de particions.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3767,7 +3790,7 @@ msgstr ""
 "El nucli encara usa l'antiga taula.\n"
 "La taula nova s'usarà després d'arrencar de nou.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3780,7 +3803,7 @@ msgstr ""
 "DOS 6.x, mireu la pàgina del manual de fdisk\n"
 "per a informació addicional.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3789,44 +3812,44 @@ msgstr ""
 "\n"
 "S'ha produït un error en tancar el fitxer\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "S'estan sincronitzant els discs.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partició %d no té cap àrea de dades\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Nou començament de dades"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Ordre d'expert (m per a obtenir ajuda): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Nombre de cilindres"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Nombre de capçals"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Nombre de sectors"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Avís: s'està establint el desplaçament del sector per a la compatibilitat "
 "amb DOS\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3835,33 +3858,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "no es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ordre desconeguda\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Aquest nucli troba la mida del sector automàtiament; s'ignorarà l'opció -b\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3870,18 +3893,18 @@ msgstr ""
 "Avís: l'opció -b (estableix la mida del sector) s'ha d'usar amb un "
 "dispositiu específic\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "En entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en %"
 "s.\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Ordre (m per a obtenir ajuda): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3890,16 +3913,16 @@ msgstr ""
 "\n"
 "L'actual fitxer d'arrencada és: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Entreu el nom del nou fitxer d'arrencada: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "No s'ha modificat el fitxer d'arrencada\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3991,15 +4014,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Intercanvi Linux"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4138,7 +4161,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Hi ha present més d'una entrada de disc complet.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "No hi han particions definides\n"
@@ -4242,7 +4265,7 @@ msgstr ""
 "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:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "SÍ\n"
 
@@ -4298,7 +4321,7 @@ msgstr ""
 "recuperar l'anterior contingut.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4319,58 +4342,58 @@ msgstr "S'està intentant mantenir els paràmetres de la partició %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tINICI=%d\tLONGITUD=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS arrel"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS d'intercanvi"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Disc sencer"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS estàndard"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%lld sectors no assignats\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Autodetecció RAID Linux"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4383,28 +4406,28 @@ msgstr ""
 "p.ex. capçals, sectors, cilindres i particions, o forçar\n"
 "una nova etiqueta (ordre s del menú principal)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr ""
 "S'ha detectat una etiqueta de disc sgi amb una suma de comprovació "
 "incorrecta.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr ""
 "S'ha detectat una etiqueta de disc sgi amb una suma de comprovació "
 "incorrecta.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr ""
 "S'ha detectat una etiqueta de disc sgi amb una suma de comprovació "
 "incorrecta.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4412,7 +4435,7 @@ msgstr ""
 "Avís: el senyalador 0x%04x invàlid de la taula de particions %d es corregirà "
 "amb w(escriu)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4425,31 +4448,31 @@ msgstr ""
 "contingut serà irrecuperable.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sectors/pista"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partició %d encavalca amb d'altres en els sectors %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Buit no usat - sectors 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Buit no usat - sectors %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4458,7 +4481,7 @@ msgstr ""
 "Altres particions cobreixen el disc sencer.\n"
 "Abans de tornar-hi esborreu-ne o reduïu-ne la seva mida.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4467,12 +4490,12 @@ msgstr ""
 "Es recomana especialment que la onzena partició\n"
 "cobreixi el disc sencer i sigui del tipus 'volum SGI'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4483,7 +4506,7 @@ msgstr ""
 "valor %d %s encavalca amb d'altres particions. S'ha canviat l'entrada\n"
 "per %d %s\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4492,7 +4515,7 @@ msgstr ""
 "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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4507,12 +4530,12 @@ msgstr ""
 "amb el 82 (Linux d'intercanvi): "
 
 # FIXME
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4527,11 +4550,11 @@ msgstr ""
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4540,29 +4563,29 @@ msgstr ""
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Senyal.  Inici      Final   Blocs   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cilindres alternatius"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Sectors addicionals per cilindre"
 
 # FIXME
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Factor d'entrellaçat"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Nombre de cilindres físics"
 
@@ -4771,6 +4794,10 @@ msgstr "Minix / antic Linux"
 msgid "Linux swap / Solaris"
 msgstr "Intercanvi Linux / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Unitat C: oculta d'OS/2"
@@ -5412,97 +5439,97 @@ msgstr "s'ha especificat el senyalador -n: No s'ha canviat res\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "No s'ha pogut desar els sector antics - s'està avortant\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "línia d'entrada llarga o incompleta - s'està sortint\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 "s'ha produït un error en l'entrada: s'esperava `=' després del camp %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "no s'ha pogut reconèixer l'entrada: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "el nombre és massa gran\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "dades estranyes després del nombre\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "no hi ha espai per al descriptor de partició\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "no s'ha pogut crear una partició estesa adjunta\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "hi ha massa camps a l'entrada\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "No queda més espai\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Tipus no permès\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Avís: la mida indicada (%lu) excedeix la màxima acceptable (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Avís: partició buida\n"
 
 # DUBTE
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Avís: l'inici de la partició no és correcte (mínim %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "no s'ha pogut reconèixer el senyalador d'arrencada - escolliu - o *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "especificació parcial de c,h,s?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "La partició estesa no és on s'esperava\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "entrada dolenta\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "hi ha massa particions\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5513,44 +5540,44 @@ msgstr ""
 "<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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositiu: semblant a /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "opcions útils:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]:  Mostra la mida d'una partició"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprimeix o canvia l'identificador de la partició"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Mostra les particions de cada dispositiu"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [o --dump]:       El mateix, però amb un format adequat per a una\n"
 "                         entrada posterior"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5558,57 +5585,57 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Accepta/reporta en unitats de sectors/blocs/"
 "cilindres/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Llista els tipus de particions conegudes"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 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"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 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:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                Només canvia la partició amb el número #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 No escrigues realment al disc"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fitxer:           Restaura aquests sectors altra vegada"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprimeix la versió"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprimeix aquest missatge"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "opcions perilloses:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]:  Imprimeix la idea que té el nucli de la "
 "geometria"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5616,7 +5643,7 @@ msgstr ""
 "    -G [o --show-pt-geometry]: Imprimeix la geometria que s'ha endevinat\n"
 "                               partir de la taula de particions"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5625,63 +5652,63 @@ msgstr ""
 "sortida\n"
 "                             o els descriptors esperats en l'entrada"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [o --Linux]:       No mostra avisos sobre aspectes irrellevants per\n"
 "                           a Linux"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:       Suprimeix els avisos"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Podeu modificar la geometria detectada usant:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 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:2316
+#: fdisk/sfdisk.c:2321
 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:2317
+#: fdisk/sfdisk.c:2322
 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:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Podeu desactivar tota comprovació de consistència amb:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Forma d'ús:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s dispositiu n1 n2 ... activa particions n1 ..., desactiva la resta\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5690,67 +5717,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Useu el senyalador --force per a obviar totes les comprovacions.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "cap ordre?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu blocs\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "forma d'ús: sfdisk --print-id dispositiu número_partició\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "forma d'ús: sfdisk --change-id dispositiu número_partició Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "forma d'ús: sfdisk --id dispositiu partició_número [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "només podeu especificar un dispositiu (excepte amb -l o -s)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "no es pot obrir %s per a lectura-escriptura\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "no es pot obrir %s per a lectura\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcte\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "No s'ha pogut obtenir la mida de %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5758,7 +5785,7 @@ msgstr ""
 "Fet\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5767,36 +5794,36 @@ msgstr ""
 "Teniu %d particions primàries actives. Això no és important per al LILO,\n"
 "però l'MBR del DOS només pot arrencar discs amb una partició activa.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador dolent %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Aquest disc està actualment en ús.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "S'ha produït un error fatal: no s'ha pogut trobar %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Avís: %s no és un dispositiu de blocs\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "S'està comprovant que en aquest moment ningú estigui usant aquest disc...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5809,30 +5836,30 @@ msgstr ""
 "swapoff en totes les particions d'intercanvi del disc.\n"
 "Useu el senyalador --no-reread per a suprimir aquesta comprovació.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Useu el senyalador --force per a obviar totes les comprovacions.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "Correcte\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Antiga situació:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partició %d no existeix; no s'ha pogut canviar\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Nova situació:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5840,21 +5867,21 @@ msgstr ""
 "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:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "No em sembla bé - probablement hagueu de respondre No\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Esteu satisfet amb això? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Desitgeu escriure això al disc? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5863,17 +5890,17 @@ msgstr ""
 "\n"
 "sfdisk: final prematur de l'entrada\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "S'està sortint - no s'ha canviat res\n"
 
 # FIXME: 'y', 'n', 'q'. Are they translatable?
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Respongueu amb una: y,n,q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5882,7 +5909,7 @@ msgstr ""
 "S'ha escrit correctament la nova taula de particions\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5893,17 +5920,17 @@ msgstr ""
 "\tdd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Mireu fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: no s'ha pogut obrir %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5911,75 +5938,75 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: no s'ha trobat"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: s'ha produït un error %d en descomprimir! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: haureu d'especificar el tipus del sistema de fitxers"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s no és un dispositiu lp.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "S'està forçant la comprovació del sistema de fitxers a %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
@@ -5987,42 +6014,42 @@ msgstr ""
 "Forma d'ús: mkfs [-V] [-t tipus_sis._fitx.] [opcions_sis._fitx.]  dispositiu "
 "[mida]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s no és un dispositiu lp.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "No s'ha pogut obrir %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s desmuntat\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "S'està desmuntant els sistemes de fitxers restants..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: argument desconegut: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s de %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "No es pot assignar memòria intermèdia per als nodes d'identificació"
@@ -6541,7 +6568,13 @@ msgstr "No s'ha trobat cap interfície de rellotge usable.\n"
 msgid "Unable to set system clock.\n"
 msgstr "No es pot establir el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6555,17 +6588,17 @@ msgstr ""
 "possiblement ara no s'executi en cap màquina Alpha). No s'ha executat cap "
 "acció.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "No es pot obtenir el valor d'època del nucli.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "El nucli assumeix un valor d'època de %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6574,22 +6607,22 @@ msgstr ""
 "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:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "No s'establirà el valor de l'època a  %d - només s'està provant.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "No es pot establir el valor d'època en el nucli.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6608,6 +6641,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6657,7 +6691,7 @@ msgstr ""
 "  --noadjfile   No accedeixis a /etc/adjtime. Requereix l'ús de --utc o bé\n"
 "                --localtime\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6667,17 +6701,17 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                Indica al RTC el tipus d'Alpha que teniu (vegeu hwclock(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "No es pot establir el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6686,7 +6720,7 @@ msgstr ""
 "Heu especificat múltiples funcions.\n"
 "Només podeu fer-ne una a la vegada.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6695,7 +6729,7 @@ msgstr ""
 "%s: Les opcions --utc i --localtime s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6704,7 +6738,7 @@ msgstr ""
 "%s: Les opcions --adjust i --noadjfile s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6713,28 +6747,28 @@ msgstr ""
 "%s: Les opcions --adjust i --noadjfile s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "L'hora indicada per establir no és usable. No s'ha tocat el rellotge.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Només el superusuari pot canviar el rellotge del maquinari.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Només el superusuari port canviar el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6743,14 +6777,14 @@ msgstr ""
 "Només el superusuari pot canviar el valor de l'època del rellotge del "
 "maquinari en el nucli.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "No s'ha pogut accedir al rellotge del maquinari mitjançant cap dels mètodes "
 "coneguts.\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -7049,12 +7083,12 @@ msgstr "%s: No s'ha pogut establir el context per defecte per a /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "S'està canviant la informació del finger per a l'usuari %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM ha fallat; s'està avortant: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7288,36 +7322,41 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "S'ha produït un error fatal: no s'ha pogut reobrir tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s no es un dispositiu de bloc especial"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "S'ha produït un error fatal: terminal erroni"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: només el superusuari pot fer servir -h.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "forma d'ús: login [-fp] [nom_usuari]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "No s'ha pogut inicialitzar PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "entrada: "
 
 # FIXME, please describe parameters
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "S'HA INTENTAT ACCEDIR SENSE ÈXIT %d VEGADES DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7326,17 +7365,17 @@ msgstr ""
 "L'entrada no és correcta\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "S'HA INTENTAT ENTRAR MASSA VEGADES (%d) DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "NO S'HA POGUT INICIAR LA SESSIÓ DES DE %s PER A %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7345,7 +7384,7 @@ msgstr ""
 "\n"
 "Entrada incorrecta\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7354,122 +7393,122 @@ msgstr ""
 "\n"
 "S'ha produït un problema en iniciar la sessió, s'avortarà.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Nom d'usuari NUL a %s:%d. S'avortarà."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Nom d'usuari invàlid \"%s\" a %s:%d. S'avortarà."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: No hi ha prou memòria\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Nom d'usuari il·legal"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "S'ha refusat l'entrada de %s en aquest terminal.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "S'HA REFUSAT L'ENTRADA DE %s DES DE %s A LA TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "S'HA REFUSAT L'ENTRADA DE %s A LA TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Entrada incorrecta\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "MARCATGE DIRECTE A %s PER %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ENTRADA DEL ROOT A %s DES DE %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ENTRADA DEL ROOT A %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "ENTRADA A %s PER %s DES DE %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "ENTRADA A %s PER %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Teniu correu nou.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Teniu correu.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: s'ha produït un error en bifurcar: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ha fallat: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() ha fallat"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hi ha cap directori %s\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "S'està entrant amb el directori inicial = «/».\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
 "login: no hi ha prou memòria per a la seqüència de l'intèrpret d'ordres.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 "login: no s'ha pogut executar la seqüènca de l'intèrpret d'ordres: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: no hi ha l'intèrpret d'ordres: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7478,66 +7517,66 @@ msgstr ""
 "\n"
 "Entrada a %s: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "el nom d'entrada és massa llarg.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NOM és massa llarg"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "els noms d'entrada no poden començar per «-».\n"
 
 # FIXME
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "massa salts de pàgina solitaris.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "MASSA salts de pàgina"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "S'ha excedit el temps d'espera per a l'entrada al cap de %d segons.\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Última entrada: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "des de %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "a %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "HA FALLAT L'ENTRADA DE %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "HA FALLAT L'ENTRADA A %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "HA FALLAT %d VEGADES L'ENTRADA DES DE %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "HA FALLAT %d VEGADES L'ENTRADA A %s, %s"
@@ -7797,7 +7836,7 @@ msgstr "no hi ha TERM o no s'ha pogut executar stat a la tty\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "s'ha produït un error en aturar el servei: \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7807,8 +7846,8 @@ msgstr "s'ha produït un error en aturar el servei: \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "s'ha produït un error en executar finalprog\n"
+msgid "error at starting service \"%s\"\n"
+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)"
@@ -7936,25 +7975,25 @@ msgstr "%s: no s'ha pogut executar stat al fitxer temporal.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: no s'hapogut llegir el fitxer temporal.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "el valor de l'any no és legal: utilitzeu 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "el valor del mes és il·legal: utilitzeu 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "el valor de l'any no és legal: utilitzeu 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%2$d de %1$s"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "forma d'ús: cal [-13smjyV] [[mes] any]\n"
@@ -7978,6 +8017,113 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "no es pot obrir %s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Ordre desconeguda: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: no s'ha pogut llegir %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "s'ha produït un error d'escriptura a %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "S'ha canviat la informació del finger.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "No hi ha cap directori %s\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8133,7 +8279,7 @@ msgstr "%s: no s'ha pogut reanomenar %s a %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "crida: %s des dels fitxers...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8144,37 +8290,37 @@ msgstr ""
 "Useu «%s [opcions] %s» si realment desitgeu usar-lo.\n"
 "No s'ha executat script.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "forma d'ús: script [-a] [-f] [-q] [-t] [fitxer]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "S'ha iniciat l'execució de script, el fitxer és %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "s'ha produït un error d'escriptura a %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "S'ha iniciat l'execució de script a %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "s'ha produït un error d'escriptura a %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8183,17 +8329,17 @@ msgstr ""
 "\n"
 "S'ha finalitzat l'execució de script a %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "S'ha fet la seqüència, el fitxer és %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "no ha estat possible executar openpty\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "No queden pty\n"
@@ -8539,6 +8685,16 @@ msgstr "s'ha llegit %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "no es pot fer stat per a %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8569,6 +8725,11 @@ msgstr "s'ha produït un error en llegir %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "identificador invàlid"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8586,7 +8747,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8606,12 +8767,12 @@ msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8639,83 +8800,83 @@ msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM directori ... -f ] nom...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "S'ha produït un error en obrir %s"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
+"\n"
+"S'ha produït un error en tancar el fitxer\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "El disc %s no conté una taula de particions vàlida\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "no ha estat possible executar openpty\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "octets"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "no ha estat possible executar openpty\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Valor establert invàlid: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8966,7 +9127,7 @@ msgstr "loop: no s'ha pogut suprimir el dispositiu %s: %s\n"
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Aquest mount s'ha compilat sense suport per a loop. Recompileu-lo.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8986,7 +9147,7 @@ msgstr ""
 "  %s -f                                                # cerca no usats\n"
 "  %s [ -e xifratge ] [ -o desplaçament ] {-f|disp_loop} fitxer # configura\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -9002,252 +9163,296 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Valor establert invàlid: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Valor establert invàlid: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: dispositiu ocupat"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Quan es va compilar el suport per a loop no estava disponible. Recompileu-"
 "lo.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: no s'ha pogut trobar %s a %s o %s"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: segons mtab, %s ja està muntat a %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: segons mtab, %s està muntat a %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: no s'ha pogut obrir %s per a escriptura: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: s'ha produït un error en escriure %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: s'ha produït un error en canviar el mode de %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no s'ha pogut bifurcar: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "S'està provant amb %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: no heu especificat cap tipus de sistema de fitxers per a %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Es provarà amb tots els tipus indicats a %s o %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       i sembla que això és espai d'intercanvi\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Provaré amb el tipus %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s sembla espai d'intercanvi - no s'ha muntat"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "no s'ha estat possible muntar"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: només l'usuari root pot muntar %s a %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: el dispositiu loop està especificat dues vegades"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: el tipus està especificat dues vegades"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: s'està ometent la configuració d'un dispositiu loop\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Valor establert invàlid: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Valor establert invàlid: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: segons mtab, %s ja està muntat a %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: s'usarà el dispositiu loop %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: no ha estat possible configurar el dispositiu loop\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: s'ha configurat el dispositiu loop amb èxit\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no s'ha trobat %s; s'està creant...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: no s'ha pogut obrir %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: l'argument a -p o --pass-fd ha de ser un nombre"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: no s'ha pogut obrir %s per establir-ne la velocitat"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: segons mtab, %s ja està muntat a %s"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s ocupat - s'ha tornat a muntar de només lectura\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s ocupat - s'ha tornat a muntar de només lectura\n"
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: no s'ha pogut determinar el tipus de sistema de fitxers i no n'heu "
 "especificat cap"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: haureu d'especificar el tipus del sistema de fitxers"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: no ha estat possible muntar"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: el punt de muntatge %s no és un directori"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: s'ha denegat el permís"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: haureu de ser un superusuari per a usar mount"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s està ocupat"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc ja està muntat"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ja està muntat o %s està ocupat"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: el punt de muntatge %s no existeix"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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í"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: el dispositiu especial %s no existeix"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9256,12 +9461,12 @@ msgstr ""
 "mount: el dispositiu especial %s no existeix\n"
 "       (un prefix de camí no és un directori)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, 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:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9272,13 +9477,13 @@ msgstr ""
 "       superbloc incorrecte a %s, manca la pàgina de codis o algun altre "
 "error"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9286,7 +9491,7 @@ 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9294,7 +9499,7 @@ msgstr ""
 "        (no esteu intentant muntar una partició estesa,\n"
 "        en comptes d'alguna partició lògica de dins?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9302,112 +9507,107 @@ msgstr ""
 "        En alguns casos, es pot trobar informació útil a syslog,\n"
 "        proveu dmesg | tail o així\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "la taula de dispositius muntats està plena"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: no s'ha pogut llegir el superbloc"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositiu desconegut"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: no es reconeix el sitema de fitxers «%s»"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablement volíeu dir %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: potser volíeu dir «iso9660»?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: potser volíeu dir «vfat»?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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 de sistema de "
 "fitxers %s no està implementat"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s no és cap dispositiu de blocs, i stat falla?"
 
-#: mount/mount.c:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: el nucli no reconeix %s com a dispositiu de blocs\n"
 "       (potser fent «insmod controlador»?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no és un dispositiu de blocs"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s no és un dispositiu de blocs vàlid"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "dispositiu de blocs "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount : no s'ha pogut muntar %s%s com a només de lectura"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, 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 el "
 "senyalador explícit «-w»"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount : no s'ha pogut muntar %s%s com a només de lectura"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s està protegit contra escriptura; es muntarà en només lectura"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: no s'ha trobat %s; s'està creant...\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s ja està muntat a %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9417,24 +9617,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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'assumirà nfs per als dos punts\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: no s'ha especificat cap tipus; s'assumirà smb a causa del prefix //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ja està muntat a %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9494,39 +9694,39 @@ msgstr ""
 "Altres opcions: [-nfFrsvw] [-o opcions] [-p dfcontrasenya].\n"
 "Per a més detalls, consulteu «man 8 mount».\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: només l'usuari root pot fer això"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: només l'usuari root pot fer això"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "no s'ha muntat res"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: no s'ha trobat aquesta partició"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: no s'ha pogut trobar %s a %s o %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: avís: no hi ha cap nova línia al final de %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: la línia %d de %s no és correcta%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; s'ignorarà la resta del fitxer"
 
@@ -9539,7 +9739,7 @@ msgstr "s'ha produït un error en la crida xstrndup"
 msgid "not enough memory"
 msgstr "no hi ha prou memòria"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9550,7 +9750,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9563,7 +9763,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9575,128 +9775,133 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: No s'esperava EOF en el fitxer %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "no s'ha pogut bifurcar\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "no s'ha pogut executar exec\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() ha fallat"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "S'ha produït un error en obrir %s"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Nom"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: avís: %s té els permisos %04o que són insegurs, se suggereix %04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: S'està ometent el fitxer %s - sembla que té forats.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s a %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "No sou el superusuari.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9706,37 +9911,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: està compilat sense suport per a -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: no s'ha pogut bifurcar: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositiu de blocs no vàlid"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: no està muntat"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: no s'ha pogut escriure el superbloc"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9744,52 +9949,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: no s'ha trobat"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: haureu de ser superusuari per poder usar umount"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dispositius de blocs no permesos en el sistema de fitxers"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existeix, s'està provant amb umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ocupat - s'ha tornat a muntar de només lectura\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: no s'ha pogut tornar a muntar %s de només lectura\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s desmuntat\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no s'ha pogut trobar la llista dels sistemes de fitxers a desmuntar"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9801,80 +10006,85 @@ msgstr ""
 "                   [-O opcions]\n"
 "            umount [-f] [-r] [-n] [-v] especial | node...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "No s'ha pogut desmuntar «»\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "S'està intentant desmuntar %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No s'ha pogut trobar %s a mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no està muntat (segons mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembla que %s s'ha muntat diverses vegades"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s no està al fstab (i no sou el root)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: el muntatge de %s no concorda amb el fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: només %s pot desmuntar %s des de %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: només el root pot fer això"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9882,77 +10092,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "desconegut"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS sobre TCP no està implementat.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "ncount"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Nova"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
@@ -9975,7 +10204,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -10004,11 +10233,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "no s'ha pogut executar exec\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "forma d'ús: %s programa [arg ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "S'ha canviat la informació del finger.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "no es pot obtenir la mida de %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "l'assignació de memòria (malloc) ha fallat"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "No s'ha pogut escriure la partició a %s\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "No s'ha pogut escriure la partició a %s\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "s'ha produït un error en cercar"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "s'ha produït un error en cercar"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " i "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10155,7 +10492,15 @@ msgstr "   %f enters/seg.; %f rebut (caràcters/seg.)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Forma d'ús: %s [-c] [-n nivell] [-s mida_memòria_temporal]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10164,38 +10509,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Massa arguments.\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valor establert invàlid: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valor establert invàlid: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "No s'ha especificat l'opció --date.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "màx. nombre de segments = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "no ha estat possible executar openpty\n"
@@ -10242,6 +10592,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "no s'ha pogut bifurcar\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "S'ha canviat la informació del finger.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "No s'ha especificat l'opció --date.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "No s'ha especificat l'opció --date.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "la cerca ha fallat"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "el node d'identificació arrel no és un directori"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "no ha estat possible executar openpty\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "no ha estat possible executar openpty\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10335,482 +10738,457 @@ msgstr ""
 "forma d'ús: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "               [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opció il·legal -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: clau il·legal (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "s'ha denegat el permís per a la clau"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "la clau ja s'havia suprimit"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "clau invàlida"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "error desconegut en la clau"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "permisos denegats per l'identificador"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "identificador invàlid"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "l'identificador ja s'havia suprimit"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "error desconegut en l'identificador"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: argument desconegut: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "forma d'ús: %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "      %s [-s -m -q] -i identificador\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "      %s -h per a ajuda.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s proporciona informació sobre els recursos ipc als que teniu accés de "
-"lectura.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Especificació dels recursos:\n"
-"\t-m : memòria compartida\n"
-"\t-q : missatges\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : semàfors\n"
-"\t-a : tot (per defecte)\n"
+"%s proporciona informació sobre els recursos ipc als que teniu accés de "
+"lectura.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
-"Format de l'eixida:\n"
-"\t-t : temps\n"
-"\t-p : pid\n"
-"\t-c : creador\n"
+"-i id [-s -q -m] : detalls sobre els recursos identificats per "
+"l'identificador\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : límits\n"
-"\t-u : resum\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
-"-i id [-s -q -m] : detalls sobre els recursos identificats per "
-"l'identificador\n"
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "el nucli no està configurat per a memòria compartida\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Límits de la memòria compartida --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "màx. nombre de segments = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "mida màx. del segment (kbytes) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "total màx. memòria compartida (kbytes) = %lu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "mida mín. segment (octets) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Estat de la memòria compartida --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "segments assignats %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "pàgines assignades %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "pàgines residents %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "pàgines intercanviades %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Rendiment de l'intercanvi: %ld intents\t %ld encerts\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "----- Creadors/Propietaris dels segments memòria compartida -------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "-- Temps de connexió/desconnexió/modifica. mem. comp. --\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "propietari"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "connectat"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "desconnectat"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "modificat"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "-- Creador/últim operador memòria compartida --\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "---- Segments de memòria compartida ----\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "clau"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "octets"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "estat"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "No establert"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "blocat"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "nucli no configurat per als semàfors\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "-------- Límits semàfor --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "màxim nombre de matrius = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "màx. semàfors per matriu = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "màx. semàfors al sistema = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "màx. oper. per crida semop = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valor màxim del semàfor = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Estat del semàfor ------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "matrius usades = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "semàfors assignats = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "----- Creadors/propietaris matrius semàfor -----\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "-- Temps operació/modificació memòria compartida --\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "última operació"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "última modificació"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Matrius del semàfor ------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "el nucli no està configurat per a cues de missatges\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Missatges: límits -------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "nombre màx. de cues al sistema = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "mida màx. del missatge (octets) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "mida màx. per defecte de la cua (octets) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Missatges: estat --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "cues assignades = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "capçaleres usades = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "espai emprat = %d octets\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "--- Cues de missatges: creadors/propietaris ---\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "--- Temps tramesa./recep./modific. cues de missatges ---\n"
 
 # FIXME
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "envia"
 
 # FIXME
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "rep"
 
 # FIXME
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "modifica"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "-- Els PID de les cues de missatges --\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Cues de missatges -----\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "octets emprats"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "missatges"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "no s'ha pogut fer fsync"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10819,42 +11197,42 @@ msgstr ""
 "\n"
 "Segment de la memòria compartida shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "octets=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "no s'ha pogut fer fsync"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10863,32 +11241,32 @@ msgstr ""
 "\n"
 "Cua de missatges msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr "coctets=%ld\tqoctets=%ld\tqnùm=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "la cerca ha fallat"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10897,159 +11275,182 @@ msgstr ""
 "\n"
 "semid de la matriu del semàfor=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "valor"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "id invàlid : %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "identificador invàlid"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s no es un dispositiu de bloc especial"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "No s'ha pogut cercar a la unitat de disc"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Cap"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "Error RE:"
+msgid "error: cannot open %s"
+msgstr "%s: no es pot obrir %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "s'ha produït un error en llegir %s\n"
+msgid "failed to read: %s"
+msgstr "no es pot fer stat per a %s"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "s'ha produït un error en cercar"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "S'ha produït un error en obrir %s"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: s'ha produït un error en obrir: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr ""
 "\n"
 "S'ha produït un error en tancar el fitxer\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11058,70 +11459,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Antiga situació:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11130,75 +11544,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"forma d'ús: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR "
-"[ DESPLAÇAMENT ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (o rdev /linux, etc.) mostra el dispositiu ROOT actual"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         estableix el ROOT a /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              estableix els ROOTFLAGS (estat de només "
-"lectura)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            estableix la mida del RAMDISK"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-"  rdev -v /dev/fd0 1              estableix el VIDEOMODE de l'arrencada"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   usar el desplaçament d'octets N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   el mateix que rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     el mateix que rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     el mateix que rdev -v"
-
-#: sys-utils/rdev.c:87
-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=Pregunta, -2=Estès, -1=NormalVga,\n"
-"                              1=tecla1, 2=tecla2, ... "
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      useu -R 1 per muntar l'arrel de només lectura; -R 0 per a lectura/"
-"escriptura."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "falta una coma"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11309,11 +11654,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: prioritat antiga %d, nova prioritat %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11323,106 +11669,131 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: no s'ha pogut reconèixer el tipus de la taula de particions\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: clau il·legal (%s)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: opció il·legal -- %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr "%s versió %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Usant %s.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Usant %s.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s no és un dispositiu lp.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Missatge de %s@%s el %s a les %s ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 #, fuzzy
 msgid "rtc read"
 msgstr ", a punt"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11520,6 +11891,11 @@ msgstr "%s: valor incorrecte\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s no és un dispositiu lp.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "error de LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11550,6 +11926,11 @@ msgstr ", en línia"
 msgid ", error"
 msgstr ", error"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: no ha estat possible muntar"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "error de LPGETIRQ"
@@ -11593,6 +11974,16 @@ msgid "unshare failed"
 msgstr "la cerca ha fallat"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount : no s'ha pogut establir la velocitat de: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount : no s'ha pogut establir la velocitat de: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "no s'ha pogut executar exec\n"
@@ -12118,6 +12509,233 @@ msgid "Out of memory when growing buffer.\n"
 msgstr ""
 "S'ha esgotat la memòria en augmentar la mida de la memòria intermèdia.\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opció il·legal -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "segments assignats %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "pàgines assignades %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "pàgines residents %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "pàgines intercanviades %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Rendiment de l'intercanvi: %ld intents\t %ld encerts\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "s'ha produït un error en executar finalprog\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Valor establert invàlid: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "ncount"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Nova"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "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"
+
+#~ 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 ""
+#~ "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"
+#~ "    o: fdisk /dev/rd/c0d0 o: fdisk /dev/ida/c0d0  (per als dispositius "
+#~ "RAID)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "El nombre de cilindres per a aquest disc està establert en %d.\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"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: no s'ha trobat %s; s'està creant...\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "no s'ha pogut executar exec\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "forma d'ús: %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "      %s [-s -m -q] -i identificador\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "      %s -h per a ajuda.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Especificació dels recursos:\n"
+#~ "\t-m : memòria compartida\n"
+#~ "\t-q : missatges\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semàfors\n"
+#~ "\t-a : tot (per defecte)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Format de l'eixida:\n"
+#~ "\t-t : temps\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creador\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : límits\n"
+#~ "\t-u : resum\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "Error RE:"
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "s'ha produït un error en llegir %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "forma d'ús: rdev [ -rv ] [ -o DESPLAÇAMENT ] [ IMATGE [ VALOR "
+#~ "[ DESPLAÇAMENT ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (o rdev /linux, etc.) mostra el dispositiu ROOT actual"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         estableix el ROOT a /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              estableix els ROOTFLAGS (estat de només "
+#~ "lectura)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            estableix la mida del RAMDISK"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr ""
+#~ "  rdev -v /dev/fd0 1              estableix el VIDEOMODE de l'arrencada"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   usar el desplaçament d'octets N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   el mateix que rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     el mateix que rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ 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=Pregunta, -2=Estès, -1=NormalVga,\n"
+#~ "                              1=tecla1, 2=tecla2, ... "
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      useu -R 1 per muntar l'arrel de només lectura; -R 0 per a lectura/"
+#~ "escriptura."
+
+#~ msgid "missing comma"
+#~ msgstr "falta una coma"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "no hi ha prou memòria"
diff --git a/po/cs.po b/po/cs.po
index 2ffc8e25..87cd3174 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,14 +9,19 @@
 # Jiří Pavlovský <pavlovsk@ff.cuni.cz>, 1999 - 2001.
 # Petr Písař <petr.pisar@atlas.cz>, 2006.
 # Vladimír Michl <vladimir.michl@seznam.cz>, 2007
-# Petr Pisar <petr.pisar@atlas.cz>, 2007, 2008, 2009.
+# Petr Pisar <petr.pisar@atlas.cz>, 2007, 2008, 2009, 2010.
+#
+# (file system) label → jmenovka
+# (SELinux) label → značka
+# resource → prostředek
+# swap → odkakládací (prostor)
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.17-rc3\n"
+"Project-Id-Version: util-linux-ng 2.18-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
-"PO-Revision-Date: 2009-12-11 10:22+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
+"PO-Revision-Date: 2010-06-22 15:24+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -104,6 +109,11 @@ msgstr "načte znovu tabulku rozdělení disku"
 msgid "Usage:\n"
 msgstr "Použití:\n"
 
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid "  %s -V\n"
+msgstr "  %s -V\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -123,6 +133,17 @@ msgstr "Dostupné příkazy:\n"
 msgid "get size in 512-byte sectors"
 msgstr "vrátí velikost vyjádřenou v 512bajtových sektorech"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s: (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -227,15 +248,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Použití: %s [-n] ZAŘÍZENÍ\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s: (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -336,7 +348,7 @@ msgstr "CRC není možné zkontrolovat: starý formát cramfs"
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "volání malloc selhalo"
 
@@ -943,7 +955,7 @@ msgstr "volání stat pro zařízení %s selhalo"
 msgid "%s is not a block special device"
 msgstr "%s není blokovým zařízením"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "%s nelze otevřít"
@@ -967,7 +979,7 @@ msgstr "příliš mnoho i-uzlů – maximum je 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "nedostatek místa, je třeba alespoň %llu bloků"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Zařízení: %s\n"
@@ -1041,7 +1053,7 @@ msgstr "Chyba při zavírání %s"
 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:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1085,7 +1097,7 @@ msgstr ""
 " -i SOUBOR  vloží obraz ze SOUBORU do souborového systému (vyžaduje >= "
 "2.4.0)\n"
 " -n NÁZEV   nastaví název souborového systému cramfs\n"
-" -p         odsadí o %d bytů kvůli bootovacímu kódu\n"
+" -p         odsadí o %d bytů kvůli kódu zavaděče\n"
 " -s         seřadí položky v adresářích (stará volba, ignorováno)\n"
 " -z         vytvoří explicitní díry (vyžaduje >= 2.3.39)\n"
 " NÁZEV_ADRESÁŘE\n"
@@ -1280,7 +1292,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "chyba při posunu ukazovátka v check_blocks"
 
@@ -1360,173 +1372,178 @@ msgstr "Zadaná velikost stránky (%d) je chybná.\n"
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr "Používám zadanou velikost stránky %d místo systémové hodnoty %d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s: volání calloc() selhalo: %s\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Chybná velikost hlavičky odkládacího souboru, jmenovka nezapsána.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Jmenovka byla zkrácena.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "žádná jmenovka, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "žádné UUID\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Použití: %s [-c] [-pVELIKOST_STRÁNKY] [-L JMENOVKA] [-U UUID] ZAŘÍZENÍ "
 "[BLOKY]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "příliš mnoho chybných stránek"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "chybných stránek: 1\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "chybných stránek: %lu\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "odkládací prostor nelze převinout"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 msgid "unable to alloc new libblkid probe"
 msgstr "nelze alokovat nový test libblkid"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr "zařízení nelze přiřadit do testu liblkid"
+#: disk-utils/mkswap.c:400
+msgid "unable to assign device to libblkid probe"
+msgstr "zařízení nelze přidat do testu libblkid"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 msgid "unable to erase bootbits sectors"
 msgstr "zaváděcí bloky nelze smazat"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s: %s: varování: nemažte zaváděcí sektory\n"
 
 # Continuation of previous message
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (nalezena tabulka rozdělení disku typu %s). "
 
 # Alternate continuation of previous message
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "        on whole disk. "
 msgstr "        na celém disku. "
 
 # Alternate continuation of previous message
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, c-format
 msgid "        (compiled without libblkid). "
 msgstr "        (přeloženo bez libblkid). "
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: varování: ignoruji -U (%1$s nepodporuje UUID)\n"
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: nepodporuje odkládací prostor verze %d.\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "chyba: rozbor UUID selhal"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: chyba: velikost %llu KiB je větší než velikost zařízení %llu KiB\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: chyba: odkládacího prostor potřebuje aspoň %ld KiB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: varování: zkracuji odkládací prostor na %llu KiB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: chyba: Nebudu se pokoušet vytvořit odkládací zařízení na „%s“\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: chyba: %s je připojeno; odkládací prostor zde nevytvořím.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Odkládací prostor nelze nastavit: nečitelné"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Vytvářím odkládací prostor verze 1, velikost = %llu KiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: stránku se signaturou nelze zapsat: %s"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "volání fsync selhalo"
 
 # selinux file label - selinuxová nálepka/značka/štítek souboru?
 # Upřednostňuji značku
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: nelze získat selinuxovou značku souboru: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "matchpathcon() nelze provést"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "nový kontext selinuxu nelze vytvořit"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "nedokáži vypočíst kontext selinuxu"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s nelze změnit jmenovku z %s na %s: %s\n"
@@ -1593,63 +1610,117 @@ msgstr "raw%d:\tnapojeno na hlavní %d, vedlejší %d\n"
 msgid "Error setting raw device (%s)\n"
 msgstr "Chyba při nastavování syrového zařízení (%s)\n"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Nepoužitelné"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, c-format
+msgid "%s: unable to probe device"
+msgstr "%s: zařízení nelze vyzkoušet"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Volný prostor"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr "%s: víceznačný výsledek zkoušky, použijte wipefs(8)"
+
+#: disk-utils/swaplabel.c:71
+#, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: není neplatným odkládacím oddílem"
+
+#: disk-utils/swaplabel.c:77
+#, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: nepodporovaná verze odkládacího prostoru „%s“"
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:108
+#, c-format
+msgid "%s: failed to open"
+msgstr "%s: otevření selhalo"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:117
+#, c-format
+msgid "failed to parse UUID: %s"
+msgstr "UUID se nezdařilo rozebrat: %s"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:121
+#, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: přesun na UUID odkládacího prostoru selhal"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:125
+#, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: zápis UUID se nezdařil"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:136
+#, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: přesun na jmenovku odkládacího prostoru selhal"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr "jmenovka je příliš dlouhá. Zkrácena na „%s“"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:146
+#, c-format
+msgid "%s: failed to write label"
+msgstr "%s: chyba při zápisu jmenovky"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Použití: %s [PŘEPÍNAČE] <ZAŘÍZENÍ>\n"
+"\n"
+"Přepínače:\n"
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+" -h, --help             tato nápověda\n"
+" -L, --label <JMENOVKA> určuje novou jmenovku\n"
+" -U, --uuid <UUID>      určuje nové UUID\n"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:169
+#, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Více informací naleznete ve swaplabel(8).\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr "ignoruje se -U (UUID není podporováno)"
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Nepoužitelné"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Volný prostor"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Na disku byly provedeny změny.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1662,231 +1733,231 @@ 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:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "OSUDOVÁ CHYBA"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Stiskněte jakoukoliv klávesu pro ukončení programu cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Nelze posunout ukazovátko na disku"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Z disku nelze číst"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Nelze zapisovat na disk"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "příliš mnoho diskových oddílů"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Diskový oddíl začíná před sektorem 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Diskový oddíl končí před sektorem 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Diskový oddíl začíná za koncem disku"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Diskový oddíl končí za koncem disku"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Diskový oddíl končí v posledním částečném cylindru"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "logické diskový oddíl jsou chybně seřazeny"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "logické diskové oddíly se vzájemně překrývají"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "zvětšené logické diskové oddíly se vzájemně překrývají"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 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:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 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:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Nabídka beze směru. Používám vodorovný."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Chybná klávesa"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Stiskněte klávesu pro pokračování"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primární"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Vytvořit nový primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logický"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Vytvořit nový logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Nevytvářet diskový oddíl"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Vnitřní chyba !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Začátek"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Vytvořit diskový oddíl na začátku volného prostoru"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Vytvořit diskový oddíl na konci volného prostoru"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Pro rozšířený diskový oddíl není dostatek místa"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Nebyla nalezena žádná tabulka rozdělení disku.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Chybí tabulka rozdělení disku. Začínám s prázdnou tabulkou."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Chybná signatura tabulky rozdělení disku"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Neznámý typ tabulky rozdělení disku"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Přejete si začít s prázdnou tabulkou [a/N]?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 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:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Disk nelze otevřít"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 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:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "Varování!! Detekována nepodporovaná GPT (GUID tabulka rozdělení disku). "
 "Použijte GNU Parted."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Velikost disku nelze zjistit"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Chybný primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Chybný logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 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:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to 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:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Tabulka rozdělení disku nebyla uložena"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "ano"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Zadejte „ano“ či „ne“"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Ukládám tabulku rozdělení disku na disk…"
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Tabulka rozdělení disku byla uložena na disk"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
@@ -1895,84 +1966,84 @@ msgstr ""
 "Aby se tabulka aktualizovala, spusťte partprobe(8), kpartx(8) nebo\n"
 "restartujte systém."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 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:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Zadejte název souboru či stiskněte RETURN pro zobrazení: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Soubor „%s“ nelze otevřít"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "  Žádný  "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "  Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "  Primární"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "  Logický"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Zaveditelný"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Nic"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabulka rozdělení disku pro %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "             První       Poslední\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1980,7 +2051,7 @@ msgstr ""
 " # Typ       sektor      sektor    Posun     Délka    ID systému souborů   "
 "Příz\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1988,464 +2059,464 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ----Počátek----      -----Konec-----  Počáteční    Počet\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 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:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Přímý"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Vytisknout tabulku v přímém datovém formátu"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektory"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Vytisknout tabulku seřazenou dle sektorů"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabulka"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Vytisknout pouze tabulku rozdělení disku"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Netisknout tabulku"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Nápověda pro cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 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:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "diskových oddílů na Vašem pevném disku."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Příkaz      Význam"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Přepne aktuálnímu oddílu příznak zaveditelnosti"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Smaže aktuální oddíl"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Změní geometrii"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 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:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             kteří vědí, co činí."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Vypíše tuto nápovědu"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximálně zvětší aktuální diskový oddíl "
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Poznámka: Toto může učinit oddíl nekompatibilní s"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, …"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Vytvořit na volném místě nový oddíl"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 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:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             z několika formátů:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 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:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabulka seřazená dle sektorů"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Tabulka v přímém formátu"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Ukončí program bez uložení tabulky rozdělení disku"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Změní typ systému souborů"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Změní jednotky pro zobrazení velikosti oddílu"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Cykluje mezi MB, sektory a cylindry"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 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:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             nebo odmítnout napsáním „yes“ nebo"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             „no“"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nahoru       Přesune kurzor na předcházející oddíl."
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Dolů         Přesune kurzor na další oddíl."
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Překreslí obrazovku"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Vypíše tuto nápovědu"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "(s výjimkou zápisu - W)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Změní geometrii cylindrů"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Hlavy"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Změní geometrii hlav"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Změní geometrii sektorů"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Geometrie změněna"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Zadejte počet cylindrů: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Chybný počet cylindrů"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Zadejte počet hlav: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Chybný počet hlav"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Zadejte počet sektorů na stopu: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Chybný počet sektorů"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Zadejte typ systému souborů: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Nelze nastavit typ SS na prázdný"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Nelze nastavit typ SS na rozšířený"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Neznámý (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disk: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Velikost %'lld bajtů, %'lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Velikost %'lld bajtů, %'lld,%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Hlav: %d   Sektorů na stopu: %d    Cylindrů: %'lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Název"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Příznaky"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Typ oddílu"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Typ SS"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Popis]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Sektorů"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cylindrů"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "Velik. (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "Velik. (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Zavedit."
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Přepne příznak zaveditelnosti aktuálnímu diskovému oddílu"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Smazat"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Smaže aktuální diskový oddíl"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Změní geometrii disku (pouze pro odborníky)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Nápověda"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Vypíše nápovědu"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Zvětšit"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 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:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nový"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Vytvoří nový diskový oddíl ve volném prostoru"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Tisk"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Ukončí program bez uložení tabulky rozdělení disku"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Druh"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 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:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Jednotky"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 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:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Uložit"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 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:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Tento oddíl nelze nastavit jako zaveditelný."
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Prázdný diskový oddíl nelze smazat."
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Tento diskový oddíl nelze zvětšit."
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Tento diskový oddíl je nepoužitelný."
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Tento diskový oddíl je již používán."
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Typ prázdného diskového oddílu nelze změnit."
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Žádné další diskové oddíly"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Chybný příkaz"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994–2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2517,9 +2588,9 @@ msgstr ""
 "\n"
 "BSD tabulka rozdělení disku pro zařízení: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Příkazy"
 
@@ -2539,9 +2610,9 @@ msgstr "   i   instalovat zavaděč"
 msgid "   l   list known filesystem types"
 msgstr "   l   vypsat známé typy systémů souborů"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   vypíše tuto nabídku"
 
@@ -2553,14 +2624,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:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   ukončí program bez uložení změn"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   návrat do hlavní nabídky"
 
@@ -2603,13 +2674,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "První %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Poslední %s či +velikost či +velikostM či +velikostK"
@@ -2757,7 +2828,7 @@ msgstr "sektorů/stopu"
 msgid "tracks/cylinder"
 msgstr "stop/cylindr"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cylindry"
@@ -2815,7 +2886,7 @@ msgstr "Zavaděč instalován na %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Diskový oddíl (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, 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"
@@ -2839,224 +2910,224 @@ msgstr ""
 "\n"
 "Synchronizují se disky.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Použití: fdisk [-b SSZ] [-u] DISK     Změní tabulku rozdělení disku\n"
-"         fdisk -l [-b SSZ] [-u] DISK  Vypíše tabulku rozdělení disku\n"
-"         fdisk -s ODDÍL               Vypíše velikost diskového oddílu\n"
-"                                      v blocích\n"
-"         fdisk -v                     Vypíše informace o verzi\n"
-"DISK je něco jako /dev/hdb či /dev/sda a ODDÍL je něco jako /dev/hda7\n"
-"-u: vrací Začátek a Konec v sektorech (místo cylindrech)\n"
-"-b 2048: (pro některé MO jednotky) použije 2048bajtové sektory\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Použití: fdisk [-l] [-b SSZ] [-u] zařízení\n"
-"Např: fdisk /dev/hda  (pro první IDE disk)\n"
-"  či: fdisk /dev/sdc  (pro třetí SCSI disk)\n"
-"  či: fdisk /dev/eda  (pro první PS/2 ESDI disk)\n"
-"  či: fdisk /dev/rd/c0d0  či: fdisk /dev/ida/c0d0  (pro RAID zařízení)\n"
-"  …\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+"Použití:\n"
+" fdisk [PŘEPÍNAČE] <DISK>    změní tabulku rozdělení disku\n"
+" fdisk [PŘEPÍNAČE] -l <DISK> vypíše tabulku(y) rozdělení disku\n"
+" fdisk -s <ODDÍL>            vypíše velikost(i) diskového oddílu v blocích\n"
+"\n"
+"Přepínače:\n"
+" -b <VELIKOST>               velikost sektoru (512, 1024, 2048 nebo 4096)\n"
+" -c[=<REŽIM>]                režim kompatibility: „dos“ nebo "
+"„nondos“ (implic.)\n"
+" -h                          vypíše tuto nápovědu\n"
+" -u=[<JEDNOTKA>]             zobrazuje v jednotkách: „cylinders“ (cylindry)\n"
+"                             nebo „sectors“ (sektory)\n"
+" -v                          vypíše verzi programu\n"
+" -C <POČET>                  určuje počet cylindrů\n"
+" -H <POČET>                  určuje počet hlav\n"
+" -S <POČET>                  určuje počet sektorů na stopu\n"
+"\n"
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s nelze otevřít\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s nelze číst\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ukazovátko nelze posunout na %s.\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s nelze uložit\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Nelze alokovat více paměti\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Fatální chyba\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   přepne příznak \"pouze pro čtení\""
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   úprava bsd popisu disku"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   přepne příznak \"připojitelný\""
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   smaže diskový oddíl"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   vypíše známé typy diskových oddílů"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   vytvoří nový diskový oddíl"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   vytvoří prázdnou tabulku rozdělení disků typu IBM (DOS)"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   vypíše tabulku rozdělení disku"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   vytvoří prázdný Sun popis disku"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   změní ID systému diskového oddílu"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   změní jednotky v nichž jsou vypisovány informace"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   ověří tabulku rozdělení disku"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   uloží tabulku rozdělení disku a ukončí program"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   rozšiřující funkce (pouze pro odborníky)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   nastaví startovací diskový oddíl"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   úprava položky startovacího souboru"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   nastaví SGI odkládací diskový oddíl"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   přepne příznak \"startovací\""
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   přepne příznak \"DOS kompatibilní\""
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   změní množství alternativních cylindrů"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   změní množství cylindrů"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 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:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   změní množství extra sektorů na stopu"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   změní množství hlav"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   změní prokládací faktor"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   změní rychlost otáčení"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   změní počet sektorů/stopu"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   změní počet fyzických cylindrů"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   posune počátek dat v diskovém oddílu"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   vypíše rozšířené diskové oddíly"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   vytvoří tabulku rozdělení disku typu IRIX (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   opraví řazení diskových oddílů"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i   změní identifikátor disku"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Musíte nastavit"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "hlavy"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektory"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3065,30 +3136,11 @@ msgstr ""
 "%s%s.\n"
 "Můžete tak učinit z nabídky rozšiřujících funkcí.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " a "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Počet cylindrů tohoto disku je nastaven na %d.\n"
-"Na tom není nic špatného, ale jelikož je to více než 1024,\n"
-"může za určitých okolností dojít k problémům:\n"
-"1) s programy spouštěnými při startu (např. staré verze LILA)\n"
-"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:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3105,48 +3157,48 @@ msgstr ""
 "Použijte parted(1) a tabulku rozdělení disku typu GUID (GPT).\n"
 "\n"
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 "\n"
-"Zařízení uvádí, že velikost logického sektoru je menší než velikost\n"
-"sektoru fyzického. Doporučuje se dodržet zarovnání na hranice fyzických\n"
-"sektorů. V opačném případě může utrpět výkon.\n"
-"\n"
+"Zařízení uvádí, že velikost logického sektoru je menší než velikost sektoru\n"
+"fyzického. Doporučuje se dodržet zarovnání na hranice fyzických sektorů\n"
+"(nebo bloků optimálních pro I/O). V opačném případě může utrpět výkon.\n"
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
-"POZOR: Zařízení neposkytuje vyrovnání (alignment_offset) při dělení disku\n"
-"podle DOSu, avšak režim kompatibility s DOSem je zapnut.\n"
-"Použijte příkaz „c“ na vypnutí režimu DOSu.\n"
+"\n"
+"POZOR: Režim kompatibility s DOSem je zastaralý. Důrazně se doporučuje "
+"tento\n"
+"       režim vypnout (příkaz „c“)."
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
-"Doporučuje se změnit jednotky výpisů na sektory (příkaz „u“).\n"
 "\n"
+"POZOR: cylindry jakožto jednotky výpisů jsou zastaralé. Jednotky lze změnit\n"
+"         na sektory pomocí příkazu „u“.\n"
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, 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:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3155,32 +3207,32 @@ msgstr ""
 "Varování: vynechávám oddíly po čísle %d.\n"
 "Pokud tuto tabulku rozdělení disku uložíte, budou ztraceny.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, 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:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "vynechávám prázdný oddíl (%d)\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Identifikátor disku: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Nový identifikátor disku (současný 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3193,30 +3245,17 @@ msgstr ""
 "disk.\n"
 "Poté již nebudou stará data pochopitelně dostupná.\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Pozor: velikost sektoru je %d (nikoliv %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-"\n"
-"POZOR: Zařízení poskytuje alignment_offset (zarovnávací posun), ale posun\n"
-"neodpovídá geometrii zařízení.\n"
-"\n"
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3225,7 +3264,7 @@ msgstr ""
 "Tento disk má magické signatury DOSU i BSD.\n"
 "Pro vstup do BSD režimu použijte příkaz „b“.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3235,17 +3274,17 @@ msgstr ""
 "popis\n"
 "disku\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Vnitřní chyba\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Nadbytečný rozšířený diskový oddíl %d ignorován.\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3254,7 +3293,7 @@ msgstr ""
 "Varování: chybný příznak 0x%04x tabulky rozdělení disku %d bude opraven "
 "zápisem(w)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3263,21 +3302,21 @@ msgstr ""
 "\n"
 "třikrát jsem nalezl EOF - končím..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Šestnáctkově (L vypíše kódy):"
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, implicitně %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "Nepodporovaná přípona: „%s“.\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3286,74 +3325,79 @@ msgstr ""
 "Podporované: 10^N: KB (kilobajt), MB (megabajt), GB (gigabajt)\n"
 "              2^N: K  (kibibajt), M  (mebibajt), G  (gibibajt)\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Používám implicitní hodnotu %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Hodnota je mimo meze.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Číslo diskového oddílu"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, 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:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Vybrán oddíl %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ještě nejsou definovány žádné diskové oddíly!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Již byly definovány všechny primární diskové oddíly!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cylindr"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1548
+#: fdisk/fdisk.c:1614
+#, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Jednotky pro zobrazení/vstup změněny na cylindry (ZASTARALÉ!)\n"
+
+#: fdisk/fdisk.c:1616
 #, c-format
-msgid "Changing display/entry units to %s\n"
-msgstr "Měním jednotky v nichž jsou vypisovány informace na %s\n"
+msgid "Changing display/entry units to sectors\n"
+msgstr "Jednotky pro zobrazení/vstup změněny na sektory\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, 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:1569
+#: fdisk/fdisk.c:1636
 #, c-format
-msgid "DOS Compatibility flag is set\n"
-msgstr "Příznak DOSOVÉ kompatibility je nastaven.\n"
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
+msgstr "Příznak kompatibility s DOSem je nastaven (ZASTARALÉ!)\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Příznak DOSOVÉ kompatibility není nastaven.\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Diskový oddíl %d zatím neexistuje!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3365,7 +3409,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:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3374,7 +3418,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:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3385,7 +3429,7 @@ msgstr ""
 "neboť SunOS/Solaris to očekává a i Linux tomu dává přednost.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3396,63 +3440,63 @@ msgstr ""
 "oddíl 11 jako celý svazek (6), neboť IRIX to očekává.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Typ diskového oddílu %d je nezměněn: %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyz=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logický=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, 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:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "mělo by být (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Diskový oddíl %i nekončí na hranici cylindru.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "mělo by být (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
-msgstr "Oddíl %i nezačíná na hranici fyzického bloku.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
+msgstr "Oddíl %i nezačíná na hranici fyzického sektoru.\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3461,7 +3505,7 @@ msgstr ""
 "\n"
 "Disk %s: %'ld MB, %'lld bajtů\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3470,32 +3514,37 @@ msgstr ""
 "\n"
 "Disk %s: %'ld,%ld GB, %'lld bajtů\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "hlav: %'d, sektorů na stopu: %'llu, cylindrů: %'d"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", celkem %'llu sektorů"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Jednotky = %s po %d * %d = %'d bajtech\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr "Velikost sektoru (logického/fyzického): %u bajtů / %lu bajtů\n"
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr "Velikost I/O (minimální/optimální): %lu bajtů / %lu bajtů\n"
+
+#: fdisk/fdisk.c:1915
 #, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "Zarovnávací posun: %lu bajtů\n"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3504,12 +3553,12 @@ msgstr ""
 "Diskové oddíly jsou již seřazeny.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "Hotovo.\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3519,16 +3568,16 @@ msgstr ""
 "Toto nevypadá jako tabulka rozdělení disku.\n"
 "Pravděpodobně jste zvolili špatné zařízení.\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Zavádět   Začátek       Konec    Bloky    Id  Systém\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Zařízení"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3537,7 +3586,7 @@ msgstr ""
 "\n"
 "Diskové oddíly jsou chybně seřazeny\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3548,89 +3597,89 @@ msgstr ""
 "Disk %s: hlav: %'d, sektorů: %'llu, cylindrů: %'d\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varování: diskový oddíl %d obsahuje sektor 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Diskový oddíl %d: sektor %d má větší číslo než je maximum %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, 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:2175
+#: fdisk/fdisk.c:2247
 #, 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:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varování: diskový oddíl %d je prázdný.\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Celkový počet alokovaných sektorů %'llu je větší než maximum %'llu.\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "Zbývá %'lld nealokovaných %dbajtových sektorů\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektor %llu je již alokován\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Nejsou žádné volné sektory.\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Poslední %1$s, +%2$s nebo +velikost{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3643,7 +3692,7 @@ msgstr ""
 "\t novu prázdnou DOSOVOU tabulku rozdělení disku (příkaz „o“).\n"
 "\tVAROVÁNÍ: Tímto přijdete o současný obsah disku.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3656,22 +3705,22 @@ msgstr ""
 "\t novu prázdnou DOSOVOU tabulku rozdělení disku (příkaz „o“).\n"
 "\tVAROVÁNÍ: Tímto přijdete o současný obsah disku.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Všechny logické oddíly jsou obsazeny\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Přidávám primární diskový oddíl\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3682,32 +3731,32 @@ msgstr ""
 "   %s\n"
 "   p   primární diskový oddíl (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   logický diskový oddíl (5 nebo více)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   rozšířený diskový oddíl"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Chybné číslo diskového oddílu pro typ „%c“.\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr "Tabulka rozdělení disku byla změněna!\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, 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:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3720,7 +3769,7 @@ msgstr ""
 "Jádro stále používá starou tabulku. Nová tabulka se použije až po příštím\n"
 "restartu nebo po té, co spustíte partprobe(8) nebo kpartx(8).\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3733,7 +3782,7 @@ 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:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3742,42 +3791,42 @@ msgstr ""
 "\n"
 "Chyba při zavírání souboru\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronizují se disky.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Diskový oddíl %d neobsahuje datovou oblast.\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Nový začátek dat"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Příkaz pro odborníky (m pro nápovědu): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Počet cylindrů"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Počet hlav"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Počet sektorů"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, 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:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3790,33 +3839,33 @@ msgstr ""
 "nepodporuje GPT. Použijte GNU Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s nelze otevřít.\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s nelze otevřít.\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "příkaz %c není znám\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3826,16 +3875,16 @@ msgstr ""
 "jedním\n"
 "          zadaným zařízením.\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Příkaz (m pro nápovědu): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3844,16 +3893,16 @@ msgstr ""
 "\n"
 "Aktuální startovací soubor: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Zadejte název nového startovacího souboru: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Startovací soubor nebyl změněn.\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3943,15 +3992,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux nativní"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4086,7 +4135,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:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nejsou definovány žádné diskové oddíly\n"
@@ -4190,7 +4239,7 @@ msgstr ""
 "Zadejte ANO, pokud jste si jist, že chcete označit tento diskový oddíl "
 "jinak.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "ANO\n"
 
@@ -4247,7 +4296,7 @@ msgstr ""
 "pochopitelně dostupná.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4268,55 +4317,55 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "Nepřiřazeno"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Celý disk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "Náhr. sektory SunOS"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "Vyhrazeno pro SunOS"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux RAID samorozpoznatelný"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4329,22 +4378,22 @@ msgstr ""
 "cylindry a diskové oddíly, nebo vytvořit novou tabulku (příkaz s v hlavní\n"
 "nabídce)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Nalezl jsem sunovský popis disku s chybnou verzí [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Nalezl jsem sunovský popis disku s chybným „sanity“ [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Nalezl jsem sunovský popis disku s chybným počtem_oddílů [%u].\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4352,7 +4401,7 @@ msgstr ""
 "Varování: Chybné hodnoty musí být opraveny a bude tak učiněno při zápisu "
 "(w)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4364,31 +4413,31 @@ msgstr ""
 "do paměti, dokud se nerozhodnete je uložit na disk. Poté již nebudou stará\n"
 "data pochopitelně dostupná.\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektorů/stopu"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Nevyužívaný prostor - sektory 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nevyužívaný prostor - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4397,7 +4446,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:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4406,12 +4455,12 @@ msgstr ""
 "Velmi se doporučuje, aby třetí oddíl zaujímal celý prostor disku\n"
 "a byl typu „Celý disk“\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je již alokován\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4421,7 +4470,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:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4431,7 +4480,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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4445,12 +4494,12 @@ 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:581
+#: fdisk/fdisksunlabel.c:576
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4458,50 +4507,50 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Disk %s (sunovský tabulka rozdělení disku): hlav: %'d, sektorů: %'llu,\n"
-"o/m: %'d, cylindrů: %'d, náhradních cylindrů: %'d, fyzických cylindrů: %'d\n"
-"extra sektorů/cyl: %d, prokládání: %d:1\n"
+"Disk %s (sunovský tabulka rozdělení disku): hlav: %'u, sektorů: %'llu,\n"
+"o/m: %'d, cylindrů: %'u, náhradních cylindrů: %'d, fyzických cylindrů: %'d\n"
+"extra sektorů/cyl: %'d, prokládání: %d:1\n"
 "ID jmenovky: %s\n"
 "ID svazku: %s\n"
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
 "\n"
-"Disk %s (sunovská tabulka rozdělení disku): hlav: %'d, sektorů: %'llu,\n"
-"cylindrů: %'d\n"
+"Disk %s (sunovská tabulka rozdělení disku): hlav: %'u, sektorů: %'llu,\n"
+"cylindrů: %'u\n"
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, 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:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Počet alternativních cylindrů"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektory na cylindr"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Interleave faktor"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Rychlost otáčení (otm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Počet fyzických cylindrů"
 
@@ -4710,6 +4759,10 @@ msgstr "Minix / starý Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap/Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 skrytý C: disk"
@@ -4764,7 +4817,7 @@ msgstr "NetBSD"
 
 #: fdisk/i386_sys_types.c:73
 msgid "Darwin boot"
-msgstr "Darwin bootovací"
+msgstr "Darwin zaveditelný"
 
 #: fdisk/i386_sys_types.c:74
 msgid "HFS / HFS+"
@@ -5333,95 +5386,95 @@ msgstr "byl zadán přepínač -n: Nic nebylo změněno\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Chyba při ukládání starých sektorů - končím\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, 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:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "příliš dlouhý či neúplný řádek - končím\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, 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:1757
+#: fdisk/sfdisk.c:1762
 #, 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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nerozpoznaný vstup: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "číslo je příliš veliké\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "nesmysly za číslem\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "není místo pro popis diskového oddílu\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "okolní rozšiřující diskový oddíl nelze vytvořit\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "příliš mnoho vstupních položek\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Již nejsou volné bloky\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Chybný typ\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Varování: zadaná velikost(%lu) překračuje maximální povolenou velikost (%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Varování: prázdný diskový oddíl\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, 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:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nerozpoznaný příznak 'startovací' - zvolte - či *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "neúplná c,h,s specifikace?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Rozšířený diskový oddíl na neočekávaném místě\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "chybný vstup\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "příliš mnoho diskových oddílů\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5433,96 +5486,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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Použití: %s [PŘEPÍNAČE] ZAŘÍZENÍ…\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "Zařízení: něco jako /dev/hda či /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "Užitečné přepínače:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 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:2293
+#: fdisk/sfdisk.c:2298
 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:2294
+#: fdisk/sfdisk.c:2299
 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:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [či --dump]:      taktéž, ale ve formátu vhodném k dalšímu zpracování"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 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:2298
+#: fdisk/sfdisk.c:2303
 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:2299
+#: fdisk/sfdisk.c:2304
 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:2300
+#: fdisk/sfdisk.c:2305
 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:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                změní pouze diskový oddíl s číslem #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 žádné změny nebudou uloženy na disk"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I SOUBOR :          obnoví tyto sektory ze SOUBORU"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [či --version]:   vypíše informace o verzi"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [či --help]:      vypíše tuto nápovědu"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "Nebezpečné přepínače:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [či --show-geometry]:\n"
 "                         vypíše informace o geometrii, které udržuje jádro"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5531,7 +5584,7 @@ msgstr ""
 "                         vypíše informace o geometrii, která byla odhadnuta\n"
 "                         z tabulky rozdělení disku"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5540,61 +5593,61 @@ msgstr ""
 "                         vypíše informace o rozšířených diskových\n"
 "                         oddílech a na vstupu bude očekávat jejich popis"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 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:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [či --quiet]:    nebude vypisovat varovné hlášky"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Nalezenou geometrii můžete přepsat pomocí:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [či --cylinders #]:nastaví počet cylindrů"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [či --heads #]:    nastaví počet hlav"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [či --sectors #]:  nastaví počet cylindrů"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Ověřování konzistence můžete vypnout pomocí:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Použití:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An zařízení\t aktivuje diskový oddíl n, deaktivuje ostatní\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5607,67 +5660,67 @@ msgstr ""
 "sfdisk nepodporuje GPT. Použijte GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "K potlačení této kontroly použijte přepínač --force.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "žádný příkaz?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "celkový počet bloků: %'llu\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 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:2667
+#: fdisk/sfdisk.c:2672
 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:2669
+#: fdisk/sfdisk.c:2674
 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:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "můžete zadat pouze jedno zařízení (výjimkou jsou přepínače -l a -s)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s nelze otevřít pro čtení i zápis.\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s nelze otevřít pro čtení\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Nelze zjistit velikost %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5675,7 +5728,7 @@ msgstr ""
 "Hotovo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5685,35 +5738,35 @@ msgstr ""
 "MBR\n"
 "nastartuje pouze z disku s jedním aktivním diskovým oddílem.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id %lx je chybné\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Tento disk je právě používán.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatální chyba: %s nelze nalézt\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, 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:3027
+#: fdisk/sfdisk.c:3032
 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:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5726,30 +5779,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:3033
+#: fdisk/sfdisk.c:3038
 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:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Stará situace:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, 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:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Nová situace:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5757,21 +5810,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:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Vyhovuje Vám to? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Uložit na disk? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5780,16 +5833,16 @@ msgstr ""
 "\n"
 "sfdisk: předčasný konec vstupu\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Končím - nebyly učiněny žádné změny\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Odpovězte prosím y,n či q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5798,7 +5851,7 @@ msgstr ""
 "Nová tabulka rozdělení disku byla úspěšně uložena.\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5810,17 +5863,17 @@ msgstr ""
 "bla7\n"
 "bs=512 count=1' (viz fdisk(8)).\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "VAROVÁNÍ: %s se nepodařilo otevřít: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr "VAROVÁNÍ: chybný formát na řádku %d souboru %s\n"
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5832,37 +5885,37 @@ msgstr ""
 "\tco nejdříve.\n"
 "\n"
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr "fsck: %s: nenalezeno\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr "%s: wait: Žádní další potomci?!\n"
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr "Varování… %s nad zařízením %s skončil signálem %d.\n"
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr "%s %s: status je %x, to by nikdy nemělo přihodit.\n"
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "%s dokončeno (návratový kód %d)\n"
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: Chyba %d při provádění fsck.%s nad %s\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
@@ -5870,11 +5923,11 @@ msgstr ""
 "Buďto všechny, nebo žádný z typů souborových systémů předaných v -t musí\n"
 "být uvedeny s počátečním „no“ nebo „!“.\n"
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "Pro typy souborových systémů nebylo možné alokovat paměť\n"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
@@ -5883,67 +5936,67 @@ msgstr ""
 "%s: přeskakuji chybný řádek v /etc/fstab: přípojný bod typu bind\n"
 "s nenulovým pořadím kontroly\n"
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: přeskakuje se neexistující zařízení\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr "fsck: %s nelze zkontrolovat: fsck.%s nenalezen\n"
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr "Kontroluji všechny systému souborů.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "– čeká se – (průchod %d)\n"
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "Použití: fsck [-AMNPRTV] [-C [fd]][-t typ_ss] [volby_ss] [systém_souborů…]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: příliš mnoho zařízení\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "%s nebylo možné otevřít: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "Je /proc připojeno?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr "Jen root může hledat odpovídající souborové systémy: %s\n"
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Nebylo možné nalézt odpovídající systém souborů: %s\n"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: příliš mnoho argumentů\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, c-format
 msgid "fsck from %s\n"
 msgstr "fsck z %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "%s: Paměť pro fsck_path nelze alokovat\n"
@@ -6096,7 +6149,7 @@ msgstr "Jelikož jsem se nesnažil, nepodařilo se mi získat práva pro příst
 #: hwclock/cmos.c:584
 #, 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"
+msgstr "%s: přístup k portu nelze získat: volání iopl(3) selhalo.\n"
 
 #: hwclock/cmos.c:587
 #, c-format
@@ -6443,7 +6496,15 @@ msgstr "Nebylo nalezeno žádné použitelné rozhraní k hodinám.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Systémový čas nelze nastavit.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+"Je předpovězeno, že v čase %'ld sekund po roce 1969 reálné hodiny\n"
+"budou ukazovat %'ld sekund od konce roku 1969.\n"
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6457,39 +6518,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:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, 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:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s na %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6508,6 +6569,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6545,6 +6607,7 @@ msgstr ""
 "       --getepoch     vypíše počátek epochy hodin reálného času podle jádra\n"
 "       --setepoch     nastaví jádru počátek epochy hodin reálného času na\n"
 "                      hodnotu zadanou volbou --epoch\n"
+"       --predict      předpoví hodnotu RTC v době zadané pomocí --date\n"
 "  -v | --version      vypíše verzi hwclocku na standardní výstup\n"
 "\n"
 "Volby: \n"
@@ -6554,7 +6617,7 @@ msgstr ""
 "       --directisa    místo %s použije přímo ISA sběrnici\n"
 "       --badyear      ignoruje rok z RTC, protože BIOS je rozbitý\n"
 "       --date         čas, na který budou nastaveny hodiny reálného času\n"
-"       --epoch=ROK    určuje počátek epochy hodin reálného času\n"
+"       --epoch=ROK    určuje rok, kdy začíná epocha hodin reálného času\n"
 "       --noadjfile    nepoužije /etc/adjtime. Vyžaduje použití buď --utc,\n"
 "                      nebo --localtime\n"
 "       --adjfile=CESTA\n"
@@ -6565,7 +6628,7 @@ msgstr ""
 "  -D | --debug        ladicí režim\n"
 "\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6575,18 +6638,18 @@ msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "                       určí typ vašeho systému Alpha (vizte hwclock(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "%s: Nelze se připojit ke kontrolnímu systému\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6595,14 +6658,14 @@ msgstr ""
 "Zadal jste vícero funkčních přepínačů.\n"
 "Program může provést v jeden okamžik právě jednu funkci.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, 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:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6611,7 +6674,7 @@ msgstr ""
 "%s: Volby --adjust a --noadjfile se vzájemně vylučují. Vy jste však použil "
 "obě.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6620,40 +6683,40 @@ msgstr ""
 "%s: Volby --adjfile a --noadjfile se vzájemně vylučují. Vy jste však použil"
 "(a) obě.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Současně s --noadjfile musíte použít buď --utc, nebo --localtime\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, 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:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, 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:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6942,12 +7005,12 @@ msgstr "%s: Nemohu nastavit výchozí kontext pro /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "Měním finger informace o uživateli %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: chyba PAM, končím: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7175,35 +7238,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATÁLNÍ: nelze znovu otevřít tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "FATÁLNÍ: %s není terminálem"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "FATÁLNÍ: špatné tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, 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:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Použití: login [fp] [uživatelské jméno]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM nelze inicializovat: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "Přihlašovací jméno:"
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, 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:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7212,17 +7280,17 @@ msgstr ""
 "Chybné přihlášení\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, 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:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7231,7 +7299,7 @@ msgstr ""
 "\n"
 "Chybné přihlášení\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7240,120 +7308,120 @@ msgstr ""
 "\n"
 "Problém během nastavování relace. Přerušuji činnost.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULLOVÉ jméno uživatele v %s:%d. Přerušuji činnost."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Neplatné jméno uživatele „%s“ v %s:%d. Přerušuji činnost."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Nedostatek paměti\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Chybné uživatelské jméno"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, 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:805
+#: login-utils/login.c:809
 #, 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:809
+#: login-utils/login.c:813
 #, 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:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Chybné přihlášení\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, 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:1095
+#: login-utils/login.c:1099
 #, 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:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "PŘIHLÁŠENÍ UŽIVATELE ROOT NA TTY %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, 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:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PŘIHLÁŠENÍ UŽIVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Máte novou poštu.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Máte starou poštu.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: volání fork selhalo: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "Selhalo TIOCSCTTY: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "volání setuid() selhalo"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Adresář %s neexistuje!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, 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:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: nedostatek paměti pro skript shellu.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skript shellu %s nelze spustit.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: žádný shell: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7362,65 +7430,65 @@ msgstr ""
 "\n"
 "Přihlašovací jméno na %s: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "přihlašovací jméno je příliš dlouhé.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "JMÉNO je příliš dlouhé"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "přihlašovací jméno nesmí začínat '-'.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "příliš mnoho znaků LF\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "PŘÍLIŠ mnoho znaků LF"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, 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:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Poslední přihlášení: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "%.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "CHYBNÉ PŘIHLÁŠENÍ UŽIVATELE %2$s Z %1$s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, 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:1477
+#: login-utils/login.c:1481
 #, 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:1480
+#: login-utils/login.c:1484
 #, 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"
@@ -7680,8 +7748,8 @@ msgstr "žádný TERM nebo selhalo volání stat pro tty\n"
 
 #: login-utils/simpleinit.c:938
 #, c-format
-msgid "error stopping service: \"%s\"\n"
-msgstr "chyba při zastavování služby: „%s“\n"
+msgid "error at stopping service \"%s\"\n"
+msgstr "chyba při zastavování služby „%s“\n"
 
 #: login-utils/simpleinit.c:950
 #, c-format
@@ -7690,8 +7758,8 @@ msgstr "Zastavená služby: %s\n"
 
 #: login-utils/simpleinit.c:1070
 #, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "chyba při spouštění programu: „%s“\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "chyba při spouštění služby „%s“\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7817,25 +7885,25 @@ msgstr "%s: volání stat pro dočasný soubor selhalo.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: dočasný soubor nelze číst.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "chybná hodnota pro den: použijte 1–%d"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "chybná hodnota pro měsíc: použijte 1–12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "chybná hodnota pro rok: použijte 1–9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Použití: cal [-13smjyV] [[[DEN] MĚSÍC] ROK]\n"
@@ -7859,6 +7927,145 @@ msgstr "Použití: %s JMENOVKA=<JMENOVKA>|UUID=<UUID>\n"
 msgid "unable to resolve '%s'"
 msgstr "„%s“ nelze přeložit"
 
+#: misc-utils/findmnt.c:192
+#, c-format
+msgid "unknown column: %s"
+msgstr "neznámý sloupec: %s"
+
+#: misc-utils/findmnt.c:308
+msgid "failed to add line to output"
+msgstr "přidání řádku na výstup selhalo"
+
+#: misc-utils/findmnt.c:359
+msgid "failed to initialize libmount tab"
+msgstr "tabulku libmountu se nepodařilo inicializovat"
+
+#: misc-utils/findmnt.c:364
+#, c-format
+msgid "can't read: %s"
+msgstr "nelze přečíst: %s"
+
+#: misc-utils/findmnt.c:370
+#, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: chyba rozboru: %s"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+"\n"
+"Použití:\n"
+" %1$s [VOLBY]\n"
+" %1$s [VOLBY] <ZAŘÍZENÍ> | <BOD_PŘIPOJENÍ>\n"
+" %1$s [VOLBY] <ZAŘÍZENÍ> <BOD_PŘIPOJENÍ>\n"
+" %1$s [VOLBY] [--source <ZAŘÍZENÍ>] [--target <BOD_PŘIPOJENÍ>]\n"
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+"\n"
+"Volby:\n"
+" -s, --fstab            hledá ve statické tabulce souborových systémů\n"
+" -m, --mtab             hledá v tabulce připojených souborových systémů\n"
+" -k, --kernel           hledá v jaderné tabulce připojených souborových\n"
+"                        systémů (implicitní)\n"
+"\n"
+" -c, --canonicalize     cesty vypisuje v kanonickém tvaru\n"
+" -d, --direction <SMĚR> směr hledání – „forward“ (dopředné) nebo\n"
+"                        „backward“ (zpětné)\n"
+" -e, --evaluate         všechny značky (jmenovky/UUID) před zobrazením\n"
+"                        vyhodnotí\n"
+" -f, --first-only       vypíše pouze první nalezený souborový systém\n"
+" -h, --help             zobrazí tuto nápovědu\n"
+" -i, --invert           obrátí smysl vyhledávacích pravidel\n"
+" -l, --list             výstup ve formátu seznamu\n"
+" -n, --noheadings       nezobrazí záhlaví\n"
+" -u, --notruncate       nezkracuje text ve sloupcích\n"
+" -O, --options <SEZNAM> omezí množinu souborových systémů podle voleb\n"
+"                        připojení\n"
+" -o, --output <SEZNAM>  zobrazí dané sloupce\n"
+" -r, --raw              neformátovaný výstup\n"
+" -a, --ascii            pro vykreslení stromu použije znaky ASCII\n"
+" -t, --types <SEZNAM>   omezí množinu souborových systémů podle jejich "
+"druhu\n"
+" -S, --source <ŘETĚZEC> zařízení, LABEL= (jmenovka) nebo UUID=\n"
+" -T, --target <ŘETĚZEC> bod připojení\n"
+"\n"
+
+#: misc-utils/findmnt.c:483
+#, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Více informací naleznete ve findmnt(1).\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr "volby se vzájemně vylučují"
+
+#: misc-utils/findmnt.c:564
+#, c-format
+msgid "unknown direction '%s'"
+msgstr "neznámý směr „%s"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+"volby --target a --source nemohou být použity společně s prvkem příkazového "
+"řádku, který není volbou"
+
+#: misc-utils/findmnt.c:679
+msgid "failed to initialize libmount iterator"
+msgstr "iterátor libmountu se nepodařilo inicializovat"
+
+#: misc-utils/findmnt.c:685
+msgid "failed to initialize libmount cache"
+msgstr "pomocnou paměť libmountu se nepodařilo inicializovat"
+
+#: misc-utils/findmnt.c:695
+msgid "failed to initialize output table"
+msgstr "výstupní tabulku se nepodařilo inicializovat"
+
+#: misc-utils/findmnt.c:707
+msgid "failed to initialize output column"
+msgstr "výstupní sloupec se nepodařilo inicializovat"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8023,7 +8230,7 @@ msgstr "%s: %s nelze přejmenovat na %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Použití: %s Z NA SOUBOR…\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8034,37 +8241,37 @@ 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:173
+#: misc-utils/script.c:182
 #, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "Použití: script [-a] [-f] [-q] [-t] [SOUBOR]\n"
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
+msgstr "použití: script [-a] [-f] [-q] [-t] [SOUBOR]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script spuštěn. Soubor je %s.\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s: chyba zápisu %d: %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Script spuštěn %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s: chyba zápisu: %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: skript soubor nelze zapsat, chyba: %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8073,17 +8280,17 @@ msgstr ""
 "\n"
 "Script ukončen %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script utils. Soubor je %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "volání openpty selhalo\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Nejsou žádná další volná pty\n"
@@ -8391,7 +8598,7 @@ msgstr "Použití: %s [-d] [-p PID_SOUBOR] [-s CESTA_K_SOCKETU] [-t LIMIT]\n"
 #: misc-utils/uuidd.c:48
 #, c-format
 msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
-msgstr "       %s [-r|t] [-n POČ] [-s CESKA_K_SOCKETU]\n"
+msgstr "       %s [-r|t] [-n POČ] [-s CESTA_K_SOCKETU]\n"
 
 #: misc-utils/uuidd.c:50
 #, c-format
@@ -8422,6 +8629,16 @@ msgstr "načtení počtu"
 msgid "bad response length"
 msgstr "chybná délka odpovědi"
 
+#: misc-utils/uuidd.c:244
+#, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "Nezdařilo se otevřít/vytvořit %s: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "Nezdařilo se zamknout %s: %s\n"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8452,6 +8669,11 @@ msgstr "Chyba při čtení z klienta, délka = %d\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr "operace %d, příchozí počet = %d\n"
 
+#: misc-utils/uuidd.c:362
+#, c-format
+msgid "operation %d\n"
+msgstr "operace %d\n"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8462,17 +8684,17 @@ msgstr "Vygenerované časové UUID: %s\n"
 msgid "Generated random UUID: %s\n"
 msgstr "Vygenerované náhodné UUID: %s\n"
 
-# TODO: plurals
+# TODO: plurals
 #: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
 msgstr "Vygenerované časové UUID %s a %d následujících\n"
 
-# TODO: plurals
+# TODO: plurals
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
-msgstr "Vygenerováno UUID: %d:\n"
+msgid "Generated %d UUIDs:\n"
+msgstr "Vygenerováno %d UUID:\n"
 
 #: misc-utils/uuidd.c:427
 #, c-format
@@ -8492,12 +8714,12 @@ msgstr "Chyba při volání démona uuidd (%s): %s\n"
 # TODO: plurals
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr "%s a následující %d UUID\n"
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr "Seznam UUID:\n"
 
 #: misc-utils/uuidd.c:557
@@ -8525,84 +8747,79 @@ msgstr "Použití: %s [-r] [-t]\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM adresář ... -f ] název...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
 msgstr "funkce calloc selhala"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
 msgstr "funkce strdup selhala"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr "inicializace testování se nezdařila"
+#: misc-utils/wipefs.c:202
+#, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "chyba: %s: inicializace testování se nezdařila"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
-msgstr "na pozici 0x%jx nebyl nalezen magický řetězec – ignoruje se."
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "POZOR: %s: zdá se, že obsahuje tabulku rozdělení disku „%s“"
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:259
+#, c-format
+msgid "no magic string found at offset 0x%jx -- ignored"
+msgstr "na pozici 0x%jx nebyl nalezen žádný magický řetězec – ignoruje se"
+
+#: misc-utils/wipefs.c:266
 #, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: přesun na pozici 0x%jx selhal"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, c-format
 msgid "%s: write failed"
 msgstr "%s: zápis se nezdařil"
 
 # TODO: plurals
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, c-format
 msgid "%zd bytes ["
 msgstr "%zd bajtů ["
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr "] vymazáno na pozici 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: otevření se nezdařilo"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "zadána neplatná hodnota pozice „%s“"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Použití: %s [PŘEPÍNAČE] <NÁZEV_SOUBORU>\n"
-"\n"
-"Přepínače:\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 " -a, --all             zničí všechny magické řetězce (BUĎTE OPATRNÍ!)\n"
-" -h, --help            tato nápověda\n"
-" -n, --no-act          provede vše až na volání write()\n"
+" -h, --help            zobrazí tuto nápovědu\n"
+" -n, --no-act          provede vše až na samotné volání write()\n"
 " -o, --offset <ČÍSLO>  pozice v bajtech, na které se bude mazat\n"
 " -p, --parsable        vypisuje v strojově zpracovatelném formátu namísto\n"
 "                       v přehledné podobě\n"
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, c-format
 msgid ""
 "\n"
@@ -8611,7 +8828,7 @@ msgstr ""
 "\n"
 "Více informací naleznete ve wipefs(8).\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr "--offset a --all se vzájemně vylučují"
 
@@ -8859,7 +9076,7 @@ msgstr "loop: zařízení %s nelze smazat: %s\n"
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Tento program byl přeložen bez podpory pro loop. Přeložte jej znovu.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8884,7 +9101,7 @@ msgstr ""
 "SOUBOREM\n"
 " %1$s [PŘEPÍNAČE] {-f|--find|LOOP_ZAŘÍZENÍ} SOUBOR  sestrojí zařízení\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8911,248 +9128,300 @@ msgstr ""
 " -v | --verbose           upovídaný režim\n"
 "\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "%s: zadána neplatná pozice „%s“"
+
+#: mount/lomount.c:1023
+#, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "%s: zadáno neplatné omezení délky „%s“"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
-msgstr "Loop zařízení %s\n"
+msgstr "Loop zařízení je %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "ukradený loop=%s… zkouším znovu\n"
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: zařízení se právě používá"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Podpora pro loop nebyla při překladu zadána. Přeložte program znovu.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+"\n"
+"mount: pozor: Do /etc/mtab nelze zapsat (například systém souborů je pouze\n"
+"       pro čtení). Je možné, že údaje hlášené nástrojem mount(8) nebudou\n"
+"       aktuální. Aktuální informace o přípojných bodech lze zjistit\n"
+"       v souboru /proc/mounts.\n"
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr "mount: řetězec přepínačů „%s“ je nesprávně uzavřen do uvozovek"
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: %s přeloženo z „%s“ na „%s“\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: podle mtab je %s již připojeno na %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: podle mtab je %s připojeno na %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s nelze otevřít pro zápis: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: chyba při zápisu %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: chyba při změně módu %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: číslo skupiny (GID) nelze nastavit: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: číslo uživatele (UID) nelze nastavit: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: volání fork selhalo: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Používám %s.\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: nezadal jste typ systému souborů pro %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Vyzkouším všechny typy v %s či %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       a vypadá to, že se jedná o odkládací prostor\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Vyzkouším typ %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vypadá jako odkládací prostor - nepřipojeno"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+"mount: %s: nalezeno více souborových systémů. To by se nemělo stát.\n"
+"       Explicitně uveďte druh souborového systému pomocí „-t DRUH“ nebo\n"
+"       vyčistěte zařízení pomocí wipefs(8).\n"
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "připojení se nezdařilo"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: pouze superuživatel může připojit %s na %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: zařízení loop bylo zadáno dvakrát"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: typ byl zadán dvakrát"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: přeskakuji nastavení loop zařízení\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "mount: zadán neplatná pozice „%s“"
+
+#: mount/mount.c:1155
+#, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "mount: zadáno neplatné omezení délky „%s“"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: podle mtab je %s již připojeno na %s jako loop"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: chystám se použít zařízení loop %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: ukradený loop=%s … zkouším znovu\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: ukradený loop=%s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: nepodařilo se nastavit zařízení loop\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: zařízení loop bylo korektně nastaveno\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nebylo nalezeno - vytvářím jej..\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s nelze otevřít: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument přepínačů -p a --pass-fd musí být číslo"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s nelze otevřít za účelem nastavení rychlosti"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: rychlost nelze nastavit: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: podle mtab je %s již připojeno do %s\n"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "mount: pozor: %s se zdá být připojen pro čtení i zápis.\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "mount: pozor: %s se zdá být připojen jen pro čtení.\n"
+
+#: mount/mount.c:1482
 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:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: musíte zadat typ systému souborů"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: připojení se nezdařilo"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: přípojný bod %s není adresářem"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: přístup odmítnut"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount může používat pouze superuživatel"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s se používá"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc je již připojeno"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, 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:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: přípojný bod %s neexistuje"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speciální zařízení %s neexistuje"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9161,12 +9430,12 @@ msgstr ""
 "mount: speciální zařízení %s neexistuje\n"
 "              (název cesty nezačíná adresářem)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, 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:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9175,7 +9444,7 @@ msgstr ""
 "mount: chybný typ SS, chybný přepínač, chybný superblok na %s,\n"
 "       chybí kódová stránka nebo pomocný program nebo jiná chyba"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
@@ -9183,7 +9452,7 @@ msgstr ""
 "       (pro většinou souborových systému (např. nfs, cifs) budete\n"
 "       potřebovat pomocný program /sbin/mount.<TYP>)"
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9191,13 +9460,13 @@ msgstr ""
 "       (mohlo by se jednat o IDE zařízení, kde ve skutečnosti používáte\n"
 "       ide-scsi, takže je potřeba sr0 nebo sda nebo něco na ten způsob?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr "       (nepokoušíte se připojit rozšířený oddíl namísto logického?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9205,108 +9474,104 @@ msgstr ""
 "       V jistých případech lze najít potřebné informace v systémovém\n"
 "       protokolu – zkuste například „dmesg | tail“ \n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "tabulka připojení je plná"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok nelze přečíst"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: blokové zařízení %s je neznámé"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: neznámý systém souborů „%s“"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: pravděpodobně jste myslel %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: možná jste myslel „iso9660“?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: možná jste myslel „vfat“?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
-"mount: jádro nerozpoznalo %s jako blokové zařízení (možná „insmod ovladač“?)"
+"mount: jádro nerozpoznalo %s jako blokové zařízení\n"
+"       (možná „modprobe ovladač“?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s není blokovým zařízením"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s není platným blokovým zařízením"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "blokové zařízení"
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, 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:1569
+#: mount/mount.c:1647
 #, 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:1573
+#: mount/mount.c:1651
 #, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr ""
 "umount: %s%s nelze znovu připojit pro čtení i zápis, protože je chráněn "
 "proti zápisu"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, 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:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: v %s nenalezeno žádné médium… zkouším znovu\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: v %s nenalezeno žádné médium"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9323,22 +9588,22 @@ msgstr ""
 "       přistoupit na tento systém souborů. Další rady lze nalézt\n"
 "       v restorecon(8) a mount(8).\n"
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: nebyl zadán typ - budu předpokládat cifs kvůli předponě //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je již připojeno na %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9411,39 +9676,39 @@ msgstr ""
 "Další přepínače: [-nfFrsvw] [-o VOLBY] [-p DESKRIPTOR_S_HESLEM].\n"
 "Mnoho dalších informací získáte příkazem „man 8 mount“.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, c-format
-msgid "mount: only root can do that (effective UID is %d)"
-msgstr "mount: toto může provést pouze superuživatel (efektivní UID je %d)"
+msgid "mount: only root can do that (effective UID is %u)"
+msgstr "mount: toto může provést pouze superuživatel (efektivní UID je %u)"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: toto může provést pouze superuživatel"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "nebyl připojen žádný diskový oddíl"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: žádný odpovídající diskový oddíl nebyl nalezen"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s nelze nalézt v %s ani %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: varování: %s není ukončeno novou řádkou\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: řádek %d v %s je chybný%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; ignoruji zbytek souboru"
 
@@ -9456,7 +9721,7 @@ msgstr "chyba ve volání xstrndup"
 msgid "not enough memory"
 msgstr "Nedostatek paměti"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9473,7 +9738,7 @@ msgstr ""
 " SOUBOR                               vybere SOUBOR\n"
 "\n"
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9496,7 +9761,7 @@ msgstr ""
 " %1$s -V                            vypíše verzi\n"
 "\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9515,39 +9780,39 @@ msgstr ""
 " %1$s -V                           vypíše verzi\n"
 "\n"
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: neočekávaný formát souboru"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: reinicializuji odkládací oblast."
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 msgid "fork failed"
 msgstr "volání fork selhalo"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 msgid "execv failed"
 msgstr "funkce execv selhala"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
 msgstr "volání waitpid selhalo"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: volání lseek selhalo"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: zápis podpisu selhal"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
@@ -9555,52 +9820,58 @@ msgstr ""
 "řazení bajtů"
 
 # Last argument of "page-size %d, %s byte order"
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr "odlišné"
 
 # Last argument of "page-size %d, %s byte order"
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "same"
 msgstr "stejné"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: volání stat selhalo"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: přístupová práva %04o nejsou bezpečná, %04o by byla lepší."
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: vynechávám – zdá se, že obsahuje díry."
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: nepodařilo se zjistit velikost"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: nepodařilo se načíst hlavičku odkládací oblasti"
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+"%s: velikost_stránky=%d, velikost_úložiště=%llu, velikost_zařízení=%llu"
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 "%s: last_page 0x%08llx je větší než současní velikost odkládacího prostoru"
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: formát odkládacího prostoru se neshoduje ve velikosti stránky."
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9608,37 +9879,37 @@ msgstr ""
 "%s: formát odkládacího prostoru se neshoduje ve velikosti stránky. (Lze ji "
 "reinicializovat pomocí --fixpgsz.)"
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s: nalezena data ze softwarového uspání. Přepisuji podpis odkládací oblasti."
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon selhal"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "nelze nalézt zařízení pro %s"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr "Nejste superuživatel."
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff selhal"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9649,37 +9920,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount byl přeložen bez podpory pro -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: číslo skupiny (GID) nelze nastavit: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: číslo uživatele (UID) nelze nastavit: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: volání fork selhalo: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: blokové zařízení %s je chybné"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s není připojeno"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: superblok nelze na %s zapsat"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9690,52 +9961,52 @@ msgstr ""
 "        (V některých případech lze získat užitečné informace o procesech,\n"
 "        které se zařízením pracují, pomocí nástrojů lsof(8) a fuser(1).)"
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nelze najít"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, 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:177
+#: mount/umount.c:180
 #, 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:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nenalezl jsem umount2, zkouším umount…\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s je právě používáno - znovu připojeno v režimu pro pouze čtení\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, 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:272
+#: mount/umount.c:278
 #, c-format
-msgid "%s umounted\n"
-msgstr "%s odpojeno\n"
+msgid "%s has been unmounted\n"
+msgstr "%s bylo odpojeno\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznam systémů souborů na odpojení nelze nalézt"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9746,80 +10017,92 @@ msgstr ""
 "         umount -a [-d] [-f] [-r] [-n] [-v] [-t TYPY_VFS] [-O VOLBY]\n"
 "         umount [-d] [-f] [-r] [-n] [-v] SPECIÁLNÍ_SOUBOR | UZEL…\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
 msgstr "zařízení %s je spojeno s %s\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "zařízení %s není spojeno s %s\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+msgid "Cannot unmount \"\"\n"
 msgstr "„“ nelze odpojit\n"
 
-#: mount/umount.c:493
+#: mount/umount.c:499
 #, c-format
-msgid "Trying to umount %s\n"
-msgstr "Zkouším odpojit %s\n"
+msgid "Trying to unmount %s\n"
+msgstr "Zkouší se odpojit %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: analýza mtab dává matoucí výsledky"
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
-msgstr "umount: %s nelze odpojit – %s je přes něj připojen na stejné místo."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
+msgstr "umount: %s nelze odpojit – na stejné místo je přes něj připojeno %s"
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s nelze v mtab najít\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: podle mtab není %s připojeno"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, 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:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: připojení %s neodpovídá fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, 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:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: toto může provést pouze uživatel root"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
+msgstr ""
 "\n"
+"chrt – zachází s vlastnostmi procesu týkajících se plánování v reálném čase\n"
+"\n"
+"Nastaví politiku:\n"
+"  chrt [PŘEPÍNAČE] <POLITIKA> <PRIORITA> {<PID> | <PŘÍKAZ> [<ARGUMENT>…]}\n"
+"\n"
+"Získá politiku:\n"
+"  chrt [PŘEPÍNAČE] {<PID> | <PŘÍKAZ> [<ARGUMENT>…]}\n"
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9827,105 +10110,115 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+"\n"
+"Politiky plánování:\n"
+"  -b | --batch         nastaví politiku na SCHED_BATCH (dávka)\n"
+"  -f | --fifo          nastaví politiku na SCHED_FIFO (fronta)\n"
+"  -i | --idle          nastaví politiku na SCHED_IDLE (zahálení)\n"
+"  -o | --other         nastaví politiku na SCHED_OTHER (jiná)\n"
+"  -r | --rr            nastaví politiku na SCHED_RR (implicitní)\n"
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+"\n"
+"Příznaky plánování:\n"
+"  -R | --reset-on-fork u FIFO nebo RR nastaví SCHED_RESET_ON_FORK\n"
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 "\n"
-"chrt – zachází s vlastnostmi procesu týkajícími se plánování v reálném "
-"čase.\n"
-"\n"
-"Nastaví politiku:\n"
-"  chrt [PŘEPÍNAČE] <POLITIKA> <PRIORITA> {<PID> | <PŘÍKAZ> [<ARGUMENT>…]}\n"
-"\n"
-"Získá politiku:\n"
-"  chrt [PŘEPÍNAČE] {<PID> | <PŘÍKAZ> [<ARGUMENTY>…]}\n"
-"\n"
-"\n"
-"Politiky plánování:\n"
-"  -b | --batch         nastaví politiku na SCHED_BATCH\n"
-"  -f | --fifo          nastaví politiku na SCHED_FIFO\n"
-"  -i | --idle          nastaví politiku na SCHED_IDLE\n"
-"  -o | --other         nastaví politiku na SCHED_OTHER\n"
-"  -r | --rr            nastaví politiku na SCHED_RR (implicitní)\n"
-"\n"
 "Přepínače:\n"
 "  -h | --help          zobrazí tuto nápovědu\n"
-"  -p | --pid           pracuje nad existujícím procesem s PID\n"
 "  -m | --max           zobrazí minimální a maximální platné priority\n"
+"  -p | --pid           pracuje nad existujícím procesem s PID\n"
 "  -v | --verbose       zobrazí stavové informace\n"
 "  -V | --version       vypíše informace o verzi\n"
 "\n"
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr "nepodařilo se získat politiku procesu %d"
 
-# XXX: Second argument is "new" or "current"
-# FIXME: i18n "new".
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
 #, c-format
-msgid "pid %d's %s scheduling policy: "
-msgstr "%2$s plánovací politika procesu %1$d: "
+msgid "pid %d's new scheduling policy: "
+msgstr "nová plánovací politika procesu %d: "
+
+#: schedutils/chrt.c:106
+#, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr "stávající plánovací politika procesu %d: "
 
 # unknown policy
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, c-format
 msgid "unknown\n"
 msgstr "neznámá\n"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "nepodařilo se získat vlastnosti procesu %d"
 
-# XXX: Second argument is "new" or "current"
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
-msgstr "%2$s plánovací priorita procesu %1$d: %3$d\n"
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr "nová plánovací priorita procesu %d: %d\n"
+
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr "stávající plánovací priorita procesu %d: %d\n"
 
 # First argument just completes literal policy name
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s min./max. priorita\t: %d/%d\n"
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "SCHED_%s není podporována?\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 msgid "failed to parse pid"
 msgstr "PID se nezdařilo rozebrat"
 
-# current policy/priority
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr "současná"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 msgid "failed to parse priority"
 msgstr "prioritu se nezdařilo rozebrat"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+"Příznak SCHED_RESET_ON_FORK je podporován jen u politik SCHED_FIFO a SCHED_RR"
+
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "politiku procesu %d se nepodařilo nastavit"
 
-# pid %d's _new_ scheduling policy 
-#: schedutils/chrt.c:242
-msgid "new"
-msgstr "nová"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, c-format
 msgid "failed to execute %s"
 msgstr "spuštění %s selhalo"
@@ -9946,7 +10239,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9961,11 +10254,11 @@ msgstr ""
 "\n"
 "Použití:\n"
 "  ionice [PŘEPÍNAČE] -p <PID> [<PID>…]\n"
-"  ionoce [PŘEPÍNAČE] <PŘÍKAZ> [<ARGUMENT>…]\n"
+"  ionice [PŘEPÍNAČE] <PŘÍKAZ> [<ARGUMENT>…]\n"
 "\n"
 "Přepínače:\n"
 "  -n <DATA_TŘÍDY>     data třídy (0–7, menší číslo znamená vyšší prioritu)\n"
-"  -c <class>          plánovací třída: 0 – žádná, 1 – reálný čas, \n"
+"  -c <TŘÍDA>          plánovací třída: 0 – žádná, 1 – reálný čas, \n"
 "                      2 – best-effort, 3 – zahálení [idle]\n"
 "  -t                  ignorovat selhání\n"
 "  -h                  tato nápověda\n"
@@ -9989,9 +10282,135 @@ msgstr "u třídy zahálení [idle] se ignorují zadaná data třídy"
 msgid "bad prio class %d"
 msgstr "chybná plánovací třída %d"
 
-#: schedutils/ionice.c:187
-msgid "execvp failed"
-msgstr "funkce execvp selhala"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, c-format
+msgid "executing %s failed"
+msgstr "spuštění %s selhalo"
+
+#: schedutils/taskset.c:38
+#, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr ""
+"Použití: %s [PŘEPÍNAČE] [MASKA | SEZNAM_CPU] [PID | PŘÍKAZ [ARGUMENT…]]\n"
+"\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+"Přepínače:\n"
+" -p, --pid               pracuje nad existujícím zadaným PID\n"
+" -c, --cpu-list          zobrazí a určí CPU jako seznam\n"
+" -h, --help              zobrazí tuto nápovědu\n"
+" -V, --version           zobrazí údaje o verzi\n"
+"\n"
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+"Implicitní chování je spuštění nového příkazu:\n"
+"    %1$s 03 sshd -b 1024\n"
+"Masku existující úlohy lze zjistit takto:\n"
+"    %1$s -p 700\n"
+"Nebo ji lze nastavit:\n"
+"    %1$s -p 03 700\n"
+"Zápis ve tvaru seznamu (místo masky) používá jako oddělovač čárku:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Rozsahy v seznamu mohou mít jako argument krok:\n"
+"    např. 0-31:2 je shodné s maskou 0x55555555\n"
+
+#: schedutils/taskset.c:61
+#, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Více informací naleznete v taskset(1).\n"
+
+#: schedutils/taskset.c:113
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "nelze zjistit počet CPU, činnost ukončena"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+msgid "cpuset_alloc failed"
+msgstr "alokace cpuset_alloc selhala"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "nepodařilo se získat afinitu procesu s PID %d"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr "seznam současné afinity procesu %d: %s\n"
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr "maska současné afinity procesu %d: %s\n"
+
+# First argument is next to msgids
+#: schedutils/taskset.c:157
+#, c-format
+msgid "failed to parse %s %s"
+msgstr "nezdařilo rozebrat %s %s"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr "seznam CPU"
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr "masku CPU"
+
+#: schedutils/taskset.c:162
+#, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "afinitu procesu %d se nepodařilo nastavit"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr "seznam nové afinity procesu %d: %s\n"
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr "maska nové afinity procesu %d: %s\n"
+
+#: shlibs/mount/src/tab_parse.c:501
+msgid "parse error at lines: "
+msgstr "chyba rozboru na řádkách: "
+
+#: shlibs/mount/src/tab_parse.c:503
+msgid "parse error at line: "
+msgstr "chyba rozboru na řádku: "
+
+#: shlibs/mount/src/tab_parse.c:523
+#, c-format
+msgid " and %d."
+msgstr " a %d."
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -10137,7 +10556,18 @@ msgstr "   %f přer./s; %f příj. (znak/s)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Použití: %s [-c] [-n úroveň] [-r] [-s velikost_bufferu]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Použití: %s [PŘEPÍNAČE] <NÁZEV_SOUBORU>\n"
+"\n"
+"Přepínače:\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10150,7 +10580,7 @@ msgstr ""
 " -o, --offset <ČÍSLO>  pozice alokace v bajtech\n"
 " -l, --length <ČÍSLO>  délka alokace v bajtech\n"
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
@@ -10159,27 +10589,31 @@ msgstr ""
 "\n"
 "Více informací naleznete ve fallocate(1).\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 msgid "no length argument specified"
-msgstr "nezadán artument s délkou"
+msgstr "nezadán argument s délkou"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
 msgstr "zadána neplatná hodnota délky"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
 msgstr "zadána neplatná hodnota pozice"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 msgid "no filename specified."
 msgstr "nezadán název souboru."
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+msgid "unexpected number of arguments"
+msgstr "neočekávaný počet argumentů"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr "režim neměnné velikosti (přepínač -n) není podporován"
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: volání fallocate selhalo"
@@ -10238,6 +10672,65 @@ msgstr "%s: vyžaduje deskriptor souboru, soubor nebo adresář\n"
 msgid "%s: fork failed: %s\n"
 msgstr "%s: volání fork selhalo: %s\n"
 
+#: sys-utils/fsfreeze.c:41
+#, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Použití: %s [PŘEPÍNAČE] <BOD_PŘIPOJENÍ>\n"
+"\n"
+"Přepínače:\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+" -h, --help          tato nápověda\n"
+" -f, --freeze        zmrazí systém souborů\n"
+" -u, --unfreeze      rozmrazí systém souborů\n"
+
+#: sys-utils/fsfreeze.c:49
+#, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Více informací naleznete ve fsfreeze(8).\n"
+
+#: sys-utils/fsfreeze.c:90
+msgid "no action specified"
+msgstr "nezadána žádná akce"
+
+#: sys-utils/fsfreeze.c:92
+msgid "no filename specified"
+msgstr "nezadán název souboru"
+
+#: sys-utils/fsfreeze.c:105
+#, c-format
+msgid "%s: fstat failed"
+msgstr "%s: volání fstat selhalo"
+
+#: sys-utils/fsfreeze.c:110
+#, c-format
+msgid "%s: is not a directory"
+msgstr "%s: není adresářem"
+
+#: sys-utils/fsfreeze.c:116
+#, c-format
+msgid "%s: freeze failed"
+msgstr "%s: zmrazení se nezdařilo"
+
+#: sys-utils/fsfreeze.c:121
+#, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s: rozmrazení se nezdařilo"
+
 #: sys-utils/ipcmk.c:84
 #, c-format
 msgid ""
@@ -10297,7 +10790,7 @@ msgstr "nepodařilo se vytvořit semafor"
 #: sys-utils/ipcmk.c:160
 #, c-format
 msgid "Semaphore id: %d\n"
-msgstr "ID sepaforu: %d\n"
+msgstr "ID semaforu: %d\n"
 
 #: sys-utils/ipcrm.c:64
 #, c-format
@@ -10334,474 +10827,469 @@ msgstr ""
 "            [-Q KLÍČ_ZPRÁVY] [-M KLÍČ_SDÍLENÉ_PAMĚTI] [-S KLÍČ_SEMAFORU] "
 "… ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nepovolená volba – %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: nepovolený klíč (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "pro daný klíč přístup odmítnut"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "již odstraněný klíč"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "neplatný klíč"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "neznámá chyba v klíči"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "pro dané id přístup odmítnut"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "neplatné id"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "již odstraněné id"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "neznámá chyba v id"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: neznámý argument: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "Použití: %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h pro nápovědu.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s poskytuje informace o IPC prostředcích, které můžete číst.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
+msgstr ""
+"Použití: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"         %1$s [-s|-m|-q] -i id\n"
+"         %1$s -h pro nápovědu\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Zadání prostředku:\n"
-"\t-m : sdílená paměť\n"
-"\t-q : zprávy\n"
+"Použití: %1$s [PROSTŘEDEK…] [VÝSTUPNÍ_FORMÁT]\n"
+"         %1$s [PROSTŘEDEK] -i ID\n"
+"\n"
 
 #: sys-utils/ipcs.c:127
 #, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
-msgstr ""
-"\t-s : semafory\n"
-"\t-a : vše (implicitní)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
+msgstr "Poskytuje informace o prostředcích IPC, které můžete číst.\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
 #, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
-"Výstupní formát:\n"
-"\t-t : čas\n"
-"\t-p : pid\n"
-"\t-c : tvůrce\n"
+"    -h      zobrazí tuto nápovědu\n"
+"    -i ID   zobrazí podrobnosti o prostředku určeném dle ID\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : omezení\n"
-"\t-u : shrnutí\n"
+"Volby prostředků:\n"
+"    -m      sdílené segmenty paměti\n"
+"    -q      fronty zpráv\n"
+"    -s      semafory\n"
+"    -a      vše (implicitní)\n"
+"\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : podrobnosti o prostředku určeném dle id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
+"Výstupní formát:\n"
+"    -t      čas\n"
+"    -p      PID\n"
+"    -c      tvůrce\n"
+"    -l      omezení\n"
+"    -u      souhrn\n"
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "jádro nepodporuje sdílenou paměť\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Omezení pro sdílenou paměť --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "maximální počet segmentů = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "maximální velikost segmentu (v kilobajtech) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "celkové maximum pro sdílenou paměť (v kilobajtech) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "minimální velikost segmentu (v bajtech) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Stav sdílené paměti --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "alokované segmenty %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "alokované stránky %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "rezidentní stránky %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "stránky v odkládacím prostoru %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Statistika pro odkládání: pokusů: %ld\t, z toho úspěšných: %ld\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Tvůrci/vlastníci segmentů sdílené paměti ------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "práva"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Časy připojení/odpojení/změny pro sdílenou paměť --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "vlastník"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "připojení"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "odpojení"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "změna"
 
-#: sys-utils/ipcs.c:299
+#: sys-utils/ipcs.c:327
 #, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr "------ Tvůrce sdílené paměti/poslední operace --------\n"
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
+msgstr "------ Tvůrce sdílené paměti/PID poslední operace --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segmenty sdílené paměti --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "klíč"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "bajty"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "stav"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Nenastaveno"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "cíl"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "zamčeno"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "jádro nepodporuje semafory\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------Omezení pro semafory --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "maximální počet polí = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "maximální počet semaforů v poli = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "celkový maximální počet semaforů = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "maximální počet operací na jedno semop volání = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "maximální hodnota semaforu = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Stav semaforu --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "použitá pole = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "alokované semafory = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Tvůrci/vlastníci polí semaforů --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ Časy operace/změny semaforu --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "poslední operace"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "poslední změna"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Pole semaforů --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "jádro nepodporuje fronty zpráv\n"
 
-#: sys-utils/ipcs.c:490
+#: sys-utils/ipcs.c:518
 #, c-format
-msgid "------ Messages: Limits --------\n"
-msgstr "------ Zprávy: Omezení --------\n"
+msgid "------ Messages Limits --------\n"
+msgstr "------ Omezení zpráv --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "celkový maximální počet front = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "maximální velikost zprávy (v bajtech) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "implicitní maximální velikost fronty (v bajtech) = %d\n"
 
-#: sys-utils/ipcs.c:497
+#: sys-utils/ipcs.c:525
 #, c-format
-msgid "------ Messages: Status --------\n"
-msgstr "------ Zprávy: Stav --------\n"
+msgid "------ Messages Status --------\n"
+msgstr "------ Stav zpráv --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "alokované fronty = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "použité hlavičky = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "použitý prostor (v bajtech) = %d\n"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:532
 #, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr "------ Fronty zpráv: Tvůrci/Vlastníci --------\n"
+msgid "------ Message Queues Creators/Owners --------\n"
+msgstr "------ Tvůrci/vlastníci front zpráv --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Časy odeslání.příchodu/změny pro fronty zpráv --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "odeslání"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "příjem"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "změna"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID pro fronty zpráv --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Fronty zpráv --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "užité bajty"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "zprávy"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
 msgstr "volání shmctl selhalo"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10810,41 +11298,41 @@ msgstr ""
 "\n"
 "shmid segmentu sdílené paměti = %d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mód=%#o\tpřístupová práva=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bajtů=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "připoj_čas=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "odpoj_čas=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "čas_změny=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
 msgstr "volání msgctl selhalo"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10853,31 +11341,31 @@ msgstr ""
 "\n"
 "msgid fronty zpráv=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmód=%#o\n"
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "čas odeslání=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "čas příjmu=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
 msgstr "volání semctl selhalo"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10886,61 +11374,66 @@ msgstr ""
 "\n"
 "semid pole semaforů = %d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mód=%#o, přístupová práva=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "čas poslední operace = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "čas změny = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "hodnota"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, c-format
+msgid "invalid iflag: %s"
+msgstr "neplatný iflag: %s"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
-"Použití: %s [-dhV78neo12] [-s RYCHLOST] LDISC ZAŘÍZENÍ\n"
+"Použití: %s [-dhV78neo12] [-s RYCHLOST] [-i [-]IFLAG ] LDISC ZAŘÍZENÍ\n"
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10948,95 +11441,114 @@ msgstr ""
 "\n"
 "Známá jména LDISC (disciplíny linky):\n"
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+"\n"
+"Známá jména IFLAG:\n"
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "chybná rychlost: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach z %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "neplatný přepínač"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "neplatná disciplína linky: %s"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s není sériovou linkou"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "nelze zjistit vlastnosti terminálu %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr "rychlost %d nepodporována"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "vlastnosti terminálu %s nelze nastavit"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr "disciplínu linky nelze nastavit"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
 msgstr "nelze se démonizovat"
 
 # virtualization type
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 msgid "none"
 msgstr "žádná"
 
 # virtualization type
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr "paravirtualizace"
 
 # virtualization type
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr "plná"
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
+#, c-format
+msgid "error: cannot open %s"
+msgstr "chyba: nelze otevřít %s"
+
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, c-format
-msgid "error: %s"
-msgstr "chyba: %s"
+msgid "failed to read: %s"
+msgstr "čtení selhalo: %s"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:209
 #, c-format
-msgid "error parse: %s"
-msgstr "chyba při rozebírání: %s"
+msgid "parse error: %s"
+msgstr "chyba rozebírání: %s"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
 msgstr "chyba: funkce strdup selhala"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+msgid "failed to callocate cpu set"
+msgstr "množinu CPU nelze alokovat"
+
+#: sys-utils/lscpu.c:263
+#, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "masku CPU %s se nezdařilo rozebrat"
+
+#: sys-utils/lscpu.c:318
 msgid "error: uname failed"
 msgstr "chyba: volání uname selhalo"
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
-msgstr "chyba: funkce malloc selhala"
-
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr "chyba: souborový systém /sys není přístupný."
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+msgid "error: calloc failed"
+msgstr "chyba: funkce calloc selhala"
 
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11049,72 +11561,85 @@ msgstr ""
 "# které se počítá od nuly.\n"
 "# CPU,Jádro,Patice,Uzel"
 
-#: sys-utils/lscpu.c:619
-#, fuzzy
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr "Architektura:"
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
+msgstr "Operační režim(y) CPU:"
+
+#: sys-utils/lscpu.c:759
+#, fuzzy
+msgid "CPU(s):"
 msgstr "Patic CPU:"
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr "Vláken na jádro:"
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr "Jader na patici:"
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr "Patic CPU:"
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr "Uzly NUMA:"
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
-msgstr "ID výrobce:"
+msgstr "ID výrobce:"
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr "Rodina CPU:"
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr "Model:"
 
 # ???: Existuje český překlad?
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr "Stepping:"
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr "Virtualizace:"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr "Výrobce hypervizoru:"
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr "Druh virtualizace:"
 
-# ???: keš
-#: sys-utils/lscpu.c:658
+# ???: keš
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr "%s cache:"
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "CPU NUMA uzlu %d:"
+
+#: sys-utils/lscpu.c:816
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Použití: %s [PŘEPÍNAČ]\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11129,67 +11654,6 @@ msgstr ""
 "čitelné\n"
 "  -s, --sysroot  použije adresář jako kořen nového systému\n"
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr "chyba: změna pracovního adresáře do %s."
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "Použití: rdev [ -rv ] [ -o POSUN ] [ OBRAZ [ HODNOTA [ POSUN ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (či rdev /linux, etc.) vypíše aktuální ROOT zařízení"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         nastaví ROOT na /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              nastaví PŘÍZNAKY ROOT (pouze pro čtení)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            nastaví velikost RAMDISKU"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              nastaví startovací VIDEOMÓD"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   posun v bajtech"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  root příznaky ...               stejné jako rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  velikost ram ...                stejné jako rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmód ...                      stejné jako rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Poznámka: video módy: -3=Ask, -2=Extended, -1=NormalVga, 1=kláv1, 2=kláv2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "          Pomocí -R 1 připojíte pouze pro čtení, -R 0 umožní zápis."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "chybí čárka"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11310,11 +11774,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: původní priorita %d, nová priorita %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11325,119 +11790,145 @@ msgid ""
 msgstr ""
 "Použití: %s [PŘEPÍNAČE]\n"
 "    -d | --device <ZAŘÍZENÍ>  vybere RTC zařízení (rtc0|rtc1|…)\n"
-"    -l | --local              RTC běží v místním čase\n"
+"    -n | --dry-run            provede vše až na uspání\n"
+"    -l | --local              RTC používá místní časovou zónu\n"
 "    -m | --mode               režim spánku standby|mem|…\n"
-"    -s | --seconds <SEKUND>   kolik sekund bude spát\n"
+"    -s | --seconds <SEKUNDY>  kolik sekund bude spát\n"
 "    -t | --time <time_t>      čas probuzení\n"
 "    -u | --utc                RTC běží v UTC\n"
 "    -v | --verbose            podrobné zprávy\n"
 "    -V | --version            zobrazit verzi\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "čtení hodin RTC"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "čtení systémových hodin"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "konverze času RTC"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "nastavení budíku RTC"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr "zapnutí budíku RTC"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr "nastavení budíku RTC pro probuzení"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr "%s: nerozpoznaný stav uspání „%s“\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: nepovolený interval %s sekund\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: %s není povolená hodnota time_t\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: verze %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: předpokládám, že hodiny reálného času běží v UTC…\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Používám UTC čas.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "Používám místní čas.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: je nezbytné uvést dobu probuzení\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "volání malloc() selhalo"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s neumí zpracovat probouzecí události\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "budík %ld, systémový_čas %ld, reálný_čas %ld, sekund %u\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr "%s: hodiny nedojdou pozpátku na %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s: probuzení z „%s“ za použití %s v %s\n"
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr "režim spánku: no (žádný); končí se\n"
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr "režim spánku: off (vypnuto); spouští se %s\n"
+
+#: sys-utils/rtcwake.c:503
 #, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: %s nelze spustit: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr "režim spánky: on (zapnuto); čte se RTC\n"
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "odečtení hodin reálného času"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr "režim spánku: disable (zakázáno); budík se vypíná\n"
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr "reži spánku: %s; systém bude uspán\n"
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr "zakázání přerušení budíku hodin reálného času"
 
 #: sys-utils/setarch.c:50
 #, c-format
 msgid "Switching on %s.\n"
-msgstr "Zapínám %s.\n"
+msgstr "Zapíná se %s.\n"
 
 #: sys-utils/setarch.c:113
 #, c-format
@@ -11547,6 +12038,10 @@ msgstr "%s: chybná hodnota\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s není lp zařízením\n"
 
+#: sys-utils/tunelp.c:259
+msgid "LPGETSTATUS error"
+msgstr "chyba LPGETSTATUS"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11577,6 +12072,10 @@ msgstr ", zapnuta"
 msgid ", error"
 msgstr ", chyba"
 
+#: sys-utils/tunelp.c:274
+msgid "tunelp: ioctl failed"
+msgstr "tunelp: IOCTL se nezdařilo"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "chyba LPGETIRQ"
@@ -11628,6 +12127,14 @@ msgid "unshare failed"
 msgstr "volání unshare selhalo"
 
 #: sys-utils/unshare.c:118
+msgid "cannot set group id"
+msgstr "číslo skupiny (GID) nelze nastavit"
+
+#: sys-utils/unshare.c:121
+msgid "cannot set user id"
+msgstr "číslo uživatele (UID) nelze nastavit"
+
+#: sys-utils/unshare.c:125
 #, c-format
 msgid "exec %s failed"
 msgstr "spuštění % selhalo"
@@ -12130,7 +12637,7 @@ msgstr ""
 #: text-utils/tailf.c:151
 #, c-format
 msgid "%s: cannot add inotify watch."
-msgstr "%s: nelze přidat sledování pomocí inotfy."
+msgstr "%s: nelze přidat sledování pomocí inotify."
 
 #: text-utils/tailf.c:160
 #, c-format
@@ -12175,6 +12682,311 @@ 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 "%s: illegal option -- %c\n"
+#~ msgstr "%s: nepovolená volba – %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "alokované segmenty %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "alokované stránky %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "rezidentní stránky %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "stránky v odkládacím prostoru %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Statistika pro odkládání: pokusů: %ld\t, z toho úspěšných: %ld\n"
+
+# Dodržet zarovnání se zprávou „POZOR: Režim kompatibility…“
+#~ msgid ""
+#~ " and change display units to\n"
+#~ "         sectors (command 'u').\n"
+#~ msgstr ""
+#~ " a změnit jednotky výpisů na sektory\n"
+#~ "       (příkaz „u“).\n"
+
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "chyba při spouštění programu: „%s“\n"
+
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "zadána neplatná hodnota pozice „%s“"
+
+#~ msgid ""
+#~ "\n"
+#~ "chrt - manipulate real-time attributes of a process.\n"
+#~ "\n"
+#~ "Set policy:\n"
+#~ "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
+#~ "\n"
+#~ "Get policy:\n"
+#~ "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
+#~ "\n"
+#~ "\n"
+#~ "Scheduling policies:\n"
+#~ "  -b | --batch         set policy to SCHED_BATCH\n"
+#~ "  -f | --fifo          set policy to SCHED_FIFO\n"
+#~ "  -i | --idle          set policy to SCHED_IDLE\n"
+#~ "  -o | --other         set policy to SCHED_OTHER\n"
+#~ "  -r | --rr            set policy to SCHED_RR (default)\n"
+#~ "\n"
+#~ "Scheduling flags:\n"
+#~ "  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h | --help          display this help\n"
+#~ "  -p | --pid           operate on existing given pid\n"
+#~ "  -m | --max           show min and max valid priorities\n"
+#~ "  -v | --verbose       display status information\n"
+#~ "  -V | --version       output version information\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "chrt – zachází s vlastnostmi procesu týkajícími se plánování v reálném "
+#~ "čase.\n"
+#~ "\n"
+#~ "Nastaví politiku:\n"
+#~ "  chrt [PŘEPÍNAČE] <POLITIKA> <PRIORITA> {<PID> | <PŘÍKAZ> "
+#~ "[<ARGUMENT>…]}\n"
+#~ "\n"
+#~ "Získá politiku:\n"
+#~ "  chrt [PŘEPÍNAČE] {<PID> | <PŘÍKAZ> [<ARGUMENT>…]}\n"
+#~ "\n"
+#~ "\n"
+#~ "Politiky plánování:\n"
+#~ "  -b | --batch         nastaví politiku na SCHED_BATCH (dávka)\n"
+#~ "  -f | --fifo          nastaví politiku na SCHED_FIFO (fronta)\n"
+#~ "  -i | --idle          nastaví politiku na SCHED_IDLE (zahálení)\n"
+#~ "  -o | --other         nastaví politiku na SCHED_OTHER (jiná)\n"
+#~ "  -r | --rr            nastaví politiku na SCHED_RR (implicitní)\n"
+#~ "\n"
+#~ "Příznaky plánování:\n"
+#~ "  -R | --reset-on-fork u FIFO nebo RR nastaví SCHED_RESET_ON_FORK\n"
+#~ "\n"
+#~ "Přepínače:\n"
+#~ "  -h | --help          zobrazí tuto nápovědu\n"
+#~ "  -p | --pid           pracuje nad existujícím procesem s PID\n"
+#~ "  -m | --max           zobrazí minimální a maximální platné priority\n"
+#~ "  -v | --verbose       zobrazí stavové informace\n"
+#~ "  -V | --version       vypíše informace o verzi\n"
+#~ "\n"
+
+# current policy/priority
+#~ msgid "current"
+#~ msgstr "současná"
+
+# pid %d's _new_ scheduling policy 
+#~ msgid "new"
+#~ msgstr "nová"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: v %s nenalezeno žádné médium… zkouším znovu\n"
+
+#~ msgid "execvp failed"
+#~ msgstr "funkce execvp selhala"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "Použití: %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h pro nápovědu.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Zadání prostředku:\n"
+#~ "\t-m : sdílená paměť\n"
+#~ "\t-q : zprávy\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semafory\n"
+#~ "\t-a : vše (implicitní)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Výstupní formát:\n"
+#~ "\t-t : čas\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : tvůrce\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : omezení\n"
+#~ "\t-u : shrnutí\n"
+
+#~ msgid "error: %s"
+#~ msgstr "chyba: %s"
+
+#~ msgid "error parse: %s"
+#~ msgstr "chyba při rozebírání: %s"
+
+#~ msgid "error: /sys filesystem is not accessable."
+#~ msgstr "chyba: souborový systém /sys není přístupný."
+
+#~ msgid "error: change working directory to %s."
+#~ msgstr "chyba: změna pracovního adresáře do %s."
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr "Použití: rdev [ -rv ] [ -o POSUN ] [ OBRAZ [ HODNOTA [ POSUN ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (či rdev /linux, etc.) vypíše aktuální ROOT zařízení"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         nastaví ROOT na /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              nastaví PŘÍZNAKY ROOT (pouze pro čtení)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            nastaví velikost RAMDISKU"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              nastaví startovací VIDEOMÓD"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   posun v bajtech"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  root příznaky ...               stejné jako rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  velikost ram ...                stejné jako rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmód ...                      stejné jako rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Poznámka: video módy: -3=Ask, -2=Extended, -1=NormalVga, 1=kláv1, "
+#~ "2=kláv2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr "          Pomocí -R 1 připojíte pouze pro čtení, -R 0 umožní zápis."
+
+#~ msgid "missing comma"
+#~ msgstr "chybí čárka"
+
+#~ 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 ""
+#~ "Použití: fdisk [-b SSZ] [-u] DISK     Změní tabulku rozdělení disku\n"
+#~ "         fdisk -l [-b SSZ] [-u] DISK  Vypíše tabulku rozdělení disku\n"
+#~ "         fdisk -s ODDÍL               Vypíše velikost diskového oddílu\n"
+#~ "                                      v blocích\n"
+#~ "         fdisk -v                     Vypíše informace o verzi\n"
+#~ "DISK je něco jako /dev/hdb či /dev/sda a ODDÍL je něco jako /dev/hda7\n"
+#~ "-u: vrací Začátek a Konec v sektorech (místo cylindrech)\n"
+#~ "-b 2048: (pro některé MO jednotky) použije 2048bajtové sektory\n"
+
+#~ 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 ""
+#~ "Použití: fdisk [-l] [-b SSZ] [-u] zařízení\n"
+#~ "Např: fdisk /dev/hda  (pro první IDE disk)\n"
+#~ "  či: fdisk /dev/sdc  (pro třetí SCSI disk)\n"
+#~ "  či: fdisk /dev/eda  (pro první PS/2 ESDI disk)\n"
+#~ "  či: fdisk /dev/rd/c0d0  či: fdisk /dev/ida/c0d0  (pro RAID zařízení)\n"
+#~ "  …\n"
+
+#~ 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"
+#~ "Počet cylindrů tohoto disku je nastaven na %d.\n"
+#~ "Na tom není nic špatného, ale jelikož je to více než 1024,\n"
+#~ "může za určitých okolností dojít k problémům:\n"
+#~ "1) s programy spouštěnými při startu (např. staré verze LILA)\n"
+#~ "2) s programy pro správu diskových oddílů z jiných OS\n"
+#~ "   (např. DOS FDISK, OS/2 FDISK)\n"
+
+#~ msgid ""
+#~ "WARNING: The device does not provide compensation (alignment_offset)\n"
+#~ "for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
+#~ "Use command 'c' to switch-off DOS mode.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "POZOR: Zařízení neposkytuje vyrovnání (alignment_offset) při dělení "
+#~ "disku\n"
+#~ "podle DOSu, avšak režim kompatibility s DOSem je zapnut.\n"
+#~ "Použijte příkaz „c“ na vypnutí režimu DOSu.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "WARNING: the device provides alignment_offset, but the offset does not\n"
+#~ "match with device geometry.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "POZOR: Zařízení poskytuje alignment_offset (zarovnávací posun), ale "
+#~ "posun\n"
+#~ "neodpovídá geometrii zařízení.\n"
+#~ "\n"
+
 # TODO: i18n second argument
 #~ msgid "%s: found %sswap v%d signature string for %d KiB PAGE_SIZE\n"
 #~ msgstr ""
diff --git a/po/da.po b/po/da.po
index 4a32ac93..be25749f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11y\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2005-08-15 21:00+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -109,6 +109,11 @@ msgstr "genl�s partitionstabellen"
 msgid "Usage:\n"
 msgstr "Brug:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ signal ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -129,6 +134,17 @@ msgstr "Tilg�ngelige kommandoer:\n"
 msgid "get size in 512-byte sectors"
 msgstr "f� st�rrelse i byte"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -230,15 +246,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "brug: %s [ -n ] enhed\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -341,7 +348,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "hukommelsesallokering mislykkedes (malloc)"
 
@@ -956,7 +963,7 @@ msgstr "kunne ikke finde enheden %s"
 msgid "%s is not a block special device"
 msgstr "%s er ikke en blokenhed"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "kunne ikke �bne %s"
@@ -980,7 +987,7 @@ msgstr "for mange inodes - �vre gr�nse er 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "ikke plads nok, kr�ver mindst %lu blokke"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhed: %s\n"
@@ -1054,7 +1061,7 @@ msgstr "Fejl under lukning af %s"
 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:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1287,7 +1294,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "s�gning mislykkedes i check_blocks"
 
@@ -1370,173 +1377,179 @@ msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Benytter bruger-bestemt sidest�rrelse %d i stedet for systemv�rdierne %d/%d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "forgrening mislykkedes\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Ugyldig st�relse p� swap-hovede, skrev ikke noget m�rke.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "M�rke afkortet.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "intet m�rke, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "ingen uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Brug: %s [-c] [-v0|-v1] [-pSIDESTR] [-L m�rke] /dev/navn [blokke]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "for mange ugyldige sider"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Hukommelse opbrugt"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "en ugyldig side\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu ugyldige sider\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "kunne ikke spole tilbage p� swap-enheden"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "kunne ikke allokere buffere til inodes"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "kunne ikke allokere buffere til inodes"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "kunne ikke slette opstartssektor"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p    vis BSD-partitionstabel"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s    vis hele diskm�rkatet"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s    vis hele diskm�rkatet"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: fejl: ukendt version %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Fejl ved lukning af fil\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: fejl: st�rrelsen %lu er st�rre end enhedsst�rrelsen %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: fejl: swap-omr�de skal mindst v�re p� %ldkB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: fejl: afkorter swap-omr�det til %ldkB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "Vil ikke fors�ge at oprette swap-enhed p� '%s'"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s er monteret; vil ikke oprette et filsystem her!"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kunne ikke klarg�re swap-omr�de: ul�seligt"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Klarg�rer swap-omr�de version %d, st�rrelse = %llu kB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "kunne ikke skrive signatur-side"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync mislykkedes"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "kunne ikke finde %s"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "kunne ikke skrive inodes"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "kunne ikke omd�be %s til %s: %s\n"
@@ -1599,62 +1612,108 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "fejl ved fors�g p� at stoppe tjenesten: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Ubrugelig"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "kunne ikke spole tilbage p� swap-enheden"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Frit omr�de"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: ingen s�dan partition\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: fejl: ukendt version %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: Kunne ikke �bne: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: Kunne ikke �bne: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: Kunne ikke �bne: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: Kunne ikke �bne: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: Kunne ikke �bne: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "s�gning mislykkedes i write_tables"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "Finger-informationer �ndret.\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Ubrugelig"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Frit omr�de"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disken er blevet udskiftet.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1667,199 +1726,199 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "�ndret DOS 6.x partitioner.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "FATAL FEJL"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Tryk en tast for at afslutte cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Kan ikke s�ge p� drev"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Kan ikke l�se drev"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Kan ikke skrive p� drev"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "For mange partitioner"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Partition starter f�r sektor 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Partition slutter f�r sektor 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Partition starter efter slut-p�-disk"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Partition slutter efter slut-p�-disk"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitionen slutter i den sidste partialcylinder"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "logiske partitioner ikke i disk-r�kkef�lge"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "logisk partitions-overlap"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "forst�rret logisk partitions-overlap"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Intern fejl under oprettelse af logisk drev uden udvidet partition !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menupunkt for langt. Menu ser muligvis m�rkeligt ud."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menu uden retning. V�lger standarden horisontal."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Ugyldig tast"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Tryk en tast for at forts�tte"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Prim�r"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Opret en ny prim�r partition"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Opret en ny logisk partition"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Opret ikke partition"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Intern fejl !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "St�rrelse (i MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Begyndelse"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Tilf�j partition i starten af det frie omr�de"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Slut"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Tilf�j partition i slutningen af det frie omr�de"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Ikke plads til at oprette udvidet partition"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Ingen partitionstabel.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Ingen partitionstabel. Starter med nulstillet tabel."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Ugyldig signatur i partitionstabel"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Ukendt partitionstabel-type"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Vil du starte med nulstillet tabel [j/N] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav flere cylindre end der kan v�re p� disken"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Kan ikke �bne drev"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 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:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Kan ikke f� diskst�rrelsen"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Ugyldig prim�rpartition"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Ugyldig logisk partition"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Advarsel!! Dette �del�gger muligvis data p� din disk!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 #, fuzzy
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
@@ -1867,31 +1926,31 @@ msgstr ""
 "Er du sikke p�, at du vil skrive partitionstabellen til disken? (ja eller "
 "nej): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Skrev ikke partitionstabellen til disken"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Skriv venligst 'ja' eller 'nej'"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabel til disken..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabel til disken"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1900,85 +1959,85 @@ msgstr ""
 "Skrev partitionstabel, men genindl�sning mislykkedes. Genstart for at "
 "opdatere tabellen."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 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:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 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:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan ikke �bne filen '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Drev: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Ingen  "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Prim�r"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logisk "
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Opstart"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Ingen"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabel for %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               F�rste      Sidst\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1986,7 +2045,7 @@ msgstr ""
 " # Type       Sektor      Sektor   forskydn. L�ngde   Filsystem  Type (ID) "
 "Flag\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1994,465 +2053,465 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ---Starter---       ----Ender----     Start     Antal\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, fuzzy
 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "R�"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Vis tabellen i r�tdata format"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Vis tabellen ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Vis kun partitionstabellen"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Vis ikke tabellen"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Hj�lpesk�rm for cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dette er cfdisk, et curses-baseret diskpartitionerings-program, som"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "harddisk."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Kommando     Betydning"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Slet partitionen"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Ret cylinder, hoved, sektorer-per-spor parametre"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 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:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             er klar over, hvad de g�r."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Vis denne sk�rm"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksim�r partitionens diskforbrug"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Bem�rk: Dette kan g�re partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Opret ny partition i frit omr�de"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Der er flere forskellige formater p� partitionen,"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             som du kan v�lge mellem:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 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:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel ordnet efter sektorer"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel i r�data format"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Afslut program uden at skrive partitionstabellen"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Skift filsystem type"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Skift enhed for visning af partitionsst�rrelser"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Skifter mellem MB, sektorer og cylindre"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 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:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             bekr�fte eller afvise ved at skrive henholdsvis 'ja'"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             eller 'nej'"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pil op       Flyt mark�ren til forrige partition"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pil ned      Flyt mark�ren til n�ste partition"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Gentegner sk�rmen"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Vis denne sk�rm"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "bogstaver (undtagen W)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cylindre"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Skift cylindergeometri"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Hoveder"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Skift hovedgeometri"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Skift sektorgeometri"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "F�rdig"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "F�rdig med geometri�ndring"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Angiv antallet af cylindre: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Ugyldigt cylinderantal"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Angiv antallet af hoveder: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Ugyldig hovedantal"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Angiv antallet af sektorer per spor: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Ugyldig sektorantal"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Angiv filsystemtype: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Kan ikke �ndre filsystemtype til tom"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Kan ikke �ndre filsystemtype til udvidet"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ukt(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Ukendt (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Drev: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "St�rrelse: %lld byte, %lld Mb"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "St�rrelse: %lld byte, %lld.%lld Gb"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Hoveder: %d   Sektorer per spor: %d   Cylindre: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Navn"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Part-type"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Fs-type"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[M�rkat]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Sektorer"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cylindre"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  St�rrelse (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  St�rrelse (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Opstartbar"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Skift opstartbar-flaget for partitionen ('bootable')"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Slet"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Slet partitionen"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Skift diskgeometri (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Hj�lp"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Vis hj�lpesk�rm"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maksim�r"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksim�r diskforbruget for partitionen (kun for eksperter)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Opret ny partition i frit omr�de"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Udl�s"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Afslut"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Afslut program uden at �ndre partitionstabellen"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Skift filsystemtype (DOS, Linux, OS/2 osv.)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Enheder"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Skift enheder for visning af partitionstabellen (MB, sekt, cyl)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen til disk (dette kan �del�gge data)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Kan ikke g�re denne partition opstartbar"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Kan ikke slette en tom partition"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Kan ikke maksimere denne partition"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Denne partition er ubrugelig"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Denne partition er allerede i brug"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan ikke �ndre en tom partitions type"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Ikke flere partitioner"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Ugyldig kommando"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2523,9 +2582,9 @@ msgstr ""
 "\n"
 "BSD-m�rkat for enhed: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Kommando beskrivelse"
 
@@ -2545,9 +2604,9 @@ msgstr "   i    installer opstarts-igangs�tter ('bootstrap')"
 msgid "   l   list known filesystem types"
 msgstr "   l    vis liste over filsystemtyper"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m    vis denne menu"
 
@@ -2559,14 +2618,14 @@ msgstr "   n    tilf�j en ny BSD-partition"
 msgid "   p   print BSD partition table"
 msgstr "   p    vis BSD-partitionstabel"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q    afslut uden at gemme �ndringerne"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r    return�r til hovedmenuen"
 
@@ -2609,13 +2668,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "F�rste %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sidste %s eller +st�rrelse eller +st�rrelseM eller +st�rrelseK"
@@ -2760,7 +2819,7 @@ msgstr "sektorer/spor"
 msgid "tracks/cylinder"
 msgstr "spor/cylinder"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cylindre"
@@ -2818,7 +2877,7 @@ msgstr "Opstarts-igangs�tter installeret p� %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Det maksimale antal partitioner er blevet oprettet\n"
@@ -2842,225 +2901,208 @@ msgstr ""
 "\n"
 "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Brug: fdisk [-b SSZ] [-u] DISK     Skift partitionstabel\n"
-"      fdisk -l [-b SSZ] [-u] DISK  Vis partitionstabel(ler)\n"
-"      fdisk -s PARTITION           Vis partitionsst�rrelser i blokke\n"
-"      fdisk -v                     Vis fdisks version\n"
-"DISK er f.eks. /dev/hdb eller /dev/sda\n"
-"PARTITION er f.eks. /dev/hda7\n"
-"-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:260
-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 ""
-"Brug: fdisk [-l] [-b SSZ] [-u] enhed\n"
-"F.eks.: fdisk /dev/hda  (for den f�rste IDE-disk)\n"
-" eller: fdisk /dev/sdc  (for den tredie SCSI-disk)\n"
-" eller: fdisk /dev/eda  (for det f�rste PS/2 ESDI-drev)\n"
-" eller: fdisk /dev/rd/c0d0  eller: fdisk /dev/ida/c0d0  (for RAID-enheder)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kunne ikke �bne %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kunne ikke l�se %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kunne ikke s�ge til %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kunne ikke skrive %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl mislykkedes p� %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Kunne ikke allokere mere hukommelse\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Fatal fejl\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a    skift et skrivebeskyttelses-flag"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b    skift bsd-diskm�rkat"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c    skift mont�rbart-flag"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d    slet en partition"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l    vis liste over kendte partitionstyper"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n    tilf�j en ny partition"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o    opret en ny, tom DOS-partitionstabel"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p    vis partitionstabellen"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s    opret en ny, tom Sun-diskm�rkat"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t    skift system-id for en partition"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u    skift enheder for visning/indtastning"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v    verific�r partitionstabellen"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w    skriv partitionstabel til disk og afslut"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x    ekstra funktionalitet (kun for eksperter)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a    v�lg en opstartbar partition"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b    redig�r indgang i opstartsfil"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c    v�lg sgi swap-partition"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a    skift opstartbar-flaget"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c    skift DOS-kompatilitets-flaget"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a    �ndr antallet af alternative cylindre"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c    �ndr antallet af cylindre"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d    vis r�dataene fra partitionstabellen"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e    �ndr antallet af ekstra sektorer per cylinder"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h    �ndr antallet af hoveder"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   �ndr interleavefaktor"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o    �ndr rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s    �ndr antallet af sektorer/spor"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   �ndr antallet af fysiske cylindre"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b    flyt starten p� data i en partition"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e    vis udvidede partitioner"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g    opret en IRIX (SGI) partitionstabel"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f    ordn partitionsr�kkef�lgen"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u    skift enheder for visning/indtastning"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Du skal angive"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "hoveder"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3069,30 +3111,11 @@ msgstr ""
 "%s%s.\n"
 "Dette kan du g�re fra menuen 'Ekstra funktioner'.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " og "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Antallet af cylindre er sat til %d for denne disk.\n"
-"Det er der intet galt med, men da det er st�rre end 1024,\n"
-"kan det i visse ops�tninger give problemer med:\n"
-"1) programmer, der k�rer tidligt i opstarten (bl.a. gamle LILO-versioner)\n"
-"2) opstarts- og partitioneringsprogrammer fra andre OS'er\n"
-"   (Bl.a. DOS FDISK og OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3103,38 +3126,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ugyldig forskydning i prim�r udvidet partition\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3143,32 +3165,32 @@ msgstr ""
 "Advarsel: udelader partitioner efter #%d.\n"
 "De vil blive slettet, hvis du gemmer denne partitionstabel.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Advarsel: ignorerer ekstra data i partitionstabel %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Advarsel: tom partition\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3181,26 +3203,17 @@ msgstr ""
 "indhold naturligvis ikke genskabes\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Bem�rk: sektorst�rrelsen er %d (ikke %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3209,7 +3222,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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3218,17 +3231,17 @@ msgstr ""
 "Enheden indeholder hverken en gyldig DOS-partitionstabel eller et Sun-, SGI- "
 "eller OSF-diskm�rkat.\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Intern fejl\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerer ekstra udvidet partition %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3237,7 +3250,7 @@ msgstr ""
 "Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med "
 "'w' (skriv)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3246,95 +3259,100 @@ msgstr ""
 "\n"
 "fik filslut (EOF) tre gange - afslutter..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Hex-kode (tryk L for en liste over koderne): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standard %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Bruger standardv�rdi %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "V�rdi udenfor omr�det.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Advarsel: partition %d er af typen 'tom'\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d er valgt\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partitioner defineret!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle prim�re partitioner er allerede definerede!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Skifter enheder for visning/indtastning til %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Skifter enheder for visning/indtastning til %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ADVARSEL: Partition %d er en udvidet partition\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "DOS-kompatilitetsflag er sat\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatilitetsflag er ikke sat\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d eksisterer ikke endnu!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3347,7 +3365,7 @@ msgstr ""
 "er nok uklogt. Du kan slette en partition med\n"
 "'d'-kommandoen.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3356,7 +3374,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:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3367,7 +3385,7 @@ msgstr ""
 "SunOS/Solaris forventer det og selv Linux foretr�kker det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3378,62 +3396,62 @@ msgstr ""
 "og partition 11 som 'entire volume' (6), da IRIX forventer det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "�ndrede systemtypen for partition %d til %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har forskellig fysisk/logisk endelse:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "burde v�re (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "burde v�re (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "Partition %i starter ikke p� en cylinder-gr�nse:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3442,7 +3460,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld Mb, %lld byte\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3451,34 +3469,39 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld Gb, %lld byte\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d hoveder, %d sektorer/spor, %d cylindre"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", i alt %llu sektorer"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 "Enheder = %s af %d * %d = %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "ugyldig inode-st�rrelse"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3487,14 +3510,14 @@ msgstr ""
 "Intet at g�re. R�kkef�lgen er allerede korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "F�rdig\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3505,16 +3528,16 @@ msgstr ""
 "Du har nok valgt den forkerte enhed.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Opstart   Start         Slut     Blokke   Id  System\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Enhed"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3523,7 +3546,7 @@ msgstr ""
 "\n"
 "Partitionstabellens indgange er ikke i disk-r�kkef�lge\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3534,89 +3557,89 @@ msgstr ""
 "Disk %s: %d hoveder, %d sektorer, %d cylindre\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Advarsel: partition %d indeholder sektor 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partition %d: sektor %d er st�rre end de maksimale %d\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, 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:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Advarsel: partition %d overlapper med partition %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Advarsel: partition %d er tom\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 "Det totale antal allokerede sektorer %d er st�rre end de maksimale %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld ikke-allokerede sektorer\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Ingen tilg�ngelige frie sektorer\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3629,7 +3652,7 @@ msgstr ""
 "\ttilf�je DOS-partitioner. (Brug o.)\n"
 "\tADVARSEL: Dette vil �del�gge diskens nuv�rende indhold.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3642,22 +3665,22 @@ msgstr ""
 "\ttilf�je DOS-partitioner. (Brug o.)\n"
 "\tADVARSEL: Dette vil �del�gge diskens nuv�rende indhold.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Samtlige logiske partitioner er i brug\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Tilf�jer en prim�rpartition\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3668,20 +3691,20 @@ msgstr ""
 "   %s\n"
 "   p    prim�r partition (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l    logisk (5 eller derover)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e    udvidet"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ugyldigt partitionsnummer for type '%c'\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3690,12 +3713,12 @@ msgstr ""
 "Partitionstabellen er �ndret!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kalder ioctl() for at genindl�se partitionstabellen.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3708,7 +3731,7 @@ msgstr ""
 "Denne kerne bruger stadig den gamle tabel.\n"
 "Den nye tabel vil blive brugt fra n�ste genstart.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3721,7 +3744,7 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "�ndret DOS 6.x partitioner.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3730,42 +3753,42 @@ msgstr ""
 "\n"
 "Fejl ved lukning af fil\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har intet dataomr�de\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Ny begyndelse p� data"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Ekspert kommando (m for hj�lp): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Antal cylindre"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Antal hoveder"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Advarsel: s�tter sektorforskydning for DOS-kompatilitet\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3774,32 +3797,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kunne ikke �bne %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kunne ikke �bne %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ukendt kommando\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3808,16 +3831,16 @@ msgstr ""
 "Advarsel: tilvalget -b (angiv sektorst�rrelse) kr�ver angivelse af disk-"
 "enhed\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Kommando (m for hj�lp): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3826,16 +3849,16 @@ msgstr ""
 "\n"
 "Den nuv�rende opstartfil er: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Angiv venligt navnet p� den ny opstartsfil: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Opstartsfil u�ndret\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3927,15 +3950,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux' egen"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4069,7 +4092,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Der er mere end �n fuldst�ndig diskindgang.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Ingen partitioner defineret\n"
@@ -4173,7 +4196,7 @@ 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:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -4229,7 +4252,7 @@ msgstr ""
 "naturligvis ikke kunne genskabes.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4250,58 +4273,58 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%lld ikke-allokerede sektorer\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetekt"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4315,22 +4338,22 @@ msgstr ""
 "eller gennemtvinge et helt nyt m�rkat.\n"
 "(s-kommandoen i hovedmenuen\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Detekterede SGI diskm�rkat med forkert tjeksum.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Detekterede SGI diskm�rkat med forkert tjeksum.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Detekterede SGI diskm�rkat med forkert tjeksum.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4338,7 +4361,7 @@ msgstr ""
 "Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med "
 "'w' (skriv)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4351,31 +4374,31 @@ msgstr ""
 "naturligvis ikke kunne genskabes.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektorer/spor"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Ubenyttet hul - sektorerne 0�%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ubenyttet hul - sektorerne %d�%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4384,7 +4407,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:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4393,12 +4416,12 @@ msgstr ""
 "Det anbefales kraftigt at den ellevte partition\n"
 "fylder hele disken og er af typen 'SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4409,7 +4432,7 @@ msgstr ""
 "%d %s d�kker en anden partition. Din indgang er blevet �ndret til\n"
 "%d %s \n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4418,7 +4441,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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4432,12 +4455,12 @@ 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:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4452,11 +4475,11 @@ msgstr ""
 "Enheder = %s � %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4465,28 +4488,28 @@ msgstr ""
 "Enheder = %s � %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Start       Slut   Blokke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Antal alternative cylindre"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Ekstra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Interleavefaktor"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Antal fysiske cylindre"
 
@@ -4695,6 +4718,10 @@ msgstr "Minix / gammel Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 skjult C-drev"
@@ -5320,95 +5347,95 @@ msgstr "flaget -n blev givet: Intet �ndret\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Kunne ikke gemme de gamle sektorer- afbryder\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Mislykket skrivning af partition p� %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "lang eller uafsluttet inddatalinje - afbryder\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "inddatafejl: forventer '=' efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "inddatafejl: uventet tegn %c efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ukendt inddata: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "tal for stort\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "uvedkommende tegn efter tallet\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "ikke plads til partitionsbeskrivelse\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "kunne ikke opbygge den omgivende udvidede partition\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "for mange inddatafelter\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Ikke plads til mere\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Ugyldig type\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, 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:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Advarsel: tom partition\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Advarsel: ugyldigt partitionsbegyndelse (tidligst %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ukendt opstartbar-flag,  v�lg - eller *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "delvis c,h,s-specifikation?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Udvidet partition ikke hvor den forventedes\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "ugyldige inddata\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "for mange partitioner\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5418,43 +5445,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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhed: noget lignende /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "nyttige tilvalg:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: vis partitionens st�rrelse"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:        vis eller �ndr partitions-id"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:      vis hver enheds partitioner"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 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:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5462,52 +5489,52 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:     indl�s/vis i enhederne sektorer/blokke/cylindre/"
 "MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:vis kendte partitionstyper"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [eller --DOS]:       DOS-kompatibilitet: spilder lidt plads"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [eller --re-read]:   lad kernen genindl�se partitionstabellen"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                   ret kun partitionen med nummer #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                    undlad at skrive �ndringerne til disken"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :                genskab disse sektorer"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]:   vis version"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:      vis denne besked"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "farlige tilvalg:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 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:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5515,7 +5542,7 @@ msgstr ""
 "    -G [eller --show-geometry]: vis kernens bud p� den geometri ud fra "
 "partitionstabellen"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5523,59 +5550,59 @@ msgstr ""
 "    -x [eller --show-extended]: medtag udvidede partitioner i uddata\n"
 "                                eller forvent deskriptorer for dem i inddata"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 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:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:      undertryk advarsler"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan tilsides�tte den detekterede geometri med:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [eller --cylinders #]:angiv det cylinderantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [eller --heads #]:    angiv det hovedantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [eller --sectors #]:  angiv det sektorantal, der skal bruges"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan undertrykke alle forenelighedstjek med:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Brug:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5584,67 +5611,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Brug flaget --force for at undertrykke alle tjek.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "ingen kommando?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "i alt: %llu blokke\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "brug: sfdisk --print-id enhed partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "brug: sfdisk --change-id enhed partitionsnummer id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "brug: sfdisk --id enhed partitionsnummer [id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kunne ikke �bne %s for skrivning\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kunne ikke �bne %s for l�sning\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: O.k.\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan ikke f� st�rrelsen %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5652,7 +5679,7 @@ msgstr ""
 "F�rdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5661,35 +5688,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:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ugyldig id %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Denne disk er i brug for �jeblikket.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatal fejl: kunne ikke finde %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Advarsel: %s er ikke en blokenhed\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 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:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5702,30 +5729,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:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Brug flaget --force for at undertrykke alle tjek.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "O.k.\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Gammel situation:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, 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:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5733,21 +5760,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:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Er du tilfreds med dette? [jna] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vil du virkelig skrive dette til disken? [jna] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5756,16 +5783,16 @@ msgstr ""
 "\n"
 "sfdisk: inddata sluttede for tidligt\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Afslutter - intet blev �ndret\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Svar venligst j,n,a\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5774,7 +5801,7 @@ msgstr ""
 "Skrivning af ny partitionstabel lykkedes\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5784,17 +5811,17 @@ msgstr ""
 "dd(1) til at nulstille de f�rste 512 byte:\n"
 "'dd if=/dev/zero of=/dev/xxx7 bs=512 count=1'  (se fdisk(8))\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: kunne ikke �bne %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5802,116 +5829,116 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: ikke fundet"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: fejl %d under udpakning! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: du skal angive filsystemtypen"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s ikke en printerenhed.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Gennemtvinger tjek af filsystem p� %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr "Brug: mkfs [-V] [-t fstype] [fs-tilvalg] enhed [st�rrelse]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s ikke en printerenhed.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Kunne ikke �bne %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s afmonteret\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Afmonterer resterende filsystemer..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: ukendt tilvalg: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s fra %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Kunne ikke allokere mere hukommelse\n"
@@ -6411,7 +6438,13 @@ msgstr "Fandt ingen brugbare ur-gr�nseflader.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Kunne ikke s�tte systemuret.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6423,17 +6456,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:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6442,22 +6475,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:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s fra %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6476,6 +6509,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6524,7 +6558,7 @@ msgstr ""
 "  --noadjfile   tilg� ikke /etc/adjtime. Det kr�ver, at der bruges\n"
 "                enten --utc eller --localtime\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6534,17 +6568,17 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                angiv hvilken slags alpha du har (se hwclock(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "Kunne ikke s�tte systemuret.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6553,7 +6587,7 @@ msgstr ""
 "Du har angivet flere funktionstilvalg.\n"
 "Du kan kun udf�re �n funktion ad gangen.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6561,7 +6595,7 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --utc og --localtime udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6569,7 +6603,7 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --adjust og --noadjfile udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6577,27 +6611,27 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --adjust og --noadjfile udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, 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:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Beklager, kun superbrugeren kan �ndre maskinuret.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Beklager, kun superbrugeren kan �ndre systemuret.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6605,12 +6639,12 @@ msgid ""
 msgstr ""
 "Beklager, kun superbrugeren kan �ndre maskinurets epokev�rdi i kernen.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6900,12 +6934,12 @@ msgstr "%s: Kan ikke s�tte standardkontekst for /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "�ndrer finger-information for %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM-fejl, afbryder: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7131,35 +7165,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATALT: kunne ikke gen�bne tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s er ikke en blokenhed"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "FATALT: ugyldig tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h er kun for superbrugeren.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "brug: login [-fp] [brugernavn]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kunne ikke klarg�re PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGIN %d FRA %s FOR %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7168,17 +7207,17 @@ msgstr ""
 "Login ugyldigt\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGINSESSION FRA %s FOR %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7187,7 +7226,7 @@ msgstr ""
 "\n"
 "Login ugyldigt\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7196,120 +7235,120 @@ msgstr ""
 "\n"
 "Problem med sessions-ops�tning, afbryder.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "TOMT brugernavn i %s: %d. Afbryder."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ugyldigt brugernavn \"%s\" i %s:%d. Afbryder."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Hukommelse opbrugt\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Ugyldigt brugernavn"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login afvist p� denne terminal.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s AFVIST FRA %s P� TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s AFVIST P� TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login ugyldigt\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "OPRINGNING KLOKKEN %s AF %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN P� %s FRA %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN P� %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN P� %s AF %s FRA %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN P� %s AF %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: mislykket forgrening: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY mislykkedes: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() mislykkedes"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Ingen mappe %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logger ind med hjemmemappe = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ingen hukommelse for skal-skript.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, 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:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ingen skal: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7318,65 +7357,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "loginnavn alt for langt.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "for langt NAVN"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "loginnavne m� ikke starte med '-'.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "for mange tomme linjeskift,\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "VOLDSOMT MANGE linjeskift"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login udl�b efter %d sekunder\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Sidste login: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "fra %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "p� %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGINFEJL FRA %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGINFEJL p� %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGINFEJL fra %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGINFEJL P� %s, %s"
@@ -7633,7 +7672,7 @@ msgstr "ingen TERM eller kunne ikke finde tty\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "fejl ved fors�g p� at stoppe tjenesten: \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7643,8 +7682,8 @@ msgstr "fejl ved fors�g p� at stoppe tjenesten: \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "fejl ved k�rsel af finalprog\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "fejl ved fors�g p� at stoppe tjenesten: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7771,25 +7810,25 @@ msgstr "%s: kunne ikke finde midlertidig fil.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: kunne ikke l�se midlertidig fil.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "ugyldig �rsv�rdi: brug 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "ugyldig m�nedsv�rdi: brug 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "ugyldig �rsv�rdi: brug 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "brug: cal [-13smjyV] [[m�ned] �r]\n"
@@ -7813,6 +7852,113 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "kunne ikke �bne %s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Ukendt kommando: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "Kunne ikke allokere buffer.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "Kunne ikke allokere buffer.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: kunne ikke l�se %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "skrivefejl p� %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "Finger-informationer �ndret.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Ingen mappe %s!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "Kunne ikke allokere buffer.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "Kunne ikke allokere buffer.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "Kunne ikke allokere buffer.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "Kunne ikke allokere buffer.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7966,7 +8112,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:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7977,37 +8123,37 @@ msgstr ""
 "Brug '%s [tilvalg] %s', hvis du virkelig vil bruge den.\n"
 "Skript blev ikke startet.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "brug: script [-a] [-f] [-q] [-t] [fil]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skript p�begyndt, filen er %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "skrivefejl p� %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Skript p�begyndt p� %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "skrivefejl p� %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: kunne ikke finde enheden for %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8016,17 +8162,17 @@ msgstr ""
 "\n"
 "Skript k�rt p� %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skript f�rdigt, filen er %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty mislykkedes\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "L�bet t�r for pty-er\n"
@@ -8371,6 +8517,16 @@ msgstr "l�s %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: Kunne ikke �bne: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "kunne ikke finde %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8401,6 +8557,11 @@ msgstr "Fejl ved l�sning af %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "ugyldigt id"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8418,7 +8579,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8438,12 +8599,12 @@ msgstr "fejl ved �ndring af filtilstand for %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8471,83 +8632,83 @@ msgstr "Brug: %s [tilvalg] enhed ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM mappe ... -f ] navn...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "hukommelsesallokering mislykkedes (malloc)"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "�bning af %s mislykkedes"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
+"\n"
+"Fejl ved lukning af fil\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Disk %s indeholder ikke en gyldig partitionstabel\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: Kunne ikke �bne: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "openpty mislykkedes\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "byte"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty mislykkedes\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Ugyldig sat v�rdi: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Brug: %s [tilvalg] enhed ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Finger-informationer �ndret.\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8790,7 +8951,7 @@ msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Denne 'mount' er oversat uden loop-underst�ttelse. Genovers�t venligst.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8810,7 +8971,7 @@ msgstr ""
 "  %s -f                                                  # find ubenyttet\n"
 "  %s [ -e kryptering ] [ -o forskydning ] {-f|loop_enhed} fil # klarg�r\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8826,250 +8987,294 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Ugyldig sat v�rdi: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Ugyldig sat v�rdi: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: kunne ikke �bne enheden %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: enhed optaget"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Der var ingen loop-underst�ttelse tilg�ngelig ved overs�ttelsen. Genovers�t "
 "venligst.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: kunne ikke finde %s i %s eller %s"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: if�lge mtab er %s allerede monteret som %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: if�lge mtab er %s monteret som %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kunne ikke �bne %s for skrivning: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fejl ved skrivning til %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fejl ved �ndring af filtilstand for %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kunne ikke forgrene: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Fors�ger %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: du angav ikke filsystemtype for %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Jeg vil fors�ge alle typerne, der n�vnes i %s eller %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       og det ser ud til, at dette er swapomr�de\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Jeg vil fors�ge type %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ligner et swap-omr�de - ikke monteret"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "montering mislykkedes"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: kun root kan montere %s som %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: loop-enheden angivet to gange"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: type angivet to gange"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: dropper ops�tning af loop-enhed\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Ugyldig sat v�rdi: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Ugyldig sat v�rdi: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: if�lge mtab er %s allerede monteret som %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: skal til at benytte loop-enheden %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: klarg�ring af loop-enhed mislykkedes\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: klarg�ringen af loop-enhed lykkedes\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s fundet - opretter den..\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kunne ikke �bne %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argumentet til -p eller --pass-fd skal v�re et tal"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kunne ikke �bne %s for at s�tte hastigheden"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: if�lge mtab er %s allerede monteret som %s"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
+
+#: mount/mount.c:1482
 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:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du skal angive filsystemtypen"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: montering mislykkedes"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkt %s er ikke en mappe"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: adgang n�gtet"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: skal v�re superbruger for at bruge 'mount'"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s er optaget"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc er allerede monteret"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: enten er %s allerede monteret eller %s optaget"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkt %s eksisterer ikke"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenhed %s eksisterer ikke"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9078,12 +9283,12 @@ msgstr ""
 "mount: specialenhed %s eksisterer ikke\n"
 "       (en sti er ikke en mappe)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ikke allerede monteret, eller forkert tilvalg"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9092,13 +9297,13 @@ msgstr ""
 "mount: forkert filsystemtype, forkert tilvalg, ugyldig superblok p� %s,\n"
 "       manglende tegns�t eller anden fejl"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9106,7 +9311,7 @@ msgstr ""
 "       (kan dette v�re en IDE-enhed, hvor du i virkeligheden bruger\n"
 "       ide-scsi, s� sr0, sda eller lignende er p�kr�vet?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9114,7 +9319,7 @@ msgstr ""
 "       (pr�ver du ikke p� at montere en udvidet partition i stedet\n"
 "       for en logisk partition indeni?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9122,108 +9327,103 @@ msgstr ""
 "       I nogle tilf�lde vil du finde nyttige oplysninger i systemlogggen\n"
 "       - pr�v 'dmesg | tail'  eller lignende\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "monteringstabellen er fuld"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kunne ikke l�se superblokken"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ukendt enhed"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: ukendt filsystemtype'%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du mente sikkert %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: m�ske mente du 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: m�ske mente du 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: kernen genkender ikke %s som en blokenhed\n"
 "       (m�ske hj�lper 'insmod enheds-driver'?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s er ikke en blokenhed"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s er ikke en gyldig blokenhed"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "blokenhed "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, 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:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: ingen %s fundet - opretter den..\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s er allerede monteret som %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9233,24 +9433,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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:1707
+#: mount/mount.c:1777
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: ingen type blev angivet - Jeg antager smbfs p.g.a. det "
 "foranstillede //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s er allerede monteret som %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9308,40 +9508,40 @@ msgstr ""
 "Andre tilvalg: [-nfFrsvw] [-o tilvalg] [-p adgangskodefd].\n"
 "se mange flere detaljer med 'man 8 mount'.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: dette kan kun root g�re"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: dette kan kun root g�re"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "intet blev monteret"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: fandt ingen s�dan partition"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kunne ikke finde %s i %s eller %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 "[mntent]: advarsel: intet afsluttende linjeskift ved slutningen af %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: linje %d i %s er ugyldig%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; resten af filen blev ignoreret"
 
@@ -9354,7 +9554,7 @@ msgstr "programfejl i xstrndup-kald"
 msgid "not enough memory"
 msgstr "ikke nok hukommelse"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9365,7 +9565,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9378,7 +9578,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9390,127 +9590,132 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Uventet filafslutning i %s-fil\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "forgrening mislykkedes\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "programk�rsel mislykkedes\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() mislykkedes"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "s�gning fejlede"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "�bning af %s mislykkedes"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Navn"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "s�gning fejlede"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: advarsel: %s har usikre filrettigheder %04o, %04o anbefales\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: Dropper filen %s - den lader til at v�re fragmenteret.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "s�gning fejlede"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s p� %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "forgrening mislykkedes\n"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: kunne ikke finde enheden for %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "Ikke superbruger.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "forgrening mislykkedes\n"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9520,37 +9725,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: oversat uden underst�ttelse af tilvalget -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: kunne ikke s�tte hastigheden: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kunne ikke forgrene: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ugyldig blokenhed"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ikke monteret"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kunne ikke skrive superblok"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9558,52 +9763,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ikke fundet"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: skal v�re superbruger for at afmontere"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blokenheder tillades ikke p� dette fs"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, fors�ger umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kunne ikke montere %s skrivebeskyttet\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s afmonteret\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9614,80 +9819,85 @@ msgstr ""
 "      umount -a [-f] [-r] [-n] [-v] [-t vfstyper] [-O tilvalg]\n"
 "      umount [-f] [-r] [-n] [-v] speciel | knude...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Kan ikke afmontere \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Fors�ger at afmontere %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunne ikke finde %s i mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s er ikke monteret (if�lge mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, 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:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s montering stemmer ikke med fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: kun %s kan afmontere %s fra %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: dette kan kun root g�re"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9695,77 +9905,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "Mislykket skrivning af partition p� %s\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "ukendt"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS via TCP underst�ttes ikke.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: Kunne ikke �bne: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "nantal"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Mislykket skrivning af partition p� %s\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Mislykket skrivning af partition p� %s\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Ny"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() kunne ikke afl�se tiden fra %s"
@@ -9788,7 +10017,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9817,11 +10046,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "programk�rsel mislykkedes\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "brug: %s program [parametre ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "Finger-informationer �ndret.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "Kan ikke f� st�rrelsen af %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "hukommelsesallokering mislykkedes (malloc)"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "Mislykket skrivning af partition p� %s\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: Kunne ikke �bne: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "Mislykket skrivning af partition p� %s\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "s�gefejl"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "s�gefejl"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " og "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -9964,7 +10301,15 @@ msgstr "   %f tal/sek; %f flt (tegn/sek)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Brug: %s [-c] [-n level] [-s bufstr.]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -9973,38 +10318,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "For mange parametre.\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Ugyldig sat v�rdi: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Ugyldig sat v�rdi: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Intet --date tilvalg angivet.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "maks antal segmenter= %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty mislykkedes\n"
@@ -10051,6 +10401,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "forgrening mislykkedes\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "Finger-informationer �ndret.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Intet --date tilvalg angivet.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Intet --date tilvalg angivet.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "s�gning fejlede"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "rod-inode er ikke en mappe"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "openpty mislykkedes\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "openpty mislykkedes\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10144,475 +10547,450 @@ msgstr ""
 "brug: %s [ [-q beskk�id] [-m shmid] [-s semid]\n"
 "         [-Q beksn�gle] [-M shmn�gle] [-S semn�gle] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ugyldigt tilvalg -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: ugyldig n�gle (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "adgang til n�gle n�gtet"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "har allerede fjernet n�gle"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "ugyldig n�gle"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "ukendt fejl i n�gle"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "adgang til id n�gtet"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "ugyldigt id"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "id allerede fjernet"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "ukendt fejl i id"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: ukendt tilvalg: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "brug : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h for hj�lp.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s viser oplysninger om de ipc-faciliteter, du har l�seadgang til.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Ressourcespecification:\n"
-"\t-m : delt_hukommelse\n"
-"\t-q : beskeder\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
-msgstr ""
-"\t-s : semaforer\n"
-"\t-a : alle (standard)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
+msgstr "%s viser oplysninger om de ipc-faciliteter, du har l�seadgang til.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Uddataformat:\n"
-"\t-t : tid\n"
-"\t-p : pid\n"
-"\t-c : skaber\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : detaljer om ressourcen angivet ved id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : gr�nser\n"
-"\t-u : sammendrag\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : detaljer om ressourcen angivet ved id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "kernen er ikke konfigureret til brug af delt hukommelse\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- Gr�nser for delt hukommelse ---\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "maks antal segmenter= %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "maks seg-st�r. (kbyte) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "maks total delt hukommelse (sider) = %lu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "min seg-st�r. (byte) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "---- Status for delt hukommelse ----\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "allokerede segmenter %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "allokerede sider %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "sider i ram     %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "sider i swap'et %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Swap pr�station: %ld fors�g\t %ld successer\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "---- Delte hukommelsessegmenters skabere/ejere ------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "dthid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "rtghd"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "--- Delt hukommelse Til-/afkoblings-/�ndringstider -----\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "ejer"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "tilkoblet"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "afkoblet"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "�ndret"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "----- Delt hukommelse skaber/Sidste-op ------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "----- Delte hukommelsessegmenter -----\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "n�gle"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "byte"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "atlkbl"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "status"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Ikke sat"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "m�l"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "l�st"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "kernen ikke konfigureret til semaforer\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "-------- Semaforgr�nser  -------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "maks antal tabeller = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "maks semaforer per tabel = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "maks semaforer i hele systemet = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "maks ops per semop-kald = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "semafor maksv�rdi = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "-------- Semaforstatus  --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "brugte tabeller = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "allokerede semaforer = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------- Semafortabellers skabere/ejere ---------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "---- Delt hukommelse operations-/�ndringstider -----\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "sidstop"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "sidst-�ndret"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "-------- Semafortabeller --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsemf"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "kernen er ikke konfigureret til beskedk�er\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Beskeder: Gr�nser -------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "maks k�er p� systemet = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "maks-st�rrelse af besked (byte) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "standard maks-st�rrelse af k� (byte) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Beskeder: Status --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "allokerede k�er= %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "brugte hoveder = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "brugt plads = %d byte\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "--------- Beskedk�er: skabere/ejere  ----------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "bk�id"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Beskedk�er send/modtag/�ndrings-tider --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "send"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "modt"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "�ndrng"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ Beskedk�ers PIDer  ---------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "-------- Beskedk�er ----------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "brugte-byte"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "beskeder"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync mislykkedes"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10621,42 +10999,42 @@ msgstr ""
 "\n"
 "Delt hukommelsessegment dhsid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "tilstand=%#o\tadgangs_rett=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, 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:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "tilk_tid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "frak_tid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "�ndrings_tid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync mislykkedes"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10665,32 +11043,32 @@ msgstr ""
 "\n"
 "Beskedk� bk�id=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\ttilstand=%#o\n"
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr "cbyte=%ld\tk�byte=%ld\tkant=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_tid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "modt_tid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "s�gning fejlede"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10699,159 +11077,182 @@ msgstr ""
 "\n"
 "Semafortabel semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "tilstand=%#o, adgangs_rett=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsign = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otid  = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "�tid = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "sigant"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "v�rdi"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "nantal"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zantal"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "ugyldigt id: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ugyldigt id: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s fra %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "ugyldigt id"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ugyldigt id: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s er ikke en blokenhed"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "Kan ikke f� st�rrelsen af %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "Kan ikke f� st�rrelsen af %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Kan ikke s�ge p� drev"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "Kan ikke f� st�rrelsen af %s"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Ingen"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "RE fejl: "
+msgid "error: cannot open %s"
+msgstr "%s: kunne ikke �bne %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "fejl under l�sning af %s\n"
+msgid "failed to read: %s"
+msgstr "kunne ikke finde %s"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "s�gefejl"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "�bning af %s mislykkedes"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "Kunne ikke allokere buffer.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: Kunne ikke �bne: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr ""
 "\n"
 "Fejl ved lukning af fil\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "hukommelsesallokering mislykkedes (malloc)"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10860,70 +11261,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Gammel situation:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10932,70 +11346,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "fejl ved �ndring af filtilstand for %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"brug: rdev [ -rv ] [ -o FORSKYDNING ] [ BILLEDE [ V�RDI [ FORSKYDNING ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (eller rdev /linux, osv.) viser den nuv�rende rod-enhed"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         s�tter filsystemroden til /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              s�tter ROOTFLAGS (skrivebeskyttelsesstatus)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            angiv RAMDISK-st�rrelsen"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              angiv opstarts-sk�rmtilstand"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   brug byteforskydning N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   samme som rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     samme som rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     samme som rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Bem�rk: sk�rmtilstande er: -3=Sp�rg, -2=Udvidet, -1=NormalVGA, 1=n�gle1, "
-"2=n�gle2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      brug -R 1 for at montere skrivebeskyttet, -R 0 for skriveadgang."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "manglende komma"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11106,11 +11456,12 @@ msgstr "s�tprioritet"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: gammel prioritet %d, ny prioritet %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11120,106 +11471,131 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: ukendt partitionstabeltype\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: ugyldig n�gle (%s)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: ugyldigt tilvalg -- %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr "%s version %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Bruger %s.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Bruger %s.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "hukommelsesallokering mislykkedes (malloc)"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s ikke en printerenhed.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Besked fra %s@%s p� %s klokken %s ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "kunne ikke omd�be %s til %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 #, fuzzy
 msgid "rtc read"
 msgstr ", klar"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11315,6 +11691,11 @@ msgstr "%s: ugyldig v�rdi\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s ikke en printerenhed.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "LPGETIRQ fejl"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11345,6 +11726,11 @@ msgstr ", klar"
 msgid ", error"
 msgstr ", fejl"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: montering mislykkedes"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ fejl"
@@ -11388,6 +11774,16 @@ msgid "unshare failed"
 msgstr "s�gning fejlede"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: kunne ikke s�tte hastigheden: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: kunne ikke s�tte hastigheden: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "programk�rsel mislykkedes\n"
@@ -11909,6 +12305,232 @@ 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 "%s: illegal option -- %c\n"
+#~ msgstr "%s: ugyldigt tilvalg -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "allokerede segmenter %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "allokerede sider %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "sider i ram     %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "sider i swap'et %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Swap pr�station: %ld fors�g\t %ld successer\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "fejl ved k�rsel af finalprog\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Ugyldig sat v�rdi: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "nantal"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Ny"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Brug: fdisk [-b SSZ] [-u] DISK     Skift partitionstabel\n"
+#~ "      fdisk -l [-b SSZ] [-u] DISK  Vis partitionstabel(ler)\n"
+#~ "      fdisk -s PARTITION           Vis partitionsst�rrelser i blokke\n"
+#~ "      fdisk -v                     Vis fdisks version\n"
+#~ "DISK er f.eks. /dev/hdb eller /dev/sda\n"
+#~ "PARTITION er f.eks. /dev/hda7\n"
+#~ "-u: angiv start og slut som sektornumre (i stedet for cylindernumre)\n"
+#~ "-b 2048: (for visse MO-drev) brug sektorer p� 2048 byte\n"
+
+#~ 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 ""
+#~ "Brug: fdisk [-l] [-b SSZ] [-u] enhed\n"
+#~ "F.eks.: fdisk /dev/hda  (for den f�rste IDE-disk)\n"
+#~ " eller: fdisk /dev/sdc  (for den tredie SCSI-disk)\n"
+#~ " eller: fdisk /dev/eda  (for det f�rste PS/2 ESDI-drev)\n"
+#~ " eller: fdisk /dev/rd/c0d0  eller: fdisk /dev/ida/c0d0  (for RAID-"
+#~ "enheder)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "Antallet af cylindre er sat til %d for denne disk.\n"
+#~ "Det er der intet galt med, men da det er st�rre end 1024,\n"
+#~ "kan det i visse ops�tninger give problemer med:\n"
+#~ "1) programmer, der k�rer tidligt i opstarten (bl.a. gamle LILO-"
+#~ "versioner)\n"
+#~ "2) opstarts- og partitioneringsprogrammer fra andre OS'er\n"
+#~ "   (Bl.a. DOS FDISK og OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: ingen %s fundet - opretter den..\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "programk�rsel mislykkedes\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "brug : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h for hj�lp.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Ressourcespecification:\n"
+#~ "\t-m : delt_hukommelse\n"
+#~ "\t-q : beskeder\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semaforer\n"
+#~ "\t-a : alle (standard)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Uddataformat:\n"
+#~ "\t-t : tid\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : skaber\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : gr�nser\n"
+#~ "\t-u : sammendrag\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "RE fejl: "
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "fejl under l�sning af %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "fejl ved �ndring af filtilstand for %s: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "brug: rdev [ -rv ] [ -o FORSKYDNING ] [ BILLEDE [ V�RDI "
+#~ "[ FORSKYDNING ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (eller rdev /linux, osv.) viser den nuv�rende rod-enhed"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr ""
+#~ "  rdev /dev/fd0 /dev/hda2         s�tter filsystemroden til /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              s�tter ROOTFLAGS "
+#~ "(skrivebeskyttelsesstatus)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            angiv RAMDISK-st�rrelsen"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              angiv opstarts-sk�rmtilstand"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   brug byteforskydning N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   samme som rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     samme som rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     samme som rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Bem�rk: sk�rmtilstande er: -3=Sp�rg, -2=Udvidet, -1=NormalVGA, 1=n�gle1, "
+#~ "2=n�gle2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      brug -R 1 for at montere skrivebeskyttet, -R 0 for skriveadgang."
+
+#~ msgid "missing comma"
+#~ msgstr "manglende komma"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "l�bet t�r for hukommelse"
diff --git a/po/de.po b/po/de.po
index d9cefe18..8101129f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2008-01-09 17:38+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -137,6 +137,11 @@ msgstr "Partitionstabelle erneut lesen"
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "        %s -l [ Signal ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -157,6 +162,17 @@ msgstr "Verfügbare Befehle:\n"
 msgid "get size in 512-byte sectors"
 msgstr "Größe in Bytes ermitteln"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -260,15 +276,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Aufruf: %s [ -n ] Gerät\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -371,7 +378,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "„malloc“ schlug fehl"
 
@@ -989,7 +996,7 @@ msgstr "kann nicht auf Gerät %s zugreifen"
 msgid "%s is not a block special device"
 msgstr "%s ist kein blockorientiertes Gerät"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "es ist nicht möglich, %s zu öffnen"
@@ -1013,7 +1020,7 @@ msgstr "zu viele Inodes – Maximum ist 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "nicht genügend Platz; es werden wenigstens %lu Blöcke benötigt"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Gerät: %s\n"
@@ -1087,7 +1094,7 @@ msgstr "Fehler beim Schließen von %s"
 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:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1324,7 +1331,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "Seek fehlgeschlagen in check_blocks"
 
@@ -1407,176 +1414,182 @@ msgstr "Ungültige nutzerdefinierte Seitengröße %d\n"
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr "Benutze nutzerdefinierte Seitengröße %d anstelle der Systemwerte %d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "„fork“ fehlgeschlagen\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Ungültige Swap-Headergröße, kein Label geschrieben.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Label wurde abgeschnitten.\n"
 
 # dito
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "kein Label, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "keine UUID\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Aufruf: %s [-c] [-v0|-v1] [-pSEITENGRÖSSE] [-L Label] /dev/Name [Blöcke]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "Zu viele beschädigte „Seiten“"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Speicher ist aufgebraucht"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "Eine beschädigte „Seite“\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu beschädigte Seiten\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "kann Swap-Gerät nicht zurückspulen"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "kann Puffer für Inodes nicht reservieren"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "kann Puffer für Inodes nicht reservieren"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "kann Bootsektor nicht löschen"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   Die BSD-Partitionstabelle anzeigen"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   komplettes Disklabel zeigen"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   komplettes Disklabel zeigen"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: Fehler: unbekannte Version %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Fehler beim Schließen von Datei\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: Fehler: Die angegebene Größe %lu ist größer als die des Gerätes: %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: Fehler: Der Swapbereich muss mindestens %ldkB groß sein\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: Warnung: Der Swapbereich wird nur mit der Größe %ldkB angelegt\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: Fehler: Es wird nicht versucht, Swap auf ‚%s‘ anzulegen\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: Fehler: %s ist eingehängt; es wird hier kein Swap angelegt.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Es ist nicht möglich, einen Swapbereich einzurichten: nicht lesbar"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Swapbereich Version %d wird angelegt, Größe %llu KBytes\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "kann Signaturseite nicht schreiben"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "kann kein „stat“ auf %s anwenden"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "kann keinen neuen SE-Linux-Kontext anlegen"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "konnte SE-Linux-Kontext nicht berechnen"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: konnte %s nicht in %s umbenennen: %s\n"
@@ -1641,64 +1654,112 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "Fehler beim Stoppen des Service „%s“"
 
-# "Unbrauchbar"
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Unbenutzbar"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "kann Swap-Gerät nicht zurückspulen"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Freier Bereich"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: es gibt keine derartige Partition\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: Fehler: unbekannte Version %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "Seek fehlgeschlagen in write_tables"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Für weitere Informationen siehe setarch(8).\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+# "Unbrauchbar"
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Unbenutzbar"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Freier Bereich"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Festplatte wurde verändert.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1711,239 +1772,239 @@ msgstr ""
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "cfdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "FATALER FEHLER"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Eine Taste drücken, um cfdisk zu beenden"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Konnte „seek()“ nicht auf der Festplatte benutzen"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Konnte nicht von der Festplatte lesen"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Konnte nicht auf die Festplatte schreiben"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Zu viele Partitionen"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Partition fängt vor Sektor 0 an"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Partition endet vor Sektor 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Partition fängt hinter dem Ende der Festplatte an"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Partition endet hinter dem Ende der Festplatte"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partition endet im letzten teilweisen Zylinder"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "logische Partitionen nicht in Platten-Reihenfolge"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "logische Partitionen überlappen"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "vergrößerte logische Partitionen überlappen"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 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:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 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:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menü ohne Richtung, verwende horizontal."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Diese Taste ist hier nicht verwendbar"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Eine Taste drücken, um fortzufahren"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primäre"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Erzeuge eine neue primäre Partition"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logische"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Erzeuge eine neue logische Partition"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Erzeuge keine neue Partition"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Interner Fehler !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Größe (in MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Anfang"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Erzeuge Partition am Anfang des freien Bereiches"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Ende"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Erzeuge Partition am Ende des freien Bereiches"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Kein Platz, um die erweiterte Partition anzulegen"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Keine Partitionstabelle.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Keine Partitionstabelle. Fange mit Null-Tabelle an."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Ungültige Signatur an Partitionstabelle"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 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:1594
+#: fdisk/cfdisk.c:1476
 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:1642
+#: fdisk/cfdisk.c:1524
 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:1674
+#: fdisk/cfdisk.c:1556
 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:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 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:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Konnte die Größe der Festplatte nicht feststellen"
 
 # "Ungültige primäre Partition"
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Beschädigte primäre Partition"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Beschädigte logische Partition"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Warnung!!  Dies kann Daten auf der Festplatte zerstören!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "Sind Sie sicher, dass Sie die Partitionstabelle schreiben wollen?\n"
 "(„ja“ oder „nein“): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "nein"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Die Partitionstabelle wurde nicht auf die Festplatte geschrieben"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Bitte „ja“ oder „nein“ eingeben"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Die Partitionstabelle wird auf die Festplatte geschrieben…"
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 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:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1952,14 +2013,14 @@ msgstr ""
 "Die Tabelle wurde geschr., aber das Neueinlesen schlug fehl.  Rebooten Sie."
 
 # This one isn't really correct.
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
@@ -1968,73 +2029,73 @@ msgstr ""
 
 # "Geben sie einen Dateinamen ein oder drücken Sie Return, um es auf dem Bildschirm anzuzeigen: "
 # is too long
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dateiname oder Return um es auf dem Bildschirm anzuzeigen: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Konnte „%s“ nicht öffnen"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Festplatte: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Keine  "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primäre"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "  Logische"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Boot"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Kein"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabelle von %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Erster   Letzter\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -2042,7 +2103,7 @@ msgstr ""
 " # Typ        Sektor      Sektor   Offset    Länge    Dateisystemtyp (ID)  "
 "Flags\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2050,490 +2111,490 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "-----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ---Anfangs----      -----End------   Anfangs-   Anzahl der\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, fuzzy
 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "„Roh“"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Die „rohen“ Daten der Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektoren"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Die Tabelle nach Sektoren sortiert ausgeben"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabelle"
 
 # "Nur die Partitionstabelle ausgeben" (joey)
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Einfach die Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Zeige die Tabelle nicht an"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Hilfe für cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 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:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "und zu verändern."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
 # "Befehl"
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Befehl     Bedeutung"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "--------     ---------"
 
 # "  b          Wechselt zwischen bootfähig und nicht bootfähig."
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 "  b          (De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 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:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WARNUNG: Diese Funktion sollte nur von Leuten benutzt"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             werden, die wissen, was sie tun."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Diese Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximieren der Nutzung der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Beachten Sie, dass dies die Partition nicht mehr kompatibel"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             zu DOS, OS/2, … machen kann"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Aus dem freien Bereich eine neue Partition erzeugen"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Es gibt mehrere Formate für die Partitionstabelle, aus"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             denen man wählen kann"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 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:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s – Tabelle nach Sektoren sortiert"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t – Tabelle mit den reinen Daten"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Das Programm beenden ohne die Partitionstabelle zu schreiben"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Den Dateisystemtyp ändern"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Einheit für die Größenanzeige ändern"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Wechselt zwischen MB, Sektoren und Zylindern"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 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:2319
+#: fdisk/cfdisk.c:2201
 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:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             ablehnen"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pfeil-hoch   Den Cursor zur vorherigen Partition bewegen"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 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:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "Strg-L       Zeichnet den Bildschirm erneut"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Diese Hilfe anzeigen"
 
 # "Hinweis"
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "eingegeben werden (außer W zum Schreiben)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr " Zylinder"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Die Anzahl der Zylinder ändern"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Köpfe"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Die Anzahl der Köpfe ändern"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Die Anzahl der Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Fertig"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Ändern der Geometrie beenden"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Geben Sie die Anzahl der Zylinder ein: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Ungültiger Wert für die Anzahl der Zylinder"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Geben Sie die Anzahl der Köpfe ein: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Ungültiger Wert für die Anzahl der Köpfe"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Geben Sie die Anzahl der Sektoren pro Spur ein: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Ungültiger Wert für die Anzahl der Sektoren"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Geben Sie den Dateisystemtyp ein: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Der Dateisystemtyp kann nicht auf „leer“ gesetzt werden"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Der Dateisystemtyp kann nicht auf „erweitert“ gesetzt werden"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unb(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Unbekannt (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Festplatte: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Größe: %lld Bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Größe: %lld Bytes, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Köpfe: %d   Sektoren pro Spur: %d   Zylinder: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Name"
 
 # I currently don't know a better translation
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Flags"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Part. Typ"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Dateisystemtyp"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Bezeichner]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "   Sektoren"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "   Zylinder"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr " Größe (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr " Größe (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr " Bootbar"
 
 # "Bootfähigkeit der aktuellen Partition ändern" (joey)
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "(De)Aktivieren des bootfähig-flags der aktuellen Partition"
 
 # "Löschen"
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Löschen"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Die Festplattengeometrieparameter ändern (nur für Experten)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Hilfe"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Die Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maxim."
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximieren der Nutzung der aktuellen Partition (nur für Experten)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Neue"
 
 # "Erzeuge aus dem freien Bereich eine neue Partition"
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Neue Partition im freiem Bereich anlegen"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Ausgabe"
 
 # "Gib die Partitionstabelle auf dem Bildschirm oder in eine Datei aus"
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "Partitionstabelle auf dem Bildschirm oder in Datei ausgeben"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Ende"
 
 # "Beende das Programm ohne die Partitionstabelle zu schreiben"
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Das Programm beenden, ohne die Partitionstabelle zu speichern"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 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:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Einheit."
 
 # "Ändert die Einheiten der Größenanzeige ("
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 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:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Schreib."
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Die Partitionstabelle schreiben (dies kann Daten zerstören)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Diese Partition kann nicht als bootfähig markiert werden"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Eine leere Partition kann nicht gelöscht werden"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Die Nutzung dieser Partition kann nicht maximiert werden"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Diese Partition ist unbenutzbar"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Diese Partition ist bereits in Benutzung"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Der Dateisystemtyp einer leeren Partition kann nicht geändert werden"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Keine weiteren Partitionen"
 
 # "Ungültige Taste"
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Unzulässiger Befehl"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2605,9 +2666,9 @@ msgstr ""
 "\n"
 "„BSD label“ für Gerät: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Befehl  Bedeutung"
 
@@ -2627,9 +2688,9 @@ msgstr "   i   Bootstrap installieren"
 msgid "   l   list known filesystem types"
 msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   Dieses Menü anzeigen"
 
@@ -2641,14 +2702,14 @@ msgstr "   n   Eine neue BSD-Partition anlegen"
 msgid "   p   print BSD partition table"
 msgstr "   p   Die BSD-Partitionstabelle anzeigen"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   Ende ohne Speichern der Änderungen"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   Zurück zum Hauptmenü"
 
@@ -2692,13 +2753,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Erster %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Letzter %s oder +Größe, +GrößeK oder +GrößeM"
@@ -2844,7 +2905,7 @@ msgstr "Sektoren/Spur"
 msgid "tracks/cylinder"
 msgstr "Spuren/Zylinder"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "Zylinder"
@@ -2902,7 +2963,7 @@ msgstr "Bootstrap auf %s installiert.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Die maximale Anzahl von Partitionen wurde erzeugt\n"
@@ -2926,232 +2987,212 @@ msgstr ""
 "\n"
 "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:257
 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 ""
-"Aufruf: fdisk [-b SSZ] [-u] FESTPLATTE     Partitionstabelle bearbeiten\n"
-"        fdisk -l [-b SSZ] [-u] FESTPLATTE  Partitionstabelle(n) ausgeben\n"
-"        fdisk -s PARTITION                 Größe einer Partition in Blöcken\n"
-"        fdisk -v                           Version anzeigen\n"
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
 "\n"
-"FESTPLATTE ist zum Beispiel /dev/hda oder /dev/sda\n"
-"PARTITION ist zum Beispiel /dev/hda7\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
 "\n"
-"-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:260
-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 ""
-"Aufruf: fdisk [-l] [-b SSZ] [-u] Gerät\n"
-"Zum Beispiel: fdisk /dev/hda       (die erste IDE-Festplatte)\n"
-"        oder: fdisk /dev/sdc       (die dritte SCSI-Festplatte)\n"
-"        oder: fdisk /dev/eda       (die erste PS/2 ESDI-Festplatte)\n"
-"        oder: fdisk /dev/rd/c0d0\n"
-"        oder: fdisk /dev/ida/c0d0  (RAID-Festplatten)\n"
-"        …\n"
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Konnte %s nicht lesen\n"
 
 # "Konnte in %s nicht positionieren"
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Konnte in %s nicht positionieren\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Konnte %s nicht schreiben\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-IOCTL fehlgeschlagen bei %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Konnte keinen weiteren Speicher reservieren\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Fataler Fehler\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   (De)Aktivieren eines Nur-Lese-Flags"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   „bsd disklabel“ bearbeiten"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   (De)Aktivieren des Mountable(Einhängbarkeit)-Flags"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   Eine Partition löschen"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   Eine neue Partition anlegen"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Eine neue leere DOS Partitionstabelle anlegen"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   Die Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Einen neuen leeren „Sun disklabel“ anlegen"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   Den Dateisystemtyp einer Partition ändern"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   Die Einheit für die Anzeige/Eingabe ändern"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   Die Partitionstabelle überprüfen"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr ""
 "   w   Die Tabelle auf die Festplatte schreiben und das Programm beenden"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Zusätzliche Funktionen (nur für Experten)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   Wählen der bootfähigen Partition"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   Bearbeiten des „bootfile“-Eintrags"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   Die sgi-swap-Partition auswählen"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   (De)Aktivieren des bootfähig-Flags"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   (De)Aktivieren des DOS Kompatibilitätsflags"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Die Anzahl der alternierenden Zylinder ändern"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   Die Anzahl der Zylinder ändern"
 
 # XXX
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Die „raw“-Daten der Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Die Anzahl der Extra-Sektoren pro Zylinder ändern"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   Die Anzahl der Köpfe ändern"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   Den Interleave-Faktor ändern"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Umdrehungsgeschwindigkeit ändern (U/min)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   Die Anzahl der Sektoren/Spur ändern"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Die Anzahl der physischen Zylinder ändern"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 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:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   Erweiterte Partitionen anzeigen"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   Eine IRIX-Partitionstabelle (SGI) anlegen"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   Partitionsreihenfolge korrigieren"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   i   Die Einheit für die Anzeige/Eingabe ändern"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Sie müssen angeben"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "Köpfe"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "Sektoren"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3160,30 +3201,11 @@ msgstr ""
 "%s%s.\n"
 "Sie können dies im Zusatzfunktionsmenü tun.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " und "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Die Anzahl der Zylinder für diese Platte ist auf %d gesetzt.\n"
-"Daran ist nichts verkehrt, aber das ist größer als 1024 und kann\n"
-"in bestimmten Konfigurationen Probleme hervorrufen mit:\n"
-"1) Software, die zum Bootzeitpunkt läuft (z. B. ältere LILO-Versionen)\n"
-"2) Boot- und Partitionierungssoftware anderer Betriebssysteme\n"
-"   (z. B. DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3194,38 +3216,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ungültiges Offset in primärer erweiterter Partition\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3234,32 +3255,32 @@ msgstr ""
 "Warnung: Lasse Partition hinter #%d aus.\n"
 "Sie werden gelöscht, wenn Sie diese Partitionstabelle schreiben.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Warnung: ignoriere weitere Daten in Partitionstabelle %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Warnung: leere Partition\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3274,27 +3295,18 @@ msgstr ""
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Hinweis: Die Sektorgröße ist %d (nicht %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
 # XXX
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3303,7 +3315,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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3312,17 +3324,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:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Die zusätzliche erweiterte Partition %d ignorieren\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3331,7 +3343,7 @@ msgstr ""
 "Warnung: Schreiben wird ungültiges Flag 0x%04x in Part.-tabelle %d "
 "korrigieren\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3340,95 +3352,100 @@ msgstr ""
 "\n"
 "dreimalig EOF bekommen – beende…\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Hex code (L um eine Liste anzuzeigen): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, Vorgabe: %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Benutze den Standardwert %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Wert außerhalb des Bereichs.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Warnung: Partition %d hat leeren Typ\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition %d ausgewählt\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Noch keine Partition definiert!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primären Partitionen sind schon definiert worden!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "Sektor"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Die Einheit für die Anzeige/Eingabe ist nun %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Die Einheit für die Anzeige/Eingabe ist nun %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WARNUNG: Partition %d ist eine erweiterte Partition\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "DOS-Kompatibilitätsflag ist gesetzt\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-Kompatibilitätsflag ist nicht gesetzt\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d existiert noch nicht!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3441,7 +3458,7 @@ msgstr ""
 "ist wahrscheinlich unklug. Sie können eine Partition\n"
 "mit dem „d“-Kommando löschen.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3450,7 +3467,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:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3461,7 +3478,7 @@ msgstr ""
 "zu lassen, wie es SunOS/Solaris erwartet und sogar Linux es mag.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3473,62 +3490,62 @@ msgstr ""
 "als gesamte Platte zu lassen, wie es IRIX erwartet.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Der Dateisystemtyp der Partition %d ist nun %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d hat unterschiedliche phys./log. Enden:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "sollte sein (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i endet nicht an einer Zylindergrenze.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "sollte sein (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3537,7 +3554,7 @@ msgstr ""
 "\n"
 "Platte %s: %ld MByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3546,32 +3563,37 @@ msgstr ""
 "\n"
 "Platte %s: %ld.%ld GByte, %lld Byte\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d Köpfe, %llu Sektoren/Spur, %d Zylinder"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", zusammen %llu Sektoren"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Einheiten = %s von %d × %d = %d Bytes\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "ungültige INode-Größe"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3580,14 +3602,14 @@ msgstr ""
 "Keine Änderungen notwendig.  Die Anordnung ist schon korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Fertig\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3602,16 +3624,16 @@ msgstr ""
 # "   Device"
 # "    Gerät"
 # 2002-05-10 12:15:13 CEST -ke-
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s  boot.     Anfang        Ende     Blöcke   Id  System\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Gerät"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3620,7 +3642,7 @@ msgstr ""
 "\n"
 "Partitionstabelleneinträge sind nicht in Platten-Reihenfolge\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3633,88 +3655,88 @@ msgstr ""
 
 # Ist "Kp" eine gute Abkürzung für "Kopf" ?
 # Kf ist besser (2001-11-24 21:30:51 CET -ke-)
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Warnung: Partition %d enthält Sektor 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partition %d: Sektor %d größer als Maximum %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, 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:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Warnung: Partition %d überlappt mit Partition %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Warnung: Partition %d ist leer\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Gesamtanzahl belegter Sektoren %ld größer als Maximum %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld unbenutzte Sektoren\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektor %llu wird bereits benutzt\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Es sind keine freien Sektoren verfügbar\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3727,7 +3749,7 @@ msgstr ""
 "\tzuerst eine neue, leere DOS-Partitionstabelle (mit o).\n"
 "\tWARNUNG: Das zerstört den momentanen Inhalt Ihrer Platte.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3740,23 +3762,23 @@ msgstr ""
 "\tzuerst eine neue, leere DOS-Partitionstabelle (mit o).\n"
 "\tWARNUNG: Das zerstört den momentanen Inhalt Ihrer Platte.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, 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:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Füge primäre Partition hinzu\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3767,20 +3789,20 @@ msgstr ""
 "   %s\n"
 "   p      Primäre Partition (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l      Logische Partition (5 oder größer)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e      Erweiterte"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ungültige Partitionsnummer für den Typ „%c“\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3789,12 +3811,12 @@ msgstr ""
 "Die Partitionstabelle wurde verändert!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Rufe ioctl() um Partitionstabelle neu einzulesen.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3807,7 +3829,7 @@ msgstr ""
 "Der Kernel benutzt noch die alte Tabelle.\n"
 "Die neue Tabelle wird beim nächsten Neustart verwendet.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3820,7 +3842,7 @@ msgstr ""
 "oder verändert haben, dann schauen Sie bitte in die\n"
 "fdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3829,43 +3851,43 @@ msgstr ""
 "\n"
 "Fehler beim Schließen von Datei\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d hat keinen Datenbereich\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Neuer Datenanfang"
 
 # That sounds pretty ummm…
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Expertenkommando (m für Hilfe): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Anzahl der Zylinder"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Anzahl der Köpfe"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Anzahl der Sektoren"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, 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:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3874,32 +3896,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: Unbekannter Befehl\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3908,16 +3930,16 @@ msgstr ""
 "Warnung: Option -b (Sektorengröße setzen) sollte nur mit einem\n"
 "angegebenen Gerät benutzt werden\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Befehl (m für Hilfe): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3926,16 +3948,16 @@ msgstr ""
 "\n"
 "Momentane Bootdatei ist: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Bitte geben Sie den Namen der neuen Boot-Datei an: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot-Datei unverändert\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -4028,15 +4050,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux Swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4171,7 +4193,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:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Keine Partitionen definiert\n"
@@ -4278,7 +4300,7 @@ msgstr ""
 "Geben Sie JAWOHL ein, wenn Sie sicher sind, diese\n"
 "Partition von anderem Typ sein lassen zu wollen.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "JAWOHL\n"
 
@@ -4342,7 +4364,7 @@ msgstr ""
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4363,55 +4385,55 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS Swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Gesamte Platte"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt sectors"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS reserved"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4424,22 +4446,22 @@ msgstr ""
 "Zylinder und Partitionen, setzen müssen oder mit einem\n"
 "frischen Label beginnen (s im Hauptmenü).\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "SGI-Disklabel mit falscher Prüfsumme entdeckt.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "SGI-Disklabel mit falscher Prüfsumme entdeckt.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "SGI-Disklabel mit falscher Prüfsumme entdeckt.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4447,7 +4469,7 @@ msgstr ""
 "Warnung: Schreiben wird ungültiges Flag 0x%04x in Part.-tabelle %d "
 "korrigieren\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4462,31 +4484,31 @@ msgstr ""
 "vorherige Inhalt unrettbar verloren.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektoren/Spur"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Unbenutzter Bereich – Sektor 0–%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Unbenutzter Bereich – Sektor %d–%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4495,7 +4517,7 @@ msgstr ""
 "Andere Partition überdecken bereits die ganze Platte.\n"
 "Löschen/verkleinern Sie sie vor einem erneuten Versuch.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4504,12 +4526,12 @@ msgstr ""
 "Es ist höchst empfehlenswert, die elfte Partition die ganze\n"
 "Platte überdecken und sie vom Typ „SGI volume“ sein zu lassen.\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4520,7 +4542,7 @@ msgstr ""
 "Ihr Wert %d %s überdeckt einige andere Partitionen. Ihr Eintrag wurde auf\n"
 "%d %s geändert\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4531,7 +4553,7 @@ msgstr ""
 "dem\n"
 "Beginn bei 0 und %u Sektoren.\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4545,12 +4567,12 @@ msgstr ""
 "Geben Sie JAWOHL ein, wenn Sie sich ganz sicher sind, dass Sie diese\n"
 "Partition als 82 (Linux Swap) markieren möchten: "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4565,11 +4587,11 @@ msgstr ""
 "Einheiten = %s of %d × 512 Byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4578,28 +4600,28 @@ msgstr ""
 "Einheiten: %s mit %d × 512 Byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Start       Ende   Blöcke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Anzahl der alternierenden Zylinder"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Extra-Sektoren pro Zylinder"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Interleave-Faktor"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Rotationsgeschwindigkeit (U/min)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Anzahl der physikalischen Zylinder"
 
@@ -4809,6 +4831,10 @@ msgstr "Minix / old Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux Swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 verst. C:-Lw."
@@ -5447,94 +5473,94 @@ msgstr "Die Option „-n“ wurde verwendet: Es wurde nichts verändert\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Speichern der alten Sektoren fehlgeschlagen – Abbruch\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Schreiben der Partition auf %s fehlgeschlagen\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "Lange oder unvollständige Eingabezeilen – beende\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "Eingabefehler: „=“ erwartet nach %s-Feld\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "Eingabefehler: unerwartetes Zeichen %c nach %s-Feld\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nicht erkannte Eingabe: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "Zahl zu groß\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "abschließender Müll hinter Zahl\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "kein Platz für Partitionsdeskriptor\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "kann umgebende erweiterte Partition nicht anlegen\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "zu viele Eingabefelder\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Für mehr kein Platz\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Illegaler Typ\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Warnung: gegebene Größe (%lu) überschreitet maximal erlaubte Größe (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Warnung: leere Partition\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Warnung: ungültiger Partitionsanfang (kleinstmöglich %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nicht erkanntes Boofähig-Flag – wählen Sie - oder *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "partielle c,h,s-Spezifikation?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Erweiterte Partition nicht dort, wo erwartet\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "ungültige Eingabe\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "Zu viele Partitionen\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5545,43 +5571,43 @@ msgstr ""
 "Normalerweise brauchen Sie nur <anfang> und <größe> anzugeben (und\n"
 "vielleicht <typ>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "gerät: etwas wie /dev/hda oder /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "nützliche Optionen:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [oder --show-size]: Größe einer Partition anzeigen"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [oder --id]:        Partitions-Id ausgeben oder ändern"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [oder --list]:      Partitionen jedes Geräts auflisten"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [oder --dump]:      genauso, aber in einem für späteres "
 "Wiedereinlesen\n"
 "                             geeigneten Format"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [oder --increment]: Zylinder usw. von 1 statt von 0 an zählen"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5589,60 +5615,60 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:    in Einheiten von Sektoren/Blöcken/Zylindern/MB\n"
 "                         akzeptieren/ausgeben"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [oder --list-types]:bekannte Partitionstypen auflisten"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [oder --DOS]:       für DOS-Kompatibilität: ein wenig Platz "
 "verschwenden"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "-R [oder --re-read]:   den Kernel zum Neueinlesen der Partitionstabelle\n"
 "                         veranlassen"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                  nur die Partition Nummer # ändern"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                   nicht wirklich auf Platte schreiben"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O datei :             die zu überschreibenden Sektoren in Datei "
 "speichern"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I datei :             diese Sektoren wieder herstellen"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [oder --version]:   Version ausgeben"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [oder --help]:      diese Meldung ausgeben"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "gefährliche Optionen:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [oder --show-geometry]: die Vorstellungen des Kernels zur Geometrie\n"
 "                                 ausgeben"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5651,7 +5677,7 @@ msgstr ""
 "Geometrie\n"
 "                                    ausgeben"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5660,61 +5686,61 @@ msgstr ""
 "auflisten\n"
 "                               bzw. bei Eingabe Deskriptoren für sie erwarten"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [oder --Linux]:        nicht über für Linux irrelevante Dinge "
 "beschweren"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [oder --quiet]:        Warnmeldungen unterdrücken"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Sie können die erkannte Geometrie überstimmen:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [oder --cylinders #]:  Zahl der Zylinder setzen"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [oder --heads #]:      Zahl der Köpfe setzen"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [oder --sectors #]:    Zahl der Sektoren setzen"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Sie können jegliche Konsistenzprüfungen abschalten mit:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [oder --force]:        mach was ich sag, auch wenn’s dumm ist"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s Gerät\t\t aktive Partitionen auf Gerät auflisten\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s Gerät n1 n2 … aktive Partitionen n1 …, der Rest deaktivieren\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An Gerät\t aktiviere Partition n, device die anderen\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5723,69 +5749,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 "Benutzen Sie die Optioen --force, um diese Überprüfung zu unterbinden.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "kein Befehl?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "zusammen: %llu Blöcke\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Aufruf: sfdisk --print-id Gerät Partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Aufruf: sfdisk --change-id Gerät Partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Aufruf: sfdisk --id Gerät Partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "Konnte %s nicht zum Lesen/Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "Konnte %s nicht zum Lesen öffnen\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
 # And again one for show_geometry()…
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kann die Größe von %s nicht feststellen\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5793,7 +5819,7 @@ msgstr ""
 "Fertig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5802,36 +5828,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:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "Partition %s hat ID %x und ist nicht versteckt\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ungültige ID %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Diese Platte ist momentan in Benutzung.\n"
 
 # This is a stat()
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Schwerwiegender Fehler: kann %s nicht finden\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Warnung: %s ist kein blockorientiertes Gerät\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Überprüfe, dass niemand diese Festplatte zur Zeit benutzt …\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5845,31 +5871,31 @@ msgstr ""
 "deaktivieren Sie alle Swap-Partitionen (mit swapoff).\n"
 "Benutzen Sie --no-reread, um diese Überprüfung zu unterbinden.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 "Benutzen Sie die Optioen --force, um alle Überprüfungen zu unterbinden.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Alte Aufteilung:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partition %d existiert nicht, kann sie nicht ändern\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Neue Aufteilung:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5877,21 +5903,21 @@ msgstr ""
 "Mir gefallen diese Partitionen nicht – nichts geändert.\n"
 "(Wenn Sie das wirklich wollen, benutzen Sie die Option --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Mir gefällt das nicht – Sie sollten am besten mit „Nein“ antworten\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Sind Sie damit zufrieden? [y – ja, n – nein, q – aufhören] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Wollen Sie das auf Platte schreiben? [y – ja, n – nein, q – aufhören] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5900,16 +5926,16 @@ msgstr ""
 "\n"
 "sfdisk: vorzeitiges Ende der Eingabe\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Höre auf – nichts geändert\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Bitte antworten Sie mit y, n oder q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5918,7 +5944,7 @@ msgstr ""
 "Die neue Partitionstabelle wurde erfolgreich geschrieben\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5928,17 +5954,17 @@ msgstr ""
 "dann nehmen Sie dd(1), um die ersten 512 Bytes auf 0 zu setzen:\n"
 "„dd if=/dev/zero of=/dev/foo7 bs=512 count=1“ (siehe fdisk(8)).\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: Konnte %s nicht öffnen: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5946,118 +5972,118 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: Nicht gefunden"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: Fehler %d beim Entpacken! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: Sie müssen den Dateisystemtyp angeben"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s ist kein lp-Gerät.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Überprüfung des Dateisystem auf %s erzwungen.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr "Aufruf: mkfs [-V] [-t FS-Typ] [FS-Optionen] Gerät [Größe]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s ist kein lp-Gerät.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Konnte %s nicht öffnen: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s ausgehängt\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Aushängen aller restlichen Dateisysteme…"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: Unbekanntes Argument: %s\n"
 
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s von %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Kein Speicherplatz für „inodes“ verfügbar"
@@ -6610,7 +6636,13 @@ msgstr "Keine brauchbare Uhrschnittstelle gefunden.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Konnte die Systemuhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6625,19 +6657,19 @@ msgstr ""
 "gemacht.\n"
 
 # Egger
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6646,26 +6678,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:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s von %s\n"
 
 # "Universalzeit"
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6684,6 +6716,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6735,7 +6768,7 @@ msgstr ""
 "  --noadjfile   nicht auf /etc/adjtime zugreifen; erfordert Benutzung von\n"
 "                 entweder --utc oder --localtime\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6747,17 +6780,17 @@ msgstr ""
 "                  (siehe hwclock(8))\n"
 
 # "stellen"
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "Konnte die Systemuhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6766,7 +6799,7 @@ msgstr ""
 "Sie haben mehrere Funktionen angefordert.\n"
 "Sie können immer nur eine Funktion gleichzeitig ausführen.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6775,7 +6808,7 @@ msgstr ""
 "%s: Die Optionen --utc und --localtime schließen sich aus. Sie gaben beide "
 "an.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6784,7 +6817,7 @@ msgstr ""
 "%s: Die Optionen --adjust und --noadjfile schließen sich aus. Sie gaben "
 "beide an.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6793,42 +6826,42 @@ msgstr ""
 "%s: Die Optionen --adjust und --noadjfile schließen sich aus. Sie gaben "
 "beide an.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Keine brauchbare Zeitangabe. Kann Uhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, 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:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -7123,12 +7156,12 @@ msgstr "%s: Kann keinen voreingestellten Kontext für /etc/passwd setzen"
 msgid "Changing finger information for %s.\n"
 msgstr "Ändere finger-Information für %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM-Fehlschlag, breche ab: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7356,38 +7389,43 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATAL: kann TTY nicht erneut öffnen: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s ist kein blockorientiertes Gerät"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "FATAL: ungültiges TTY"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h nur für den Superuser.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Aufruf: login [-fp] [Benutzername]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Konnte PAM nicht initialisieren: %s"
 
 # unten nochmal mit NL
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "Anmeldung: "
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, 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:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7397,17 +7435,17 @@ msgstr ""
 "\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7416,7 +7454,7 @@ msgstr ""
 "\n"
 "Login inkorrekt\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7425,122 +7463,122 @@ msgstr ""
 "\n"
 "Problem beim Aufsetzen der Sitzung, Abbruch.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Leerer Benutzername in %s:%d. Abbruch."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ungültiger Nutzername „%s“ in %s:%d. Abbruch."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Speicher ist alle!\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Ungültiger Nutzername"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, 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:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSED FROM %s ON TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSED ON TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login inkorrekt\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Sie haben neue E-Mail.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Sie haben E-Mail.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Kann keinen neuen Prozess erzeugen: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY fehlgeschlagen: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() fehlgeschlagen"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logge ein mit Heimatverzeichnis = „/“.\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: kein Speicher für Shellskipt.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: konnte Shellskipt nicht ausführen: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: keine Shell: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7549,69 +7587,69 @@ msgstr ""
 "\n"
 "%s Anmeldung: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Login-Name viel zu lang.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NAME zu lang"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Benutzernamen dürfen nicht mit einem „-“ anfangen.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "zu viele nackte Zeilenvorschübe\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "EXZESSIV viele Zeilenvorschübe"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login nach %d Sekunden abgebrochen\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Letzte Anmeldung: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "von %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "auf %.*s\n"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, 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:1473
+#: login-utils/login.c:1477
 #, 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:1477
+#: login-utils/login.c:1481
 #, 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:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -7873,7 +7911,7 @@ msgstr "kein TERM oder kann nicht auf TTY zugreifen\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "Fehler beim Stoppen des Service „%s“"
 
 #: login-utils/simpleinit.c:950
@@ -7883,8 +7921,8 @@ msgstr "Fehler beim Stoppen des Service „%s“"
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "Fehler beim „exec“ von finalprog\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "Fehler beim Stoppen des Service „%s“"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -8016,25 +8054,25 @@ msgstr "%s: Konnte „stat“ nicht auf eine temporäre Datei anwenden.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: Konnte eine temporäre Datei nicht lesen.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "illegaler Wert für Jahr: benutzen Sie 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "illegaler Wert für Monat: benutzen Sie 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "illegaler Wert für Jahr: benutzen Sie 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Aufruf: cal [-13smjyV] [[Monat] Jahr]\n"
@@ -8059,6 +8097,115 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "kann %s nicht öffnen"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Unbekannter Befehl: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: Konnte %s nicht lesen.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "Fehler beim Schreiben auf %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Für weitere Informationen siehe setarch(8).\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8214,7 +8361,7 @@ msgstr "%s: Konnte %s nicht in %s umbenennen: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Aufruf: %s von nach Dateien…\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8225,40 +8372,40 @@ msgstr ""
 "Benutzen Sie „%s [optionen] %s“, wenn Sie es tatsächlich starten wollen.\n"
 "Script nicht gestartet.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "Aufruf: script [-a] [-f] [-q] [-t] [Datei]\n"
 
 # Not really nice…
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script wurde gestartet, die Datei ist %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "Fehler beim Schreiben auf %s\n"
 
 # The %s must be at the end, 'cause it contains the \n
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Script wurde gestartet: %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "Fehler beim Schreiben auf %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: Konnte das Gerät für %s nicht finden\n"
 
 # The %s must be at the end, 'cause it contains the \n
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8267,17 +8414,17 @@ msgstr ""
 "\n"
 "Script beendet: %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script wurde beendet, die Datei ist %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Keine ptys mehr.\n"
@@ -8624,6 +8771,16 @@ msgstr "read %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: fehlschlagenes Öffnen von: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "kann kein „stat“ auf %s anwenden"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8654,6 +8811,11 @@ msgstr "Fehler beim Lesen von %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "ungültige ID"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8671,7 +8833,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8691,12 +8853,12 @@ msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8724,76 +8886,76 @@ msgstr "Aufruf: %s [Optionen] gerät …\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM Verzeichnis … -f ] Name…\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "„malloc“ schlug fehl"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
+"\n"
+"Fehler beim Schließen von Datei\n"
+
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Festplatte %s enthält keine gültige Partitionstabelle\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "Bytes"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Ungültiger Wert zu setzen: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Aufruf: %s [Optionen] gerät …\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8802,7 +8964,7 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -9060,7 +9222,7 @@ msgstr ""
 "Dieses mount wurde ohne Loop-Unterstützung übersetzt. Bitte neu übersetzen.\n"
 
 # Setup
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -9084,7 +9246,7 @@ msgstr ""
 "  Setup:\n"
 "    %s [ -e Verschlüsselung ] [ -o Offset ] {-f|loop-Gerät} Datei\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -9100,12 +9262,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Ungültiger Wert zu setzen: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Ungültiger Wert zu setzen: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
@@ -9114,74 +9286,85 @@ msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
 # libc.po:
 # "Device or resource busy"
 # "Das Gerät oder die Ressource ist belegt"
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: Das Gerät wird momentan noch benutzt"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Zur Übersetzungszeit war keine Loop-Unterstützung verfügbar. Bitte neu "
 "übersetzen.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: übersetzte %s „%s“ in „%s“\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: Laut mtab ist %s schon auf %s eingehängt"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: Laut mtab ist %s auf %s eingehängt"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: Konnte %s nicht zum Schreiben öffnen: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: Fehler beim Schreiben von %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: Fehler beim Ändern der Zugriffsrechte von %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Versuche %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: Es wurde kein Dateisystemtyp für %s angegeben\n"
@@ -9189,175 +9372,199 @@ msgstr "mount: Es wurde kein Dateisystemtyp für %s angegeben\n"
 # Maybe:
 # "       Es werden alle Dateisystemtypen ausprobiert, die\n"
 # "       in %s oder %s aufgelistet sind\n"
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 "       Werde alle Dateisystemtypen probieren, die in %s oder\n"
 "       %s aufgelistet sind\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       und es sieht so aus, als sei dies Swap-Bereich\n"
 
 # Maybe: "       Es wird der Typ %s ausprobiert\n"
 # or   : … "probieren"
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Werde den Typ %s versuchen\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s sieht wie ein Swap-Bereich aus – nicht eingehängt"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "mount ist fehlgeschlagen"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: nur „root“ kann %s auf %s einhängen"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: das „loop“-Gerät wurde zweimal angegeben"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: der Typ wurde doppelt angegeben"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: überspringe Aufsetzen des „loop“-Geräts\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Ungültiger Wert zu setzen: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Ungültiger Wert zu setzen: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: Laut mtab ist %s schon auf %s eingehängt"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: werde das „loop“-Gerät %s verwenden\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: loop=%s gestohlen"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: Aufsetzen des „loop“-Geräts fehlgeschlagen\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: „loop“-Gerät erfolgreich aufgesetzt\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nicht gefunden – Erzeuge sie…\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: Konnte %s nicht öffnen: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: Argument für -p oder --pass-fd muss eine Zahl sein"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: Kann %s nicht zum Setzen der Geschwindigkeit öffnen"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: Laut mtab ist %s schon auf %s eingehängt\n"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr ""
 "umount: %s wird momentan noch benutzt – im Nur-Lese-Modus wiedereingehängt\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr ""
+"umount: %s wird momentan noch benutzt – im Nur-Lese-Modus wiedereingehängt\n"
+
+#: mount/mount.c:1482
 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:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: Sie müssen den Dateisystemtyp angeben"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: Einhängen ist fehlgeschlagen"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, 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:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: keine Berechtigung"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: muss Superuser sein, um mount zu verwenden"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s wird gerade benutzt"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc ist bereits eingehängt"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, 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:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: Einhängepunkt %s existiert nicht"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: Gerätedatei %s existiert nicht"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9366,14 +9573,14 @@ msgstr ""
 "mount: Spezialgerät %s existiert nicht\n"
 "       (ein Pfadpräfix ist kein Verzeichnis)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, 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:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9383,13 +9590,13 @@ msgstr ""
 "       Superblock von %s ist beschädigt, fehlende\n"
 "       Kodierungsseite oder ein anderer Fehler"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9397,7 +9604,7 @@ 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9405,7 +9612,7 @@ msgstr ""
 "       (Versuchen Sie nicht eine erweiterte Partition einzuhängen\n"
 "       statt einer der logischen Partitionen darin?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9413,114 +9620,109 @@ msgstr ""
 "       Manchmal liefert das Syslog wertvolle Informationen – versuchen\n"
 "       Sie  dmesg | tail  oder so\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "Einhängetabelle ist voll"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: Konnte den Superblock nicht lesen"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: unbekanntes Gerät"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: unbekannter Dateisystemtyp „%s“"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: Wahrscheinlich meinten sie „%s“"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: Vielleicht meinten Sie „iso9660“?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: Vielleicht meinten Sie „vfat“?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: Das Kernel erkennt %s nicht als blockorientiertes\n"
 "       Gerät (Vielleicht hilft „insmod Treiber“?)"
 
 # "versuchen"
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ist kein blockorientiertes Gerät"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ist kein gültiges blockorientiertes Gerät"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "blockorientiertes Gerät "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, 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:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s ist schreibgeschützt, doch Option „-w“ ist explizit gegeben"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: Konnte %s%s nicht im Nur-Lese-Modus einhängen"
 
 # That sounds somehow dumb.
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, 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:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s ist bereits auf %s eingehängt\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9530,24 +9732,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: kein Typ angegeben – aufgrund des //-Präfixes wird cifs angenommen\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ist bereits auf %s eingehängt\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9616,41 +9818,41 @@ msgstr ""
 "Weitere Optionen: [-nfFrsvw] [-o optionen] [-p passwdfd].\n"
 "Für viele weitere Details: man 8 mount.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: Nur „root“ kann dies tun"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: Nur „root“ kann dies tun"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "nichts wurde eingehängt"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: keine passende Partition gefunden"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: Konnte %s nicht in %s oder %s finden"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 "[mntent]: Warnung: Am Ende der Datei %s fehlt ein abschließender "
 "Zeilenvorschub.\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: Zeile %d in %s ist fehlerhaft%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; der Rest der Datei wurde ignoriert"
 
@@ -9663,7 +9865,7 @@ msgstr "Fehler im Aufruf von xstrndup"
 msgid "not enough memory"
 msgstr "Nicht genügend Speicher"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9674,7 +9876,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9687,7 +9889,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9699,130 +9901,135 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: unerwartetes Dateiende in %s-Datei\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "„fork“ fehlgeschlagen\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "„exec“ fehlgeschlagen\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() fehlgeschlagen"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Name"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
 
 # holes
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: Überspringe die Datei %s – sie scheint Löcher zu enthalten.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
 # The first %s is swapon/swapoff
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s für %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: Konnte das Gerät für %s nicht finden\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "Nicht Superuser.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9832,37 +10039,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: Die Unterstützung für -f wurde nicht mit übersetzt\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: Kann keinen neuen Prozess erzeugen: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: kein gültiges blockorientiertes Gerät"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s ist nicht eingehängt"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: Konnte den „Superblock“ nicht schreiben"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9870,52 +10077,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: Nicht gefunden"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: nur der Superuser kann umount durchführen"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: Blockgeräte auf Dateisystem nicht erlaubt"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "kein umount2, versuche umount…\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, 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:263
+#: mount/umount.c:269
 #, 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:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s ausgehängt\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: Kann die Liste der Dateisysteme zum Aushängen nicht finden"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9926,80 +10133,85 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t VFS-Typen] [-O optionen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis …\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Kann \"\" nicht aushängen\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Versuche, %s auszuhängen\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Konnte %s nicht in „mtab“ finden\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ist laut „mtab“ nicht eingehängt"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s scheint mehrfach eingehängt zu sein"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount und fstab stimmen nicht überein"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: Nur %s kann %s von %s unmounten"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: Nur „root“ kann dies tun"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -10007,77 +10219,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "unbekannter"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS über TCP wird nicht unterstützt.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "ncount"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Neue"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() konnte Zeit nicht von %s lesen."
@@ -10100,7 +10331,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -10129,11 +10360,121 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "„exec“ fehlgeschlagen\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Aufruf: %s Programm [Argument …]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Für weitere Informationen siehe setarch(8).\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "es ist nicht möglich, die Größe von %s festzustellen"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "„malloc“ schlug fehl"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "Konnte Persönlichkeit nicht auf %s setzen"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: fehlschlagenes Öffnen von: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "Konnte Persönlichkeit nicht auf %s setzen"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "Seek-Fehler"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "Seek-Fehler"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " und "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10277,7 +10618,15 @@ msgstr "   %f int/sec; %f rec (char/sec)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Aufruf: %s [-c] [-n Level] [-s Puffergröße]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10286,7 +10635,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10295,31 +10644,36 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Nicht genug Argumente"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Ungültiger Wert zu setzen: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Ungültiger Wert zu setzen: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "Maximale Anzahl der Segmente = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
@@ -10366,6 +10720,61 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "„fork“ fehlgeschlagen\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Für weitere Informationen siehe setarch(8).\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Es wurde keine „--date“-Option angegeben.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Es wurde keine „--date“-Option angegeben.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "„seek“ gescheitert."
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "„root inode“ ist kein Verzeichnis"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "„openpty“ ist fehlgeschlagen\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "„openpty“ ist fehlgeschlagen\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10461,481 +10870,456 @@ msgstr ""
 "Aufruf: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "           [-Q msgkey] [-M shmkey] [-S semkey] … ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unzulässige Option -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: unzulässiger Schlüssel (%s)\n"
 
 # libc.po: "Keine Berechtigung"
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "Keine Berechtigung für Schlüssel"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "Schlüssel schon entfernt"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "ungültiger Schlüssel"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "unbekannter Fehler im Schlüssel"
 
 # libc.po: "Keine Berechtigung"
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "Keine Berechtigung für ID"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "ungültige ID"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "ID schon entfernt"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "unbekannter Fehler in ID"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: Unbekanntes Argument: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "Aufruf: %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i Id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h für weitere Informationen.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s liefert Informationen über Einrichtungen von IPC (Inter Process\n"
-"Communication), auf die Sie Lesezugriff haben.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Ressourcenspezifikation:\n"
-"\t-m : gemeinsamer Speicher\n"
-"\t-q : Nachrichten\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : Semaphoren\n"
-"\t-a : alles (Voreinstellung)\n"
+"%s liefert Informationen über Einrichtungen von IPC (Inter Process\n"
+"Communication), auf die Sie Lesezugriff haben.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Ausgabeformat:\n"
-"\t-t : Zeit\n"
-"\t-p : Pid\n"
-"\t-c : Erzeuger\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i Id [-s -q -m] : Details über mit Id identifizierte Ressource\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : Grenzen\n"
-"\t-u : Zusammenfassung\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i Id [-s -q -m] : Details über mit Id identifizierte Ressource\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr ""
 "Der Kernel ist nicht konfiguriert, gemeinsamen Speicher zu unterstützen.\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Gemeinsamer Speicher: Grenzen --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "Maximale Anzahl der Segmente = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "Maximale Segmentgröße (KByte) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "Maximaler gesamter gemeinsamer Speicher (kBytes) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "Minimale Segmentgröße (Bytes) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Gemeinsamer Speicher: Status --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "allozierte Segmente %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "allozierte Seiten %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "residente Seiten  %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "geswappte Seiten  %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Swapleistung: %ld Versuche\t %ldErfolge\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Gemeinsamer Speicher: Erzeuger/Besitzer der Segmente --------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "Rechte"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Gemeinsamer Speicher: Attach/Detach/Change-Zeiten --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "Besitzer"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "Attach"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "Detach"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "Change"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ Gemeinsamer Speicher: Erzeuger/Last-Op --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Gemeinsamer Speicher: Segmente --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "Schlüssel"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "Bytes"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "Status"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Nicht gesetzt"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "zerstört"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "gesperrt"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "Kernel nicht für Semaphoren konfiguriert\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Semaphorengrenzen --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "maximale Anzahl von Feldern = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "maximale Semaphoren pro Feld = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "maximale Semaphoren systemweit = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "maximale Operations pro Semop-Ruf = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "maximaler Semaphorenwert = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Semaphorenstatus --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "benutzte Felder = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "zugewiesene Semaphoren = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Semaphorenfelder: Erzeuger/Besitzer --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "SemID"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ Semaphore-Operations/Änderungs-Zeiten --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "last-op"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "last-changed"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Semaphorenfelder --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "Kernel nicht für Nachrichtenschlangen konfiguriert\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Nachrichten: Grenzen --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "maximale Warteschlangen systemweit = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "maximale Größe der Nachricht (Bytes) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "normale maximale Größe der Warteschlange (Bytes) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Nachrichten: Status --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "zugewiesene Warteschlangen = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "benutzte Köpfe = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "benutzter Platz = %d Bytes\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ Nachrichtenwarteschlangen: Erzeuger/Besitzer --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 "------ Nachrichtenwarteschlangen: Versand/Empfang/Änderung-Zeiten --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "Versand"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "Empfang"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "Änderung"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ Nachrichtenwarteschlangen: PIDs --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Nachrichtenwarteschlangen --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "Benutzt-Bytes"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "Nachrichten"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10945,43 +11329,43 @@ msgstr ""
 "Gemeinsamer Speicher Segment shmid=%d\n"
 
 # similiar message below.
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 # similiar message below.
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time = %-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time = %-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "Änderungszeit = %-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10990,32 +11374,32 @@ msgstr ""
 "\n"
 "Nachrichtenwarteschlange msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "Sendezeit = %-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "Empfangszeit = %-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "„seek“ gescheitert."
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -11024,161 +11408,184 @@ msgstr ""
 "\n"
 "Semaphorenfeld semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "Semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "Wert"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "Pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "ungültige ID: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ungültige ID: %s\n"
 
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s von %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "ungültige ID"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ungültige ID: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ist kein blockorientiertes Gerät"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Konnte „seek()“ nicht auf der Festplatte benutzen"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Kein"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "Fehler in regulärem Ausdruck: "
+msgid "error: cannot open %s"
+msgstr "%s: Konnte %s nicht öffnen\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "Fehler beim Lesen von %s\n"
+msgid "failed to read: %s"
+msgstr "kann kein „stat“ auf %s anwenden"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "Seek-Fehler"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: fehlschlagenes Öffnen von: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr ""
 "\n"
 "Fehler beim Schließen von Datei\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "„malloc“ schlug fehl"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11187,70 +11594,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Alte Aufteilung:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11259,70 +11679,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "Aufruf: rdev [ -rv ] [ -o OFFSET ] [ BILD [ WERT [ OFFSET ] ] ]"
-
-# Oh well, "ROOT-Gerät" sounds sooo stupid
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (oder rdev /linux etc.) das aktuelle ROOT-Gerät anzeigen"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         ROOT auf /dev/hda2 setzen"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              ROOTFLAGS setzen (Nur-Lese-Status)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            Größe der RAMDISK setzen"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              VIDEOMODE bei Booten setzen"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N …                     Byte-Offset N benutzen"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags …                     das gleiche wie rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize …                       das gleiche wie rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode …                       das gleiche wie rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Bem.: Videomodi sind: -3=fragen, -2=Erweitert, -1=NormalVGA, 1=schlüssel1, …"
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      nehmen Sie -R 1, um im Nur-Lesen-Modus einzuhängen, -R 0 für lesen/"
-"schreiben."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "fehlendes Komma"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11436,11 +11792,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: Alte Priorität: %d, neue Priorität: %d\n"
 
-#: sys-utils/rtcwake.c:83
-#, c-format
+#: sys-utils/rtcwake.c:85
+#, fuzzy, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11459,105 +11816,130 @@ msgstr ""
 "    -v | --verbose            ausführliche Nachrichten\n"
 "    -V | --version            Version anzeigen\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "RTC-Zeit lesen"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "System-Zeit lesen"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "RTC-Zeit konvertieren"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "RTC-Alarm setzen"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr "RTC-Alarm aktivieren"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr "RTC-Weck-Alarm setzen"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: nicht erkannter Energiesparmodus „%s“\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: unzulässiges Intervall %s Sekunden\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: unzulässige time_t-Wert %s\n"
 
 # c-format
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: Version %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: interpretiere RTC als UTC …\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Benutze %s-Zeit.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Benutze %s-Zeit.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: Weckzeit muss angegeben werden\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "„malloc“ schlug fehl"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s nicht für Weckereignisse geeignet\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "Alarm %ld, sys_time %ld, rtc_time %ld, Sekunden %u\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr "%s: Zeit geht nicht rückwärts zu %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s: Weckereignis von „%s“, benutze %s bei %s\n"
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: konnte %s nicht in %s umbenennen: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "RTC gelesen"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11659,6 +12041,11 @@ msgstr "%s: Ungültiger Wert\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s ist kein lp-Gerät.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "„LPGETIRQ“ Fehler"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11690,6 +12077,11 @@ msgstr ", on-line"
 msgid ", error"
 msgstr ", Fehler"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: Einhängen ist fehlgeschlagen"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "„LPGETIRQ“ Fehler"
@@ -11735,6 +12127,16 @@ msgid "unshare failed"
 msgstr "„seek“ gescheitert."
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "„exec“ fehlgeschlagen\n"
@@ -12259,6 +12661,232 @@ 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 "%s: illegal option -- %c\n"
+#~ msgstr "%s: unzulässige Option -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "allozierte Segmente %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "allozierte Seiten %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "residente Seiten  %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "geswappte Seiten  %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Swapleistung: %ld Versuche\t %ldErfolge\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "Fehler beim „exec“ von finalprog\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Ungültiger Wert zu setzen: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "ncount"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Neue"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Aufruf: fdisk [-b SSZ] [-u] FESTPLATTE     Partitionstabelle bearbeiten\n"
+#~ "        fdisk -l [-b SSZ] [-u] FESTPLATTE  Partitionstabelle(n) ausgeben\n"
+#~ "        fdisk -s PARTITION                 Größe einer Partition in "
+#~ "Blöcken\n"
+#~ "        fdisk -v                           Version anzeigen\n"
+#~ "\n"
+#~ "FESTPLATTE ist zum Beispiel /dev/hda oder /dev/sda\n"
+#~ "PARTITION ist zum Beispiel /dev/hda7\n"
+#~ "\n"
+#~ "-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"
+
+#~ 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 ""
+#~ "Aufruf: fdisk [-l] [-b SSZ] [-u] Gerät\n"
+#~ "Zum Beispiel: fdisk /dev/hda       (die erste IDE-Festplatte)\n"
+#~ "        oder: fdisk /dev/sdc       (die dritte SCSI-Festplatte)\n"
+#~ "        oder: fdisk /dev/eda       (die erste PS/2 ESDI-Festplatte)\n"
+#~ "        oder: fdisk /dev/rd/c0d0\n"
+#~ "        oder: fdisk /dev/ida/c0d0  (RAID-Festplatten)\n"
+#~ "        …\n"
+
+#~ 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"
+#~ "Die Anzahl der Zylinder für diese Platte ist auf %d gesetzt.\n"
+#~ "Daran ist nichts verkehrt, aber das ist größer als 1024 und kann\n"
+#~ "in bestimmten Konfigurationen Probleme hervorrufen mit:\n"
+#~ "1) Software, die zum Bootzeitpunkt läuft (z. B. ältere LILO-Versionen)\n"
+#~ "2) Boot- und Partitionierungssoftware anderer Betriebssysteme\n"
+#~ "   (z. B. DOS FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "„exec“ fehlgeschlagen\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "Aufruf: %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i Id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h für weitere Informationen.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Ressourcenspezifikation:\n"
+#~ "\t-m : gemeinsamer Speicher\n"
+#~ "\t-q : Nachrichten\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : Semaphoren\n"
+#~ "\t-a : alles (Voreinstellung)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Ausgabeformat:\n"
+#~ "\t-t : Zeit\n"
+#~ "\t-p : Pid\n"
+#~ "\t-c : Erzeuger\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : Grenzen\n"
+#~ "\t-u : Zusammenfassung\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "Fehler in regulärem Ausdruck: "
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "Fehler beim Lesen von %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr "Aufruf: rdev [ -rv ] [ -o OFFSET ] [ BILD [ WERT [ OFFSET ] ] ]"
+
+# Oh well, "ROOT-Gerät" sounds sooo stupid
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (oder rdev /linux etc.) das aktuelle ROOT-Gerät anzeigen"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         ROOT auf /dev/hda2 setzen"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              ROOTFLAGS setzen (Nur-Lese-Status)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            Größe der RAMDISK setzen"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              VIDEOMODE bei Booten setzen"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N …                     Byte-Offset N benutzen"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags …                     das gleiche wie rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize …                       das gleiche wie rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode …                       das gleiche wie rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Bem.: Videomodi sind: -3=fragen, -2=Erweitert, -1=NormalVGA, "
+#~ "1=schlüssel1, …"
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      nehmen Sie -R 1, um im Nur-Lesen-Modus einzuhängen, -R 0 für lesen/"
+#~ "schreiben."
+
+#~ msgid "missing comma"
+#~ msgstr "fehlendes Komma"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "Speicher ist alle"
diff --git a/po/es.po b/po/es.po
index 17182ca7..fd7ad324 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,8 +1,11 @@
 # Mensajes en espa�ol para util-linux.
 # Copyright (C) 2000 Beth Powell <bpowell@turbolinux.com>.
 # Copyright (C) 2001, 2002, 2003 Santiago Vila Doncel <sanvila@unex.es>.
+#
+# This file is distributed under the same license as the util-linux-ng package.
+#
 # Beth Powell <bpowell@turbolinux.com>, 2000.
-# Santiago Vila Doncel <sanvila@unex.es>, 2001, 2002, 2003, 2004.
+# Santiago Vila Doncel <sanvila@unex.es>, 2001, 2002, 2003, 2004, 2010.
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided that this
@@ -11,10 +14,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.12m\n"
+"Project-Id-Version: util-linux-ng 2.17.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
-"PO-Revision-Date: 2004-12-22 01:31+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
+"PO-Revision-Date: 2010-04-04 03:31+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,27 +37,24 @@ msgid "get read-only"
 msgstr "obtiene s�lo lectura"
 
 #: disk-utils/blockdev.c:82
-#, fuzzy
 msgid "get logical block (sector) size"
-msgstr "obtiene el tama�o del sector"
+msgstr "obtiene el tama�o del bloque l�gico (sector)"
 
 #: disk-utils/blockdev.c:88
-#, fuzzy
 msgid "get physical block (sector) size"
-msgstr "obtiene el tama�o del sector"
+msgstr "obtiene el tama�o del bloque f�sico (sector)"
 
 #: disk-utils/blockdev.c:94
 msgid "get minimum I/O size"
-msgstr ""
+msgstr "obtiene el tama�o m�nimo de E/S"
 
 #: disk-utils/blockdev.c:100
 msgid "get optimal I/O size"
-msgstr ""
+msgstr "obtiene el tama�o �ptimo de E/S"
 
 #: disk-utils/blockdev.c:106
-#, fuzzy
 msgid "get alignment offset"
-msgstr "tama�o de nodo-i incorrecto"
+msgstr ""
 
 #: disk-utils/blockdev.c:112
 #, fuzzy
@@ -86,14 +86,12 @@ msgid "get readahead"
 msgstr "obtiene `readahead'"
 
 #: disk-utils/blockdev.c:157
-#, fuzzy
 msgid "set filesystem readahead"
-msgstr "establece `readahead'"
+msgstr "establece el `readahead' del sistema de ficheros"
 
 #: disk-utils/blockdev.c:163
-#, fuzzy
 msgid "get filesystem readahead"
-msgstr "obtiene `readahead'"
+msgstr "obtiene el `readahead' del sistema de ficheros"
 
 #: disk-utils/blockdev.c:167
 msgid "flush buffers"
@@ -108,6 +106,11 @@ msgstr "vuelve a leer la tabla de particiones"
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ se�al ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -124,9 +127,19 @@ msgid "Available commands:\n"
 msgstr "�rdenes disponibles:\n"
 
 #: disk-utils/blockdev.c:187
-#, fuzzy
 msgid "get size in 512-byte sectors"
-msgstr "obtiene el tama�o en bytes"
+msgstr "obtiene el tama�o en sectores de 512 bytes"
+
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, fuzzy, c-format
+msgid "%s (%s)\n"
+msgstr "%s: %s (%s)\n"
 
 #: disk-utils/blockdev.c:321
 #, c-format
@@ -161,7 +174,7 @@ msgstr "%s: error de ioctl en %s\n"
 #: disk-utils/blockdev.c:481
 #, fuzzy, c-format
 msgid "RO    RA   SSZ   BSZ   StartSec            Size   Device\n"
-msgstr "RO    RA   SSZ   BSZ   StartSec     Size    Device\n"
+msgstr "RO    RA   SSZ   BSZ   StartSec            Size   Device\n"
 
 #: disk-utils/elvtune.c:48
 #, c-format
@@ -230,15 +243,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "uso: %s [ -n ] dispositivo\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, fuzzy, c-format
-msgid "%s (%s)\n"
-msgstr "%s: %s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -294,9 +298,9 @@ msgstr ""
 "%s: atenci�n, no se puede determinar el tama�o del sistema de ficheros\n"
 
 #: disk-utils/fsck.cramfs.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "not a block device or file: %s"
-msgstr "%s no es un dispositivo de bloques o un fichero\n"
+msgstr "no es un dispositivo de bloques o un fichero: %s"
 
 #: disk-utils/fsck.cramfs.c:184 disk-utils/fsck.cramfs.c:226
 #, fuzzy
@@ -311,7 +315,7 @@ msgstr "(Siguiente fichero: %s)"
 
 #: disk-utils/fsck.cramfs.c:207
 msgid "superblock magic not found"
-msgstr ""
+msgstr "no se ha encontrado el n�mero m�gico del superbloque"
 
 #: disk-utils/fsck.cramfs.c:216
 #, fuzzy
@@ -319,9 +323,9 @@ msgid "unsupported filesystem features"
 msgstr "Escriba el tipo de sistema de ficheros: "
 
 #: disk-utils/fsck.cramfs.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "superblock size (%d) too small"
-msgstr "N�mero de sectores"
+msgstr "el tama�o del superbloque (%d) es demasiado peque�o"
 
 #: disk-utils/fsck.cramfs.c:223
 #, fuzzy
@@ -340,18 +344,17 @@ msgstr "%s: atenci�n, imagen cramfs antigua, sin CRC\n"
 
 #: disk-utils/fsck.cramfs.c:246
 msgid "unable to test CRC: old cramfs format"
-msgstr ""
+msgstr "no se puede comprobar CRC: formato cramfs antiguo"
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
 #: disk-utils/fsck.cramfs.c:297
-#, fuzzy
 msgid "crc error"
-msgstr ", error"
+msgstr "error de crc"
 
 #: disk-utils/fsck.cramfs.c:364
 #, fuzzy
@@ -370,7 +373,7 @@ msgstr ""
 #: disk-utils/fsck.cramfs.c:391
 #, c-format
 msgid "decompression error %p(%d): %s"
-msgstr ""
+msgstr "error de descompresi�n %p(%d): %s"
 
 #: disk-utils/fsck.cramfs.c:415
 #, fuzzy, c-format
@@ -419,17 +422,17 @@ msgid "directory inode has zero offset and non-zero size: %s"
 msgstr ""
 
 #: disk-utils/fsck.cramfs.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "mkdir failed: %s"
-msgstr "/dev: chdir() ha fallado: %m"
+msgstr "mkdir fall�: %s"
 
 #: disk-utils/fsck.cramfs.c:511
 msgid "filename length is zero"
-msgstr ""
+msgstr "la longitud del nombre del fichero es cero"
 
 #: disk-utils/fsck.cramfs.c:514
 msgid "bad filename length"
-msgstr ""
+msgstr "longitud err�nea del nombre del fichero"
 
 #: disk-utils/fsck.cramfs.c:521
 #, fuzzy
@@ -450,7 +453,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:574
 msgid "symbolic link has zero size"
-msgstr ""
+msgstr "el enlace simb�lico tiene tama�o cero"
 
 #: disk-utils/fsck.cramfs.c:586
 #, fuzzy, c-format
@@ -483,9 +486,9 @@ msgid "bogus mode: %s (%o)"
 msgstr "%s: modo falso en `%s' (%o)\n"
 
 #: disk-utils/fsck.cramfs.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "mknod failed: %s"
-msgstr "montaje err�neo"
+msgstr "mknod fall�: %s"
 
 #: disk-utils/fsck.cramfs.c:682
 #, c-format
@@ -969,7 +972,7 @@ msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
 msgid "%s is not a block special device"
 msgstr "%s no es un dispositivo de bloques"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
@@ -993,7 +996,7 @@ msgstr "demasiados nodos-i; el m�ximo es 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "no hay suficiente espacio, se necesitan al menos %lu bloques"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -1068,7 +1071,7 @@ msgstr "error al cerrar %s"
 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:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1308,7 +1311,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "Error de b�squeda en check_blocks"
 
@@ -1394,174 +1397,180 @@ 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:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "La bifurcaci�n (fork) ha fallado\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "etiqueta"
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
-msgstr ""
+msgstr "no hay uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTAMP�G] /dev/nombre [bloques]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "Hay demasiadas p�ginas incorrectas"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "No queda memoria"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "Una p�gina incorrecta\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu p�ginas incorrectas\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "No se puede rebobinar el dispositivo de intercambio"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "No se puede asignar b�fer para los nodos-i"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "No se puede asignar b�fer para los nodos-i"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "No se puede borrar el sector de inicio"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   Imprime la tabla de particiones BSD"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   Muestra la etiqueta del disco completa"
 
-#: disk-utils/mkswap.c:454
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:439
+#, c-format
 msgid "        (compiled without libblkid). "
-msgstr "   s   Muestra la etiqueta del disco completa"
+msgstr ""
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: error: versi�n desconocida %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Error al cerrar el fichero\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: error: el tama�o %lu es superior al tama�o del dispositivo %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: error: el �rea de intercambio debe tener como m�nimo %ldkB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: atenci�n: el �rea de intercambio se trunca a %ldkB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "No se intentar� crear el dispositivo de intercambio en '%s'"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s est� montado; no se crear� un sistema de ficheros aqu�"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 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:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Configurando espacio de intercambio versi�n %d, tama�o = %llu kB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "No se puede escribir la p�gina de firma"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync ha fallado"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "No se puede ejecutar `stat' sobre %s"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "No se pueden escribir los nodos-i"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "No se puede cambiar el nombre %s por %s: %s\n"
@@ -1607,7 +1616,7 @@ msgstr "/dev/%s: no es un dispositivo de caracteres"
 #: disk-utils/raw.c:216
 #, fuzzy, c-format
 msgid "Device '%s' is not a raw dev\n"
-msgstr "%s no es un dispositivo de bloques"
+msgstr "Atenci�n: %s no es un dispositivo de bloques\n"
 
 #: disk-utils/raw.c:231
 #, c-format
@@ -1624,56 +1633,102 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "error al detener el servicio: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Inutilizable"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "No se puede rebobinar el dispositivo de intercambio"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Espacio libre"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: esta partici�n no existe\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: error: versi�n desconocida %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: fallo al abrir %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: fallo al abrir %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: fallo al abrir %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: fallo al abrir %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: fallo al abrir %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "Error de b�squeda en write_tables"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "Se ha cambiado la informaci�n de finger.\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Inutilizable"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Espacio libre"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Se ha modificado el disco.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
@@ -1681,7 +1736,7 @@ msgstr ""
 "bien\n"
 "actualizada.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1694,233 +1749,232 @@ msgstr ""
 "particiones DOS 6.x, consulte la p�gina de manual de cfdisk\n"
 "para obtener m�s informaci�n.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ERROR MUY GRAVE"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Pulse una tecla para salir de cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "No se puede buscar en la unidad de disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "No se puede leer la unidad de disco"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "No se puede escribir en la unidad de disco"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Hay demasiadas particiones"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "La partici�n empieza antes del sector 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "La partici�n termina antes del sector 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "La partici�n empieza despu�s del fin de disco"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "La partici�n termina despu�s del fin de disco"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partici�n termina en el �ltimo cilindro parcial"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "Las particiones l�gicas no est�n en orden de disco"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "Solapamiento de particiones l�gicas"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "Solapamiento de particiones l�gicas ampliadas"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 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:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 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:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Men� sin direcci�n; la opci�n predeterminada es horizontal."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Tecla no permitida"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Pulse una tecla para continuar"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Crea una nueva partici�n primaria"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "L�gica"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Crea una nueva partici�n l�gica"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "No crea ninguna partici�n"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "���� Error interno !!!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Tama�o (en MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Principio"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "A�ade la partici�n al principio del espacio libre"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Final"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "A�ade la partici�n al final del espacio libre"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "No hay espacio para crear la partici�n extendida"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "No hay tabla de particiones.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "No hay tabla de particiones. Se comienza con una tabla vac�a."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Firma err�nea en la tabla de particiones"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Tipo de tabla de particiones desconocido"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 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:1642
+#: fdisk/cfdisk.c:1524
 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:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "No se puede abrir la unidad de disco"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 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:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "No se puede obtener el tama�o del disco"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Partici�n primaria incorrecta"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Partici�n l�gica incorrecta"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "�Atenci�n!: esta operaci�n puede destruir datos del disco"
 
-#: fdisk/cfdisk.c:1881
-#, fuzzy
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to 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): "
+"     (si o no): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "No se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
-msgstr "s�"
+msgstr "si"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
-msgstr "Por favor escriba `s�' (con acento) o `no'"
+msgstr "Por favor escriba `si' (sin acento) o `no'"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Se est� escribiendo la tabla de particiones en el disco..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Se ha escrito la tabla de particiones en el disco"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1929,89 +1983,89 @@ 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:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 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:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 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:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "No se puede abrir el fichero '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidad de disco: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
 # Masculino, porque se refiere a un tipo de partici�n.
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Ninguno"
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/L�g"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primaria"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   L�gica"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Inicio"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
 # Masculino, porque se refiere a "Indicadores"
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Ninguno"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabla de particiones para %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "              Primer     �ltimo\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -2019,7 +2073,7 @@ msgstr ""
 "N� Tipo       Sector      Sector   Despl.  Longitud  Tipo sist. fich. (ID) "
 "Indicad.\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2027,475 +2081,475 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ----Inicio----      -----Final----   Comienzo   N�mero de\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, fuzzy
 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "En bruto (raw)"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Imprime la tabla utilizando el formato de datos en bruto"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sectores"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Imprime la tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabla"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "S�lo imprime la tabla de particiones"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "No imprime la tabla"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Pantalla de ayuda para cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 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:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "de disco duro."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Orden        Significado"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-----        -----------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Conmuta el indicador de iniciable de la partici�n actual"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Suprime la partici�n actual"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 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:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ATENCI�N: Se recomienda utilizar esta opci�n �nicamente"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             si se conoce el funcionamiento de la misma."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 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:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Esta opci�n puede hacer que la partici�n sea"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             incompatible con DOS, OS/2,..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Crea una nueva partici�n a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Hay varios formatos distintos para la partici�n"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             entre los que puede elegir:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 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:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabla ordenada por sectores"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Tabla con formato en bruto"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Cambia el tipo de sistema de ficheros"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 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:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, sectores y cilindros"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 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:2319
+#: fdisk/cfdisk.c:2201
 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:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             escribiendo `s�' o `no'"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Flecha arriba  Desplaza el cursor a la partici�n anterior"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Flecha abajo   Desplaza el cursor a la partici�n siguiente"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Vuelve a dibujar la pantalla"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "(salvo W para operaciones de escritura)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Cambia la geometr�a de cilindros"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Cabezas"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Cambiar geometr�a de cabezas"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Cambiar geometr�a de sectores"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Ha finalizado la operaci�n de cambio de geometr�a"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Escriba el n�mero de cilindros: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros no permitido"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Escriba el n�mero de cabezas: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Valor de cabezas no permitido"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Escriba el n�mero de sectores por pista: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Valor de sectores no permitido"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Escriba el tipo de sistema de ficheros: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a vac�o"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "No se puede cambiar el tipo de sistema de ficheros a extendido"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc.(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/L�g"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconocido (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unidad de disco: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Tama�o: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Tama�o: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Cabezas: %d   Sectores por pista: %d   Cilindros: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nombre"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Indicadores"
 
 # Este espacio inicial es para que no se pegue con la s de Indicadores
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr " Tipo"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Tipo de S.F."
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Etiqueta]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "   Sectores"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cilindros"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr " Tama�o(MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "Tama�o (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Iniciable"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Conmuta el indicador de iniciable de la partici�n actual"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Suprimir"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Suprime la partici�n actual"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometr�a"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Cambia la geometr�a del disco (s�lo para usuarios avanzados)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Ayuda"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Imprime esta pantalla"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 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:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nueva"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Crea una nueva partici�n a partir del espacio libre"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Imprimir"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Salir"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Sale del programa sin escribir la tabla de particiones"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 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:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 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:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Escribir"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 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:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "No se puede convertir esta partici�n en una partici�n iniciable"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "No se puede suprimir una partici�n vac�a"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "No se puede maximizar esta partici�n"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Esta partici�n se encuentra en estado inutilizable"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Esta partici�n ya est� en uso"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 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:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "No hay m�s particiones"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Orden ilegal"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2567,9 +2621,9 @@ msgstr ""
 "\n"
 "Etiqueta BSD para el dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Orden  Acci�n"
 
@@ -2589,9 +2643,9 @@ msgstr "   i   Instala secuencia de inicio"
 msgid "   l   list known filesystem types"
 msgstr "   l   Lista los tipos de sistemas de ficheros conocidos"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   Imprime este men�"
 
@@ -2603,14 +2657,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:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   Sale sin guardar los cambios"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   Vuelve al men� principal"
 
@@ -2654,13 +2708,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Primer %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "�ltimo %s o +tama�o o +tama�oM o +tama�oK"
@@ -2805,7 +2859,7 @@ msgstr "sectores/pista"
 msgid "tracks/cylinder"
 msgstr "pistas/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cilindros"
@@ -2863,7 +2917,7 @@ msgstr "Secuencia de inicio instalada en %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partici�n (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Se ha creado el n�mero m�ximo de particiones\n"
@@ -2887,226 +2941,208 @@ msgstr ""
 "\n"
 "Se est�n sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Uso:   fdisk [-b SSZ] [-u] DISCO    Cambia tabla de particiones\n"
-"       fdisk -l [-b SSZ] [-u] DISCO Lista tabla(s) de particiones\n"
-"       fdisk -s PARTICI�N           Obtiene tama�o de particiones en "
-"bloques\n"
-"       fdisk -v                     Obtiene versi�n de fdisk\n"
-"El valor de DISCO tiene el formato /dev/hdb o /dev/sda\n"
-"y el valor de PARTICI�N tiene el formato /dev/hda7\n"
-"-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:260
-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 ""
-"Uso: fdisk [-l] [-b SSZ] [-u] dispositivo\n"
-"Ej.:  fdisk /dev/hda  (para el primer disco IDE)\n"
-"  o:  fdisk /dev/sdc  (para el tercer disco SCSI)\n"
-"  o:  fdisk /dev/eda  (para la primera unidad PS/2 ESDI)\n"
-"  o:  fdisk /dev/rd/c0d0  o fdisk /dev/ida/c0d0  (para dispositivos RAID)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "No se puede leer %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "No se puede buscar en %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "No se puede escribir %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE ha fallado en %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "No se puede asignar m�s memoria\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Error muy grave\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   Conmuta el indicador de s�lo lectura"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   Modifica la etiqueta de disco bsd"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   Conmuta indicador de montable"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   Suprime una partici�n"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   Lista los tipos de particiones conocidos"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   A�ade una nueva partici�n"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Crea una nueva tabla de particiones DOS vac�a"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   Imprime la tabla de particiones"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Crea una nueva etiqueta de disco Sun"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   Cambia el identificador de sistema de una partici�n"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   Cambia las unidades de visualizaci�n/entrada"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   Verifica la tabla de particiones"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   Escribe la tabla en el disco y sale"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Funciones adicionales (s�lo para usuarios avanzados)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   Selecciona partici�n iniciable"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   Modifica entrada de fichero de inicio"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   Selecciona partici�n de intercambio sgi"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   Conmuta el indicador de iniciable"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   Conmuta el indicador de compatibilidad con DOS"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Cambia el n�mero de cilindros alternativos"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   Cambia el n�mero de cilindros"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 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:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Cambia el n�mero de sectores adicionales por cilindro"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   Cambia el n�mero de cabezas"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   Cambia el factor de interleave"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Cambia la velocidad de rotaci�n (r.p.m.)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   Cambia el n�mero de sectores por pista"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Cambia el n�mero de cilindros f�sicos"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   Mueve el principio de los datos de una partici�n"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   Lista las particiones extendidas"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   Crea una tabla de particiones IRIX (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   Corrige el orden de las particiones"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u   Cambia las unidades de visualizaci�n/entrada"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Debe establecer"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "cabezas"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sectores"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3115,30 +3151,11 @@ msgstr ""
 "%s%s.\n"
 "Puede efectuar esta operaci�n desde el men� de funciones adicionales.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " y "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"El n�mero de cilindros para este disco est� establecido en %d.\n"
-"No hay nada malo en ello, pero es mayor que 1024, y en algunos casos\n"
-"podr�a causar problemas con:\n"
-"1) software que funciona en el inicio (p.ej. versiones antiguas de LILO)\n"
-"2) software de arranque o particionamiento de otros sistemas operativos\n"
-"   (p.ej. FDISK de DOS, FDISK de OS/2)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3149,38 +3166,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplazamiento incorrecto en particiones extendidas primarias\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3189,34 +3205,34 @@ 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:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, 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:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Atenci�n: partici�n vac�a\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
-msgstr ""
+msgstr "Identificador del disco: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
-msgstr ""
+msgstr "Nuevo identificador del disco: (actual 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3229,26 +3245,17 @@ msgstr ""
 "operaci�n, el contenido anterior no se podr� recuperar.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, 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:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3257,7 +3264,7 @@ msgstr ""
 "Este disco tiene tanto magia DOS como BSD.\n"
 "Utilice la orden 'b' para ir al modo BSD.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3266,17 +3273,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:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Error interno\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, 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:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3285,7 +3292,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:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3294,95 +3301,100 @@ msgstr ""
 "\n"
 "se ha detectado EOF tres veces - saliendo...\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "C�digo hexadecimal (escriba L para ver los c�digos): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, valor predeterminado %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
-msgstr ""
+msgstr "Sufijo no soportado: '%s'.\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Se est� utilizando el valor predeterminado %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "El valor est� fuera del rango.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "N�mero de partici�n"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, 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:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Se ha seleccionado la partici�n %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "�No hay ninguna partici�n definida!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "�Ya se han definido todas las particiones primarias!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Se cambian las unidades de visualizaci�n/entrada a %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Se cambian las unidades de visualizaci�n/entrada a %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, 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:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "El indicador de compatibilidad con DOS est� establecido\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "El indicador de compatibilidad con DOS no est� establecido\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partici�n %d todav�a no existe\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3395,7 +3407,7 @@ msgstr ""
 "tener particiones de tipo 0. Puede suprimir una\n"
 "partici�n con la orden `d'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3404,7 +3416,7 @@ msgstr ""
 "No puede convertir una partici�n en extendida ni viceversa.\n"
 "Primero debe suprimirla.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3415,7 +3427,7 @@ msgstr ""
 "ya que as� lo prev� SunOS/Solaris e incluso es adecuado para Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3426,63 +3438,63 @@ msgstr ""
 "y la partici�n 11 como volumen completo (6) ya que IRIX as� lo espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Se ha cambiado el tipo de sistema de la partici�n %d por %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " f�sicos=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "l�gicos=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, 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:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "debe ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "debe ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "La partici�n %i no empieza en el l�mite del cilindro:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3491,7 +3503,7 @@ msgstr ""
 "\n"
 "Disco %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3500,34 +3512,39 @@ msgstr ""
 "\n"
 "Disco %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d cabezas, %d sectores/pista, %d cilindros"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", %llu sectores en total"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 "Unidades = %s de %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
+#, c-format
 msgid "Alignment offset: %lu bytes\n"
-msgstr "tama�o de nodo-i incorrecto"
+msgstr ""
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3536,14 +3553,14 @@ msgstr ""
 "No hay nada que hacer. El orden ya es correcto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Fin\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3553,17 +3570,17 @@ msgstr ""
 "Esto no parece una tabla de particiones\n"
 "Probablemente ha seleccionado el dispositivo que no era.\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, 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:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Disposit."
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3572,7 +3589,7 @@ msgstr ""
 "\n"
 "Las entradas de la tabla de particiones no est�n en el orden del disco\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3583,88 +3600,88 @@ msgstr ""
 "Disco %s: %d cabezas, %d sectores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, 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:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partici�n %d: el sector %d supera el m�ximo %d\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, 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:2175
+#: fdisk/fdisk.c:2247
 #, 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:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Atenci�n: la partici�n %d est� vac�a\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "El total de sectores asignados %d supera el m�ximo %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld sectores no asignados\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "El sector %d ya est� asignado\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "No hay disponible ning�n sector libre\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3677,7 +3694,7 @@ msgstr ""
 "        tabla de particiones DOS vac�a primero. (Use o.)\n"
 "        ATENCI�N: Esto destruir� el contenido de este disco.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3690,23 +3707,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:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Se est�n usando todas las particiones l�gicas\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Se a�ade una partici�n primaria\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3717,20 +3734,20 @@ msgstr ""
 "%s\n"
 "   p   Partici�n primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   Partici�n l�gica (5 o superior)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   Partici�n extendida"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, 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:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3739,12 +3756,12 @@ msgstr ""
 "�Se ha modificado la tabla de particiones!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, 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:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3758,7 +3775,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:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3771,7 +3788,7 @@ msgstr ""
 "particiones DOS 6.x, consulte la p�gina man de fdisk\n"
 "para ver informaci�n adicional.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3780,44 +3797,44 @@ msgstr ""
 "\n"
 "Error al cerrar el fichero\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Se est�n sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, 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:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Nuevo principio de datos"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Orden avanzada (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "N�mero de cilindros"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "N�mero de cabezas"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "N�mero de sectores"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, 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:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3826,34 +3843,34 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: orden desconocida\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3862,18 +3879,18 @@ msgstr ""
 "Atenci�n: la opci�n -b (establecer tama�o de sector) debe utilizarse con un "
 "dispositivo especificado\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Orden (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3882,16 +3899,16 @@ msgstr ""
 "\n"
 "El fichero de inicio actual es: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Escriba el nombre del nuevo fichero de inicio: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "No se ha modificado el fichero de inicio\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3984,15 +4001,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4130,7 +4147,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:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "No hay ninguna partici�n definida\n"
@@ -4237,7 +4254,7 @@ msgstr ""
 "Escriba S� si est� seguro de querer dar una etiqueta distinta a esta "
 "partici�n.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "S�\n"
 
@@ -4298,7 +4315,7 @@ msgstr ""
 "operaci�n, el contenido anterior se habr� perdido de forma irrecuperable.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4319,58 +4336,58 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Disco completo"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%lld sectores no asignados\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4384,28 +4401,28 @@ msgstr ""
 "como cabezas, sectores, cilindros y particiones\n"
 "o forzar una nueva etiqueta (orden s en men� principal)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco sgi con suma de comprobaci�n "
 "incorrecta.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco sgi con suma de comprobaci�n "
 "incorrecta.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco sgi con suma de comprobaci�n "
 "incorrecta.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4413,7 +4430,7 @@ msgstr ""
 "Atenci�n: el indicador 0x%04x inv�lido de la tabla de particiones %d se "
 "corregir� mediante w(rite)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4426,31 +4443,31 @@ msgstr ""
 "operaci�n, el contenido anterior no se podr� recuperar.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sectores/pista"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Espacio no utilizado - sectores 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espacio no utilizado - sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4459,7 +4476,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:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4468,12 +4485,12 @@ msgstr ""
 "Se recomienda que la partici�n 11\n"
 "abarque el disco completo y sea del tipo `SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ya est� asignado\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4484,7 +4501,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:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4493,7 +4510,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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4507,12 +4524,12 @@ msgstr ""
 "Escriba S� si est� seguro de que desea que la partici�n\n"
 "est� marcada con 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4527,11 +4544,11 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4540,28 +4557,28 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Indic.  Principio   Fin    Bloques  Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "N�mero de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Sectores adicionales por cilindro"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Factor de interleave"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Velocidad de rotaci�n (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "N�mero de cilindros f�sicos"
 
@@ -4770,6 +4787,10 @@ msgstr "Minix / old Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Unidad C: oculta de OS/2"
@@ -4914,11 +4935,11 @@ msgstr "DOS secondary"
 
 #: fdisk/i386_sys_types.c:101
 msgid "VMware VMFS"
-msgstr ""
+msgstr "VMFS de VMware"
 
 #: fdisk/i386_sys_types.c:102
 msgid "VMware VMKCORE"
-msgstr ""
+msgstr "VMKCORE de VMware"
 
 #: fdisk/i386_sys_types.c:106
 msgid "LANstep"
@@ -5412,94 +5433,94 @@ msgstr "Se ha especificado el indicador -n: no se ha producido ning�n cambio\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Error al guardar los sectores antiguos; anulando la operaci�n\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 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:1750
+#: fdisk/sfdisk.c:1755
 #, 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:1757
+#: fdisk/sfdisk.c:1762
 #, 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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Entrada no reconocida: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "N�mero demasiado elevado\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "Datos extra�os tras el n�mero\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "No hay espacio para descriptor de partici�n\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "No se puede crear partici�n extendida adyacente\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "Demasiados campos de entrada\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "No queda m�s espacio\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Tipo no permitido\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, 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:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Atenci�n: partici�n vac�a\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Atenci�n: principio de partici�n incorrecto (antes %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Indicador de iniciable no reconocido; elija - o *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "�Especificaci�n parcial de cil,cab,sect?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Partici�n extendida en ubicaci�n no esperada\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "Entrada incorrecta\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "Hay demasiadas particiones\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5511,44 +5532,44 @@ msgstr ""
 "<cil,cab,sec>\n"
 "Normalmente s�lo debe especificar <principio> y <tama�o> (y quiz�s <tipo>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: similar a /dev/hda or /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "opciones �tiles:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 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:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [o --id]:         Imprime o cambia el identificador de partici�n"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Muestra las particiones de cada dispositivo"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 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:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5556,60 +5577,60 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Acepta/muestra en unidades de\n"
 "                         sectores/bloques/cilindros/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Muestra los tipos de particiones conocidos"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 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:2300
+#: fdisk/sfdisk.c:2305
 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:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                Cambia �nicamente la partici�n con el n�mero #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 No escribe realmente en el disco"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichero:          Restaura estos sectores de nuevo"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprime la versi�n"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprime este mensaje"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "opciones peligrosas:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 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:2309
+#: fdisk/sfdisk.c:2314
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
@@ -5617,7 +5638,7 @@ msgid ""
 msgstr ""
 "    -g [o --show-geometry]:  Imprime la idea del n�cleo sobre la geometr�a"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5625,7 +5646,7 @@ msgstr ""
 "    -x [o --show-extended]:  Muestra tambi�n las particiones extendidas en\n"
 "                             salida o espera sus descriptores en entrada"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
@@ -5633,59 +5654,59 @@ msgstr ""
 "para\n"
 "                           Linux"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:       Suprime mensajes de aviso"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Puede modificar la geometr�a detectada utilizando:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 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:2316
+#: fdisk/sfdisk.c:2321
 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:2317
+#: fdisk/sfdisk.c:2322
 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:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Puede desactivar toda comprobaci�n de coherencia con:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5694,67 +5715,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "�ninguna orden?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu bloques\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uso: sfdisk --print-id dispositivo n�mero-partici�n\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 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:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uso: sfdisk --id dispositivo n�mero-partici�n [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "No se puede abrir %s para lectura-escritura\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "No se puede abrir %s para lectura\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcto\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "No se puede obtener el tama�o de %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5762,7 +5783,7 @@ msgstr ""
 "Fin\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5771,35 +5792,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:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador %lx incorrecto\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Actualmente este disco est� en uso.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Error muy grave: no se puede encontrar %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, 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:3027
+#: fdisk/sfdisk.c:3032
 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:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5814,30 +5835,30 @@ msgstr ""
 "esta\n"
 "comprobaci�n.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "Correcto\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Situaci�n anterior:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, 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:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Situaci�n nueva:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5846,23 +5867,23 @@ msgstr ""
 "nada.\n"
 "(Si realmente desea realizar esta operaci�n, use la opci�n --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "�Est� satisfecho con esta operaci�n? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, 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:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5871,16 +5892,16 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada antes de lo previsto\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Se est� saliendo; no se ha cambiado nada\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, 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:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5889,7 +5910,7 @@ msgstr ""
 "La nueva tabla de particiones se ha escrito correctamente\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5900,17 +5921,17 @@ msgstr ""
 "bs=512 count=1\n"
 "(V�ase fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: no se puede abrir %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5918,116 +5939,116 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: no se ha encontrado"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: �error %d al descomprimir! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: debe especificar el tipo de sistema de ficheros"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s no es un dispositivo lp.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Forzando comprobaci�n del sistema de ficheros en %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr "Uso: mkfs [-V] [-t tipo_sf] [opciones_sf] dispositivo [tama�o]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s no es un dispositivo lp.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "No se puede abrir %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Desmontando los sistemas de ficheros restantes..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: argumento desconocido: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s de %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "No se puede asignar b�fer para los nodos-i"
@@ -6548,7 +6569,13 @@ msgstr "No se ha encontrado ninguna interfaz de reloj utilizable.\n"
 msgid "Unable to set system clock.\n"
 msgstr "No se puede establecer el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6561,17 +6588,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:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6580,23 +6607,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:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6615,6 +6642,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6669,7 +6697,7 @@ msgstr ""
 "  --noadjfile   No accede a /etc/adjtime. Necesita del uso de --utc\n"
 "                o de --localtime\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6680,17 +6708,17 @@ msgstr ""
 "                Indica al reloj de hardware el tipo de Alpha (ver hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "No se puede establecer el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6699,7 +6727,7 @@ msgstr ""
 "Ha especificado varias funciones.\n"
 "S�lo puede llevar a cabo una funci�n a la vez.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6708,7 +6736,7 @@ msgstr ""
 "%s: las opciones --utc y --localtime se excluyen mutuamente. Ha especificado "
 "ambas.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6717,7 +6745,7 @@ msgstr ""
 "%s: las opciones --adjust y --noadjfile se excluyen mutuamente. Ha "
 "especificado ambas.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6726,28 +6754,28 @@ msgstr ""
 "%s: las opciones --adjust y --noadjfile se excluyen mutuamente. Ha "
 "especificado ambas.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, 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:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6756,12 +6784,12 @@ msgstr ""
 "S�lo el superusuario puede cambiar el valor de �poca del reloj de hardware "
 "del n�cleo.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -7057,12 +7085,12 @@ msgstr "%s: No se puede establecer el contexto predeterminado para /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "Cambiando informaci�n de finger para %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: error de PAM; anulando: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7294,35 +7322,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Error fatal: no se puede reabrir la terminal: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "ERROR FATAL: %s no es una terminal"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "ERROR FATAL: Terminal err�nea"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h s�lo para superusuario.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "uso: login [-fp] [nombreusuario]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "No se ha podido inicializar PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "Inicio de sesi�n: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, 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:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7331,17 +7364,17 @@ msgstr ""
 "Inicio de sesi�n incorrecto\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, 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:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7350,7 +7383,7 @@ msgstr ""
 "\n"
 "Inicio de sesi�n incorrecto\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7359,121 +7392,121 @@ msgstr ""
 "\n"
 "Problema al iniciar la sesi�n, abortado.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "nombre de usuario NULO en %s:%d. Abortado."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, 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:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: No queda memoria\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Nombre de usuario no permitido"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, 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:805
+#: login-utils/login.c:809
 #, 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:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "Inicio de sesi�n %s rechazado en tty %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Inicio de sesi�n incorrecto\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "Conexi�n telef�nica en %s por %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "Inicio de sesi�n con root en %s desde %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "Inicio de sesi�n con root en %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, 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:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "Inicio de sesi�n en %s por %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Tiene correo nuevo.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Tiene correo.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: error en fork: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "Fallo en TIOCSCTTY: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() ha fallado"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hay ning�n directorio %s\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Iniciando la sesi�n con directorio de inicio = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, 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:1269
+#: login-utils/login.c:1273
 #, 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:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: no hay int�rprete de �rdenes: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7482,65 +7515,65 @@ msgstr ""
 "\n"
 "Inicio de sesi�n de %s: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Nombre de inicio de sesi�n demasiado largo.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "Nombre demasiado largo"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, 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:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "Demasiados avances de l�nea solos.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "Excesivos avances de l�nea"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, 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:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ltimo inicio de sesi�n: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "desde %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Error de inicio de sesi�n desde %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Error de inicio de sesi�n en %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d errores de inicio de sesi�n desde %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d errores de inicio de sesi�n en %s, %s"
@@ -7802,7 +7835,7 @@ msgstr "Sin TERM o no se puede ejecutar stat para tty\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "error al detener el servicio: \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7812,8 +7845,8 @@ msgstr "error al detener el servicio: \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "error al ejecutar finalprog\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "error al detener el servicio: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7941,25 +7974,25 @@ msgstr "%s: no se puede ejecutar stat para fichero temporal.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: no se puede leer el fichero temporal.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "Valor de a�o no permitido: utilice 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "Valor de mes no permitido: utilice 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "Valor de a�o no permitido: utilice 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s de %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "uso: cal [-13smjyV] [[mes] a�o]\n"
@@ -7981,7 +8014,114 @@ msgstr ""
 #: misc-utils/findfs.c:55
 #, fuzzy, c-format
 msgid "unable to resolve '%s'"
-msgstr "No se puede abrir %s"
+msgstr "No se puede abrir '%s'"
+
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Orden desconocida: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "No se puede asignar el b�fer.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "No se puede asignar el b�fer.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: no se puede leer %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "Error de escritura en %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "Se ha cambiado la informaci�n de finger.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "No hay ning�n directorio %s\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "No se puede asignar el b�fer.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "No se puede asignar el b�fer.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "No se puede asignar el b�fer.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "No se puede asignar el b�fer.\n"
 
 #: misc-utils/kill.c:207
 #, c-format
@@ -8070,12 +8210,12 @@ msgstr "�No queda memoria?\n"
 #: misc-utils/namei.c:188
 #, fuzzy, c-format
 msgid "failed to read symlink: %s"
-msgstr "ioctl() no ha podido leer la hora de %s"
+msgstr "%s: fallo al abrir %s\n"
 
 #: misc-utils/namei.c:231 misc-utils/namei.c:254
 #, fuzzy, c-format
 msgid "could not stat '%s'"
-msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
+msgstr "No se puede ejecutar `stat' sobre %s"
 
 #: misc-utils/namei.c:449
 #, fuzzy, c-format
@@ -8138,7 +8278,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:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8149,37 +8289,37 @@ msgstr ""
 "Utilice `%s [opciones] %s' si quiere utilizarlo de verdad.\n"
 "No se inicia la transcripci�n.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "uso: script [-a] [-f] [-q] [-t] [fichero]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado; el fichero es %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "Error de escritura en %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado (%s)"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "Error de escritura en %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: no se puede encontrar \"_stext\" en %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8188,17 +8328,17 @@ msgstr ""
 "\n"
 "Script terminado (%s)"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script terminado; el fichero es %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ha fallado\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "No quedan pty\n"
@@ -8211,7 +8351,7 @@ msgstr ""
 #: misc-utils/scriptreplay.c:53
 #, c-format
 msgid "expected a number, but got '%s'"
-msgstr ""
+msgstr "se esperaba un n�mero, pero se obtuvo '%s'"
 
 #: misc-utils/scriptreplay.c:56 misc-utils/scriptreplay.c:60
 #, c-format
@@ -8219,9 +8359,8 @@ msgid "divisor '%s'"
 msgstr ""
 
 #: misc-utils/scriptreplay.c:104
-#, fuzzy
 msgid "write to stdout failed"
-msgstr "Error al abrir %s"
+msgstr "fall� la escritura a stdout"
 
 #: misc-utils/scriptreplay.c:110
 #, c-format
@@ -8249,9 +8388,9 @@ msgid "failed to read timing file %s"
 msgstr "ioctl() no ha podido leer la hora de %s"
 
 #: misc-utils/scriptreplay.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "timings file %s: %lu: unexpected format"
-msgstr "%s: EOF inesperado en el fichero %s\n"
+msgstr ""
 
 #: misc-utils/setterm.c:759
 #, c-format
@@ -8543,6 +8682,16 @@ msgstr "read %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: fallo al abrir %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "No se puede ejecutar `stat' sobre %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8556,12 +8705,12 @@ msgstr ""
 #: misc-utils/uuidd.c:305
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
-msgstr "No se puede abrir %s: %s\n"
+msgstr "shutdown: No se puede ejecutar umount %s: %s\n"
 
 #: misc-utils/uuidd.c:313
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
-msgstr "No se puede abrir %s: %s\n"
+msgstr "No se puede bloquear el fichero de bloqueo %s: %s\n"
 
 #: misc-utils/uuidd.c:351
 #, fuzzy, c-format
@@ -8573,6 +8722,11 @@ msgstr "Error al leer %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "N�mero inv�lido: %s\n"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8590,13 +8744,13 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
-msgstr "identificador inv�lido"
+msgstr "N�mero inv�lido: %s\n"
 
 #: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, fuzzy, c-format
@@ -8610,12 +8764,12 @@ msgstr "Error al cambiar el modo de %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8636,90 +8790,88 @@ msgstr ""
 #: misc-utils/uuidgen.c:32
 #, fuzzy, c-format
 msgid "Usage: %s [-r] [-t]\n"
-msgstr "Uso: %s [opciones] dispositivo ...\n"
+msgstr "Uso: %s [ -s int�rprete_�rdenes ] "
 
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nombre...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
-msgstr "Error al abrir %s"
+msgstr "setuid() ha fallado"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "El disco %s no contiene una tabla de particiones v�lida\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: fallo al abrir %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
-msgstr "openpty ha fallado\n"
+msgstr "Error de b�squeda"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "bytes"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty ha fallado\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Valor establecido inv�lido: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Uso: %s [opciones] dispositivo ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:347
+#, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
-msgstr "Se ha cambiado la informaci�n de finger.\n"
+msgstr ""
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8973,7 +9125,7 @@ msgstr ""
 "Este montaje se ha compilado sin soporte de bucle. Vuelva a realizar la "
 "compilaci�n.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8994,7 +9146,7 @@ msgstr ""
 "usados\n"
 "  %s [ -e cifrado ] [ -o despl ] {-f|disp_bucle} fichero # configurar\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -9010,252 +9162,296 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Valor establecido inv�lido: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Valor establecido inv�lido: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: no se puede abrir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: dispositivo ocupado"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Al compilar no hab�a soporte de bucle disponible. Vuelva a realizar la "
 "compilaci�n.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: no se puede encontrar %s en %s o %s"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: seg�n mtab, %s ya est� montado en %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: seg�n mtab, %s est� montado en %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: no se puede abrir %s para escritura: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: error al escribir %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: error al cambiar el modo de %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no se puede bifurcar (fork): %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Probando con %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: no ha especificado ning�n tipo de sistema de ficheros para %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Se probar� con todos los tipos indicados en %s o %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       y parece que sea un espacio de intercambio\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Se probar� con el tipo %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espacio de intercambio - no montado"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "montaje err�neo"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: s�lo el usuario root puede montar %s en %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de bucle especificado dos veces"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado dos veces"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: omitiendo la configuraci�n de un dispositivo de bucle\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Valor establecido inv�lido: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Valor establecido inv�lido: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: seg�n mtab, %s ya est� montado en %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: se va a utilizar el dispositivo de bucle %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: error al configurar dispositivo de bucle\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuraci�n correcta de dispositivo de bucle\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no se ha encontrado %s; se est� creando...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: no se puede abrir %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: el argumento para -p o --pass-fd debe ser un n�mero"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: no se puede abrir %s para establecer la velocidad"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: seg�n mtab, %s ya est� montado en %s"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s ocupado; se ha vuelto a montar como de s�lo lectura\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s ocupado; se ha vuelto a montar como de s�lo lectura\n"
+
+#: mount/mount.c:1482
 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:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: debe especificar el tipo de sistema de ficheros"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: montaje err�neo"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, 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:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: permiso denegado"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: debe ser superusuario para utilizar mount"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est� ocupado"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc ya est� montado"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ya est� montado o %s est� ocupado"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: el punto de montaje %s no existe"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: el dispositivo especial %s no existe"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9264,12 +9460,12 @@ msgstr ""
 "mount: el dispositivo especial %s no existe\n"
 "       (un prefijo de ruta no es un directorio)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, 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:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9279,13 +9475,13 @@ msgstr ""
 "       superbloque incorrecto en %s, falta la p�gina de c�digos,\n"
 "       o alg�n otro error"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9293,7 +9489,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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9301,7 +9497,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:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9309,111 +9505,106 @@ msgstr ""
 "   En algunos casos se encuentra informaci�n en syslog, pruebe\n"
 "   dmesg | tail   o algo parecido\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "tabla de dispositivos montados completa"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: no se puede leer el superbloque"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositivo desconocido"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: tipo de sistema de ficheros '%s' desconocido"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablemente quer�a referirse a %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: �quiere decir 'iso9660?'"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: �quiere decir 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: el n�cleo no reconoce %s como dispositivo de bloques\n"
 "       (�tal vez `insmod driver'?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no es un dispositivo de bloques"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s no es un dispositivo de bloques v�lido"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "dispositivo de bloques "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, 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:1569
+#: mount/mount.c:1647
 #, 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:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "umount: no se puede montar %s%s de s�lo lectura"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, 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:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: no se ha encontrado %s; se est� creando...\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s ya est� montado en %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9423,26 +9614,26 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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:1707
+#: mount/mount.c:1777
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: no se ha especificado ning�n tipo; se presupone smbfs por el "
 "prefijo //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ya est� montado en %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9502,39 +9693,39 @@ msgstr ""
 "Otras opciones: [-nfFrsvw] [-o opciones] [-p passwdfd].\n"
 "Escriba man 8 mount para saber mucho m�s.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: s�lo el usuario root puede efectuar esta acci�n"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: s�lo el usuario root puede efectuar esta acci�n"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "no se ha montado nada"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: no se ha encontrado esta partici�n"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: no se puede encontrar %s en %s o %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: atenci�n: no hay ninguna nueva l�nea final al final de %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: la l�nea %d de %s es incorrecta%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; el resto del fichero no se tiene en cuenta"
 
@@ -9547,7 +9738,7 @@ msgstr "Error en la llamada xstrndup"
 msgid "not enough memory"
 msgstr "No hay suficiente memoria"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9558,7 +9749,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9571,7 +9762,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9583,129 +9774,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: EOF inesperado en el fichero %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "La bifurcaci�n (fork) ha fallado\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "La ejecuci�n (exec) ha fallado\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() ha fallado"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "Error de b�squeda"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
-msgstr "Error al abrir %s"
+msgstr "No se puede escribir la p�gina de firma"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Nombre"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
-msgstr "Error de b�squeda"
+msgstr "El estado de %s es %d"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "swapon: atenci�n: %s tiene permisos %04o que no son seguros, se sugiere %"
 "04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "swapon: omitiendo el fichero %s; parece que tiene huecos.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "Error de b�squeda"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s en %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
-msgstr "Error de b�squeda"
+msgstr "fsync ha fallado"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: no se puede encontrar \"_stext\" en %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "No es el superusuario.\n"
 
-#: mount/swapon.c:529
-#, fuzzy, c-format
+#: mount/swapon.c:541
+#, c-format
 msgid "%s: swapoff failed"
-msgstr "Error de b�squeda"
+msgstr ""
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9715,37 +9911,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sin soporte para -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: no se puede bifurcar (fork): %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de bloques inv�lido"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: no montado"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: no se puede escribir el superbloque"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9753,53 +9949,53 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: no se ha encontrado"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: debe ser superusuario para utilizar umount"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, 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:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 no existe; se est� probando con umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, 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:263
+#: mount/umount.c:269
 #, 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:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 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:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9810,80 +10006,85 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opciones]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:468
-#, fuzzy, c-format
+#: mount/umount.c:474
+#, c-format
 msgid "device %s is associated with %s\n"
-msgstr "El sector %d ya est� asignado\n"
+msgstr ""
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
-msgstr "El sector %d ya est� asignado\n"
+msgstr "write: %s no tiene una sesi�n iniciada en %s.\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "No se puede desmontar \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Se est� intentando ejecutar umount en %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No se puede encontrar %s en mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no est� montado (seg�n mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s se ha montado varias veces"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montaje de %s no concuerda con fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: s�lo %s puede desmontar %s desde %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: s�lo el usuario root puede efectuar esta acci�n"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9891,79 +10092,99 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's new scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:106
+#, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "desconocido"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS sobre TCP no est� soportado.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: fallo al abrir %s\n"
 
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr "actual"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "nuevo "
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
-msgstr "ioctl() no ha podido leer la hora de %s"
+msgstr "%s: fallo al abrir %s\n"
 
 #: schedutils/ionice.c:57
 #, fuzzy
@@ -9983,7 +10204,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -10012,11 +10233,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "La ejecuci�n (exec) ha fallado\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "uso: %s programa [arg ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "Se ha cambiado la informaci�n de finger.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "no se puede obtener el tama�o de %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "La asignaci�n de memoria (malloc) ha fallado"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "Error al escribir la partici�n en %s\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: fallo al abrir %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "Error al escribir la partici�n en %s\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "error de b�squeda"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "error de b�squeda"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " y "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10162,7 +10491,15 @@ msgstr "   %f enteros/seg.; %f recepci�n (caracteres/seg.)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n nivel] [-s tama�ob�fer]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10171,41 +10508,46 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Hay demasiados argumentos.\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valor establecido inv�lido: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valor establecido inv�lido: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "No se ha especificado la opci�n --date.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "se esperaba un n�mero, pero se obtuvo '%s'"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
-msgstr "openpty ha fallado\n"
+msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
 #: sys-utils/flock.c:65
 #, c-format
@@ -10249,6 +10591,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "La bifurcaci�n (fork) ha fallado\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "Se ha cambiado la informaci�n de finger.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "No se ha especificado la opci�n --date.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "No se ha especificado la opci�n --date.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "El estado de %s es %d"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "El nodo-i ra�z no es un directorio"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "Error de b�squeda"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "Error de b�squeda"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10345,479 +10740,454 @@ msgstr ""
 "uso: %s [ [-q id-msq] [-m id-shm] [-s id-sem]\n"
 "        [-Q clave-msg] [-M clave-shm] [-S clave-sem] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opci�n ilegal -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: clave ilegal (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "permiso denegado para la clave"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "clave ya eliminada"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "clave inv�lida"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "error desconocido en la clave"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "permiso denegado para el identificador"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "identificador inv�lido"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "identificador ya eliminado"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "error desconocido en el identificador"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: argumento desconocido: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "uso: %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h para obtener ayuda.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s facilita informaci�n sobre los recursos ipc para los cuales tiene\n"
-"acceso de lectura.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Especificaci�n de recursos:\n"
-"\t-m : memoria compartida\n"
-"\t-q : mensajes\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : sem�foros\n"
-"\t-a : todo (valor predeterminado)\n"
+"%s facilita informaci�n sobre los recursos ipc para los cuales tiene\n"
+"acceso de lectura.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
-"Formato de salida:\n"
-"\t-t : tiempo\n"
-"\t-p : pid\n"
-"\t-c : creador\n"
+"-i id [-s -q -m] : informaci�n detallada sobre los recursos identificados "
+"por id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : l�mites\n"
-"\t-u : resumen\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
-"-i id [-s -q -m] : informaci�n detallada sobre los recursos identificados "
-"por id\n"
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "el n�cleo no est� configurado para memoria compartida\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- L�mites memoria compartida ----\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "n�mero m�x. segmentos = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "tama�o m�x. segmento (kbytes) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "total m�x. memoria compartida (kbytes) = %lu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "tama�o m�n. segmento (bytes) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "----- Estado memoria compartida ----\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "segmentos asignados %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "p�ginas asignadas %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "p�ginas residentes %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "p�ginas intercambiadas %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Rendimiento de intercambio: %ld intentos\t %ld correctos\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "-- Creadores/propietarios segmento mem. compartida --\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "-- Tiempos conexi�n/desconexi�n/modificac. mem. comp. --\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "propietario"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "conectado"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "desconectado"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "modificado"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "---- Creador/�ltimo op. memoria compart. ----\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "---- Segmentos memoria compartida ----\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "key"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "bytes"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "estado"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "No establecido"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "bloqueado"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "el n�cleo no est� configurado para sem�foros\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ L�mites sem�foro --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "n�mero m�ximo de matrices = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "m�x. sem�foros por matriz = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "m�x. sem�foros sistema = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "m�x. oper. por llamada semop = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valor m�x. sem�foro = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Estado sem�foro ---------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "matrices utilizadas = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "sem�foros asignados = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "---- Creadores/propietarios matrices sem�f. ----\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "--- Tiempos operaci�n/modificaci�n memoria comp. ---\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "�ltima operaci�n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "�ltima modificaci�n"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Matrices sem�foro -------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "el n�cleo no est� configurado para colas de mensajes\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Mensajes: l�mites -------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "m�x. colas sistema = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "tama�o m�x. mensaje (bytes) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "tama�o m�x. predeterminado cola (bytes) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Mensajes: estado --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "colas asignadas = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "cabeceras utilizadas = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "espacio utilizado = %d bytes\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "-- Colas de mensajes: creadores/propietarios --\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "--- Tiempos env�o/recep./modific. colas mensajes ----\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "env�o"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "recepci�n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "modificaci�n"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "----- PID de colas de mensajes ----\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Colas de mensajes -----\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "bytes utilizados"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "mensajes"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync ha fallado"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10826,42 +11196,42 @@ msgstr ""
 "\n"
 "Segmento de memoria compartida shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync ha fallado"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10870,32 +11240,32 @@ msgstr ""
 "\n"
 "Cola de mensajes msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "Error de b�squeda"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10904,161 +11274,180 @@ msgstr ""
 "\n"
 "semid de matriz de sem�foros=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "value"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "identificador inv�lido: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "identificador inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "identificador inv�lido"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "identificador inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s no es un dispositivo de bloques"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "no se puede obtener el tama�o de %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
-#, fuzzy, c-format
+#: sys-utils/ldattach.c:316
+#, c-format
 msgid "cannot set terminal attributes for %s"
-msgstr "no se puede obtener el tama�o de %s"
+msgstr ""
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "No se puede buscar en la unidad de disco"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
-msgstr "no se puede obtener el tama�o de %s"
+msgstr "no se puede abrir %s"
 
 # Masculino, porque se refiere a "Indicadores"
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Ninguno"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-# �Qu� significa?
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "RE error:"
+msgid "error: cannot open %s"
+msgstr "%s: no se puede abrir %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "Error al leer %s\n"
+msgid "failed to read: %s"
+msgstr "No se puede ejecutar `stat' sobre %s"
 
-#: sys-utils/lscpu.c:184
-#, fuzzy
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "error de b�squeda"
+
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
-msgstr "Error al abrir %s"
+msgstr ""
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "No se puede asignar el b�fer.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: fallo al abrir %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
-msgstr ""
-"\n"
-"Error al cerrar el fichero\n"
+msgstr "montaje err�neo"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11067,70 +11456,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Situaci�n anterior:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11139,74 +11541,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "Error al cambiar el modo de %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"uso: rdev [ -rv ] [ -o DESPLAZAMIENTO ] [ IMAGEN [ VALOR "
-"[ DESPLAZAMIENTO ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (o rdev /linux, etc.) muestra el dispositivo ROOT actual"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         Establece ROOT en /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              Establece ROOTFLAGS (estado de s�lo "
-"lectura)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            Establece tama�o de RAMDISK"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              Establece VIDEOMODE de inicio"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   Utiliza desplazamiento de bytes N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   Igual que rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     Igual que rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     Igual que rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Nota: los modos de v�deo son: -3=Ask, -2=Extended, -1=NormalVga,\n"
-"        1=key1, 2=key2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      Utilice -R 1 para montar root como de s�lo lectura;\n"
-"              -R 0 para lectura/escritura."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "falta una coma"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11321,11 +11655,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: prioridad antigua %d, nueva prioridad %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11335,107 +11670,132 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 #, fuzzy
 msgid "read rtc time"
 msgstr "lectura/escritura"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: tipo de tabla de particiones no reconocido\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: clave ilegal (%s)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: opci�n ilegal -- %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr "%s versi�n %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Utilizando %s.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Utilizando %s.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s no es un dispositivo lp.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Mensaje de %s@%s el %s a las %s ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "No se puede cambiar el nombre %s por %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 #, fuzzy
 msgid "rtc read"
 msgstr ", preparado"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11531,6 +11891,11 @@ msgstr "%s: valor incorrecto\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s no es un dispositivo lp.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "error de LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11561,6 +11926,11 @@ msgstr ", en l�nea"
 msgid ", error"
 msgstr ", error"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: montaje err�neo"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "error de LPGETIRQ"
@@ -11604,6 +11974,16 @@ msgid "unshare failed"
 msgstr "Error de b�squeda"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: no se puede establecer la velocidad: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: no se puede establecer la velocidad: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "La ejecuci�n (exec) ha fallado\n"
@@ -12130,149 +12510,178 @@ 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"
 
-#, fuzzy
-#~ msgid "out if memory"
-#~ msgstr "no queda memoria"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opci�n ilegal -- %c\n"
 
-#~ msgid "# partition table of %s\n"
-#~ msgstr "# tabla de particiones de %s\n"
+#~ msgid "segments allocated %d\n"
+#~ msgstr "segmentos asignados %d\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "unit: sectors\n"
-#~ "\n"
-#~ msgstr "%lld sectores no asignados\n"
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "p�ginas asignadas %ld\n"
 
-#, fuzzy
-#~ msgid " start=%9lu"
-#~ msgstr "comienzo"
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "p�ginas residentes %ld\n"
 
-#, fuzzy
-#~ msgid ", size=%9lu"
-#~ msgstr "Tama�o m�ximo=%ld\n"
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "p�ginas intercambiadas %ld\n"
 
-#, fuzzy
-#~ msgid ", bootable"
-#~ msgstr "AIX bootable"
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Rendimiento de intercambio: %ld intentos\t %ld correctos\n"
 
 #, fuzzy
-#~ msgid "Clock in UTC, not changed.\n"
-#~ msgstr "No se ha cambiado el int�rprete de �rdenes.\n"
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "error al ejecutar finalprog\n"
 
 #, fuzzy
-#~ 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"
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Valor establecido inv�lido: %s\n"
 
-#~ msgid "fatal: first page unreadable"
-#~ msgstr "muy grave: no se puede leer la primera p�gina"
+#~ msgid "current"
+#~ msgstr "actual"
 
 #, fuzzy
-#~ msgid ""
-#~ "%s: Device '%s' contains a valid Sun disklabel.\n"
-#~ "This probably means creating v0 swap would destroy your partition table.\n"
-#~ "No swap was created. If you really want to create v0 swap on that "
-#~ "device,\n"
-#~ "use the -f option to force it.\n"
-#~ msgstr ""
-#~ "%s: el dispositivo '%s' contiene una etiqueta de disco Sun v�lida.\n"
-#~ "Esto probablemente significa que crear un espacio de intercambio v0 "
-#~ "destruir�\n"
-#~ "la tabla de particiones. No se ha creado el espacio de intercambio.\n"
-#~ "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"
+#~ msgid "new"
+#~ msgstr "nuevo "
 
-#~ msgid "namei: unable to get current directory - %s\n"
-#~ msgstr "namei: no se puede obtener el directorio actual - %s\n"
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
 
-#~ msgid "namei: unable to chdir to %s - %s (%d)\n"
-#~ msgstr "namei: no se puede ejecutar chdir para %s - %s (%d)\n"
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
 
-#~ msgid "namei: could not chdir to root!\n"
-#~ msgstr "namei: no se puede ejecutar chdir para directorio ra�z\n"
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
 
-#~ msgid "namei: could not stat root!\n"
-#~ msgstr "namei: no se puede ejecutar stat para el directorio ra�z\n"
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
 
-#~ msgid "namei: buf overflow\n"
-#~ msgstr "namei: desbordamiento de b�fer\n"
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
 
-#~ msgid " ? could not chdir into %s - %s (%d)\n"
-#~ msgstr " ? no se puede ejecutar chdir para %s - %s (%d)\n"
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
 
-#~ msgid " ? problems reading symlink %s - %s (%d)\n"
-#~ msgstr " ? problemas al leer el enlace simb�lico %s - %s (%d)\n"
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
 
-#~ msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-#~ msgstr "  *** Se ha superado l�mite de enlaces simb�licos de Unix ***\n"
-
-#~ msgid "namei: unknown file type 0%06o on file %s\n"
-#~ msgstr "namei: tipo de fichero desconocido 0%06o en el fichero %s\n"
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
 
 #, fuzzy
-#~ msgid "mount: going to mount %s by %s\n"
-#~ msgstr "mount: se montar� %s mediante %s\n"
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: no se ha encontrado %s; se est� creando...\n"
 
 #, fuzzy
-#~ msgid "mount: no LABEL=, no UUID=, going to mount %s by path\n"
-#~ msgstr "mount: se montar� %s mediante %s\n"
+#~ msgid "execvp failed"
+#~ msgstr "La ejecuci�n (exec) ha fallado\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "uso: %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h para obtener ayuda.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Especificaci�n de recursos:\n"
+#~ "\t-m : memoria compartida\n"
+#~ "\t-q : mensajes\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : sem�foros\n"
+#~ "\t-a : todo (valor predeterminado)\n"
 
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Formato de salida:\n"
+#~ "\t-t : tiempo\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creador\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : l�mites\n"
+#~ "\t-u : resumen\n"
+
+# �Qu� significa?
 #, fuzzy
-#~ msgid "%s: cannot fork: %s\n"
-#~ msgstr "%s: no se puede bifurcar (fork)\n"
+#~ msgid "error: %s"
+#~ msgstr "RE error:"
 
 #, fuzzy
-#~ msgid "%s: waitpid: %s\n"
-#~ msgstr "%s: fallo al abrir %s\n"
+#~ msgid "error parse: %s"
+#~ msgstr "Error al leer %s\n"
 
 #, fuzzy
-#~ msgid "%s: cannot stat %s: %s\n"
-#~ msgstr "swapon: no se puede ejecutar stat para %s: %s\n"
+#~ msgid "error: change working directory to %s."
+#~ msgstr "Error al cambiar el modo de %s: %s\n"
 
-#~ msgid "could not umount %s - trying %s instead\n"
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 #~ msgstr ""
-#~ "no se ha podido ejecutar umount en %s; en su lugar se prueba con %s\n"
+#~ "uso: rdev [ -rv ] [ -o DESPLAZAMIENTO ] [ IMAGEN [ VALOR "
+#~ "[ DESPLAZAMIENTO ] ] ]"
 
-#~ msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
-#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (o rdev /linux, etc.) muestra el dispositivo ROOT actual"
 
-#~ msgid "%-10s %-10s %-20s %-20s %-20s\n"
-#~ msgstr "%-10s %-10s %-20s %-20s %-20s\n"
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         Establece ROOT en /dev/hda2"
 
-#~ msgid "%-10s %-10s %-10s %-10s\n"
-#~ msgstr "%-10s %-10s %-10s %-10s\n"
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              Establece ROOTFLAGS (estado de s�lo "
+#~ "lectura)"
 
-#~ msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
-#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            Establece tama�o de RAMDISK"
 
-#~ msgid "%-8s %-10s %-26.24s %-26.24s\n"
-#~ msgstr "%-8s %-10s %-26.24s %-26.24s\n"
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              Establece VIDEOMODE de inicio"
 
-#~ msgid "%-10s %-10s %-10s %-10s %-10s\n"
-#~ msgstr "%-10s %-10s %-10s %-10s %-10s\n"
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   Utiliza desplazamiento de bytes N"
 
-#~ msgid "%-8s %-10s %-20s %-20s %-20s\n"
-#~ msgstr "%-8s %-10s  %-20s %-20s %-20s\n"
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   Igual que rdev -R"
 
-#~ msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-#~ msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
-
-#, fuzzy
-#~ msgid "chfn: PAM Failure, aborting: %s\n"
-#~ msgstr "login: error de PAM; anulando: %s\n"
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     Igual que rdev -r"
 
-#~ msgid "Can't read %s, exiting."
-#~ msgstr "No se puede leer %s; saliendo."
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     Igual que rdev -v"
 
-#~ msgid "login: PAM Failure, aborting: %s\n"
-#~ msgstr "login: error de PAM; anulando: %s\n"
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Nota: los modos de v�deo son: -3=Ask, -2=Extended, -1=NormalVga,\n"
+#~ "        1=key1, 2=key2,..."
 
-#~ msgid "mount: backgrounding \"%s\"\n"
-#~ msgstr "mount: ejecutando en segundo plano \"%s\"\n"
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      Utilice -R 1 para montar root como de s�lo lectura;\n"
+#~ "              -R 0 para lectura/escritura."
 
-#~ msgid "mount: giving up \"%s\"\n"
-#~ msgstr "mount: se abandona \"%s\"\n"
+#~ msgid "missing comma"
+#~ msgstr "falta una coma"
 
 #~ msgid "`%s': bad directory: '.' isn't first\n"
 #~ msgstr "`%s': directorio incorrecto: '.' no es el primero\n"
@@ -12280,6 +12689,85 @@ msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 #~ msgid "`%s': bad directory: '..' isn't second\n"
 #~ msgstr "`%s': directorio incorrecto: '..' no es el segundo\n"
 
+#, fuzzy
+#~ 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"
+
+#~ msgid "fatal: first page unreadable"
+#~ msgstr "muy grave: no se puede leer la primera p�gina"
+
+#~ 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: el dispositivo '%s' contiene una etiqueta de disco Sun v�lida.\n"
+#~ "Esto probablemente significa que crear un espacio de intercambio v0 "
+#~ "destruir�\n"
+#~ "la tabla de particiones. No se ha creado el espacio de intercambio.\n"
+#~ "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"
+
+#~ 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 ""
+#~ "Uso:   fdisk [-b SSZ] [-u] DISCO    Cambia tabla de particiones\n"
+#~ "       fdisk -l [-b SSZ] [-u] DISCO Lista tabla(s) de particiones\n"
+#~ "       fdisk -s PARTICI�N           Obtiene tama�o de particiones en "
+#~ "bloques\n"
+#~ "       fdisk -v                     Obtiene versi�n de fdisk\n"
+#~ "El valor de DISCO tiene el formato /dev/hdb o /dev/sda\n"
+#~ "y el valor de PARTICI�N tiene el formato /dev/hda7\n"
+#~ "-u: Obtener Principio y Final en sectores (en lugar de cilindros)\n"
+#~ "-b 2048: (Para algunas unidades MO) Utilizar sectores de 2048 bytes\n"
+
+#~ 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 ""
+#~ "Uso: fdisk [-l] [-b SSZ] [-u] dispositivo\n"
+#~ "Ej.:  fdisk /dev/hda  (para el primer disco IDE)\n"
+#~ "  o:  fdisk /dev/sdc  (para el tercer disco SCSI)\n"
+#~ "  o:  fdisk /dev/eda  (para la primera unidad PS/2 ESDI)\n"
+#~ "  o:  fdisk /dev/rd/c0d0  o fdisk /dev/ida/c0d0  (para dispositivos "
+#~ "RAID)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "El n�mero de cilindros para este disco est� establecido en %d.\n"
+#~ "No hay nada malo en ello, pero es mayor que 1024, y en algunos casos\n"
+#~ "podr�a causar problemas con:\n"
+#~ "1) software que funciona en el inicio (p.ej. versiones antiguas de LILO)\n"
+#~ "2) software de arranque o particionamiento de otros sistemas operativos\n"
+#~ "   (p.ej. FDISK de DOS, FDISK de OS/2)\n"
+
+#~ msgid "# partition table of %s\n"
+#~ msgstr "# tabla de particiones de %s\n"
+
 #~ msgid "calling open_tty\n"
 #~ msgstr "calling open_tty\n"
 
@@ -12325,18 +12813,62 @@ msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 #~ msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 #~ msgstr "Atenci�n: \"%s\" no figura en /etc/shells\n"
 
+#~ msgid "Can't read %s, exiting."
+#~ msgstr "No se puede leer %s; saliendo."
+
 #~ msgid "timeout = %d, quiet = %d, reboot = %d\n"
 #~ msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
+#~ msgid "namei: unable to get current directory - %s\n"
+#~ msgstr "namei: no se puede obtener el directorio actual - %s\n"
+
+#~ msgid "namei: unable to chdir to %s - %s (%d)\n"
+#~ msgstr "namei: no se puede ejecutar chdir para %s - %s (%d)\n"
+
+#~ msgid "namei: could not chdir to root!\n"
+#~ msgstr "namei: no se puede ejecutar chdir para directorio ra�z\n"
+
+#~ msgid "namei: could not stat root!\n"
+#~ msgstr "namei: no se puede ejecutar stat para el directorio ra�z\n"
+
+#~ msgid "namei: buf overflow\n"
+#~ msgstr "namei: desbordamiento de b�fer\n"
+
+#~ msgid " ? could not chdir into %s - %s (%d)\n"
+#~ msgstr " ? no se puede ejecutar chdir para %s - %s (%d)\n"
+
+#~ msgid " ? problems reading symlink %s - %s (%d)\n"
+#~ msgstr " ? problemas al leer el enlace simb�lico %s - %s (%d)\n"
+
+#~ msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
+#~ msgstr "  *** Se ha superado l�mite de enlaces simb�licos de Unix ***\n"
+
+#~ msgid "namei: unknown file type 0%06o on file %s\n"
+#~ msgstr "namei: tipo de fichero desconocido 0%06o en el fichero %s\n"
+
 #~ 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"
 
+#, fuzzy
+#~ msgid "mount: going to mount %s by %s\n"
+#~ msgstr "mount: se montar� %s mediante %s\n"
+
+#, fuzzy
+#~ msgid "mount: no LABEL=, no UUID=, going to mount %s by path\n"
+#~ msgstr "mount: se montar� %s mediante %s\n"
+
 #~ msgid ", offset %lld"
 #~ msgstr ", desplazamiento %lld"
 
 #~ msgid "%s: could not find any device /dev/loop#"
 #~ msgstr "%s: no se puede encontrar ning�n dispositivo /dev/loop#"
 
+#~ msgid "mount: backgrounding \"%s\"\n"
+#~ msgstr "mount: ejecutando en segundo plano \"%s\"\n"
+
+#~ msgid "mount: giving up \"%s\"\n"
+#~ msgstr "mount: se abandona \"%s\"\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "usage: %s [-hV]\n"
@@ -12362,6 +12894,38 @@ msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 #~ msgid "%s: cannot canonicalize %s: %s\n"
 #~ msgstr "%s: no se puede abrir %s: %s\n"
 
+#, fuzzy
+#~ msgid "%s: cannot stat %s: %s\n"
+#~ msgstr "swapon: no se puede ejecutar stat para %s: %s\n"
+
+#~ 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"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+
+#~ msgid "%-10s %-10s %-20s %-20s %-20s\n"
+#~ msgstr "%-10s %-10s %-20s %-20s %-20s\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+
+#~ msgid "%-8s %-10s %-26.24s %-26.24s\n"
+#~ msgstr "%-8s %-10s %-26.24s %-26.24s\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-10s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-10s\n"
+
+#~ msgid "%-8s %-10s %-20s %-20s %-20s\n"
+#~ msgstr "%-8s %-10s  %-20s %-20s %-20s\n"
+
+#~ msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+#~ msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+
 #~ msgid ""
 #~ "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 #~ msgstr ""
@@ -12844,9 +13408,6 @@ msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 #~ msgid "sleepexit %d\n"
 #~ msgstr "sleepexit %d\n"
 
-#~ msgid "Usage: %s [ -s shell ] "
-#~ msgstr "Uso: %s [ -s int�rprete_�rdenes ] "
-
 #~ msgid "       [ username ]\n"
 #~ msgstr "       [ nombre_usuario ]\n"
 
diff --git a/po/et.po b/po/et.po
index 512c97c5..8f04ca0d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11r\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+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"
@@ -103,6 +103,11 @@ msgstr ""
 msgid "Usage:\n"
 msgstr "kasutamine:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "             %s -l [ signaal ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -122,6 +127,17 @@ msgstr ""
 msgid "get size in 512-byte sectors"
 msgstr ""
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, fuzzy, c-format
+msgid "%s (%s)\n"
+msgstr "%s: %s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -223,15 +239,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Kasutamine: %s [ -n ] seade\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, fuzzy, c-format
-msgid "%s (%s)\n"
-msgstr "%s: %s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, fuzzy, c-format
 msgid "%s: not a block device\n"
@@ -328,7 +335,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "M�lu sai otsa"
 
@@ -941,7 +948,7 @@ msgstr "stat(%s) ei �nnestunud"
 msgid "%s is not a block special device"
 msgstr "%s pole plokkseade"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "ei suuda avada seadet %s"
@@ -965,7 +972,7 @@ msgstr "liiga palju i-kirjeid - maksimum on 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "pole piisavalt vaba ruumi, vaja oleks v�hemalt %lu plokki"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Seade: %s\n"
@@ -1039,7 +1046,7 @@ msgstr "viga %s sulgemisel"
 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:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1249,7 +1256,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "seek ei �nnestunud plokkide kontrollimisel"
 
@@ -1332,172 +1339,178 @@ msgstr "Vigane kasutaja poolt m��ratud lehek�lje suurus %d\n"
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr "Kasutan etteantud lehek�lje suurust %d, mitte s�steemseid %d/%d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "fork ei �nnestunud\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Kasutamine: %s [-c] [-v0|-v1] [-pLKSUURUS] /dev/nimi [plokke]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "liiga palju vigaseid lehek�lgi"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "M�lu sai otsa"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "�ks vigane lehek�lg\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d vigast lehek�lge\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "ei suuda tagasi kerida saalimisseadet"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "ei j�tku m�lu i-kirjete puhvrile"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "ei j�tku m�lu i-kirjete puhvrile"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "ei suuda puhastada boot-sektorit"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   n�idata BSD partitsioonitabelit"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   n�idata t�ielikku partitsioonitabelit"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   n�idata t�ielikku partitsioonitabelit"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: Viga - tundmatu versioon %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr "Viga %s sulgemisel\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: Viga - suurus %ld on suurem kui seadme maht %d\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: Viga - saalimisala peab olema v�hemalt %ldkB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: Hoiatus - piiran saalimisala %ld kB-ga\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "ei �rita luua saalimisala seadmele `%s'"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s on monteeritud - siia failis�steemi ei tee!"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Ei suuda saalimisala tekitada: seade pole loetav"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Tekitan saalimisala versiooniga %d, suurus = %lu KiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "ei suuda kirjutada signatuuriga lehek�lge"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync ei �nnestunud"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
 # XXX stat'ida
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "ei suuda stat'ida seadet %s"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "ei suuda kirjutada i-kirjeid"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: %s �mber nimetamine %s -ks ei �nnestnud: %s\n"
@@ -1560,62 +1573,107 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "viga teenuse peatamisel: %s"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Kasutamatu"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "ei suuda tagasi kerida saalimisseadet"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Vaba ruum"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: sellist partitsiooni ei ole\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: Viga - tundmatu versioon %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: fdisk/cfdisk.c:389
-#, fuzzy
-msgid "Linux JFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "seek ei �nnestunud tabelite kirjutamisel"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "Kasutaja informatsioon on muudetud\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Kasutamatu"
 
-#: fdisk/cfdisk.c:415
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Vaba ruum"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Ketast sai muudetud\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1628,233 +1686,233 @@ msgstr ""
 "partitsioone, lugege palun cfdisk'i manuali\n"
 "lisainformatsiooni hankimiseks.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "FATAALNE VIGA"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Vajuta m�nda klahvi cfdiskist v�ljumiseks"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Ei suuda kettal seekida"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Ei suuda kettalt lugeda"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Ei suuda kettale kirjutada"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Liiga palju partitsioone"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Partitsioon algab enne sektorit 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Partitsioon l�ppeb enne sektorit 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Partitsioon algab p�rast ketta l�ppu"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Partitsioon l�ppeb p�rast ketta l�ppu"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "Loogilised partitsioonid on f��silisest erinevas j�rjestuses"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "Loogilised partitsioonid kattuvad"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "Suurendatud loogilised partitsioonid kattuvad"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "Sisemine viga: loogilise partitsiooni loomisel puudub extended-partitsioon"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 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:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Men�� ilma suunata, eeldan horisontaalset"
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Vale klahv"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Vajuta m�nda klahvi j�tkamiseks"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primaarne"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Loo uus primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Loogiline"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Loo uus loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "T�hista"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "�ra loo partitsiooni"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Sisemine viga !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Suurus (MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Beginning"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Lisada partitsioon vaba ruumi algusse"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "End"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Lisada partitsioon vaba ruumi l�ppu"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Pole ruumi extended-partitsiooni tegemiseks"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Puuduv partitsioonitabel v�i vale signatuur partitsioonitabelis"
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Tr�kkida lihtsalt tabel"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Kas soovite alustada t�hja tabeliga [y/N] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Te andiste suurema silindrite arvu kui kettale mahub"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Ei suuda avada kettaseadet"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Avasin ketta ainult lugemiseks - kirjutamiseks pole �igust"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Ei suuda kindlaks teha ketta mahtu"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Vigane primaarne partitsioon"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Vigane loogiline partitsioon"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Hoiatus!!  See v�ib Teie kettal andmeid h�vitada!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 #, fuzzy
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr "Olete kindel, et soovite salvestada partitsioonitabelit? (jah v�i ei):"
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Ei kirjutanud partitsioonitabelit kettale"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "jah"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Palun sisestage `jah' v�i `ei'"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Kirjutan partitsioonitabelit kettale..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Kirjutasin partitsioonitabeli kettale"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1862,88 +1920,88 @@ msgid ""
 msgstr ""
 "Kirjutasin partitsioonitabeli, aga tagasi lugemine eba�nnestus. Reboot abiks."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 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:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Siseta failinimi v�i vajuta RETURN ekraanil n�itamiseks: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ei suuda avada faili `%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Kettaseade: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Vaba   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr " Primaarne"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr " Loogiline"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 #, fuzzy
 msgid "None"
 msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitsioonitabel kettal %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            Esimene  Viimane\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1951,7 +2009,7 @@ msgid ""
 msgstr ""
 " # T��p     Sektor   Sektor   Offset  Pikkus   Failis�st. t��p (ID)   Lipud\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1960,470 +2018,470 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ----Algus-----      -----L�pp-----  Esimene Sektorite\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "tooRes"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Tr�kkida tabel toores formaadis (baithaaval)"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektorid"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Tr�kkida tabel j�rjestatuna sektorite j�rgi"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Tr�kkida lihtsalt tabel"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Ei tr�ki midagi"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "cfdiski abiinfo ekraan"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "See on cfdisk, curses'il baseeruv ketta partitsioneerimise"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "arvuti k�vakettal."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "K�sk        T�hendus"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Muuta silindrite, peade ja rajal olevate sektorite arvu"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 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:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             nad teevad."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          N�idata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimiseerida jooksva partitsiooni kettakasutus"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             M�rkus: see v�ib teha ketta mitte�hilduvaks DOSi,"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             OS/2 ja muude operatsioonis�teemidega."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          V�ljastada partitsioonitabel ekraanile v�i faili"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             V�ljastamisel v�ite valida mitme formaadi vahel:"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr " "
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - tooRes - see baidijada, mis kettale kirjutataks"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Sektorite j�rgi j�rjestatud tabel"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel teksti kujul (umbes nagu peaekraanil)"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          V�ljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Muuta jooksva partitsiooni failis�steemi t��pi"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Muuta partitsioonide suuruse ja asukoha �hikuid"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Variandid on MB, sektorid ja silindrid"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Kirjutada partitsioonitabel kettale (jah, suurt�ht)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 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:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             enne kirjutamist kinnitust. Vastata tuleb eestikeelse"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             t�iss�naga (`jah' v�i `ei')."
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nool �les    Viia kursor eelmisele reale"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nool alla    Viia kursor j�rgmisele reale"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Joonistada ekraan �le"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          N�idata sedasama ekraani"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "v�lja arvatud suur W."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "silindrid (C)"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Muuta silindrite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "pead (H)"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Muuta peade arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Muuta sektorite arvu geomeetrias"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "valmis (D)"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Muutused geomeetrias on tehtud"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Sisestage silindrite arv: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Vigane silindrite arv"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Sisetage peade arv: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Vigane peade arv"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Sisestage sektorite arv rajal: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Vigane sektorite arv"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Sisestage failis�steemi t��bi number: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Failis�steemi t��pi ei saa muuta t�hjaks"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Failis�steemi t��pi ei saa muuta extended'iks"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tundmatu (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Kettaseade: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Maht: %lld baiti, %ld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Maht: %lld baiti, %ld.%ld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "P�id: %d    Sektoreid rajal: %d    Silindreid: %d"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Lipud"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "T��p"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "FS t��p"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 #, fuzzy
 msgid "    Sectors"
 msgstr "Sektoreid"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 #, fuzzy
 msgid "  Cylinders"
 msgstr "silindrid (C)"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Maht (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Maht (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Buutiv"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Vahetada buuditavuse lippu jooksval partitsioonil"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "kustutaDa"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Kustutada jooksev partitsioon"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geomeetria"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta ketta geomeetriat (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Help"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "N�idata abiinfot"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maksimiseerida"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimiseerida jooksva partitsiooni kettakasutus (ainult ekspertidele)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "uus (N)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Luua uus partitsioon vaba ruumi sisse"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Prindi"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "V�ljastada partitsioonitabel ekraanile v�i faili"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "V�lja"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "V�ljuda programmist ilam muutusi salvestamata"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "T��p"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 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:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Uhikud"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Muuta partitsioonide suuruse n�itamise �hikuid (MB, sektorid, silindrid)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "salvesta (W)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Kirjutada partitsioonitabel kettale (v�ib h�vitada andmed)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Seda partitsiooni ei saa buutivaks teha"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "T�hja partitsiooni ei saa kustutada"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Seda partitsiooni ei saa maksimiseerida"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "See partitsioon pole kasutatav"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "See partitsioon on juba olemas"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "T�hja partitsiooni t��pi ei saa muuta"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Rohkem partitsioone ei ole"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Vigane k�sk"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2495,9 +2553,9 @@ msgstr ""
 "\n"
 "BSD partitsioonitabel seadmel %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "K�sk    T�hendus"
 
@@ -2517,9 +2575,9 @@ msgstr "   i   installeerida bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   anda nimekiri tuntud failis�steemide t��pidest"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   n�idata sedasama men��d"
 
@@ -2531,14 +2589,14 @@ msgstr "   n   lisada uus BSD partitsioon"
 msgid "   p   print BSD partition table"
 msgstr "   p   n�idata BSD partitsioonitabelit"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   v�ljuda salvetsamata"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   tagasi peamen��sse"
 
@@ -2581,13 +2639,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Esimene %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimane %s v�i +suurus v�i +suurusM v�i +suurusK"
@@ -2734,7 +2792,7 @@ msgstr "sektorit rajal"
 msgid "tracks/cylinder"
 msgstr "rada silindris"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "silindrit"
@@ -2792,7 +2850,7 @@ msgstr "Bootstrap sai installitud seadmele %s\n"
 msgid "Partition (a-%c): "
 msgstr "Partitsioon (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Maksimaalne arv partitsioone on juba loodud\n"
@@ -2816,228 +2874,208 @@ msgstr ""
 "\n"
 "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Kasutamine: fdisk [-b SSZ] [-u] DISK      Muuta partitsioonitabelit\n"
-"            fdisk -l [-b SSZ] [-u] DISK   N�idata partitsioonitabeli sisu\n"
-"            fdisk -s PARTITSIOON          N�idata partitsiooni mahtu "
-"plokkides\n"
-"            fdisk -v                      N�idata fdiski versiooni\n"
-"Siin DISK on seadmefail (n�iteks /dev/hda v�i /dev/sda)\n"
-"ja PARTITSIOON on midagi stiilis /dev/hda7\n"
-"-u: n�idata partitsioonide algust ja l�ppu silindrite asemel sektorites\n"
-"-b 2048: kasutada 2048-baidiseid sektoreid (vajalik n�iteks m�nel MO "
-"seadmel)\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Kasutamine: fdisk [-l] [-b SSZ] [-u] seade\n"
-"N�iteks:    fdisk /dev/hda  (esimese IDE ketta jaoks)\n"
-"            fdisk /dev/sdc  (kolmanda SCSI ketta jaoks)\n"
-"            fdisk /dev/eda  (esimese PS/2 ESDI ketta jaoks)\n"
-"            fdisk /dev/rd/c0d0 v�i fdisk /dev/ida/c0d0 (RAID seadmete "
-"jaoks)\n"
-"            ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Ei suuda avada seadet %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Ei suuda lugeda seadet %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ei suuda seekida seadmel %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Ei suuda kirjutada seadmele %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl ei �nnestunud seadmel %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "M�lu sai otsa\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Fataalne viga\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   l�litada kirjutuskaitse lipp sisse/v�lja"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b redigeerida NSD partitsioonitabelit"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   l�litada monteeritavuse lipp sisse/v�lja"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   kustutada partitsioon"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   anda nimekiri tuntud partitsioonit��pidest"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   lisada uus partitsioon"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   luua uus t�hi DOSi partitsioonitabel"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   n�idata partitsioonitabelit"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   luua uus t�hi Sun'i partitsioonitabel"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   muuta partitsiooni t��pi"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   muuta sisestamise ja tabeli n�itamise �hikuid"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   kontrollida partitsioonitabelit"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   kirjutada tabel kettale ja v�ljuda"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   lisafunktsionaalsus (ainult ekspertidele)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   valida buutiv partitsioon"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   redigeerida buutfaili kirjet"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   valida SGI saalimispartitsioon"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   l�litada buuditavuse lipp sisse/v�lja"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   l�litada DOSiga �hilduvuse rezhiim sisse/v�lja"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   muuta alternatiivsete silindrite arvu"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   muuta silindrite arvu"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   n�idata partitsioonitabelit baidikaupa"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   muuta lisasektorite arvu silindril"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   muuta peade arvu"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   muuta interleave-tegurit"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   muuta p��rlemise kiirust (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   muuta sektorite arvu rajal"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   muuta f��siliste silindrite arvu"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   liigutada andmete algust partitsioonis"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   n�idata extended-partitsioonide nimekirja"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   luua IRIXi (SGI) partitsioonitabel"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   parandada partitsioonide j�rjekord"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u   muuta sisestamise ja tabeli n�itamise �hikuid"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Te peate m��rama, et eksisteerib nii-ja-nii-mitu"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "pead"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3046,30 +3084,11 @@ msgstr ""
 "%s%s.\n"
 "Te saate seda teha lisafunktsionaalsuse men��st.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " ja "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Ketta silindrite arvuks on seatud %d. Selles ei ole iseenesest\n"
-"midagi halba, aga see on suurem kui 1024 ning v�ib seega p�hjustada\n"
-"teatud situatsioonides probleeme:\n"
-"1) tarkvaraga, mis k�ivitub buutimise ajal (n�iteks vana versioon LILOst)\n"
-"2) muude operatsioonis�steemide buutimise ja partitsioneerimise\n"
-"tarkvaraga (n�iteks DOSi FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3080,70 +3099,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Vigane offset primaarses extended-partitsioonis\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Hoiatus: �leliigne 'link pointer' partitsioonitabelis %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Hoiatus: ignoreerin �leliigseid andmeid partitsioonitabelis %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Hoiatus: t�hi partitsioon\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3155,50 +3173,41 @@ msgstr ""
 "kuni Te ise otsustate need kettale kirjutada. P�rast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "M�rkus: sektori suurus on %d (mitte %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Partitsioonitabelit ei saa salvestada\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, 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:1204
+#: fdisk/fdisk.c:1261
 #, 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:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Sisemine viga\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3207,7 +3216,7 @@ msgstr ""
 "Hoiatus: vigane lipp 0x%04x (partitsioonitabelis %d) parandatakse\n"
 "kirjutamisel (w) �ra\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3216,95 +3225,100 @@ msgstr ""
 "\n"
 "Sain EOF-i kolm korda j�rjest - aitab\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Kuueteistk�mnends�steemis kood (L n�itab koodide nimekirja): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, vaikimisi %d): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Kasutan vaikimisi v��rtust %d\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "V��rtus on piiridest v�ljas\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Partitsiooni number"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Hoiatus: partitsioonil %d on t�hi t��p\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignoreerin lisa-extended partistsiooni %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "�htegi partitsiooni pole defineeritud\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "silinder"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Sisestamisel ja n�itamisel on n��d �hikuteks %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Sisestamisel ja n�itamisel on n��d �hikuteks %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "Hoiatus: partitsioon %d on extended-partitsioon\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "DOSiga �hilduvuse lipp on p�sti\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOSiga �hilduvuse lipp pole p�sti\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitsiooni %d pole veel olemas!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3317,7 +3331,7 @@ msgstr ""
 "tekitada t��pi 0 partitsioone. Te saate partitsiooni\n"
 "kustutada k�suga 'd'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3326,7 +3340,7 @@ msgstr ""
 "Partitsiooni ei saa muuta extended'iks ega extendedist harilikuks.\n"
 "Selle asemel tuleb partitsioon kustutada ja uus luua.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3336,7 +3350,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:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3346,71 +3360,71 @@ 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:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Partitsiooni %d t��p on n��d %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     f��s=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "loogiline=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, 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:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitsioon %i ei alga silindri piirilt:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "peaks olema (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "peaks olema (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "Partitsioon %i ei alga silindri piirilt:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3420,7 +3434,7 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr ""
@@ -3428,12 +3442,12 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
@@ -3441,17 +3455,22 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "vigane i-kirje suurus"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3460,14 +3479,14 @@ msgstr ""
 "Midagi pole vaja teha, j�rjestus on juba �ige\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3475,16 +3494,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, 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:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Seade"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3493,7 +3512,7 @@ msgstr ""
 "\n"
 "Partitsioonitabeli kirjed on f��silisest erinevas j�rjekorras\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3504,87 +3523,87 @@ msgstr ""
 "Ketas %s: %d pead, %d sektorit rajal, %d silindrit\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Hoiatus: partitsioon %d sisaldab sektorit 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partitsioon %d: sektor %d on suurem kui sektroite arv rajal %d\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Hoiatus: partitsioonis %d on andmete algus vigane\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Hoiatus: partitsioon %d kattub partitsiooniga %d\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Hoiatus: partitsioon %d on t�hi\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Loogiline partitsioon %d pole �leni partitsioonis %d\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Kogu kasutataud sektorite arv %d on suurem kui sektorite koguarv %d\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%d vaba sektorit\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Vabad sektorid on otsas\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3598,7 +3617,7 @@ msgstr ""
 "\t(k�suga o).\n"
 "\tHOIATUS: see h�vitab ketta praeguse sisu!\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3612,24 +3631,24 @@ msgstr ""
 "\t(k�suga o).\n"
 "\tHOIATUS: see h�vitab ketta praeguse sisu!\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Loogilised partitsioonid on f��silisest erinevas j�rjestuses"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Vigane primaarne partitsioon"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3640,20 +3659,20 @@ msgstr ""
 "   %s\n"
 "   p   primaarse partitsiooni (1-4) loomine\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   loogilise partitsiooni (5-...) loomine"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   extended partitsiooni loomine"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Vigane partitsiooni number t��bile `%c'\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3662,12 +3681,12 @@ msgstr ""
 "Partitsioonitabelit on muudetud!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kasutan ioctl() partitsioonitabeli uuesti lugemiseks\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3681,7 +3700,7 @@ msgstr ""
 "Tuum kasutab endiselt vana tabelit,\n"
 "uus tabel hakkab kehtima j�rgmisest buudist alates.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3694,49 +3713,49 @@ msgstr ""
 "partitsioone, lugege palun fdisk'i manuali\n"
 "lisainformatsiooni jaoks.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Viga %s sulgemisel\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitsioonil %d pole andmetele ruumi eraldatud\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Andmete uus algus"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Eksperdi k�sk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Sisestage silindrite arv"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Sisetage peade arv"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Sisetage sektorite arv"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Hoiatus: sean sektorite offseti DOSiga �hilduvuse jaoks\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3745,32 +3764,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Seade %s ei sisalda �ratuntavat partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Ei suuda avada faili %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tundmatu k�sk\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3779,18 +3798,18 @@ msgstr ""
 "Hoiatus: -b v�tit (sektori suuruse seadmine) tuleks kasutada ainult �he "
 "t�pselt m��ratud seadmega\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "K�sk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3799,16 +3818,16 @@ msgstr ""
 "\n"
 "Aktiivne buutfail on %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Palun sisestage uue buutfaili nimi: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Buutfail j�i samaks\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3901,15 +3920,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linuxi swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linuxi andmed"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4044,7 +4063,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Tabelis on rohekm kui �ks terve ketta kirje\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "�htegi partitsiooni pole defineeritud\n"
@@ -4147,7 +4166,7 @@ msgstr ""
 "terve ketta kirje tohib seda reeglit rikkuda.\n"
 "Kui olete kindel, et soovite seda t��pi muuta, kirjutage YES\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4202,7 +4221,7 @@ msgstr ""
 "kuni Te ise otsustate need kettale kirjutada. P�rast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4220,58 +4239,58 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Terve ketas"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%d vaba sektorit\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linuxi iseavastuv raid"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4284,22 +4303,22 @@ msgstr ""
 "peade, sektorite ja silindrite arv ning partitsioonid\n"
 "v�i luua uus tabel (k�suga s p�himen��st).\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Leidsin vale kontrollsummaga SGI partitsioonitabeli\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Leidsin vale kontrollsummaga SGI partitsioonitabeli\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Leidsin vale kontrollsummaga SGI partitsioonitabeli\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4307,7 +4326,7 @@ msgstr ""
 "Hoiatus: vigane lipp 0x%04x (partitsioonitabelis %d) parandatakse\n"
 "kirjutamisel (w) �ra\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4319,31 +4338,31 @@ msgstr ""
 "kuni Te ise otsustate need kettale kirjutada. P�rast seda pole vana sisu\n"
 "loomulikult enam taastatav.\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektoreid rajal"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partitsioon %d ei l�ppe silindri piiril\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Kasutamata vahemik - sektorid 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kasutamata vahemik - sektorid %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4352,7 +4371,7 @@ msgstr ""
 "Teised partitsioonid katavad juba kogu ketta.\n"
 "Kustutage v�i v�hendage neist m�nda ja proovige uuesti\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4361,12 +4380,12 @@ msgstr ""
 "On �limalt soovitav, et 11. partitsioon kataks kogu ketta\n"
 "ja oleks t��pi \"SGI volume\"\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4376,7 +4395,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:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4385,7 +4404,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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4399,12 +4418,12 @@ msgstr ""
 "sisestage YES, kui olete t�desti kindlad, et tahate partitsiooni t��biks\n"
 "panna 82 (Linuxi saalimisala):"
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4419,11 +4438,11 @@ msgstr ""
 "�hikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4432,28 +4451,28 @@ msgstr ""
 "�hikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, 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:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Alternatiivsete silindrite arv"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Lisasektoreid silindril"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Vahelej�tu tegur"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "P��rlemiskiirus (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "F��siliste silindrite arv"
 
@@ -4670,6 +4689,10 @@ msgstr "Minix / vana Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linuxi swap"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 peidetud C: ketas"
@@ -5296,248 +5319,248 @@ msgstr ""
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Hoiatus: t�hi partitsioon\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "Liiga palju partitsioone\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "kasutamine:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5546,67 +5569,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "kokku: %d plokki\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ei suuda avada seadet %s lugemiseks ja kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ei suuda avada seadet %s lugemiseks\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5614,42 +5637,42 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, 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:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fataalne viga: ei suuda leida %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Hoiatus: %s pole plokkseade\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5657,90 +5680,90 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Palun sisestage y, n v�i q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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 ""
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "shutdown: Ei suuda lahti monteerida kataloogi %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5748,115 +5771,115 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr ""
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr ""
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr ""
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr ""
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Pealesunnitud kontroll failis�steemil %s\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr "Kasutamine: mkfs [-V] [-t fst��p] [fs-v�tmed] seade [suurus]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s pole flopiseade\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Ei suutnud avada %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr ""
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Monteerin lahti k�ik allesj��nud failis�steemid"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: Tundmatu argument: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s paketist %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "ei j�tku m�lu i-kirjete puhvrile"
@@ -6356,7 +6379,13 @@ msgstr "Ei leidnud kasutatavat kellaliidest\n"
 msgid "Unable to set system clock.\n"
 msgstr "S�steemikella seadmine ei �nnestunud\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6368,17 +6397,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:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Tuum kasutab epohhi v��rtust %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6387,22 +6416,22 @@ msgstr ""
 "Epohhi v��rtuse seadmiseks peate kasutama `epoch' v�tit uue v��rtuse "
 "andmiseks\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Ei pannud epohhiks %d - testime ainult\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Epohhi v��rtuse seadmine ei �nnestunud\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s paketist %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6421,6 +6450,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6469,7 +6499,7 @@ msgstr ""
 "  --noadjfile   mitte kasutada faili /etc/adjtime. Vajab kas --utc v�i\n"
 "                --localtime v�tit\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6480,24 +6510,24 @@ msgstr ""
 "                �tleb hwclock'ile, mis t��pi Alphaga on tegemist\n"
 "                Vt. hwclock(8) l�hema info jaoks\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "S�steemikella seadmine ei �nnestunud\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, 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:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6506,54 +6536,54 @@ msgstr ""
 "%s: --utc ja --localtime v�tmed on teineteist v�listavad. Teie kasutasite "
 "m�lemat korraga\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, 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:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile 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:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ei saanud kasutatavat aega, ei keera kella\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, 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:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6842,12 +6872,12 @@ msgstr ""
 msgid "Changing finger information for %s.\n"
 msgstr "Muudan kasutaja %s kohta k�ivat informatsiooni\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM viga, katkestan: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7071,35 +7101,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Saatuslik viga: ei suuda taasavada terminali: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s pole plokkseade"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h on ainult superkasutajale\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Kasutamine: login [-fp] [kasutajanimi]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Ei suutnud initsialiseerida PAM'i: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7108,17 +7143,17 @@ msgstr ""
 "Login incorrect\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7127,127 +7162,127 @@ msgstr ""
 "\n"
 "Login incorrect\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: M�lu sai otsa\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Vigane kasutajanimi"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Kasutaja %s ei tohi sellelt terminaliltsisse logida\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUSED FROM %s ON TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUSED ON TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorrect\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP AT %s BY %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN ON %s FROM %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN ON %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN ON %s BY %s FROM %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN ON %s BY %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Teile on uusi kirju\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Teile on kirju\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Viga fork'imisel: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ei �nnestunud: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() ei �nnestunud"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Kataloogi %s pole!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login sisse kodukataloogiga \"/\"\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: Ei j�tku m�lu shell-skriptile\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, 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:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: shelli pole: %s\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7256,65 +7291,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Kasutajanimi on liiga pikk\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "Nimi on liiga pikk"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "Kasutajanimed ei tohi alata miinusega\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "Liiga palju t�hje ridu\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "TOHUTULT reavahetusi"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login timed out after %d seconds\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Viimati loginud: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "masinast %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "terminalil %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -7571,7 +7606,7 @@ msgstr "TERM pole seatud v�i stat (tty) ei �nnestnud\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "viga teenuse peatamisel: %s"
 
 #: login-utils/simpleinit.c:950
@@ -7581,8 +7616,8 @@ msgstr "viga teenuse peatamisel: %s"
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "viga finalprog'i k�ivitamisel\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "viga teenuse peatamisel: %s"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7710,25 +7745,25 @@ msgstr "%s: ei suuda lugeda ajutise faili staatust\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ei suuda lugeda ajutist faili\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "Vigane aasta number, lubatud on 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "Vigane kuu number, lubatud on 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "Vigane aasta number, lubatud on 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Kasutamine: cal [-13smjyV] [[kuu] aasta]\n"
@@ -7752,6 +7787,113 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "ei suuda avada seadet %s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Tundmatu argument: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "ei j�tku m�lu kaartide puhvritele"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "ei j�tku m�lu kaartide puhvritele"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: ei suuda lugeda %s\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "Kirjutamise viga seadmel %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "Kasutaja informatsioon on muudetud\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Kataloogi %s pole!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "ei j�tku m�lu kaartide puhvritele"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "ei j�tku m�lu kaartide puhvritele"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "ei j�tku m�lu kaartide puhvritele"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "ei j�tku m�lu kaartide puhvritele"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7907,7 +8049,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:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7915,54 +8057,54 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "Kasutamine: script [-a] [-f] [-q] [-t] [fail]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "Kirjutamise viga seadmel %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "Kirjutamise viga seadmel %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "stat(%s) ei �nnestunud"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
@@ -8306,6 +8448,17 @@ msgstr "lugesin %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
+
+# XXX stat'ida
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "ei suuda stat'ida seadet %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8336,6 +8489,11 @@ msgstr ""
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "vigane identifikaator"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8353,7 +8511,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8373,12 +8531,12 @@ msgstr ""
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8406,83 +8564,81 @@ msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "Kasutamine: whereis [ -sbmu ] [ -SBM kataloog ... -f ] nimi...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "M�lu sai otsa"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "%s avamine ei �nnestunud"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr ""
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "Viga %s sulgemisel\n"
+
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Seade %s ei sisalda �ratuntavat partitsioonitabelit\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "seek ei �nnestunud"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, c-format
 msgid "%zd bytes ["
 msgstr ""
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "seek ei �nnestunud"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr ""
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8721,7 +8877,7 @@ msgstr ""
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8736,7 +8892,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8752,389 +8908,428 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1023
+#, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "Seade: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr ""
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr ""
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr ""
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1155
+#, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr ""
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr ""
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or helper program, or other error"
 msgstr ""
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   anda nimekiri tuntud failis�steemide t��pidest"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: ei suuda avada seadet %s kiiruse seadmiseks"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr ""
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9144,22 +9339,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9196,39 +9391,39 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr ""
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr ""
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr ""
 
@@ -9241,7 +9436,7 @@ msgstr ""
 msgid "not enough memory"
 msgstr ""
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9252,7 +9447,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9265,7 +9460,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9277,126 +9472,131 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "fork ei �nnestunud\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "exec ei �nnestunud\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() ei �nnestunud"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "%s avamine ei �nnestunud"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Nimi"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "stat(%s) ei �nnestunud"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr ""
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9406,37 +9606,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "fork ei �nnestunud"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9444,51 +9644,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
-msgstr ""
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
+msgstr "Ketast sai muudetud\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9496,81 +9696,85 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: mount/umount.c:487
+#: mount/umount.c:493
 #, fuzzy
-msgid "Cannot umount \"\"\n"
+msgid "Cannot unmount \"\"\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
-msgstr ""
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
+msgstr "shutdown: Ei suuda lahti monteerida kataloogi %s: %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9578,75 +9782,95 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "tundmatu"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: schedutils/chrt.c:225
-msgid "current"
+#: schedutils/chrt.c:273
+msgid "failed to parse priority"
 msgstr ""
 
-#: schedutils/chrt.c:233
-msgid "failed to parse priority"
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
 msgstr ""
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "uus (N)"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
@@ -9669,7 +9893,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9698,11 +9922,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "exec ei �nnestunud\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "Kasutaja informatsioon on muudetud\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "ei suuda kindlaks teha seadme %s mahtu"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "M�lu sai otsa"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "positsioneerimise viga"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "positsioneerimise viga"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " ja "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -9836,7 +10168,15 @@ msgstr ""
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Kasutamine: script [-a] [-f] [-q] [-t] [fail]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -9845,36 +10185,40 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Liiga palju argumente\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "--date parameeter on puudu\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+msgid "unexpected number of arguments"
+msgstr ""
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "seek ei �nnestunud"
@@ -9921,6 +10265,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "fork ei �nnestunud\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "Kasutaja informatsioon on muudetud\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "--date parameeter on puudu\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "--date parameeter on puudu\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "seek ei �nnestunud"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "juurkataloogi i-kirje ei kirjelda kataloogi"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "seek ei �nnestunud"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "seek ei �nnestunud"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10005,695 +10402,705 @@ msgid ""
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: vigane v�ti (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "v�tmele pole �igusi"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "vigane v�ti"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "identifikaatorile pole �igusi"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "vigane identifikaator"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: Tundmatu argument: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr ""
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:127
 #, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
 #, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr ""
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr ""
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr ""
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr ""
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr ""
 
-#: sys-utils/ipcs.c:299
+#: sys-utils/ipcs.c:327
 #, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr ""
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr ""
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr ""
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr ""
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr ""
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr ""
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr ""
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr ""
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr ""
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr ""
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr ""
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
-msgstr ""
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
+msgstr "-------      -------"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
-msgstr ""
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
+msgstr "-------      -------"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:532
 #, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr ""
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr ""
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr ""
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr ""
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr ""
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync ei �nnestunud"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync ei �nnestunud"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "seek ei �nnestunud"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "vigane kiirus: %s"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "vigane kiirus: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s paketist %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "vigane identifikaator"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "vigane arv: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s pole plokkseade"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ei suuda kettal seekida"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "valmis (D)"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "positsioneerimise viga"
+msgid "error: cannot open %s"
+msgstr "%s: Ei suuda avada faili %s\n"
 
-#: sys-utils/lscpu.c:162
+# XXX stat'ida
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "Viga %s lugemisel\n"
+msgid "failed to read: %s"
+msgstr "ei suuda stat'ida seadet %s"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "positsioneerimise viga"
+
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "%s avamine ei �nnestunud"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "ei j�tku m�lu kaartide puhvritele"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: Avamine ei �nnestunud: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr "Viga %s sulgemisel\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "M�lu sai otsa"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10702,69 +11109,82 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr ""
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10773,65 +11193,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr ""
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr ""
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr ""
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr ""
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr ""
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -10930,11 +11291,12 @@ msgstr ""
 msgid "%d: old priority %d, new priority %d\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -10944,105 +11306,130 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: vigane v�ti (%s)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: vigane v�ti (%s)\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr "%s paketist %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Kasutan %s\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Kasutan %s\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "M�lu sai otsa"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s pole flopiseade\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Teade kasutajalt %s@%s terminalil %s kell %s..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: %s �mber nimetamine %s -ks ei �nnestnud: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr ""
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11135,6 +11522,10 @@ msgstr ""
 msgid "%s: %s not an lp device.\n"
 msgstr ""
 
+#: sys-utils/tunelp.c:259
+msgid "LPGETSTATUS error"
+msgstr ""
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11165,6 +11556,11 @@ msgstr ""
 msgid ", error"
 msgstr ""
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "seek ei �nnestunud"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr ""
@@ -11208,6 +11604,16 @@ msgid "unshare failed"
 msgstr "seek ei �nnestunud"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "fork ei �nnestunud"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "fork ei �nnestunud"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "exec ei �nnestunud\n"
@@ -11691,6 +12097,111 @@ msgid "Out of memory when growing buffer.\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "viga finalprog'i k�ivitamisel\n"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "uus (N)"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#, fuzzy
+#~ msgid "Linux JFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Kasutamine: fdisk [-b SSZ] [-u] DISK      Muuta partitsioonitabelit\n"
+#~ "            fdisk -l [-b SSZ] [-u] DISK   N�idata partitsioonitabeli "
+#~ "sisu\n"
+#~ "            fdisk -s PARTITSIOON          N�idata partitsiooni mahtu "
+#~ "plokkides\n"
+#~ "            fdisk -v                      N�idata fdiski versiooni\n"
+#~ "Siin DISK on seadmefail (n�iteks /dev/hda v�i /dev/sda)\n"
+#~ "ja PARTITSIOON on midagi stiilis /dev/hda7\n"
+#~ "-u: n�idata partitsioonide algust ja l�ppu silindrite asemel sektorites\n"
+#~ "-b 2048: kasutada 2048-baidiseid sektoreid (vajalik n�iteks m�nel MO "
+#~ "seadmel)\n"
+
+#~ 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 ""
+#~ "Kasutamine: fdisk [-l] [-b SSZ] [-u] seade\n"
+#~ "N�iteks:    fdisk /dev/hda  (esimese IDE ketta jaoks)\n"
+#~ "            fdisk /dev/sdc  (kolmanda SCSI ketta jaoks)\n"
+#~ "            fdisk /dev/eda  (esimese PS/2 ESDI ketta jaoks)\n"
+#~ "            fdisk /dev/rd/c0d0 v�i fdisk /dev/ida/c0d0 (RAID seadmete "
+#~ "jaoks)\n"
+#~ "            ...\n"
+
+#~ 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"
+#~ "Ketta silindrite arvuks on seatud %d. Selles ei ole iseenesest\n"
+#~ "midagi halba, aga see on suurem kui 1024 ning v�ib seega p�hjustada\n"
+#~ "teatud situatsioonides probleeme:\n"
+#~ "1) tarkvaraga, mis k�ivitub buutimise ajal (n�iteks vana versioon "
+#~ "LILOst)\n"
+#~ "2) muude operatsioonis�steemide buutimise ja partitsioneerimise\n"
+#~ "tarkvaraga (n�iteks DOSi FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "exec ei �nnestunud\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "positsioneerimise viga"
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "Viga %s lugemisel\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
+
+#, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "M�lu sai otsa"
 
@@ -11737,10 +12248,6 @@ msgstr ""
 #~ "v0 saalimisala tekitada, kasutage -f v�tit selle sundimiseks.\n"
 
 #, fuzzy
-#~ msgid "mount: going to mount %s by %s\n"
-#~ msgstr "shutdown: Ei suuda lahti monteerida kataloogi %s: %s\n"
-
-#, fuzzy
 #~ msgid "%s: cannot fork: %s\n"
 #~ msgstr "%s: Ei suuda avada faili %s\n"
 
diff --git a/po/eu.po b/po/eu.po
index a703be97..10aa3c8a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,17 +1,17 @@
 # Basque translation of util-linux-ng.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the util-linux-ng package.
-# Mikel Olasagasti Uranga <hey_neken@mundurat.net>, 2005, 2009.
+# Mikel Olasagasti Uranga <hey_neken@mundurat.net>, 2005, 2009, 2010.
 # , fuzzy
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.17-rc3\n"
+"Project-Id-Version: util-linux-ng 2.17.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
-"PO-Revision-Date: 2009-12-11 20:02+0100\n"
-"Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
+"PO-Revision-Date: 2010-02-16 19:58+0100\n"
+"Last-Translator: Mikel Olasagasti Uranga <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -101,6 +101,11 @@ msgstr "berirakurri partizio taula"
 msgid "Usage:\n"
 msgstr "Erabilera:\n"
 
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid "  %s -V\n"
+msgstr ""
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -120,6 +125,17 @@ msgstr "Erabilgarri dauden komandoak:\n"
 msgid "get size in 512-byte sectors"
 msgstr "lortu tamainua 512 byte-eko sektoreetan"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -163,7 +179,7 @@ msgstr "erabilera:\n"
 #: disk-utils/elvtune.c:53
 #, c-format
 msgid "\tNOTE: elvtune only works with 2.4 kernels\n"
-msgstr ""
+msgstr "\tOHARRA: elvtune-k 2.4 kernel-ekin bakarrik funtzionatzen du\n"
 
 #: disk-utils/elvtune.c:104
 #, fuzzy, c-format
@@ -173,7 +189,7 @@ msgstr "crc errorea"
 #: disk-utils/elvtune.c:110
 #, c-format
 msgid "missing blockdevice, use -h for help\n"
-msgstr ""
+msgstr "bloke-gailua falta da, erabili -h laguntzarako\n"
 
 #: disk-utils/elvtune.c:131
 #, c-format
@@ -219,15 +235,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "erabilera: %s [ -n] gailua\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, fuzzy, c-format
 msgid "%s: not a block device\n"
@@ -324,7 +331,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc-ek huts egin du"
 
@@ -491,7 +498,7 @@ msgstr "        (libblkid gabe konpilatua). "
 #: disk-utils/fsck.minix.c:207
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr ""
+msgstr "Erabilera: %s [-larvsmf] /dev/izena\n"
 
 #: disk-utils/fsck.minix.c:323
 #, c-format
@@ -895,7 +902,7 @@ msgstr "errorea: malloc-ek huts egin du"
 #: disk-utils/isosize.c:208
 #, c-format
 msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
-msgstr ""
+msgstr "Erabilera: %s [-x] [-d <zenbakia>] iso9660-irudia\n"
 
 #: disk-utils/mkfs.bfs.c:83
 #, c-format
@@ -903,6 +910,8 @@ msgid ""
 "Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
 "       [-F fsname] device [block-count]\n"
 msgstr ""
+"Erabilera: %s [-v] [-N inodo-kopurua] [-V bolumen-izena]\n"
+"       [-F fs-izena] gailua [bloke-kopurua]\n"
 
 #: disk-utils/mkfs.bfs.c:130
 #, fuzzy
@@ -922,9 +931,9 @@ msgstr "Ezin da '%s' (%s) raw moetako gailua aurkitu\n"
 #: disk-utils/mkfs.bfs.c:166
 #, c-format
 msgid "%s is not a block special device"
-msgstr ""
+msgstr "%s ez da bloke gailu berezia"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "ezin da %s ireki"
@@ -937,36 +946,36 @@ msgstr "Ezin da diskoaren tamainua lortu"
 #: disk-utils/mkfs.bfs.c:187
 #, c-format
 msgid "blocks argument too large, max is %llu"
-msgstr ""
+msgstr "bloke argumentu luzeegia, gehienezkoa %llu da"
 
 #: disk-utils/mkfs.bfs.c:202
 msgid "too many inodes - max is 512"
-msgstr ""
+msgstr "inodo gehiegi - gehienezkoa 512 da"
 
 #: disk-utils/mkfs.bfs.c:211
 #, c-format
 msgid "not enough space, need at least %llu blocks"
-msgstr ""
+msgstr "ez dago nahikoa leku, %llu bloke behar dira gutxienez"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Gailua: %s\n"
 
 #: disk-utils/mkfs.bfs.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "Volume: <%-6s>\n"
-msgstr "SGI volume"
+msgstr "Bolumena: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:225
 #, c-format
 msgid "FSname: <%-6s>\n"
-msgstr ""
+msgstr "FSizena: <%-6s>\n"
 
 #: disk-utils/mkfs.bfs.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "BlockSize: %d\n"
-msgstr "lortu bloke-tamainua"
+msgstr "Bloke tamaina: %d\n"
 
 #: disk-utils/mkfs.bfs.c:228
 #, fuzzy, c-format
@@ -976,12 +985,12 @@ msgstr "Markatu erabilia dagoela"
 #: disk-utils/mkfs.bfs.c:231
 #, c-format
 msgid "Inodes: %d (in %lld blocks)\n"
-msgstr ""
+msgstr "Inodoak: %d (%lld blokeetan)\n"
 
 #: disk-utils/mkfs.bfs.c:233
-#, fuzzy, c-format
+#, c-format
 msgid "Blocks: %lld\n"
-msgstr "%ld bloke\n"
+msgstr "Blokeak: %lld\n"
 
 #: disk-utils/mkfs.bfs.c:234
 #, fuzzy, c-format
@@ -989,14 +998,12 @@ msgid "Inode end: %d, Data end: %d\n"
 msgstr "   e   diskoaren data editatu"
 
 #: disk-utils/mkfs.bfs.c:239
-#, fuzzy
 msgid "error writing superblock"
-msgstr "Disko etiketa idazten %s-(e)ri.\n"
+msgstr "errorea superblokea idazten"
 
 #: disk-utils/mkfs.bfs.c:259
-#, fuzzy
 msgid "error writing root inode"
-msgstr "erro inodoa ez da direktorioa"
+msgstr "errorea erro inodoa idazten"
 
 #: disk-utils/mkfs.bfs.c:264
 #, fuzzy
@@ -1030,7 +1037,7 @@ msgstr ""
 "Erabilera: mkfs [-V] [-t fitxategi sistema moeta] [fitxategi sistemaren "
 "aukerak] gailua [tamainua]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1131,7 +1138,7 @@ msgstr "ROM irudia"
 #: disk-utils/mkfs.cramfs.c:937
 #, c-format
 msgid "ROM image write failed (%zd %zd)\n"
-msgstr ""
+msgstr "ROM irudia idazteak huts egin du (%zd %zd)\n"
 
 #: disk-utils/mkfs.cramfs.c:946
 #, c-format
@@ -1171,6 +1178,7 @@ msgstr ""
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr ""
+"Erabilera: %s [-c | -l fitxategi-izena] [-nXX] [-iXX] /dev/izena [blokeak]\n"
 
 #: disk-utils/mkfs.minix.c:178
 #, c-format
@@ -1239,7 +1247,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1281,9 +1289,9 @@ msgid "unable to stat %s"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
 #: disk-utils/mkfs.minix.c:645
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open %s"
-msgstr "ezin dira bootbit sektoreak ezabatu"
+msgstr "ezin da %s ireki"
 
 #: disk-utils/mkfs.minix.c:650
 #, c-format
@@ -1319,171 +1327,176 @@ msgstr ""
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s: fork-ek huts egin du: %s\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, fuzzy, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 "\n"
 "BSD etiketa gailuarentzat: %s\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "etiketa gabea, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "uuid-rik ez\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Erabilera: %s [-c] [-pORRITAMAINUA] [-L etiketa] [-U UUID] /dev/izena "
 "[blokeak]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "orri txar gehiegi"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Memoriarik ez"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "orri oker bat\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu orri oker\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 msgid "unable to alloc new libblkid probe"
 msgstr ""
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
+#: disk-utils/mkswap.c:400
+msgid "unable to assign device to libblkid probe"
 msgstr ""
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 msgid "unable to erase bootbits sectors"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, fuzzy, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (%s partizio tabla atzeman da). "
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "        on whole disk. "
 msgstr "        disko guztian. "
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, c-format
 msgid "        (compiled without libblkid). "
 msgstr "        (libblkid gabe konpilatua). "
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "errorea: UUIDa irakurtzean huts egin da"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr ""
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync-ek huts egin du"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "ezin dira bootbit sektoreak ezabatu"
@@ -1548,61 +1561,107 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "Ezin da '%s' (%s) raw moetako gailua aurkitu\n"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Ezin erabili"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Leku librea"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: ez dago horrelako partiziorik\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "fitxategi sistemaren euskarririk gabeko ezaugarriak"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Erabilera: %s [aukerak] gailua ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Ezin erabili"
 
-#: fdisk/cfdisk.c:415
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Leku librea"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Diskoa aldatu egin da.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1615,228 +1674,228 @@ msgstr ""
 "mesedez ikusi cfdisk-en eskuliburua\n"
 "informazio gehiagorak.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ERRORE LARRIA"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Sakatu tekla bat cfdisk-etik irteteko"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Ezin da bilatu disko unitatean"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Ezin da disko unitatea irakurri"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Ezin da disko unitatean idatzi"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Partizio gehiegi"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Partizioa 0 sektorea baina lehenago hasten da"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Partizioa 0 sektorearen ondoren amaitzen da"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Partizioa disko-amaiera baina lehenago hasten da"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Partizioa disko-amaiera baina lehenago amaitzen da"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partizioa azken partizio zilindroan amaitzen da"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "partizio logikoak ez daude disko ordenean"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "partizio logikoen teilakapena"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 #, fuzzy
 msgid "enlarged logical partitions overlap"
 msgstr "partizio logikoak ez daude disko ordenean"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menu elementu luzeegia. Menuak arraroa eman dezake."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Norabide gabeko menua. Horizontala lehenetsiko da."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Baliogabeko tekla"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Sakatu edozein tekla jarraitzeko"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primarioa"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Sortu partizio primario berri bat"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logikoa"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Sortu partizio logiko berri bat"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Utzi"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Ez sortu partizio bat"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "Barne errorea !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Tamainua (MBtan): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Hasieran"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Gehitu partizioa leku librearen hasieran"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Amaiera"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 #, fuzzy
 msgid "Add partition at end of free space"
 msgstr "Gehitu partizioa leku librearen hasieran"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Ez dago partizio taularik.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Partizio taula moeta ezezaguna"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Zero taula batekin hasi nahi duzu [b/E] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Ezin da disko unitatea ireki"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Partizio primario txarra"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Partizio logiko txarra"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "ez"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 #, fuzzy
 msgid "Did not write partition table to disk"
 msgstr "  W          Partizio taula diskoan idatzi (W letra larriz)"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "bai"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Mesedez sartu `bai' edo `ez'"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Partizio taula diskoan idazten..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Partizio taula diskoan idatzi da"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
@@ -1844,82 +1903,82 @@ msgstr ""
 "Partizio taula idatzi da, baina taularen berirakurketak huts egin du. Saiatu "
 "partprobe(8) edo kpartx(8)-rekin edo berrabiarazi sistema taula berritzeko."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Sartu fitxategi izena edo sakatu INTRO pantailan erakusteko:"
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disko unitatea: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "0 sektorea:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "%d sektorea:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Ezer   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primarioa"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logikoa"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Abio"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Ezer"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s-(r)en partizio taula\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Lehena     Azkena\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1927,7 +1986,7 @@ msgstr ""
 " # Moeta     Sekto.      Sekto.   Offset-a Luzeera   Fitx. Sist. Moeta(ID) "
 "Adierazlea\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1935,474 +1994,474 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ----Hasiera----      ----Amaiera----    Hasi      Kopurua\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sektorea  Sektoreak\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Raw"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Inprimatu taula raw datu formatua erabiliz"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektoreak"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Inprimatu taula sektore bidez ordenatua"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Taula"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Soilik partizio taula inprimatu"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Ez inprimatu taula"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk-entzat laguntza pantaila"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Hau cfdisk da, curses-en oinarritutako disko partizionatze programa, non "
 "honek"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 "zure diskoetan partizioak sortu, ezabatu eta modifikatzeko aukera ematen dizu"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "disko unitateetan."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Komandoak     Esanahia"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Uneko partizioari abiarazgarri adierazlea jarri edo kendu"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Uneko partizioa ezabatu"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Aldatu, zilindro, buru eta sektoreak-pistako parametroak"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ABISUA: Aukera hau aldaketak zer ekar dezakeen dakitenek"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             erabili beharko lukete soilik."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Pantaila hau erakutsi"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Uneko partizioaren disko erabilera maximora handitu"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Oharra: Honek DOS, OS/2 eta beste partizio moeta batzuekin"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             bateragarritasuna kendu dezake"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Sortu partizio berria libre dagoen espaziotik"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          Erakutsi partizio taula pantailan edo idatzi fitxategiren batean"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 #, fuzzy
 msgid "                s - Table ordered by sectors"
 msgstr "Inprimatu taula sektore bidez ordenatua"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 #, fuzzy
 msgid "                t - Table in raw format"
 msgstr "Inprimatu taula raw datu formatua erabiliz"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Irten aplikaziotik partizio taula idatzi gabe"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Aldatu fitxategi sistema moeta"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Aldatu erakusten den partizioaren tamainu unitatea"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, sektore eta zilindro aukerak erakutsiko ditu"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Partizio taula diskoan idatzi (W letra larriz)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Honek diskoaren datu guztiak suntsitu ditzazkeenez"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             konfirmazio bat eskatuko da hauetako aukera bat erabiliaz: "
 "`yes' edo"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             `ez'"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Gora gezia    Mugitu kurtsorea aurreko partiziora"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Behera gezia  Mugitu kurtsorea hurrengo partiziora"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Pantaila freskatu"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Pantaila hau inprimatu"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Oharra: komando guztiak letra handiz edo txikiz sartu daitezke"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "letra xeheak (idazketetarako ezik)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Zilindroak"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Aldatu zilindro geometria"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Buruak"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Aldatu buru geometria"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Aldatu sektore geometria"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Eginda"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Geometria aldaketa egina"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Sartu zilindro kopurua:"
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Baliogabeko zilindro baloreak"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Sartu buru kopurua:"
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Baliogabeok buru baloreak"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Sartu pistako zenbat sektore kopurua:"
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Baliogabeko sektore baloreak"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Sartu fitxategi sistema moeta: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Ezin da F.S. moeta aldatu ezerrera"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Ezin da F.S. moeta aldatu zabaldura"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ezezaguna(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Ezezaguna (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disko unitatea: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Tamainua: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Tamainua: %lld byte, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Buruak: %d   Sektoreak pistako: %d   Zilindroak: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Izena"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Banderak"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Partizio moeta"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "S.E. moeta"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Etiketa]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Sektoreak"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Zilindroak"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Tamainua (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Tamainua (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Abiogarria"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Uneko partizioaren abiarazgarri adierazlea aldatu"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Ezabatu uneko partizioa"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Aldatu diskoaren geometria (erabiltzaile aurreratuak soilik)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Laguntza"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Inprimatu laguntza pantaila"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maximizatu"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Uneko partizioaren disko erabilera maximora handitu (erabiltzaile "
 "aurreratuak soilik)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Berria"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Sortu partizio berria libre dagoen espaziotik"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Inprimatu"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "Erakutsi partizio taula pantailan edo idatzi fitxategiren batean"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Irten"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Irten programatik partizio taula idatzi gabe"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Moeta"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Aldatu fitxategi-sistema moeta (DOS, Linux, OS/2 eta abar)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Unitateak"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Aldatu partizioaren tamainu unitateak (MB, sektoreak, zilindroak)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Idatzi"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Idatzi partizio taula diskora (datu guztiak suntsitu ditzazke)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Ezin da partizio hau abiagarria egin"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Ezin da partizu huts bat ezabatu"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Ezin da partizio hau maximizatu"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Partizio hau ezin da erabili"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Ezin da hutsik dagoen partizio baten moeta aldatu"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Ez dago partizio gehiago"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Komando baliogabea"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2462,9 +2521,9 @@ msgstr ""
 "\n"
 "BSD etiketa gailuarentzat: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Komandoaren ekintza"
 
@@ -2484,9 +2543,9 @@ msgstr "   i   instalatu hasierako sekuentzia"
 msgid "   l   list known filesystem types"
 msgstr "   l   zerrendatu ezagutzen diren fitxategi sistema moetak"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   menu hau erakutsi"
 
@@ -2498,14 +2557,14 @@ msgstr "   n   BSD partizio berri bat gehitu"
 msgid "   p   print BSD partition table"
 msgstr "   p   BSD partizio taula erakutsi"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   irten aldaketak gorde gabe"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   menu nagusira itzuli"
 
@@ -2548,13 +2607,13 @@ msgstr "Ez dago *BSD partiziorik %s-(e)n.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD disko etiketa komandoa (m laguntza erakusteko):"
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Lehenengo %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Azken %s-(e)a edo +tamainua edo +tamainuaM edo +tamainuaK"
@@ -2699,7 +2758,7 @@ msgstr "sektoreak pistako"
 msgid "tracks/cylinder"
 msgstr "pistak zilindroko"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "zilindroak"
@@ -2762,10 +2821,10 @@ msgstr "        disko guztian. "
 msgid "Partition (a-%c): "
 msgstr "berirakurri partizio taula"
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
-msgstr ""
+msgstr "Gehienezko partizio kopurua sortu da\n"
 
 #: fdisk/fdiskbsdlabel.c:629
 #, fuzzy, c-format
@@ -2775,7 +2834,7 @@ msgstr "Partizio hau dagoeneko erabilita dago"
 #: fdisk/fdiskbsdlabel.c:756
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr ""
+msgstr "Abisua: partizio gehiegi (%d, gehienezkoa %d da).\n"
 
 #: fdisk/fdiskbsdlabel.c:804
 #, c-format
@@ -2783,262 +2842,249 @@ msgid ""
 "\n"
 "Syncing disks.\n"
 msgstr ""
+"\n"
+"Diskak sinkronizatzen.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-
-#: fdisk/fdisk.c:260
+#: fdisk/fdisk.c:257
 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"
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
 msgstr ""
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:274
 #, fuzzy, c-format
 msgid "Unable to open %s\n"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, fuzzy, c-format
 msgid "Unable to read %s\n"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, fuzzy, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ezin da bilatu disko unitatean"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, fuzzy, c-format
 msgid "Unable to write %s\n"
 msgstr "   w   idatzi diskoaren etiketa diskoan"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr ""
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Errore larria\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 #, fuzzy
 msgid "   a   toggle a read only flag"
 msgstr "  b          Uneko partizioari abiarazgarri adierazlea jarri edo kendu"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 #, fuzzy
 msgid "   b   edit bsd disklabel"
 msgstr "BSD disko etiketa komandoa (m laguntza erakusteko):"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 #, fuzzy
 msgid "   c   toggle the mountable flag"
 msgstr "  b          Uneko partizioari abiarazgarri adierazlea jarri edo kendu"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 #, fuzzy
 msgid "   d   delete a partition"
 msgstr "  d          Uneko partizioa ezabatu"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 #, fuzzy
 msgid "   l   list known partition types"
 msgstr "   l   zerrendatu ezagutzen diren fitxategi sistema moetak"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 #, fuzzy
 msgid "   n   add a new partition"
 msgstr "   n   BSD partizio berri bat gehitu"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 #, fuzzy
 msgid "   p   print the partition table"
 msgstr "Soilik partizio taula inprimatu"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 #, fuzzy
 msgid "   t   change a partition's system id"
 msgstr "   t   aldatu paritzioaren fitxategi sistema IDa"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 #, fuzzy
 msgid "   u   change display/entry units"
 msgstr "  u          Aldatu erakusten den partizioaren tamainu unitatea"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 #, fuzzy
 msgid "   v   verify the partition table"
 msgstr "berirakurri partizio taula"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr ""
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 #, fuzzy
 msgid "   x   extra functionality (experts only)"
 msgstr "Aldatu diskoaren geometria (erabiltzaile aurreratuak soilik)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 #, fuzzy
 msgid "   a   select bootable partition"
 msgstr "  b          Uneko partizioari abiarazgarri adierazlea jarri edo kendu"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 #, fuzzy
 msgid "   b   edit bootfile entry"
 msgstr "   e   diskoaren data editatu"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 #, fuzzy
 msgid "   c   select sgi swap partition"
 msgstr ""
 "\n"
 "Ez da swap partiziorik existitzen.\n"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 #, fuzzy
 msgid "   a   toggle a bootable flag"
 msgstr "  b          Uneko partizioari abiarazgarri adierazlea jarri edo kendu"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 #, fuzzy
 msgid "   c   toggle the dos compatibility flag"
 msgstr "  b          Uneko partizioari abiarazgarri adierazlea jarri edo kendu"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 #, fuzzy
 msgid "   a   change number of alternate cylinders"
 msgstr "   u   aldatu unitateak (zilindroak/sektoreak)"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 #, fuzzy
 msgid "   c   change number of cylinders"
 msgstr "Sartu zilindro kopurua:"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 #, fuzzy
 msgid "   d   print the raw data in the partition table"
 msgstr "Inprimatu taula raw datu formatua erabiliz"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 #, fuzzy
 msgid "   h   change number of heads"
 msgstr "Sartu buru kopurua:"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 #, fuzzy
 msgid "   i   change interleave factor"
 msgstr "  t          Aldatu fitxategi sistema moeta"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 #, fuzzy
 msgid "   s   change number of sectors/track"
 msgstr "Sartu pistako zenbat sektore kopurua:"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 #, fuzzy
 msgid "   y   change number of physical cylinders"
 msgstr "   u   aldatu unitateak (zilindroak/sektoreak)"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 #, fuzzy
 msgid "   e   list extended partitions"
 msgstr "Partizio gehiegi"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 #, fuzzy
 msgid "   f   fix partition order"
 msgstr "berirakurri partizio taula"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "Aldatu diskoaren geometria (erabiltzaile aurreratuak soilik)"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Ezarri egin behar duzu"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "buruak"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektoreak"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " eta "
 
-#: fdisk/fdisk.c:747
-#, 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 ""
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3049,70 +3095,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Ezin da partizu huts bat ezabatu"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
-msgstr ""
+msgstr "Disko identifikatzailea: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3121,154 +3166,150 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, 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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Barne errorea\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
-msgstr ""
+msgstr "Kode hexadezimala (sakatu L kodeak zerrendatzeko): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr ""
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, fuzzy, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "fitxategi sistemaren euskarririk gabeko ezaugarriak"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Baliogabeko zilindro baloreak"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, fuzzy, c-format
 msgid "Value out of range.\n"
 msgstr "memoriatik kanpo"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Partizio zenbakia"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, fuzzy, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Ezin da hutsik dagoen partizio baten moeta aldatu"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "berirakurri partizio taula"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ez dago *BSD partiziorik %s-(e)n.\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "zilindroa"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektorea"
 
-#: fdisk/fdisk.c:1548
+#: fdisk/fdisk.c:1614
 #, c-format
-msgid "Changing display/entry units to %s\n"
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
+msgstr "  u          Aldatu erakusten den partizioaren tamainu unitatea"
+
+#: fdisk/fdisk.c:1626
 #, fuzzy, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "Partizio hau ezin da erabili"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
-msgstr ""
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
+msgstr "DOS bateragarritasun marka ezarrita dago\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
-msgstr ""
+msgstr "DOS bateragarritasun marka ez dago ezarrita\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, fuzzy, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr ""
 "\n"
 "Ez da swap partiziorik existitzen.\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3277,14 +3318,14 @@ msgid ""
 "a partition using the `d' command.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3292,7 +3333,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3300,113 +3341,118 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
-msgstr ""
+msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logikoa=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1813
-#, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
-msgstr ""
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Partition %i does not start on physical sector boundary.\n"
+msgstr "%s partizioak hasierako 0 sektore baliogabea dauka.\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d buru, %llu sektore pistako, %d zilindro"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", guztira %llu sektore"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Unitateak: %s %d-(e)tik * %d = %d byte\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "Eginda.\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3414,23 +3460,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Gailua"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3441,87 +3487,87 @@ msgstr ""
 "%s diskoa: %d buru, %llu sektore, %d zilindro\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, fuzzy, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Partizioa 0 sektorea baina lehenago hasten da"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, fuzzy, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "berirakurri partizio taula"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, fuzzy, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Ezin da partizu huts bat ezabatu"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, fuzzy, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "partizio logikoak ez daude disko ordenean"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, fuzzy, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Azken %s-(e)a edo +tamainua edo +tamainuaM edo +tamainuaK"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3530,7 +3576,7 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3539,22 +3585,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Partizio primario txarra"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, fuzzy, c-format
 msgid ""
 "Command action\n"
@@ -3562,34 +3608,34 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr "Sortu partizio primario berri bat"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 #, fuzzy
 msgid "l   logical (5 or over)"
 msgstr "partizio logikoen teilakapena"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 #, fuzzy
 msgid "e   extended"
 msgstr "Linux extended"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3598,7 +3644,7 @@ msgid ""
 "the next reboot or after you run partprobe(8) or kpartx(8)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3607,53 +3653,53 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
-msgstr ""
+msgstr "Diskak sinkronizatzen.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, fuzzy, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 "\n"
 "Swap partizioak ez da swap moetakoa.\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 #, fuzzy
 msgid "New beginning of data"
 msgstr "   e   diskoaren data editatu"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 #, fuzzy
 msgid "Expert command (m for help): "
 msgstr "BSD disko etiketa komandoa (m laguntza erakusteko):"
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Zilindro kopurua"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Buru kopurua"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Sektore kopurua pistako"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3662,64 +3708,66 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
-msgstr ""
+msgstr "%s diskak ez dauka partizio taula zuzena\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ezin da %s ireki\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ezin da %s ireki\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, fuzzy, c-format
 msgid "%c: unknown command\n"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Komandoa (m laguntza erakusteko)"
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
+"\n"
+"Uneko abio fitxategia: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
-msgstr ""
+msgstr "Mesedez sartu abio fitxategi berriaren izena:"
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, fuzzy, c-format
 msgid "Boot file unchanged\n"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3796,16 +3844,16 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 #, fuzzy
 msgid "Linux native"
 msgstr "Linux ext2"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -3911,7 +3959,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Ez da partiziorik definitu\n"
@@ -4006,7 +4054,7 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "BAI\n"
 
@@ -4056,7 +4104,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4074,55 +4122,55 @@ msgstr ""
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
-msgstr ""
+msgstr "Ezarri gabea"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Disko osoa"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt sectors"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS reserved"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Automatikoki atzeman Linux raid-ak"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4131,28 +4179,28 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4161,50 +4209,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektoreak pistako"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, fuzzy, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Baliogabeko sektore baloreak"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, fuzzy, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Baliogabeko sektore baloreak"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
 "and is of type `Whole disk'\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, fuzzy, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4212,14 +4260,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, 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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4228,12 +4276,12 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4241,39 +4289,42 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
+"\n"
+"%s diskoa: %d buru, %llu sektore, %d zilindro\n"
+"\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 #, fuzzy
 msgid "Number of alternate cylinders"
 msgstr "Sartu zilindro kopurua:"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 #, fuzzy
 msgid "Extra sectors per cylinder"
 msgstr "Sartu pistako zenbat sektore kopurua:"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Bira minutuko (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 #, fuzzy
 msgid "Number of physical cylinders"
 msgstr "Sartu zilindro kopurua:"
@@ -4299,9 +4350,8 @@ msgid "FAT16 <32M"
 msgstr "FAT16 <32M"
 
 #: fdisk/i386_sys_types.c:11
-#, fuzzy
 msgid "Extended"
-msgstr "Linux extended"
+msgstr "Extended"
 
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
@@ -4484,6 +4534,10 @@ msgstr "Minix / old Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 hidden C: drive"
@@ -4780,16 +4834,18 @@ msgid ""
 msgstr ""
 
 #: fdisk/sfdisk.c:645
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Id  Name\n"
 "\n"
-msgstr "baliogabeko id-a: %s\n"
+msgstr ""
+"Id  Izena\n"
+"\n"
 
 #: fdisk/sfdisk.c:806
-#, fuzzy, c-format
+#, c-format
 msgid "Re-reading the partition table ...\n"
-msgstr "Partizio taula moeta ezezaguna"
+msgstr "Partizio taula berriz irakurtzen ...\n"
 
 #: fdisk/sfdisk.c:811
 msgid ""
@@ -4804,9 +4860,9 @@ msgid "Error closing %s\n"
 msgstr "Errorea %s itxitzerakoan\n"
 
 #: fdisk/sfdisk.c:855
-#, fuzzy, c-format
+#, c-format
 msgid "%s: no such partition\n"
-msgstr "Ez dago partizio taularik.\n"
+msgstr "%s: ez dago horrelako partiziorik\n"
 
 #: fdisk/sfdisk.c:878
 #, fuzzy
@@ -5068,255 +5124,254 @@ msgstr ""
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, fuzzy, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Partizio taula diskoan idazten..."
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, fuzzy, c-format
 msgid "unrecognized input: %s\n"
 msgstr "sarrera okerra\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "zenbaki handiegia\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 #, fuzzy
 msgid "too many input fields\n"
 msgstr "orri txar gehiegi"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2070
-#, fuzzy
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
-msgstr "Partizio moeta"
+msgstr "Baliogabeko moeta\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 #, fuzzy
 msgid "Warning: empty partition\n"
 msgstr "Ezin da partizu huts bat ezabatu"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "sarrera okerra\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "partizio gehiegi\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "gailua: /dev/hda edo /dev/sda moduko zerbait"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "aukera baliogarriak:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 #, fuzzy
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "  p          Erakutsi partizio taula pantailan edo idatzi fitxategiren batean"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 #, fuzzy
 msgid "    -v [or --version]:   print version"
 msgstr "Ez inprimatu taula"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 #, fuzzy
 msgid "dangerous options:"
 msgstr "aukera baliogarriak:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Erabilera:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5325,68 +5380,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 #, fuzzy
 msgid "no command?\n"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "guztira: %llu bloke\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ezin da \"%s\" ireki irakurketarako"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ezin da \"%s\" ireki irakurketarako"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, fuzzy, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%d buru, %llu sektore pistako, %d zilindro"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5394,43 +5449,43 @@ msgstr ""
 "Eginda\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, 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:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, fuzzy, c-format
 msgid "Bad Id %lx\n"
 msgstr "ezin da %s id-a ezabatu (%s)\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 #, fuzzy
 msgid "This disk is currently in use.\n"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5438,90 +5493,90 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Egoera zaharra:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Egoera berria:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Irteten - ez da ezer aldatu\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Mesedez erantzun y,n edo q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, fuzzy, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr "Partizio taula diskoan idatzi da"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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 ""
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5529,113 +5584,113 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr "fsck: %s: ez da aurkitu\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr ""
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr ""
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, fuzzy, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "Ordulariaren tick-ari itxaroten\n"
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: gailu gehiegi\n"
 
-#: fsck/fsck.c:1135
-#, fuzzy, c-format
+#: fsck/fsck.c:1134
+#, c-format
 msgid "Couldn't open %s: %s\n"
-msgstr "open-ek huts egin du: %s"
+msgstr "Ezin da %s ireki: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "/proc montatua dago?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: argumentu gehiegi\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s-(e)tik renice-ea\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr ""
@@ -5775,9 +5830,9 @@ msgid "cmos_write(): write to data address %X failed: %s\n"
 msgstr ""
 
 #: hwclock/cmos.c:574
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr "Ezin da disko unitatea ireki"
+msgstr "Ezin da /dev/port ireki: %s"
 
 #: hwclock/cmos.c:581
 #, c-format
@@ -5842,9 +5897,9 @@ msgid "Waiting for clock tick...\n"
 msgstr "Ordulariaren tick-ari itxaroten\n"
 
 #: hwclock/hwclock.c:356
-#, fuzzy, c-format
+#, c-format
 msgid "...synchronization failed\n"
-msgstr "stat-ek huts egin du: %s"
+msgstr "...sinkronizazioak huts egin du\n"
 
 #: hwclock/hwclock.c:358
 #, fuzzy, c-format
@@ -6098,7 +6153,13 @@ msgstr ""
 msgid "Unable to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6107,39 +6168,39 @@ msgid ""
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, 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:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, fuzzy, c-format
 msgid "%s from %s\n"
 msgstr "%s-(e)tik renice-ea\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6158,6 +6219,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6179,7 +6241,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6187,77 +6249,77 @@ msgid ""
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6288,23 +6350,21 @@ msgid "ioctl() failed to read time from %s"
 msgstr ""
 
 #: hwclock/kd.c:140
-#, fuzzy
 msgid "ioctl KDSHWCLK failed"
-msgstr "%s: get size egiterakoan huts egin da"
+msgstr "ioctl KDSHWCLK-ek huts egin du"
 
 #: hwclock/kd.c:176
 msgid "Can't open /dev/tty1 or /dev/vc/1"
 msgstr ""
 
 #: hwclock/kd.c:180
-#, fuzzy
 msgid "KDGHWCLK ioctl failed"
-msgstr "%s: get size egiterakoan huts egin da"
+msgstr "KDGHWCLK ioctl-ek huts egin du"
 
 #: hwclock/rtc.c:147 hwclock/rtc.c:241
-#, fuzzy, c-format
+#, c-format
 msgid "open() of %s failed"
-msgstr "open-ek huts egin du: %s"
+msgstr "%s-(r)engan open() egiteak huts egin du"
 
 #: hwclock/rtc.c:181
 #, c-format
@@ -6408,9 +6468,9 @@ msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
 
 #: login-utils/agetty.c:360
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "exec %s-(e)k huts egin du"
+msgstr "%s: ezin da %s-(r)engan exec egin: %m"
 
 #: login-utils/agetty.c:383
 #, fuzzy
@@ -6468,9 +6528,9 @@ msgid "users"
 msgstr "erabiltzaileak"
 
 #: login-utils/agetty.c:1030
-#, fuzzy, c-format
+#, c-format
 msgid "%s: read: %m"
-msgstr "Irakurri:"
+msgstr "%s: irakurri: %m"
 
 #: login-utils/agetty.c:1077
 #, fuzzy, c-format
@@ -6546,12 +6606,12 @@ msgstr ""
 msgid "Changing finger information for %s.\n"
 msgstr ""
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr ""
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -6579,9 +6639,9 @@ msgid ""
 msgstr ""
 
 #: login-utils/chfn.c:330
-#, fuzzy, c-format
+#, c-format
 msgid "[ --help ] [ --version ]\n"
-msgstr "Inprimatu laguntza pantaila"
+msgstr "[ --help ] [ --version ]\n"
 
 #: login-utils/chfn.c:378
 msgid "Office"
@@ -6771,246 +6831,251 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr ""
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr ""
+
+#: login-utils/login.c:238
 #, fuzzy
 msgid "FATAL: bad tty"
 msgstr "fitxategi luzeera okerra"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr ""
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr ""
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, fuzzy, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr ""
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, fuzzy, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr "Pasahitz okerra."
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr "Pasahitz okerra."
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, fuzzy, c-format
 msgid "login: Out of memory\n"
 msgstr "memoriatik kanpo"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 #, fuzzy
 msgid "Illegal username"
 msgstr "Baliogabeko tekla"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, fuzzy, c-format
 msgid "Login incorrect\n"
 msgstr "Pasahitz okerra."
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, fuzzy, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "%s-(r)en disko etiketa irakurtzen %d sektorean.\n"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, fuzzy, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "        disko guztian. "
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, fuzzy, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "        disko guztian. "
 
-#: login-utils/login.c:1125
-#, fuzzy, c-format
+#: login-utils/login.c:1129
+#, c-format
 msgid "You have new mail.\n"
-msgstr "Sortu partizio primario berri bat"
+msgstr "Posta elektroniko berria duzu.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr ""
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr ""
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, fuzzy, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "stat-ek huts egin du: %s"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid()-k huts egin du"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, fuzzy, c-format
 msgid "No directory %s!\n"
 msgstr "<i> (ez dago iradokizunik) </i>"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, fuzzy, c-format
 msgid "login: no shell: %s.\n"
 msgstr "Ez dago partizio taularik.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr ""
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "IZENA luzeegia"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr ""
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, fuzzy, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "orri txar gehiegi"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr ""
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, fuzzy, c-format
 msgid "Last login: %.*s "
 msgstr "               Lehena     Azkena\n"
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, fuzzy, c-format
 msgid "from %.*s\n"
 msgstr "%s-(e)tik renice-ea\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, fuzzy, c-format
 msgid "on %.*s\n"
 msgstr "        disko guztian. "
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, fuzzy, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "        disko guztian. "
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, fuzzy, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "        disko guztian. "
@@ -7047,9 +7112,8 @@ msgid "newgrp: Permission denied"
 msgstr ""
 
 #: login-utils/newgrp.c:132
-#, fuzzy
 msgid "newgrp: setuid"
-msgstr "setuid()-k huts egin du"
+msgstr "newgrp: setuid"
 
 #: login-utils/newgrp.c:138
 #, fuzzy
@@ -7273,7 +7337,7 @@ msgstr ""
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "errorea: malloc-ek huts egin du"
 
 #: login-utils/simpleinit.c:950
@@ -7283,7 +7347,7 @@ msgstr "Gelditutako gailua: %s\n"
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
+msgid "error at starting service \"%s\"\n"
 msgstr "errorea: malloc-ek huts egin du"
 
 #: login-utils/ttymsg.c:75
@@ -7410,25 +7474,25 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr "ezin da badblocks fitxategia irakurri"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "baliogabeko egun balorea: erabili 1-%d"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr ""
@@ -7444,34 +7508,141 @@ msgid "St. Tib's Day"
 msgstr "baliogabeko egun balorea: erabili 1-%d"
 
 #: misc-utils/findfs.c:24
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr "Erabilera: %s [aukerak] gailua ...\n"
+msgstr "Erabilera: %s LABEL=<etiketa>|UUID=<uuid>\n"
 
 #: misc-utils/findfs.c:55
 #, fuzzy, c-format
 msgid "unable to resolve '%s'"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: misc-utils/kill.c:207
+#: misc-utils/findmnt.c:192
 #, fuzzy, c-format
-msgid "%s: unknown signal %s\n"
+msgid "unknown column: %s"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: misc-utils/kill.c:270
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: misc-utils/findmnt.c:364
 #, fuzzy, c-format
-msgid "%s: can't find process \"%s\"\n"
+msgid "can't read: %s"
 msgstr "hexdump: ezin da %s  irakurri.\n"
 
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "crc errorea"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "<i> (ez dago iradokizunik) </i>"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: misc-utils/kill.c:207
+#, c-format
+msgid "%s: unknown signal %s\n"
+msgstr "%s: %s seinale ezezaguna\n"
+
+#: misc-utils/kill.c:270
+#, c-format
+msgid "%s: can't find process \"%s\"\n"
+msgstr "%s: ezin da \"%s\" prozesua aurkitu\n"
+
 #: misc-utils/kill.c:314
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr ""
 
 #: misc-utils/kill.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "Erabilera: %s [aukerak] gailua ...\n"
+msgstr "erabilera: %s [ -s seinalea | -p ] [ -a ] pid ...\n"
 
 #: misc-utils/kill.c:355
 #, c-format
@@ -7602,7 +7773,7 @@ msgstr "huts egin da lerro buffer-a hasieratzen\n"
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7610,54 +7781,54 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:173
+#: misc-utils/script.c:182
 #, fuzzy, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "erabilera: %s [ -i ] [ -tTerm ] fitxategia...\n"
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
+msgstr "erabilera: script-a [-a] [-f] [-q] [-t] [fitxategia]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "crc errorea"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, fuzzy, c-format
 msgid "Script started on %s"
 msgstr "        disko guztian. "
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "crc errorea"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr ""
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr "        disko guztian. "
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, fuzzy, c-format
 msgid "openpty failed\n"
 msgstr "stat-ek huts egin du: %s"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, fuzzy, c-format
 msgid "Out of pty's\n"
 msgstr "%s: Memoriaz kanpo!\n"
@@ -7678,9 +7849,8 @@ msgid "divisor '%s'"
 msgstr ""
 
 #: misc-utils/scriptreplay.c:104
-#, fuzzy
 msgid "write to stdout failed"
-msgstr "   w   idatzi diskoaren etiketa diskoan"
+msgstr "huts egin da stdout-era idazten"
 
 #: misc-utils/scriptreplay.c:110
 #, c-format
@@ -8000,6 +8170,16 @@ msgstr "read-ek huts egin du: %s"
 msgid "bad response length"
 msgstr "fitxategi luzeera okerra"
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8030,6 +8210,11 @@ msgstr ""
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "%d baliogabeko ekintza\n"
+
 #: misc-utils/uuidd.c:378
 #, fuzzy, c-format
 msgid "Generated time UUID: %s\n"
@@ -8047,7 +8232,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, fuzzy, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr "uuid-rik ez\n"
 
 #: misc-utils/uuidd.c:427
@@ -8067,13 +8252,13 @@ msgstr ""
 
 #: misc-utils/uuidd.c:534
 #, fuzzy, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr "errorea: UUIDa irakurtzean huts egin da"
 
 #: misc-utils/uuidd.c:536
 #, fuzzy, c-format
-msgid "List of UUID's:\n"
-msgstr "uuid-rik ez\n"
+msgid "List of UUIDs:\n"
+msgstr "UUID zerrenda:\n"
 
 #: misc-utils/uuidd.c:557
 #, c-format
@@ -8100,82 +8285,79 @@ msgstr "Erabilera: %s [-r] [-t]\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
 msgstr "calloc-ek huts egin du"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
 msgstr "strdup-ek huts egin du"
 
-#: misc-utils/wipefs.c:199
-#, fuzzy
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr "%s: get size egiterakoan huts egin da"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "%s diskak ez dauka partizio taula zuzena\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr ""
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, c-format
 msgid "%s: write failed"
 msgstr " %s: write-k huts egin du"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, c-format
 msgid "%zd bytes ["
 msgstr "%zd byte ["
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: open-ek huts egin du"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
-#, c-format
-msgid "invalid offset '%s' value specified"
-msgstr ""
-
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
+#: misc-utils/wipefs.c:329
+#, fuzzy, c-format
+msgid "invalid offset value '%s' specified"
+msgstr "Baliogabeko zilindro baloreak"
 
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8415,7 +8597,7 @@ msgstr ""
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8430,7 +8612,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8446,392 +8628,428 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1023
+#, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop gailua %s da\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
-#, fuzzy, c-format
+#: mount/lomount.c:1075
+#, c-format
 msgid "%s: %s: device is busy"
-msgstr "Loop gailua %s da\n"
+msgstr "%s: %s: gailua okupatua dago"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "Gehitu \"%s\" hiztegiari"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr ""
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr ""
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1190
-#, fuzzy, c-format
+#: mount/mount.c:582 mount/mount.c:1256
+#, c-format
 msgid "mount: error writing %s: %s"
-msgstr "Disko etiketa idazten %s-(e)ri.\n"
+msgstr "mount: errorea %s idazten: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr ""
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr ""
 
-#: mount/mount.c:705 mount/mount.c:1855
-#, fuzzy, c-format
+#: mount/mount.c:729 mount/mount.c:1925
+#, c-format
 msgid "mount: cannot fork: %s"
-msgstr "Ezin da '%s' fitxategia ireki"
+msgstr "mount: ezin da fork egin: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount.c:878
-#, fuzzy, c-format
+#: mount/mount.c:901
+#, c-format
 msgid "       I will try type %s\n"
-msgstr "Partizio moeta"
+msgstr "       %s moetarekin saiatuko da\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "mount-ek huts egin du"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1155
+#, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "Loop gailua %s da\n"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: ezin da %s ireki: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, fuzzy, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "ezin da lerroaren disziplina ezarri"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr ""
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "ezin da badblocks fitxategia irakurri"
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: mount-ek huts egin du"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#: mount/mount.c:1424 mount/mount.c:1428
-#, fuzzy, c-format
+#: mount/mount.c:1502 mount/mount.c:1506
+#, c-format
 msgid "mount: %s is busy"
-msgstr "mount: %s lanpetuta dago"
+msgstr "mount: %s okupatua dago"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:1438
-#, fuzzy, c-format
+#: mount/mount.c:1516
+#, c-format
 msgid "mount: mount point %s does not exist"
-msgstr ""
-"\n"
-"Ez da swap partiziorik existitzen.\n"
+msgstr "mount: %s muntau puntua ez da existitzen"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or helper program, or other error"
 msgstr ""
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1505
-#, fuzzy
+#: mount/mount.c:1583
 msgid "mount table full"
-msgstr "berirakurri partizio taula"
+msgstr "muntai taula beteta"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, fuzzy, c-format
 msgid "mount: %s: unknown device"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "Partizio taula moeta ezezaguna"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "bloke gailua"
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, fuzzy, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "ezin da badblocks fitxategia irakurri"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr ""
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr ""
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr ""
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8841,22 +9059,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8893,40 +9111,39 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr ""
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2279
-#, fuzzy
+#: mount/mount.c:2349
 msgid "nothing was mounted"
-msgstr "/proc montatua dago?\n"
+msgstr "ez da ezer muntatu"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr ""
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 #, fuzzy
 msgid "; rest of file ignored"
 msgstr "Ezin da '%s' fitxategia ireki"
@@ -8937,11 +9154,10 @@ msgstr ""
 
 #: mount/sundries.c:225 mount/sundries.c:281 mount/sundries.c:296
 #: mount/xmalloc.c:11
-#, fuzzy
 msgid "not enough memory"
-msgstr "memoriatik kanpo"
+msgstr "ez dago nahikoa memoria"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -8952,7 +9168,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -8965,7 +9181,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -8977,124 +9193,129 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, fuzzy, c-format
 msgid "%s: reinitializing the swap."
 msgstr "Linux swap"
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 msgid "fork failed"
 msgstr "fork-ek huts egin du"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 msgid "execv failed"
 msgstr "execv-ek huts egin du"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
 msgstr "waitpid-ek huts egin du"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek-ek huts egin du"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "%s: get size egiterakoan huts egin da"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "same"
 msgstr "berdina"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat-ek huts egin du"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: get size egiterakoan huts egin da"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s %s-(e)-n\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon-ek huts egin du"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr ""
 "\n"
 "BSD etiketa gailuarentzat: %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr "Ez zara super-erabiltzailea"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff-ek huts egin du"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9104,37 +9325,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ezin da fork egin: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ez dago montatuta"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9142,51 +9363,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: ez da %s aurkitu"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
-msgstr ""
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
+msgstr "Diskoa aldatu egin da.\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9194,80 +9415,85 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
 msgstr ""
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
 msgstr ""
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Ezin da \"\" desmontatu\n"
 
-#: mount/umount.c:493
+#: mount/umount.c:499
 #, fuzzy, c-format
-msgid "Trying to umount %s\n"
-msgstr "Gehitu \"%s\" hiztegiari"
+msgid "Trying to unmount %s\n"
+msgstr "%s desmuntatzen saiatzen\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9275,75 +9501,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's new scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:106
+#, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:139
 #, c-format
 msgid "unknown\n"
 msgstr "ezezaguna\n"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "fsck: %s: ez da aurkitu\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr "unekoa"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:242
-msgid "new"
-msgstr "berria"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, c-format
 msgid "failed to execute %s"
 msgstr "huts egin da %s exekutatzen"
@@ -9364,7 +9611,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9393,9 +9640,118 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr "fitxategi luzeera okerra"
 
-#: schedutils/ionice.c:187
-msgid "execvp failed"
-msgstr "execvp-ek huts egin du"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
+msgstr "exec %s-(e)k huts egin du"
+
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Erabilera: %s [aukerak] gailua ...\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "Ezin da diskoaren tamainua lortu"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "calloc-ek huts egin du"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "crc errorea"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "crc errorea"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " eta "
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -9530,7 +9886,15 @@ msgstr ""
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Erabilera: %s [-c] [-n maila] [-r] [-s buffer-aren tamainua]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -9539,36 +9903,41 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Ez da --date aukerarik zehaztu.\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Ez da --date aukerarik zehaztu.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "Ezin da '%s' fitxategia ireki"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: fallocate-k huts egin du"
@@ -9615,6 +9984,62 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "%s: fork-ek huts egin du: %s\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Erabilera: %s%s [aukerak] [aplikazioa [aplikazioa argumentuak]]\n"
+"\n"
+"Aukerak:\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Ez da --date aukerarik zehaztu.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Ez da --date aukerarik zehaztu.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s: stat-ek huts egin du"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "erro inodoa ez da direktorioa"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr " %s: write-k huts egin du"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr " %s: write-k huts egin du"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -9664,9 +10089,9 @@ msgid "create semaphore failed"
 msgstr "%s: get size egiterakoan huts egin da"
 
 #: sys-utils/ipcmk.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Semaphore id: %d\n"
-msgstr "baliogabeko id-a: %s\n"
+msgstr "Semaforo id-a: %d\n"
 
 #: sys-utils/ipcrm.c:64
 #, c-format
@@ -9700,696 +10125,704 @@ msgid ""
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: baliogabeko aukera -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, fuzzy, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "Baliogabeko tekla"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 #, fuzzy
 msgid "already removed key"
 msgstr "Sakatu edozein tekla jarraitzeko"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 #, fuzzy
 msgid "invalid key"
 msgstr "Baliogabeko tekla"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "baliogabeko id-a"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 #, fuzzy
 msgid "already removed id"
 msgstr "ezin da %s id-a ezabatu (%s)\n"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, fuzzy, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, fuzzy, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "Erabilera: %s [aukerak] gailua ...\n"
-
-#: sys-utils/ipcs.c:117
-#, fuzzy, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "baliogabeko id-a: %s\n"
-
-#: sys-utils/ipcs.c:118
-#, fuzzy, c-format
-msgid "\t%s -h for help.\n"
-msgstr "cfdisk-entzat laguntza pantaila"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:127
 #, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
 #, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, fuzzy, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "memoriatik kanpo"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, fuzzy, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "memoriatik kanpo"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:278
-#, fuzzy, c-format
-msgid "pages allocated %ld\n"
-msgstr "%6.2f%% (%+ld bytes)\t%s\n"
-
-#: sys-utils/ipcs.c:279
-#, fuzzy, c-format
-msgid "pages resident  %ld\n"
-msgstr "%6.2f%% (%+ld bytes)\t%s\n"
-
-#: sys-utils/ipcs.c:280
-#, fuzzy, c-format
-msgid "pages swapped   %ld\n"
-msgstr "%6.2f%% (%+ld bytes)\t%s\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "jabea"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "konektatuta"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "deskonektatuta"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "aldatuta"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr ""
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
+msgstr "memoriatik kanpo"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, fuzzy, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "memoriatik kanpo"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 #, fuzzy
 msgid "key"
 msgstr "Baliogabeko tekla"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 #, fuzzy
 msgid "bytes"
 msgstr "%6.2f%% (%+ld bytes)\t%s\n"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr ""
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr ""
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
-#, fuzzy
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
-msgstr "ezarri bloke-tamainua"
+msgstr "Ezarrigabea"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr ""
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr ""
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, fuzzy, c-format
 msgid "max number of arrays = %d\n"
 msgstr "Sartu zilindro kopurua:"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, fuzzy, c-format
 msgid "semaphore max value = %d\n"
 msgstr "Baliogabeko zilindro baloreak"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, fuzzy, c-format
 msgid "used arrays = %d\n"
 msgstr "%6ld zona erabilita (%ld%%)\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr ""
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 #, fuzzy
 msgid "last-op"
 msgstr "               Lehena     Azkena\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 #, fuzzy
 msgid "last-changed"
 msgstr "               Lehena     Azkena\n"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr ""
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
-msgstr ""
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
+msgstr "memoriatik kanpo"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, fuzzy, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "lortu tamainua byte-tan"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
-msgstr ""
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
+msgstr "memoriatik kanpo"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, fuzzy, c-format
 msgid "used headers = %d\n"
 msgstr "%6ld zona erabilita (%ld%%)\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, fuzzy, c-format
 msgid "used space = %d bytes\n"
 msgstr "%6.2f%% (%+ld bytes)\t%s\n"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:532
 #, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr ""
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "recv"
 
-#: sys-utils/ipcs.c:512
-#, fuzzy
+#: sys-utils/ipcs.c:540
 msgid "change"
-msgstr "  t          Aldatu fitxategi sistema moeta"
+msgstr "aldatu"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr ""
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 #, fuzzy
 msgid "used-bytes"
 msgstr "%6.2f%% (%+ld bytes)\t%s\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr ""
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
 msgstr "shmctl-ek huts egin du"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, fuzzy, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "`%s' fitxategiak %05o modua dauka\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
 msgstr "msgctl-ek huts egin du"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
 msgstr "semctl-ek huts egin du"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
 #, fuzzy, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "`%s' fitxategiak %05o modua dauka\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, fuzzy, c-format
 msgid "nsems = %ld\n"
 msgstr "%ld inodo\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "balioa"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "baliogabeko id-a: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "baliogabeko abiadura: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s-(e)tik renice-ea\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "baliogabeko aukera"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ezin da lerroaren disziplina ezarri"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr "%d abiadurak ez du euskarririk"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr "ezin da lerroaren disziplina ezarri"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "Ezin da ireki"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 msgid "none"
 msgstr "ez"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, c-format
-msgid "error: %s"
-msgstr "errorea: %s"
+#: sys-utils/lscpu.c:158
+#, fuzzy, c-format
+msgid "error: cannot open %s"
+msgstr "Ezin da ireki"
+
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
+#, fuzzy, c-format
+msgid "failed to read: %s"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:209
 #, fuzzy, c-format
-msgid "error parse: %s"
+msgid "parse error: %s"
 msgstr "crc errorea"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
 msgstr "errorea: strdup-ek huts egin du"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: sys-utils/lscpu.c:318
 msgid "error: uname failed"
 msgstr "errorea: uname-k huts egin du"
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+#, fuzzy
+msgid "error: calloc failed"
 msgstr "errorea: malloc-ek huts egin du"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10398,70 +10831,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
-#, fuzzy
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
+msgstr "CPUaren op-modua(k):"
+
+#: sys-utils/lscpu.c:759
+#, fuzzy
+msgid "CPU(s):"
 msgstr "CPU socketak:"
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr "Core bakoitzeko hari kopurua:"
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr "Socket bakoitzeko core kopurua:"
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr "CPU socketak:"
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr "NUMA noduak:"
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr "Fabrikatzailearen IDa:"
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr "CPU familia:"
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr "Modeloa:"
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr "Stepping-a:"
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr "Birtualizazioa:"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr "Hypervisor-earen fabrikatzailea:"
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr "Birtualizazio moeta:"
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr "%s cachea:"
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, fuzzy, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "NUMA noduak:"
+
+#: sys-utils/lscpu.c:816
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Erabilera: %s [aukera]\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10470,65 +10916,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr ""
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr ""
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr ""
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr ""
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr ""
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "koma falta da"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -10627,11 +11014,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: %d prioritate zaharra, %d prioritate berria\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -10641,105 +11029,130 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "irakurri rtc ordua"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "irakurri sistemaren ordua"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 #, fuzzy
 msgid "convert rtc time"
 msgstr "%s: baliogabeko %s time_t balorea\n"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "ezarri rtc alarma"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "Baliogabeko zilindro baloreak"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: baliogabeko %s time_t balorea\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "UTC ordua erabiltzen.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "Ordu lokala erabiltzen.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "malloc()-ek huts egin du"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "rtc irakurrita"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -10839,6 +11252,11 @@ msgstr "%s: balio okerra\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s ez da lp gailua.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "LPGETIRQ errorea"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -10860,15 +11278,20 @@ msgid ", out of paper"
 msgstr ", paperik gabe"
 
 #: sys-utils/tunelp.c:267
-#, fuzzy, c-format
+#, c-format
 msgid ", on-line"
-msgstr "lerro luzeegia"
+msgstr ", linean"
 
 #: sys-utils/tunelp.c:268
 #, c-format
 msgid ", error"
 msgstr ", errorea"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: mount-ek huts egin du"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ errorea"
@@ -10911,6 +11334,16 @@ msgid "unshare failed"
 msgstr "unshared-ek huts egin du"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "ezin da %s ireki"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "Ezin da diskoaren tamainua lortu"
+
+#: sys-utils/unshare.c:125
 #, c-format
 msgid "exec %s failed"
 msgstr "exec %s-(e)k huts egin du"
@@ -11401,6 +11834,78 @@ msgstr "Sarrera lerro luzeegia.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Memoriarik ez buffer-a hazterakoan.\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: baliogabeko aukera -- %c\n"
+
+#, fuzzy
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "%6.2f%% (%+ld bytes)\t%s\n"
+
+#, fuzzy
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "%6.2f%% (%+ld bytes)\t%s\n"
+
+#, fuzzy
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "%6.2f%% (%+ld bytes)\t%s\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "errorea: malloc-ek huts egin du"
+
+#~ msgid "current"
+#~ msgstr "unekoa"
+
+#~ msgid "new"
+#~ msgstr "berria"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ msgid "execvp failed"
+#~ msgstr "execvp-ek huts egin du"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "erabilera : %s -asmq -tclup \n"
+
+#, fuzzy
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "baliogabeko id-a: %s\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h laguntzarako.\n"
+
+#~ msgid "error: %s"
+#~ msgstr "errorea: %s"
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "crc errorea"
+
+#~ msgid "missing comma"
+#~ msgstr "koma falta da"
+
 #~ msgid "out if memory"
 #~ msgstr "memoriatik kanpo"
 
diff --git a/po/fi.po b/po/fi.po
index 96cede79..b4aa434c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.17-rc3\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2009-12-16 21:30+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -112,6 +112,11 @@ msgstr "lue osiotaulu uudelleen"
 msgid "Usage:\n"
 msgstr "Käyttö:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -k\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -131,6 +136,17 @@ msgstr "Käytettävissä olevat komennot:\n"
 msgid "get size in 512-byte sectors"
 msgstr "hae koko 512-tavuisina sektoreina"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -232,15 +248,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "käyttö: %s [ -n ] laite\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -342,7 +349,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc epäonnistui"
 
@@ -954,7 +961,7 @@ msgstr "laitteen %s tilaa ei voi lukea"
 msgid "%s is not a block special device"
 msgstr "%s ei ole lohkolaite"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "laitetta %s ei voi avata"
@@ -978,7 +985,7 @@ msgstr "liian monta i-solmua – maksimi on 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "tila ei riitä, vaaditaan vähintään %llu lohkoa"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Laite: %s\n"
@@ -1054,7 +1061,7 @@ msgstr ""
 "Käyttö: mkfs [-V] [-t tied.järj. tyyppi] [tied.järj.valitsimet] laite "
 "[koko]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1290,7 +1297,7 @@ msgstr "siirtyminen epäonnistui lohkojen testauksen aikana"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Outoja arvoja funktiossa do_check: todennäköisesti ohjelmistovikoja\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "siirtyminen epäonnistui funktiossa check_blocks"
 
@@ -1373,169 +1380,175 @@ msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Käytetään käyttäjän antamaa sivukokoa %d järjestelmän arvon %d sijaan\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "haarauttaminen epäonnistui\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Virheellinen sivutusotsakkeen koko, nimiötä ei kirjoitettu.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Nimiötä lyhennettiin.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "ei nimiötä, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "ei uuid:tä\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Käyttö: %s [-c] [-pSIVUKOKO] [-L nimiö] [-U UUID] /dev/nimi [lohkot]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "liian monta viallista sivua"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Muisti lopussa"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "yksi viallinen sivu\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu viallista sivua\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "i-solmuille ei voi varata puskureita"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "i-solmuille ei voi varata puskureita"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "käynnistyssektorin tyhjentäminen ei onnistu"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p    näytä BSD-osiotaulu"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s    näytä täydellinen levynimiö"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s    näytä täydellinen levynimiö"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: virhe: tuntematon versio %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "virhe: UUID:n jäsennys epäonnistui"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: virhe: Sivutustilan kohde?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: virhe: koko %lu KiB on suurempi kuin laitteen koko %lu KiB\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: virhe: sivutusalueen on oltava vähintään %ld KiB:n kokoinen\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: varoitus: typistetään sivutusalue kokoon %ld KiB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: virhe: ei yritetä luoda sivutuslaitetta kohteeseen ”%s”\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: virhe: %s on liitetty; ei tehdä sivutustilaa.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Sivutustilaa ei voi luoda: ei luettavissa"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Asetetaan sivutustila, versio %d, koko = %llu KiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: allekirjoitussivua ei voi kirjoittaa: %s"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync epäonnistui"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: selinux-tiedostonimiön hakeminen ei onnistu: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "tiedoston %s tilaa ei voi lukea"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "uuden selinux-kontekstin luominen ei onnistu"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "selinux-kontekstin laskeminen ei onnistunut"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: uudelleennimeäminen %s → %s ei onnistu: %s\n"
@@ -1600,63 +1613,114 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "virhe pysäytettäessä palvelua: ”%s”"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Ei käytettävissä"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "sivutuslaitteella ei voi siirtyä taaksepäin"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Vapaa tila"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: osiota ei ole\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: virhe: tuntematon versio %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "siirtyminen epäonnistui funktiossa write_tables"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Käyttö: %s [valitsimet] <tiedostonimi>\n"
+"\n"
+"Valitsimet:\n"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Lisätietoja manuaalisivulla wipefs(8).\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Ei käytettävissä"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Vapaa tila"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Levy on vaihdettu.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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 "
 "varmistamiseksi.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1668,228 +1732,228 @@ msgstr ""
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
 "katso lisätietoja cfdiskin manuaalisivulta.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "VAKAVA VIRHE"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Paina mitä tahansa näppäintä poistuaksesi cfdiskistä"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Levyasemalla ei voi siirtyä"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Levyasemaa ei voi lukea"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Levyasemalle ei voi kirjoittaa"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Liian monta osiota"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Osion alku on ennen sektoria 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Osion loppu on ennen sektoria 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Osion alku on levyn lopun jälkeen"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Osion loppu on levyn lopun jälkeen"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Osion loppu on viimeisellä osittaisella sylinterillä"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "loogiset osiot eivät ole levyjärjestyksessä"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "loogiset osiot ovat päällekkäiset"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "suurennetut loogiset osiot ovat päällekkäiset"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Sisäinen virhe luotaessa loogista asemaa ilman laajennettua osiota !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Tähän ei voi luoda loogista asemaa – luotaisiin kaksi laajennettua osiota"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Liian pitkä valikon kohta. Valikko voi näyttää oudolta."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Valikko ilman suuntaa. Käytetään oletuksena vaakasuuntaa."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Väärä näppäin"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Paina näppäintä jatkaaksesi"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Ensiö"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Luo uusi ensiöosio"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Looginen"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Luo uusi looginen osio"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Älä luo osiota"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Sisäinen virhe !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Koko (Mt): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Alku"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Lisää osio tyhjän tilan alkuun"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Loppu"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Lisää osio tyhjän tilan loppuun"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Laajennetun osion luomiseen ei ole tilaa"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Ei osiotaulua.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Ei osiotaulua. Aloitetaan tyhjällä taululla."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Osiotaulun allekirjoitus on virheellinen"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Tuntematon osiotaulun tyyppi"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Haluatko aloittaa tyhjällä osiotaululla [y/N]?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Annettu sylinterimäärä ei mahdu levylle"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Levyasemaa ei voi avata"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Levy avattiin vain luku -tilassa – sinulla ei ole kirjoitusoikeutta"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "Varoitus!! Havaittu ei-tuettu GPT (GUID Partition Table). Käytä GNU Partedia."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Levyn kokoa ei voi hakea"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Viallinen ensiöosio"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Viallinen looginen osio"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varoitus!! Tämä voi tuhota dataa levyltä!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr "Haluatko varmasti kirjoittaa osiotaulun levylle? (jaa tai ei):"
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "ei"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Osiotaulua ei kirjoitettu levylle"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "jaa"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Kirjoita ”jaa” tai ”ei”"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Kirjoitetaan osiotaulua levylle..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Osiotaulu kirjoitettiin levylle"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
@@ -1897,86 +1961,86 @@ msgstr ""
 "Osiotaulu kirjoitettiin, mutta uudelleenluku epäonnistui. Aja partprobe(8), "
 "kpartx(8) tai käynnistä tietokone uudelleen, jotta taulu päivittyy."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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ä."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 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ä."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Syötä tiedostonimi tai paina RETURN saadaksesi näytölle: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Tiedostoa ”%s” ei voi avata"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Levyasema: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektori 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektori %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Ei mitään"
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Ens/Loog"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Ensiö"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Looginen"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Ei mitään"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Laitteen %s osiotaulu\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Alku-      Loppu-\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1984,7 +2048,7 @@ msgstr ""
 " # Tyyppi    sektori     sektori   Siirt.    Pituus   Tied.järj. tyyppi (ID) "
 "Liput\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1992,465 +2056,465 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "          ----Alku----         ----Loppu----     Alku-     Sektorien\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 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"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- ------------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Raaka"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Näytä taulu raa'assa datamuodossa"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektorit"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Näytä taulu järjestettynä sektoreiden mukaan"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Taulu"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Näytä osiotaulu"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Älä näytä taulua"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Cfdiskin ohjeruutu"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Tämä on cfdisk, curses-pohjainen levynosiointiohjelma, "
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "jolla voi luoda, poistaa ja muuttaa kiintolevyllä "
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "olevia osioita."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright © 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Komento      Merkitys"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Muuta sylinteri-, pää- ja sektoriparametreja"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VAROITUS: Tätä valitsinta tulee käyttää vain niiden,"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             jotka tietävät mitä ovat tekemässä."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimoi nykyisen osion levynkäyttö"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Huom: Tämä saattaa tehdä osiosta epäyhteensopivan"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             mm. DOSin ja OS/2:n kanssa."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Osioille on useita erilaisia muotoja,"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             joista voit valita:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r – Raaka data (tasan se, mitä levylle kirjoitettaisiin)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s – Sektoreittain järjestetty taulu"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t – Taulu raa'assa muodossa"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Muuta tiedostojärjestelmän tyyppiä"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Muuta osiokokonäkymän yksiköitä"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Vaihtaa megatavujen, sektoreiden ja sylinterien välillä"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Koska tämä saattaa tuhota levyllä olevaa dataa, kirjoitus"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             on joko varmistettava tai peruttava kirjoittamalla ”jaa” tai"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             ”ei”"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nuoli ylös   Siirrä osoitin edelliseen osioon"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nuoli alas   Siirrä osoitin seuraavaan osioon"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Piirtää ruudun uudelleen"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Näytä tämä ohjeruutu"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Huom: Kaikki komennot voi antaa joko isoilla tai pienillä"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "kirjaimilla (paitsi taulun kirjoitus (W) )."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Sylinterit"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Muuta sylinterigeometriaa"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Päät"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Vaihda päägeometriaa"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Vaihda sektorigeometriaa"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Valmis"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Geometrian muutos valmis"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Anna sylinterien määrä: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Virheellinen sylinteriarvo"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Anna päiden määrä: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Virheellinen pääarvo"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Anna sektorien määrä uraa kohden: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Virheellinen sektorimäärä"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Anna tiedostojärjestelmän tyyppi: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa tyhjäksi"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Tiedostojärjestelmän tyyppiä ei voi muuttaa laajennetuksi"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Tunt(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Ens/Loog"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tuntematon (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Levyasema: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Koko: %lld tavua, %lld Mt"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Koko: %lld tavua, %lld.%lld Gt"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Päät: %d   Sektorit/ura: %d   Sylinterit: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nimi"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Liput"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Osiotyyppi"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Tied.järj.tyyppi"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Nimiö]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "   Sektorit"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr " Sylinterit"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr " Koko (Mt)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr " Koko (Gt)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Käynnistettävä"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Aseta nykyisen osion käynnistettävyyslippu päälle/pois"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Poista"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Poista nykyinen osio"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Muuta levyn geometriaa (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Ohje"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Näytä ohjeruutu"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimoi nykyisen osion tilankäyttö (vain asiantuntijoille)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Uusi"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Luo uusi osio tyhjästä tilasta"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Näytä"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "Tulosta osiotaulu ruudulle tai tiedostoon"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Lopeta"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Lopeta ohjelma kirjoittamatta osiotaulua"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Tyyppi"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Vaihda tiedostojärjestelmän tyyppi (DOS, Linux, OS/2, jne)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Yksiköt"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Vaihda osiokokonäytön yksiköt (Mt, sekt, syl)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Kirjoita"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Kirjoita osiotaulu levylle (tämä saattaa tuhota dataa)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Tästä osiosta ei voi tehdä käynnistettävää"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Tyhjää osiota ei voi poistaa"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Tätä osiota ei voi maksimoida"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Tämä osio on ei ole käytettävissä"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Tämä osio on jo käytössä"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Tyhjän osion tyyppiä ei voi vaihtaa"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Ei enempää osioita"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Virheellinen komento"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994-2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2522,9 +2586,9 @@ msgstr ""
 "\n"
 "BSD-nimiö laitteelle: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Komento  merkitys"
 
@@ -2544,9 +2608,9 @@ msgstr "   i    asenna esilatausohjelma"
 msgid "   l   list known filesystem types"
 msgstr "   l    listaa tunnetut tiedostojärjestelmätyypit"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m    näytä tämä valikko"
 
@@ -2558,14 +2622,14 @@ msgstr "   n    lisää uusi BSD-osio"
 msgid "   p   print BSD partition table"
 msgstr "   p    näytä BSD-osiotaulu"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q    lopeta tallentamatta muutoksia"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r    palaa päävalikkoon"
 
@@ -2608,13 +2672,13 @@ msgstr "Laitteella %s ei ole *BSD-osiota.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD-levynimiökomento (m antaa ohjeen): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Ensimmäinen %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimeinen %s tai +koko tai +kokoM tai +kokoK"
@@ -2759,7 +2823,7 @@ msgstr "sektoria/ura"
 msgid "tracks/cylinder"
 msgstr "uraa/sylinteri"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "sylinterit"
@@ -2817,7 +2881,7 @@ msgstr "Esilatausohjelma asennettu laitteelle %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Osio (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Maksimimäärä osioita on luotu\n"
@@ -2841,224 +2905,207 @@ msgstr ""
 "\n"
 "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"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"
-
-#: fdisk/fdisk.c:260
-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 ""
-"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/rd/c0d0  tai: fdisk /dev/ida/c0d0  (RAID-laitteet)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Laitetta %s ei voi lukea\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Laitteella %s ei voi siirtyä\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Laitteelle %s ei voi kirjoittaa\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-ioctl epäonnistui laitteelle %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Muistia ei voi varata enempää\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Vakava virhe\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a    aseta vain luku -lippu päälle/pois"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b    muokkaa bsd-levynimiötä"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c    aseta liitettävyyslippu päälle/pois"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d    poista osio"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l    listaa tunnetut osiotyypit"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n    lisää uusi osio"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o    luo uusi tyhjä DOS-osiotaulu"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p    näytä osiotaulu"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s    luo uusi tyhjä Sun-levynimiö"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t    vaihda osion järjestelmä-id:tä"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u    vaihda näkymä/syöteyksiköt"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v    varmista osiotaulu"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w    kirjoita taulu levylle ja poistu"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x    lisätoiminnot (vain asiantuntijoille)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a    valitse käynnistettävä osio"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b    muokkaa käynnistystiedostomerkintää"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c    valitse sgi-sivutusosio"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a    aseta käynnistettävyyslippu päälle/pois"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c    aseta dos-yhteensopivuuslippu päälle/pois"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a    muuta vaihtoehtoisten sylinterien määrää"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c    muuta sylinterien määrää"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d    näytä osiotaulun raaka data"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e    muuta sylinterikohtaisten lisäsektorien määrää"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h    muuta päiden määrää"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i    muuta lomituskerrointa"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o    muuta pyörimisnopeutta (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s    muuta sektorien määrää uraa kohden"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y    muuta fyysisten sylintereiden määrää"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b    siirrä datan alkua osiossa"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e    listaa laajennetut osiot"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g    luo IRIX (SGI) -osiotaulu"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f    korjaa osiojärjestys"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i    muuta levyn tunnistetta"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "On asetettava"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "päät"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektorit"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3067,30 +3114,11 @@ msgstr ""
 "%s%s.\n"
 "Tämän voi tehdä lisätoimintovalikosta.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " ja "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"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:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3101,38 +3129,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Virheellinen siirtymä laajennetussa ensiöosiossa\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3141,32 +3168,32 @@ msgstr ""
 "Varoitus: ei huomioida #%d:n jälkeisiä osioita.\n"
 "Ne tuhotaan jos tämä osiotaulu tallennetaan.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Varoitus: ylimääräinen linkkiosoitin osiotaulussa %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, 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"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Varoitus: tyhjä osio\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Levyn tunniste: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Levyn uusi tunniste (nykyinen 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3180,26 +3207,17 @@ msgstr ""
 "palauttaa.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Huom: sektorikoko on %d (ei %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Et pysty kirjoittamaan osiotaulua.\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3208,24 +3226,24 @@ msgstr ""
 "Tällä levyllä on sekä DOS-, että BSD-taikatavut.\n"
 "Siirry BSD-tilaan ”b”-komennolla.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, 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"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Sisäinen virhe\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ylimääräistä laajennettua osiota %d ei huomioida\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3234,7 +3252,7 @@ msgstr ""
 "Varoitus: osiotaulun %2$d virheellinen lippu 0x%1$04x korjataan "
 "kirjoitettaessa (w)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3243,21 +3261,21 @@ msgstr ""
 "\n"
 "saatiin EOF kolmesti – poistutaan..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Heksakoodi (L listaa koodit): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, oletus %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "Tuntematon jälkiliite: ”%s”.\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3266,75 +3284,80 @@ msgstr ""
 "Tunnetut:  10^N: KB (kilotavu), MB (megatavu), GB (gigatavu)\n"
 "            2^N: K  (kibitavu), M  (mebitavu), G  (gibitavu)\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Käytetään oletusarvoa %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Arvo sallitun välin ulkopuolella.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Osionumero"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varoitus: osiolla %d on tyhjä tyyppi\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valittiin osio %d\n"
 
 #
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Osioita ei ole vielä määritelty!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Kaikki ensiöosiot on jo määritelty!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "sylinteri"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektori"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Vaihdetaan näkymä/syöteyksiköiksi %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Vaihdetaan näkymä/syöteyksiköiksi %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VAROITUS: Osio %d on laajennettu osio\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "DOS-yhteensopivuuslippu on asetettu\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-yhteensopivuuslippua ei ole asetettu\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Osiota %d ei ole vielä olemassa!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3347,7 +3370,7 @@ msgstr ""
 "pitäminen ei todennäköisesti ole viisasta. Osion voi\n"
 "poistaa käyttämällä ”d”-komentoa.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3356,7 +3379,7 @@ msgstr ""
 "Osiota ei voi muuttaa laajennetuksi osioksi, eikä päinvastoin.\n"
 "Se on poistettava ensin.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3366,7 +3389,7 @@ msgstr ""
 "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:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3377,62 +3400,62 @@ msgstr ""
 "ja osion 11 tyypiksi Koko osio (6), koska IRIX odottaa sitä.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Osion %d järjestelmätyypiksi vaihdettiin %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Osion %d järjestelmätyyppinä säilyi %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyysinen=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "looginen=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Osiolla %d on eri fyysiset/loogiset loppukohdat:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Osion %i alku ei ole sylinterin rajalla:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "pitää olla (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Osion %i loppu ei ole sylinterin rajalla.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "pitää olla (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
-#, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+#: fdisk/fdisk.c:1883
+#, fuzzy, c-format
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "Osion %i alku ei ole fyysisen lohkon rajalla.\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3441,7 +3464,7 @@ msgstr ""
 "\n"
 "Levy %s: %ld Mt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3450,32 +3473,37 @@ msgstr ""
 "\n"
 "Levy %s: %ld.%ld Gt, %lld tavua\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d päätä, %llu sektoria/ura, %d sylinteriä"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", yhteensä %llu sektoria"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Yksiköt = %2$d * %3$d = %4$d -tavuiset %1$s\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "virheellinen i-solmun koko"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3484,12 +3512,12 @@ msgstr ""
 "Ei mitään tehtävää. Järjestys on jo oikea.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "Valmis.\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3500,16 +3528,16 @@ msgstr ""
 "Valittuna on todennäköisesti väärä laite.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Käynn     Alku          Loppu    Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Laite"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3518,7 +3546,7 @@ msgstr ""
 "\n"
 "Osiotaulumerkinnät eivät ole levyjärjestyksessä\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3529,89 +3557,89 @@ msgstr ""
 "Levy %s: %d päätä, %llu sektoria, %d sylinteriä\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varoitus: osio %d sisältää sektorin 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Osio %d: pää %d on suurempi kuin maksimi %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Osio %d: sektori %d on suurempi kuin maksimi %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varoitus: virheellinen datan alkukohta osiossa %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varoitus: osio %d ja osio %d ovat (osittain) päällekkäiset.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varoitus: osio %d on tyhjä\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 "Varattujen sektoreiden kokonaismäärä %llu on suurempi kuin maksimi %llu\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld varaamatonta %d-tavuista sektoria\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektori %llu on jo varattu\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Ei vapaita sektoreita käytettävissä\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Viimeinen %1$s, +%2$s tai +koko{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3624,7 +3652,7 @@ msgstr ""
 "\tuusi DOS-osiotaulu. (Komento o.)\n"
 "\tVAROITUS: Uuden osiotaulun luominen tuhoaa levyn nykyisen sisällön.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3637,22 +3665,22 @@ msgstr ""
 "\tuusi DOS-osiotaulu. (Komento o.)\n"
 "\tVAROITUS: Uuden osiotaulun luominen tuhoaa levyn nykyisen sisällön.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Kaikki loogiset osiot ovat käytössä\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Lisätään ensiöosio\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3663,20 +3691,20 @@ msgstr ""
 "   %s\n"
 "   p    ensiöosio (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l    looginen (5 tai yli)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e    laajennettu"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Virheellinen osionumero tyypille ”%c”\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3685,12 +3713,12 @@ msgstr ""
 "Osiotaulua on muutettu!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kutsutaan osiotaulun uudelleen lukeva ioctl().\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3703,7 +3731,7 @@ msgstr ""
 "Ydin käyttää edelleen vanhaa taulua. Uusi taulu tulee käyttöön seuraavassa\n"
 "käynnistyksessä, tai ajamalla partprobe(8) tai kpartx(8)\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3715,7 +3743,7 @@ msgstr ""
 "VAROITUS: Jos DOS 6.x -osioita luotiin tai muutettiin,\n"
 "katso lisätietoja fdiskin manuaalisivulta.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3724,42 +3752,42 @@ msgstr ""
 "\n"
 "Virhe suljettaessa tiedostoa\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Osiolla %d ei ole data-aluetta\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Uusi datan alku"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Asiantuntijakomento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Sylinterien määrä"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Päiden määrä"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Sektorien määrä"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varoitus: asetetaan sektorisiirtymä DOS-yhteensopivuutta varten\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3772,32 +3800,32 @@ msgstr ""
 "GPT:tä. Käytä GNU Partediä.\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Levy %s ei sisällä kelvollista osiotaulua\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tuntematon komento\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3806,17 +3834,17 @@ msgstr ""
 "Varoitus: valitsinta -b (sektorikoon asetus) tulee käyttää yhden annetun "
 "laitteen kanssa\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Komento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3825,16 +3853,16 @@ msgstr ""
 "\n"
 "Nykyinen käynnistystiedosto on: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Anna uuden käynnistystiedoston nimi: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Käynnistystiedosto muuttumaton\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3924,15 +3952,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux-sivutus"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linuxmainen"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4067,7 +4095,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Levyllä on useampi kuin yksi kokolevymerkintä.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Ei määriteltyjä osioita\n"
@@ -4171,7 +4199,7 @@ msgstr ""
 "Vain ”SGI volume” -kokolevyosuus voi rikkoa tätä sääntöä.\n"
 "Kirjoita JAA, jos olet varma tämän osion merkitsemisestä toisin.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "JAA\n"
 
@@ -4228,7 +4256,7 @@ msgstr ""
 "tietenkään voida palauttaa.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4249,55 +4277,55 @@ msgstr "Yritetään säilyttää osion %d parametrit.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tALKU=%d\tPITUUS=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Koko levy"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt sectors"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS reserved"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4311,28 +4339,28 @@ msgstr ""
 "osiot tai pakottamaan tuoreen nimiön \n"
 "(s-komento päävalikossa)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Havaittiin sun-levynimiö, jolla on väärä versio [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Havaittiin sun-levynimiö, jolla on väärä sanity-arvo [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Havaittiin sun-levynimiö, jolla on väärä num_partitions-arvo [%u].\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
 msgstr "Varoitus: Väärät arvot korjataan kirjoitettaessa (w)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4345,31 +4373,31 @@ msgstr ""
 "tietenkään ole palautettavissa.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektoreita/ura"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Osion %d loppu ei ole sylinterin rajalla\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, 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"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Käyttämätöntä tilaa – sektorit 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Käyttämätöntä tilaa – sektorit %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4378,7 +4406,7 @@ msgstr ""
 "Muut osiot käyttävät jo koko levyn.\n"
 "Poista/kutista joitakin ennen uutta yritystä.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4387,12 +4415,12 @@ msgstr ""
 "On erittäin suositeltavaa, että kolmas osio kattaa koko levyn ja\n"
 "on tyyppiä ”Koko levy”\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4402,7 +4430,7 @@ msgstr ""
 "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:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4411,7 +4439,7 @@ 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"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4425,12 +4453,12 @@ msgstr ""
 "Kirjoita JAA, jos olet erittäin varma, että haluat osion tyypiksi\n"
 "merkittävän 82 (Linux-sivutus): "
 
-#: fdisk/fdisksunlabel.c:581
-#, c-format
+#: fdisk/fdisksunlabel.c:576
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4447,11 +4475,11 @@ msgstr ""
 "Yksiköt = %13$d * 512 -tavuiset %12$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4460,28 +4488,28 @@ msgstr ""
 "Yksiköt = %6$d * 512 -tavuiset %5$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Lippu   Alku        Loppu  Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Vaihtoehtoisten sylinterien määrä"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Ylimääräisiä sektoreita sylinterillä"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Lomituskerroin"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Pyörimisnopeus (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Fyysisten sylinterien määrä"
 
@@ -4690,6 +4718,10 @@ msgstr "Minix/vanha Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux-sivutus / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 kätketty C:-asema"
@@ -5312,93 +5344,93 @@ msgstr "valitsin -n oli annettu: Mitään ei muutettu\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Vanhojen sektoreiden tallennus epäonnistui – keskeytetään\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "liian pitkä tai epätäydellinen syöterivi – lopetetaan\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "syötevirhe: kentän %s jälkeen odotetaan löytyvän ”=”\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "syötevirhe: odottamaton merkki %c kentän %s jälkeen\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "tunnistamaton syöte: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "liian suuri luku\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "roskaa numeron perässä\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "ei tilaa osiokahvalle\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "ympäröivää laajennettua osiota ei voi rakentaa\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "liian monta syötekenttää\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Ei enempää tilaa\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Virheellinen tyyppi\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Varoitus: annettu koko (%lu) ylittää suurimman sallitun koon (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Varoitus: tyhjä osio\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varoitus: virheellinen osion alku (aikaisintaan %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "tunnistamaton ”käynnistettävä”-lippu – valitse - tai *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "osittainen c,h,s-määritys?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Laajennettu osio ei ole odotetussa paikassa\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "virheellinen syöte\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "liian monta osiota\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5408,100 +5440,100 @@ msgstr ""
 "<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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "laite: esimerkiksi /dev/hda tai /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "hyödylliset valitsimet:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [tai --show-size]: näytä osion koko"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [tai --id:        näytä tai muuta osio-id"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [tai --list]:     listaa kaikkien laitteiden osiot"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [tai --dump]:     sama kuin edellä, muoto sopiva syötteeksi"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 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"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 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"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [tai --list-types]:listaa tunnetut osiotyypit"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [tai --DOS]:      DOS-yhteensopivuutta varten; tuhlaa vähän tilaa"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [tai --re-read]:  käske ytimen lukea osiotaulu uudelleen"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                muuta vain osiota numero #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 älä kirjoita levylle oikeasti"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O tiedosto :        tallenna ylikirjoitettavat sektori tiedostoon"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I tiedosto :        palauta nämä sektorit"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [tai --version]:  näytä versio"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [tai --help]:     näytä tämä viesti"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "vaaralliset valitsimet:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [tai --show-geometry]: näytä ytimen käsitys geometriasta"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr "    -G [tai --show-pt-geometry]: näytä osiotausta päätelty geometria"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5509,60 +5541,60 @@ msgstr ""
 "    -x [tai --show-extended]: listaa myös laajennetut osiot tulosteessa\n"
 "                             tai odota syötteestä niiden kahvoja"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [tai --Linux]:     älä huomauta Linuxissa merkityksettömistä asioista"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [tai --quiet]:     vaienna varoitusviestit"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Voit ohittaa tunnistetun geometrian käyttämällä:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [tai --cylinders #]:aseta käytettävä sylinterien määrä"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -h# [tai --heads #]:    aseta käytettävä päiden määrä"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [tai --sectors #]:  aseta käytettävä sektorien määrä"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Kaikki tarkistukset voi ohittaa valitsimella:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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ää"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5575,67 +5607,67 @@ msgstr ""
 "GPT:tä. Käytä GNU Partediä.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Käytä --force -valitsinta ohittaaksesi tämän tarkistuksen.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "ei komentoa?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "yhteensä: %llu lohkoa\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "käyttö: sfdisk --print-id laite osionumero\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "käyttö: sfdisk --change-id laite osionumero Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "käyttö: sfdisk --id laite osionumero [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "laitetta %s ei voi avata lukua-kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "laitetta %s ei voi avata lukua varten\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Laitteen %s kokoa ei voida hakea\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5643,7 +5675,7 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5652,35 +5684,35 @@ 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"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, 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"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Virheellinen Id %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Levy on tällä hetkellä käytössä.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Vakava virhe: laitetta %s ei löydy\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varoitus: %s ei ole lohkolaite\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Tarkistetaan, että kukaan ei käytä levyä juuri nyt...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5693,30 +5725,30 @@ msgstr ""
 "(komento umount) ja kaikki levyllä olevat sivutusosiot (komento swapoff).\n"
 "Käytä valitsinta --no-reread tämän testin ohittamiseen.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Käytä --force -valitsinta ohittaaksesi kaikki tarkistukset.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vanha tilanne:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Osiota %d ei ole olemassa, sitä ei voi muuttaa\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Uusi tilanne:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5724,21 +5756,21 @@ msgstr ""
 "En pidä näistä osioista – mitään ei muutettu.\n"
 "(Jos todella haluat tätä, käytä valitsinta --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "En pidä tästä – kannattaa todennäköisesti vastata ”No”\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Oletko tyytyväinen tähän? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Haluatko kirjoittaa tämän levylle? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5747,16 +5779,16 @@ msgstr ""
 "\n"
 "sfdisk: ennenaikainen syötteen loppu\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Lopetetaan – mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Vastaa joko y, n tai q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5765,7 +5797,7 @@ msgstr ""
 "Uusi osiotaulu kirjoitettiin onnistuneesti\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5776,17 +5808,17 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Katso fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "VAROITUS: tiedostoa %s ei voi avata: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5794,117 +5826,117 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr "fsck: %s: ei löytynyt\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: virhe %d purettaessa! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: tiedostojärjestelmän tyyppi on annettava"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s ei ole lp-laite.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Pakotetaan tiedostojärjestelmän tarkistus laitteella %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "Käyttö: fsck [-AMNPRTV] [ -C [ fd ] ] [-t tied.järj. tyyppi] [tied.järj."
 "valitsimet] [tied.järj. ...]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: liian monta laitetta\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Laitetta %s ei voi avata: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "Onkohan /proc liitetty?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Irrotetaan jäljellä olevat tiedostojärjestelmät..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: tuntematon argumentti: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s paketista %s%s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "I-solmuille ei voi varata puskuria"
@@ -6411,7 +6443,13 @@ msgstr "Käyttökelpoista kellorajapintaa ei löytynyt.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Järjestelmäkellon asetus ei onnistu.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6423,40 +6461,40 @@ msgstr ""
 "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:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Ytimeltä ei saada epoch-arvoa.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Ydin olettaa epoch-arvoksi %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, 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"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Ei aseteta epoch-arvoksi %d – vain kokeilu.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Ytimen epoch-arvoa ei voi asettaa.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s – %s\n"
 
-#: hwclock/hwclock.c:1311
-#, c-format
+#: hwclock/hwclock.c:1325
+#, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -6474,6 +6512,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6534,7 +6573,7 @@ msgstr ""
 "  -D | --debug        vianetsintätila\n"
 "\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6545,17 +6584,17 @@ msgstr ""
 "       kertoo hwclockille Alphan tyypin (ks. hwclock(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "%s: Audit-järjestelmään yhdistäminen ei onnistu\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6564,7 +6603,7 @@ msgstr ""
 "Monta toimintoa määritelty.\n"
 "Vain yksi toiminto voidaan suorittaa kerrallaan.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6573,7 +6612,7 @@ msgstr ""
 "%s: Valitsimet --utc ja --localtime ovat toisensa poissulkevat. Annoit "
 "molemmat.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6582,7 +6621,7 @@ msgstr ""
 "%s: Valitsimet --adjust ja --noadjfile ovat toisensa poissulkevat. Käytit "
 "molempia.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6591,29 +6630,29 @@ msgstr ""
 "%s: Valitsimet --adjfile ja --noadjfile ovat toisensa poissulkevat. Käytit "
 "molempia.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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 --"
 "localtime\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ei käyttökelpoista aikaa asetettavaksi. Kelloa ei voida asettaa.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Valitettavasti vain pääkäyttäjä voi säätää laitteistokelloa.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Valitettavasti vain pääkäyttäjä voi säätää järjestelmäkelloa.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6622,12 +6661,12 @@ msgstr ""
 "Valitettavasti vain pääkäyttäjä voi säätää laitteistokellon epoch-arvoa "
 "ytimessä.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, 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"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6920,12 +6959,12 @@ msgstr "%s: Tiedoston /etc/passwd oletusympäristöä ei voi asettaa"
 msgid "Changing finger information for %s.\n"
 msgstr "Vaihdetaan käyttäjän %s finger-tiedot.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM-virhe, keskeytetään: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7152,35 +7191,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "VAKAVAA: päätettä ei voi avata uudelleen: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s ei ole lohkolaite"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "VAKAVAA: virheellinen pääte"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h on vain pääkäyttäjälle.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "käyttö: login [-fp] [käyttäjänimi]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAMia ei voitu alustaa: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "tunnus: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, 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"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7189,18 +7233,18 @@ msgstr ""
 "Kirjautuminen epäonnistui\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, 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"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7209,7 +7253,7 @@ msgstr ""
 "\n"
 "Kirjautuminen epäonnistui\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7218,120 +7262,120 @@ msgstr ""
 "\n"
 "Istunnon aloitusongelma, keskeytys.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Käyttäjänimi on NULL funktiossa %s, rivillä %d. Keskeytys."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Virheellinen käyttäjänimi ”%s” funktiossa %s, rivillä %d. Keskeytys."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Muisti lopussa\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Virheellinen käyttäjänimi"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Käyttäjän %s kirjautuminen hylätty tällä päätteellä.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, 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"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "KÄYTTÄJÄN %s KIRJAUTUMINEN HYLÄTTIIN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Virheellinen kirjautuminen\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "KÄYTTÄJÄN %2$s MODEEMIYHTEYS PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s OSOITTEESTA %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "PÄÄKÄYTTÄJÄN KIRJAUTUMINEN PÄÄTTEELLÄ %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, 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"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "KÄYTTÄJÄN %2$s KIRJAUTUMINEN PÄÄTTEELLÄ %1$s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Sinulle on uutta postia.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Sinulle on postia.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: virhe haarautettaessa: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY epäonnistui: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() epäonnistui"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Ei hakemistoa %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Kirjaudutaan käyttäen kotihakemistona ”/”.\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ei muistia kuoriskriptille.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kuoriskriptiä ei voitu käynnistää: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ei kuorta: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7340,65 +7384,65 @@ msgstr ""
 "\n"
 "%s, kirjautuminen: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "tunnus aivan liian pitkä.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NIMI liian pitkä"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "tunnukset eivät voi alkaa merkillä ”-”.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "liian monta peräkkäistä rivinvaihtoa.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "LIIKAA rivinvaihtoja"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Kirjautuminen aikakatkaistiin %d sekunnin jälkeen\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Edellinen kirjautuminen: %.*s"
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "osoitteesta %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "päätteeltä %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "EPÄONNISTUNUT KIRJAUTUMINEN OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "EPÄONNISTUNUT KIRJAUTUMINEN PÄÄTTEELTÄ %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA PÄÄTTEELTÄ %s, %s"
@@ -7655,8 +7699,8 @@ msgid "no TERM or cannot stat tty\n"
 msgstr "TERM-muuttujaa ei ole tai päätteen tilaa ei voi lukea\n"
 
 #: login-utils/simpleinit.c:938
-#, c-format
-msgid "error stopping service: \"%s\"\n"
+#, fuzzy, c-format
+msgid "error at stopping service \"%s\"\n"
 msgstr "virhe pysäytettäessä palvelua: ”%s”\n"
 
 #: login-utils/simpleinit.c:950
@@ -7665,9 +7709,9 @@ msgid "Stopped service: %s\n"
 msgstr "Pysäytetään palvelua: ”%s”\n"
 
 #: login-utils/simpleinit.c:1070
-#, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "Virhe ajettaessa ohjelmaa: ”%s”\n"
+#, fuzzy, c-format
+msgid "error at starting service \"%s\"\n"
+msgstr "virhe pysäytettäessä palvelua: ”%s”\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7795,25 +7839,25 @@ msgstr "%s: väliaikaistiedoston tilaa ei voi lukea.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "virheellinen päivän arvo: käytä 1-%d"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "virheellinen kuukauden arvo: käytä 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "virheellinen vuoden arvo: käytä 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "käyttö: cal [-13smjyV] [[[päivä] kuukausi] vuosi]\n"
@@ -7837,6 +7881,115 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "laitetta %s ei voi avata"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Tuntematon komento: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "Puskuria ei voi varata.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "Puskuria ei voi varata.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: tiedostoa %s ei voi lukea.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: kirjoitusvirhe: %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Lisätietoja manuaalisivulla namei(1).\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Ei hakemistoa %s!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "Puskuria ei voi varata.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "Puskuria ei voi varata.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "Puskuria ei voi varata.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "Puskuria ei voi varata.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7994,7 +8147,7 @@ msgstr "%s: uudelleennimeäminen %s → %s epäonnistui: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "käyttö: %s lähde kohde tiedostot...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8005,37 +8158,37 @@ msgstr ""
 "Käytä ”%s [valitsimet] %s” jos todella haluat käyttää sitä.\n"
 "Skriptiä ei käynnistetty.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "käyttö: script [-a] [-f] [-q] [-t] [tiedosto]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skripti käynnistetty, tiedosto on %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s: kirjoitusvirhe %d: %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Skripti käynnistetty %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s: kirjoitusvirhe: %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: tiedostolle %s ei löydy laitetta\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8044,17 +8197,17 @@ msgstr ""
 "\n"
 "Skripti suoritettu %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skripti suoritettu, tiedosto on %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty epäonnistui\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Pty:t lopussa\n"
@@ -8399,6 +8552,16 @@ msgstr "luettiin %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: avaaminen epäonnistui: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "tiedoston %s tilaa ei voi lukea"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8429,6 +8592,11 @@ msgstr "Virhe luettaessa %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "virheellinen valitsin"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8446,7 +8614,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8466,12 +8634,12 @@ msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8499,77 +8667,72 @@ msgstr "Käyttö: %s [valitsimet] laite ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM hak ... -f ] nimi...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
 msgstr "calloc epäonnistui"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
 msgstr "strdup epäonnistui"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr ""
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "virhe: UUID:n jäsennys epäonnistui"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Levy %s ei sisällä kelvollista osiotaulua\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "openpty epäonnistui\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "tavut"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty epäonnistui\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Virheellinen asetettu arvo: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Käyttö: %s [valitsimet] <tiedostonimi>\n"
-"\n"
-"Valitsimet:\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, c-format
 msgid ""
 "\n"
@@ -8578,7 +8741,7 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla wipefs(8).\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8824,7 +8987,7 @@ msgstr "loop: laitetta %s ei voi poistaa: %s\n"
 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"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8844,7 +9007,7 @@ msgstr ""
 "  %s -f                                                # etsi vapaa\n"
 "  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8860,251 +9023,295 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Virheellinen asetettu arvo: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Virheellinen asetettu arvo: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop-laite on %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: laite on varattu"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, 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"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr "mount: väärin suojattu valitsinmerkkijono ”%s”"
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: muunnettiin %s ”%s” arvoon ”%s”\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: mtab-tiedoston mukaan %s on jo liitetty pisteeseen %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: mtab-tiedoston mukaan %s on liitetty pisteeseen %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: tiedostoa %s ei voi avata kirjoittamista varten: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: virhe kirjoitettaessa %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: virhe muutettaessa tiedoston %s tilaa: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: ryhmä-id:tä voi asettaa: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: käyttäjä-id:tä ei voi asettaa: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: haarauttaminen ei onnistu: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Kokeillaan %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: et antanut tyyppiä tiedostojärjestelmälle %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Kokeillaan kaikkia tiedostoissa %s ja %s mainittuja tyyppejä\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       ja tämä näyttää olevan sivutustilaa\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Kokeillaan tyyppiä %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vaikuttaa olevan sivutustilaa – ei liitetä"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "liittäminen epäonnistui"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: vain root voi liittää %s pisteeseen %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: loop-laite annettu kahdesti"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: tyyppi annettu kahdesti"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ohitetaan loop-laitteen asettaminen\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Virheellinen asetettu arvo: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Virheellinen asetettu arvo: %s\n"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 "mount: mtab-tiedoston mukaan %s on jo liitetty pisteeseen %s loop-laitteena"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: aiotaan käyttää loop-laitetta %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop-laitteen asettaminen epäonnistui\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop-laite asetettiin onnistuneesti\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ei löytynyt %s – luodaan se..\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: tiedostoa %s ei voi avata: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argumentin valitsimelle -p tai --pass-fd on oltava luku"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: tiedostoa %s ei voi avata nopeuden asetusta varten"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: nopeutta ei voi asettaa: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: mtabin mukaan %s on jo liitetty pisteeseen %s\n"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s on varattu – uudelleenliitettiin vain luku -tilassa\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s on varattu – uudelleenliitettiin vain luku -tilassa\n"
+
+#: mount/mount.c:1482
 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 "
 "annettu"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: tiedostojärjestelmän tyyppi on annettava"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: liitos epäonnistui"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: liitospiste %s ei ole hakemisto"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: lupa evätty"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mountin käyttöön vaaditaan pääkäyttäjän oikeudet"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s on varattu"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc on jo liitetty"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s on jo liitetty tai %s on varattu"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: liitospiste %s ei ole olemassa"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: liitospiste %s on symlinkki olemattomaan"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: erikoislaite %s ei ole olemassa"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9113,12 +9320,12 @@ msgstr ""
 "mount: erikoislaite %s ei ole olemassa\n"
 "       (polun etuliite ei ole hakemisto)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ei ole vielä liitetty, tai virheellinen valitsin"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9128,13 +9335,13 @@ msgstr ""
 "       superlohko laitteella %s, puuttuva koodisivu tai apuohjelma, tai muu "
 "virhe"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9142,7 +9349,7 @@ 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9150,7 +9357,7 @@ msgstr ""
 "       (etkö yritäkin liittää laajennettua osiota, etkä\n"
 "       sen sisältämää loogista osiota?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9158,109 +9365,104 @@ msgstr ""
 "       Joissakin tapauksissa järjestelmälokista löytyy hyödyllistä\n"
 "       tietoa – kokeile esim. komentoa ”dmesg | tail”.\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "liitostaulukko täynnä"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superlohkoa ei voi lukea"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: tuntematon laite"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: tuntematon tiedostojärjestelmän tyyppi ”%s”"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: tarkoitat todennäköisesti %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: ehkä tarkoitit ”iso9660”?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: ehkä tarkoitit ”vfat”?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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 "
 "ole tuettu"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ei ole lohkolaite, ja tilan luku epäonnistuu?"
 
-#: mount/mount.c:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: ydin ei tunnista tiedostoa %s lohkolaitteeksi\n"
 "       (ehkä ”insmod ajuri” auttaa?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s ei ole lohkolaite (yritä ”-o loop”?)"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ei ole lohkolaite"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ei ole kelvollinen lohkolaite"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "lohkolaite "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, 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:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: ei voi liittää %s%s vain luku -tilassa"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s on kirjoitussuojattu, liitetään vain luku -tilassa"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: ei löytynyt %s – luodaan se..\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s on jo liitetty paikkaan %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9270,26 +9472,26 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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 "
 "nfs\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: tyyppiä ei annettu – //-alkuliitteen perusteella sen oletetaan olevan "
 "cifs\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s on jo liitetty paikkaan %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9358,39 +9560,39 @@ msgstr ""
 "Muut valitsimet: [-nfFrsvw] [-o valitsimet] [-p kahva].\n"
 "Paljon lisätietoja komennolla:  man 8 mount .\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: vain root voi tehdä tuon"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: vain root voi tehdä tuon"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "mitään ei liitetty"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: osiota ei löydy"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s ei löydy tiedostosta %s, eikä %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: varoitus: tiedoston %s lopussa ei ole rivinvaihtoa\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: rivi %d tiedostossa %s on virheellinen%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; loput tiedostosta jätetään huomioimatta"
 
@@ -9403,7 +9605,7 @@ msgstr "ohjelmistovika xstrndup-kutsussa"
 msgid "not enough memory"
 msgstr "muisti ei riitä"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9414,7 +9616,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -9436,7 +9638,7 @@ msgstr ""
 " %1$s -V                            näytä versio\n"
 "\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9455,129 +9657,134 @@ msgstr ""
 " %1$s -V                           näytä versio\n"
 "\n"
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: %s: odottamaton tiedostomuoto\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "haarauttaminen epäonnistui\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "käynnistys epäonnistui\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() epäonnistui"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "siirtyminen epäonnistui"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Nimi"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s epäonnistui.\n"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: varoitus: tiedostolla %s on turvattomat oikeudet %04o, suositellaan %"
 "04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: Ohitetaan tiedosto %s – siinä vaikuttaa olevan reikiä.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "siirtyminen epäonnistui"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s laitteella %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s epäonnistui.\n"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: tiedostolle %s ei löydy laitetta\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "Et ole pääkäyttäjä.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s epäonnistui.\n"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9587,37 +9794,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: käännetty ilman tukea valitsimelle -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: ryhmä-id:tä ei voi asettaa: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: käyttäjä-id:tä ei voi asettaa: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: haarauttaminen ei onnistu: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: virheellinen lohkolaite"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ei ole liitettynä"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superlohkoa ei voi kirjoittaa"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9625,52 +9832,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: ei löydy"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: vaaditaan pääkäyttäjän oikeudet"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: lohkolaitteita ei sallita tiedostojärjestelmässä"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ohjelmaa umount2 ei ole, kokeillaan ohjelmaa umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s on varattu – uudelleenliitettiin vain luku -tilassa\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 "umount: kohteen %s uudelleenliittäminen vain luku -tilassa epäonnistui\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s irrotettu\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: irrotettavien tiedostojärjestelmien listaa ei löydy"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9682,80 +9889,85 @@ msgstr ""
 "valitsimet]\n"
 "        umount [-d] [-f] [-r] [-n] [-v] erikoistied | solmu...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Kohdetta ”” ei voi irrottaa\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Yritetään irrottaa %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s ei löytynyt tiedostosta mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ei ole liitetty (mtab-tiedoston mukaan)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s vaikuttaa olevan liitettynä useita kertoja"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, 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)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s on ristiriidassa tiedoston fstab kanssa"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: vain %s voi irrottaa laitteen %s paikasta %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: vain root voi tehdä tämän"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9763,77 +9975,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "tuntemattomassa "
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS yli TCP:n ei ole tuettu.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "ncount"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Uusi"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
@@ -9856,7 +10087,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9885,11 +10116,121 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "käynnistys epäonnistui\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Käyttö: %s [valitsimet] <ohjelma> [arg...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Lisätietoja manuaalisivulla namei(1).\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "laitteen %s kokoa ei voi hakea"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "calloc epäonnistui"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "Osion kirjoitus epäonnistui laitteelle %s"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: avaaminen epäonnistui: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "Osion kirjoitus epäonnistui laitteelle %s"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "siirtymisvirhe"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "siirtymisvirhe"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " ja "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10030,7 +10371,18 @@ msgstr ""
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "käyttö: %s [-c] [-n taso] [-s puskurin_koko]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Käyttö: %s [valitsimet] <tiedostonimi>\n"
+"\n"
+"Valitsimet:\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10039,7 +10391,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
@@ -10048,31 +10400,36 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla fallocate(1).\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Liian vähän argumentteja"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Virheellinen asetettu arvo: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Virheellinen asetettu arvo: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Valitsinta --date ei ole annettu.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "segmenttejä enintään = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty epäonnistui\n"
@@ -10119,6 +10476,64 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "haarauttaminen epäonnistui\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Käyttö: %s [valitsimet] <tiedostonimi>\n"
+"\n"
+"Valitsimet:\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Lisätietoja manuaalisivulla wipefs(8).\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Valitsinta --date ei ole annettu.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Valitsinta --date ei ole annettu.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s epäonnistui.\n"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "juuren i-solmu ei ole hakemisto"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "openpty epäonnistui\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "openpty epäonnistui\n"
+
 #: sys-utils/ipcmk.c:84
 #, c-format
 msgid ""
@@ -10211,479 +10626,457 @@ msgstr ""
 "käyttö: %s [ [-q vstjno-id] [-m jmuisti-id] [-s semid]\n"
 "           [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: virheellinen valitsin – %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: virheellinen avain (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 #, fuzzy
 msgid "permission denied for key"
 msgstr "mount: lupa evätty"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 #, fuzzy
 msgid "unknown error in key"
 msgstr "%s: Tuntematon virhe tiedostossa %s\n"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 #, fuzzy
 msgid "permission denied for id"
 msgstr "mount: lupa evätty"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "virheellinen id"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 #, fuzzy
 msgid "unknown error in id"
 msgstr "%s: Tuntematon virhe tiedostossa %s\n"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: tuntematon argumentti: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "käyttö : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h näyttää ohjeen.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:127
 #, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : semaforit\n"
-"\t-a : kaikki (oletus)\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
 #, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
-"Tulostusmuoto:\n"
-"\t-t : aika\n"
-"\t-p : pid\n"
-"\t-c : luoja\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : rajat\n"
-"\t-u : tiivistelmä\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Jaetun muistin rajat --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "segmenttejä enintään = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "segmentin enimmäiskoko (ktavua) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "jaettua muistia yhteensä enintään (ktavua) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "segmentin vähimmäiskoko (tavua) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Jaetun muistin tila ---------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "jmuisti-id"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "oikeudet"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "omistaja"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr ""
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr ""
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 #, fuzzy
 msgid "changed"
 msgstr "Kuori vaihdettu.\n"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr ""
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
+msgstr "------ Jaetun muistin tila ---------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Jaetun muistin segmentit ------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "avain"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "tavut"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "liit-määrä"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "status"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Ei asetettu"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "kohde"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "lukittu"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------- Semaforien rajat -------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "taulukkoja enintään = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "semaforeja taulukossa enintään = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "semaforeja järjestelmässä enintään = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "operaatioita semop-kutsua kohden enintään = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "semaforin arvo enintään = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------- Semaforien tila --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "käytettyjä taulukoita = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "varattuja semaforeja = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "----- Semaforitaulukoiden Luojat/Omistajat -----\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ Semaforien Operaatio-/Muutosajat --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr ""
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 #, fuzzy
 msgid "last-changed"
 msgstr "Salasanaa ei vaihdettu."
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Semaforitaulukot --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 #, fuzzy
 msgid "nsems"
 msgstr "käyttäjää"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------- Viestien rajat ---------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "jonoja järjestelmässä enintään = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "viestin koko enintään (tavua) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "jonon oletusenimmäiskoko (tavua) = %d\n"
 
 # Ilman kaksoispistettä Status-otsikoiden yhtenäisyyden vuoksi
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------- Viestien tila --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "varattuja jonoja = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "käytettyjä otsakkeita = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "käytettyä tilaa = %d tavua\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------- Viestijonot: Luojat/Omistajat ----------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "vstjno-id"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "----- Viestijonot: Läh.-/Vast.otto-/Muutosajat ------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "send"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "recv"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr ""
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------- Viestijonot: PIDit --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "-------- Viestijonot ---------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "käyt-tavut"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "viestit"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
 msgstr "shmctl epäonnistui"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10692,42 +11085,42 @@ msgstr ""
 "\n"
 "Jaetun muistin segmentti jmuisti-id=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync epäonnistui"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10736,187 +11129,211 @@ msgstr ""
 "\n"
 "Viestijonon msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "siirtyminen epäonnistui"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "value"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "virheellinen id: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "virheellinen nopeus: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach – %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "virheellinen valitsin"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "virheellinen id: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ei ole lohkolaite"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "laitteen %s kokoa ei voi hakea"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Levyasemalla ei voi siirtyä"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "laitetta %s ei voi avata"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Ei mitään"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "Virhe säännöllisessä lausekkeessa: "
+msgid "error: cannot open %s"
+msgstr "%s: tiedostoa %s ei voi avata\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "virhe luettaessa tiedostoa %s\n"
+msgid "failed to read: %s"
+msgstr "tiedoston %s tilaa ei voi lukea"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "siirtymisvirhe"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "Puskuria ei voi varata.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: avaaminen epäonnistui: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr "virhe: UUID:n jäsennys epäonnistui"
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+#, fuzzy
+msgid "error: calloc failed"
 msgstr "virhe: malloc epäonnistui"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr "virhe: /sys-tiedostojärjestelmä ei ole käytettävissä."
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10925,70 +11342,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Vanha tilanne:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10997,67 +11427,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr "virhe: vaihda työhakemistoksi %s."
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "käyttö: rdev [ -rv ] [ -o SIIRTYMÄ ] [ VEDOS [ VALUE [ SIIRTYMÄ ] ] ]"
-
-#: sys-utils/rdev.c:78
-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"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         asettaa JUUREKSI /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              aseta JUURILIPUT (vain luku -tila)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            aseta RAM-levyn koko"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              aseta käynnistyksen NÄYTTÖTILA"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   käytä tavusiirtymää N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   sama kuin rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     sama kuin rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     sama kuin rdev -v"
-
-#: sys-utils/rdev.c:87
-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, "
-"2=avain2,..."
-
-#: sys-utils/rdev.c:88
-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."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "puuttuva pilkku"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11179,11 +11548,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: vanha prioriteetti %d, uusi prioriteetti %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11193,104 +11563,129 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: tunnistamaton virransäästötila ”%s”\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: virheellinen aikaväli %s sekuntia\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: virheellinen time_t-arvo %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: versio %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: oletetaan RTC:n käyttävän UTC:tä...\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Käytetään UTC-aikaa.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "Käytetään paikallista aikaa.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: herätysaika on annettava\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "malloc() epäonnistui"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s ei ole lp-laite.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: uudelleennimeäminen %s → %s ei onnistu: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "virhe rtc:tä luettaessa"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11392,6 +11787,11 @@ msgstr "%s: virheellinen arvo\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s ei ole lp-laite.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "LPGETIRQ-virhe"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11422,6 +11822,11 @@ msgstr ", on-line"
 msgid ", error"
 msgstr ", virhe"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: liitos epäonnistui"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ-virhe"
@@ -11467,6 +11872,16 @@ msgid "unshare failed"
 msgstr "siirtyminen epäonnistui"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: ryhmä-id:tä voi asettaa: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: käyttäjä-id:tä ei voi asettaa: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "käynnistys epäonnistui\n"
@@ -11988,6 +12403,203 @@ msgstr "Syöterivi on liian pitkä.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: virheellinen valitsin – %c\n"
+
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "Virhe ajettaessa ohjelmaa: ”%s”\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Virheellinen asetettu arvo: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "ncount"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Uusi"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "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"
+
+#~ 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 ""
+#~ "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/rd/c0d0  tai: fdisk /dev/ida/c0d0  (RAID-laitteet)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "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"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: ei löytynyt %s – luodaan se..\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "käynnistys epäonnistui\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "käyttö : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h näyttää ohjeen.\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semaforit\n"
+#~ "\t-a : kaikki (oletus)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Tulostusmuoto:\n"
+#~ "\t-t : aika\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : luoja\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : rajat\n"
+#~ "\t-u : tiivistelmä\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "Virhe säännöllisessä lausekkeessa: "
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "virhe luettaessa tiedostoa %s\n"
+
+#~ msgid "error: /sys filesystem is not accessable."
+#~ msgstr "virhe: /sys-tiedostojärjestelmä ei ole käytettävissä."
+
+#~ msgid "error: change working directory to %s."
+#~ msgstr "virhe: vaihda työhakemistoksi %s."
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "käyttö: rdev [ -rv ] [ -o SIIRTYMÄ ] [ VEDOS [ VALUE [ SIIRTYMÄ ] ] ]"
+
+#~ 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"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         asettaa JUUREKSI /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              aseta JUURILIPUT (vain luku -tila)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            aseta RAM-levyn koko"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              aseta käynnistyksen NÄYTTÖTILA"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   käytä tavusiirtymää N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   sama kuin rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     sama kuin rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     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, 2=avain2,..."
+
+#~ 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."
+
+#~ msgid "missing comma"
+#~ msgstr "puuttuva pilkku"
+
 #~ msgid "superblock size (%lu) too small"
 #~ msgstr "superlohkon koko (%lu) on liian pieni"
 
diff --git a/po/fr.po b/po/fr.po
index 9f181a54..58be1aaf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.16-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2009-07-05 22:36+0100\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -108,6 +108,11 @@ msgstr "relit la table de partition"
 msgid "Usage:\n"
 msgstr "Utilisation :\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -k\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -127,6 +132,17 @@ msgstr "Commandes disponibles :\n"
 msgid "get size in 512-byte sectors"
 msgstr "obtenir la taille secteurs de 512 octets"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -231,15 +247,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Utilisation : %s [ -n ] p�riph�rique\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -342,7 +349,7 @@ msgstr "impossible de tester la somme de contr�le CRC : format cramfs ancien"
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "�chec de malloc()"
 
@@ -960,7 +967,7 @@ msgstr "impossible d'�valuer par stat() le p�riphique %s"
 msgid "%s is not a block special device"
 msgstr "%s n'est pas un p�riph�rique sp�cial de blocs"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
@@ -984,7 +991,7 @@ msgstr "trop d'inodes - le maximum est 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "pas assez d'espace, %llu blocs n�cessaires au moins"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "P�riph�rique: %s\n"
@@ -1060,7 +1067,7 @@ msgstr ""
 "Utilisation : mkfs [-V] [-t type-syst�me-de-fichiers] [options] p�riph�rique "
 "[taille]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1303,7 +1310,7 @@ msgstr "�chec de positionnement durant le test des blocs"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valeurs �tranges dans do_check: probablement un bug\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "�chec de positionnement dans check_blocks"
 
@@ -1386,177 +1393,183 @@ msgstr ""
 "Utilise la taille de page sp�cifi�e par l'usager %d, au lieu de la valeur "
 "syst�me %d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s : �chec de \"fork\" : %s\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Taille erron�e d'ent�te de swap, aucune �tiquette n'a �t� �crite.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "L'�tiquette a �t� tronqu�e.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "pas d'�tiquette, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "pas d'uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Usage : %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocs]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "trop de pages corrompues"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "M�moire �puis�e"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "une page corrompue\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu pages corrompues\n"
 
 # disk-utils/mkswap.c:612
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "Impossible de r�initialiser le p�riph�rique d'�change"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "Impossible d'allouer un tampons pour les inodes"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "Impossible d'allouer un tampons pour les inodes"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 msgid "unable to erase bootbits sectors"
 msgstr "impossible d'effacer le secteur d'amor�age"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s : %s : attention, ne pas effacer les secteurs de d�marrage\n"
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (%s table de partitions d�tect�e). "
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "        on whole disk. "
 msgstr "        tout le disque."
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "        tout le disque."
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 "%1$s: attention: option -U ignor�e (les UUID ne sont pas support�s par %1"
 "$s)\n"
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s : ne supporte pas cette version d'espace d'�change %d.\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "erreur : �chec d'analyse de l'UUID"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: erreur: aucun endroit pour d�finir un espace d'�change ?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s : erreur : taille %llu Ko sup�rieure � la taille du p�riph�rique %llu Ko\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 "%s: erreur : la zone d'�change (swap) doit �tre au moins de taille %ld Ko\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: AVERTISSEMENT : troncage de la zone d'�change (swap) � %llu Ko\n"
 
 # disk-utils/mkswap.c:566
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: impossible de cr�er une zone d'�change sur \"%s\"\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 "%s: erreur - %s est mont� ; impossible de cr�er une zone d'�change ici.\n"
 
 # disk-utils/mkswap.c:605
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossible d'initialiser l'espace d'�change : illisible"
 
 # disk-utils/mkswap.c:606
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Configure l'espace d'�change (swap) en version 1, taille = %llu Ko\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s : %s : impossible d'�crire la page de signature %s"
 
 # disk-utils/mkswap.c:623
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "�chec de la synchronisation du syst�me de fichiers par fsync"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: impossible d'obtenir l'�tiquette du fichier selinux : %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "matchpathcon() inutilisable"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "impossible de cr�er un nouveau contexte selinux"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "impossible d'�valuer le contexte selinux"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: impossible d'�tiqueter de %s en %s: %s\n"
@@ -1624,63 +1637,119 @@ msgstr "p�riph. phys. %d :\t associ� � n� majeur %d, n� mineur %d\n"
 msgid "Error setting raw device (%s)\n"
 msgstr "Erreur de configuration du p�riph. physique (%s)\n"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Inutilisable"
+# disk-utils/mkswap.c:612
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "Impossible de r�initialiser le p�riph�rique d'�change"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Espace libre"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: pas de telle partition\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s : ne supporte pas cette version d'espace d'�change %d.\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: �chec d'ouverture: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "analyse impossible pour ce pid"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: �chec d'ouverture: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: �chec d'ouverture: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: �chec d'ouverture: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "�chec de positionnement dans write_tables"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Usage : %s [options]\n"
+"\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Pour plus d'informations voir ipcmk(1).\n"
+"\n"
+
+#: disk-utils/swaplabel.c:203
+#, fuzzy
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+"%1$s: attention: option -U ignor�e (les UUID ne sont pas support�s par %1"
+"$s)\n"
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Inutilisable"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Espace libre"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Le disque a �t� chang�.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Red�marrer le syst�me pour s'assurer que la table de partition soit "
 "correctement mise � jour.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1693,231 +1762,231 @@ msgstr ""
 "partition DOS 6.x, svp consulter les pages du manuel\n"
 "de cfdisk pour de plus amples informations.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ERREUR FATALE"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Appuyer sur n'importe quelle touche pour quitter cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Impossible de se positionner sur le disque"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Impossible de lire sur le disque"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Impossible d'�crire sur le disque"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Trop de partitions"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "La partition d�bute avant le secteur 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "La partition se termine avant le secteur 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "La partition d�bute apr�s la fin du disque"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "La partition se termine apr�s la fin du disque"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "La partition se termine dans le cylindre final partiel"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "partitions logiques non ordonn�es suivant le disque"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "chevauchement de partitions logiques"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "chevauchement des partitions logiques agrandies"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "Erreur interne en cr�ant un disque logique sans partition �tendue !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Impossible de cr�er un disque logique ici -- cela cr�erait 2 partitions "
 "�tendues"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Item de menu trop long. Le menu pourrait para�tre erron�."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menu sans direction. Horizontal par d�faut."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Touche non valable"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Appuyer sur une touche pour continuer"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primaire"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Cr�e une nouvelle partition primaire"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logique"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Cr�e une nouvelle partition logique"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Annuler"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Ne pas cr�er une partition"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Erreur interne !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Taille (en Mo): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "D�but"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Ajoute une partition au d�but de l'espace libre"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Fin"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Ajoute une partition � la fin de l'espace libre"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Pas d'espace pour cr�er une partition �tendue"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Aucune table de partitions.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Aucune table de partitions. D�marrage avec une table vierge."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Signature erron�e dans la table de partitions"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Type inconnu de table de partitions"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Voulez-vous d�marrer avec une table vierge [y (pour oui)/N] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Vous avez sp�cifi� plus de cylindres que le disque n'en contient"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Impossible d'ouvrir l'unit� de disque"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disque ouvert en mode lecture seule - aucune permission d'�criture"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "Attention!! Identifiant GPT (GUID) de table de partitions non support� "
 "d�tect�. Utilisez GNU Parted."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Impossible d'obtenir la taille du disque"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Partition primaire erron�e"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Partition logique erron�e"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "AVERTISSEMENT!!  Cela pourrait d�truire les donn�es sur votre disque!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "�tes-vous s�r de vouloir �crire la table de partitions sur le disque? (oui/"
 "non)"
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "non"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Table de partitions non �crite sur le disque"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "oui"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "SVP r�pondre � oui � ou � non �"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "�criture de la table de partitions sur le disque..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Table de partitions �crite sur le disque"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
@@ -1925,88 +1994,88 @@ msgstr ""
 "Table de partitions �crite, mais �chec de la relecture. Ex�cuter partprobe"
 "(8), kpartx(8) ou red�marrer pour mettre � jour la table."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Aucune partition primaire marqu�e comme amor�able. DOS MBR ne pourra pas "
 "amorcer."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Plus d'une partition primaire marqu�e comme amor�able. DOS MBR ne pourra pas "
 "amorcer."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 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:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Impossible d'ouvrir le fichier � %s �"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unit� de disque: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Secteur 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Secteur %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Aucun   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primaire"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logique"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Amorce"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Aucun"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Table de partitions de %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Premier     Dernier\n"
 
 # fdisk/cfdisk.c:1969
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -2014,7 +2083,7 @@ msgstr ""
 " # Type       Secteur    Secteur  D�calage  Longueur  Syst.Fich. Type (ID) "
 "Fanions\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2022,476 +2091,476 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "        --- D�but  ---       ---- Fin  ----     Premier   Nbre de\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 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:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Brut(e)"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Afficher le contenu de la table en format brut"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Secteurs"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Affiche le contenu de la table ordonn� par secteurs"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Table"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Affiche juste la table de partitions"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Ne pas afficher la table"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "�cran d'aide pour cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk est un programme de partionnement bas� sur curses, qui"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "disque dur."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Commande     Signification"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          basculer le fanion d'amorce sur la partition courante"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          d�truire la partition courante"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          modifier les param�tres: cylindres, t�tes, secteurs par piste"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             AVERTISSEMENT: cette option ne doit pas �tre utilis�e par"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             des gens qui ne savent pas ce qu'ils font."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          afficher cet �cran d'aide"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 "  m          maximiser l'utilisation du disque par la partition courante"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Note: cela peut rendre la partition incompatible avec"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          cr�er une nouvelle partition � partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 "  p          lister la table de partitions � l'�cran ou dans un fichier"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Il y a plusieurs formats diff�rents pour la partition"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             que vous pouvez choisir:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 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:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - table ordonn�e par secteurs"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - table au format brut"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          quitter le programme sans �crire la table de partitions"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          modifier le type de syst�me de fichiers"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 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:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             alterne Mo, secteurs et cylindres"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 "             Vu que cela peut d�truire des donn�es sur le disque, vous devez"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             confirmer ou annuler la commande par la r�ponse � oui � ou"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             � non �"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 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:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Fl�che-bas   d�placer le curseur vers la partition suivante"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       r�afficher le contenu � l'�cran"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          afficher cet �cran d'aide"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Note: toutes les commandes peuvent �tre saisies en lettres"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "majuscules ou minuscules (sauf pour les �critures)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cylindres"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Modifier la g�om�trie des cylindres"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "T�tes"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Modifier la g�om�trie des t�tes"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Modifier la g�om�trie des secteurs"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Compl�t�"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Modification de la g�om�trie compl�t�e"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Entrer le nombre de cylindres: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Valeur ill�gale pour les cylindres"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Entrer le nombre de t�tes: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Valeur ill�gale pour les t�tes"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Entrer le nombre de secteurs par piste: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Valeur ill�gale pour les secteurs"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Entrer le type de syst�me de fichiers:"
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Impossible de modifier le type de syst. de fichiers (valeur nulle)"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Impossible de modifier le type de syst. de fichiers � \"�tendu\""
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Inc(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Inconnu (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unit� disque: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Taille: %lld octets,  %lld Mo"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Taille: %lld octets,  %lld.%lld Go"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "T�tes: %d   Secteurs par piste: %d  Cylindres: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nom"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Fanions"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Part Type"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Type Sys.Fic"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[�tiq.]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Secteurs"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cylindres"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Taille (Mo)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Taille (Go)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Amor�able"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Basculer le fanion d'amorce pour la partition courante"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "D�truire"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "D�truire la partition courante"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "G�om�trie"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Modifier la g�om�trie du disque (pour expert seulement)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Aide"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Afficher l'�cran d'aide"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Maximiser l'usage du disque par la partition courante (experts seulement)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nouvelle"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Cr�er une nouvelle partition � partir de l'espace libre"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Afficher"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Quitter"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Quitter le programme sans �crire la table de partitions"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Type"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 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:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Unit�s"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Mofifier les unit�s d'affichage des taille des partitions (Mo, sect, cyl)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Ecrire"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Ecrire la table de partitions sur le dsique (cela peut d�truire les donn�es)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Impossible de rendre cette partition amor�able"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Impossible de d�truire une partition vide"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Impossible de maximiser cette partition"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Cette partition est inutilisable"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Cette partition est en cours d'utilisation"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Impossible de changer le type d'une partition vide"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Pas de partition suppl�mentaire"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Commande ill�gale"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright � 1994-2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2565,9 +2634,9 @@ msgstr ""
 "\n"
 "�tiquette BSD sur le p�riph�rique: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Commande d'action"
 
@@ -2587,9 +2656,9 @@ msgstr "   i   installer une amorce"
 msgid "   l   list known filesystem types"
 msgstr "   l   lister les types de syst�me de fichiers connus"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   afficher ce menu"
 
@@ -2601,14 +2670,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:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   quitter sans enregistrer les changements"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   retourner au menu principal"
 
@@ -2651,13 +2720,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Premier %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Dernier %s ou +taille or +tailleM ou +tailleK"
@@ -2803,7 +2872,7 @@ msgstr "secteurs/piste"
 msgid "tracks/cylinder"
 msgstr "pistes/cylindre"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cylindres"
@@ -2861,7 +2930,7 @@ msgstr "Amorce install�e sur %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Le nombre maximum de partitions a �t� cr��\n"
@@ -2885,228 +2954,207 @@ msgstr ""
 "\n"
 "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Utilisation : fdisk [-b TAILLE] [-u] DISQUE    modifier la table de "
-"partitions\n"
-"       fdisk -l [-b TAILLE] [-u] DISQUE lister les tables de partitions\n"
-"       fdisk -s PARTITION                    donner la taille de partition "
-"en blocs\n"
-"       fdisk -v                                       afficher la version de "
-"fdisk\n"
-"O� DISQUE est quelque chose du genre: /dev/hdb ou /dev/sda\n"
-"et PARTITION est quelque chose du genre: /dev/hda7\n"
-"-u: donne le D�but et la Fin en unit�s de secteurs (au lieu de cylindres)\n"
-"-b 2048: (pour certains disques optiques) sp�cifie 2048 octets par secteur\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Utilisation : fdisk [-l] [-b TAILLE] [-u] p�riph�rique\n"
-"i.e.: fdisk /dev/hda  (pour le premier disque IDE)\n"
-"  ou: fdisk /dev/sdc  (pour le 3e disque SCSI)\n"
-"  ou: fdisk /dev/eda  (pour le 1er disque PS/2 ESDI)\n"
-"  ou: fdisk /dev/rd/c0d0  ou: fdisk /dev/ida/c0d0  (pour des p�riph�riques "
-"RAID)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Impossible d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Impossible de lire %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Impossible de se positionner sur %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Impossible d'�crire %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "�chec de BLKGETSIZE ioctl sur %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Impossible d'allouer plus de m�moire\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "ERREUR FATALE\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   basculer le fanion de lecture seule"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   �diter l'�tiquette BSD du disque"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   basculer le fanion \"montable\""
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   supprimer la partition"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   lister les types de partitions connues"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   ajouter une nouvelle partition"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   cr�er une nouvelle table vide de partitions DOS"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   afficher la table de partitions"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   cr�er une nouvelle �tiquette vide pour disque de type Sun"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   modifier l'id de syst�me de fichiers d'une partition"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   modifier les unit�s d'affichage/saisie"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   v�rifier la table de partitions"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   �crire la table sur le disque et quitter"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fonctions avanc�es (pour experts seulement)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   s�lectionner une partition amor�able"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   �ditier l'entr�e du fichier d'amorce"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   s�lectionner une partition d'�change pour SGI"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   bascule le fanion d'amorce"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   basculer le fanion de compatibilit� DOS"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifier le nombre de cylindres alternatifs"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   modifier le nombre de cylindres"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 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:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifier le nombre de secteurs additionnels par cylindre"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   modifier le nombre de t�tes"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   changer le facteur \"interleave\""
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   modifier la vitesse de rotation en tours par minute (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifier le nombre de secteurs par piste"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifier le nombre de cylindres physiques"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 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:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   lister les partitions �tendues"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   cr�er une table de partitions de type IRIX (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   corriger l'ordre des partitions"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i   modifier l'identifiant de disque"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Vous devez initialiser"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "t�tes"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "secteurs"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3115,31 +3163,11 @@ msgstr ""
 "%s%s.\n"
 "Vous pouvez faire cela depuis le menu des fonctions avanc�es.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " et "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Le nombre de cylindres pour ce disque est fix� � %d.\n"
-"Il n'y a rien d''incorrect avec cela, mais c'est plus grand que 1024,\n"
-"et cela pourrait causer des probl�mes pour certaines installations:\n"
-"1) logiciels qui sont ex�cut�s � l'amor�age (i.e., vieilles versions de "
-"LILO)\n"
-"2) logiciels d'amor�age et de partitionnement pour d'autres OS\n"
-"   (i.e., DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3157,38 +3185,37 @@ msgstr ""
 "de partitions � GUID (GPT).\n"
 "\n"
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "D�calage erron� dans la partition primaire �tendue\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3197,33 +3224,33 @@ msgstr ""
 "AVERTISSEMENT: omission des partitions apr�s n�%d.\n"
 "Elles seront d�truites si vous sauvegardez cette table de partition.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, 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:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "partition vide ignor�e (%d)\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Identifiant de disque : 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Nouvel identifiant de disque (actuellement 0x%08x) : "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3236,26 +3263,17 @@ msgstr ""
 "Apr�s quoi, bien s�r, le contenu pr�c�dent sera irr�cup�rable.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Note: taille de secteur %d (et non pas %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Il sera impossible d'�crire la table de partitions.\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3264,7 +3282,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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3273,17 +3291,17 @@ msgstr ""
 "Le p�riph�rique ne contient pas une table de partitions DOS ou Sun, SGI, OSF "
 "valide\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Erreur interne\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Partition �tendue suppl�mentaire ignor�e %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3292,7 +3310,7 @@ msgstr ""
 "AVERTISSEMENT: fanion 0x%04x non valide dans la table de partitions %d, sera "
 "corrig� par w(�criture)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3301,21 +3319,21 @@ msgstr ""
 "\n"
 "EOF (fin de fichier) obtenue 3 fois - fin du programme...\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Code Hexa (taper L pour lister les codes): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, par d�faut %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "Suffixe non support� : '%s'.\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3324,74 +3342,79 @@ msgstr ""
 "Admis : 10^N: Ko (KiloOctets), Mo (MegaOctets), Go (GigaOctets)\n"
 "            2^N: K  (KibiOctets), M  (MebiOctets), G  (GibiOctets)\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Utilisation de la valeur par d�faut %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valeur hors limites.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Num�ro de partition"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "AVERTISSEMENT: partition %d a un type vide\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partition s�lectionn�e %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Aucune partition n'est d�finie pour l'instant!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, 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:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cylindre"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "secteur"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Modification des unit�s d'affichage/saisie � %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Modification des unit�s d'affichage/saisie � %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "AVERTISSEMENT: la partition %d est une partition �tendue\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "Fanion de compatibilit� DOS positionn�\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Fanion de compatibilit� DOS non positionn�\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partition %d n'existe pas encore!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3404,7 +3427,7 @@ msgstr ""
 "type 0 n'est pas recommand�. Vous pouvez d�truire\n"
 "la partition en utilisant la commande � d �.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3414,7 +3437,7 @@ msgstr ""
 "versa.\n"
 "Vous devez la d�truire d'abord.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3425,7 +3448,7 @@ msgstr ""
 "tel que SunOS/Solaris l'exige et aussi ce qui est pr�f�rable  pour Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3436,63 +3459,63 @@ msgstr ""
 "et la partition 11 comme un volume entier (6) tel que IRIX l'exige.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Type syst�me de partition modifi� de %d � %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Type syst�me de partition %d non modifi� : %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "La partition %d a des d�buts physique/logique diff�rents (non Linux?):\n"
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logique=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "La partition %d a des fins physique/logique diff�rentes:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partition %i ne d�bute pas sur une fronti�re de cylindre:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "devrait �tre (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "devrait �tre (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "La partition %i ne d�bute pas sur une fronti�re de cylindre:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3501,7 +3524,7 @@ msgstr ""
 "\n"
 "Disque %s: %ld Mo, %lld octets\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3510,32 +3533,37 @@ msgstr ""
 "\n"
 "Disque %s: %ld.%ld Go, %lld octets\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d t�tes, %llu secteurs/piste, %d cylindres"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", total %llu secteurs"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Unit�s = %s de %d * %d = %d octets\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "mauvais index d'inode"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3544,12 +3572,12 @@ msgstr ""
 "Rien � faire. L'ordre est d�j� correct.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "Effectu�.\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3560,16 +3588,16 @@ msgstr ""
 "Vous avez probablement s�lectionn� le mauvais p�riph�rique.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, 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:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "P�riph�rique"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3578,7 +3606,7 @@ msgstr ""
 "\n"
 "Les entr�es de la table de partitions ne sont pas dans l'ordre du disque\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3589,88 +3617,88 @@ msgstr ""
 "Disque %s: %d t�tes, %llu secteurs, %d cylindres\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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    Taille ID\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "AVERTISSEMENT: la partition %d contient un secteur 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partition %d : secteur %d sup�rieur au maximum %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d : secteurs pr�c�dents %d ne concordent pas avec le total %d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, 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:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "AVERTISSEMENT: la partition %d chevauche la partition %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "AVERTISSEMENT: la partition %d est vide\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Total de secteurs allou�s %llu sup�rieur au maximum %llu\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld secteurs de %d octets non allou�s\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "La partition %d est d�j� d�finie. La d�truire avant de l'ajouter.\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Le secteur %llu est d�j� allou�\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Aucun secteur disponible\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Dernier %1$s, +%2$s or +taille{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3684,7 +3712,7 @@ msgstr ""
 "\tune nouvelle table de partitions DOS vide. (Utiliser o.)\n"
 "\tAVERTISSEMENT: cela va d�truire le contenu du pr�sent disque.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3697,23 +3725,23 @@ msgstr ""
 "\tune nouvelle table de partition DOS vide. (Utiliser o.)\n"
 "\tAVERTISSEMENT : cela d�truira le contenu actuel du disque.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Vous devez d�truire une partition et ajouter une partition �tendue d'abord\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Toutes les partitions logiques sont utilis�es\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Ajout d'une partition primaire\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3724,20 +3752,20 @@ msgstr ""
 "   %s\n"
 "   p   partition primaire (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   logique (5 ou plus)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   �tendue"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Num�ro de partition non valide pour le type � %c �\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3746,12 +3774,12 @@ msgstr ""
 "La table de partitions a �t� alt�r�e!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, 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:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3765,7 +3793,7 @@ msgstr ""
 "lors du prochain d�marrage ou apr�s avoir ex�cut� partprobe(8) ou kpartx"
 "(8).\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3778,7 +3806,7 @@ msgstr ""
 "svp consulter les pages du manuel de fdisk pour des informations\n"
 "compl�mentaires.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3787,43 +3815,43 @@ msgstr ""
 "\n"
 "Erreur de fermeture du fichier\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partition %d n'a pas de zone de donn�es\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Nouveau d�but de donn�es"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Commande pour experts (m pour de l'aide): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Nombre de cylindres"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Nombre de t�tes"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Nombre de secteurs"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, 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:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3836,32 +3864,32 @@ msgstr ""
 "\" ! L'utilitaire fdisk ne supporte pas GPT. Utilisez GNU Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Le disque %s ne contient pas une table de partition valide\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossible d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossible d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: commande inconnue\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Ce noyau trouve lui-m�me la taille des secteurs - option -b ignor�e\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3870,18 +3898,18 @@ msgstr ""
 "AVERTISSEMENT: l'option -b (initialiser la taille de secteur) doit �tre "
 "utilis�e avec un p�riph�rique sp�cifi�\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "D�tection d'une �tiquette de disque OSF/1 sur %s, passage en mode d'�dition "
 "d'�tiquette.\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Commande (m pour l'aide): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3890,16 +3918,16 @@ msgstr ""
 "\n"
 "Le fichier courant d'amor�age est: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "SVP entrer le nom du nouveau fichier d'amor�age: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Fichier d'amor�age non modifi�\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3990,15 +4018,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4134,7 +4162,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Plus d'une entr�e de disque entier pr�sente.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Aucune partition d�finie\n"
@@ -4242,7 +4270,7 @@ msgstr ""
 "Taper OUI si vous �tes certain de l'�tiquetage diff�rent de cette "
 "partition.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "OUI\n"
 
@@ -4303,7 +4331,7 @@ msgstr ""
 "bien s�r, le contenu pr�c�dent sera perdu de fa�on d�finitivement.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4325,56 +4353,56 @@ msgstr "Tentative de conservation des param�tres de la partition %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tDEBUT=%d\tLONGUEUR=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "Non-assign�"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Disque entier"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS secteurs alt."
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS r�serv�"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
 # fdisk/fdisksunlabel.c:132
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4387,23 +4415,23 @@ msgstr ""
 "i.e. t�tes, secteurs, cylindres et partitions\n"
 "ou imposez une nouvelle �tiquette (commande \"s\")\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "�tiquette de disque Sun d�tect�e avec version erron�e [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr ""
 "�tiquette de disque Sun d�tect�e avec mauvais �tat de contr�le [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "�tiquette de disque Sun d�tect�e avec erreur num_partitions [%u].\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4411,7 +4439,7 @@ msgstr ""
 "AVERTISSEMENT: des valeurs erron�es devront �tre corrig�es par la commande w "
 "(�criture)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4425,31 +4453,31 @@ msgstr ""
 "sera irr�cup�rable.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Secteurs/piste"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Espace interm�diaire inutilis� - secteurs 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espace interm�diaire inutilis� - secteurs %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4458,7 +4486,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:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4467,12 +4495,12 @@ msgstr ""
 "Il est fortement recommand� que la troisi�me partition couvre le\n"
 "disque en entier et soit de type \"Tout le disque\"\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Le secteur %d est d�j� allou�\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4483,7 +4511,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:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4493,7 +4521,7 @@ msgstr ""
 "laisser cette\n"
 "partition comme disque entier (5), d�butant � 0, avec %u secteurs\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4508,12 +4536,12 @@ msgstr ""
 "soit �tiquet�e 82 (Linux swap): "
 
 # fdisk/fdisksunlabel.c:656
-#: fdisk/fdisksunlabel.c:581
-#, c-format
+#: fdisk/fdisksunlabel.c:576
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4529,11 +4557,11 @@ msgstr ""
 "Unit�s = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4542,28 +4570,28 @@ msgstr ""
 "Unit�s = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, 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:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cylindres alternatifs"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Secteurs additionnels par cylindre"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Facteur \"interleave\""
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Vitesse de rotation (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Nombre de cylindres physiques"
 
@@ -4772,6 +4800,10 @@ msgstr "Minix / Linux ancienne"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 cach�e disque C:"
@@ -5409,95 +5441,95 @@ msgstr "option -n utilis�e : rien n'a chang�\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "�chec de sauvegarde des vieux secteurs - abandon\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "�chec de l'�criture de la partition sur %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "ligne d'entr�e longue ou incompl�te - abandon\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, 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:1757
+#: fdisk/sfdisk.c:1762
 #, 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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entr�e non reconnu: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "numbre trop grand\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "rebut apr�s le nombre\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "aucun espace pour le descripteur de partition\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "ne peut construire autour de la partition �tendue\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "trop de champs � l'entr�e\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Aucun espace pour en accepter d'avantage\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Type ill�gal\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, 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:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "AVERTISSEMENT: partition vide\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "AVERTISSEMENT: d�but de partition corrompu (auparavant %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "fanion d'amor�age non reconnu - choisir � - � ou � * �\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "sp�cification partielle c,h,s?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Partition �tendue par � l'endroit attendu\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "entr�e erron�e\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "trop de partitions\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5509,43 +5541,43 @@ msgstr ""
 "Habituellement vous n'avez besoin que de sp�cifier:\n"
 "<d�but> et <taille> (et parfois <type>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Utilisation : %s [options] p�riph�rique ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "p�riph�rique: quelque chose comme /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "options utiles:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ou --show-size]: lister la taille d'une partition"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [ou --id]:        afficher ou modifier l'identificateur de partition"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lister les partitions de chaque p�riph�rique"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 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:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5553,59 +5585,59 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  accepter/reporter en unit�s de secteurs/blocs/"
 "cylindres/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ou --list-types]:lister les types de partitions connus"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 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:2300
+#: fdisk/sfdisk.c:2305
 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:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                modifier seulement la partition ayant le num�ro #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ne pas �crire sur le disque"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fichier :         restaurer ces secteurs � nouveau"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   afficher la version"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      afficher l'aide m�moire"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "options dangereuses:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 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:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5613,7 +5645,7 @@ msgstr ""
 "    -G [ou --show-pt-geometry]: afficher la g�om�trie estim�e � partir de la "
 "table de partitions"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5622,65 +5654,65 @@ msgstr ""
 "                             ou les descripteurs attendus � l'entr�e pour "
 "ellest"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 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:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      supprimer tous les messages d'avertissement"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Vous pouvez �craser la g�om�trie en utilisant:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [ou --cylinders #]:initialiser le nombre de cylindres � utiliser"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 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:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S# [ou --sectors #]:  initialiser le numbre de secteurs � utiliser"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Vous pouvez d�sactiver toutes les v�rifications de consistence avec:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5693,68 +5725,68 @@ msgstr ""
 "\" ! L'utilitaire sfdisk ne supporte pas GPT. Utilisez GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Utiliser l'option --force pour ignorer ce contr�le.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "pas de commande?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu blocs\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Utilisation : sfdisk --print-id p�riph�rique num�ro-de-partition\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Utilisation : sfdisk --change-id p�riph�rique num�ro-de-partition Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Utilisation : sfdisk --id p�riph�rique num�ro-de-partition [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ne peut ouvrir %s en lecture-�criture\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ne peut ouvrir %s en lecture\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Ne peut obtenir la taille de %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5762,7 +5794,7 @@ msgstr ""
 "Compl�t�\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5772,35 +5804,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:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identifcateur erron� %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Le disque est pr�sentement en usage.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erreur fatale: ne peut trouver %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, 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:3027
+#: fdisk/sfdisk.c:3032
 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:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5814,30 +5846,30 @@ msgstr ""
 "partitions swap sur ce disque.\n"
 "Utiliser le fanion --no-reread pour supprimer cette v�rification.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 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:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vieille situation:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, 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:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Nouvelle situation:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5845,23 +5877,23 @@ msgstr ""
 "Ces partitions sont questionnables -- rien n'a chang�.\n"
 "(Si vous d�sirez cela, utiliser l'option --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "�tes-vous satisfait avec cela? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Voulez-vous �crire cela sur le disque? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5870,16 +5902,16 @@ msgstr ""
 "\n"
 "sfdisk: fin pr�matur�e de l'entr�e\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Abandon - rien n'a chang�\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, 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:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5888,7 +5920,7 @@ msgstr ""
 "Succ�s d'�criture de la nouvelle table de partitions\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5899,17 +5931,17 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Consulter fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "ATTENTION : impossible d'ouvrir %s : %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr "ATTENTION : mauvais format � la ligne %d sur %s\n"
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5921,37 +5953,37 @@ msgstr ""
 "corriger cela au plus t�t dans le fichier /etc/fstab.\n"
 "\n"
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr "fsck : %s : non trouv�\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr "%s : wait : aucun processus enfant ?!?\n"
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr "Attention... %s, p�riph�rique %s, signal de fin %d.\n"
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr "%s %s : statut %x, cela ne devrait pas arriver.\n"
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Fin de %s (code de sortie %d)\n"
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s : erreur %d lors de l'ex�cution de \"fsck\". %s pour %s\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
@@ -5959,12 +5991,12 @@ msgstr ""
 "Tous les types de syst�mes de fichiers pr�cis�s par -t, ou bien aucun,\n"
 "doivent �tre pr�fix�s par 'no' (non) ou '!'.\n"
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr ""
 "Impossible d'allouer la m�moire pour les types de syst�mes de fichiers\n"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
@@ -5973,70 +6005,70 @@ msgstr ""
 "%s : mauvaise ligne dans /etc/fstab ignor�e : montage avec nombre de passes "
 "\"fsck\" non nul\n"
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s n'est pas un p�riph�rique d'impression lp.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr "fsck : impossible de contr�ler %s, fsck.%s non trouv�\n"
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr "Contr�le de tous les syst�mes de fichiers.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--en attente-- (passe %d)\n"
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "Usage : fsck [-AMNPRTV] [ -C [ fd ] ] [-t type_sysfic] [options_sysfic] "
 "[sys_fic ...]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s : p�riph�riques trop nombreux\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Impossible d'ouvrir %s : %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "/proc est-il mont� ?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 "Vous devez �tre \"root\" pour rechercher le type de syst�mes de fichiers : %"
 "s\n"
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Impossible de trouver un syst�me de fichiers correspondant : %s\n"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s : trop d'arguments\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, c-format
 msgid "fsck from %s\n"
 msgstr "fsck de %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "%s : impossible d'allouer la m�moire pour fsck_path\n"
@@ -6569,7 +6601,13 @@ msgstr "Aucune interface d'horloge utilisable n'a �t� rep�r�e.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Impossible d'initialiser l'horloge syst�me.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6584,17 +6622,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:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Impossible d'obtenir la valeur d'�poque � partir du kernel.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6603,26 +6641,26 @@ msgstr ""
 "Pour initialiser la valeur d'�poque, vous devez utiliser l'option � epoch � "
 "pour y mettre la valeur voulue.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Impossible d'initialiser la valeur d'�poque dans le kernel.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
 
 # hwclock/hwclock.c:1108
-#: hwclock/hwclock.c:1311
-#, c-format
+#: hwclock/hwclock.c:1325
+#, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -6640,6 +6678,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6700,7 +6739,7 @@ msgstr ""
 "  -D | --debug        mode d�bogage\n"
 "\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6711,19 +6750,19 @@ msgstr ""
 "       indique � \"hwclock\" le type d'alpha utilis� (voir hwclock(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "%s: impossible de se connecter au syst�me d'audit\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6732,7 +6771,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:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6741,7 +6780,7 @@ msgstr ""
 "%s: les options --utc et --localtime sont mutuellement exclusives. Vous avez "
 "soumis les deux.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6750,7 +6789,7 @@ msgstr ""
 "%s: les options --adjust et --noadjfile sont mutuellement exclusives. Vous "
 "avez soumis les deux.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6759,28 +6798,28 @@ msgstr ""
 "%s: les options --adjfile et --noadjfile sont mutuellement exclusives. Vous "
 "avez sp�cifi� les deux.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, 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:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6789,13 +6828,13 @@ msgstr ""
 "D�sole, seul le super usager peut modifier l'�poque de l'horloge mat�rielle "
 "dans le kernel.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -7098,12 +7137,12 @@ msgstr "%s: ne peut initialiser le contexte par d�faut pour /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "Modification de l'information de finger pour %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: �chec de login PAM, fin d'ex�cution : %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7333,35 +7372,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "Erreur fatale: ne peut r�ouvrir tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s n'est pas une ligne s�rie"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "Erreur fatale: tty erron�"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h pour le super usager seulement.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Utilisation : login [-fp] [nom-d-usager]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Ne peut initialiser PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, 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:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7370,17 +7414,17 @@ msgstr ""
 "Login incorrect\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, 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:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7389,7 +7433,7 @@ msgstr ""
 "\n"
 "Login incorrect\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7398,121 +7442,121 @@ msgstr ""
 "\n"
 "Probl�me d'initialisation de la session, abandon.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Nom d'usager null dans %s:%d. Abandon."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, 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:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: m�moire �puis�e\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Nom d'usager ill�gal"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login refus� sur ce terminal.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s REFUS� DE %s SUR TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s REFUS� SUR TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorrect\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "APPEL � %s fait par %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN DE %s � PARTIR DE %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN SUR %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN SUR %s PAR %s � PARTIR DE %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN SUR %s PAR %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Vous avez du courrier.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Vous avez du courrier.\n"
 
 # login-utils/login.c:1087too many bare linefeeds.\n"
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: �chec d'�tablissement de relais par fork(): %s "
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "�ched de TIOCSCTTY: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "�chec de setuid()"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Pas de r�pertoire %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Login avec un r�pertoire home = � / �.\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, 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:1269
+#: login-utils/login.c:1273
 #, 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:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: pas de shell: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7521,65 +7565,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "nom du compte usager login trop long.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NOM trop long"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "noms de login ne peuvent d�buter avec � - �.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "trop de sauts de page (linefeeds)\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "Nombre escessif de sauts de page (linefeeds)"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, 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:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Dernier login: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "� partir de %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "sur %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "�chec de login � partir de %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "�chec de login � partir de %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d login en �chec � partir de %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d login en �chec sur %s, %s"
@@ -7835,8 +7879,8 @@ msgid "no TERM or cannot stat tty\n"
 msgstr "pas de TERM ou ne peut �valuer tty par stat()\n"
 
 #: login-utils/simpleinit.c:938
-#, c-format
-msgid "error stopping service: \"%s\"\n"
+#, fuzzy, c-format
+msgid "error at stopping service \"%s\"\n"
 msgstr "erreur en arr�tant le service : \"%s\"\n"
 
 #: login-utils/simpleinit.c:950
@@ -7845,9 +7889,9 @@ msgid "Stopped service: %s\n"
 msgstr "Service arr�t� : %s\n"
 
 #: login-utils/simpleinit.c:1070
-#, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "erreur d'ex�cution du programme : \"%s\"\n"
+#, fuzzy, c-format
+msgid "error at starting service \"%s\"\n"
+msgstr "erreur en arr�tant le service : \"%s\"\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7974,25 +8018,25 @@ msgstr "%s: ne peut �valuer par stat() le fichier temporaire.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ne peut lire du fichier temporaire.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "valeur de jour incorrecte : utiliser 1-%d"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "valeur de mois ill�gal: utiliser 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "valeur d'ann�e ill�gale: utiliser 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Utilisation : cal [-13smjyV] [[[jour] mois] ann�e]\n"
@@ -8016,6 +8060,115 @@ msgstr "Usage : %s LABEL=<label>|UUID=<uuid>\n"
 msgid "unable to resolve '%s'"
 msgstr "impossible de r�soudre '%s'"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: commande inconnue : %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "impossible d'allouer le tampon de sortie"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "impossible d'allouer le tampon de sortie"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: ne peut lire %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: erreur d'�criture : %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Pour plus d'informations voir namei(1).\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Pas de r�pertoire %s!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "impossible d'allouer le tampon de sortie"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "impossible d'allouer le tampon de sortie"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "impossible d'allouer le tampon de sortie"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "impossible d'allouer le tampon de sortie"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8180,7 +8333,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:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8191,37 +8344,37 @@ 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:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "Utilisation : script [-a] [-f] [-q] [-t] [fichier]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Le script a d�but�, le fichier est %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s: erreur d'�criture %d : %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Le script a d�but� sur %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s: erreur d'�criture : %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: impossible d'�crire le fichier \"script\", erreur : %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8230,17 +8383,17 @@ msgstr ""
 "\n"
 "Script compl�t� sur %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script compl�l�, le fichier est %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "�chec de openpty\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Manque de pty\n"
@@ -8580,6 +8733,16 @@ msgstr "nb de lectures"
 msgid "bad response length"
 msgstr "mauvaise longueur de r�ponse"
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "analyse impossible pour ce pid"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "�chec de la fonction \"stat\" : %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8610,6 +8773,11 @@ msgstr "Erreur lecture du client, longueur=%d\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr "op�ration %d, num. entrant = %d\n"
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "Op�ration non valide %d\n"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8626,8 +8794,8 @@ msgid "Generated time UUID %s and %d following\n"
 msgstr "Heure UUID g�n�r�e %s et %d suiv.\n"
 
 #: misc-utils/uuidd.c:415
-#, c-format
-msgid "Generated %d UUID's:\n"
+#, fuzzy, c-format
+msgid "Generated %d UUIDs:\n"
 msgstr "%d UUIDs g�n�r�s :\n"
 
 #: misc-utils/uuidd.c:427
@@ -8646,13 +8814,13 @@ msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Erreur d'appel du d�mon UUIDd (%s) : %s\n"
 
 #: misc-utils/uuidd.c:534
-#, c-format
-msgid "%s and subsequent %d UUID's\n"
+#, fuzzy, c-format
+msgid "%s and subsequent %d UUIDs\n"
 msgstr "%s et %d suivants UUIDs\n"
 
 #: misc-utils/uuidd.c:536
-#, c-format
-msgid "List of UUID's:\n"
+#, fuzzy, c-format
+msgid "List of UUIDs:\n"
 msgstr "Liste des UUID : \n"
 
 #: misc-utils/uuidd.c:557
@@ -8680,80 +8848,74 @@ msgstr "Utilisation : %s [-r] [-t]\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM r�pertorie ... -f ] nom...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "�chec de malloc()"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "erreur : �chec de \"strdup\""
 
-#: misc-utils/wipefs.c:199
-#, fuzzy
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr "...�chec de synchronisation\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Le disque %s ne contient pas une table de partition valide\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: �chec d'ouverture: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "%s : �chec d'ouverture"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "octets"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, c-format
 msgid "%s: open failed"
 msgstr "%s : �chec d'ouverture"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Valeur d'initialisation invalide: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Usage : %s [options]\n"
-"\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8763,7 +8925,7 @@ msgstr ""
 "Pour plus d'informations voir ipcmk(1).\n"
 "\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -9010,7 +9172,7 @@ msgstr ""
 "Cette version de mount a �t� compil�e sans support de boucle. SVP "
 "recompiler.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -9035,7 +9197,7 @@ msgstr ""
 "<fichier>\n"
 " %1$s [ options ] {-f|--find|loopdev} <fichier>  configurer\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -9067,256 +9229,300 @@ msgstr ""
 " -v | --verbose                   mode verbeux\n"
 "\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Valeur d'initialisation invalide: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Valeur d'initialisation invalide: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "P�riph�rique boucle (loop) : %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "p�riph. boucle perdu (loop)=%s...nouvel essai\n"
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: p�riph�rique occup�"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Aucun support de boucle n'�tait disponible au moment de la compilation. SVP "
 "recompiler.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr "mount : cha�ne d'options non entour�e de guillemets \"%s\""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount : transformation de %s \"%s\" en \"%s\"\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: selon mtab %s est d�j� mont� sur %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: selon mtab %s est mont� sur %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: ne peut ouvrir %s en �criture: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erreur d'�criture %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: erreur lors du changement de mode de %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount : impossible de fixer l'id de groupe : %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount : impossible de fixer l'id d'utilisateur : %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ne peut �tablir un relais fork(): %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "On tente %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 "mount: vous n'avez pas sp�cifier le type de syst�me de fichiers pour %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Je vais essayer tous les types mentionn�s dans %s ou %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       et il semble que c'est un espace de swap\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Je vais essayer le type %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ressemble � un esapce de swap - n'a pas �t� mont�"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "�chec de mount"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: seul l'usager ROOT peut monter %s sur %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: p�riph�rique de type loop sp�cifi� deux fois"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: type sp�cifi� deux fois"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: escamotage du setup du p�riph�rique de type loop\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Valeur d'initialisation invalide: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Valeur d'initialisation invalide: %s\n"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount : selon mtab %s est d�j� mont� sur %s en tant que \"loop\""
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: on se pr�pare � utiliser le p�riph�rique de type loop %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 "mount : p�riph. r�cup�r� par un autre processus=%s... nouvelle tentative\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount : p�riph. repris par un autre processus=%s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: �chec d'initialisation du p�riph�rique de type loop\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: r�ussite d'initialisation du p�riph�rique de type loop\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, 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:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: ne peut ouvrir %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument � -p ou --pass-fd doit �tre un nombre"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ne peut ouvrir %s pour ajuster la vitesse"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ne peut initialiser la vitesse: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount : selon mtab %s est d�j� mont� sur %s\n"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s est occup� - remont� en lecture seulement\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s est occup� - remont� en lecture seulement\n"
+
+#: mount/mount.c:1482
 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:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: vous devez sp�cifier le type de syst�me de fichiers"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: �chec de mount"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, 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:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: permission refus�e"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: doit �tre le super usager pour utiliser mount"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est occup�"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc d�j� mont�"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s est d�j� mont� ou %s est occup�"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: le point de montage %s n'existe pas"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: p�riph�rique sp�cial %s n'existe pas"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9325,12 +9531,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:1469
+#: mount/mount.c:1547
 #, 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:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9339,7 +9545,7 @@ msgstr ""
 "mount : type erron� de syst .de fichiers, option erron�e, super bloc\n"
 "        erron� sur %s, codepage ou aide manquante ou autre erreur"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
@@ -9347,7 +9553,7 @@ msgstr ""
 "       (pour plusieurs syst. de fichiers (nfs, cifs) vous aurez\n"
 "       besoin d'un programme /sbin/mount.<type> interm�diaire)"
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9355,7 +9561,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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9363,7 +9569,7 @@ msgstr ""
 "       (tentez-vous de monter une partition �tendue,\n"
 "       au lieu d'une partition logique � l'int�rieur?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9372,110 +9578,105 @@ msgstr ""
 "essayez\n"
 "       dmesg | tail  ou quelque chose du genre\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "table de p�riph�riques mont�s est pleine"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ne peut lire le super bloc"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: p�riph�rique inconnnu"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: type inconnu de syst�me de fichiers '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablement vous voulez dire %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: peut-�tre voulez-vous dire 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: peut-�tre voulez-vous dire 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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�"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 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:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, 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:1560
+#: mount/mount.c:1638
 #, 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"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "p�riph�rique de type bloc"
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ne peut monter %s%s en lecture seulement"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, 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:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: ne peut monter %s%s en lecture seulement"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, 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:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount : media non pr�sent dans %s ...nouvel essai\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: aucun media trouv� dans %s"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9491,26 +9692,26 @@ msgstr ""
 "       acc�der aux fichiers. Pour des d�tails, voir restorecon(8) et mount"
 "(8).\n"
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: aucun type n'a �t� fourni - je vais assumer cifs en raison du "
 "pr�fixe //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, 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:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9580,39 +9781,39 @@ msgstr ""
 "Autres options: [-nfFrsvw] [-o options] [-p descr_fic_mots_passe].\n"
 "Pour plus de d�tails, tapez \"man 8 mount\".\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: seul l'usager ROOT peut faire cela"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: seul l'usager ROOT peut faire cela"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "rien n'a �t� mont�"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: pas de telle partition rep�r�e"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ne peut rep�rer %s dans %s ou %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: AVERTISSEMENT: aucun nouvelle ligne finale � la fin de %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: ligne %d dans %s est erron�%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; reste du fichier est ignor�"
 
@@ -9625,7 +9826,7 @@ msgstr "probl�me dans l'appel de xstrndup"
 msgid "not enough memory"
 msgstr "pas assez de m�moire"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9642,7 +9843,7 @@ msgstr ""
 " <fichier>                               nom du fichier � utiliser\n"
 "\n"
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9663,7 +9864,7 @@ msgstr ""
 " %1$s -V                            affiche le n� de version\n"
 "\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9682,90 +9883,95 @@ msgstr ""
 " %1$s -V                           affiche le n� de version\n"
 "\n"
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s : format de fichier inattendu"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s : r�initialisation de l'espace d'�change."
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 msgid "fork failed"
 msgstr "�chec de la fonction \"fork\""
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 msgid "execv failed"
 msgstr "�chec de la fonction \"execv\""
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
 msgstr "�chec de la fonction \"waitpid\""
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s : �chec de \"lseek\""
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s : �chec d'�criture de signature"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Nom"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s : �chec de fonction \"stat\""
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s : permissions non s�res %04o, %04o sugg�r�es."
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s : ignor� - semble avoir des trous."
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s : impossible d'obtenir la taille"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s : erreur de lecture de l'ent�te de zone d'�change (swap)"
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 "%s: derni�re_page 0x%08llx plus grande que la taille actuelle d'espace "
 "d'�change"
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: swap format pagesize does not match."
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9773,38 +9979,38 @@ msgstr ""
 "%s : taille de page ne correspondant pas avec le format d'espace d'�change "
 "(utiliser --fixpgsz pour r�initialiser)"
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s : donn�es de mise en veille d'application d�tect�es. R��criture de la "
 "signature d'espace d'�change (swap)."
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s sur %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s : �chec de la fonction \"swapon\""
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "impossible de trouver le p�riph�rique %s"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr "Vous n'�tes pas le super-utilisateur (root)."
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s : �chec de la fonction \"swapoff\""
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9814,37 +10020,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compil� sans support pour -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount : impossible de fixer l'id de groupe : %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount : impossible de fixer l'id d'utilisateur : %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: ne peut faire un fork(): %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: p�riph�rique de type bloc invalide"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: n'est pas mont�"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ne peut �crire sur le super bloc"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9855,52 +10061,52 @@ msgstr ""
 "       (Dans certains cas, des infos sur les processus l'utilisant\n"
 "        sont r�cup�rables par lsof(8) ou fuser(1))"
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: n'a pas �t� trouv�"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: doit �tre le super usager pour utiliser umount"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, 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:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "pas de umount2, tentative avec umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est occup� - remont� en lecture seulement\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ne peut remonter %s en lecture seulement\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s d�mont�\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 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:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9911,80 +10117,85 @@ msgstr ""
 "       umount -a [-d] [-f] [-r] [-n] [-v] [-t typevfs] [-O opts]\n"
 "       umount [-d] [-f] [-r] [-n] [-v] sp�cial | noeud...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
 msgstr "p�riph�rique %s d�j� associ� avec %s\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "p�riph�rique %s non associ� avec %s\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Ne peut d�monter \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Tentative pour d�monter %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr "umount : probl�me � l'analyse de mtab"
 
-#: mount/umount.c:511
-#, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+#: mount/umount.c:517
+#, fuzzy, c-format
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr "umount : impossible de d�monter %s -- %s est mont� au m�me endroit."
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Ne peut rep�rer %s dans mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s n'est pas mont� (selon mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, 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:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount est en d�saccord avec fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: seul %s peut d�monter %s de %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: seul l'usager ROOT peut ex�cuter la commande"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9992,98 +10203,94 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
-"\n"
-"chrt - manipule les attributs temps-r�el d'un processus.\n"
-"\n"
-"Fixer la strat�gie :\n"
-"  chrt [options] <strat�gie> <priorit�> {<pid> | <commande> [<arg> ...]}\n"
-"\n"
-"Obtenir la strat�gie :\n"
-"  chrt [options] {<pid> | <commande> [<arg> ...]}\n"
-"\n"
-"\n"
-"Strat�gies de planification d'ex�cution :\n"
-"  -b | --batch         fixe la strat�gie � SCHED_BATCH\n"
-"  -f | --fifo          fixe la strat�gie � SCHED_FIFO\n"
-"  -i | --idle          fixe la strat�gie � SCHED_IDLE\n"
-"  -o | --other         fixe la strat�gie � SCHED_OTHER\n"
-"  -r | --rr            fixe la strat�gie � SCHED_RR (par d�faut)\n"
-"\n"
-"Options :\n"
-"  -h | --help          affiche cette aide\n"
-"  -p | --pid           agit sur le pid donn�\n"
-"  -m | --max           affiche les priorit�s min/max valables\n"
-"  -v | --verbose       affiche les informations d'�tat\n"
-"  -V | --version       affiche les informations de version\n"
-"\n"
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr "impossible d'obtenir la strat�gie d'ex�cution du pid %d"
 
-#: schedutils/chrt.c:87
-#, c-format
-msgid "pid %d's %s scheduling policy: "
+#: schedutils/chrt.c:104
+#, fuzzy, c-format
+msgid "pid %d's new scheduling policy: "
 msgstr "strat�gie de planification d'ex�cution pour pid %d %s :"
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:106
+#, fuzzy, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr "strat�gie de planification d'ex�cution pour pid %d %s :"
+
+#: schedutils/chrt.c:139
 #, c-format
 msgid "unknown\n"
 msgstr "inconnu\n"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "impossible d'obtenir les attributs pour le pid %d"
 
-#: schedutils/chrt.c:115
-#, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+#: schedutils/chrt.c:146
+#, fuzzy, c-format
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr "priorit� de planification d'ex�cution pour le pid %d %s : %d\n"
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, fuzzy, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr "priorit� de planification d'ex�cution pour le pid %d %s : %d\n"
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s priorit� min/max \t: %d/%d\n"
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "SCHED_%s non support�(e) ?\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 msgid "failed to parse pid"
 msgstr "analyse impossible pour ce pid"
 
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr "actuel"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 msgid "failed to parse priority"
 msgstr "impossible d'analyser la priorit�"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "impossible de fixer la strat�gie d'ex�cution du pid %d"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Nouvelle"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, c-format
 msgid "failed to execute %s"
 msgstr "impossible d'ex�cuter %s"
@@ -10097,14 +10304,14 @@ msgid "ioprio_set failed"
 msgstr "�chec de la fonction \"ioprio_set\""
 
 #: schedutils/ionice.c:81
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "ionice - sets or gets process io scheduling class and priority.\n"
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -10149,9 +10356,120 @@ msgstr "classe de veille sp�cifi�e ignor�e"
 msgid "bad prio class %d"
 msgstr "mauvaise classe de priorit� %d"
 
-#: schedutils/ionice.c:187
-msgid "execvp failed"
-msgstr "�chec de \"execvp\""
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
+msgstr "�chec de exec()\n"
+
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Utilisation : %s program [arg ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Pour plus d'informations voir namei(1).\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "impossible d'obtenir la taille de %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "�chec de malloc()"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "impossible d'obtenir la strat�gie d'ex�cution du pid %d"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "analyse impossible pour ce pid"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "impossible de fixer la strat�gie d'ex�cution du pid %d"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "erreur d'analyse\n"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "erreur d'analyse\n"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " et "
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -10297,7 +10615,18 @@ msgstr "   %f int/sec; %f rec (caract�res/sec)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Utilisation : %s [-c] [-n niveau] [-s taille-de-tampon]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Usage : %s [options]\n"
+"\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10306,7 +10635,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10315,31 +10644,36 @@ msgstr ""
 "\n"
 "Pour plus d'informations voir namei(1).\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Pas assez d'arguments"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valeur d'initialisation invalide: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valeur d'initialisation invalide: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Aucune option --date sp�cifi�.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "nombre attendu, mais obtenu : \"%s\""
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "%s : �chec d'ouverture"
@@ -10399,6 +10733,65 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "%s : �chec de \"fork\" : %s\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Usage : %s [options]\n"
+"\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Pour plus d'informations voir ipcmk(1).\n"
+"\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Aucune option --date sp�cifi�.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Aucune option --date sp�cifi�.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s : �chec de fonction \"stat\""
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "l'inode racine n'est pas un r�pertoire"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "%s : �chec d'ouverture"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s : �chec d'ouverture"
+
 #: sys-utils/ipcmk.c:84
 #, c-format
 msgid ""
@@ -10495,478 +10888,453 @@ msgstr ""
 "Utilisation : %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: option ill�gale -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: cl� ill�gale (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "permission refus�e pour la cl�"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "cl� d�j� enlev�e"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "cl� invalide"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "erreur inconnue dans la cl�"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "permission refus�e pour l'identificateur"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "identificateur invalide"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "identificateur d�j� enlev�"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "erreur inconnue dans l'identificateur"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: argument inconnu: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "usage : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h pour l'aide.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s fournits des informations sur les services pour lesquels vous avez des "
-"droits d'acc�s en mode lecture.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Sp�cifications des ressources:\n"
-"\t-m : m�moire partag�e (shared_mem)\n"
-"\t-q : messages\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : s�maphores\n"
-"\t-a : tout (par d�faut)\n"
+"%s fournits des informations sur les services pour lesquels vous avez des "
+"droits d'acc�s en mode lecture.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Format de sortie:\n"
-"\t-t : temps\n"
-"\t-p : pid\n"
-"\t-c : cr�ateur\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : d�tails sur les ressources identifi�s par id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : limites\n"
-"\t-u : sommaire\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : d�tails sur les ressources identifi�s par id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "kernel n'est pas configur� pour traiter la m�moire partag�e\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Limites de la m�moire partag� --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "nombre maximum de segments = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "taille max seg (koctets) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "maximum total de m�moire partag�e (Ko) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "taille minimum de segments (octets) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ �tat de la m�moire partag�e --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "segment allou�s %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "pages allou�s %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "pages r�sidentes  %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "pages �chang�es (swap) %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Performance du swap: %ld tentatives\t %ld succ�s\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Segment de m�moire partag� Cr�ateurs/Propri�taires --------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 "------ M�moire partag� Attachement/D�tachement/Changement Temps --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "propri�taire"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "attach�"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "d�tach�"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "modifi�"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ M�moire partag� Cr�ateur/Derni�re-op�ration --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segment de m�moire partag� --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "cl�"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "octets"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "�tats"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Non initialis�"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "verrouill�"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "kernel n'est pas configur� pour traiter les s�maphores\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Limites des s�maphores --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "nombre max de tableaux = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "nombre max de s�maphores par tableau = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "nombre max de s�maphores syst�me = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "nombre max d'ops par appel semop = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valeur max de s�maphore = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ �tats des s�maphores --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "tableaux utilis�s = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "s�maphores allou�s = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "--- Tableaux de s�maphores Cr�ateurs/Propri�taires ---\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "--- S�maphores : op�rations/changements temporels ---\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "last-op"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "last-changed"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Tableaux de s�maphores --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "kernel n'est pas configur� pour traiter les queues de messages\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Messages: lmites --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "nombre max de queues syst�me = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "taille max des messages (octets) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "taille max par d�faut des queues (octets) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Messages: �tats --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "queues allou�es = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "en-t�tes utilis�es = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "espace utilis� = %d octets\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ Queues de messages: Cr�ateurs/Propri�taires --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Queues de messages Transmis/Re�us/Chang�s Temps --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "transmis"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "re�us"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "chang�s"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID des queues de messages --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Queues de messages --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "octets-utilis�s"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "messages"
 
 # disk-utils/mkswap.c:623
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
 msgstr "�chec de la fonction \"shmctl\""
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10975,42 +11343,42 @@ msgstr ""
 "\n"
 "M�moire partag�e segment shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "octets=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
 # disk-utils/mkswap.c:623
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
 msgstr "�chec de la fonction \"msgctl\""
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -11019,31 +11387,31 @@ msgstr ""
 "\n"
 "Queue de messages msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
 msgstr "�chec de la fonction \"semctl\""
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -11052,61 +11420,66 @@ msgstr ""
 "\n"
 "Tableaux de s�maphores semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "valeur"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
-#, c-format
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "id invalide: %s\n"
+
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Utilisation : %s [ -dhV78neo12 ] [ -s <vitesse> ] <ldisque> <p�riph�rique>\n"
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11114,92 +11487,114 @@ msgstr ""
 "\n"
 "Noms <ldisque> connus :\n"
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+#, fuzzy
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+"\n"
+"Noms <ldisque> connus :\n"
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "vitesse non valide : %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ex�cution de \"ldattach\" depuis %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "option non valide"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "discipline (configuration) de ligne non valide : %s"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s n'est pas une ligne s�rie"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "impossible d'obtenir les attributs du terminal %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr "vitesse %d non support�e"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "impossible de sp�cifier les attributs du terminal %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr "impossible de sp�cifier la discipline (configuration) de ligne"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
 msgstr "�chec de transformation en d�mon"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 msgid "none"
 msgstr "rien"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr "para"
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr "complet"
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, c-format
-msgid "error: %s"
-msgstr "erreur : %s "
+#: sys-utils/lscpu.c:158
+#, fuzzy, c-format
+msgid "error: cannot open %s"
+msgstr "%s: impossible d'ouvrir %s\n"
 
-#: sys-utils/lscpu.c:162
-#, c-format
-msgid "error parse: %s"
-msgstr "erreur d'analyse : %s"
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
+#, fuzzy, c-format
+msgid "failed to read: %s"
+msgstr "�chec de la fonction \"stat\" : %s"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "erreur d'analyse\n"
+
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
 msgstr "erreur : �chec de \"strdup\""
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "impossible d'allouer le tampon de sortie"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "analyse impossible pour ce pid"
+
+#: sys-utils/lscpu.c:318
 msgid "error: uname failed"
 msgstr "erreur : �chec de \"uname\""
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+#, fuzzy
+msgid "error: calloc failed"
 msgstr "erreur : �chec de \"malloc\""
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr "erreur : le syst�me de fichiers /sys est inaccessible."
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11212,70 +11607,84 @@ msgstr ""
 "# un unique num�ro ID partant de z�ro.\n"
 "# CPU, coeur, support (socket), noeud"
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 #, fuzzy
 msgid "CPU op-mode(s):"
 msgstr "Support(s) CPU :"
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+#, fuzzy
+msgid "CPU(s):"
+msgstr "Support(s) CPU :"
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr "Thread(s) par coeur :"
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr "Coeur(s) par support CPU :"
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr "Support(s) CPU :"
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr "Noeud(s) NUMA :"
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr "ID du vendeur :"
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr "Famille CPU :"
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr "Mod�le :"
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr "Version :"
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr "CPU MHz :"
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr "Virtualisation :"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr "Vendeur hyperviseur :"
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr "Type de virtualisation :"
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr "%s cache :"
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, fuzzy, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "Noeud(s) NUMA :"
+
+#: sys-utils/lscpu.c:816
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Utilisation : %s [options]\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11289,74 +11698,6 @@ msgstr ""
 "  -p, --parse    sortie en format analysable et non affichable.\n"
 "  -s, --sysroot  sp�cifie un r�pertoire comme racine du syst�me.\n"
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr "erreur : changement de r�pertoire de travail en %s."
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"Utilisation : rdev [ -rv ] [ -o D�CALAGE ] [ IMAGE [ VALEUR [ D�CALAGE ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (ou rdev /linux, etc.) afficher les p�riph�riques ROOT "
-"courants"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         initialiser ROOT � /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              initialiser les ROOTFLAGS (�tat en mode "
-"lecture seulement)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            initialiser la taille du RAMDISK"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              initialiser le MODEVIDEO d'amor�age"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   utiliser une d�calage de N octets"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   identique � rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     identique � rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     identique � rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Note: modes vid�os sont: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
-"2=key2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      utiliser -R 1 pour monter root en mode lecture seulement, -R 0 en mode "
-"lecture-�criture."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "virgule manquante"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11482,11 +11823,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: priorit� pr�c�dente %d, nouvelle priorit� %d\n"
 
-#: sys-utils/rtcwake.c:83
-#, c-format
+#: sys-utils/rtcwake.c:85
+#, fuzzy, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11507,104 +11849,129 @@ msgstr ""
 "    -v | --verbose            mode verbeux\n"
 "    -V | --version            affiche la version\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "lecture de l'heure RTC"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "lit l'heure syst�me"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "convertion de l'heure courante RTC"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "fixe l'alarme de l'horloge RTC"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr "active l'alarme RTC"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr "fixe l'alarme de r�veil RTC"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s : �tat de veille non reconnu \"%s\"\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: intervalle incorrect %s secondes\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: mauvaise valeur pour heure_t %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: version %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: on consid�re que l'horloge RTC utilise l'�chelle UTC...\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Heure UTC utilis�e.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "Heure locale utilis�e.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: vous devez pr�ciser l'heure de r�veil\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "�chec de malloc()"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s : %s non activ� pour les �v�nements \"wakeup\" (r�veil)\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "alarme %ld, heure_syst�me %ld, heure_horloge %ld, secondes %u\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr "%s: l'heure ne peut pas reculer en %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s : \"wakeup\" (r�veil) depuis \"%s\" avec %s � %s\n"
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: impossible d'�tiqueter de %s en %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "lecture horloge RTC"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr "d�sactive l'interruption g�rant l'alarme RTC"
 
@@ -11723,6 +12090,11 @@ msgstr "%s: valeur erron�e\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s n'est pas un p�riph�rique d'impression lp.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "Erreur LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11753,6 +12125,11 @@ msgstr ", en-ligne"
 msgid ", error"
 msgstr ", erreur"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: �chec de mount"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "Erreur LPGETIRQ"
@@ -11798,6 +12175,16 @@ msgid "unshare failed"
 msgstr "�chec de positionnement"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount : impossible de fixer l'id de groupe : %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount : impossible de fixer l'id d'utilisateur : %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "�chec de exec()\n"
@@ -12345,6 +12732,290 @@ 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 "%s: illegal option -- %c\n"
+#~ msgstr "%s: option ill�gale -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "segment allou�s %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "pages allou�s %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "pages r�sidentes  %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "pages �chang�es (swap) %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Performance du swap: %ld tentatives\t %ld succ�s\n"
+
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "erreur d'ex�cution du programme : \"%s\"\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Valeur d'initialisation invalide: %s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "chrt - manipulate real-time attributes of a process.\n"
+#~ "\n"
+#~ "Set policy:\n"
+#~ "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
+#~ "\n"
+#~ "Get policy:\n"
+#~ "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
+#~ "\n"
+#~ "\n"
+#~ "Scheduling policies:\n"
+#~ "  -b | --batch         set policy to SCHED_BATCH\n"
+#~ "  -f | --fifo          set policy to SCHED_FIFO\n"
+#~ "  -i | --idle          set policy to SCHED_IDLE\n"
+#~ "  -o | --other         set policy to SCHED_OTHER\n"
+#~ "  -r | --rr            set policy to SCHED_RR (default)\n"
+#~ "\n"
+#~ "Scheduling flags:\n"
+#~ "  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h | --help          display this help\n"
+#~ "  -p | --pid           operate on existing given pid\n"
+#~ "  -m | --max           show min and max valid priorities\n"
+#~ "  -v | --verbose       display status information\n"
+#~ "  -V | --version       output version information\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "chrt - manipule les attributs temps-r�el d'un processus.\n"
+#~ "\n"
+#~ "Fixer la strat�gie :\n"
+#~ "  chrt [options] <strat�gie> <priorit�> {<pid> | <commande> [<arg> ...]}\n"
+#~ "\n"
+#~ "Obtenir la strat�gie :\n"
+#~ "  chrt [options] {<pid> | <commande> [<arg> ...]}\n"
+#~ "\n"
+#~ "\n"
+#~ "Strat�gies de planification d'ex�cution :\n"
+#~ "  -b | --batch         fixe la strat�gie � SCHED_BATCH\n"
+#~ "  -f | --fifo          fixe la strat�gie � SCHED_FIFO\n"
+#~ "  -i | --idle          fixe la strat�gie � SCHED_IDLE\n"
+#~ "  -o | --other         fixe la strat�gie � SCHED_OTHER\n"
+#~ "  -r | --rr            fixe la strat�gie � SCHED_RR (par d�faut)\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -h | --help          affiche cette aide\n"
+#~ "  -p | --pid           agit sur le pid donn�\n"
+#~ "  -m | --max           affiche les priorit�s min/max valables\n"
+#~ "  -v | --verbose       affiche les informations d'�tat\n"
+#~ "  -V | --version       affiche les informations de version\n"
+#~ "\n"
+
+#~ msgid "current"
+#~ msgstr "actuel"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Nouvelle"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Utilisation : fdisk [-b TAILLE] [-u] DISQUE    modifier la table de "
+#~ "partitions\n"
+#~ "       fdisk -l [-b TAILLE] [-u] DISQUE lister les tables de partitions\n"
+#~ "       fdisk -s PARTITION                    donner la taille de "
+#~ "partition en blocs\n"
+#~ "       fdisk -v                                       afficher la version "
+#~ "de fdisk\n"
+#~ "O� DISQUE est quelque chose du genre: /dev/hdb ou /dev/sda\n"
+#~ "et PARTITION est quelque chose du genre: /dev/hda7\n"
+#~ "-u: donne le D�but et la Fin en unit�s de secteurs (au lieu de "
+#~ "cylindres)\n"
+#~ "-b 2048: (pour certains disques optiques) sp�cifie 2048 octets par "
+#~ "secteur\n"
+
+#~ 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 ""
+#~ "Utilisation : fdisk [-l] [-b TAILLE] [-u] p�riph�rique\n"
+#~ "i.e.: fdisk /dev/hda  (pour le premier disque IDE)\n"
+#~ "  ou: fdisk /dev/sdc  (pour le 3e disque SCSI)\n"
+#~ "  ou: fdisk /dev/eda  (pour le 1er disque PS/2 ESDI)\n"
+#~ "  ou: fdisk /dev/rd/c0d0  ou: fdisk /dev/ida/c0d0  (pour des "
+#~ "p�riph�riques RAID)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "Le nombre de cylindres pour ce disque est fix� � %d.\n"
+#~ "Il n'y a rien d''incorrect avec cela, mais c'est plus grand que 1024,\n"
+#~ "et cela pourrait causer des probl�mes pour certaines installations:\n"
+#~ "1) logiciels qui sont ex�cut�s � l'amor�age (i.e., vieilles versions de "
+#~ "LILO)\n"
+#~ "2) logiciels d'amor�age et de partitionnement pour d'autres OS\n"
+#~ "   (i.e., DOS FDISK, OS/2 FDISK)\n"
+
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount : media non pr�sent dans %s ...nouvel essai\n"
+
+#~ msgid "execvp failed"
+#~ msgstr "�chec de \"execvp\""
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "usage : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h pour l'aide.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Sp�cifications des ressources:\n"
+#~ "\t-m : m�moire partag�e (shared_mem)\n"
+#~ "\t-q : messages\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : s�maphores\n"
+#~ "\t-a : tout (par d�faut)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Format de sortie:\n"
+#~ "\t-t : temps\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : cr�ateur\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : limites\n"
+#~ "\t-u : sommaire\n"
+
+#~ msgid "error: %s"
+#~ msgstr "erreur : %s "
+
+#~ msgid "error parse: %s"
+#~ msgstr "erreur d'analyse : %s"
+
+#~ msgid "error: /sys filesystem is not accessable."
+#~ msgstr "erreur : le syst�me de fichiers /sys est inaccessible."
+
+#~ msgid "error: change working directory to %s."
+#~ msgstr "erreur : changement de r�pertoire de travail en %s."
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "Utilisation : rdev [ -rv ] [ -o D�CALAGE ] [ IMAGE [ VALEUR "
+#~ "[ D�CALAGE ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (ou rdev /linux, etc.) afficher les p�riph�riques ROOT "
+#~ "courants"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         initialiser ROOT � /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              initialiser les ROOTFLAGS (�tat en mode "
+#~ "lecture seulement)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            initialiser la taille du RAMDISK"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr ""
+#~ "  rdev -v /dev/fd0 1              initialiser le MODEVIDEO d'amor�age"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   utiliser une d�calage de N octets"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   identique � rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     identique � rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     identique � rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Note: modes vid�os sont: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      utiliser -R 1 pour monter root en mode lecture seulement, -R 0 en "
+#~ "mode lecture-�criture."
+
+#~ msgid "missing comma"
+#~ msgstr "virgule manquante"
+
 #~ msgid "%s: found %sswap v%d signature string for %d KiB PAGE_SIZE\n"
 #~ msgstr ""
 #~ "%s : cha�ne de signature trouv�e %sswap v%d pour PAGE_SIZE de %d Ko\n"
diff --git a/po/hu.po b/po/hu.po
index a0da7a87..346185a5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.14-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2008-05-21 18:25+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -102,6 +102,11 @@ msgstr "partíciós tábla újraolvasása"
 msgid "Usage:\n"
 msgstr "Használat:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ jelzés ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -121,6 +126,17 @@ msgstr "Elérhető parancsok:\n"
 msgid "get size in 512-byte sectors"
 msgstr "méret lekérése 512 bájtos szektorokban"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -224,15 +240,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Használat: %s [-n] eszköz\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -334,7 +341,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "a malloc meghiúsult"
 
@@ -950,7 +957,7 @@ msgstr "a(z) „%s” eszköz nem érhető el"
 msgid "%s is not a block special device"
 msgstr "a(z) %s nem egy speciális blokkos eszköz"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "a(z) %s nem nyitható meg"
@@ -974,7 +981,7 @@ msgstr "túl sok inode, a maximum 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "nincs elég hely, legalább %lu blokk szükséges"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Eszköz: %s\n"
@@ -1050,7 +1057,7 @@ msgstr ""
 "Használat: mkfs [-V] [-t fájlrendszertípus] [fájlrendszer-beállítások] "
 "eszköz [méret]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1288,7 +1295,7 @@ msgstr "a pozicionálás meghiúsult a blokkok tesztelése közben"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Szokatlan értékek a do_check-ben: ez valószínűleg hibát jelez\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "a pozicionálás meghiúsult a check_blocks-ban"
 
@@ -1371,175 +1378,181 @@ msgstr ""
 "A felhasználó által megadott %d lapméret használata a rendszer %d értéke "
 "helyett\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "az indítás meghiúsult\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "A swap fejlécmérete hibás, nem került kiírásra címke.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "A címke csonkítva.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "nincs címke, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "nincs uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Használat: %s [-c] [-v0|-v1] [-pLAPMÉRET] [-L címke] [-U UUID] /dev/név "
 "[blokkok]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "túl sok hibás lap"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Nincs elég memória"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "egy hibás lap\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu hibás lap\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "nem lehet visszaállítani a lapozóterület-eszközt"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "nem lehet puffereket lefoglalni az inode-oknak"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "nem lehet puffereket lefoglalni az inode-oknak"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "a rendszerindító szektort nem lehet törölni"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   BSD partíciós tábla kiírása"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   a teljes lemezcímke mutatása"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   a teljes lemezcímke mutatása"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 "%1$s: figyelmeztetés: a -U figyelmen kívül marad (a(z) %1$s nem támogatja az "
 "UUID-ket)\n"
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: hiba: a(z) %d verziószám ismeretlen\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "hiba: az UUID feldolgozás meghiúsult"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s hiba: Nem állítja be sehová a lapozóterületet?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: hiba: a(z) %lu KiB méret nagyobb mint az eszköz %lu KiB mérete\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s hiba: a lapozóterületnek legalább %ld KiB méretűnek kell lennie\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: figyelmeztetés: a lapozóterület %ld KiB méretre lesz csonkítva\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 "%s: hiba: a lapozóeszköz létrehozására nem történik kísérlet a(z) „%s” "
 "eszközön\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 "%s: hiba: a(z) %s csatolva van, a lapozóterület nem kerül létrehozásra.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "A lapozóterület nem állítható be: olvashatatlan"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "%d verziójú lapozóterület beállítása, mérete: %llu kiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: nem lehet írni az aláíráslapra: %s"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "az fsync meghiúsult"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: a selinux fájlcímke nem kérhető le: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "nem hajtható végre a matchpathcon() hívás"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "nem hozható létre új selinux kontextus"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "nem számítható ki a selinux kontextus"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: %s nem címkézhető át (erre: %s): %s\n"
@@ -1602,63 +1615,114 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "hiba a szolgáltatás leállításakor: „%s”"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Használhatatlan"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "nem lehet visszaállítani a lapozóterület-eszközt"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Szabad terület"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: nincs ilyen partíció\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: hiba: a(z) %d verziószám ismeretlen\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "a pozicionálás sikertelen a write_tables-ben"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
+
+#: disk-utils/swaplabel.c:203
+#, fuzzy
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+"%1$s: figyelmeztetés: a -U figyelmen kívül marad (a(z) %1$s nem támogatja az "
+"UUID-ket)\n"
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Használhatatlan"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Szabad terület"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "A lemez megváltozott.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "A rendszer újraindításával biztosíthatja a partíciós tábla megfelelő "
 "frissítését.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1671,232 +1735,232 @@ msgstr ""
 "létre vagy módosított, akkor további információkért\n"
 "olvassa el a cfdisk kézikönyv oldalát.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "VÉGZETES HIBA "
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Üssön le egy billentyűt a kilépéshez"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Nem lehet pozicionálni a lemezmeghajtón"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "A lemezmeghajtó nem olvasható"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "A lemezmeghajtó nem írható"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Túl sok partíció"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "A partíció a 0. szektor előtt kezdődik"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "A partíció a 0. szektor után fejeződik be"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "A partíció a lemez vége után kezdődik"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "A partíció a lemezmeghajtó után végződik"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "A partíció az utolsó részleges cilinder után végződik"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "a logikai partíciók nincsenek a lemezlistában"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "logikai partíciók fedik egymást"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "megnövelt logikai partíciók fedik egymást"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "Belső hiba logikai partíció kiterjesztett partíció nélküli létrehozása során!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Nem hozható létre logikai meghajtó -- ez két kiterjesztett partíciót hozna "
 "létre"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "A menüelem túl hosszú. A menü furcsán jelenhet meg."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr ""
 "A menünek nincs iránya. Alapértelmezetten vízszintes kerül felhasználásra."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Érvénytelen billentyű"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Nyomjon meg egy billentyűt a folytatáshoz"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Elsődleges"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Új elsődleges partíció létrehozása"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logikai"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Új logikai partíció létrehozása"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Ne hozzon létre partíciót"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Belső hiba !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Méret (MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Kezdet"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Partíció hozzáadása a szabad terület elején"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Vége"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Partíció hozzáadása a szabad terület végén"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Nincs hely a kiterjesztett partíció létrehozásához"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Nincs jelen partíciós tábla.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Nincs partíciós tábla. Indítás üres táblával."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "A partíciós tábla aláírása hibás"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "A partíciós tábla típusa ismeretlen"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Üres táblával szeretne indulni [i/N]?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Több cilindert adott meg, mint amennyi elfér a lemezen"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Nem nyitható meg a lemezmeghajtó"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "A megnyitott lemez csak olvasható - nincs joga írni rá"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "Figyelmeztetés: Nem támogatott GPT (GUID partíciós tábla). Használja a GNU "
 "Parted-et."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Nem lehet lekérdezni a lemez méretét"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Hibás elsődleges partíció"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Hibás logikai partíció"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Figyelmeztetés: ez megsemmisítheti a lemezen található adatait!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "Biztosan ki akarja írni a partíciós táblát a lemezre? (igen vagy nem): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "nem"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "A partíciós tábla nem került a lemezre"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "igen"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Az „igen” vagy „nem” egyikét írja be"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Partíciós tábla kiírása a lemezre..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "A partíciós tábla kiírva a lemezre"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1904,87 +1968,87 @@ msgid ""
 msgstr ""
 "A partíciós tábla kiírva, de újraolvasni nem sikerült. Újraindítás szükséges."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Egy elsődleges partíció sincs indíthatóként kijelölve. A DOS MBR ezt nem "
 "tudja elindítani."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Több elsődleges partíció van indíthatóként kijelölve. A DOS MBR ezt nem "
 "tudja elindítani."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Adjon meg fájlnevet vagy nyomja meg az ENTER-t a képernyő megjelenítéshez: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Nem nyitható meg a(z) „%s” fájl"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Lemezmeghajtó: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "0. szektor:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "%d. szektor:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Nincs  "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Els/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Elsődleges"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logikai"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Indítható"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Nincs"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "A(z) „%s” partíciós táblája\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Első     Utolsó\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1992,7 +2056,7 @@ msgstr ""
 " # Típus     Szektor   Szektor   Eltolás   Hossz  Fájlrendszer Típus (ID)  "
 "Jelző\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2000,466 +2064,466 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ---Kezdet--          ---Vég---       Kezdet     Szám\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr " # Jelzők Fej Szekt Cil   ID  Fej Szektor Cil    Szektor Szektorok\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Nyers"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Tábla megjelenítése nyers formában"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Szektorok"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Tábla megjelenítése szektorok szerint"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Táblázat"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Csak megjeleníti a partíciós táblát"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Ne jelenjen meg a tábla"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "A cfdisk súgója"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Ez a cfdisk, egy curses alapú lemezparticionáló program, amellyel"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "létrehozhatja, törölheti és módosíthatja a partícióit a"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "merevlemezen."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Parancs     Jelentés"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Az aktuális partíció megjelölése indíthatóként"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Az aktuális partíció törlése"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          A cilinder-, fej-, és sávonkénti szektorszám módosítása"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             FIGYELMEZTETÉS: Ezt a lehetőséget csak akkor használja,"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             ha tudja, hogy mit csinál."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Ezen képernyő megjelenítése"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Az aktuális partíció lemezkihasználásának maximalizálása"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Megjegyzés: Ez inkompatibilissé teheti a partíciót a "
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS-sal, OS/2-vel, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Új partíció létrehozása a szabad területből"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          A partíciós tábla kiírása a képernyőre vagy fájlba"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Számos különböző partícióformátum létezik,"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             amelyek közül választhat:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Nyers adatok (pontosan az, ami ki lesz írva a lemezre)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Táblázat szektorok szerint rendezve"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Táblázat nyers formában"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Kilépés a programból a partíciós tábla kiírása nélkül"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          A fájlrendszer típusának megváltoztatása"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          A partícióméret kijelzési egységének megváltoztatása"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Választhat MB-ok, szektorok és cilinderek között"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Kiírja a partíciós táblát a lemezre (csak a nagy W érvényes)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Ez letörli az összes adatot a lemezről, ezért"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             erősítse, vagy tagadja meg az írást az „igen”"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             vagy „nem” beírásával"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Fel nyíl     A kurzort az előző partícióra mozgatja"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Le nyíl      A kurzort a következő partícióra mozgatja"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Újrarajzolja a képernyőt"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Ez a képernyő"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Megjegyzés: Az összes parancs beírható kis és nagy betűvel is"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "kivéve kiírásnál (W)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cilinderek"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Cilinderek geometriájának megváltoztatása"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Fejek"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Fejek geometriájának megváltoztatása"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Szektorok geometriájának megváltoztatása"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Kész"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "A geometria megváltoztatása kész"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Adja meg a cilinderek számát: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Érvénytelen cilinderérték"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Adja meg a fejek számát: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Érvénytelen fejszám"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Adja meg a sávonkénti szektorok számát: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Érvénytelen szektorszám"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Adja meg a fájlrendszer típusát: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "A fájlrendszer típusa nem módosítható üresre"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "A fájlrendszer típusa nem módosítható kiterjesztettre"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ism(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Els/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Ismeretlen (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Lemezmeghajtó: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Méret: %lld bájt, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Méret: %lld bájt, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Fejek: %d   Sávonkénti szektorszám: %d   Cilinderek: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Név"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Jelek"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Part. típus"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "FR típus"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Címke]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "   Szektorok"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cilinderek"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Méret (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Méret (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Aktív"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Az aktuális partíció indíthatóvá tétele"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Törlés"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Az aktuális partíció törlése"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "A lemezgeometria módosítása (csak haladóknak)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Súgó"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Segítség kiírása"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maximal."
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximalizálja az aktuális partíció lemezkihasználását (csak haladónak)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Új"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Új partíció létrehozása a szabad területen"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Megnézés"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "Kiírja a partíciós táblát a képernyőre vagy egy fájlba"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Kilépés"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Kilépés a partíciós tábla kiírása nélkül"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Típus"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "A fájlrendszer típusának módosítása (DOS, Linux, OS/2, stb)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Egység"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "A partícióméret kijelzési egységének megváltoztatása (MB, Szekt., Cil.)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Kiírás"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "A partíciós tábla kiírása a lemezre (adatvesztést okozhat)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Ez a partíció nem tehető indíthatóvá"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Nem törölhet üres partíciót"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Nem maximalizálhatja ezt a partíciót"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Ez a partíció használhatatlan"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Ez a partíció már használatban van"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Üres partíció típusa nem módosítható"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Nincs több partíció"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Érvénytelen parancs"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2530,9 +2594,9 @@ msgstr ""
 "\n"
 "BSD címke a következő eszközön: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Parancs Művelet"
 
@@ -2552,9 +2616,9 @@ msgstr "   i   rendszertöltő telepítése"
 msgid "   l   list known filesystem types"
 msgstr "   l   az ismert fájlrendszertípusok felsorolása"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   ezen menü kiírása"
 
@@ -2566,14 +2630,14 @@ msgstr "   n    új BSD partíció hozzáadása"
 msgid "   p   print BSD partition table"
 msgstr "   p   BSD partíciós tábla kiírása"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   kilépés mentés nélkül"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   vissza a főmenübe"
 
@@ -2616,13 +2680,13 @@ msgstr "Nincs *BSD partíció a következőn: %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD lemezcímke parancs (m = súgó): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Első %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Utolsó %s vagy +méret vagy +méretM vagy +méretK"
@@ -2768,7 +2832,7 @@ msgstr "sávonkénti szektorok"
 msgid "tracks/cylinder"
 msgstr "cilinderenkénti sávok"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cilinderek"
@@ -2829,7 +2893,7 @@ msgstr "A rendszerindító telepítve a következőre: %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partíció (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "A létrehozott partíciók száma elérte a maximumot\n"
@@ -2853,224 +2917,207 @@ msgstr ""
 "\n"
 "Lemezek szinkronizálása.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Használat: fdisk [-b SZM] [-u] LEMEZ   Partíciós tábla módosítása\n"
-"       fdisk -l [-b SZM] [-u] LEMEZ    A partíciós táblák kiírása\n"
-"       fdisk -s PARTÍCIÓ               A partícióméret megadása blokkban\n"
-"       fdisk -v                        Az fdisk verziószáma\n"
-"A LEMEZ /dev/hdb vagy /dev/sda alakban adható meg,\n"
-"a PARTÍCIÓ pedig /dev/hda7 alakban\n"
-"-u: A kezdet és vég megadása szektorban (cilinder helyett)\n"
-"-b 2048: (bizonyos MO lemezeknél) 2048 bájtos szektorok használata\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Használat: fdisk [-l] [-b SZM] [-u] eszköz\n"
-"Például: fdisk /dev/hda  (az első IDE meghajtó)\n"
-"   vagy: fdisk /dev/sdc  (a harmadik SCSI lemez)\n"
-"   vagy: fdisk /dev/eda  (az első PS/2 ESDI lemez)\n"
-"   vagy: fdisk /dev/rd/c0d0  vagy: fdisk /dev/ida/c0d0  (RAID eszközök)\n"
-"   ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "A(z) %s nem nyitható meg\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "A(z) %s nem olvasható\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Nem lehet a(z) %s eszközön pozicionálni\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "A(z) %s nem írható\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "A BLKGETSIZE ioctl meghiúsult a következőn: %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Nem foglalható le több memória\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Végzetes hiba\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   a csak olvasható jelző átváltása"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd lemezcímke szerkesztése"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   a csatolható jelző átváltása"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   partíció törlése"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   az ismert partíciótípusok felsorolása"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   új partíció hozzáadása"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   új, üres DOS partíciós tábla létrehozása"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   a partíciós tábla kiírása"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   új, üres Sun lemezcímke létrehozása"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   egy partíció rendszerazonosítójának módosítása"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   a megjelenítési/bejegyzésegységek megváltoztatása"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   a partíciós tábla ellenőrzése"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   a tábla lemezre írása és kilépés"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   extra szolgáltatások (csak szakértőknek)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   az indítható partíció kiválasztása"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   indítófájl-bejegyzés szerkesztése"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi lapozópartíció kiválasztása"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   indítható jelző átváltása"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   a DOS kompatibilitás jelzésének átváltása"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   az alternatív cilinderek számának módosítása"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   a cilinderek számának módosítása"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   a partíciós tábla nyers adatainak kiírása"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   a cilinderenkénti extra szektorok számának módosítása"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   a fejek számának módosítása"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   az átrendezési tényező módosítása"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   a forgási sebesség (rpm) módosítása"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   a sávonkénti szektorok számának módosítása"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   a fizikai cilinderek számának módosítása"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   az adatok elejének mozgatása egy partícióban"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   kiterjesztett partíciók felsorolása"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) partíciós tábla létrehozása"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   partíciósorrend javítása"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i   a lemezazonosító módosítása"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Beállítandó"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "fejek"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "szektorok"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3079,31 +3126,11 @@ msgstr ""
 "%s%s.\n"
 "Ez csak az extra szolgáltatások menüből érhető el.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " és "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"A cilinderek beállított száma ezen a meghajtón %d.\n"
-"Ez nem jelent problémát, de ez az érték nagyobb mint 1024,\n"
-"és bizonyos rendszereken problémák lehetnek:\n"
-"1) rendszerinduláskor futó szoftverekkel (például a LILO régi verziói)\n"
-"2) másik operációs rendszerek indításával és azok partícionáló "
-"szoftvereinek\n"
-"   használatával (például DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3114,38 +3141,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Hibás eltolás az elsődleges kiterjesztett partíción\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3154,34 +3180,34 @@ msgstr ""
 "Figyelmeztetés: partíciók kerülnek kihagyásra a(z) %d. után.\n"
 "Ezek törlésre kerülnek a partíciós tábla mentésekor.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Figyelmeztetés: fölösleges linkmutató a(z) %d partíciós táblában\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Figyelmeztetés: fölösleges adatok maradnak figyelmen kívül a(z) %d partíciós "
 "táblában\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Figyelmeztetés: üres partíció\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Lemezazonosító: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Új lemezazonosító (jelenleg 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3193,26 +3219,17 @@ msgstr ""
 "A változások a memóriában maradnak amíg ki nem írja azokat.\n"
 "Ezután természetesen a korábbi tartalom nem lesz visszaállítható.\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Megjegyzés: a szektorméret: %d (és nem %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Nem lesz képes erre a partíciós táblára írni.\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3221,7 +3238,7 @@ msgstr ""
 "Ez a lemez DOS és BSD módban is működhet.\n"
 "Használja a „b” parancsot a BSD módhoz.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3230,17 +3247,17 @@ msgstr ""
 "Az eszköz nem tartalmaz érvényes DOS partíciós táblát, sem Sun, SGI vagy OSF "
 "lemezcímkét\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Belső hiba\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "A(z) %d. fölösleges kiterjesztett partíció figyelmen kívül marad\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3249,7 +3266,7 @@ msgstr ""
 "Figyelmeztetés: a 0x%04x jelző érvénytelen a(z) %d. partíciós táblán, ez a "
 "kiírás után javításra kerül\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3258,21 +3275,21 @@ msgstr ""
 "\n"
 "Három EOF érkezett -- kilépés..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Hexa kód (a kódok listája az L megnyomásával érhető el): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, alapértelmezetten %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "Nem támogatott utótag: „%s”.\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3281,74 +3298,79 @@ msgstr ""
 "Támogatott: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Az alapértelmezett %u érték kerül felhasználásra\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Az érték kívül esik a tartományon.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Partíciószám"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Figyelmeztetés: a(z) %d partíció típusa üres\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "%d. partíció kiválasztva\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Még nincs megadva partíció!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Már minden elsődleges partíció megadásra került!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cilinder"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "szektor"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "A megjelenítési/bejegyzésegységek módosítva: %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "A megjelenítési/bejegyzésegységek módosítva: %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "FIGYELMEZTETÉS: A(z) %d partíció egy kiterjesztett partíció\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "A DOS kompatibilitási jelző be van állítva\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "A DOS kompatibilitási jelző nincs beállítva\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "A(z) %d. partíció még nem létezik!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3361,7 +3383,7 @@ msgstr ""
 "okos dolog. A partíció a 'd' paranccsal törölhető\n"
 "\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3370,7 +3392,7 @@ msgstr ""
 "A partíciót nem változtatható kiterjesztett partícióvá vagy vissza\n"
 "Először törölje le.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3381,7 +3403,7 @@ msgstr ""
 "mivel a SunOS/Solaris erre számít és a Linux is kezeli.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3393,62 +3415,62 @@ msgstr ""
 "elvárja.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "A(z) %d. partíció rendszertípusa módosítva a következőre: %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "A(z) %d. partíció rendszertípusa változatlan: %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "A(z) %d. partíción eltér a fizikai és logikai kezdet (nem Linux?):\n"
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fizikai=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logikai=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "A(z) %d. partíción eltér a fizikai és logikai vég:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "A(z) %i. partíció nem cillinderhatáron kezdődik:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "a várt érték: (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "A(z) %i. partíció nem cilinderhatáron végződik.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "a várt érték: (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "A(z) %i. partíció nem cillinderhatáron kezdődik:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3457,7 +3479,7 @@ msgstr ""
 "\n"
 "%s lemez: %ld MB, %lld) bájt\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3467,32 +3489,37 @@ msgstr ""
 "%s lemez: %ld.%ld GB, %lld bájt\n"
 "\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d fej, %llu szektor, %d cilinder"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", összesen %llu szektor"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Egység: %s %d * %d = %d bájt\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "hibás inode méret"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3501,14 +3528,14 @@ msgstr ""
 "Nincs teendő. A sorrend már helyes.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Kész\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3519,16 +3546,16 @@ msgstr ""
 "Valószínűleg nem a megfelelő eszközt választotta ki.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Indítás   Eleje         Vége      Blokkok  Az  Rendszer\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Eszköz"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3537,7 +3564,7 @@ msgstr ""
 "\n"
 "A partíciós tábla bejegyzései nem a lemezen található sorrendben vannak\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3548,90 +3575,90 @@ msgstr ""
 "%s lemez: %d fej, %llu szektor, %d cilinder\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Szám AF  Fej Szek  Cil  Fej Szek  Cil   Kezdet  Méret Az\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Figyelmeztetés: a(z) %d. partíció a 0. szektort is tartalmazza\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "%d. partíció: a(z) %d. fej nagyobb, mint a maximális %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "%d. partíció: a(z) %d. szektor nagyobb, mint a maximális %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "%d. partíció: a(z) %d. cilinder nagyobb, mint a maximális %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "%d. partíció: az előző %d szektor eltér a teljes %d értéktől\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Figyelmeztetés: az adatok kezdete hibás a(z) %d partíción\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Figyelmeztetés: a(z) %d. partíció átfedi a(z) %d partíciót.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Figyelmeztetés: a(z) %d. partíció üres\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 "A(z) %d. logikai partíció nincs teljesen bejegyezve a(z) %d. partíción\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 "Az összesen lefoglalt szektorok száma (%ld) nagyobb, mint a maximális %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld szektor nincs lefoglalva\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "A(z) %d. partíció már létezik. Törölje le az ismételt hozzáadás előtt.\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "A(z) %llu. szektor már le van foglalva\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Nem érhető el szabad szektor\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Utolsó %1$s, +%2$s vagy +size{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3644,7 +3671,7 @@ msgstr ""
 "\thozzon létre egy üres DOS partíciós táblát (használja az 'o'-t)\n"
 "\tFIGYELMEZTETÉS: Ez megsemmisíti a lemez jelenlegi teljes tartalmát.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3657,23 +3684,23 @@ msgstr ""
 "\thozzon létre egy üres DOS partíciós táblát (használja az 'o'-t)\n"
 "\tFIGYELMEZTETÉS: Ez megsemmisíti a lemez jelenlegi teljes tartalmát.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Először töröljön néhány partíciót és vegyen fel egy kiterjesztett partíciót\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Az összes logikai partíció használatban van\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Elsődleges partíció hozzáadása\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3684,20 +3711,20 @@ msgstr ""
 " %s\n"
 "   p   elsődleges partíció (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   logikai (5 vagy több)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   kiterjesztett"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Érvénytelen partíciószám a(z) „%c” típushoz\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3706,12 +3733,12 @@ msgstr ""
 "A partíciós tábla módosítva!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "ioctl() hívása a partíciós tábla újraolvasásához.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3724,7 +3751,7 @@ msgstr ""
 "következő hibával %d: %s. A rendszermag még mindig a régit használja.\n"
 "Az új tábla a következő újraindítás után lép érvénybe.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3736,7 +3763,7 @@ msgstr ""
 "FIGYELMEZTETÉS: Ha DOS 6.x partíciót hozott létre vagy módosított\n"
 "akkor további információkért olvassa el a cfdisk kézikönyvoldalát.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3745,42 +3772,42 @@ msgstr ""
 "\n"
 "Hiba a fájl lezárásakor\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Adatok kiírása a lemezekre.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "A(z) %d. partíciónak nincs adatterülete\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Az adatok új kezdete"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Szakértői parancs (m = súgó): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Cilinderek száma"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Fejek száma"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Szektorok száma"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Figyelmeztetés: a szektoreltolás beállítása DOS-kompatibilitis módra\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3793,34 +3820,34 @@ msgstr ""
 "fdisk segédprogram nem támogatja a GPT-t. Használja a GNU parted programot.\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "A(z) %s lemez nem tartalmaz érvényes partíciós táblát\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "A(z) „%s” nem nyitható meg\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "a(z) „%s” nem nyitható meg\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ismeretlen parancs\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Ez a rendszermag a szektorméretet önállóan állapítja meg - a -b kapcsoló "
 "figyelmen kívül maradt\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3829,17 +3856,17 @@ msgstr ""
 "Figyelmeztetés: a -b (szektorméret beállítása) kapcsolóhoz meg kell adni egy "
 "eszközt\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "OSF/1 lemezcímke található a(z) %s eszközön, lemezcímke módra váltás.\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Parancs (m = súgó): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3848,16 +3875,16 @@ msgstr ""
 "\n"
 "Az aktuális indítófájl: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Adja meg az új indítófájl nevét: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Az indítófájl változatlan\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3946,15 +3973,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux lapozó"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux natív"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4088,7 +4115,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Több teljes lemez bejegyzés van jelen.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nincsenek partíciók megadva\n"
@@ -4193,7 +4220,7 @@ msgstr ""
 "Írja be az IGEN szót, ha biztosan eltérő módon kívánja címkézni ezt a "
 "partíciót.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "IGEN\n"
 
@@ -4250,7 +4277,7 @@ msgstr ""
 "a korábbi tartalom visszavonhatatlanul elvész.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4271,55 +4298,55 @@ msgstr "Kísérlet a(z) %d. partíció paramétereinek megtartására.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "AZ=%02x\tKEZDET=%d\tHOSSZ=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "Társítatlan"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS gyökér"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS lapozó"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Teljes lemez"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt szektorok"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS fenntartott"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid automatikus felismeréssel"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4332,29 +4359,29 @@ msgstr ""
 "például a fejek, szektorok, cilinderek és partíciók számát\n"
 "vagy készítsen új címkét (a fő menü 's' parancsával)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "A Sun lemezcímke verziószáma hibás [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "A Sun lemezcímke állapota hibás [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "A Sun lemezcímke num_partitions[%u] értéke hibás.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
 msgstr ""
 "Figyelmeztetés: A hibás értékeket javítani kell, ez az íráskor megtörténik\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4367,31 +4394,31 @@ msgstr ""
 "a korábbi tartalom elvész.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sávonkénti szektorok"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "A(z) %d. partíció nem cilinderhatáron végződik.\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "A(z) %d. partíció másokat fed át a(z) %d-%d szektorokban\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Nem használt hézag a 0-%d szektorokon\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nem használt hézag a(z) %d-%d szektorokon\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4400,7 +4427,7 @@ msgstr ""
 "A többi partíció már lefedi a teljes lemezt.\n"
 "Töröljön vagy zsugorítson össze néhányat az újrapróbálkozás előtt.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4409,12 +4436,12 @@ msgstr ""
 "Erősen ajánlott, hogy a 11. partíció\n"
 "lefedje az egész lemezt és 'SGI kötet' típusú legyen.\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "A(z) %d. szektor már le van foglalva\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4424,7 +4451,7 @@ msgstr ""
 "Nem foglalta le a teljes lemezt a 3. partícióval, de a(z) %d %s érték\n"
 "lefoglal egy másik partíciót. A bejegyzése módosítva %d %s értékre.\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4433,7 +4460,7 @@ msgstr ""
 "Ha fenn akarja tartani a SunOS/Solaris kompatibilitást, akkor hagyja a\n"
 "partíciót teljes lemezként (5), a 0. szektortól %u szektorral\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4447,12 +4474,12 @@ msgstr ""
 "Írja be az IGEN szót, ha a partíció biztosan 82-es (Linux lapozó)\n"
 "típusú legyen: "
 
-#: fdisk/fdisksunlabel.c:581
-#, c-format
+#: fdisk/fdisksunlabel.c:576
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4468,11 +4495,11 @@ msgstr ""
 "Egység = %s, összesen %d * 512 bájt\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4481,28 +4508,28 @@ msgstr ""
 "Egység = %s, összesen %d * 512 bájt\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Jelző   Kezdet      Vége   Blokkok  Az  Rendszer\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Az alternatív cilinderek száma"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Cilinderenkénti extra szektorok"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Átrendezési tényező"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Forgási sebesség (percenkénti fordulat)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "A fizikai cilinderek száma"
 
@@ -4711,6 +4738,10 @@ msgstr "Minix / régi Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux lapozó / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 rejtett C: meghajtó"
@@ -5346,95 +5377,95 @@ msgstr "megadta a -n kapcsolót: Semmi sem módosult\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Nem sikerült elmenteni a régi szektorokat - megszakítás\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Nem sikerült a partíció kiírása a(z) %s eszközön\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "hosszú vagy hiányos bemeneti sor - kilépés\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "bemeneti hiba: a(z) %s mezőt „=” jelnek kellene követnie\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "bemeneti hiba: váratlan karakter (%c) a(z) %s mező után\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "azonosítatlan bemenet: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "a szám túl nagy\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "befejező szemét egy szám után\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "nincs hely a partícióleírónak\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "nem lehet felépíteni a körülvevő kiterjesztett partíciót\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "túl sok bemeneti mező\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Nincs hely több elem számára\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Érvénytelen típus\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Figyelmeztetés: a megadott méret (%lu) túllépte az engedélyezhető legnagyobb "
 "méretet (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Figyelmeztetés: üres partíció\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Figyelmeztetés: hibás a partíció kezdete (legelső %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "azonosítatlan indítható jelző - válassza a - vagy * egyikét\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "részleges c,h,s meghatározás?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "A kiterjesztett partíció nem a várt helyen van\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "hibás bemenet\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "túl sok partíció\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5445,43 +5476,43 @@ msgstr ""
 "Általában csak a <kezdet> és a <méret> megadása szükséges (és néha a "
 "<típus>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "eszköz: /dev/hda, /dev/sda vagy ezekhez hasonló eszköznév"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "Hasznos kapcsolók:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [vagy --show-size]: kiírja egy partíció méretét"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 "    -c [vagy --id]:        kiírja vagy módosítja egy partíció azonosítóját"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [vagy --list]:      kiírja az egyes eszközök partícióit"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [vagy --dump]:      ugyanaz, de későbbi bemenetnek megfelelő formában"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [vagy --increment]: cilinderek stb. számozása 1-től és nem 0-tól"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5489,64 +5520,64 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  elfogadás/jelentés szektor/blokk/cilinder/MB "
 "egységben"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [vagy --list-types]:az ismert partíciótípusok kiírása"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [vagy --DOS]:       a DOS kompatibilitáshoz egy kevés hely elpazarlása"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [vagy --re-read]:   a rendszermag újraolvassa a partíciós táblát"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                  csak a megadott számú partíció módosítása"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                   a lemez tényleges írásának kihagyása"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O fájl :              a felülírandó szektorok fájlba mentése"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 "    -I fájl :              az előbbivel mentett szektorok visszaállítása"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [vagy --version]:   verziószám kiírása"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [vagy --help]:      ezen súgó kiírása"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "Veszélyes kapcsolók:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [vagy --show-geometry]: kiírja a rendszermag elképzelését a "
 "geometriáról"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 "    -g [vagy --show-geometry]: kiírja a geometriát a partíciós tábla alapján"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5554,62 +5585,62 @@ msgstr ""
 "    -x [vagy --show-extended]: felsorolja a kibővített partíciókat is\n"
 "                                 vagy leírókat vár hozzájuk a bemenetről"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [vagy --Linux]:    nem jelez Linux alatt lényegtelen dolgok miatt"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [vagy --quiet]:    figyelmeztető üzenetek elnémítása"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "Felülbírálhatja az érzékelt geometriát a következőkkel:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [vagy --cylinders #]:  a használandó cilinderszám beállítása"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [vagy --heads #]:      a használandó fejszám beállítása"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [vagy --sectors #]:    a használandó szektorszám beállítása"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Letilthatja az összes konzisztencia-ellenőrzést a következőkkel:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [vagy --force]:    parancs végrehajtása, akkor is ha értelmetlen"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Használat:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s eszköz\t\t az eszköz aktív partícióinak felsorolása\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s eszköz n1 n2...  az n1... partíciók aktiválása, a többi deaktiválása\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An eszköz\t az n. partíció aktiválása, a többi deaktiválása\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5623,67 +5654,67 @@ msgstr ""
 "programot.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Ezt az ellenőrzést a --force kapcsoló segítségével bírálhatja felül.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "nincs parancs?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "összesen: %llu blokk\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "használat: sfdisk --print-id eszköz partíciószám\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "használat: sfdisk --change-id eszköz partíciószám azonosító\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "használat: sfdisk --id eszköz partíciószám [azonosító]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "csak egy eszköz adható meg (kivéve a -l vagy -s kapcsolót)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "a(z) %s nem nyitható meg írásra és olvasásra\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "a(z) %s nem nyitható meg olvasásra\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Rendben\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilinder, %ld fej, %ld sáv szektoronként\n"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Nem kérhető le a(z) %s mérete\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "hibás aktív bájt: 0x%x a 0x80 helyett\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5691,7 +5722,7 @@ msgstr ""
 "Kész\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5702,36 +5733,36 @@ msgstr ""
 "MBR csak a pontosan egy aktív partíciót tartalmazó lemezről képes "
 "elindulni.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "a(z) %s partíció azonosítója %x és nem rejtett\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Hibás azonosító: %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "A lemez jelenleg használatban van.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Végzetes hiba: a(z) „%s” nem található\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Figyelmeztetés: a(z) %s nem blokkeszköz\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "Ellenőrzésre kerül, hogy pillanatnyilag senki sem használja a lemezt...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5744,30 +5775,30 @@ msgstr ""
 "lapozópartíciók kikapcsolásához. Használja a --no-reread kapcsolót ezen\n"
 "ellenőrzés letiltásához.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Használja a --force kapcsolót az összes ellenőrzés felülbírálásához.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "Rendben\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Régi helyzet:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "A(z) %d. partíció nem létezik, nem lehet módosítani\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Új helyzet:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5775,21 +5806,21 @@ msgstr ""
 "Nem szeretem ezeket a partíciókat - semmit sem változott.\n"
 "(Ha tényleg ezt akarja, használja a --force kapcsolót.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Nem szeretem ezt - Ajánlott a Nem válasz\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Elégedett ezzel? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Valóban lemezre akarja ezt írni? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5798,16 +5829,16 @@ msgstr ""
 "\n"
 "sfdisk: idő előtt vége a bemenetnek\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Kilépés - semmi sem változott\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Az y, n, q (igen, nem, kilépés) egyikével válaszoljon\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5816,7 +5847,7 @@ msgstr ""
 "Az új partíciós tábla sikeresen kiírva\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5827,17 +5858,17 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Nézze meg az fdisk(8) kézikönyvoldalt)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: %s nem nyitható meg: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5845,75 +5876,75 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s nem található"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr ""
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: meg kell adnia a fájlrendszer típusát"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: a(z) %s nem egy párhuzamos (lp) eszköz.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Fájlrendszer-ellenőrzés kényszerítése a következőn: „%s”.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
@@ -5921,42 +5952,42 @@ msgstr ""
 "Használat: mkfs [-V] [-t fájlrendszertípus] [fájlrendszer-beállítások] "
 "eszköz [méret]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: a(z) %s nem egy párhuzamos (lp) eszköz.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "%s nem nyitható meg: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s leválasztva\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "A megmaradt fájlrendszerek leválasztása..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: ismeretlen argumentum: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s a(z) %s csomagból\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Nem foglalható le puffer az inode-oknak"
@@ -6469,7 +6500,13 @@ msgstr "Nem található használható órafelület\n"
 msgid "Unable to set system clock.\n"
 msgstr "A rendszeróra nem állítható be.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6481,17 +6518,17 @@ msgstr ""
 "A hwcolock ezen másolata nem Alpha gépre készült\n"
 "(és így feltételezhetően most sem Alpha gépen fut). Nincs teendő.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Nem lehet lekérni az epoch értékét a rendszermagból.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "A rendszermag feltételezi, hogy az epoch értéke %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6499,22 +6536,22 @@ msgid ""
 msgstr ""
 "A beállítandó epoch érték megadásához használja az „epoch” kapcsolót.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Az epoch értéke nem kerül beállításra (%d értékre) - ez csak teszt.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Nem lehet beállítani az epoch értéket a rendszermagban.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s a(z) %s csomagból\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6533,6 +6570,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6587,7 +6625,7 @@ msgstr ""
 "az\n"
 "                      /etc/adjtime)\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6598,18 +6636,18 @@ msgstr ""
 "                megadja a hwclocknak a használt alpha gép típusát\n"
 "                  (lásd a hwclock(8) kézikönyvoldalt)\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "%s: Nem lehet a megfigyelőrendszerhez csatlakozni.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "A(z) %s nem vár nem kapcsoló paramétereket. A következőt adta meg: %d.\n"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6618,7 +6656,7 @@ msgstr ""
 "Több műveletet adott meg egyszerre.\n"
 "Egyszerre csak egy művelet használható.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6627,7 +6665,7 @@ msgstr ""
 "%s: Az --utc és a --locatime kölcsönösen kizárják egymást.\n"
 "Mégis mindkettőt megadta.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6636,7 +6674,7 @@ msgstr ""
 "%s: Az --adjust és a --noadjfile kölcsönösen kizárják egymást.\n"
 "Mégis mindkettőt megadta.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6645,29 +6683,29 @@ msgstr ""
 "%s: Az --adjfile és a --noadjfile kölcsönösen kizárják egymást, de "
 "mindkettőt megadta.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: A --noadjfile kapcsolóval használnia kell a --utc vagy --localtime "
 "egyikét\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Nem használható a beállítandó idő. Az óra nem állítható be.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Elnézést, csak a rendszergazda módosíthatja a hardverórát.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Elnézést, csak a rendszergazda módosíthatja a rendszerórát.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6676,12 +6714,12 @@ msgstr ""
 "Elnézést, csak a rendszergazda módosíthatja a hardveróra epoch értékét a "
 "rendszermagban.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "A hardveróra egyetlen ismert módon sem érhető el.\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6983,12 +7021,12 @@ msgstr "%s: Nem állítható be az /etc/passwd alapértelmezett kontextusa"
 msgid "Changing finger information for %s.\n"
 msgstr "%s finger információinak megváltoztatása.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: jelszó-hitelesítési (PAM) hiba, megszakítva: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7219,35 +7257,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "VÉGZETES: nem nyitható meg újra a terminál: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s nem soros vonal"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "VÉGZETES: hibás terminál"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: a -h csak rendszergazdaként érhető el.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Használat: login [-fp] [felhasználónév]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "A jelszó-hitelesítés (PAM) nem inicializálható: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "felhasználónév: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "%d SIKERTELEN BEJELENTKEZÉS ERRŐL: %s A KÖVETKEZŐKÉNT: %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7256,18 +7299,18 @@ msgstr ""
 "A bejelentkezés meghiúsult\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TÚL SOK BEJELENTKEZÉSI KÍSÉRLET (%d) ERRŐL: %s A KÖVETKEZŐKÉNT: %s, %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 "A MUNKAMENETBE BEJELENTKEZÉS MEGHIÚSULT ERRŐL: %s A KÖVETKEZŐKÉNT: %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7276,7 +7319,7 @@ msgstr ""
 "\n"
 "A bejelentkezés meghiúsult\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7285,120 +7328,120 @@ msgstr ""
 "\n"
 "Munkamenet-beállítási probléma, megszakítva.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Üres felhasználónév a következőben: %s:%d. Megszakítva."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Érvénytelen felhasználónév („%s”) a következőben: %s:%d. Megszakítva."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Elfogyott a memória\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Érvénytelen felhasználónév"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s bejelentkezése megtagadva ezen a terminálon.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s BEJELENTKEZÉSE MEGTAGADVA ERRŐL: %s A KÖVETKEZŐ TERMINÁLON: %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s BEJELENTKEZÉSE MEGTAGADVA A KÖVETKEZŐ TERMINÁLON: %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "A bejelentkezés meghiúsult\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "BEHÍVÁS EZEN: %s A KÖVETKEZŐTŐL: %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT BEJELENTKEZÉS EZEN: %s A KÖVETKEZŐRŐL: %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT BEJELENTKEZÉS EZEN: %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "BEJELENTKEZÉS EZEN: %s %s FELHASZNÁLÓTÓL A KÖVETKEZŐRŐL: %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "BEJELENTKEZÉS EZEN: %s %s FELHASZNÁLÓTÓL"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Új levele érkezett.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Levele van.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: a programindítás meghiúsult: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY meghiúsult: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "a setuid() hívása meghiúsult"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Nincs %s nevű könyvtár!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Bejelentkezés a „/” saját könyvtárral.\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: nincs memória a parancsfájlnak.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: a parancsfájl nem futtatható: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: nincs parancsértelmező: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7407,65 +7450,65 @@ msgstr ""
 "\n"
 "%s felhasználónév: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "A felhasználónév túl hosszú.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "A NÉV túl hosszú"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "A felhasználónevek nem kezdődhetnek „-” jellel.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "túl sok üres soremelés.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "TÚL SOK soremelés"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "A bejelentkezés %d másodperc után túllépte az időkorlátot\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Utolsó bejelentkezés: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "erről: %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "ezen: %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "BEJELENTKEZÉSI HIBA ERRŐL: %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "BEJELENTKEZÉSI HIBA EZEN: %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d BEJELENTKEZÉSI HIBA ERRŐL: %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d BEJELENTKEZÉSI HIBA EZEN: %s, %s"
@@ -7722,7 +7765,7 @@ msgstr "nincs TERM vagy nem érhető el a terminált\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "hiba a szolgáltatás leállításakor: „%s”"
 
 #: login-utils/simpleinit.c:950
@@ -7732,8 +7775,8 @@ msgstr "hiba a szolgáltatás leállításakor: „%s”"
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "hiba az utolsó program futtatása során\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "hiba a szolgáltatás leállításakor: „%s”"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7862,25 +7905,25 @@ msgstr "%s: nem érhető el az ideiglenes fájl.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: nem olvasható az ideiglenes fájl.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "érvénytelen napérték: használjon 1-%d közötti értéket"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "érvénytelen hónapérték: használjon 1-12 közötti értéket"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "érvénytelen évérték: használjon 1-9999 közötti értéket"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Használat: cal [-13smjyV] [[[nap] hónap] év]\n"
@@ -7904,6 +7947,115 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "%s nem nyitható meg"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Ismeretlen parancs: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "Nem foglalható le puffert.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "Nem foglalható le puffert.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: nem olvasható a(z) %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: írási hiba: %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Nincs %s nevű könyvtár!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "Nem foglalható le puffert.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "Nem foglalható le puffert.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "Nem foglalható le puffert.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "Nem foglalható le puffert.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8060,7 +8212,7 @@ msgstr "%s: a(z) %s átnevezése meghiúsult a következőre: %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "hívás: %s a fájlokhoz...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8071,37 +8223,37 @@ msgstr ""
 "Használja a(z) „%s [kapcsolók] %s” parancsot, ha valóban\n"
 "használni akarja. A parancsfájl nem indult el.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "Használat: script [-a] [-f] [-q] [-t] [fájl]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "A parancsfájl elindult, a fájl: %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s: %d. írási hiba: %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "A parancsfájl elindult ekkor: %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s: írási hiba: %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: nem írható a parancsfájl, hiba: %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8110,17 +8262,17 @@ msgstr ""
 "\n"
 "A parancsfájl kész ekkor: %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "A parancsfájl kész, a fájl: %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "az openpty meghiúsult\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Elfogytak a pszeudoterminálok\n"
@@ -8465,6 +8617,16 @@ msgstr "időtúllépés"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: a következő megnyitása meghiúsult: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "%s nem érhető el"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8495,6 +8657,11 @@ msgstr ""
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "érvénytelen kapcsoló"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8512,7 +8679,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8532,12 +8699,12 @@ msgstr "hiba a(z) %s módjának módosításakor: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8565,76 +8732,74 @@ msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM könyvtár ... -f ] név...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "a malloc meghiúsult"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "a szabványos kimenetre írás meghiúsult"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr ""
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "hiba: az UUID feldolgozás meghiúsult"
+
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "A(z) %s lemez nem tartalmaz érvényes partíciós táblát\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "az openpty meghiúsult\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "bájt"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "az openpty meghiúsult\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Érvénytelen beállított érték: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Használat: %s [kapcsolók] eszköz ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8643,7 +8808,7 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8895,7 +9060,7 @@ msgstr ""
 "Ez a „mount” parancs hurokeszköz-támogatás nélkül lett lefordítva. Fordítsa "
 "újra.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8919,7 +9084,7 @@ msgstr ""
 "felsorolása\n"
 " %1$s [ kapcsolók ] {-f|--find|hurokeszköz} fájl   beállítás\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8947,256 +9112,300 @@ msgstr ""
 " -v | --verbose            részletes mód\n"
 "\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Érvénytelen beállított érték: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Érvénytelen beállított érték: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: nem nyitható meg a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "mount: a(z) %s foglalt"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "A 'loop' támogatás nem volt elérhető fordításkor. Fordítsa újra a "
 "programot.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr "mount: helytelenül idézőjelezett kapcsoló-karaktersorozat: „%s”"
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: a(z) %s „%s” lefordítva a következőre: „%s”\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: az mtab alapján a(z) %s már csatolva van a következőn: %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: az mtab alapján a(z) %s a következő alá van csatolva: %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: a(z) %s nem nyitható meg írásra: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: hiba a(z) %s írásakor: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: hiba a(z) %s módjának módosításakor: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: nem állítható be a csoportazonosító: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: nem állítható be a felhasználóazonosító: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: nem indítható a program: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Kísérlet: %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: nem adta meg a következő fájlrendszerét: %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 "       Kísérlet a(z) %s vagy a(z) %s fájlban említett összes típussal\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "      és úgy tűnik, ez egy lapozóterület\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "      Kísérlet a(z) %s típussal\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s lapozóterületnek tűnik - nem került csatolásra"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "a csatolás meghiúsult"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: csak a rendszergazda csatolhatja a(z) %s eszközt a(z) %s helyre"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: a hurokeszközt kétszer adta meg"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: a típust kétszer adta meg"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: a hurokeszköz beállításának kihagyása\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Érvénytelen beállított érték: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Érvénytelen beállított érték: %s\n"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 "mount: az mtab alapján a(z) %s már csatolva van hurokeszközként a "
 "következőn: %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: a(z) %s hurokeszköz kerül felhasználásra\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: a(z) %s hurokeszközt egy másik folyamat ellopta"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: a hurokeszköz beállítása meghiúsult\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: a hurokeszköz beállítása sikerült\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nem található a(z) %s - létrehozás...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: a(z) %s nem nyitható meg: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: a -p vagy --pass-fd argumentumának számnak kell lennie"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: a(z) %s nem nyitható meg a sebesség beállításához"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: nem állítható be a sebesség: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: az mtab alapján a(z) %s már csatolva van a következőn: %s\n"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: a(z) %s foglalt - újracsatolva csak olvashatóként\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: a(z) %s foglalt - újracsatolva csak olvashatóként\n"
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: nem határozható meg a fájlrendszer típusa és nem is adta azt meg"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: meg kell adnia a fájlrendszer típusát"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: a csatolás meghiúsult"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: a(z) %s csatolási pont nem egy könyvtár"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: hozzáférés megtagadva"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: csak a rendszergazda használhatja a mount parancsot"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: a(z) %s foglalt"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: a proc fájlrendszer már csatolva van"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: a(z) %s már csatolva van, vagy a(z) %s foglalt"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: a(z) %s csatolási pont nem létezik"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: a(z) %s csatolási pont egy szimbolikus link a semmibe"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: a(z) %s speciális eszköz nem létezik"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9205,12 +9414,12 @@ msgstr ""
 "mount: a(z) %s speciális eszköz nem létezik\n"
 "       (az elérési út egy előtagja nem könyvtár)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: a(z) %s még nincs csatolva, vagy a kapcsoló hibás"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9219,7 +9428,7 @@ msgstr ""
 "mount: hibás fájlrendszertípus, hibás kapcsoló, hibás szuperblokk a(z)\n"
 "       %s eszközön, hiányzó kódlap vagy segédprogram, vagy egyéb hiba"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
@@ -9227,7 +9436,7 @@ msgstr ""
 "       (számos fájlrendszer (például nfs, cifs) esetén szükséges\n"
 "       lehet egy /sbin/mount.<típus> segédprogram)"
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9235,7 +9444,7 @@ msgstr ""
 "       (lehet, hogy ez egy IDE eszköz, miközben ide-scsi-t\n"
 "       használ, így az sr0 vagy sda vagy hasonló szükséges?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9243,7 +9452,7 @@ msgstr ""
 "       (lehet, hogy egy kiterjesztett partíciót próbál csatolni\n"
 "       az általa tartalmazott valamelyik logikai partíció helyett?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9251,111 +9460,105 @@ msgstr ""
 "       Egyes esetekben hasznos információk találhatók a syslogban\n"
 "       próbálja kiadni a dmesg | tail parancsot vagy egy ehhez hasonlót\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "a csatolási tábla megtelt"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: nem lehet olvasni a(z) %s szuperblokkját"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: a(z) %s eszköz ismeretlen"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: ismeretlen fájlrendszertípus: „%s”"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: talán a következőre gondolt: %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: talán az „iso9660” típusra gondolt?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: talán a „vfat” típusra gondolt?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: a(z) %s eszközszáma hibás vagy a(z) %s fájlrendszer nem támogatott"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: a(z) %s nem blokkeszköz és az elérés meghiúsult."
 
-#: mount/mount.c:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: a rendszermag nem ismeri fel a(z) %s blokkeszközt\n"
 "       (talán ki kellene adnia az „insmod meghajtó” parancsot?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: a(z) %s nem blokkeszköz (próbálja használni a „-o loop” kapcsolót)"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: a(z) %s nem blokkeszköz"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: a(z) %s nem egy érvényes blokkeszköz"
 
 # ez a következő három %s%s-ben az első %s lesz, meg kell majd ott fordítani
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "blokkeszköz"
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: a(z) %2$s%1$s nem csatolható írásvédettként"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: a(z) %2$s%1$s írásvédett, de megadásra került a „-w” kapcsoló"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: a(z) %2$s%1$s nem csatolható írásvédettként"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: a(z) %2$s%1$s írásvédett, csatolás csak olvashatóként"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr ""
-"mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: a(z) %s már csatolva van a(z) %s alá\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9365,24 +9568,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: nem adott meg típust - a kettőspont miatt nfs típust feltételezek\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: nem adott meg típust - a // előtag miatt cifs típust feltételezek\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: a(z) %s már csatolva van a(z) %s alá\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9458,39 +9661,39 @@ msgstr ""
 "Egyéb kapcsolók: [-nfFrsvw] [-o kapcsolók].\n"
 "További információkért adja ki a „man 8 mount” parancsot.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: ezt csak a rendszergazda teheti meg"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: ezt csak a rendszergazda teheti meg"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "semmi nem lett csatolva"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: nincs ilyen partíció"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: a(z) %s nem található a(z) %s vagy a(z) %s alatt"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: figyelmeztetés: nincs befejező újsor a(z) %s végén\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: a(z) %d. sor hibás a(z) %s fájlban%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; a fájl többi része figyelmen kívül marad"
 
@@ -9503,7 +9706,7 @@ msgstr "hiba az xstrndup hívásban"
 msgid "not enough memory"
 msgstr "nincs elég memória"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9520,7 +9723,7 @@ msgstr ""
 " <fájl>                               a használandó fájl neve\n"
 "\n"
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -9543,7 +9746,7 @@ msgstr ""
 " %1$s -V                            verzió megjelenítése\n"
 "\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9562,133 +9765,138 @@ msgstr ""
 " %1$s -V                           verzió megjelenítése\n"
 "\n"
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: %s: váratlan fájlformátum\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, fuzzy, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 "%s: %s: szoftveres felfüggesztési adatok találhatók. A lapozóterület "
 "ismételt előkészítése.\n"
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "az indítás meghiúsult\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "a végrehajtás meghiúsult\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "a setuid() hívása meghiúsult"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "a szabványos kimenetre írás meghiúsult"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Név"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s meghiúsult.\n"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: figyelmeztetés: a(z) %s jogosultságai (%04o) nem biztonságosak, a "
 "javasolt érték: %04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: A(z) %s fájl kihagyása - úgy tűnik, lyukak vannak benne.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, fuzzy, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s: %s: szoftveres felfüggesztési adatok találhatók. A lapozóterület "
 "ismételt előkészítése.\n"
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s a következőn: %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s meghiúsult.\n"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: nem található a(z) %s eszköze\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "Nem rendszergazda.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s meghiúsult.\n"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9698,37 +9906,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: a program a -f kapcsoló támogatása nélkül lett lefordítva\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: nem állítható be a csoportazonosító: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: nem állítható be a felhasználóazonosító: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: nem indítható program: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s érvénytelen blokkeszköz"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s nincs csatolva"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s szuperblokkja nem írható"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9739,51 +9947,51 @@ msgstr ""
 "        (Egyes esetekben az eszközt használó folyamatokról hasznos\n"
 "         információkat talál az lsof(8) vagy fuser(1))"
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nem található"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s leválasztásához rendszergazdai jog szükséges"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: a blokkeszközök nem engedélyezettek ezen a fájlrendszeren (%s)"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nem található az umount2, kísérlet az umount használatára...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: a(z) %s foglalt - újracsatolva csak olvashatóként\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: nem csatolható újra csak olvashatóként a következő: %s\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s leválasztva\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: nem található a leválasztandó fájlrendszerek listája"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9795,81 +10003,86 @@ msgstr ""
 "kapcsolók]\n"
 "           umount [-f] [-r] [-n] [-v] speciális | csomópont...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Nem választható le: „”\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Kísérlet a következő leválasztására: %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "A(z) %s nem található az mtab fájlban\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: a(z) %s nincs csatolva (az mtab fájl alapján)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: úgy tűnik, hogy a(z) %s többször került csatolásra"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: a(z) %s nincs az fstab fájlban (és Ön nem rendszergazda)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: a(z) %s csatolás nem egyezik az fstab tartalmával"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 "umount: csak a(z) %s felhasználó választhatja le a(z) %s eszközt a(z) %s alól"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: ezt csak a rendszergazda teheti meg"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9877,77 +10090,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "ismeretlen"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "n.szám"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Új"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "a típusparancsfájl (%s) olvasása meghiúsult"
@@ -9970,7 +10202,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9999,11 +10231,121 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "a végrehajtás meghiúsult\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Használat: %s program [argumentum ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "a(z) %s mérete nem állapítható meg"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "a malloc meghiúsult"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "A személyiség beállítása meghiúsult a következőre: %s"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: a következő megnyitása meghiúsult: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "A személyiség beállítása meghiúsult a következőre: %s"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "pozicionálási hiba"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "pozicionálási hiba"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " és "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10149,7 +10491,15 @@ msgstr "   %f egész/mp; %f rögzítve (kar/mp)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Használat: %s [-c] [-n szint] [-s pufferméret]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10158,7 +10508,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10167,31 +10517,36 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Túl kevés argumentum"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Érvénytelen beállított érték: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Érvénytelen beállított érték: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "A „--date” kapcsoló nincs megadva.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "a várt szám helyett „%s” található"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "az openpty meghiúsult\n"
@@ -10238,6 +10593,61 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "az indítás meghiúsult\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "A „--date” kapcsoló nincs megadva.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "A „--date” kapcsoló nincs megadva.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s meghiúsult.\n"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "a gyökér inode nem könyvtár"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "az openpty meghiúsult\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "az openpty meghiúsult\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10335,480 +10745,455 @@ msgstr ""
 "              [-Q üzenetkulcs] [-M osztottmemória-kulcs] [-S "
 "szemaforkulcs] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: érvénytelen kapcsoló -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: érvénytelen kulcs (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "a kulcs elérése megtagadva"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "a kulcs már el van távolítva"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "érvénytelen kulcs"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "ismeretlen hiba a kulcsban"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "az azonosító elérése megtagadva"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "érvénytelen azonosító"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "az azonosító már el van távolítva"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "ismeretlen hiba az azonosítóban"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: ismeretlen argumentum: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "Használat: %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i azonosító\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h - súgó.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"A(z) %s információkat ad az elérhető ipc szolgáltatásokról, amelyek\n"
-"olvasására jogosult.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Erőforrás meghatározása:\n"
-"\t-m: osztott memória\n"
-"\t-q: üzenetek\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s: szemaforok\n"
-"\t-a: minden (alapértelmezés)\n"
+"A(z) %s információkat ad az elérhető ipc szolgáltatásokról, amelyek\n"
+"olvasására jogosult.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
-"Kimeneti formátum\n"
-"\t-t: idő\n"
-"\t-p: pid\n"
-"\t-c: létrehozó\n"
+"-i azonosító [-s -q -m] : az azonosítóval megadott erőforrás-azonosító "
+"részletei\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l: korlátok\n"
-"\t-u: összesítés\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
-"-i azonosító [-s -q -m] : az azonosítóval megadott erőforrás-azonosító "
-"részletei\n"
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "a rendszermag nincs beállítva osztott memória használatára\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---------- Osztott memória korlátai ----------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "szegmensek maximális száma = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "maximális szegmensméret (kilobájt) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "teljes osztott memória maximális mérete (kilobájt) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "minimális szegmensméret = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------- Osztott memória állapota --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "lefoglalt szegmensek:    %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "lefoglalt lapok:         %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "memóriában maradó lapok: %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "kilapozott lapok:        %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Lapozóterület teljesítménye: %ld kísérlet\t %ld sikeres\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------- Osztott memóriaszegmens létrehozói/tulajdonosai ------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "o.m.-az"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "jogok"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "l.fh.az"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "l.cs.az"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "fh.az"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "cs.az"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 "-------- Osztott memória csatolási/leválasztási/módosítási számai -------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "tulajdonos"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "csatolva"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "leválasztva"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "módosítva"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "-------- Osztott memória létrehozója/utolsó művelete --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "l.f.az"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "u.f.az"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------- Osztott memóriaszegmensek --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "kulcs"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "bájt"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "csat.szám"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "állapot"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Nincs beállítva"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "cél"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "zárolva"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "a rendszermag nincs beállítva szemaforok használatára\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "-------- Szemaforok korlátai -----------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "a tömbök maximális száma = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "szemaforok tömbönként maximális száma = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "rendszerszintű szemaforok maximális száma = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "szemafor hívásonkénti műveletek maximális száma = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "szemafor maximális értéke = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "--------- Szemaforállapot -------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "használt tömbök = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "lefoglalt szemaforok = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------- A szemafortömbök létrehozói/tulajdonosai ------- \n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "szem.az"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "---------- Szemaforműveletek/módosítások számai -------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "ut.művelet"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "ut.változás"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------- Szemafortömbök ----------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "szem.sz"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "a rendszermag nincs beállítva üzenetsorok használatára\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "         Üzenetek: korlátok ---------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "rendszerszintű sorok maximálisan = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "maximális üzenetméret (bájt) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "sor alapértelmezett maximális mérete (bájt) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Üzenetek: állapot -------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "lefoglalt sorok = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "használt fejlécek = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "használt terület = %d bájt\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ Üzenetsorok: létrehozók/tulajdonosok --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "üz.az"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "-------- Üzenetsorok küldések/fogadások/módosítások számai -------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "küldés"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "fogadás"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "módosítás"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "----- Üzenetsorok PID-jei --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "u.k.f.az"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "u.f.f.az"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------- Üzenetsorok ---------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "használt bájtok"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "üzenetek"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "az fsync meghiúsult"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10817,42 +11202,42 @@ msgstr ""
 "\n"
 "Osztott memóriaszegmens o.m.az =%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr "f.az=%d\tcs.az=%d\tl.fh.az=%d\tl.cs.az=%d\n"
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mód=%#o\thozzáférési_jog=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bájt=%ld\tu.f.az=%d\tl.f.az=%d\tcsat.szám=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "csatl_idő=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "lev_idő=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "módosítási_idő=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "az fsync meghiúsult"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10861,32 +11246,32 @@ msgstr ""
 "\n"
 "Üzenetsor üz.az=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "f.az=%d\tcs.az=%d\tl.fh.az=%d\tl.cs.az=%d\tmód=%#o\n"
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr "l.bájt=%ld\ts.bájt=%ld\ts.szám=%ld\tu.k.f.az=%d\tu.f.f.az=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "küldési_idő=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "fogadási_idő=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10895,61 +11280,66 @@ msgstr ""
 "\n"
 "Szemafortömb szem.az=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 msgstr "f.az=%d\t cs.az=%d\t l.fh.az=%d\t l.cs.az=%d\n"
 
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mód=%#o, hozzáférési_jog=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "szem.szám = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "oidő = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "cidő = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "szemaforszám"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "érték"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "n.szám"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "z.szám"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "f.az"
 
-#: sys-utils/ldattach.c:89
-#, c-format
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "érvénytelen azonosító: %s\n"
+
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Használat: %s [ -dhV78neo12 ] [ -s <sebesség> ] <llemez> <eszköz>\n"
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10957,97 +11347,118 @@ msgstr ""
 "\n"
 "Ismert <llemez> nevek:\n"
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+#, fuzzy
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+"\n"
+"Ismert <llemez> nevek:\n"
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "érvénytelen sebesség: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach innen: %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "érvénytelen kapcsoló"
 
 # fixme: mi ez?
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "érvénytelen sorelv: %s"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s nem soros vonal"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "a(z) %s terminálattribútumai nem kérhetők le"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr "a sebesség (%d) nem támogatott"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "a(z) %s terminálattribútumai nem állíthatók be"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr "nem állítható be a sorelv"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
 msgstr "nem démonizálható"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Nincs"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "RE hiba: "
+msgid "error: cannot open %s"
+msgstr "%s: %s nem nyitható meg\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "hiba a(z) %s olvasásakor\n"
+msgid "failed to read: %s"
+msgstr "%s nem érhető el"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "pozicionálási hiba"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "a szabványos kimenetre írás meghiúsult"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "Nem foglalható le puffert.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: a következő megnyitása meghiúsult: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr "hiba: az UUID feldolgozás meghiúsult"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "a malloc meghiúsult"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11056,70 +11467,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Régi helyzet:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11128,73 +11552,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "hiba a(z) %s módjának módosításakor: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "Használat: rdev [ -rv ] [ -o ELTOLÁS ] [ KÉP [ ÉRTÉK [ ELTOLÁS ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (vagy rdev /linux, stb.) megjeleníti az aktuális "
-"gyökéreszközt"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
-"  rdev /dev/fd0 /dev/hda2         a gyökér beállítása a /dev/hda2 eszközre"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              a ROOTFLAGS beállítása (csak olvasható)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            a RAMDISK méretének beállítása"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              a kiinduló VIDEOMODE beállítása"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   N bájtos eltolás használata"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   ugyanaz, mint az rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     ugyanaz, mint az rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     ugyanaz, mint az rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Megjegyzés: a videomódok: -3=rákérdezés, -2=Kibővített, -1 Normális VGA, 1=1."
-"kulcs, 2=2.kulcs, ..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"       a -R 1 használatával a gyökér csak olvasható, a -R 0 használatával "
-"írható-olvasható módban csatolható."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "hiányzó vessző"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11315,11 +11672,12 @@ msgstr "prioritás beállítása"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: régi prioritás: %d, új prioritás: %d\n"
 
-#: sys-utils/rtcwake.c:83
-#, c-format
+#: sys-utils/rtcwake.c:85
+#, fuzzy, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11338,104 +11696,129 @@ msgstr ""
 "    -v | --verbose             részletes üzenetek\n"
 "    -V | --version             verziószám megjelenítése\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "rtc idő olvasása"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "rendszeridő olvasása"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "rtc idő átalakítása"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "rtc riasztás beállítása"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr "rtc riasztás engedélyezése"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr "rtc ébresztési riasztás beállítása"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr "%s: ismeretlen felfüggesztési állapot: „%s”\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: érvénytelen időköz (%s másodperc)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: érvénytelen time_t érték (%s)\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: %s verzió\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: feltételezem, hogy az RTC UTC-t használ ...\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "UTC idő használata.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "Helyi idő használata.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: meg kell adnia a felébresztési időt\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "a memóriafoglalás sikertelen"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: a(z) %s nem támogatja az ébresztési eseményeket\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "%ld. riasztás, rendszeridő: %ld, rtc idő: %ld, %u másodperc\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr "%s: az idő nem megy vissza eddig: %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s: ébresztés a(z) „%s” eszközről %s segítségével ekkor: %s\n"
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: %s nem címkézhető át (erre: %s): %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "rtc olvasás"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr "rtc riasztási megszakítás letiltása"
 
@@ -11554,6 +11937,11 @@ msgstr "%s: hibás érték\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: a(z) %s nem egy párhuzamos (lp) eszköz.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "LPGETIRQ hiba"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11584,6 +11972,11 @@ msgstr ", elérhető"
 msgid ", error"
 msgstr ", hiba"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: a csatolás meghiúsult"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ hiba"
@@ -11629,6 +12022,16 @@ msgid "unshare failed"
 msgstr "a pozicionálás meghiúsult"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: nem állítható be a csoportazonosító: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: nem állítható be a felhasználóazonosító: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "a végrehajtás meghiúsult\n"
@@ -12147,6 +12550,232 @@ msgstr "A bemeneti sor túl hosszú.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Elfogyott a memória a puffer növelésekor.\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: érvénytelen kapcsoló -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "lefoglalt szegmensek:    %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "lefoglalt lapok:         %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "memóriában maradó lapok: %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "kilapozott lapok:        %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Lapozóterület teljesítménye: %ld kísérlet\t %ld sikeres\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "hiba az utolsó program futtatása során\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Érvénytelen beállított érték: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "n.szám"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Új"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Használat: fdisk [-b SZM] [-u] LEMEZ   Partíciós tábla módosítása\n"
+#~ "       fdisk -l [-b SZM] [-u] LEMEZ    A partíciós táblák kiírása\n"
+#~ "       fdisk -s PARTÍCIÓ               A partícióméret megadása blokkban\n"
+#~ "       fdisk -v                        Az fdisk verziószáma\n"
+#~ "A LEMEZ /dev/hdb vagy /dev/sda alakban adható meg,\n"
+#~ "a PARTÍCIÓ pedig /dev/hda7 alakban\n"
+#~ "-u: A kezdet és vég megadása szektorban (cilinder helyett)\n"
+#~ "-b 2048: (bizonyos MO lemezeknél) 2048 bájtos szektorok használata\n"
+
+#~ 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 ""
+#~ "Használat: fdisk [-l] [-b SZM] [-u] eszköz\n"
+#~ "Például: fdisk /dev/hda  (az első IDE meghajtó)\n"
+#~ "   vagy: fdisk /dev/sdc  (a harmadik SCSI lemez)\n"
+#~ "   vagy: fdisk /dev/eda  (az első PS/2 ESDI lemez)\n"
+#~ "   vagy: fdisk /dev/rd/c0d0  vagy: fdisk /dev/ida/c0d0  (RAID eszközök)\n"
+#~ "   ...\n"
+
+#~ 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"
+#~ "A cilinderek beállított száma ezen a meghajtón %d.\n"
+#~ "Ez nem jelent problémát, de ez az érték nagyobb mint 1024,\n"
+#~ "és bizonyos rendszereken problémák lehetnek:\n"
+#~ "1) rendszerinduláskor futó szoftverekkel (például a LILO régi verziói)\n"
+#~ "2) másik operációs rendszerek indításával és azok partícionáló "
+#~ "szoftvereinek\n"
+#~ "   használatával (például DOS FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr ""
+#~ "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "a végrehajtás meghiúsult\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "Használat: %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i azonosító\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h - súgó.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Erőforrás meghatározása:\n"
+#~ "\t-m: osztott memória\n"
+#~ "\t-q: üzenetek\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s: szemaforok\n"
+#~ "\t-a: minden (alapértelmezés)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Kimeneti formátum\n"
+#~ "\t-t: idő\n"
+#~ "\t-p: pid\n"
+#~ "\t-c: létrehozó\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l: korlátok\n"
+#~ "\t-u: összesítés\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "RE hiba: "
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "hiba a(z) %s olvasásakor\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "hiba a(z) %s módjának módosításakor: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "Használat: rdev [ -rv ] [ -o ELTOLÁS ] [ KÉP [ ÉRTÉK [ ELTOLÁS ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (vagy rdev /linux, stb.) megjeleníti az aktuális "
+#~ "gyökéreszközt"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr ""
+#~ "  rdev /dev/fd0 /dev/hda2         a gyökér beállítása a /dev/hda2 eszközre"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              a ROOTFLAGS beállítása (csak olvasható)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            a RAMDISK méretének beállítása"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              a kiinduló VIDEOMODE beállítása"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   N bájtos eltolás használata"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   ugyanaz, mint az rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     ugyanaz, mint az rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     ugyanaz, mint az rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Megjegyzés: a videomódok: -3=rákérdezés, -2=Kibővített, -1 Normális VGA, "
+#~ "1=1.kulcs, 2=2.kulcs, ..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "       a -R 1 használatával a gyökér csak olvasható, a -R 0 használatával "
+#~ "írható-olvasható módban csatolható."
+
+#~ msgid "missing comma"
+#~ msgstr "hiányzó vessző"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "elfogyott a memória"
diff --git a/po/id.po b/po/id.po
index 767ef6c8..9cba7f26 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,14 +5,14 @@
 # this file and modified versions, provided that this
 # header is not removed and modified versions are marked
 # as such.
-# Arif E. Nugroho <arif_endro@yahoo.com>, 2006, 2008, 2009.
+# Arif E. Nugroho <arif_endro@yahoo.com>, 2006, 2008, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.16-rc2\n"
+"Project-Id-Version: util-linux-ng 2.17.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
-"PO-Revision-Date: 2009-09-08 18:00+0700\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
+"PO-Revision-Date: 2010-02-18 04:00+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -32,32 +32,28 @@ msgid "get read-only"
 msgstr "get hanya-baca"
 
 #: disk-utils/blockdev.c:82
-#, fuzzy
 msgid "get logical block (sector) size"
-msgstr "get sectorsize"
+msgstr "get ukuran logikal blok (sektor)"
 
 #: disk-utils/blockdev.c:88
-#, fuzzy
 msgid "get physical block (sector) size"
-msgstr "get sectorsize"
+msgstr "get ukuran fisik blok (sektor)"
 
 #: disk-utils/blockdev.c:94
 msgid "get minimum I/O size"
-msgstr ""
+msgstr "get ukuran minimal I/O"
 
 #: disk-utils/blockdev.c:100
 msgid "get optimal I/O size"
-msgstr ""
+msgstr "get ukuran optimal I/O"
 
 #: disk-utils/blockdev.c:106
-#, fuzzy
 msgid "get alignment offset"
-msgstr "ofset inode buruk"
+msgstr "get penyesuaian ofset"
 
 #: disk-utils/blockdev.c:112
-#, fuzzy
 msgid "get max sectors per request"
-msgstr "Extra sektor per cylinder"
+msgstr "get maksimal sektor setiap permintaan"
 
 #: disk-utils/blockdev.c:118
 msgid "get blocksize"
@@ -104,6 +100,11 @@ msgstr "membaca lagi tabel partisi"
 msgid "Usage:\n"
 msgstr "Penggunaan:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -k\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -123,6 +124,17 @@ msgstr "Perintah yang tersedia:\n"
 msgid "get size in 512-byte sectors"
 msgstr "Dapatkan ukuran dalam 512-byte sektor"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -227,15 +239,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "penggunaan: %s [ -n ] perangkat\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -336,7 +339,7 @@ msgstr "tidak dapat memeriksa CRC: format cramfs lama"
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc gagal"
 
@@ -584,9 +587,8 @@ msgid "seek failed"
 msgstr "gagal seek"
 
 #: disk-utils/fsck.minix.c:591 disk-utils/mkfs.minix.c:399
-#, fuzzy
 msgid "unable to alloc buffer for superblock"
-msgstr "tidak mengalokasikan buffer untuk maps"
+msgstr "tidak mengalokasikan penyangga untuk blok super"
 
 #: disk-utils/fsck.minix.c:594
 msgid "unable to read super block"
@@ -944,7 +946,7 @@ msgstr "tidak dapat memperoleh statistik perangkat %s"
 msgid "%s is not a block special device"
 msgstr "%s bukan sebuah perangkat block spesial"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "tidak dapat membuka %s"
@@ -968,7 +970,7 @@ msgstr "terlalu banyak inodes - maksimal adalah 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "ruang tidak cukup, butuh paling tidak %llu blok"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Perangkat: %s\n"
@@ -1042,7 +1044,7 @@ msgstr "error menutup %s"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Penggunaan: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1282,7 +1284,7 @@ msgstr "seek gagal selama pengetesan blocks"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nilai aneh dalam do_check: mungkin bugs\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "seek gagal dalam check_blocks"
 
@@ -1364,168 +1366,173 @@ msgstr ""
 "Menggunakan ukuran page %d yang dispesifikasikan pengguna, dari pada "
 "menggunakan ukuran system %d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s: gagal fork: %s\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Ukuran swap header tidak baik, label tidak akan ditulis.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Label telah dipotong.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "tidak terdapat label, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "tidak ada uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Penggunaan: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blok]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "terlalu banyak pages yang buruk"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Kekurangan memory"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "sebuah page buruk\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu page buruk\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "tidak dapat merewind perangkat swap"
 
-#: disk-utils/mkswap.c:413
-#, fuzzy
+#: disk-utils/mkswap.c:398
 msgid "unable to alloc new libblkid probe"
-msgstr "tidak dapat mengalokasikan buffer untuk inodes"
+msgstr "tidak dapat mengalokasikan probe libblkid baru"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "tidak dapat menempatkan perangkat ke penelitian liblkid"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 msgid "unable to erase bootbits sectors"
 msgstr "tidak dapat menghapus sektor bootbits"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s: %s: peringatan: jangan hapus sektor bootbits\n"
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (%s tabel partisi terdeteksi). "
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "        on whole disk. "
 msgstr "        diseluruh disk. "
 
-#: disk-utils/mkswap.c:454
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:439
+#, c-format
 msgid "        (compiled without libblkid). "
-msgstr "        diseluruh disk. "
+msgstr "        (dikompilasi tanpa libblkid). "
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: peringatan: mengabaikan -U (UUIDs tidak didukung oleh %1$s)\n"
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: tidak mendukung versi swapsapce %d.\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "error: UUID parsing gagal"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: error: Tidak ada tempat untuk menset swap?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: error: ukuran %llu KiB lebih besar dari ukuran perangkat %llu KiB\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: error: daerah swap membutuhkan setidaknya %ld kiB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: peringatan: memotong daerah swap menjadi %llu kiB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: error: Tidak akan mencoba untuk membuat perangkat swap di '%s'\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: error: %s ter-mount; tidak akan membuat swapspace.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Tidak dapat men set-up swap-space: tidak dapat dibaca"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Membuat swapspace versi 1, ukuran = %llu kiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: tidak dapat menulis page signature: %s"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync gagal"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: tidak dapat memperoleh selinux file label: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "tidak dapat melakukan matchpathcon()"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "tidak dapat membuat context selinux baru"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "tidak dapat menentukan context selinux"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: tidak dapat mengganti nama %s menjadi %s: %s\n"
@@ -1592,63 +1599,116 @@ msgstr "raw%d:\tterikat ke major %d, minor %d\n"
 msgid "Error setting raw device (%s)\n"
 msgstr "Error mengkonfigurasi perangkat raw (%s)\n"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Tidak dapat digunakan"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "tidak dapat merewind perangkat swap"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Space kosong"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: tidak ada partisi seperti itu\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: tidak mendukung versi swapsapce %d.\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux FS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: gagal untuk membuka: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "gagal mendapatkan pid"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: gagal untuk berpindah ke ofset 0x%jx"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: gagal untuk membuka: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: gagal untuk berpindah ke ofset 0x%jx"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "seek gagal dalam write_tables"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Penggunaan: %s [pilihan] <nama berkas>\n"
+"\n"
+"Pilihan:\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Untuk informasi lebih lanjut lihat wipefs(8).\n"
+"\n"
+
+#: disk-utils/swaplabel.c:203
+#, fuzzy
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr "%1$s: peringatan: mengabaikan -U (UUIDs tidak didukung oleh %1$s)\n"
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Tidak dapat digunakan"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Space kosong"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disk sudah berubah.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Reboot komputer anda untuk memastikan tabel partisi telah benar - benar di-"
 "update.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1661,232 +1721,232 @@ msgstr ""
 "DOS 6.x, tolong lihat manual dari cfdisk untuk informasi \n"
 "lebih lanjut.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "FATAL ERROR"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Tekan tombol manapun untuk keluar dari cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Tidak dapat mencari di disk drive"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Tidak dapat membaca disk drive"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Tidak dapat menulis disk drive"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Terlalu banyak partisi"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Partisi mulai sebelum sektor 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Partisi berakhir sebelum sektor 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Partisi mulai sesudak akhir dari disk"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Partisi berakhir sesudah akhir dari disk"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partisi berakhir di ujung sebagian cylinder"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "partisi logical tidak dalam urutan disk"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "partisi logical saling beroverlap"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "memperbesar partisi logical yang saling beroverlap"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Kesalahan internal membuat drive logical dengan tidak menggunakan "
 "partisi extended !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Tidak dapat membuat drive logical disini -- apakah anda akan membuat dua "
 "partisi extended"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menu item terlalu panjang. Menu mungkin kelihatan janggal."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menu tanpa direksi. Default ke arah horisontal."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Kunci tidak valid"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Tekan sebuah tombol untuk melanjutkan"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Utama"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Buat sebuah partisi primary baru"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logical"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Buat sebuah partisi logical baru"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Batal"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Jangan membuat sebuah partisi"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Kesalahan internal !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Ukuran (dalam MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Diawali"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Tambahkan partisi di awal ruang kosong"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Akhir"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Tambahkan partisi di akhir ruang kosong"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Tidak ada tempat untuk membuat partisi extended"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Tidak ada tabel partisi.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Tidak ada tabel partisi, Dimulai dengan tabel nol."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Signature tidak sesuai di tabel partisi"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Tipe tabel partisi tidak diketahui"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Apakan anda ingin memulai dengan tabel nol [y/N] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Anda menspesifikasikan cylinder yang lebih besar dari ukuran di disk"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Tidak dapat membukan disk drive"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disk terbuka hanya-baca - anda tidak mempunyai ijin untuk menulis"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "Peringatan!! GPT Tidak didukung (GUID Tabel Partisi) Terdeteksi. Gunakan GNU "
 "Parted."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Tidak dapat memperoleh ukuran disk"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Partisi primary tidak baik"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Partisi logical tidak baik"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Peringatan!! Ini mungkin akan menghancurkan data di disk anda!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "Apakah anda yakin ingin menulis tabel partisi ke disk? (ya atau tidak): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "tidak"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Tidak menulis tabel partisi di disk"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "ya"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Tolong jawab 'ya' atau 'tidak'"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Menulis tabel partisi di disk..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Tabel partisi telah tertulis di disk"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
@@ -1894,87 +1954,87 @@ msgstr ""
 "Tabel partisi telah ditulis, tetapi gagal untuk membaca ulang tabel partisi. "
 "Jalankan partprobe(8), kpartx(8) atau reboot untuk memperbarui tabel."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Tidak ada partisi primary yang diberi tanda bootable. DOS MBR tidak dapat "
 "memboot disk ini."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Lebih dari satu partisi primary yang diberi tanda bootable. DOS MBR tidak "
 "dapat memboot disk ini."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Masukkan nama file atau tekan RETURN untuk menampilkan display di layar: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Tidak dapat membuka file '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk Drive: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   None   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primary"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logical"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Boot"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Kosong"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabel partisi untuk %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Pertama     Akhir\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1982,7 +2042,7 @@ msgstr ""
 " # Tipe       Sektor      Sektor   Offset     Length  Tipe Filesystem (ID) "
 "Tanda\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1990,475 +2050,475 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr ""
 "         ----Berawal----      ----Berakhir----   Awal      Nomor dari\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr " # Tanda Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Mentah"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Cetak tabel dengan menggunakan format data mentah"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektor"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Cetak tabel diurut berdasarkan sektor"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Hanya cetak tabel partisi"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Jangan mencetak tabel"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Layar bantuan untuk cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Ini adalah cfdisk, sebuah program untuk mempartisi disk berbasis curses, yang"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 "memungkinkan anda untuk membuat, menghapus, dan memodifikasi partisi di "
 "perangkat"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "disk drive."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Hak Cipta (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Perintah     Arti"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Ubah tanda bootable pada partisi terpilih"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Hapus partisi terpilih"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Ubah parameter cylinders, heads, sector-per-tracks"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 "             PERINGATAN: Pilihan ini seharusnya hanya boleh digunakan oleh "
 "orang yang"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             tahu apa yang mereka kerjakan."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Cetak layar ini"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maksimalkan penggunaan disk dari partisi terpilih"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Catatan: Ini mungkin akan membuat partisi tidak kompatibel "
 "dengan"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Membuat partisi baru dari ruang yang tersisa/kosong"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Cetak tabel partisi di layar atau ke sebuah file"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Terdapat beberapa format yang berbeda untuk partisi"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             yang dapat anda pilih dari:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Data mentah (sama seperti yang akan ditulis di disk)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabel diurut berdasarkan dari sektor"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Tabel dalam format mentah (raw)"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Keluar dari program tanpa menulis tabel partisi"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Ubah tipe filesystem"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Ubah satuan dari ukuran partisi yang ditampilkan"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Rotasi melalui MB, sektor, dan cylinders"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Tulis tabel partisi ke disk (harus mengetikkan huruf besar W)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Karen ini mungkin menghancurkan data di disk, anda harus"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 "             mengkonfirmasikan atau menolak penulisan dengan mengetikkan "
 "'yes' atau"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "              `no'"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Panah Atas   Memindahkan cursor ke partisi sebelumnya"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Panah Bawah  Memindahkan cursor ke partisi sesudahnya"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Menggambar ulang layar"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Mencetak tampilan ini"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Catatan: Semua perintah dapat diketikkan dengan menggunakan huruf "
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "besar atau huruf kecil (kecuali untuk penulisan ke disk)"
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cylinders"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Ubah geometri cylinder"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Heads"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Ubah geometri head"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Ubah geometri sektor"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Selesai"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Selesai tanpa mengubah geometri"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Masukkan jumlah dari cylinder: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Jumlah cylinders tidak valid"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Masukkan jumlah heads:"
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Jumlah head tidak valid"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Masukkan jumlah sektor per track: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Jumlah sektor tidak valid"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Masukkan tipe filesystem: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Tidak dapat mengubah FS type menjadi kosong"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Tidak dapat mengubah FS tipe menjadi extended"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%20X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Tidak diketahui (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disk Drive: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Ukuran: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Ukuran: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Heads: %d    Sektor per Track: %d   Cylinders: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nama"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Tanda"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Tipe Partisi"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Tipe FS"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Sektor"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cylinders"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Ukuran (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Ukuran (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Bootable"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Ubah tanda bootable dari partisi terpilih"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Hapus"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Hapus partisi terpilih"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Ubah geometri disk (expert only)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Bantuan"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Cetak layar bantuan"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maksimalkan"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maksimalkan penggunaan disk pada partisi terpilih (expert only)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Baru"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Buat partisi baru dari ruang kosong"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Cetak"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "Cetak tabel partisi di layar atau ke sebuah file"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Berhenti"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Berhenti dari aplikasi tanpa menulis tabel partisi"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Tipe"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Ubah tipe filesystem (DOS, Linux, OS/2, dan selanjutnya)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Satuan"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Ubah satuan dari ukuran partisi yang ditampilkan (MB, sect, cyl)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Tulis"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Tulis tabel partisi ke disk (Ini mungkin akan menghancurkan data)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Tidak dapat membuat partisi ini menjadi bootable"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Tidak dapat menghapus sebuah partisi kosong"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Tidak dapat memaksimalkan partisi ini"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Partisi ini tidak dapat digunakan"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Partisi ini sudah dipakai"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Tidak dapat mengubah tipe dari sebuah partisi kosong"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Tidak ada partisi lagi"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Perintah tidak valid"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Hak Cipta (C) 1994-2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2530,9 +2590,9 @@ msgstr ""
 "\n"
 "BSD label untuk perangkat: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Aksi perintah"
 
@@ -2552,9 +2612,9 @@ msgstr "   i   install bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   list tipe filesystem yang diketahui"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   cetak menu ini"
 
@@ -2566,14 +2626,14 @@ msgstr "   n   tambahkan sebuah partisi BSD baru"
 msgid "   p   print BSD partition table"
 msgstr "   p   cetak tabel partisi BSD"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   keluar tanpa menyimpan perubahan yang telah dilakukan"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   kembali ke menu utama"
 
@@ -2616,13 +2676,13 @@ msgstr "Tidak ada partisi *BSD di %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Perintah BSD disklabel (m untuk bantuan): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Pertama %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Terakhir %s atau +size atau +sizeM atau +sizeK"
@@ -2767,7 +2827,7 @@ msgstr "sektor/track"
 msgid "tracks/cylinder"
 msgstr "tracks/cylinder"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cylinders"
@@ -2825,7 +2885,7 @@ msgstr "Bootstrap dipasang di %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partisi (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Maksimum jumlah partisi telah dibuat\n"
@@ -2849,226 +2909,223 @@ msgstr ""
 "\n"
 "Sinkronisasi disk.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Penggunaan: fdisk [-b SSZ] [-u] DISK     Ubah tabel partisi\n"
-"            fdisk -l [-b SSZ] [-u] DISK  Tampilkan daftar tabel partisi\n"
-"            fdisk -s PARTISI             Berikan ukuran partisi dalam "
-"blocks\n"
-"            fdisk -v                     Tampilkan versi dari fdisk\n"
-"Disini DISK  memiliki nama seperti /dev/hdb atau /dev/sda\n"
-"dan PARTISI ini memiliki nama seperti /dev/hda7\n"
-"-u: memberikan Awal dan Akhir dalam satuan sector (dari pada dalam "
-"cylinders)\n"
-"-b 2048: (untuk beberapa MO disks) gunakan 2048-byte dari sector\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Penggunaan: fdisk [-l] [-b SSZ] [-u] perangkat\n"
-"E.g.: fdisk /dev/hda  (untuk IDE disk yang pertama)\n"
-"atau: fdisk /dev/sdc  (untuk SCSI DISK yang ketiga)\n"
-"atau: fdisk /dev/eda  (untuk PS/2 ESDI drive)\n"
-"atau: fdisk /dev/rd/c0d0 atau: fdisk /dev/ida/c0d0 (untuk perangkat RAID)\n"
-"....\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+#, fuzzy
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+"Penggunaan:\n"
+" fdisk [pilihan] <disk>    ubah tabel partisi\n"
+" fdisk [pilihan] -l <disk> tampilkan tabel partisi\n"
+" fdisk -s <partisi>        beri ukuran partisi dalam blok\n"
+"\n"
+"Pilihan:\n"
+" -b <besar>                ukuran sektor (512, 1024, 2048 atau 4096)\n"
+" -c                        non-aktifkan mode DOS-kompatibel\n"
+" -h                        tampilkan bantuan\n"
+" -u <besar>                berikan ukuran dalam sektor daripada silinder\n"
+" -v                        tampilkan versi\n"
+" -C <jumlah>               spesifikasikan jumlah dari silinder\n"
+" -H <jumlah>               spesifikasikan jumlah dari head\n"
+" -S <jumlah>               spesifikasikan jumlah dari sektor per track\n"
+"\n"
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Tidak dapat membuka %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Tidak dapat membaca %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Tidak dapat mencari di %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Tidak dapat menulis %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl gagal di %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Tidak dapat mengalokasikan memori lagi\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Fatal error\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   ubah tanda read only"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   edit bsd disklabel"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   ubah tanda dapat di mount"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   hapus sebuah partisi"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   list tipe partisi yang diketahui"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   tambahkan sebuah partisi baru"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   buat sebuah tabel partisi DOS baru yang kosong"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   cetak tabel partisi"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   buat sebuah disklabel Sun yang kosong"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   ubah id dari partisi system"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   ubah satuan dari tampilan/masukan"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   verifikasi tabel partisi"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   tulis tabel ke disk dan keluar"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fungsi tambahan (expert only)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   pilih partisi yang bootable"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   edit masukan bootfile"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   pilih partisi swap sgi"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   ubah tanda bootable"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   ubah tanda kompatibilitas dos"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ubah nomor dari alternatif cylinders"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   ubah nomor dari cylinders"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   cetak data mentah (raw) di tabel partisi"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ubah jumlah sektor lebih dari setiap cylinder"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   ubah jumlah dari heads"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   ubah faktor interleave"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ubah kecepatan rotasi (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   ubah jumlah sektor/track"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ubah jumlah dari physical cylinders"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   pindahkan awal dari data dalam sebuah partisi"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   list partisi extended"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   buat sebuah IRIX (SGI) tabel partisi"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   betulkan urutan dari partisi"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i   ubah identifikasi disk"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Anda harus menset"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "heads"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3077,30 +3134,11 @@ msgstr ""
 "%s%s.\n"
 "Anda dapat melakukan ini dari menu fungsi tambahan.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " dan "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Jumlah dari cylinder untuk disk ini di set ke %d.\n"
-"Tidak ada yang salah dengan hal ini, tetapi ini lebih besar dari 1024,\n"
-"dan dapat membuat menyebabkan masalah dalam beberapa setup dengan:\n"
-"1) aplikasi yang berjalan pada waktu boot (e.g., versi lama dari LILO)\n"
-"2) booting dan partitioning software dari OS yang lain\n"
-"   (e.g., DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3117,38 +3155,49 @@ msgstr ""
 "parted(1) format tabel partisi GUID (GPT).\n"
 "\n"
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
+"\n"
+"Perangkat menampilkan sebuah ukuran sektor logikal yang lebih kecil "
+"daripada\n"
+"ukuran sektor fisik. Menyesuaikan ke batas sektor fisik (atau optimal I/O) "
+"adalah langkah yang\n"
+"direkomendasikan, atau mungkin berdampak pada performansi perangkat.\n"
 
-#: fdisk/fdisk.c:792
-#, c-format
+#: fdisk/fdisk.c:800
+#, fuzzy, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
+"\n"
+"PERINGATAN: MODE kompatibel DOS telah ditinggalkan. Ini sangat dianjurkan\n"
+"            untuk menonaktifkan mode tersebut (perintah 'c')"
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
+"\n"
+"PERINGATAN: penampilan silinder sebagai satuan sudah ditinggalkan.\n"
+"            Gunakan perintah 'u' untuk mengubah satuan ke sektor.\n"
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Bad offset dalam partisi extended primary\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3157,32 +3206,32 @@ msgstr ""
 "Peringatan: mengabaikan partisi sesudah #%d.\n"
 "Mereka mungkin telah menghapus jika anda menyimpan tabel partisi.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Peringatan: extra pointer link dalam tabel partisi %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Peringatan: mengabaikan extra data dalam tabel partisi %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "mengabaikan partisi kosong (%d)\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Identifikasi disk: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Identifikasi disk baru (sekarang 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3196,26 +3245,17 @@ msgstr ""
 "Sesudah itu, tentu, isi sebelumnya tidak dapat dikembalikan lagi.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Note: ukuran sector adalah %d (bukan %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Anda tidak akan dapat menulis ke tabel partisi.\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3224,7 +3264,7 @@ msgstr ""
 "Disk ini memiliki DOS dan BSD magic.\n"
 "Berikan perintah 'b' untuk berubah ke mode BSD.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3233,17 +3273,17 @@ msgstr ""
 "Perangkat tidak berisi tabel partisi yang valid baik untuk DOS, Sun, SGI "
 "ataupun OSF disklabel\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Kesalahan internal\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Mengabaikan extra partisi extended %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3252,7 +3292,7 @@ msgstr ""
 "Peringatan: tanda tidak valid 0x%04x dari tabel partisi %d akan dibetulkan w"
 "(rite)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3261,21 +3301,21 @@ msgstr ""
 "\n"
 "memperoleh EOF thrice - keluar..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Kode hex (ketik L untuk daftar dari kode): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, default %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "Akhiran tidak didukung: '%s'.\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3284,74 +3324,79 @@ msgstr ""
 "Yang didukung: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "                2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Menggunakan nilai default %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Nilai diluar dari jangkauan.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Nomor partisi"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Peringatan: partisi %d memiliki tipe kosong\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partisi yang terpilih %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Tidak ada partisi yang sudah didefinisikan!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Seluruh partisi primary telah didefinisikan!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
 msgstr "Mengubah satuan tampilan/masukan menjadi %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
+msgstr "Mengubah satuan tampilan/masukan menjadi %s\n"
+
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "PERINGATAN: Partisi %d adalah sebuah partisi extended\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "Tanda kompatibilitas DOS telah diset\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Tanda kompatibilias DOS belum diset\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partisi %d belum ada!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3364,7 +3409,7 @@ msgstr ""
 "mungkin tidak baik. Anda dapat menghapus sebuah partisi\n"
 "dengan menggunakan perintah `d'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3373,7 +3418,7 @@ msgstr ""
 "Anda tidak dapat mengubah sebuah partisi menjadi sebuah extended atau \n"
 "sebaliknya. Hapus ini terlebih dahulu.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3384,7 +3429,7 @@ msgstr ""
 "sebagai SunOS/Solaris menduga ini dan mungkin Linux menyukainya.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3395,63 +3440,63 @@ msgstr ""
 "dan partisi 11 sebagai seluruh volume (6) seperti IRIX menduganya.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Menguba tipe sistem partisi dari %d menjadi %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Tipe sistem dari parisi %d tidak berubah: %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Partisi %d memiliki physical/logical awal yang berbeda (bukan-Linux?):\n"
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logical=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partisi %d memiliki physical/logical endings yang berbeda:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partisi %i tidak berawal di batas cylinder:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "seharusnya (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partisi %i tidak berakhir di batas cylinder.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "seharusnya (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
-#, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
-msgstr "Partisi %i tidak berawal di batas cylinder:\n"
+#: fdisk/fdisk.c:1883
+#, c-format
+msgid "Partition %i does not start on physical sector boundary.\n"
+msgstr "Partisi %i tidak berawal di perbatasan sektor fisik.\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3460,7 +3505,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3469,32 +3514,37 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d heads, %llu sektor/track, %d cylinders"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", total %llu sektor"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Units = %s dari %d * %d = %d bytes\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
-msgstr ""
+msgstr "Ukuran sektor (logikal/fisikal): %u bytes / %lu bytes\n"
 
-#: fdisk/fdisk.c:1843
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr "Ukuran I/O (minimal/optimal): %lu bytes / %lu bytes\n"
+
+#: fdisk/fdisk.c:1915
+#, c-format
 msgid "Alignment offset: %lu bytes\n"
-msgstr "ofset inode buruk"
+msgstr "Penyesuaian ofset: %lu bytes\n"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3503,12 +3553,12 @@ msgstr ""
 "Tidak ada yang dilakukan. Urutan sudah dibetulkan.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "Selesai.\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3519,16 +3569,16 @@ msgstr ""
 "Mungkin anda memilih perangkat yang salah\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot      Awal          Akhir    Blocks   Id  System\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Perangkat"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3537,7 +3587,7 @@ msgstr ""
 "\n"
 "Masukan tabel partisi tidak dalam urutan disk\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3548,87 +3598,87 @@ msgstr ""
 "Disk %s: %d heads, %llu sectors, %d cylinders\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Peringatan: partisi %d berisi sektor 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partisi %d: head %d lebih besar dari maksimal %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partisi %d: sektor %d lebih besar dari maksimal %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partisi %d: cylinder %d lebih besar dari maksimal %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partisi %d: sektor sebelumnya %d tidak sesuai dengan total %d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Peringatan: awal dari data tidak baik dalam partisi %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Peringatan: partisi %d overlaps partisi %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Peringatan: partisi %d kosong\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Partisi logical %d tidak seluruhnya berada di partisi %d\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Total sektor teralokasi %llu lebih besar dari pada maksimal %llu\n"
 
-#: fdisk/fdisk.c:2209
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2281
+#, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
-msgstr "%lld sektor tidak dialokasikan %d-byte sektor\n"
+msgstr "Sisa %lld sektor tidak dialokasikan %d-byte sektor\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partisi %d sudah didefinisikan. Hapus ini sebelum menambahkannya.\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektor %llu sudah dialokasikan\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Tidak ada sektor yang kosong\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Terakhir %1$s, +%2$s atau +size{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3641,7 +3691,7 @@ msgstr ""
 "\ttabel partisi DOS baru yang kosong terlebih dahulu. (Gunakan o.)\n"
 "\tPERINGATAN: Ini mungkin akan menghancurkan seluruh isi disk.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3654,24 +3704,24 @@ msgstr ""
 "\ttabel partisi DOS baru yang kosong terlebih dahulu. (Gunakan o.)\n"
 "\tPERINGATAN: Ini mungkin akan menghancurkan seluruh isi disk.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Anda harus menghapus beberapa partisi dan menambahkan sebuah partisi "
 "extended terlebih dahulu\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Seluruh partisi logical sedang digunakan\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Menambahkan sebuah partisi primary\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3682,20 +3732,20 @@ msgstr ""
 "   %s\n"
 "   p   partisi primary (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   logical (5 atau lebih)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   extended"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Nomor partisi tidak valid untuk tipe `%c'\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3704,12 +3754,12 @@ msgstr ""
 "Tabel partisi telah diubah!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Memanggil ioctl() untuk membaca kembali tabel partisi.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3722,7 +3772,7 @@ msgstr ""
 "Kernel masih menggunakan tabel yang lama.Tabel yang baru akan digunakan\n"
 "setelah reboot atau setelah anda menjalankan partprobe(8) atau kpartx(8)\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3735,7 +3785,7 @@ msgstr ""
 ", mohon lihat manual dari fdisk untuk informasi\n"
 "lebih lanjut.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3744,42 +3794,42 @@ msgstr ""
 "\n"
 "Error dalam menutup file\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Sinkronisasi disks.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partisi %d tidak memiliki area data\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Awal baru dari data"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Perintah expert (m untuk bantuan): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Jumlah dari cylinders"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Jumlah dari heads"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Jumlah dari sektor"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Peringatan: setting sektor offset untuk DOS kompatibilitas\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3791,32 +3841,32 @@ msgstr ""
 "PERINGATAN: GPT (GUID Tabel Partisi) terdeteksi di '%s'! aplikasi fdisk "
 "tidak mendukung GPT. Gunakan GNU Parted.\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s tidak memiliki sebuah tabel partisi yang valid\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Tidak dapat membuka %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "tidak dapat membuka %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: perintah tidak diketahui\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Kernel ini mencari ukuran sektornya sendiri - pilihan -b diabaikan\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3825,16 +3875,16 @@ msgstr ""
 "Peringatan: pilihan -b (set ukuran sektor) seharusnya digunakan dengan salah "
 "satuperangkat yang digunakan\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Terdeteksi sebuah OSF/1 disklabel di %s, memasuki mode disklabel.\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Perintah (m untuk bantuan): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3843,16 +3893,16 @@ msgstr ""
 "\n"
 "Boot file yang saat ini digunakan: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Tolong masukkan nama dari boot file yang baru: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot file tidak diubah\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3939,15 +3989,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4082,7 +4132,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Lebih dari satu masukan seluruh disk yang ada.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Tidak ada partisi yang didefinisikan\n"
@@ -4187,7 +4237,7 @@ msgstr ""
 "di bagian keseluruhan disk akan mengganggu ini. Ketik YES jika anda yakin\n"
 "mengenai tagging partisi ini secara berbeda.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "YA\n"
 
@@ -4248,7 +4298,7 @@ msgstr ""
 "akan hilang dan tidak dapat dikembalikan.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4269,55 +4319,55 @@ msgstr "Mencoba untuk menyimpan parameter dari partisi %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tAWAL=%d\tPANJANG=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "Tidak di assign"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Seluruh disk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt sektor"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS reserved"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4330,29 +4380,29 @@ msgstr ""
 "cylinders dan partisi untuk memaksa fresh label \n"
 "(perintah s dalam main menu)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Terdeteksi sun disklabel dengan versi salah [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Terdeteksi sun disklabel dengan sanity salah [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Terdeteksi sun disklabel dengan num_partitions salah [%u].\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
 msgstr ""
 "Peringatan: Nilai salah butuh untuk perbaiki dan akan diperbaiki w(rite)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4364,31 +4414,31 @@ msgstr ""
 "sampai anda memutuskan untuk menulis perubahan tersebut. Sesudah itu, tentu\n"
 ", isi sebelumnya tidak dapat di kembalikan.\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektor/track"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partisi %d tidak berakhir dalam batas cylinder\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partisi %d overlap dengan yang lainnya di sektor %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Gap yang tidak digunakan - sektor 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Gap yang tidak digunakan sektor %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4397,7 +4447,7 @@ msgstr ""
 "Partisi lain sudah melingkupi seluruh disk.\n"
 "Hapus sebagian/kecilkan mereka sebelum mencoba lagi.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4406,12 +4456,12 @@ msgstr ""
 "Ini sangat direkomendasikan partisi ketika melingkupi seluruh disk\n"
 "dan memiliki tipe `Whole disk'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d sudah dialokasikan\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4423,7 +4473,7 @@ msgstr ""
 "%d %s melingkupi beberapa partisi yang lain. Masukan anda telah berubah \n"
 "menjadi %d %s\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4433,7 +4483,7 @@ msgstr ""
 "untuk meninggalkan partisi ini sebagai Whole disk (5), mulai di 0, dengan %u "
 "sectors\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4447,12 +4497,12 @@ msgstr ""
 "yakin, akankah anda menset (tag) partisi tersebut dengan tipe 82 (Linux "
 "swap): "
 
-#: fdisk/fdisksunlabel.c:581
-#, c-format
+#: fdisk/fdisksunlabel.c:576
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4468,11 +4518,11 @@ msgstr ""
 "Satuan = %s dari %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4481,28 +4531,28 @@ msgstr ""
 "Units = %s of %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Tanda   Awal        Akhir  Blocks   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Jumlah dari cylinder alternative"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektor per cylinder"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Faktor Interleave"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Kecepatan rotasi (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Jumlah dari physical cylinders"
 
@@ -4711,6 +4761,10 @@ msgstr "Minix / old Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 hidded C: drive"
@@ -5346,95 +5400,95 @@ msgstr "pilihan -n telah diberikan: Tidak ada yang berubah\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Gagal menyimpan sektor lama - membatalkan\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Gagal menulis partisi di %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "panjang atau baris input tidak complete - berhenti\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "input error: `=' diperkirakan setelah %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "input error: unexpected character %c setelah %s\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input tidak diketahui: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "nomor terlalu besar\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "trailing junk sesudah nomor\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "tidak ada ruang untuk partisi deskripsi\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "tidak dapat membuat extended partisi disekitarnya\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "terlalu banya input\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Tidak ada ruang lagi\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Tipe ilegal\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Peringatan: diberikan ukuran (%lu) melebihi ukuran maksimal yang diijinkan (%"
 "lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Peringatan: partisi kosong\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Peringatan: partisi memiliki awal yang buruk (terlalu awal %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "tanda bootable tidak diketahui - pilih - atau *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "partial c,h,s spesifikasi?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Extended partisi tidak diperkirakan\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "input tidak baik\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "terlalu banyak partisi\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5446,43 +5500,43 @@ msgstr ""
 "<c,h,s> biasanya anda hanya perlu untuk menspesikan <awal> dan <ukuran> (dan "
 "mungkin <tipe>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "perangkat: sesuatu seperti /dev/hda atau /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "pilihan yang berguna:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [atau --show-size]: tampilkan ukuran setiap partisi"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [atau --id]:      mencetak atau mengubab Id dari partisi"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [atau --list]:    tampilkan partisi di setiap perangkat"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [atau --dump]:    idem, tetapi dalam sebuah format yang sesuai untuk "
 "input selanjutnya"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [atau --increment]: nomor cylinders etc. dari 1 dari pada dari 0"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5490,54 +5544,54 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  menerima/melaporkan dalam satuan dari sektor/block/"
 "cylinders/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 "    -T [atau --list-types]:tampilkan daftar dari tipe partisi yang diketahui"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [atau --DOS]:     untuk DOS-kompatibilitas: membuat sedikit ruang"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [atau --re-read]  membuat kernel membaca kembali tabel partisi"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                hanya mengubah partisi nomor #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 tidak menulis sebenarnya ke disk"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O file :            menyimpan sectors yang akan ditulis ke file"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            mengembalikan sektor itu kembali"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [atau --version]: tampilkan versi dari aplikasi"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [atau --help]:    tampilkan pesan ini"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "pilihan yang berbahaya:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [atau --show-geometry]: tampilkan ide kernel mengenai geometri"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5545,7 +5599,7 @@ msgstr ""
 "    -G [atau --show-pt-geometry]: tampilkan geometry yang ditebak dari tabel "
 "partisi"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5555,64 +5609,64 @@ msgstr ""
 "                               atau memperkirakan deskripsi dari partisi di "
 "input"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [atau --Linux]:    jangan mengkomplain mengenai sesuatu yang tidak "
 "berhubungan dengan Linux"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [atau --quiet]:    menekan pesan peringatan"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Anda dapat memaksa pendeteksian geometri dengan menggunakan:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [atau --cylinders #]:set jumlah dari cylinders yang digunakan"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [atau --heads #]:  set jumlah dari heads yang digunakan"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [atau --sectors #]: set jumlah dari sectors yang digunakan"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Anda dapat mematikan seluruh pemeriksaan konsistensi dengan:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [atau --force]:    lakukan seperti yang SAYA katakan, meskipun ini "
 "merupakan perbuatan yang bodoh"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s perangkat\t\t daftar dari partisi aktif di perangkat\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s perangkat n1 n2 ... aktivasi partisi n1 ..., menonaktifkan sisanya\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An perangkat\t aktivasi partisi n, menonaktifkan yang lainnya\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5625,69 +5679,69 @@ msgstr ""
 "tidak mendukung GPT. Gunakan GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Gunakan pilihan --force untuk memaksa pemeriksaan ini.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "tidak ada perintah?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "jumlah: %llu blocks\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "penggunaan: sfdisk --print-id perangkat nomor-partisi\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "penggunaan: sfdisk --change-id perangkat nomor-partisi Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "penggunaan: sfdisk --id perangkat nomor-partisi [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 "tidak dapat menspesifikasikan hanya untuk satu perangkat (kecuali dengan "
 "pilihan -l atau -s)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "tidak dapat membuka %s untuk baca-tulis\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "tidak dapat membuka %s untuk membaca\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Tidak dapat memperoleh ukuran dari %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "active byte tidak baik: 0x%x daripada 0x80\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5695,7 +5749,7 @@ msgstr ""
 "Selesai\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5705,35 +5759,35 @@ msgstr ""
 "LILO,\n"
 "tetapi DOS MBR hanya akan memboot sebuah disk dengan 1 active partisi.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partisi %s memiliki id %x dan ini tidak disembunyikan\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Bad Id %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Disk ini saat ini sedang digunakan.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatal error: tidak dapat menemukan %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Peringatan: %s bukan sebuah perangkat block\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Mengecheck apakah ada yang sedang menggunakan disk saat ini ...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5745,31 +5799,31 @@ msgstr ""
 "Buruk. Umount seluruh filesystem, dan swapoff seluruh partisi swap di disk \n"
 "ini. Gunakan pilihan --no-reread untuk menekan pengechekan ini.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 "Gunakan pilihan --force untuk memaksa pemeriksaan secara keseluruhan.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Keadaan lama:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partisi %d tidak ada, tidak dapat mengubahnya\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Keadaan baru:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5777,21 +5831,21 @@ msgstr ""
 "Saya tidak suka partisi ini -- tidah ada yang diubah.\n"
 "(Jika anda benar - benar menginginkan ini, gunakan pilihan --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Saya tidak menyukai ini - mungkin anda seharusnya menjawab No\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Apakan anda puas dengan keadaan ini? [ynq]"
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Anda ingin menulis ini ke disk? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5800,16 +5854,16 @@ msgstr ""
 "\n"
 "sfdisk: premature diakhir dari masukan\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Selesai - tidak ada yang diubah\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Tolong jawan salah satu dari y,n,q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5818,7 +5872,7 @@ msgstr ""
 "Sukses menulis tabel partisi baru\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5828,17 +5882,17 @@ msgstr ""
 "kemudian gunakan dd(1) untuk menolkan 512 bytes pertama: dd if=/dev/zero \n"
 "of=/dev/foo7 bs=512 count=1 (Lihat fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "PERINGATAN: tidak dapat membuka %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr "PERINGATAN: format buruk di baris %d dari %s\n"
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5850,37 +5904,37 @@ msgstr ""
 "\tseharusnya membetulkan berkas /etc/fstab anda secepatnya.\n"
 "\n"
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr "fsck: %s: tidak ditemukan\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr "%s: tunggu: Tida ada proses anak lagi?!?\n"
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr "Peringatan... %s untuk perangkat %s keluar dengan sinyal %d.\n"
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr "%s %s: status adalah %x, seharusnya tidak pernah terjadi.\n"
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Selesai dengan %s (status keluar %d)\n"
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: Error %d ketika menjalankan fsck.%s untuk %s\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
@@ -5888,11 +5942,11 @@ msgstr ""
 "Baik seluruh atau kosong dari tipe sistem berkas dilewatkan ke -t harus\n"
 "diawali dengan 'no' atau '!'.\n"
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "Tidak dapat mengalokasikan memori untuk tipe sistem berkas\n"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
@@ -5901,68 +5955,68 @@ msgstr ""
 "%s: melewatkan baris buruk dalam /etc/fstab: jalankan mount dengan tahap "
 "bukan nol di fsck\n"
 
-#: fsck/fsck.c:893
-#, fuzzy, c-format
+#: fsck/fsck.c:892
+#, c-format
 msgid "%s: skipping nonexistent device\n"
-msgstr "%s: %s bukan sebuah perangkat lp.\n"
+msgstr "%s: melewatkan perangkat yang tidak ada\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr "fsck: tidak dapat memeriksa %s: fsck.%s tidak ditemukan\n"
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr "Memeriksa seluruh sistem berkas.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--menunggu-- (tahap %d)\n"
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "Penggunaan: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-optoins] "
 "[filesys ...]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: terlalu banyak perangkat\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Tidak dapat membuka %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "Apakah /proc telah terpasang?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr "Harus root untuk dapat memindai untuk mencocokan sistem berkas: %s\n"
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Tidak dapat menemukan sistem berkas yang cocok: %s\n"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: terlalu banyak argumen\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, c-format
 msgid "fsck from %s\n"
 msgstr "fsck dari %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "%s: Tidak dapat mengalokasikan memori untuk fsck_path\n"
@@ -6470,7 +6524,13 @@ msgstr "Tidak ditemukan antarmuka clock yang berguna.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Tidak dapat menset system clock.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6483,17 +6543,17 @@ msgstr ""
 "(dan jadi diasumsikan saat ini tidak berjalan di Alpha).\n"
 "Tidak ada aksi yang dilakukan.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Tidak dapat memperoleh nilai epoch dari kernel.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernel mengasumsikan menggunakan nilai epoch dari %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6502,23 +6562,23 @@ msgstr ""
 "Untuk menset nilai epoch, anda harus menggunakan pilihan 'epoch' untuk "
 "memberitahukan nilai untuk mensetnya.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Tidak menset epoch ke %d - masih dalam pengetesan.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Tidak dapat menset nilai epoch dalam kernel.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s dari %s\n"
 
-#: hwclock/hwclock.c:1311
-#, c-format
+#: hwclock/hwclock.c:1325
+#, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -6536,6 +6596,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6594,7 +6655,7 @@ msgstr ""
 "  -D | --debug        mode penelusuran\n"
 "\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6606,17 +6667,17 @@ msgstr ""
 "(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "%s: Tidak dapat menghubungi ke sistem audit\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s tidak membutuhkan argument. Anda memberikan %d.\n"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6625,7 +6686,7 @@ msgstr ""
 "Anda telah menspesifikasi beberapa fungsi.\n"
 "Anda hanya dapat melakukan satu fungsi dalam satu waktu.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6634,7 +6695,7 @@ msgstr ""
 "%s: Pilihan --utc dan --localtime adalah mutually eksklusive. Anda "
 "menspesifikasikan keduanya.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6643,7 +6704,7 @@ msgstr ""
 "%s: Pilihan --adjust dan --noadjfile adalah mutually eksklusive. Anda "
 "menspesifikasikan keduanya.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6652,29 +6713,29 @@ msgstr ""
 "%s: Pilihan --adjfile dan --noadjfile adalah mutually eksklusive. Anda "
 "menspesifikasikan keduanya.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Dengan --noadjfile, anda harus menspesifikasi baik --utc atau --"
 "localtime\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Tidak ada set-to time yang berguna. Tidak dapat menset clock.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Maaf, hanya superuser yang dapat mengubah Hardware Clock.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Maaf, hanya superuser yang dapat mengubah System Clock.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6683,13 +6744,13 @@ msgstr ""
 "Maaf, hanya superuser yang dapat mengubah Hardware Clock epoch di dalam "
 "kernel.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "Tidak dapat mengakses Hardware Clock melalui semua metode yang diketahui.\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6979,12 +7040,12 @@ msgstr "%s: Tidak dapat menset default context untuk /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "Mengubah informasi finger untuk %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM Gagal, membatalkan: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7212,35 +7273,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATAL: tidak dapat membuka tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "FATAL: %s bukan sebuah terminal"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "FATAL: tty buruk"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h hanya untuk super-user.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "penggunaan: login [-fp] [pengguna]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Tidak dapat menginitialisasi PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "GAGAL LOGIN %d DARI %s UNTUK %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7249,17 +7315,17 @@ msgstr ""
 "Login tidak benar\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TERLALU BANYAK LOGIN DICOBA (%d) DARI %s UNTUK %s, %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "GAGAL SESI LOGIN DARI %s UNTUK %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7268,7 +7334,7 @@ msgstr ""
 "\n"
 "Login tidak benar\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7277,120 +7343,120 @@ msgstr ""
 "\n"
 "Masalah dari sesi setup, batal.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "KOSONG di pengguna (username) dalam %s: %d. Batal."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Pengguna (username) tidak valid \"%s\" dalam %s:%d. Batal."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Kehabisan memory\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Username (pengguna) tidak legal"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login ditolak di terminal ini.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s DITOLAK DARI %s DI TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s DITOLAK DI TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login tidak benar\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP PADA %s OLEH %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT LOGIN DI %s DARI %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT LOGIN DI %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN DI %s OLEH %s DARI %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN DI %s OLEH %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Anda memiliki mail baru.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Anda memiliki mail.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: gagal forking: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY gagal: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() gagal"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Bukan direktori %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Logging in dengan home = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: tidak ada memory untuk shell script.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: tidak dapat mengeksekusi shell script: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: tidak ada shell: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7399,65 +7465,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "nama login terlalu panjang.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NAMA terlalu panjang"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "nama login tidak boleh diawali dengan '-'.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "terlalu banyak linefeeds bare.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "TERLALU BANYAK linefeeds"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Waktu habis untuk Login sesudah %d detik\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Login terakhir: %.*s"
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "dari %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "di %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN GAGAL DARI %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN GAGAL DI %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN GAGAL DARI %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN GAGAL DI %s, %s"
@@ -7714,8 +7780,8 @@ msgid "no TERM or cannot stat tty\n"
 msgstr "tidak ada TERM atau tidak dapat memperoleh statistik tty\n"
 
 #: login-utils/simpleinit.c:938
-#, c-format
-msgid "error stopping service: \"%s\"\n"
+#, fuzzy, c-format
+msgid "error at stopping service \"%s\"\n"
 msgstr "error menghentikan layanan: \"%s\"\n"
 
 #: login-utils/simpleinit.c:950
@@ -7724,9 +7790,9 @@ msgid "Stopped service: %s\n"
 msgstr "Layanan terhent: %s\n"
 
 #: login-utils/simpleinit.c:1070
-#, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "error menjalankan aplikasi: \"%s\"\n"
+#, fuzzy, c-format
+msgid "error at starting service \"%s\"\n"
+msgstr "error menghentikan layanan: \"%s\"\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7854,25 +7920,25 @@ msgstr "%s: tidak dapat memperoleh statistik file sementara.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: tidak dapat membaca file sementara.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "nilai hari ilegal: gunakan 1-%d"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "nilai bulan ilegal: gunakan 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "nilai tahun ilegal: gunakan 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "penggunaan: cal [-13smjyV] [[[hari] bulan] tahun]\n"
@@ -7896,6 +7962,116 @@ msgstr "Penggunaan: %s LABEL=<nama>|UUID=<uuid>\n"
 msgid "unable to resolve '%s'"
 msgstr "tidak dapat menentukan '%s'"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Perintah tidak diketahui: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "gagal mengalokasikan outbuffer"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "gagal menginisialisasi baris penyangga\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: tidak dapat membaca %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: error menulis: %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Untuk informasi lebih lanjut lihat namei(1).\n"
+
+#: misc-utils/findmnt.c:491
+#, fuzzy
+msgid "options are mutually exclusive"
+msgstr "--offset dan --all adalah 'mutually exclusive'"
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Bukan direktori %s!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "gagal menginisialisasi baris penyangga\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "gagal menginisialisasi baris penyangga\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "gagal menginisialisasi baris penyangga\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "gagal menginisialisasi baris penyangga\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8060,7 +8236,7 @@ msgstr "%s: mengubah nama %s ke %s gagal: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s dari ke files...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8071,37 +8247,37 @@ msgstr ""
 "Penggunaan `%s [pilihan] %s' jika anda benar - benar ingin menggunakannya.\n"
 "Script tidak berjalan.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "penggunaan: script [-a] [-f] [-q] [-t] [file]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script dimulai, file adalah %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s: error menulis di %d: %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Script dimulai di %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s: error menulis: %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: tidak dapat menulis berkas script, error: %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8110,17 +8286,17 @@ msgstr ""
 "\n"
 "Script selesai di %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script selesai, file adalah %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty gagal\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Out of pty's\n"
@@ -8170,9 +8346,9 @@ msgid "failed to read timing file %s"
 msgstr "gagal membaca berkas pewaktu %s"
 
 #: misc-utils/scriptreplay.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "timings file %s: %lu: unexpected format"
-msgstr "berkas pewaktu %s: %lu: format yang diduga"
+msgstr "berkas pewaktu %s: %lu: format yang tidak terduga"
 
 #: misc-utils/setterm.c:759
 #, c-format
@@ -8460,6 +8636,16 @@ msgstr "jumlah yang terbaca"
 msgid "bad response length"
 msgstr "panjang balasan buruk"
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "gagal mendapatkan pid"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "gagal untuk mendapatkan statistik: %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8490,6 +8676,11 @@ msgstr "Error membaca dari klien, panjang = %d\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr "operasi %d, masukan jumlah = %d\n"
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "Operasi %d tidak valid\n"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8506,8 +8697,8 @@ msgid "Generated time UUID %s and %d following\n"
 msgstr "UUID waktu yang dihasilkan %s dan %d yang mengikutinya\n"
 
 #: misc-utils/uuidd.c:415
-#, c-format
-msgid "Generated %d UUID's:\n"
+#, fuzzy, c-format
+msgid "Generated %d UUIDs:\n"
 msgstr "Menghasilkan %d UUID:\n"
 
 #: misc-utils/uuidd.c:427
@@ -8526,13 +8717,13 @@ msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Error memanggil daemon uuidd (%s): %s\n"
 
 #: misc-utils/uuidd.c:534
-#, c-format
-msgid "%s and subsequent %d UUID's\n"
+#, fuzzy, c-format
+msgid "%s and subsequent %d UUIDs\n"
 msgstr "%s dan UUID %d selanjutnya\n"
 
 #: misc-utils/uuidd.c:536
-#, c-format
-msgid "List of UUID's:\n"
+#, fuzzy, c-format
+msgid "List of UUIDs:\n"
 msgstr "Daftar dari UUID:\n"
 
 #: misc-utils/uuidd.c:557
@@ -8560,92 +8751,91 @@ msgstr "Penggunaan: %s [-r] [-t]\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nama...\n"
 
-#: misc-utils/wipefs.c:128
-#, fuzzy
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
-msgstr "malloc gagal"
+msgstr "calloc gagal"
 
-#: misc-utils/wipefs.c:150
-#, fuzzy
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
-msgstr "error: strdup gagal"
+msgstr "strdup gagal"
 
-#: misc-utils/wipefs.c:199
-#, fuzzy
-msgid "probing initialization failed"
-msgstr "...sinkronisasi gagal\n"
-
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:202
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
-msgstr ""
+msgid "error: %s: probing initialization failed"
+msgstr "error: %s: gagal melakukan inisialisasi probing"
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:213
 #, fuzzy, c-format
-msgid "%s: failed to seek to offset 0x%jx"
-msgstr "%s: gagal untuk membuka: %s\n"
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "error: %s: sepertinya berisi '%s' tabel partisi"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:259
 #, fuzzy, c-format
+msgid "no magic string found at offset 0x%jx -- ignored"
+msgstr "tidak dapat menemukan sebuah string magic di ofset 0x%jx - diabaikan."
+
+#: misc-utils/wipefs.c:266
+#, c-format
+msgid "%s: failed to seek to offset 0x%jx"
+msgstr "%s: gagal untuk berpindah ke ofset 0x%jx"
+
+#: misc-utils/wipefs.c:273
+#, c-format
 msgid "%s: write failed"
-msgstr "%s: gagal membuka"
+msgstr "%s: gagal menulis"
 
-#: misc-utils/wipefs.c:259
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:275
+#, c-format
 msgid "%zd bytes ["
-msgstr "bytes"
+msgstr "%zd bytes ["
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
-msgstr ""
+msgstr "] dihapus di ofset 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: gagal membuka"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
-msgstr "Nilai set tidak valid: %s\n"
+msgid "invalid offset value '%s' specified"
+msgstr "nilai ofset yang dispesifikasikan tidak valid"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
+#: misc-utils/wipefs.c:341
 #, fuzzy, c-format
 msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Penggunaan: %s [pilihan]\n"
-"\n"
-
-#: misc-utils/wipefs.c:316
-#, c-format
-msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
+" -a, --all           hapus seluruh 'magic strings' (HATI-HATI)\n"
+" -h, --help          pesan bantuan ini\n"
+" -n, --no-act        semua yang harus dilakukan kecuali untuk pemanggilan "
+"write()\n"
+" -o, --offset <num>  offset untuk menghapus, dalam bytes\n"
+" -p, --parsable      tampilkan dalam format yang mudah diparse daripada "
+"format cetak\n"
 
-#: misc-utils/wipefs.c:322
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:347
+#, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 "\n"
-"Untuk informasi lebih lanjut lihat ipcmk(1).\n"
+"Untuk informasi lebih lanjut lihat wipefs(8).\n"
 "\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
-msgstr ""
+msgstr "--offset dan --all adalah 'mutually exclusive'"
 
 #: misc-utils/write.c:101
 #, c-format
@@ -8892,7 +9082,7 @@ msgstr "loop: tidak dapat menghapus perangkat %s: %s\n"
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Mount ini telah dikompile tanpa layanan loop. Tolong di rekompile.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8916,7 +9106,7 @@ msgstr ""
 "associated <berkas> [-o <num>]   daftar seluruh asosiasi dengan <berkas>\n"
 " %1$s [ pilihan ] {-f|--find|loopdev} <berkas> konfigurasi\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8944,251 +9134,303 @@ msgstr ""
 " -v | --verbose           mode verbose\n"
 "\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "nilai ofset '%s' tidak valid"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "nilai ofset '%s' tidak valid"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Perangkat loop adalah %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "tercuri loop=%s ...mencoba lagi\n"
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: perangkat sedang sibuk"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Layanan loop tidak ada pada waktu dikompile. Tolong di rekompile.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+"\n"
+"mount: peringatan: /etc/mtab tidak dapat ditulis (mungkin sistem berkas baca-"
+"saja).\n"
+"       Ini memungkinkan jika informasi yang ditampilkan oleh mount(8) tidak "
+"baru.\n"
+"       Untuk informasi aktual mengenai titik pemasangan sistem periksa "
+"berkas\n"
+"       /proc/mounts.\n"
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr "mount: pilihan string tidak dinyatakan dengan benar '%s'"
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: ditranslasikan %s '%s' ke '%s'\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: menurut mtab, %s telah dimount di %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: menurut mtab, %s telah di mount di %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: tidak dapat membuka %s untuk menulis: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: error dalam menulis %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: error mengubah mode dari %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount tidak dapat menset grup id: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: tidak dapat menset id pengguna: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: tidak dapat melakukan fork: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Mencoba %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 "mount: anda tidak menspesifikasikan sebuah tipe dari filesystem untuk %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Saya akan mencoba semua tipe yang disebutkan dalam %s atau %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       dan ini sepertinya merupakan sebuah swapspace\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Saya akan mencoba tipe %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s kelihatannya seperti swapspace - tidak di mount"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "mount gagal"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: hanya root yang dapat melakukan mount %s di %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: perangkat loop dispesifikasikan dua kali"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: tipe dispesifikasikan dua kali"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: melewatkan setup dari perangkat loop\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "nilai ofset '%s' tidak valid"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "nilai ofset '%s' tidak valid"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: menurut mtab, %s telah dimount di %s sebagai loop"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: akan menggunakan perangkat loop %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: tercuri loop=%s ...mencoba lagi\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: tercuri loop=%s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: gagal menset-up perangkat loop\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: setup perangkat loop telah berhasil\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s tidak ditemukan - membuatnya..\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: tidak dapat membuka %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument untuk -p atau --pass-fd harus berupa sebuah nomor"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: tidak dapat membuka %s untuk menset kecepatan"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount tidak dapat menset kecepatan: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: menurut mtab, %s telah dimount di %s\n"
 
-#: mount/mount.c:1371
-#, fuzzy, c-format
+#: mount/mount.c:1435
+#, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
-msgstr "umount: %s sibuk - di mount lagi secara hanya-baca\n"
+msgstr "mount: peringatan: %s kelihatannya telah dipasan baca-tulis.\n"
+
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "mount: peringatan: %s kelihatannya telah dipasan baca-tulis.\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: Saya tidak dapat menentukan tipe dari filesystem, dan tidak diberikan "
 "spesifikasi di argument perintah"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: anda harus menspesifikasikan tipe filesystem"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: mount gagal"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: titik mount %s bukan berupa sebuah direktori"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: ijin ditolak"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: harus menjadi superuser untuk menggunakan mount"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s sedang sibuk"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc telah dimount"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s telah dimount atau %s sedang sibuk"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: titik mount %s tidak ada"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: titik mount %s berupa symbolic link ke suatu tempat"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: perangkat spesial %s tidak ada"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9197,12 +9439,12 @@ msgstr ""
 "mount: perangkat spesial %s tidak ada\n"
 "       (sebuah path prefix bukan berupa sebuah direktori)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s sudah tidak dimount, atau pilihan buruk"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9211,7 +9453,7 @@ msgstr ""
 "mount: tipe fs salah, pilihan buruk, superblock buruk di %s,\n"
 "       hilang codepage atau aplikasi pembantu, atau error lain"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
@@ -9219,7 +9461,7 @@ msgstr ""
 "       (untuk beberapa filesystem (e.g. nfs, cifs) anda mungkin\n"
 "       membutuhkan aplikasi pembantu /sbin/mount.<tipe>)"
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9228,7 +9470,7 @@ msgstr ""
 "       ide-scsi sehingga sr0 atau sda atau perangkat sepertinya yang "
 "diperlukan?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9236,7 +9478,7 @@ msgstr ""
 "       (apakah anda mencoba memount sebuah partisi extended,\n"
 "       daripada sebuah partisi logical didalamnya?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9245,113 +9487,109 @@ msgstr ""
 "coba\n"
 "       dmesg | tail atau yang serupa\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "tabel mount penuh"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: tidak dapat membaca superblock"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: perangkat tidak diketahui"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: tipe filesystem tidak diketahui '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: mungkin yang anda maksudkan %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: mungkin yang anda maksud 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: mungkin yang anda maksud 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s memiliki nomor perangkat yang salah atau tipe fs %s tidak disupport"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 "mount: %s bukan sebuak perangkat block, dan gagal memperoleh statistik?"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: kernel tidak mengenal %s sebagai sebuah perangkat block\n"
-"       (mungkin `insmod driver'?)"
+"       (mungkin `modprobe driver'?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s bukan sebuah perangkat block (mungkin dicoba dengan menggunakan "
 "pilihan `-o loop'?"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s bukan sebuah perangkat block"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s bukan sebuah perangkat block yang valid"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "perangkat block "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: tidak dapat me-mount %s%s hanya-baca"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s memiliki proteksi untuk ditulis tetapi secara eksplisit pilihan "
 "`-w' diberikan"
 
-#: mount/mount.c:1573
-#, fuzzy, c-format
+#: mount/mount.c:1651
+#, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
-msgstr "mount: tidak dapat me-mount %s%s hanya-baca"
+msgstr ""
+"mount: tidak dapat memasang kembali %s%s secara baca-tulis, terproteksi-tulis"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s memiliki proteksi untuk ditulis, memount secara hanya-baca"
 
-#: mount/mount.c:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: tidak ada media ditemukan di %s ...mencoba lagi\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: tidak ada media ditemukan di %s"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9368,26 +9606,26 @@ msgstr ""
 "       sistem berkas ini. Untuk lebih lengkapnya lihat restorecon(8) dan "
 "mount(8).\n"
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: tipe tidak diberikan - Saya akan mengasumsikan nfs karena adanya "
 "colon\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: tipe tidak diberikan - Saya akan mengasumsikan cifs karena adanya "
 "awalan //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s telah dimount di %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9459,39 +9697,39 @@ msgstr ""
 "uuid. Pilihan lain: [-nfFrsvw] [-o pilihan] [-p passwdfd].\n"
 "Untuk informasi lebih detail, lihat man 8 mount.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
-msgstr "mount: hanya root yang dapat melakukan itu"
+msgid "mount: only root can do that (effective UID is %u)"
+msgstr "mount: hanya root yang dapat melakukan itu (UID efektif adalah %d)"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: hanya root yang dapat melakukan itu"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "tidak ada yang telah dimount"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: partisi seperti itu tidak ditemukan"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: tidak dapat menemukan %s dalam %s atau %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: peringatan: tidak ada baris baru final pada akhir dari %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: baris %d dalam %s buruk%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; seterusnya dari file diabaikan"
 
@@ -9504,7 +9742,7 @@ msgstr "kutu/bug dalam pemanggilan xstrndup"
 msgid "not enough memory"
 msgstr "memory tidak cukup"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9521,7 +9759,7 @@ msgstr ""
 " <berkas>                             nama dari berkas yang digunakan\n"
 "\n"
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9543,7 +9781,7 @@ msgstr ""
 " %1$s -V                            menampilkan versi\n"
 "\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9562,88 +9800,94 @@ msgstr ""
 " %1$s -V                           menampilkan versi\n"
 "\n"
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: format berkas tidak terduga"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: Menginisialisasi ulang swap."
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 msgid "fork failed"
 msgstr "gagal fork"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 msgid "execv failed"
 msgstr "gagal eksekusi"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
 msgstr "waitpid gagal"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek gagal"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: gagal menulis tanda tangan"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
+"%s: ditemukan tanda partisi swap: versi %d, ukuran-halaman %d, susunan byte %"
+"s"
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
-msgstr ""
+msgstr "berbeda"
 
-#: mount/swapon.c:355
-#, fuzzy
+#: mount/swapon.c:367
 msgid "same"
-msgstr "Nama"
+msgstr "sama"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat gagal"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: mode tidak aman %04o, disarankan menggunakan mode %04o."
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: dilewatkan  - kelihatannya memiliki lubang."
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: gagal mendapatkan ukuran"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: pembacaan header swap gagal"
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr "%s: last_page 0x%08llx berukuran lebih besar dari swapspace sebenarnya"
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: format swap pagesize tidak cocok."
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9651,76 +9895,78 @@ msgstr ""
 "%s: format swap pagesize tidak cocok. (Gunakan --fixpgsz untuk "
 "menginisialisasi ulang.)"
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr "%s: aplikasi suspend data terdeteksi. Menulis ulang tanda swap."
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s di %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon gagal"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "tidak dapat menemukan perangkat %s"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr "Bukan superuser."
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: gagal swapoff"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
+"'%s' adalah nama aplikasi yang tidak didukung (harus berupa 'swapon' atau "
+"'swapoff')."
 
 #: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: dikompilasi tanpa disupport untuk -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: tidak dapat menset id grup: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: tidak dapat menset id pengguna: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: tidak dapat melakukan fork: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: perangkat block tidak valid"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: tidak dimount"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: tidak dapat menulis superblock"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9732,51 +9978,51 @@ msgstr ""
 "digunakan\n"
 "         oleh perangkat dapat ditemukan oleh lsof(8) atau fuser(1))"
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: tidak ditemukan"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: harus superuser untuk melakukan umount"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: perangkat block tidak diijinkan di fs"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "tidak ada umount2, mencoba umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s sibuk - di mount lagi secara hanya-baca\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: tidak dapat melakukan mount %s secara hanya-baca\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s sudah tidak dimount\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: tidak dapat mencari daftar dari filesystems untuk di unmount"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9787,80 +10033,85 @@ msgstr ""
 "            umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "            umount [-d] [-f] [-r] [-n] [-v] special | titik...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
 msgstr "perangkat %s sudah diasosiasikan dengan %s\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "perangkat %s sudah diasosiasikan dengan %s\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Tidak dapat umount \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Mencoba untuk umount %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: bingung ketika menganalisa mtab"
 
-#: mount/umount.c:511
-#, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+#: mount/umount.c:517
+#, fuzzy, c-format
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr "umount: tidak dapat umount %s -- %s telah dipasang di titik yang sama."
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Tidak dapat mencari %s dalam mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s tidak di mount (menurut catatan di mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: kelihatannya %s telah di mount beberapa kali"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s tidak ada dalam fstab (dan anda bukan root)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount tidak cocok dengan catatan di fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: hanya %s yang dapat unmount %s dari %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: hanya root yang dapat melakukan itu"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9868,99 +10119,94 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
-"\n"
-"chrt - manipulasi atribut waktu-nyata dari sebuah proses.\n"
-"\n"
-"Set kebijakan:\n"
-"  chrt [pilihan] <kebijakan> <prioritas> {<pid> | <perintah> "
-"[<argumen ...]}\n"
-"\n"
-"Dapatkan kebijakan:\n"
-"  chrt [pilihan] {<pid> | <perintah> [<argumen> ...]}\n"
-"\n"
-"\n"
-"Kebijakan antrian:\n"
-"  -b | --batch        set kebijakan ke SCHED_BATCH\n"
-"  -f | --fifo         set kebijakan ke SCHED_FIFO\n"
-"  -i | --idle         set kebijakan ke SCHED_IDLE\n"
-"  -o | --other        set kebijakan ke SCHED_OTHER\n"
-"  -r | --rr           set kebijakan ke SCHED_RR (baku)\n"
-"\n"
-"Pilihan:\n"
-"  -h | --help         tampilkan bantuan ini\n"
-"  -p | --pid          beroperasi di pid diberikan yang telah ada\n"
-"  -m | --max          tampilkan min dan max prioritas yang sah\n"
-"  -v | --verbose      tampilkan informasi keadaan\n"
-"  -V | --version      keluarkan informasi versi\n"
-"\n"
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr "gagal mendapatkan kebijakan pid %d"
 
-#: schedutils/chrt.c:87
-#, c-format
-msgid "pid %d's %s scheduling policy: "
+#: schedutils/chrt.c:104
+#, fuzzy, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr "pid %d %s kebijakan antrian: "
+
+#: schedutils/chrt.c:106
+#, fuzzy, c-format
+msgid "pid %d's current scheduling policy: "
 msgstr "pid %d %s kebijakan antrian: "
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, c-format
 msgid "unknown\n"
 msgstr "tidak diketahui\n"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "gagal mendapatkan atribut pid %d"
 
-#: schedutils/chrt.c:115
-#, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+#: schedutils/chrt.c:146
+#, fuzzy, c-format
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr "pid %d %s prioritas antrian: %d\n"
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, fuzzy, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr "pid %d %s prioritas antrian: %d\n"
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s min/max prioritas\t: %d/%d\n"
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "SCHED_%s tidak didukung?\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 msgid "failed to parse pid"
 msgstr "gagal mendapatkan pid"
 
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr "sekarang"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 msgid "failed to parse priority"
 msgstr "gagal mendapatkan prioritas"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "gagal menset kebijakan pid %d"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Baru"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, c-format
 msgid "failed to execute %s"
 msgstr "gagal menjalankan %s"
@@ -9974,14 +10220,14 @@ msgid "ioprio_set failed"
 msgstr "ioprio_set gagal"
 
 #: schedutils/ionice.c:81
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "ionice - sets or gets process io scheduling class and priority.\n"
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -10025,9 +10271,120 @@ msgstr "mengabaikan data kelas yang diberikan untuk kelas kosong"
 msgid "bad prio class %d"
 msgstr "prioritas kelas %d buruk"
 
-#: schedutils/ionice.c:187
-msgid "execvp failed"
-msgstr "gagal eksekusi"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
+msgstr "gagal menjalankan %s"
+
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "penggunaan: %s [pilihan] <aplikasi> [arg ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Untuk informasi lebih lanjut lihat namei(1).\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "tidak dapat menentukan ukuran dari %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "calloc gagal"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "gagal mendapatkan kebijakan pid %d"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "gagal mendapatkan pid"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "gagal menset kebijakan pid %d"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "error mengambil\n"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "error mengambil\n"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " dan "
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -10168,11 +10525,22 @@ msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (char/sec)\n"
 
 #: sys-utils/dmesg.c:45
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
-msgstr "Penggunaan: %s [-c] [-n level] [-s bufsize]\n"
+msgstr "Penggunaan: %s [-c] [-n level] [-r] [-s bufsize]\n"
+
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Penggunaan: %s [pilihan] <nama berkas>\n"
+"\n"
+"Pilihan:\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10180,44 +10548,49 @@ msgid ""
 " -o, --offset <num>  offset of the allocation, in bytes\n"
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
+" -h, --help          pesan bantuan ini\n"
+" -n, --keep-size     jangan modifikasi panjang dari berkas\n"
+" -o, --offset <num>  ofset dari alokasi, dalam bytes\n"
+" -l, --length <num>  panjang dari alokasi, dalam bytes\n"
 
-#: sys-utils/fallocate.c:56
-#, fuzzy, c-format
+#: sys-utils/fallocate.c:57
+#, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 "\n"
-"Untuk informasi lebih lanjut lihat namei(1).\n"
+"Untuk informasi lebih lanjut lihat fallocate(1).\n"
 
-#: sys-utils/fallocate.c:147
-#, fuzzy
+#: sys-utils/fallocate.c:115
 msgid "no length argument specified"
-msgstr "Argumen tidak cukup"
+msgstr "panjang argumen tidak dispesifikasikan"
 
-#: sys-utils/fallocate.c:149
-#, fuzzy
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
-msgstr "Nilai set tidak valid: %s\n"
+msgstr "nilai panjang yang dispesifikasikan tidak valid"
 
-#: sys-utils/fallocate.c:151
-#, fuzzy
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
-msgstr "Nilai set tidak valid: %s\n"
+msgstr "nilai ofset yang dispesifikasikan tidak valid"
 
-#: sys-utils/fallocate.c:153
-#, fuzzy
+#: sys-utils/fallocate.c:121
 msgid "no filename specified."
-msgstr "Pilihan --date tidak dispesifikasikan.\n"
+msgstr "nama berkas tidak dispesifikasikan."
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "diduga sebuah nomor, tetapi diperoleh '%s'"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
-msgstr ""
+msgstr "mode jaga ukuran (-n pilihan) tidak didukung"
 
-#: sys-utils/fallocate.c:174
-#, fuzzy, c-format
+#: sys-utils/fallocate.c:147
+#, c-format
 msgid "%s: fallocate failed"
-msgstr "%s: gagal membuka"
+msgstr "%s: fallocate gagal"
 
 #: sys-utils/flock.c:65
 #, c-format
@@ -10273,6 +10646,65 @@ msgstr "%s: membutuhkan berkas deskripsi, berkas atau direktori\n"
 msgid "%s: fork failed: %s\n"
 msgstr "%s: gagal fork: %s\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Penggunaan: %s [pilihan] <nama berkas>\n"
+"\n"
+"Pilihan:\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Untuk informasi lebih lanjut lihat wipefs(8).\n"
+"\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "nama berkas tidak dispesifikasikan."
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "nama berkas tidak dispesifikasikan."
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s: stat gagal"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "akar inode bukan sebuah direktori"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "%s: gagal menulis"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s: gagal menulis"
+
 #: sys-utils/ipcmk.c:84
 #, c-format
 msgid ""
@@ -10369,476 +10801,451 @@ msgstr ""
 "penggunaan: %s [ [-q msgid] [-m shmid] [-s semid]\n"
 "               [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: pilihan illegal -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: kunci illegal (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "ijin ditolak untuk kunci"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "kunci sudah dihapus"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "kunci tidak valid"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "kesalahan tidak diketahui dalam kunci"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "ijin ditolak untuk id"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "id tidak valid"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "id sudah dihapus"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "error tidak diketahui dalam id"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: argument tidak diketahui: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "penggunaan: %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h untuk bantuan.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s memberikan informasi di fasilitas ipc dimana anda memiliki ijin untuk "
-"membaca.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Spesifikasi Resource:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"%s memberikan informasi di fasilitas ipc dimana anda memiliki ijin untuk "
+"membaca.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Format Output:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : detail di resource yang di identifikasi oleh id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : batas\n"
-"\t-u : ringkasan\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : detail di resource yang di identifikasi oleh id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "kernel tidak dikonfigurasu untuk shared memory\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Batas Shared Memory  --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "max nomor dari segments = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "max sed size (kbytes) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "max total shared memory (kbytes) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "min seg size (bytes) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Shared Memory Status --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "bagian yang di alokasikan %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "pages yang di alokasikan %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "pages resident %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "pages yang di swap %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Performance swap: %ld mencoba\t %ld berhasil\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Shared Memory Segment Pembuat/Pemilik --------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Shared Memory Attach/Detach/Change Times --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "pemilik"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "attached"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "detached"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "berubah"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ Shared Memory Pembuat/Last-op --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Shared Memory Segments --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "kunci"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "bytes"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "status"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Tidak diset"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "terkunci"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "kernel tidak dikonfigurasikan untuk semaphores\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Batas Semaphore  --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "max nomor dari arrays = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "max semaphors per array = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "max semaphors system wide = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "max ops per semop call = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "nilai maksimal semaphore = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Semaphore Status --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "arrays yang digunakan = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "semaphores yang dialokasikan = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Semaphore Array Pembuat/Pemilik  --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ Operasi Semaphore/Perubahan Waktu ---------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "last-op"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "last-changed"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Semaphore Arrays --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "kernel tidak dikonfigurasikan untuk message queues\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Messages: Limits --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "max queues system wide = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "ukuran maksimal dari pesan (bytes) =%d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "ukuran maksimal default dari antrian (bytes) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Pesan: Status ---------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "alokasi antrian = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "penggunaan headers = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "penggunaan space = %d bytes\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ Pesan Antrian: Pembuat/Pemilik --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msgid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Pesan Antrian Kirim/Terima/Kembali Waktu (Times) --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "kirim"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "recv"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "kembali"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ Pesan Antrian PIDs --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Pesan Antrian --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "byte yang digunakan"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "pesan"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
 msgstr "shmctl gagal"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10847,41 +11254,41 @@ msgstr ""
 "\n"
 "Bagian memory share shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr "uid=%d\tgid=%d\tuid=%d\tcgid=%d\n"
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
 msgstr "msgctl gagal"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10890,31 +11297,31 @@ msgstr ""
 "\n"
 "Antrian Pesan msgid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
 msgstr "semctl gagal"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10923,61 +11330,66 @@ msgstr ""
 "\n"
 "Semaphore Array semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "nilai"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcound"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
-#, c-format
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "id tidak valid: %s\n"
+
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Penggunaan: %s [ -dhV78neo12 ] [ -s <kecepatan> ] <ldisc> <perangkat>\n"
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10985,92 +11397,114 @@ msgstr ""
 "\n"
 "Nama <ldisc> dikenal:\n"
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+#, fuzzy
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+"\n"
+"Nama <ldisc> dikenal:\n"
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "kecepatan tidak valid: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach dari %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "pilihan tidak valid"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "baris disiplin tidak valid: %s"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s bukan sebuah baris serial"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "tidak dapat memperoleh atribut terminal %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr "kecepatan %d tidak didukung"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "tidak dapat menset atribut terminal untuk %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr "Tidak dapat menset baris disiplin"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
 msgstr "tidak dapat daemonize"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 msgid "none"
 msgstr "kosong"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr "para"
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr "penuh"
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, c-format
-msgid "error: %s"
-msgstr "error: %s"
+#: sys-utils/lscpu.c:158
+#, fuzzy, c-format
+msgid "error: cannot open %s"
+msgstr "%s: tidak dapat membuka %s\n"
 
-#: sys-utils/lscpu.c:162
-#, c-format
-msgid "error parse: %s"
-msgstr "error mengambil: %s"
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
+#, fuzzy, c-format
+msgid "failed to read: %s"
+msgstr "gagal untuk mendapatkan statistik: %s"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "error mengambil\n"
+
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
 msgstr "error: strdup gagal"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "gagal mengalokasikan outbuffer"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "gagal mendapatkan pid"
+
+#: sys-utils/lscpu.c:318
 msgid "error: uname failed"
 msgstr "error: uname gagal"
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+#, fuzzy
+msgid "error: calloc failed"
 msgstr "error: malloc gagal"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr "error: sistem berkas /sys tidak dapat diakses."
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11083,70 +11517,83 @@ msgstr ""
 "# ID unik berawal dari nol.\n"
 "# CPU,Core,Soket,Node"
 
-#: sys-utils/lscpu.c:619
-#, fuzzy
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
+msgstr "CPU op-mode:"
+
+#: sys-utils/lscpu.c:759
+#, fuzzy
+msgid "CPU(s):"
 msgstr "CPU soket:"
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr "Thread(s) setiap inti:"
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr "Inti setiap soket:"
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr "CPU soket:"
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr "Titik NUMA:"
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr "ID Pembuat:"
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr "Keluarga CPU:"
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr "Model:"
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr "Stepping:"
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr "Virtualisasi:"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr "Pembuat Hypervisor:"
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr "Tipe virtualisasi:"
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr "%s persediaan:"
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, fuzzy, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "Titik NUMA:"
+
+#: sys-utils/lscpu.c:816
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Penggunaan: %s [pilihan]\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11161,68 +11608,6 @@ msgstr ""
 "tercetak.\n"
 "  -s, --sysroot   gunakan direktori sebagai sistem root baru.\n"
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr "error: mengubah direktori kerja ke %s."
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "penggunaan: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (atau rdev /linux, etc.) tampilkan ROOT device yang dipakai"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         sets ROOT pada /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              set ROOTFLAGS (readonly status)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            set ukuran RAMDISK"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              set bootup VIDEOMODE"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   menggunakan offset byte N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   sama dengan rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ukuran ram ...                  sama dengan rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     sama dengan rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Catatan: mode video adalah: -3=Tanya, -2=Extended, -1=NormalVga, 1=kunci1, "
-"2=kunci2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      gunakan -R 1 untuk memount root readonly, -R 0 untuk read/write."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "hilang koma"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11344,11 +11729,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: prioritas sebelumnya %d, prioritas baru %d\n"
 
-#: sys-utils/rtcwake.c:83
-#, c-format
+#: sys-utils/rtcwake.c:85
+#, fuzzy, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11367,104 +11753,129 @@ msgstr ""
 "    -v | --verbose            pesan verbose\n"
 "    -V | --version            tampilkan versi\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "baca baris rtc"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "baca waktu sistem"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "ubah waktu rtc"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "set alarm rtc"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr "aktifkan alarm rtc"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr "set alarm bangun rtc"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: kondisi suspend tidak dikenal '%s'\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: interval ilegal %s detik\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: nilai time_t %s ilegal\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: versi %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: mengasumsikan RTC menggunakan UTC ...\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Menggunakan waktu UTC.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "Menggunakan waktu lokal.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: harus menyediakan waktu bangun\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "malloc() gagal"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s tidak aktif untuk even bangun\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "alarm %ld, sys_time %ld, rtc_time %ld, detik %u\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr "%s: waktu tidak pergi mundur ke %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s: bangun dari \"%s\" menggunakan %s di %s\n"
 
-#: sys-utils/rtcwake.c:487
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
+#, c-format
 msgid "%s: unable to execute %s: %s\n"
-msgstr "%s: tidak dapat mengganti nama %s menjadi %s: %s\n"
+msgstr "%s: tidak dapat menjalankan %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "baca rtc"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr "menonaktifkan interupsi alarm rtc"
 
@@ -11583,6 +11994,11 @@ msgstr "%s: nilai tidak baik\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s bukan sebuah perangkat lp.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "LPGETIRQ error"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11613,6 +12029,11 @@ msgstr ", on-line"
 msgid ", error"
 msgstr ", error"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: mount gagal"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ error"
@@ -11628,9 +12049,9 @@ msgid "%s using polling\n"
 msgstr "%s menggunakan polling\n"
 
 #: sys-utils/unshare.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [options] <program> [args...]\n"
-msgstr "penggunaan: %s program [arg ...]\n"
+msgstr "penggunaan: %s [pilihan] <aplikasi> [arg ...]\n"
 
 #: sys-utils/unshare.c:60
 msgid ""
@@ -11642,25 +12063,41 @@ msgid ""
 "  -i, --ipc         unshare System V IPC namespace\n"
 "  -n, --net         unshare network namespace\n"
 msgstr ""
+"Jalankan aplikasi dengan beberapa ruang nama tidak terbagi dari induknya\n"
+"\n"
+"  -h, --help        informasi penggunaan (pesan ini)\n"
+"  -m, --mount       unshare ruang nama pemasangan\n"
+"  -u, --uts         unshare ruang nama UTS (hostname dll)\n"
+"  -i, --ipc         unshare ruang nama Sistem V IPC\n"
+"  -n, --net         unshare ruang nama jaringan\n"
 
 #: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
 "\n"
-"Untuk informasi lebih lanjut lihat namei(1).\n"
+"Untuk informasi lebih lanjut lihat unshare(1).\n"
 
 #: sys-utils/unshare.c:114
-#, fuzzy
 msgid "unshare failed"
-msgstr "gagal seek"
+msgstr "unshare gagal"
 
 #: sys-utils/unshare.c:118
-#, fuzzy, c-format
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount tidak dapat menset grup id: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: tidak dapat menset id pengguna: %s"
+
+#: sys-utils/unshare.c:125
+#, c-format
 msgid "exec %s failed"
-msgstr "gagal eksekusi\n"
+msgstr "gagal menjalankan %s"
 
 #: text-utils/col.c:154
 #, c-format
@@ -11728,9 +12165,9 @@ msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "penggunaan: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 
 #: text-utils/more.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "failed to initialize line buffer\n"
-msgstr "gagal mengalokasikan outbuffer"
+msgstr "gagal menginisialisasi baris penyangga\n"
 
 #: text-utils/more.c:485
 #, c-format
@@ -12144,24 +12581,26 @@ msgid "cannot stat \"%s\""
 msgstr "tidak dapat memperoleh statistik \"%s\""
 
 #: text-utils/tailf.c:109
-#, fuzzy, c-format
+#, c-format
 msgid "incomplete write to \"%s\" (written %zd, expected %zd)\n"
-msgstr "penulisan tidak lengkap ke \"%s\" (ditulis %ld, diperkirakan %ld)\n"
+msgstr "penulisan tidak lengkap ke \"%s\" (ditulis %zd, diperkirakan %zd)\n"
 
 #: text-utils/tailf.c:147
 #, c-format
 msgid "%s: cannot add inotify watch (limit of inotify watches was reached)."
 msgstr ""
+"%s: tidak dapat menambahkan pemantauan inotify (batas dari pemantau inotify "
+"telah tercapai)."
 
 #: text-utils/tailf.c:151
 #, c-format
 msgid "%s: cannot add inotify watch."
-msgstr ""
+msgstr "%s: tidak dapat menambahkan pemantauan inotify."
 
 #: text-utils/tailf.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot read inotify events"
-msgstr "%s: tidak dapat membuka %s\n"
+msgstr "%s: tidak dapat membaca event inotify"
 
 #: text-utils/tailf.c:199 text-utils/tailf.c:203
 msgid "invalid number of lines"
@@ -12201,12 +12640,306 @@ msgstr "Baris input terlalu panjang.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Kehabisan memori ketika meningkatkan buffer.\n"
 
-#~ msgid "%s: found %sswap v%d signature string for %d KiB PAGE_SIZE\n"
-#~ msgstr "%s: ditemukan tanda %sswap v%d untuk %d KiB PAGE_SIZE\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: pilihan illegal -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "bagian yang di alokasikan %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "pages yang di alokasikan %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "pages resident %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "pages yang di swap %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Performance swap: %ld mencoba\t %ld berhasil\n"
+
+#~ msgid ""
+#~ " and change display units to\n"
+#~ "         sectors (command 'u').\n"
+#~ msgstr ""
+#~ " dan ubah tampilan satuan ke\n"
+#~ "         sektor (perintah 'u').\n"
+
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "error menjalankan aplikasi: \"%s\"\n"
+
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "nilai ofset '%s' tidak valid"
 
 #, fuzzy
-#~ msgid "out if memory"
-#~ msgstr "kehabisan memori"
+#~ msgid ""
+#~ "\n"
+#~ "chrt - manipulate real-time attributes of a process.\n"
+#~ "\n"
+#~ "Set policy:\n"
+#~ "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
+#~ "\n"
+#~ "Get policy:\n"
+#~ "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
+#~ "\n"
+#~ "\n"
+#~ "Scheduling policies:\n"
+#~ "  -b | --batch         set policy to SCHED_BATCH\n"
+#~ "  -f | --fifo          set policy to SCHED_FIFO\n"
+#~ "  -i | --idle          set policy to SCHED_IDLE\n"
+#~ "  -o | --other         set policy to SCHED_OTHER\n"
+#~ "  -r | --rr            set policy to SCHED_RR (default)\n"
+#~ "\n"
+#~ "Scheduling flags:\n"
+#~ "  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h | --help          display this help\n"
+#~ "  -p | --pid           operate on existing given pid\n"
+#~ "  -m | --max           show min and max valid priorities\n"
+#~ "  -v | --verbose       display status information\n"
+#~ "  -V | --version       output version information\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "chrt - manipulasi atribut waktu-nyata dari sebuah proses.\n"
+#~ "\n"
+#~ "Set kebijakan:\n"
+#~ "  chrt [pilihan] <kebijakan> <prioritas> {<pid> | <perintah> "
+#~ "[<argumen ...]}\n"
+#~ "\n"
+#~ "Dapatkan kebijakan:\n"
+#~ "  chrt [pilihan] {<pid> | <perintah> [<argumen> ...]}\n"
+#~ "\n"
+#~ "\n"
+#~ "Kebijakan antrian:\n"
+#~ "  -b | --batch        set kebijakan ke SCHED_BATCH\n"
+#~ "  -f | --fifo         set kebijakan ke SCHED_FIFO\n"
+#~ "  -i | --idle         set kebijakan ke SCHED_IDLE\n"
+#~ "  -o | --other        set kebijakan ke SCHED_OTHER\n"
+#~ "  -r | --rr           set kebijakan ke SCHED_RR (baku)\n"
+#~ "\n"
+#~ "Pilihan:\n"
+#~ "  -h | --help         tampilkan bantuan ini\n"
+#~ "  -p | --pid          beroperasi di pid diberikan yang telah ada\n"
+#~ "  -m | --max          tampilkan min dan max prioritas yang sah\n"
+#~ "  -v | --verbose      tampilkan informasi keadaan\n"
+#~ "  -V | --version      keluarkan informasi versi\n"
+#~ "\n"
+
+#~ msgid "current"
+#~ msgstr "sekarang"
+
+#~ msgid "new"
+#~ msgstr "baru"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux FS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: tidak ada media ditemukan di %s ...mencoba lagi\n"
+
+#~ msgid "execvp failed"
+#~ msgstr "gagal eksekusi"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "penggunaan: %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h untuk bantuan.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Spesifikasi Resource:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Format Output:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : batas\n"
+#~ "\t-u : ringkasan\n"
+
+#~ msgid "error: %s"
+#~ msgstr "error: %s"
+
+#~ msgid "error parse: %s"
+#~ msgstr "error mengambil: %s"
+
+#~ msgid "error: /sys filesystem is not accessable."
+#~ msgstr "error: sistem berkas /sys tidak dapat diakses."
+
+#~ msgid "error: change working directory to %s."
+#~ msgstr "error: mengubah direktori kerja ke %s."
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "penggunaan: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (atau rdev /linux, etc.) tampilkan ROOT device yang "
+#~ "dipakai"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         sets ROOT pada /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr "  rdev -R /dev/fd0 1              set ROOTFLAGS (readonly status)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            set ukuran RAMDISK"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              set bootup VIDEOMODE"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   menggunakan offset byte N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   sama dengan rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ukuran ram ...                  sama dengan rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     sama dengan rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Catatan: mode video adalah: -3=Tanya, -2=Extended, -1=NormalVga, "
+#~ "1=kunci1, 2=kunci2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      gunakan -R 1 untuk memount root readonly, -R 0 untuk read/write."
+
+#~ msgid "missing comma"
+#~ msgstr "hilang koma"
+
+#~ 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 ""
+#~ "Penggunaan: fdisk [-b SSZ] [-u] DISK     Ubah tabel partisi\n"
+#~ "            fdisk -l [-b SSZ] [-u] DISK  Tampilkan daftar tabel partisi\n"
+#~ "            fdisk -s PARTISI             Berikan ukuran partisi dalam "
+#~ "blocks\n"
+#~ "            fdisk -v                     Tampilkan versi dari fdisk\n"
+#~ "Disini DISK  memiliki nama seperti /dev/hdb atau /dev/sda\n"
+#~ "dan PARTISI ini memiliki nama seperti /dev/hda7\n"
+#~ "-u: memberikan Awal dan Akhir dalam satuan sector (dari pada dalam "
+#~ "cylinders)\n"
+#~ "-b 2048: (untuk beberapa MO disks) gunakan 2048-byte dari sector\n"
+
+#~ 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 ""
+#~ "Penggunaan: fdisk [-l] [-b SSZ] [-u] perangkat\n"
+#~ "E.g.: fdisk /dev/hda  (untuk IDE disk yang pertama)\n"
+#~ "atau: fdisk /dev/sdc  (untuk SCSI DISK yang ketiga)\n"
+#~ "atau: fdisk /dev/eda  (untuk PS/2 ESDI drive)\n"
+#~ "atau: fdisk /dev/rd/c0d0 atau: fdisk /dev/ida/c0d0 (untuk perangkat "
+#~ "RAID)\n"
+#~ "....\n"
+
+#~ 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"
+#~ "Jumlah dari cylinder untuk disk ini di set ke %d.\n"
+#~ "Tidak ada yang salah dengan hal ini, tetapi ini lebih besar dari 1024,\n"
+#~ "dan dapat membuat menyebabkan masalah dalam beberapa setup dengan:\n"
+#~ "1) aplikasi yang berjalan pada waktu boot (e.g., versi lama dari LILO)\n"
+#~ "2) booting dan partitioning software dari OS yang lain\n"
+#~ "   (e.g., DOS FDISK, OS/2 FDISK)\n"
+
+#~ msgid ""
+#~ "WARNING: The device does not provide compensation (alignment_offset)\n"
+#~ "for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
+#~ "Use command 'c' to switch-off DOS mode.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "PERINGATAN: Perangkat tidak menyediakan kompensasi (alignment_offset)\n"
+#~ "untuk pembagian DOS-kompatibel, tetapi mode DOS-kompatibel diaktifkan.\n"
+#~ "Gunakan perintah 'c' untuk menonaktifkan mode DOS.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "WARNING: the device provides alignment_offset, but the offset does not\n"
+#~ "match with device geometry.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "PERINGATAN: perangkat menyediakan alignment_offset, tetapi ofset tidak\n"
+#~ "cocok dengan geometri perangkat.\n"
 
 #~ msgid "# partition table of %s\n"
 #~ msgstr "# tabel partisi dari %s\n"
@@ -12230,6 +12963,9 @@ msgstr "Kehabisan memori ketika meningkatkan buffer.\n"
 #~ msgid "Clock in UTC, not changed.\n"
 #~ msgstr "Jam dalam UTC, tidak diubah.\n"
 
+#~ msgid "%s: found %sswap v%d signature string for %d KiB PAGE_SIZE\n"
+#~ msgstr "%s: ditemukan tanda %sswap v%d untuk %d KiB PAGE_SIZE\n"
+
 #~ msgid "%s: error: label only with v1 swap area\n"
 #~ msgstr "%s: error: hanya label dengan menggunakan swap area versi v1\n"
 
@@ -12387,7 +13123,6 @@ msgstr "Kehabisan memori ketika meningkatkan buffer.\n"
 #~ "            %s -a [-v]\n"
 #~ "            %s [-v] special ...\n"
 
-#, fuzzy
 #~ msgid "%s: cannot canonicalize %s: %s\n"
 #~ msgstr "%s: tidak dapat membuka %s: %s\n"
 
@@ -12421,7 +13156,6 @@ msgstr "Kehabisan memori ketika meningkatkan buffer.\n"
 #~ "penggunaan: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] "
 #~ "pengguna ]\n"
 
-#, fuzzy
 #~ msgid "Unknown option `%c' ignored"
 #~ msgstr "%s: pilihan tidak diketahui \"-%c\"\n"
 
diff --git a/po/it.po b/po/it.po
index 96569d27..49c64ce4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2008-04-18 13:44+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -103,6 +103,11 @@ msgstr "rileggi la tabella delle partizioni"
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ segnale ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -122,6 +127,17 @@ msgstr "Comandi disponibili:\n"
 msgid "get size in 512-byte sectors"
 msgstr "visualizza la dimensione in settori da 512 byte"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -223,15 +239,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Uso:  %s [ -n ] dispositivo\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -337,7 +344,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc non riuscita"
 
@@ -952,7 +959,7 @@ msgstr "impossibile eseguire stat sul dispositivo %s"
 msgid "%s is not a block special device"
 msgstr "%s non è un dispositivo speciale a blocchi"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "impossibile aprire %s"
@@ -976,7 +983,7 @@ msgstr "troppi inode - il massimo è 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "spazio insufficiente, sono necessari almeno %lu blocchi"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -1050,7 +1057,7 @@ msgstr "errore durante la chiusura di %s"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Uso: mkfs [-V] [-t tipofs] [opzioni-fs] dispositivo [dimensione]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1268,7 +1275,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "ricerca in check_blocks non riuscita"
 
@@ -1352,173 +1359,179 @@ msgstr ""
 "Utilizzo la dimensione pagina %d specificata dall'utente, al posto del "
 "valore di sistema %d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "fork non riuscito\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "L'etichetta è stata troncata.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "nessuna etichetta, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "nessun uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Uso: %s [-c] [-v0|-v1] [-pDIMPAGINA] [-L etichetta] /dev/nome [blocchi]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "troppe pagine danneggiate"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "una pagina danneggiata\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu pagine danneggiate\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "impossibile riavvolgere il dispositivo swap"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "impossibile allocare il buffer per gli inode"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "impossibile allocare il buffer per gli inode"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "impossibile cancellare il settore di boot"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   stampa della tabella delle partizioni BSD"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   visualizzazione del disklabel completo"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   visualizzazione del disklabel completo"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: errore: versione sconosciuta %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Errore durante la chiusura del file\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: errore: non è possibile impostare swap in nessuna posizione?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: errore: la dimensione %lu è maggiore di quella del dispositivo %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: errore: l'area di swap deve equivalere almeno a %ldkB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: attenzione: troncamento area swap a %ldkB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: errore: Non si cercherà di creare uno swapdevice su '%s'\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: errore: %s è montata; qui non verrà creato uno spazio di swap.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossibile impostare lo spazio-swap: non leggibile"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Impostazione spazio di swap versione %d, dimensione = %llu kB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "impossibile scrivere sulla pagina di firma"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync non riuscito "
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "impossibile fare matchpathcon()"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "impossibile creare un nuovo contesto selinux"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: impossibile rinominare %s in %s: %s\n"
@@ -1581,63 +1594,111 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "errore fermando il servizio \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Inutilizzabile"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "impossibile riavvolgere il dispositivo swap"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Spazio disponibile"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: nessuna partizione di questo tipo\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: errore: versione sconosciuta %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: impossibile aprire: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: impossibile aprire: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: impossibile aprire: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: impossibile aprire: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: impossibile aprire: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "ricerca in write_tables non riuscita"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Per maggiori informazioni vedere setarch(8).\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Inutilizzabile"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Spazio disponibile"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Il disco è stato cambiato.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1650,232 +1711,232 @@ msgstr ""
 "partizione DOS 6.x, consultare la pagina del manuale cfdisk\n"
 "per ulteriori informazioni.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ERRORE IRREVERSIBILE"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Premere qualsiasi tasto per uscire da cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Ricerca sull'unità disco impossibile"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Impossibile leggere l'unità disco"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Impossibile scrivere sull'unità disco"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Troppe partizioni"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "La partizione inizia prima del settore 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "La partizione termina prima del settore 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "La partizione inizia dopo la fine del disco"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "La partizione termina dopo la fine del disco"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "le partizioni logiche non sono nell'ordine del disco"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "sovrapposizione delle partizioni logiche"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "sovrapposizione delle partizioni logiche ampliate"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Errore interno durante la creazione di un'unità logica con partizione "
 "non estesa !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Impossibile creare un'unità logica in questo caso - si creerebbero due "
 "partizioni estese"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Voce di menù troppo lunga. Il menu può apparire strano."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menu senza direzione. È predefinita quella orizzontale."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Tasto non valido"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Premere un tasto per continuare"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primaria"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Creare una nuova partizione primaria"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logica"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Creare una nuova partizione logica"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Annulla"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Non creare una partizione"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Errore interno !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Dimensione (in MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Inizio"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Aggiungere la partizione all'inizio dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Aggiungere la partizione alla fine dello spazio disponibile"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Non c'è spazio per creare una partizione estesa"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Nessuna tabella delle partizioni.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Nessuna tabella delle partizioni. Si inizia con una tabella vuota."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Segnatura danneggiata nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Tipo di tabella delle partizioni sconosciuto"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Si vuole iniziare con una tabella vuota [y/N]?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 "Si è specificato un numero di cilindri superiore a quelli contenuti su disco"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Impossibile aprire l'unità disco"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aperto in sola lettura - scrittura non autorizzata"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Impossibile ottenere la dimensione del disco"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Partizione primaria danneggiata"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Partizione logica danneggiata"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Attenzione! I dati sul disco potrebbero venire eliminati!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "Sicuro di voler scrivere la tabella delle partizioni su disco? (si o no): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Scrittura tabella delle partizioni su disco non effettuata"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "si"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Inserire \"si\" (senza accento) o \"no\""
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Scrittura tabella delle partizioni su disco in corso..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Eseguita l'operazione di scrittura tabella delle partizioni su disco"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1884,88 +1945,88 @@ msgstr ""
 "Tabella scritta, ma la rilettura è fallita. Riavviare per aggiornare la "
 "tabella."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Nessuna partizione primaria è impostata come avviabile. DOS MBR non può\n"
 "avviarla."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Più di una partizione primaria è impostata come avviabile. DOS MBR non può\n"
 "avviarla."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 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:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Impossibile aprire il file '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unità disco: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Settore 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Settore %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Nessuno   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primario"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logico"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Avvio"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Nessuno"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabella delle partizioni per %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1974,7 +2035,7 @@ msgstr ""
 " # Tipo     settore   settore   offset  lunghezza   tipo di filesystem  "
 "(ID)   flag\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1983,483 +2044,483 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Grezzo"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Stampare la tabella utilizzando il formato dati grezzi"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Settori"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Stampare la tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabella"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Stampare la tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Non stampare la tabella"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Schermata Guida per cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 "Questo è cfdisk, un programma per la partizione dei dischi basato su curses"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "unità disco."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Comando     significato"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr " b          Cambia flag avviabile per la partizione corrente"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr " d          Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr " g          cambio cilindri, testine, parametri settori-per-traccia"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 "            ATTENZIONE: questa opzione dovrebbe essere utilizzata solo da "
 "persone"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "            esperti."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr " h          Stampare questa schermata"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 " m          Massimizzare l'utilizzo del disco della partizione corrente"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "            Nota: questo può rendere la partizione incompatibile con"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "            DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr " n          Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "            Vi sono diversi altri formati per la partizione"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "            tra i quali scegliere:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "               r - dati grezzi (esattamente ciò che verrebbe scritto sul "
 "disco)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "               s - Tabella ordinata per settori"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "               t - Tabella in formato grezzo"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Esce dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr " t          Cambia il tipo di filesystem"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr ""
 " u          Modifica l'unità di visualizzazione della dimensione della "
 "partizione"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "            Ruota attraverso MB, settori e cilindri"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 "            Dato che in questo modo è possibile eliminare dati sul disco, si "
 "deve"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "            confermare o negare la scrittura inserendo \"si\" o"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             \"no\""
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Freccia Su      sposta il cursore alla partizione precedente"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Freccia Giù   sposta il cursore alla partizione successiva"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ridisegna lo schermo"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Stampa questa schermata"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "lettere maiuscole/minuscole (fatta eccezione per Writes)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cilindri"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Modifica la geometria dei cilindri"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Testine"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Modifica la geometria delle testine"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Modifica la geometria dei settori"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Fine"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Modifica della geometria eseguita"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Immettere il numero di cilindri: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Valore cilindri non valido"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Immettere il numero delle testine: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Valore testine non valido"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Immettere il numero dei settori per traccia: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Valore settori non valido"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Immettere il tipo di filesystem: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Impossibile cambiare il tipo FS in vuoto"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Impossibile cambiare il tipo FS in espanso"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Sconosciuto (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Unità disco: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Dimensioni: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Dimensioni: %lld byte, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Testine: %d   Settori per traccia: %d   Cilindri: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Flag"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Tipo part."
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Tipo FS"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Etichetta]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Settori"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cilindri"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Dim. (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Dim. (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Avviabile"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr " Cambia flag avviabile per la partizione corrente "
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Elimina"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Elimina la partizione corrente"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Modifica della geometria del disco (solo per esperti)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Guida"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Mostra della schermata della guida"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Massimi."
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Massimizza l'utilizzo del disco della partizione corrente (solo per esperti)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nuova"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Creazione di una nuova partizione nello spazio disponibile"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Stampa"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Esci"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Esci dal programma senza scrivere nella tabella delle partizioni"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Modifica il tipo di filesystem (DOS, Linux, OS/2, ecc.)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Unità"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Cambia l'unità di visualizzazione della dimensione della partizione (MB, "
 "sett., cil.)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Scrivi"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 "Scrivi la tabella delle partizioni sul disco (i dati potrebbero venir persi)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Impossibile rendere questa partizione avviabile"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Impossibile cancellare una partizione vuota"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Impossibile massimizzare questa partizione"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Questa partizione è utilizzabile"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Questa partizione è già in uso"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Impossibile modificare il tipo di una partizione vuota"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Nessun'altra partizione"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Comando non valido"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2534,9 +2595,9 @@ msgstr ""
 "\n"
 "Etichetta BSD per dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Azione comando"
 
@@ -2556,9 +2617,9 @@ msgstr "   i   installazione di bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   elenco dei tipi di filesystem conosciuti"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   stampa di questo menu"
 
@@ -2570,14 +2631,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:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   uscita senza salvataggio delle modifiche"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   ritorno al menu principale"
 
@@ -2620,13 +2681,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Primo %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Ultimo %s o +size o +sizeM o +sizeK "
@@ -2771,7 +2832,7 @@ msgstr "settori/traccia"
 msgid "tracks/cylinder"
 msgstr "tracce/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cilindri"
@@ -2829,7 +2890,7 @@ msgstr "Bootstrap installato su %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partizione (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "È stato creato il numero massimo di partizioni\n"
@@ -2853,225 +2914,207 @@ msgstr ""
 "\n"
 "Sincronizzazione dei dischi.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"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:260
-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 ""
-"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/rd/c0d0  o: fdisk /dev/ida/c0d0  (per i dispositivi RAID)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Impossibile leggere %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ricerca impossibile su %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Impossibile scrivere su %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl non riuscito su %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Impossibile allocare altra memoria\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Errore irreversibile\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   attivazione/disattivazione di un flag di sola lettura"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   modifica di bsd disklabel"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   attivazione/disattivazione del flag montabile"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   cancellazione di una partizione"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   elenco dei tipi di partizione conosciuti"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   aggiunta di una nuova partizione"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   creazione di una nuova tabella delle partizioni DOS vuota"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   stampa della tabella delle partizioni"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   creazione di una nuova disklabel Sun vuota"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   modifica l'id di sistema di una partizione"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   modifica delle unità di visualizzazione/di immissione"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   verifica la tabella delle partizioni"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   scrivi la tabella su disco ed esci"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr " x   ulteriori funzioni (solo per esperti)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   selezione della partizione che è possibile avviare"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   modifica della voce bootfile"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   selezione della partizione swap sgi"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a  Cambia bootable flag"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   cambia il flag compatibile con il dos"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifica del numero di cilindri alternativi"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   modifica del numero di cilindri"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   stampa dei dati grezzi nella tabella delle partizioni"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifica del numero dei settori supplementari per cilindro"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   modifica del numero di testine"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   modifica del fattore di interleave"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   modifica della velocità di rotazione (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifica del numero di settori/traccia"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifica del numero di cilindri fisici"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   spostamento dell'inizio di dati in una partizione"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   elenco delle partizioni estese"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   crea una tabella delle partizioni IRIX (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   aggiusta l'ordine delle partizioni"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i   cambia l'identificativo del disco"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Si devono impostare"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "testine"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "settori"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3081,23 +3124,11 @@ msgstr ""
 "È possibile effettuare questa operazione dal menu delle funzioni "
 "supplementari.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:747
-#, 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 ""
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3108,74 +3139,73 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Offset errato nella partizione estesa primaria\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, 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:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Attenzione: partizione vuota\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Identificativo disco: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Nuovo identificativo disco (corrente 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3188,33 +3218,24 @@ msgstr ""
 "contenuto precedente non potrà essere recuperato.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: la dimensione del settore è %d (non %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, 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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3223,17 +3244,17 @@ msgstr ""
 "Il dispositivo non contiene né una tabella delle partizioni DOS valida, né "
 "una disklabel Sun, SGI od OSF\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Errore interno\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Partizione estesa supplementare ignorata %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3242,7 +3263,7 @@ msgstr ""
 "Attenzione: il flag 0x%04x non valido della tabella delle partizioni %d "
 "verrà corretto con w(rite)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3251,95 +3272,100 @@ msgstr ""
 "\n"
 "ricevuto EOF tre volte - uscita in corso..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Codice esadecimale (digitare L per elencare i codici): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, predefinito %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Utilizzo del valore predefinito %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valore fuori intervallo.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Numero della partizione"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Attenzione: la partizione %d ha tipo vuoto\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Partizione selezionata %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nessuna partizione definita\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Tutte le partizioni primarie sono state già definite!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "settore"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Modifica delle unità di visualizzazione/immissione su %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Modifica delle unità di visualizzazione/immissione su %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ATTENZIONE: la partizione %d è una partizione estesa\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "Impostato il flag compatibile con DOS\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Il flag compatibile con DOS non è impostato\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partizione %d non esiste ancora!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3352,7 +3378,7 @@ msgstr ""
 "tipo 0 probabilmente non è consigliabile. È possibile eliminare\n"
 "una partizione utilizzando il comando \"d\".\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3361,7 +3387,7 @@ msgstr ""
 "Non è possibile trasformare una partizione in una estesa o viceversa\n"
 "Prima bisogna eliminarla.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3372,7 +3398,7 @@ msgstr ""
 "poiché SunOS/Solaris lo prevede e ciò è gradito anche a Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3383,63 +3409,63 @@ msgstr ""
 "e la partizione 11 come volume intero (6) poiché IRIX lo prevede.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Modificato il tipo di sistema della partizione %d in %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "    phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logico=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, 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:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "dovrebbe essere (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "La partizione %i non termina al limite del cilindro.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "dovrebbe essere (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "La partizione %i non inizia al limite del cilindro:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3448,7 +3474,7 @@ msgstr ""
 "\n"
 "Disco %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3458,46 +3484,51 @@ msgstr ""
 "Disco %s: %ld.%ld GB, %lld byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d testine, %llu settori/tracce, %d cilindri"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", totale %llu settori"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Unità = %s di %d * %d = %d byte\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "dimensione inode non corretta"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr "Niente da fare. L'ordine è già corretto.\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Fine\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3508,16 +3539,16 @@ msgstr ""
 "Probabilmente è stato scelto il dispositivo sbagliato.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, fuzzy, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Avvio    Inizio    Fine   Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3527,7 +3558,7 @@ msgstr ""
 "Le voci nella tabella delle partizioni non sono nello stesso ordine del "
 "disco\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3538,88 +3569,88 @@ msgstr ""
 "Disco %s: %d testine, %llu settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Attenzione: la partizione %d contiene il settore 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partizione %d: testina %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partizione %d: settore %d più grande del massimo %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partizione %d: cilindro %d più grande del massimo %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Attenzione: la partizione %d si sovrappone alla partizione %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Attenzione: la partizione %d è vuota\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partizione logica %d non è interamente nella partizione %d\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Numero totale dei settori allocati %ld superiore al massimo %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld settori non allocati\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Il settore %llu è già allocato\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Non ci sono settori liberi disponibili\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3628,7 +3659,7 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3637,24 +3668,24 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Tutte le partizioni logiche sono usate\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Aggiunta di una partizione primaria\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3665,20 +3696,20 @@ msgstr ""
 "   %s\n"
 "   p   partizione primaria (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   logica (5 od oltre)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr " e   estesa"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Numero di partizioni non valido per il tipo \"%c\"\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3687,12 +3718,12 @@ msgstr ""
 "La tabella delle partizioni è stata alterata!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, 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:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3706,7 +3737,7 @@ msgstr ""
 "Il kernel usa ancora la tabella precedente.\n"
 "La nuova tabella sarà usata al prossimo riavvio.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3719,7 +3750,7 @@ msgstr ""
 "consultare la pagina del manuale fdisk per ulteriori\n"
 "informazioni.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3728,44 +3759,44 @@ msgstr ""
 "\n"
 "Errore durante la chiusura del file\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Sincronizzazione dei dischi in corso.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partizione %d non ha area dati\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Nuovo inizio dati"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Comando per esperti (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Numero di cilindri"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Numero di testine"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Numero di settori"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Attenzione: impostare l'offset di settore per assicurare compatibilità con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3774,34 +3805,34 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando sconosciuto\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3810,16 +3841,16 @@ msgstr ""
 "Attenzione: l'opzione -b (mpostazione della dimensione del settore) si "
 "dovrebbe utilizzare con un dispositivo specificato\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Comando (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3828,16 +3859,16 @@ msgstr ""
 "\n"
 "Il file d'avvio corrente è: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Immettere il nome del nuovo file d'avvio:"
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "File d'avvio immutato\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3931,15 +3962,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux nativo"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4076,7 +4107,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Presente più di una voce disco intero.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nessuna partizione definita\n"
@@ -4181,7 +4212,7 @@ msgstr ""
 "Digitare YES (sì) se si è certi di voler codificare questa partizione in "
 "modo differente.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr ""
 
@@ -4241,7 +4272,7 @@ msgstr ""
 "precedente sarà definitivamente perso.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4259,55 +4290,55 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "Non assegnato"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Disco intero"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS riservato"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Autorilevamento raid di Linux"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4320,29 +4351,29 @@ msgstr ""
 "per es. testine, settori, cilindri e partizioni\n"
 "o forzare un'etichetta nuova (comando s nel menu principale)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Rilevato un disklabel con versione errata [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Rilevato un disklabel con sanity errato [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Rilevato un disklabel con num_partitions errato [%u].\n"
 
 # FIXME
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
 msgstr "Attenzione: i valori non validi devono essere corretti con w(rite)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4354,31 +4385,31 @@ msgstr ""
 "solamente fino a quando si decide di scriverle. Dopodiché, chiaramente, il\n"
 "contenuto precedente non sarà recuperabile.\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Settori/traccia"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervallo inutilizzato - settori 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervallo inutilizzato - settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4387,7 +4418,7 @@ msgstr ""
 "Altre partizioni coprono già il disco intero.\n"
 "Eliminarne alcune/rimpicciolirle prima di riprovare.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4396,12 +4427,12 @@ msgstr ""
 "Si raccomanda che l'undicesima partizione\n"
 "copra l'intero disco e sia di tipo \"SGI volume\"\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4412,7 +4443,7 @@ msgstr ""
 "%d %s copre alcune altre partizioni. La voce immessa è stata cambiata\n"
 "in %d %s\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4422,7 +4453,7 @@ msgstr ""
 "in considerazione di lasciare questa partizione come disco intero (5), "
 "partendo da 0, con %u settori\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4438,12 +4469,12 @@ msgstr ""
 "Digitare YES  (sì) se si è certi di volere che quella partizione\n"
 "venga codificata con 82 (swap Linux ): "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4458,11 +4489,11 @@ msgstr ""
 "Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4471,28 +4502,28 @@ msgstr ""
 "Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Inizio       Fine    Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Numero di cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Settori supplementari per cilindro"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Fattore di interleave"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Velocità di rotazione (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Numero dei cilindri fisici"
 
@@ -4701,6 +4732,10 @@ msgstr "Minix / vecchio Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "C nascosto OS/2: drive"
@@ -5333,95 +5368,95 @@ msgstr "flag -n dato: nessuna modifica\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Salvataggio dei vecchi settori non riuscito - interruzione in corso\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "linea di input lunga o incompleta - uscita in corso\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "errore di input: \"=\" previsto dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, 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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input non riconosciuto: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "numero troppo grande\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "segni strani dopo il numero\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "non c'è spazio per il descrittore di partizione\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "impossibile costituire una partizione estesa adiacente\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "troppi campi di input\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Non c'è spazio per altri\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Tipo non valido\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Attenzione: la dimensione indicata (%lu) è superiore alla dimensione massima "
 "consentita (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Attenzione: partizione vuota\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Attenzione: inizio partizione non valido (%lu troppo anticipato)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "flag avviabile non riconosciuto - scegliere - o *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "Specificazione c,h,s parziale?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "partizione estesa in posizione non prevista\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "input non valido\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "troppe partizioni\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5434,43 +5469,43 @@ msgstr ""
 "Solitamente è necessario specificare solamente <inizio> e <dimensione> ( e "
 "forse <tipo>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: qualcosa come /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "opzioni utili:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]: elenco dimensioni di una partizione"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [o --id]:        stampa o modifica dell'Id della partizione"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:      elenco delle partizioni di ciascun dispositivo"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 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:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5478,56 +5513,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  accetta/riporta in unità di settori/blocchi/"
 "cilindri/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]:elenca i tipi di partizione conosciuti"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 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"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 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:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                modifica solamente la partizione con numero #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 non scrive realmente sul disco"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ripristina questi settori nuovamente"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:   stampa versione"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:     stampa questo messaggio"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "opzioni pericolose:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 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:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5535,7 +5570,7 @@ msgstr ""
 "    -G [o --show-pt-geometry]: stampa la geometria stimata in base alla\n"
 "                               tabella delle partizioni"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5543,59 +5578,59 @@ msgstr ""
 "    -x [o --show-extended]: elenca anche le partizioni estese in output\n"
 "                            o prevede i rispettivi descrittori in input"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [o --Linux]:      non segnala le cose irrilevanti per Linux"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:      elimina i messaggi di avvertimento"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    È possibile non usare la geometria rilevata utilizzando:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 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:2316
+#: fdisk/sfdisk.c:2321
 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:2317
+#: fdisk/sfdisk.c:2322
 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:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "È possibile disattivare tutte le verifiche di coerenza con:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [o --force]:      fa ciò che dico, anche se è stupido"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5604,68 +5639,68 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "nessun comando?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totale: %llu blocchi\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id numero partizione dispositivo\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Uso: sfdisk --change-id numero partizione dispositivo Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id numero partizione dispositivo [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 "è possibile specificare solamente un dispositivo(eccetto con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "impossibile aprire %s in lettura e scrittura\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "impossibile aprire %s in lettura\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindri, %ld testine, %ld settori/traccie\n"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "impossibile ottenere la dimensione di %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5673,7 +5708,7 @@ msgstr ""
 "Fine\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5682,37 +5717,37 @@ msgstr ""
 "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:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partizione %s ha id %x e non è nascosta\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id non valido %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Questo disco è attualmente in uso.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Errore irreversibile: impossibile trovare %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Attenzione: %s non è un dispositivo a blocchi\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 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:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5726,30 +5761,30 @@ msgstr ""
 "disco.\n"
 "Usare l'opzione --no-reread per eliminare questo controllo.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vecchia situazione:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partizione %d non esiste, non è possibile modificarla\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Nuova situazione:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5757,21 +5792,21 @@ msgstr ""
 "Queste partizioni non mi piacciono - nessuna modifica\n"
 "(se questo è quanto si desidera, utilizzare l'opzione --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Soddisfatti di questo? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Scrivere questo su disco? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5780,16 +5815,16 @@ msgstr ""
 "\n"
 "sfdisk: fine prematura dell'input\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Uscita in corso - nessuna modifica\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, 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:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5798,7 +5833,7 @@ msgstr ""
 "La nuova tabella delle partizioni è stata scritta con successo\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5809,17 +5844,17 @@ msgstr ""
 " per azzerare i primi 512 byte: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Consultare fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: impossibile aprire %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5827,116 +5862,116 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: non trovato"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: errore %d durante la decompressione! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s no è un lp device.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Forzatura controllo filesystem su %s in corso.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr "Uso: mkfs [-V] [-t tipofs] [opzioni-fs] dispositivo [dimensione]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s no è un lp device.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Impossibile aprire %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "eseguito umount di %s\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Smontaggio in corso di qualsiasi filesystem rimanente..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: argomento sconosciuto: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s da %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Impossibile allocare il buffer per gli inode"
@@ -6447,7 +6482,13 @@ msgstr "Impossibile trovare un'interfaccia clock utilizzabile.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Impossibile impostare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6462,17 +6503,17 @@ msgstr ""
 "(e quindi, presumibilmente, non può essere eseguita su un Alpha in questo "
 "momento). Nessuna azione intrapresa.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6481,24 +6522,24 @@ msgstr ""
 "Per impostare il valore epoch si deve utilizzare l'opzione 'epoch' per "
 "indicare su quale valore impostarlo.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s da %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6517,6 +6558,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6566,7 +6608,7 @@ msgstr ""
 "  --noadjfile   non legge /etc/adjtime; richiede l'uso di --utc o --"
 "localtime\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6577,18 +6619,18 @@ msgstr ""
 "                indicano al hwclock il tipo di alpha utilizzato (consultare "
 "hwclock(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "Impossibile impostare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6597,7 +6639,7 @@ msgstr ""
 "Sono state specificate multiple funzioni.\n"
 "È possibile eseguire una sola funzione per volta.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6606,7 +6648,7 @@ msgstr ""
 "%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
 "specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6615,7 +6657,7 @@ msgstr ""
 "%s: Le opzioni --adjust e -noadjfile si escludono vicendevolmente. Sono "
 "state specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6624,30 +6666,30 @@ msgstr ""
 "%s: Le opzioni --adjust e -noadjfile si escludono vicendevolmente. Sono "
 "state specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Con --noadjfile, occorre specificare o --utc o --localtime\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, 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:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 "Spiacente, solamente il superutente può modificare il clock hardware.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr ""
 "Spiacente, solamente il superutente può modificare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6656,12 +6698,12 @@ msgstr ""
 "Solamente il supeutente può modificare l'epoca del clock hardware nel "
 "kernel.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6957,12 +6999,12 @@ msgstr "%s: impossibile impostare il contesto predefinito per /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "Modifica delle informazioni finger per %s in corso.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "chsh: errore PAM, interruzione in corso: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7188,35 +7230,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATALE: impossibile riaprire la tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s non è un dispositivo speciale a blocchi"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "FATALE: tty non valida"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h solamente per super-user.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Uso: login [-fp] [nomeutente]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Impossibile inizializzare PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FALLITO IL LOGIN %d DA %s PER %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7225,17 +7272,17 @@ msgstr ""
 "Login non corretto\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, 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:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7245,7 +7292,7 @@ msgstr ""
 "Login non corretto\n"
 
 # FIXME
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7254,120 +7301,120 @@ msgstr ""
 "\n"
 "Problema nell'avviare la sessione, interrotto.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Nome utente NULL in %s:%d. Interrotto."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Nome utente \"%s\" non valido in %s:%d. Interrotto."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: memoria esaurita\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Nome utente non valido"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login rifiutato su questo terminale.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO DA %s SU TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO SU TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login non corretto\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr " CONNESSIONE DI ACCESSO REMOTO A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN DI ROOT A %s DA %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN DI ROOT A %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN A %s ATTRAVERSO %s DA %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "C'è nuova posta.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "C'è posta.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: errore in esecuzione del fork: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY non riuscito: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() non riuscito"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Nessuna directory %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Connessione con home = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: nessuna memoria per lo script shell.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: exec dello script shell impossibile: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: nessuna shell: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7376,65 +7423,65 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "il nome di login è troppo lungo.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NOME troppo lungo"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "I nomi di login non possono iniziare con'-'.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "troppi linefeed vuoti.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "Linefeed ECCESSIVI"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login scaduto dopo %d secondi\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Ultimo login: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "da %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "su %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ERRORE DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ERRORE DI LOGIN SU %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ERRORI DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ERRORI DI LOGIN SU %s, %s"
@@ -7691,7 +7738,7 @@ msgstr "TERM non definito o impossibile eseguire stat sul tty\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "errore fermando il servizio \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7701,8 +7748,8 @@ msgstr "errore fermando il servizio \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "Esecuzione del programma \"%s\" in corso...\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "errore fermando il servizio \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7831,26 +7878,26 @@ msgstr "%s: impossibile fare stat del file temporaneo.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: impossibile leggere il file temporaneo.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "valore dell'anno non valido: usare 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "valore del mese non valido: usare 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "valore dell'anno non valido: usare 1-9999"
 
 # FIXME
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Uso: cal [-13smjyV] [[mese] anno]\n"
@@ -7874,6 +7921,115 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "impossibile aprire %s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Comando sconosciuto: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "Impossibile allocare il buffer.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "Impossibile allocare il buffer.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: impossibile leggere %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "errore di scrittura su %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Per maggiori informazioni vedere setarch(8).\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Nessuna directory %s!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "Impossibile allocare il buffer.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "Impossibile allocare il buffer.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "Impossibile allocare il buffer.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "Impossibile allocare il buffer.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8029,7 +8185,7 @@ msgstr "%s: impossibile rinominare %s in %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8040,37 +8196,37 @@ msgstr ""
 "Usare \"%s [opzioni] %s\" se si vuole veramente usarlo.\n"
 "Script non avviato.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "Uso: script [-a] [-f] [-q] [-t] [file]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniziato, il file è %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "errore di scrittura su %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniziato su %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "errore di scrittura su %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: impossibile trovare il dispositivo per %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8079,17 +8235,17 @@ msgstr ""
 "\n"
 "Script effettuato su %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script effettuato, il file è %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty non riuscita\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Esauriti tutti i pty disponibili\n"
@@ -8434,6 +8590,16 @@ msgstr "lettura di %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: impossibile aprire: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "impossibile fare stat di %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8464,6 +8630,11 @@ msgstr "Errore durante la lettura di %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "id non valido"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8481,7 +8652,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8501,12 +8672,12 @@ msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8534,76 +8705,76 @@ msgstr "Uso: %s [opzioni] dispositivo...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nome...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "malloc non riuscita"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "Apertura di %s non riuscita"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
+"\n"
+"Errore durante la chiusura del file\n"
+
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Il disco %s non contiene una tabella delle partizioni valida\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "openpty non riuscita\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "byte"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty non riuscita\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Valore impostato non valido: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Uso: %s [opzioni] dispositivo...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8612,7 +8783,7 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8859,7 +9030,7 @@ msgstr "loop: impossibile eliminare il device %s: %s\n"
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Questo mount è stato compilato senza supporto per loop. Ricompilare.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8874,7 +9045,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8890,250 +9061,294 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Valore impostato non valido: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Valore impostato non valido: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: device occupato"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: impossibile trovare %s in %s o %s"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: secondo mtab, %s è già montato su %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: secondo mtab, %s è montato su %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: impossibile aprire %s in scrittura: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: errore durante la scrittura di %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: errore durante il cambio di modalità di %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: impossibile impostare l'id di gruppo: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: impossibile impostare l'id utente: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: impossibile effettuare il fork: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Prova di %s in corso\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, 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"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, 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"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "      e sembra che questo sia swapspace\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "      Proverò il tipo %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s assomigla a swapspace - non montato"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "mount non riuscito"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: solamente root può montare %s su %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: loop device specificato due volte"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: tipo specificato due volte"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: si ignora l'impostazione di un loop device\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Valore impostato non valido: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Valore impostato non valido: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: secondo mtab, %s è già montato su %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: si intende utilizzare il loop device %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: mancata impostazione del loop device\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: impostazione del loop device riuscita\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nessun %s trovato - creazione in corso...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: impossibile aprire %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: l'argomento di -p o --pass-fd deve essere un numero"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: impossibile aprire %s per impostare la velocità"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: impossibile impostare la velocità: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: secondo mtab, %s è già montato su %s\n"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s occupato - rimontato sola lettura\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s occupato - rimontato sola lettura\n"
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: impossibile determinare il tipo di filesystem, e non è stato "
 "specificato nessuno"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: mount non riuscito"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: il mount point di %s non è una directory"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: autorizzazione negata"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: bisogna essere superuser per utilizzare mount"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s è occupato"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc già montato"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s già montato o %s occupato"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: il mount point %s non esiste"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: il mount point %s è un collegamento simbolico a nulla"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: il device speciale %s non esiste"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9142,12 +9357,12 @@ msgstr ""
 "mount: il device speciale %s non esiste\n"
 "       (un prefisso di percorso non è una directory)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s non ancora montato, oppure l'opzione non è valida"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9156,25 +9371,25 @@ msgstr ""
 "mount: tipo fs errato, opzione non valida, superblocco su %s danneggiato,\n"
 "       codepage o programma ausiliario mancante, o altro errore"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9183,109 +9398,104 @@ msgstr ""
 "Provare\n"
 "       ad esempio 'dmesg | tail'\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "mount table piena"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: impossibile leggere il superblocco"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "umount: %s: dispositivo sconosciuto"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: tipo di filesystem '%s' sconosciuto"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probabilmente si intende %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: forse si intendeva 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: forse si intendeva 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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 tipo di fs %s non è supportato"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s non è un dispositivo a blocchi e stat non è riuscito?"
 
-#: mount/mount.c:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: il kernel non riconosce %s come un dispositivo a blocchi\n"
 "       (forse \"insmod driver\"?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s  non è un dispositivo a blocchi (forse provare \"-o loop\"?)"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s non è un dispositivo a blocchi"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s non è un dispositivo a blocchi valido"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "dispositivo a blocchi"
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: impossibile montare %s%s in sola lettura"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 "mount: %s%s è protetto da scrittura, ma l'opzione '-w' è stata indicata"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: impossibile montare %s%s in sola lettura"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s è protetto da scrittura, viene montato in sola lettura"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: nessun %s trovato - creazione in corso...\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s già montato su %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9295,23 +9505,23 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: non è stato dato il tipo - Si assume cifs per il prefisso //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s già montato su %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9348,39 +9558,39 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: è possibile solo per root"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: è possibile solo per root"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "non è stato montato niente"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: non si è trovata tale partizione"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: impossibile trovare %s in %s o %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: attenzione: non c'è un'andata a capo alla fine di %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: riga %d in %s non valida%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; ignorato resto del file"
 
@@ -9393,7 +9603,7 @@ msgstr "bug in chiamata xstrndup"
 msgid "not enough memory"
 msgstr "memoria insufficiente"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9404,7 +9614,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9417,7 +9627,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9429,127 +9639,132 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: EOF non previsto nel file %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "fork non riuscito\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "exec fallita\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() non riuscito"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "ricerca non riuscita"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Apertura di %s non riuscita"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Nome"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s non riuscito.\n"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: attenzione: %s ha permessi %04o non sicuri, si suggerisce %04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: file %s ignorato - sembra avere dei buchi.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "ricerca non riuscita"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s su %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s non riuscito.\n"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: impossibile trovare il dispositivo per %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "Non superutente.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s non riuscito.\n"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9559,37 +9774,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilato senza supporto per -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: impossibile impostare l'id di gruppo: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: impossibile impostare l'id utente: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: impossibile fare il fork: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo di blocchi non valido"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: non montato"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: impossibile scrivere superblock"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9597,51 +9812,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: non trovato"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bisogna essere superuser per eseguire umount"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, 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:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "nessun umount2, tentativo di umount in corso...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s occupato - rimontato sola lettura\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "eseguito umount di %s\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: impossibile trovare l'elenco dei filesystem da smontare"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9652,80 +9867,85 @@ msgstr ""
 "     umount -a [-f] [-r] [-n] [-v] [-t tipofs] [-O opzioni]\n"
 "     umount [-f] [-r] [-n] [-v] speciale | nodo...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Impossibile smontare \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Tentativo di eseguire umount di %s in corso\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Impossibile trovare %s in mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s non è montato (secondo mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembra che %s sia stato montato diverse volte"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, 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)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount non coerente con fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: solo %s può smontare %s da %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr " umount: solo root può farlo"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9733,77 +9953,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "sconosciuto"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS attraverso TCP non supportato.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "ncount"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Nuova"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() non è riuscito a leggere l'orario da %s"
@@ -9826,7 +10065,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9855,11 +10094,121 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "exec fallita\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Uso: %s programma [arg ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Per maggiori informazioni vedere setarch(8).\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "impossibile ottenere la dimensione di %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "malloc non riuscita"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "Scrittura della partizione su %s non riuscita\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: impossibile aprire: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "Scrittura della partizione su %s non riuscita\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "errore di posizionamento"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "errore di posizionamento"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " e "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10003,7 +10352,15 @@ msgstr "   %f int/sec; %f rec (car/sec)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n livello] [-s bufsize]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10012,7 +10369,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10021,31 +10378,36 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Argomenti insufficienti"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valore impostato non valido: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valore impostato non valido: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Opzione --date non specificata.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "numero massimo di segmenti = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty non riuscita\n"
@@ -10092,6 +10454,61 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "fork non riuscito\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Per maggiori informazioni vedere setarch(8).\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Opzione --date non specificata.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Opzione --date non specificata.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s non riuscito.\n"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "l'inode radice non è una directory"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "openpty non riuscita\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "openpty non riuscita\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10187,477 +10604,452 @@ msgstr ""
 "Uso: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "        [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opzione illegale -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: chiave illegale (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "autorizzazione negata per la chiave"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "chiave giù rimossa"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "chiave non valida"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "errore sconosciuto nella chiave"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "autorizzazione negata per id"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "id non valido"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "id già rimosso"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "errore sconosciuti in id"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: argomento sconosciuto: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "uso : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h per richiamare la guida.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s fornisce informazioni sulle funzionalità ipc a cui avete accesso in "
-"lettura.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Specifica risorsa:\n"
-"\t-m : shared_mem (mem_condiv)\n"
-"\t-q : messaggi\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : semafori\n"
-"\t-a : tutti (predefinito)\n"
+"%s fornisce informazioni sulle funzionalità ipc a cui avete accesso in "
+"lettura.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Formato output:\n"
-"\t-t : tempo\n"
-"\t-p : pid\n"
-"\t-c : creatore\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : dettagli sulla risorsa identificata da id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : limiti\n"
-"\t-u : sommario\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : dettagli sulla risorsa identificata da id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "il kernel non è configurato per la condivisione della memoria\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Limiti della memoria condivisa --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "numero massimo di segmenti = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "dimensione max seg (kbyte) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "valore massimo totale di memoria condivisa (kbyte) = %lu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "dimensione min seg (byte) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ stato della memoria condivisa --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "segmenti allocati %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "pagine allocate %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "pagine residenti  %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "pagine scambiate (swapping)   %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Prestazione swap: %ld tentativi\t %ld riusciti\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Segmento Mem. Condiv. Creatori/Propr.--------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Mem. Condiv.  Conn./Sconn./Cambio  Volte --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "proprietario"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "connesso"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "disconnesso"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "cambiato"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ Mem.  Condiv. Creatore/Last-op--------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segm. Memoria Condivisa --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "chiave"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "byte"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "stato"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Non impostato"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "bloccato"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "kernel non configurato per i semafori\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Limiti di semaforo --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "numero max di matrici = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "numero max di semafori per matrice = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "numero max di semafori su tutto il sistema = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "numero max opz. per chiamata semop = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valore max del semaforo = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Stato del semaforo --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "matrici utilizzate = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "semafori allocati = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Matrice di Semaf. Creatori/Propr. --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ Mem. Condivisa Operazione/Modif. Volte --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "last-op"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "ultima-modifica"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Matrici semafori --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "kernel non configurato per le code di messaggi\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Messaggi: limiti --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "numero max di code su tutto il sistema = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "dimensione max del messaggio (byte) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "dimensione massima predefinita della coda (byte) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Messaggi: stato --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "code allocate = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "intestazioni utilizzate = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "spazio utilizzato = %d byte\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ Code messaggi: Creatori/Proprietari --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Code messaggi  Inv./Ric./Modif. Volte--------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "invio"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "ricez."
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "modifica"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ Code Messaggi  PID  --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Code messaggi  --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "byte utilizzati"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "messaggi"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync non riuscito "
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10666,42 +11058,42 @@ msgstr ""
 "\n"
 "Segmento memoria condivisa shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, 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:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync non riuscito "
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10710,32 +11102,32 @@ msgstr ""
 "\n"
 "Coda di messaggi msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr "cbyte=%ld\tqbyte=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "ricerca non riuscita"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10744,159 +11136,182 @@ msgstr ""
 "\n"
 "matrice semafori semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "modalità=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "valore"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "id non valido: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s da %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "id non valido"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s non è un dispositivo speciale a blocchi"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "impossibile ottenere la dimensione di %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ricerca sull'unità disco impossibile"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "impossibile aprire %s"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Nessuno"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "fork: %s"
+msgid "error: cannot open %s"
+msgstr "%s: impossibile aprire %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "errore durante la lettura di %s\n"
+msgid "failed to read: %s"
+msgstr "impossibile fare stat di %s"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "errore di posizionamento"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "Apertura di %s non riuscita"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "Impossibile allocare il buffer.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: impossibile aprire: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr ""
 "\n"
 "Errore durante la chiusura del file\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "malloc non riuscita"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10905,70 +11320,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Vecchia situazione:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10977,70 +11405,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "errore durante il cambiamento della modalità di %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "Uso: rdev [ -rv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (o rdev /linux, eCc.) visualizza il ROOT device corrente"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         imposta ROOT su /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1             imposta i ROOTFLAGS (stato sola lettura)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            imposta la dimensione del RAMDISK"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1             imposta VIDEOMODE all'avvio"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   utilizza byte offset N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr " rootflags ...                   come rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr " ramsize ...                     come rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr " vidmode ...                     come rdev -v"
-
-#: sys-utils/rdev.c:87
-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, "
-"2=key2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"     utilizza -R 1 per montare la root readonly, -R 0 per lettura/scrittura."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "virgola mancante"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11154,11 +11518,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: vecchia priorità %d, nuova priorità %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11168,104 +11533,129 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: tipo di tabella delle partizioni non riconosciuto\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: intervallo illegale %s secondi\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: valore time_t illecito %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: versione %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Utilizzo di %s.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Utilizzo di %s.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "malloc() non riuscita"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s no è un lp device.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Messaggio da %s@%s su %s a %s ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: impossibile rinominare %s in %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "rtc letto"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11364,6 +11754,11 @@ msgstr "%s: valore non valido\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s no è un lp device.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "errore LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11394,6 +11789,11 @@ msgstr ", on-line"
 msgid ", error"
 msgstr ", errore"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: mount non riuscito"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "errore LPGETIRQ"
@@ -11439,6 +11839,16 @@ msgid "unshare failed"
 msgstr "ricerca non riuscita"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: impossibile impostare l'id di gruppo: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: impossibile impostare l'id utente: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "exec fallita\n"
@@ -11932,6 +12342,213 @@ msgstr "Linea di input troppo lunga.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: opzione illegale -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "segmenti allocati %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "pagine allocate %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "pagine residenti  %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "pagine scambiate (swapping)   %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Prestazione swap: %ld tentativi\t %ld riusciti\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "Esecuzione del programma \"%s\" in corso...\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Valore impostato non valido: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "ncount"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Nuova"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "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"
+
+#~ 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 ""
+#~ "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/rd/c0d0  o: fdisk /dev/ida/c0d0  (per i dispositivi "
+#~ "RAID)\n"
+#~ "  ...\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: nessun %s trovato - creazione in corso...\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "exec fallita\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "uso : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h per richiamare la guida.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Specifica risorsa:\n"
+#~ "\t-m : shared_mem (mem_condiv)\n"
+#~ "\t-q : messaggi\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semafori\n"
+#~ "\t-a : tutti (predefinito)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Formato output:\n"
+#~ "\t-t : tempo\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creatore\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : limiti\n"
+#~ "\t-u : sommario\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "fork: %s"
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "errore durante la lettura di %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "errore durante il cambiamento della modalità di %s: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr "Uso: rdev [ -rv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (o rdev /linux, eCc.) visualizza il ROOT device corrente"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         imposta ROOT su /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1             imposta i ROOTFLAGS (stato sola lettura)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            imposta la dimensione del RAMDISK"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1             imposta VIDEOMODE all'avvio"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   utilizza byte offset N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr " rootflags ...                   come rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr " ramsize ...                     come rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ 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, 2=key2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "     utilizza -R 1 per montare la root readonly, -R 0 per lettura/"
+#~ "scrittura."
+
+#~ msgid "missing comma"
+#~ msgstr "virgola mancante"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "memoria esaurita"
diff --git a/po/ja.po b/po/ja.po
index 6a6ab74f..a01e0a4b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,13 +4,13 @@
 #   includes cfdisk original translation by
 #         Hidenobu NABETANI <nabetani@kern.phys.sci.osaka-u.ac.jp>
 # Daisuke Yamashita <yamad@mb.infoweb.ne.jp>, 1999-2001.
-# Makoto Kato <makoto.kt@gmail.com>, 2009.
+# Makoto Kato <makoto.kt@gmail.com>, 2009-2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.16-rc2\n"
+"Project-Id-Version: util-linux-ng 2.17.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
-"PO-Revision-Date: 2009-07-20 14:08+0900\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
+"PO-Revision-Date: 2010-02-26 00:33+0900\n"
 "Last-Translator: Makoto Kato <makoto.kt@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -32,18 +32,16 @@ msgid "get read-only"
 msgstr "読み書き可能かどうかをテスト"
 
 #: disk-utils/blockdev.c:82
-#, fuzzy
 msgid "get logical block (sector) size"
-msgstr "セクタ数を取得"
+msgstr "論理ブロック (セクタ) サイズを取得"
 
 #: disk-utils/blockdev.c:88
-#, fuzzy
 msgid "get physical block (sector) size"
-msgstr "セクタ数を取得"
+msgstr "物理ブロック (セクタ) サイズを取得"
 
 #: disk-utils/blockdev.c:94
 msgid "get minimum I/O size"
-msgstr ""
+msgstr "最小のI/Oサイズを取得"
 
 #: disk-utils/blockdev.c:100
 msgid "get optimal I/O size"
@@ -97,13 +95,18 @@ msgstr "バッファをフラッシュする"
 
 #: disk-utils/blockdev.c:171
 msgid "reread partition table"
-msgstr "領域テーブルを再読み込み"
+msgstr "パーティションテーブルを再読み込み"
 
 #: disk-utils/blockdev.c:179
 #, c-format
 msgid "Usage:\n"
 msgstr "使い方:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -k\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -123,6 +126,17 @@ msgstr "利用可能コマンド:\n"
 msgid "get size in 512-byte sectors"
 msgstr "512バイトセクタのサイズを取得"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -230,15 +244,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "使い方: %s [ -n ] デバイス\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -340,7 +345,7 @@ msgstr "CRCをテストできません: 古いcramfs形式です"
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc に失敗"
 
@@ -948,7 +953,7 @@ msgstr "デバイス %s を stat できません"
 msgid "%s is not a block special device"
 msgstr "%s はブロックスペシャルデバイスではありません"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "%s を open できません"
@@ -972,7 +977,7 @@ msgstr "iノードが多すぎます - 最大 512 です"
 msgid "not enough space, need at least %llu blocks"
 msgstr "領域が不十分です。最低でも %llu ブロック必要です"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "デバイス: %s\n"
@@ -1047,7 +1052,7 @@ msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "使い方: mkfs [-V] [-t ファイルシステム型] [fs オプション] デバイス [サイズ]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1144,7 +1149,7 @@ msgstr "ディレクトリデータ: %zd バイト\n"
 #: disk-utils/mkfs.cramfs.c:908
 #, c-format
 msgid "Everything: %zd kilobytes\n"
-msgstr ""
+msgstr "すべて: %zd キロバイト\n"
 
 #: disk-utils/mkfs.cramfs.c:913
 #, c-format
@@ -1281,7 +1286,7 @@ msgstr "ブロックのテスト中にシークが失敗しました"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check に変な値があります: 多分バグでしょう\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "check_blocks でのシークに失敗しました"
 
@@ -1309,9 +1314,8 @@ msgid "badblock number input error on line %d\n"
 msgstr ""
 
 #: disk-utils/mkfs.minix.c:540
-#, fuzzy
 msgid "cannot read badblocks file"
-msgstr "ディスクドライブを読み込めません"
+msgstr "不正ブロックファイルを読み込めません"
 
 #: disk-utils/mkfs.minix.c:620
 #, c-format
@@ -1363,172 +1367,178 @@ msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "システムのページサイズ値 %2$d の代わりに、ユーザ指定値 %1$d を使います\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s: 子プロセスの起動に失敗: %s\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "スワップヘッダサイズが正しくないため、ラベルは書き込まれません。\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "ラベルは切り詰められました。\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "ラベルはありません, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "uuidがありません\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "使い方: %s [-c] [-pページサイズ] [-L ラベル] [-U UUID] /dev/name [ブロック"
 "数]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "不正ページが多すぎます"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "不正なページ数\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "不正なページ数 %lu\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "スワップデバイスを巻き戻せません"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "inode バッファの確保ができません。"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "inode バッファの確保ができません。"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "ブートセクタをクリアできません"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (%s パーティションテーブルを認識しました)。"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   完全なディスクラベルを表示する"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   完全なディスクラベルを表示する"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: 警告: -U を無視します (UUIDsは%1$sによってサポートされません)\n"
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: スワップ空間のバージョン %d はサポートされていません。\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "エラー: UUID の解析に失敗"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: エラー: スワップを有効にするための場所がない？\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: エラー: サイズ %llu KiB がデバイスのサイズ %llu KiB よりも大きいです\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: エラー: スワップ領域は少なくとも %ld KiB 必要です\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: 警告: スワップ領域を %llu KiB に切り詰めました\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "'%s: '%s' にはスワップデバイスを作らないようにします\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: %s はマウントされています; ここにはスワップ空間をつくれません。\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "スワップ空間を設定できません: 読込めません"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "スワップ空間バージョン1を設定します、サイズ = %llu KiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: 署名ページを書き込めません: %s"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync に失敗"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: selinuxのファイルラベルを含むことができません: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "%s の状態を取得できません"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "新規の selinux コンテキストを作成できません"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "selinux コンテキストを計算できません"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: %s の名前を %s に変更できません: %s\n"
@@ -1593,61 +1603,113 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "エラーによりサービスを停止します: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "使用不可"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "スワップデバイスを巻き戻せません"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "空き領域"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: そのようなパーティションはありません\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: スワップ空間のバージョン %d はサポートされていません。\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: open に失敗: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: open に失敗: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: open に失敗: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: open に失敗: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: open に失敗: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "write_tables でのシークに失敗しました"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"使い方: %s [オプション] <ファイル名>\n"
+"\n"
+"オプション:\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"詳細情報は、wipefs(8) を確認してください。\n"
+
+#: disk-utils/swaplabel.c:203
+#, fuzzy
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr "%1$s: 警告: -U を無視します (UUIDsは%1$sによってサポートされません)\n"
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "使用不可"
 
-#: fdisk/cfdisk.c:415
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "空き領域"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "ディスクが変更されました。\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr "領域情報を正しく更新させるにはシステムを再起動してください。\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1660,231 +1722,230 @@ msgstr ""
 "まった場合は、cfdisk マニュアルにある追加情報ページ\n"
 "を参照してください。\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "*致命的なエラー*"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "中断するには何かキーを入力してください"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "ディスクドライブ上で seek できません"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "ディスクドライブを読み込めません"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "ディスクドライブに書き込めません"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "領域が多すぎます"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "領域がセクタ 0 よりまえから始まっています"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "領域がセクタ 0 より前で終わっています"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "領域がディスクの終点よりも後ろから始まっています"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "領域がディスクの終点よりも後ろで終わっています"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "論理領域がディスクの順序と一致しません"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "論理領域が重複しています"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "拡大された論理領域が重複しています"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! 内部エラー。拡張領域以外に論理ドライブを作成しようとしています !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "ここには論理ドライブを作成できません -- 2 つの拡張領域であれば作成します"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "メニュー項目名が長すぎます。メニュー表示が乱れている可能性があります。"
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "メニューに方向がありません。水平方向を初期値とします。"
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "不正なキー"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "続けるには何かキーを入力してください"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "基本領域"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "新規に基本領域を作成します"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "論理領域"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "新規に論理領域を作成します"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "中止"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "領域を作成しません"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! 内部エラー !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "サイズ (MB 単位): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "最初から"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "空き領域の最初に領域を追加"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "最後から"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "空き領域の最後に領域を追加"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "拡張領域を作成するための場所がありません"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
-msgstr "領域テーブルがありません。\n"
+msgstr "パーティションテーブルがありません。\n"
 
-#: fdisk/cfdisk.c:1578
-#, fuzzy
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
-msgstr "領域テーブルが無いか領域テーブルの署名が不正です"
+msgstr "パーティションテーブルがありません。ゼロテーブルで開始しています。"
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "領域テーブルの署名が不正です"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
-msgstr "不明な領域テーブルのタイプ"
+msgstr "不明なパーティションテーブルのタイプ"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "ゼロテーブルで開始しましょうか [y/N] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "ディスクにとって適切な数よりも多くのシリンダ数を指定されました"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "ディスクドライブを開けません"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "ディスクを読込み専用で開きました -- あなたには書込み権限がありません"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "警告!! サポートしていない GPT (GUID パーティションテーブル) を検出しました。"
 "GNU Parded を使ってください"
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "ディスクサイズを取得できません"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "不正な基本領域"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "不正な論理領域"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "警告！ これはあなたのディスクにあるデータを破壊するかもしれません"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "パーティション領域をディスクに書き込んでもよろしいですか？(yes または no): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "領域テーブルをディスクに書き込みませんでした"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "`yes' か `no' のいずれかを入力してください"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "領域テーブルを書き込み中..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "領域テーブルをディスクに書き込みました"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1892,85 +1953,85 @@ msgid ""
 msgstr ""
 "領域テーブルを書き込みましたが、再読込みに失敗。再起動して更新してください"
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "ブート可能マーク付き基本領域がありません。DOS MBR はこれをブートできません。"
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "ブート可能マーク付き基本領域が複数あります。DOS MBR はこれをブートできませ"
 "ん。"
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "ファイル名を入力、画面に表示する場合はリターンキー: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "ファイル '%s' を開けません"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "ディスクドライブ: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "セクタ 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "セクタ %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   無し   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   基本/論理"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
-msgstr "   基本領域"
+msgstr "   基本"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
-msgstr "   論理領域"
+msgstr "   論理"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "不明"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "ブート"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "None"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s パーティション情報\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               最初の    最後の\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1978,7 +2039,7 @@ msgstr ""
 " # 領域       セクタ    セクタ オフセット    大きさ   Filesystemタイプ(ID) フ"
 "ラグ\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1986,463 +2047,463 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ----最初の-----      ----最後の-----      開始    Number of\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 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:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "生データ"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "生データの形式でパーティション情報を出力"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "セクタ"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "セクタ順にパーティション情報を出力"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "テーブル"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "単に領域情報を表示"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "領域情報を出力しない"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk のヘルプ画面"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk は端末型ディスク領域作成プログラムです。"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "ハードディスクドライブの領域を作成、削除、変更"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "することができます。"
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "コマンド      説明"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          カーソル上の領域のブートフラグの切替"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          カーソル上の領域を削除"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          シリンダ, ヘッダ, トラック当たりのセクタ数を変更"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             警告: このオプションが何をするものか理解していない人"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             は使用してはいけない。"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          この画面を表示"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          カーソル上の領域のディスク使用量を最大にする。"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             注意: このオプションは、DOS, OS/2 等と互換性のない"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             領域を作成する可能性があります。"
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          空き領域から新規に領域を作成"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          領域情報を画面またはディスクに出力する"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             領域の出力には次のような複数の形式から選択"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             できる:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - 生データ(ディスクに書き込まれる情報そのもの)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - セクタ順のパーティション情報"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - 生の形式のパーティション情報"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          領域情報を書き込まずにプログラムを終了"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          ファイルシステムタイプを変更"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          表示する領域サイズの単位を変更する"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, セクタ, シリンダの順に循環する"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          領域情報をディスクに書き込む(大文字 W を"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             入力しなければならない)。このオプションはディスク上の"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             データを破壊する可能性があるため、'yes'または'no'の入"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             力により、書き込みを行うかどうかを確認する。"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "上矢印キー   上の領域にカーソルを移動"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "下矢印キー   下の領域にカーソルを移動"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       画面を再描画"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          この画面を表示"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "注意: コマンドはすべて大文字、小文字どちらでも使用できます"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "(書き込みを除く)。"
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "シリンダ"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "シリンダのジオメトリを変更"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "ヘッド数"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "ヘッドのジオメトリを変更"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "セクタのジオメトリを変更"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "終了"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "ジオメトリを変更して終了"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "シリンダ数を入力してください: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "不正なシリンダ数"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "ヘッダ数を入力してください: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "不正なヘッド数"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "トラック当たりのセクタ数を入力してください: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "不正なセクタ数"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "ファイルシステムタイプを入力してください: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "ファイルシステムタイプを空に変更できません"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "ファイルシステムタイプを拡張に変更できません"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "不明(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "基本/論理"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "不明 (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "ディスクドライブ: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "サイズ: %lld バイト, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "サイズ: %lld バイト. %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "ヘッド: %d   トラック当たりのセクタ: %d   シリンダ: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "名前"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "フラグ"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "領域タイプ"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "FSタイプ"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[ラベル]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    セクタ "
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  シリンダ "
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  サイズ (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  サイズ (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "ブート可"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "カーソル上の領域のブートフラグを切り替える"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "削除"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "カーソル上の領域を削除"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "ジオメトリ"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "ディスクジオメトリを変更する(エキスパート用)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "ヘルプ"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "ヘルプ画面を表示"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "最大化"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "カーソル上の領域のディスク使用量を最大化(エキスパート用)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "新規作成"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "空き領域から新しく領域を作成"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "表示"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "領域情報を画面またはファイルに出力"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "終了"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "領域情報を書き込まずにプログラムを終了"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "FSタイプ"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "ファイルシステムのタイプを変更する(DOS, Linux, OS/2 など)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "単位"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "表示する領域サイズの単位(MB, セクタ, シリンダ)を変更する"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "書き込み"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "領域情報をディスクに書き込む(データを破壊する可能性あり)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "この領域をブート可能にはできません"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "空の領域を削除することはできません"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "この領域を最大化することはできません"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "この領域は使用できません"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "このディスクは現在使用中です。"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "空の領域のタイプを変更することはできません"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "これ以上の領域はありません"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "不正なコマンド"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2514,9 +2575,9 @@ msgstr ""
 "\n"
 "BSD ラベル用デバイス: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "コマンドの動作"
 
@@ -2536,9 +2597,9 @@ msgstr "   i   ブートストラップをインストールする"
 msgid "   l   list known filesystem types"
 msgstr "   l   既知のファイルシステムタイプをリスト表示する"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   このメニューを表示する"
 
@@ -2550,14 +2611,14 @@ msgstr "   n   新たに BSD 領域を作成する"
 msgid "   p   print BSD partition table"
 msgstr "   p   BSD 領域テーブルを表示する"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   変更を保存せずに終了する"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   メインメニューに戻る"
 
@@ -2600,13 +2661,13 @@ msgstr "%s には *BSD 領域はありません。\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD ディスクラベルコマンド (m でヘルプ): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "最初 %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "終点 %s または +サイズ または +サイズM または +サイズK"
@@ -2751,7 +2812,7 @@ msgstr "セクタ/トラック"
 msgid "tracks/cylinder"
 msgstr "トラック/シリンダ"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "シリンダ数"
@@ -2810,7 +2871,7 @@ msgstr "ブートストラップは %s にインストールされました。\n
 msgid "Partition (a-%c): "
 msgstr "領域 (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "最大領域数は作成済です\n"
@@ -2834,225 +2895,207 @@ msgstr ""
 "\n"
 "ディスクと同期しています。\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"使い方: fdisk [-b SSZ] [-u] ディスク     領域テーブルの変更\n"
-"        fdisk -l [-b SSZ] [-u] ディスク  領域テーブルリストの表示\n"
-"        fdisk -s パーティション          ブロックの領域サイズ表示\n"
-"        fdisk -v                         fdisk のバージョン表示\n"
-"ここで `ディスク' とは /dev/hdb や /dev/sda の様な何かの事です\n"
-"そして `領域' とは /dev/hda7 の様な何かの事です\n"
-"-u: (シリンダの代わりに)セクタユニットの開始、終点を与えます\n"
-"-b 2048: (ある種の MO ドライブ用に) 2048 バイトのセクタサイズを使います\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"使い方: fdisk [-l] [-b SSZ] [-u] デバイス\n"
-"   例: fdisk /dev/hda  (一番目の IDE ディスク)\n"
-" 又は: fdisk /dev/sdc  (三番目の SCSI ディスク)\n"
-" 又は: fdisk /dev/eda  (一番目の PS/2 ESDI ドライブ)\n"
-" 又は: fdisk /dev/rd/c0d0  又は: fdisk /dev/ida/c0d0  (RAID デバイス)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s を開けません\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s を読むことができません\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s をシークできません\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s への書き込みができません\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s での BLKGETSIZE ioctl に失敗\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "これ以上のメモリが確保できません\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "致命的なエラー\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   読込み専用フラグをつける"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd ディスクラベルを編集する"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   マウント可能フラグをつける"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   領域を削除する"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   既知の領域タイプをリスト表示する"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   新たに領域を作成する"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   新たに空の DOS 領域テーブルを作成する"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   領域テーブルを表示する"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   空の Sun ディスクラベルを作成する"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   領域のシステム ID を変更する"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   表示/項目ユニットを変更する"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   領域テーブルを照合する"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   テーブルをディスクに書き込み、終了する"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   特別な機能 (エキスパート専用)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   ブート可能領域を選択する"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   ブートファイルエントリを編集する"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi スワップ領域を選択する"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   ブート可能フラグをつける"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos 互換フラグをつける"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   代替シリンダ数を変更する"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   シリンダ数を変更する"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   領域テーブル内の生データを表示する"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   シリンダ毎の余剰セクタ数を変更する"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   ヘッド数を変更する"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   インターリーブファクタを変更する"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   回転数を変更する (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   セクタ数/トラックを変更する"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   物理シリンダ数を変更する"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   領域内のデータの先頭に移動する"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   拡張領域をリスト表示する"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) 領域テーブルを作成する"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   領域の順序を適正化する"
 
-#: fdisk/fdisk.c:515
-#, fuzzy
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
-msgstr "   u   表示/項目ユニットを変更する"
+msgstr "   i   ディスク識別子を変更する"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "設定する必要があります"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "ヘッド数"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "セクタ数"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3061,30 +3104,11 @@ msgstr ""
 "%s%s.\n"
 "あなたは特別機能メニューからこれを行なうことができます\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " 及び "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"このディスクのシリンダ数は %d に設定されています。\n"
-"間違いではないのですが、1024 を超えているため、以下の場合\n"
-"に問題を生じうる事を確認しましょう:\n"
-"1) ブート時に実行するソフトウェア (例. バージョンが古い LILO)\n"
-"2) 別の OS のブートやパーティション作成ソフト\n"
-"   (例. DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3095,70 +3119,72 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
-#, c-format
+#: fdisk/fdisk.c:800
+#, fuzzy, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
+"\n"
+"警告: DOS互換モードは廃止予定です。このモード (コマンド 'c') を止めることを\n"
+"      強く推奨します。"
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
-msgstr "基本拡張領域に不正なオフセットがあります\n"
+msgstr "基本拡張パーティションに不正なオフセットがあります\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "警告: 領域テーブル %d 内の特別なリンクポインタです\n"
+msgstr "警告: パーティションテーブル %d 内の特別なリンクポインタです\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "警告: 領域テーブル %d 内の特別なデータを無視します\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "空のパーティション (%d) を省略しています\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "ディスク識別子: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "新しいディスク識別子 (現在 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3170,33 +3196,24 @@ msgstr ""
 "あなたが書き込みを決定するまで、変更はメモリ内だけに残します。\n"
 "その後はもちろん以前の内容は修復不可能になります。\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "注意: セクタサイズが %d です (%d ではなく)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
-msgstr "領域テーブルの書き込みを行えません。\n"
+msgstr "パーティションテーブルの書き込みを行えません。\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, 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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3205,17 +3222,17 @@ msgstr ""
 "デバイスは正常な DOS 領域テーブルも、Sun, SGI や OSF ディスクラベルも\n"
 "含んでいません\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "内部エラー\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "特別な拡張領域 %d を無視します\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3224,7 +3241,7 @@ msgstr ""
 "警告: 領域テーブル %2$d の不正なフラグ 0x%1$04x は w(書き込み)によって\n"
 "正常になります\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3233,21 +3250,21 @@ msgstr ""
 "\n"
 "EOF を 3 回読みました -- 終了します..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "16進数コード (L コマンドでコードリスト表示): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, 初期値 %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3256,74 +3273,79 @@ msgstr ""
 "サポート: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "           2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "初期値 %u を使います\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "範囲外の値です。\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
-msgstr "領域番号"
+msgstr "パーティション番号"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "警告: 領域 %d は空のタイプです。\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "選択した領域 %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "領域が定義されていません\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "すべての基本領域は既に定義されています!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "シリンダ"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "セクタ"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "%s の表示/項目ユニットを変更します\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "%s の表示/項目ユニットを変更します\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "警告: 領域 %d は拡張領域です\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
-msgstr "DOS 互換フラグが設定されました\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
+msgstr "DOS互換フラグが設定されました\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
-msgstr "DOS 互換フラグは設定されていません\n"
+msgstr "DOS互換フラグは設定されていません\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "領域 %d はまだ存在しません！\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3336,7 +3358,7 @@ msgstr ""
 "多分浅はかなことです。あなたは `d' コマンドを使ってこのパーティションを\n"
 "削除できます。\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3345,7 +3367,7 @@ msgstr ""
 "あなたは領域を拡張領域に変更できませんし、その逆もまた\n"
 "できません。まず削除を行なってください。\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3355,7 +3377,7 @@ msgstr ""
 "領域 3 を Whole disk (5) として残しておくことを考慮してください、\n"
 "SunOS/Solaris はこれを期待しますし、Linux でさえそれが望ましいです。\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3366,62 +3388,62 @@ msgstr ""
 "として残しておくことを考慮してください。IRIX はこれを想定します。\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "領域のシステムタイプを %d から %x (%s) に変更しました\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "領域 %d のシステムタイプは変更されません: %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "領域 %d は異なった物理/論理開始位置になっています(Linux では無い?):\n"
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     物理=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "論理=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "領域 %d は異なった物理/論理終点になっています:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "領域 %i はシリンダ境界で始まっていません:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) であるべきです\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "パーティション %i は、シリンダ境界で終わっていません。\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) であるべきです\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "領域 %i はシリンダ境界で始まっていません:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3430,7 +3452,7 @@ msgstr ""
 "\n"
 "ディスク %s: %ld MB, %lld バイト\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3439,32 +3461,37 @@ msgstr ""
 "\n"
 "ディスク %s: %ld.%ld GB, %lld バイト\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "ヘッド %d, セクタ %llu, シリンダ %d"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", 合計 %llu セクタ"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Units = %s of %d * %d = %d バイト\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
+msgstr "セクタサイズ (論理 / 物理): %u バイト / %lu バイト\n"
+
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1915
+#, c-format
 msgid "Alignment offset: %lu bytes\n"
-msgstr "不正なiノードオフセット"
+msgstr ""
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3473,29 +3500,32 @@ msgstr ""
 "行うべきことはありません。既に正常な順序になっています。\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "終了\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
 "Probably you selected the wrong device.\n"
 "\n"
 msgstr ""
+"パーティションテーブルに見えません\n"
+"おそらく間違ったデバイスを選択しています。\n"
+"\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
-msgstr "%*s ブート     始点        終点    ブロック   Id  システム\n"
+msgstr "%*s ブート      始点        終点     ブロック   Id  システム\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "デバイス"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3504,7 +3534,7 @@ msgstr ""
 "\n"
 "領域テーブル項目がディスクの順序と一致しません\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3515,87 +3545,87 @@ msgstr ""
 "ディスク %s: ヘッド %d, セクタ %llu, シリンダ %d\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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"
+msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl       開始      サイズ ID\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
-msgstr "警告: 領域 %d はセクタ 0 を含んでいます\n"
+msgstr "警告: パーティション %d はセクタ 0 を含んでいます\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "領域 %d: ヘッド %d は最大値 %d よりも大きいです\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "領域 %d: セクタ %d は最大値 %llu よりも大きいです\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "領域 %d: シリンダ %d は最大値 %d よりも大きいです\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
-msgstr "領域 %d: 前のセクタ %d は合計 %d と一致しません\n"
+msgstr "パーティション %d: 前のセクタ %d は合計 %d と一致しません\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
-msgstr "警告: 領域 %d に不正なデータ開始位置があります\n"
+msgstr "警告: パーティション %d に不正なデータ開始位置があります\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "警告: 領域 %d は、領域 %d と重なっています。\n"
+msgstr "警告: パーティション %d は、パーティション %d と重なっています。\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "警告: 領域 %d は空です\n"
+msgstr "警告: パーティション %d は空です\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
-msgstr "論理領域 %d は領域 %d 全体になっていません\n"
+msgstr "論理パーティション %d はパーティション %d 全体になっていません\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
-msgstr "合計確保セクタ %llu は最大値 %llu よりも大きいです\n"
+msgstr "合計確保済みセクタ %llu は最大値 %llu よりも大きいです\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld 未確保 %d バイトセクタ\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr "領域 %d は定義済です。まずは削除を行なってください。\n"
+msgstr "パーティション %d は定義済みです。まずは削除を行なってください。\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "セクタ %llu は既に確保済みです\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
-msgstr "利用可能フリーセクタがありません\n"
+msgstr "利用可能な空きセクタがありません\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Last %1$s, +%2$s or +size{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3608,7 +3638,7 @@ msgstr ""
 "\tパーティションテーブルを作成してください。(o を使う)\n"
 "\t警告: これは現在のディスク内容を破壊します。\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3621,22 +3651,24 @@ msgstr ""
 "\tパーティションテーブルを作成してください。(o を使う)\n"
 "\t警告: これは現在のディスク内容を破壊します。\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
-msgstr "拡張領域を追加する前に、まず領域を削除する必要があります\n"
+msgstr ""
+"拡張パーティションを追加する前に、まずパーティションを削除する必要がありま"
+"す\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "すべての論理領域が使用中です\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
-msgstr "基本領域を追加します\n"
+msgstr "基本パーティションを追加します\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3645,22 +3677,22 @@ msgid ""
 msgstr ""
 "コマンドアクション\n"
 "   %s\n"
-"   p   基本領域 (1-4)\n"
+"   p   基本パーティション (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   論理 (5 以上)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   拡張"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "タイプ `%c' にとっては不正なパーティション番号です\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3669,12 +3701,12 @@ msgstr ""
 "パーティションテーブルは変更されました！\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "ioctl() を呼び出してパーティションテーブルを再読込みします。\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3688,7 +3720,7 @@ msgstr ""
 "次回リブート時か、partprobe(8)またはkpartx(8)を実行した後に\n"
 "使えるようになるでしょう\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3697,10 +3729,10 @@ msgid ""
 "information.\n"
 msgstr ""
 "\n"
-"警告: DOS 6.x 領域を作成、または変更してしまった場合は、\n"
+"警告: DOS 6.x パーティションを作成、または変更してしまった場合は、\n"
 "fdisk マニュアルの追加情報ページを参照してください。\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3709,42 +3741,42 @@ msgstr ""
 "\n"
 "ファイルクローズ中にエラー\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "ディスクを同期しています。\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "パーティション %d にはデータ領域がありません\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "新規データ開始位置"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "上級者コマンド (m でヘルプ): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "シリンダ数"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "ヘッド数"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "セクタ数"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "警告: DOS 互換のためのセクタオフセットを設定します\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3757,33 +3789,33 @@ msgstr ""
 "ユーティリティは GPT をサポートしません。GNU Parted を使ってください。\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "ディスク %s は正常なパーティションテーブルを含んでいません\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s を開けません\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s を開けません\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: 不明なコマンド\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "このカーネルはセクタサイズを自分認識します - -b オプションは無視します\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3792,17 +3824,17 @@ msgstr ""
 "警告: -b (セクタサイズ設定) オプションは 1 つのデバイス指定と共に\n"
 "使用されるべきです\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s でOSF/1 ディスクラベルを検出したので、ディスクラベルモードに移行します。\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "コマンド (m でヘルプ): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3811,16 +3843,16 @@ msgstr ""
 "\n"
 "現在のブートファイルは: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "新たなブートファイル名を入力してください: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "ブートファイルを変更しませんでした\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3910,15 +3942,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux スワップ"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4053,7 +4085,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "複数の entire disk の項目があります。\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "パーティションが定義されていません\n"
@@ -4157,7 +4189,7 @@ msgstr ""
 "だけが、このことを免れます。\n"
 "この領域に異なるタグ付けについて、よく解っているなら YES と入力して下さい。\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4212,7 +4244,7 @@ msgstr ""
 "メモリ内にのみ反映されます。その後はもちろん、以前の内容は失われ、\n"
 "復元は不可能となります。\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4230,55 +4262,55 @@ msgstr "パーティション %d の値の保存を試みます。\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\t開始=%d\t長さ=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS ルート"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS スワップ"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt セクタ"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS 予約"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid 自動検出"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4291,22 +4323,22 @@ msgstr ""
 "例. ヘッド数、セクタ数、シリンダ数及びパーティション数\n"
 "あるいは fresh label を強制してください (メインメニューの s コマンド)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "間違ったバージョン [0x%08x] の sun ディスクラベルを検出しました。\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "間違ったチェックサム値の sgi ディスクラベルを検出しました。\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "間違った num_partitions [%u] の sun ディスクラベルを検出しました。\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4314,7 +4346,7 @@ msgstr ""
 "警告: 領域テーブル %2$d の不正なフラグ 0x%1$04x は w(書き込み)によって\n"
 "正常になります\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4325,31 +4357,31 @@ msgstr ""
 "新たな sun disklabel を構築します。変更はあなたが書き込みを決定するまで、\n"
 "メモリにのみ残します。その後はもちろん、以前の内容は復元できません。\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "セクタ/トラック"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "パーティション %d はシリンダ境界で終わっていません\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "パーティション %d は他のセクタ %d-%d と重なっています\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "未使用ギャップ -- 0-%d セクタ\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "未使用ギャップ -- %d-%d セクタ\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4358,7 +4390,7 @@ msgstr ""
 "他のパーティションが既にディスク全体を覆っています。\n"
 "まずそれを削除してからもう一度試してください。\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4367,12 +4399,12 @@ msgstr ""
 "11 番目の領域は entire disk を覆い、`SGI volume' 型であることを\n"
 "強く推奨します\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "セクタ %d は既に確保済みです\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4383,7 +4415,7 @@ msgstr ""
 "他のいくつかのパーティションを覆っています。あなたの項目は %d %s に\n"
 "変更されました。\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4393,7 +4425,7 @@ msgstr ""
 "Whole disk (5) のままにしておくことを考慮してください。\n"
 "0 から始まる %u セクタ分です\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4407,12 +4439,12 @@ msgstr ""
 "もし、あなたが本当にパーティションに符合 82 (Linux swap) をつけたければ\n"
 "YES と答えてください: "
 
-#: fdisk/fdisksunlabel.c:581
-#, c-format
+#: fdisk/fdisksunlabel.c:576
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4428,11 +4460,11 @@ msgstr ""
 "ユニット = %s of %d * 512 バイト\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4441,28 +4473,28 @@ msgstr ""
 "ユニット = %s of %d * 512 バイト\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s フラグ   始点      終点  ブロック   Id  システム\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "代替シリンダ数"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "シリンダ毎の特別なセクタ"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "インターリーブ"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "回転数 (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "物理シリンダ数"
 
@@ -4671,6 +4703,10 @@ msgstr "Minix / 古い Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux スワップ / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 隠し C: ドライブ"
@@ -5207,7 +5243,7 @@ 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:1324
@@ -5215,7 +5251,7 @@ 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"
 "なってしまいます。\n"
 
@@ -5302,94 +5338,94 @@ msgstr "-n フラグが与えられました: 何も変更しませんでした\
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "古いセクタの保存に失敗 -- 中断します\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "長いか不完全な行の入力 -- 中止します\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "入力エラー: `=' は %s フィールドの後にしてください\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "入力エラー: %2$s フィールドの後の予期しない文字 `%1$c'\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "認識できない入力: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "数字が大きすぎます\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "数字の後ろにゴミが付いています\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "パーティション記述子の空きがありません\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "拡張パーティションの囲いを構築できません\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "入力フィールドが多すぎます\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "これ以上の空きがありません\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "不正なタイプ\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "警告: 与えられたサイズ (%lu) は、許容できる最大サイズ (%lu) を越えています\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "警告: 空のパーティション\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "警告: 不正なパーティションが始まっています (一番最初 %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "認識できないブート可能フラグ -- - か * を選んでください\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s の一部を指定？\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "拡張パーティションが予期した場所にありません\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "不正な入力\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "パーティションが多すぎます\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5400,92 +5436,93 @@ msgstr ""
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "普通は <start> と <size> (そして恐らく <type>)を指定するだけで構いません。\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "デバイス: /dev/hda や /dev/sda の様な何か"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "有益なオプション:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
-msgstr "    -s [or --show-size]: 領域サイズのリスト"
+msgstr "    -s [or --show-size]: パーティションサイズのリスト"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
-msgstr "    -c [or --id]:        領域 ID の表示または変更"
+msgstr "    -c [or --id]:        パーティション ID の表示または変更"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
-msgstr "    -l [or --list]:      デバイス毎の領域リスト"
+msgstr "    -l [or --list]:      デバイス毎のパーティションリスト"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [or --dump]:      前に同じだが、後の入力書式に沿うようにする"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [or --increment]: シリンダ数など。0 ではなく 1 から"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  セクタ/ブロック/シリンダ/MB のユニットの受理/報告"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
-msgstr "    -T [or --list-types]:既知の領域タイプのリスト"
+msgstr "    -T [or --list-types]:既知のパーティションタイプのリスト"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [or --DOS]:       DOS 互換モード -- 空間が少し無駄になります"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr "    -R [or --re-read]:   カーネルに領域テーブルを再読込みさせる"
+msgstr ""
+"    -R [or --re-read]:   カーネルにパーティションテーブルを再読込みさせる"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
-msgstr "    -N# :                指定番号# の領域のみ変更する"
+msgstr "    -N# :                指定番号# のパーティションのみ変更する"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ディスクへの実際の書込みを行わない"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O file :            上書きされるセクタをファイルに保存する"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            セクタをファイルから復元する"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [or --version]:   バージョンを表示する"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [or --help]:      このメッセージを表示する"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "危険なオプション:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [or --show-geometry]: カーネルのジオメトリ情報を表示する"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5493,7 +5530,7 @@ msgstr ""
 "    -G [or --show-pt-geometry]: 領域テーブルから推測されるジオメトリ情報を表"
 "示する"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5501,60 +5538,60 @@ msgstr ""
 "    -x [or --show-extended]: 拡張領域リストも表示する\n"
 "                             またはそれらの記述子の入力を得る"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [or --Linux]:      Linux にそぐわなくても文句を云わない"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [or --quiet]:      警告メッセージを抑制する"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    ジオメトリ検出を強制指定できます:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [or --cylinders #]:使用するシリンダ数を設定する"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [or --heads #]:    使用するヘッド数を設定する"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [or --sectors #]:  使用するセクタ数を設定する"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "矛盾のチェックを行わないようにできます:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [or --force]:      おかしな指定を行っても、そのまま実行します"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "使い方:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s デバイス\t\t デバイス上のアクティブ領域をリストします\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s デバイス n1 n2 ... n1 をアクティブにして..., 残りを非アクティブにします\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An デバイス\t n をアクティヴにし、それ以外を非アクティブにします\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5563,67 +5600,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "全てのチェックを超越させるには --force フラグを使ってください。\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "コマンドなし？\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "合計: %llu ブロック\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "使い方: sfdisk --print-id デバイス パーティション番号\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "使い方: sfdisk --change-id デバイス パーティション番号 ID\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "使い方: sfdisk --id デバイス パーティション番号 [ID]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "一つのデバイスのみ指定できます (-l や -s を除く)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s を読み書きモードで開けません\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s を読込み用に開けません\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "%s のサイズを取得できません\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "不正なブートフラグ: 0x80 でなく 0x%x です\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5631,7 +5668,7 @@ msgstr ""
 "終了\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5641,35 +5678,35 @@ msgstr ""
 "LILO では問題ありませんが、DOS MBR は 1 つのアクティブなパーティションしか\n"
 "ブートできません。\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "パーティション %s には ID %x があり、隠されていません\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "不正な ID %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "このディスクは現在使用中です。\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "致命的なエラー: %s が見つかりません\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "警告: %s はブロックデバイスではありません\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "現在、誰もこのディスクを使っていないかを調べます...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5683,30 +5720,30 @@ msgstr ""
 "   があれば swapoff してください。\n"
 "   ちなみに --no-reread フラグでこのチェックを抑制できます。\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "全てのチェックを超越させるには --force フラグを使ってください。\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "古い場面:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "パーティション %d は存在しませんので、変更できません\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "新たな場面:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5714,21 +5751,21 @@ msgstr ""
 "私はこれらのパーティションに関与したくありません -- 変更しません。\n"
 "(本当にこれを行ないたければ、--force オプションを使ってください)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "私はこれに関与したくありません -- 恐らく No と答えるべきでしょう\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "これであなたの要求は満たされますか？ [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "ディスクへの書き込みを行ないますか？ [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5737,16 +5774,16 @@ msgstr ""
 "\n"
 "sfdisk: 入力が短すぎます\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "中断 -- 何も変更しません\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "y,n,q のいずれかで答えてください\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5755,7 +5792,7 @@ msgstr ""
 "新たなパーティションの書き込みに成功\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5766,17 +5803,17 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(詳細は fdisk(8)を見てください。)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "警告: %s を開けません: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5784,115 +5821,115 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr "fsck: %s: 見つかりません\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr "%s: wait: 子プロセスは存在しない?!?\n"
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr ""
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "ファイルシステムタイプのためのメモリを確保できませんでした\n"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
-#, fuzzy, c-format
+#: fsck/fsck.c:892
+#, c-format
 msgid "%s: skipping nonexistent device\n"
-msgstr "%s: %s は lp デバイスではありません。\n"
+msgstr "%s: 存在しないデバイスをスキップしています\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr "fsck: %sをチェックできません: fsck.%sは見つかりません\n"
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr "すべてのファイルシステム検査します。\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--待機中-- (パス %d)\n"
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "使い方: fsck [-AMNPRTV] [ -C [ fd ] ] [-t ファイルシステム型] [fs オプショ"
 "ン] [filesys ...]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: デバイスが多すぎます\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "%s を開けません: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "/proc はマウントされていますか?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "一致するファイルシステムが見つかりません: %s\n"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: 引数が多すぎます\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, c-format
 msgid "fsck from %s\n"
 msgstr "fsck from %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "%s: fsck_pathのためのメモリを確保ができません。\n"
@@ -6382,7 +6419,13 @@ msgstr "利用可能なクロックインターフェイスが見つかりませ
 msgid "Unable to set system clock.\n"
 msgstr "システムクロックを設定できません。\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6395,17 +6438,17 @@ msgstr ""
 "この hwclock の複製は Alpha 以外のマシンでビルドされました\n"
 "(そして当然、現在 Alpha 上で実行されていません)。実行できません。\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "カーネルからエポック値を取得できません。\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "カーネルはエポック値を %lu と想定しています\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6414,23 +6457,23 @@ msgstr ""
 "エポック値を設定するためには、何の値を設定するかを知らせるために 'epoch'\n"
 "オプションを使わなければなりません。\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "エポックを %d に設定しません -- テストだけです。\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "カーネルにエポック値を設定することができませんでした。\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s from %s\n"
 
-#: hwclock/hwclock.c:1311
-#, c-format
+#: hwclock/hwclock.c:1325
+#, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -6448,6 +6491,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6504,7 +6548,7 @@ msgstr ""
 "       --test         ハードウェア時計を更新する以外のすべてを行う\n"
 "  -D | --debug        デバッグモード\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6514,17 +6558,17 @@ msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "                あなたの alpha のタイプを指示する (hwclock(8) 参照)\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "システムクロックを設定できません。\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s は何らかのオプション引数を取ります。あなたは %d 個与えました。\n"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6533,7 +6577,7 @@ msgstr ""
 "あなたは機能オプションを複数個指定しました。\n"
 "一度に一つの機能のみ行なうことができます。\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6542,7 +6586,7 @@ msgstr ""
 "%s: --utc と --localtime オプションは相互排他的ですが、両方が指定されまし"
 "た。\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6551,7 +6595,7 @@ msgstr ""
 "%s: --adjust と --noadjfile オプションは相互排他的ですが、両方が指定されまし"
 "た。\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6560,30 +6604,30 @@ msgstr ""
 "%s: --adjfile と --noadjfile オプションは相互排他的ですが、両方が指定されまし"
 "た。\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: --noadjfile をつけた場合、--utc か --localtime のいずれかを指定しなければ"
 "なりません\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "有効な設定時刻がありません。クロックを設定できません。\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 "残念ながら、ハードウェアク時計の変更はスーパーユーザでしか行なえません。\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "残念ながら、システム時計の変更はスーパーユーザでしか行なえません。\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6592,12 +6636,12 @@ msgstr ""
 "残念ながら、カーネル内のハードウェア時計のエポック値を変更できるのは、\n"
 "スーパーユーザだけです。\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "既知のどんな方法でも、ハードウェア時計にアクセスできません。\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6889,12 +6933,12 @@ msgstr "%s: /etc/passwd のデフォルトコンテキストを設定できま�
 msgid "Changing finger information for %s.\n"
 msgstr "%s の finger 情報を変更します。\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM 失敗。中断します: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -6977,7 +7021,7 @@ msgstr "finger 情報を変更しました。\n"
 #: login-utils/chsh.c:143
 #, fuzzy, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr "%s: \"%s\" は /etc/shells リストの中にありません。\n"
+msgstr "%s: %s は /etc/shells リストの中にありません。\n"
 
 #: login-utils/chsh.c:164
 #, c-format
@@ -7120,35 +7164,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "致命的なエラー: tty を再オープンできません: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "致命的なエラー: %s はターミナルではありません"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "致命的なエラー: 不正な tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h はスーパーユーザ専用です。\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "使い方: login [-fp] [ユーザ名]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM の初期化ができません: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "ログイン: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7157,17 +7206,17 @@ msgstr ""
 "Login が間違っています\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "*ログイントライが多すぎます* (%d) %s から %s へ, %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "失敗したログインセッション %s から %s へ, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7176,7 +7225,7 @@ msgstr ""
 "\n"
 "Login が間違っています\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7185,120 +7234,120 @@ msgstr ""
 "\n"
 "セッションセットアップに問題。中断します。\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL ユーザ名が %s:%d にあります。中断します。"
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "無効なユーザ名 \"%s\" が %s:%d にあります。中断します"
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: メモリが足りません\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "不正なユーザ名"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s のログインはこの端末では拒否されました。\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "ログイン %s を拒絶、%s から TTY %s 上で"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "ログイン %s を拒絶、TTY %s 上で"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login が間違っています\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "ダイアルアップで %s に、%s による"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s に ROOT がログイン、%s から"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s に ROOT がログイン"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s に %s がログイン、%s から"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s に %s がログイン"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "新しいメイルが届いています。\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "メイルが届いています。\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork に失敗: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY に失敗: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() に失敗"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "ディレクトリ %s がありません！\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "ホームディレクトリ \"/\" でログインします。\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: シェルスクリプト用のメモリがありません。\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: シェルスクリプトを実行できませんでした: %s\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: シェルがありません: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7307,65 +7356,65 @@ msgstr ""
 "\n"
 "%s ログイン: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "ログイン名が長すぎます。\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "名前が長すぎます"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "ログイン名は '-' で始まっていてはいけません。\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "行送り(linefeed) が多すぎます。\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "過大な行送り(linefeed)"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "%d 秒後にログインの時間切れ\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "最終ログイン: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr " %.*s から\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr " %.*s 上\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s からのログインが失敗, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s でのログインが失敗, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d 回 %s からのログインが失敗, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d 回 %s でのログインが失敗, %s"
@@ -7621,8 +7670,8 @@ msgid "no TERM or cannot stat tty\n"
 msgstr "端末がないか tty の状態を取得できません\n"
 
 #: login-utils/simpleinit.c:938
-#, c-format
-msgid "error stopping service: \"%s\"\n"
+#, fuzzy, c-format
+msgid "error at stopping service \"%s\"\n"
 msgstr "サービスを停止する際にエラーが発生しました: \"%s\"\n"
 
 #: login-utils/simpleinit.c:950
@@ -7631,9 +7680,9 @@ msgid "Stopped service: %s\n"
 msgstr "サービスを停止します: %s\n"
 
 #: login-utils/simpleinit.c:1070
-#, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "programme実行時にエラーが発生しました: \"%s\"\n"
+#, fuzzy, c-format
+msgid "error at starting service \"%s\"\n"
+msgstr "サービスを停止する際にエラーが発生しました: \"%s\"\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7759,25 +7808,25 @@ msgstr "%s: 一時ファイルの情報を取得できません。\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: 一時ファイルを読めません。\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "不正な日: 1-%d を使ってください"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "不正な月: 1-12 を使ってください"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "不正な年: 1-9999 を使ってください"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "使い方: cal [-13smjyV] [[[日] 月] 年]\n"
@@ -7801,6 +7850,115 @@ msgstr "使い方: %s LABEL=<label>|UUID=<uuid>\n"
 msgid "unable to resolve '%s'"
 msgstr "'%s' を解決できません"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: 不明なコマンド: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "出力バッファの確保に失敗しました"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "出力バッファの確保に失敗しました"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: %s を読めません。\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: 書き込みエラー: %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"詳細情報は、namei(1) を確認してください。\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "ディレクトリ %s がありません！\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "出力バッファの確保に失敗しました"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "出力バッファの確保に失敗しました"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "出力バッファの確保に失敗しました"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "出力バッファの確保に失敗しました"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7958,7 +8116,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:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7969,37 +8127,37 @@ msgstr ""
 "本当にそれを使いたいなら `%s [オプション] %s' を使いましょう\n"
 "Script は開始しませんでした。\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "使い方: script [-a] [-f] [-q] [-t] [ファイル]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "スクリプトを開始しました、ファイルは %s です\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s: 書き込みエラー %d: %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "スクリプトは %s に開始しました"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s: 書き込みエラー: %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: スクリプトファイルを書き込むことが出来ません。エラー: %s \n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8008,17 +8166,17 @@ msgstr ""
 "\n"
 "スクリプトは %s に終了しました"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "スクリプトを終了しました、ファイルは %s です\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty が失敗\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "利用できる pty がありません\n"
@@ -8319,37 +8477,33 @@ msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM が定義されていません。\n"
 
 #: misc-utils/uuidd.c:46
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
-msgstr "使い方: last [-#] [-f ファイル] [-t 端末] [-h ホスト名] [ユーザ ...]\n"
+msgstr "使い方: %s [-d] [-p pidファイル] [-s ソケットパス] [-T タイムアウト]\n"
 
 #: misc-utils/uuidd.c:48
 #, c-format
 msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
-msgstr ""
+msgstr "       %s [-r|t] [-n 数字] [-s ソケットパス]\n"
 
 #: misc-utils/uuidd.c:50
-#, fuzzy, c-format
+#, c-format
 msgid "       %s -k\n"
-msgstr "        %s -l [ シグナル ]\n"
+msgstr "       %s -k\n"
 
 #: misc-utils/uuidd.c:152
-#, fuzzy
 msgid "bad arguments"
-msgstr "col: 不正な -l の引数 %s です。\n"
+msgstr "不正な引数"
 
 #: misc-utils/uuidd.c:159
-#, fuzzy
 msgid "socket"
-msgstr "nfs ソケット"
+msgstr "ソケット"
 
 #: misc-utils/uuidd.c:170
-#, fuzzy
 msgid "connect"
-msgstr "nfs 接続"
+msgstr "接続"
 
 #: misc-utils/uuidd.c:189
-#, fuzzy
 msgid "write"
 msgstr "書き込み"
 
@@ -8363,6 +8517,16 @@ msgstr "%c を読込み\n"
 msgid "bad response length"
 msgstr "悪いファイル名の長さ"
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: open に失敗: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "stat が失敗しました: %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8374,9 +8538,9 @@ msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
 #: misc-utils/uuidd.c:305
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
-msgstr "%s を開けません: %s\n"
+msgstr "unixソケット %sをバインドできません: %s\n"
 
 #: misc-utils/uuidd.c:313
 #, fuzzy, c-format
@@ -8393,6 +8557,11 @@ msgstr "%s の読込みエラー\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "不正なオプション"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8401,7 +8570,7 @@ msgstr ""
 #: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
-msgstr ""
+msgstr "生成されたランダムなUUID: %s\n"
 
 #: misc-utils/uuidd.c:397
 #, c-format
@@ -8409,9 +8578,9 @@ msgid "Generated time UUID %s and %d following\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:415
-#, c-format
-msgid "Generated %d UUID's:\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Generated %d UUIDs:\n"
+msgstr "生成された %d UUID:\n"
 
 #: misc-utils/uuidd.c:427
 #, fuzzy, c-format
@@ -8419,7 +8588,7 @@ msgid "Invalid operation %d\n"
 msgstr "不正なオプション"
 
 #: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "Bad number: %s\n"
 msgstr "不正な数: %s\n"
 
@@ -8430,13 +8599,13 @@ msgstr "%s のモード変更エラー: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
-#, c-format
-msgid "List of UUID's:\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "List of UUIDs:\n"
+msgstr "UUIDのリスト:\n"
 
 #: misc-utils/uuidd.c:557
 #, c-format
@@ -8446,106 +8615,98 @@ msgstr ""
 #: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
-msgstr ""
+msgstr "pid %d で実行中の uuidd を強制終了できません: %s\n"
 
 #: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
-msgstr ""
+msgstr "pid %d で実行中の uuidd を強制終了しました\n"
 
 #: misc-utils/uuidgen.c:32
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-r] [-t]\n"
-msgstr "使い方: %s [オプション]\n"
+msgstr "使い方: %s [-r] [-t]\n"
 
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM ディレクトリ ... -f ] 名前 ...\n"
 
-#: misc-utils/wipefs.c:128
-#, fuzzy
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
-msgstr "malloc に失敗"
+msgstr "calloc が失敗しました"
 
-#: misc-utils/wipefs.c:150
-#, fuzzy
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
-msgstr "標準出力への書き込みが失敗しました"
+msgstr "strdup が失敗しました"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr ""
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "エラー: UUID の解析に失敗"
+
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "ディスク %s は正常なパーティションテーブルを含んでいません\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: open に失敗: %s\n"
 
-#: misc-utils/wipefs.c:257
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:273
+#, c-format
 msgid "%s: write failed"
-msgstr "openpty が失敗\n"
+msgstr "%s: write が失敗"
 
-#: misc-utils/wipefs.c:259
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:275
+#, c-format
 msgid "%zd bytes ["
-msgstr "バイト"
+msgstr "%zd バイト ["
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
+#, c-format
 msgid "%s: open failed"
-msgstr "openpty が失敗\n"
+msgstr "%s: open が失敗"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "不正な設定値: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"使い方: %s [オプション]\n"
-"\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:347
+#, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 "\n"
-"詳細情報は、ipcmk(1) を確認してください。\n"
-"\n"
+"詳細情報は、wipefs(8) を確認してください。\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8668,9 +8829,9 @@ msgid "error changing mode of %s: %s\n"
 msgstr "%s のモード変更エラー: %s\n"
 
 #: mount/fstab.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "error changing owner of %s: %s\n"
-msgstr "%s のモード変更エラー: %s\n"
+msgstr "%s のオーナー変更エラー: %s\n"
 
 #: mount/fstab.c:898
 #, c-format
@@ -8678,9 +8839,9 @@ msgid "can't rename %s to %s: %s\n"
 msgstr "%s の名前を %s に変更できません: %s\n"
 
 #: mount/lomount.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
-msgstr "loop: デバイス %s の情報を取得できません: %s\n"
+msgstr "loop: デバイス %s のキャパシティを設定できません: %s\n"
 
 #: mount/lomount.c:386
 #, c-format
@@ -8741,7 +8902,7 @@ msgid ""
 msgstr ""
 "%s: loop デバイスが全く見つかりません。カーネルが loop デバイスをサポートして"
 "いないかもしれません。\n"
-"       (そうであれば、再コンパイルするか `insmod loop.o' して下さい。)"
+"       (そうであれば、再コンパイルするか `modprobe loop.o' して下さい。)"
 
 #: mount/lomount.c:636
 msgid "Out of memory while reading passphrase"
@@ -8789,7 +8950,7 @@ msgstr ""
 "この mount は loop のサポートなしでコンパイルされました。\n"
 "再コンパイルしてください。\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8814,7 +8975,7 @@ msgstr ""
 "                                              一覧を表示\n"
 " %1$s [オプション] {-f|--find|loopdev} <ファイル> セットアップ\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8829,251 +8990,306 @@ msgid ""
 " -v | --verbose           verbose mode\n"
 "\n"
 msgstr ""
+"\n"
+"オプション:\n"
+" -e | --encryption <type> enable data encryption with specified <name/num>\n"
+" -h | --help              このヘルプ\n"
+" -o | --offset <num>      ファイル内のオフセット <num> で開始する\n"
+"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r | --read-only         setup read-only loop device\n"
+"      --show              デバイス名を表示する (-f <file> と一緒に指定)\n"
+" -v | --verbose           verbose mode\n"
+"\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "不正な設定値: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "不正な設定値: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loopデバイス は %s です\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: デバイスを使用中です"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "コンパイル時に loop サポートが有効になっていません。再コンパイルしてくださ"
 "い。\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: %2$s や %3$s 内に %1$s を見つけられません"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: mtab によると、%s は %s にマウント済です"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: mtab によると、%s は %s にマウントされています"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s を書き込み用にオープンできません: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s の書き込みエラー: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: %s のモード変更エラー: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: グループid を設定できません: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: ユーザーid を設定できません: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: 子プロセスの起動ができません: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "%s を試します\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: %s へのファイルシステムタイプの指定がありません\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       %s 又は %s のタイプを試してみます\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       そして、それはスワップ空間の様です。\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       タイプ %s を試してみます\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s はスワップ空間のようですね -- マウントしません"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "マウントに失敗しました"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: root だけが %s を %s にマウントできます"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: loop デバイスが 2 回指定されました"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: タイプが 2 回指定されました"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: loop デバイスの設定をスキップします\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "不正な設定値: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "不正な設定値: %s\n"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: mtab によると、%s は loop として %s にマウント済です"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: loop デバイス %s を使います\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: stolen loop=%s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop デバイスの設定に失敗しました\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop デバイスの設定に成功しました\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s が見つかりません -- 作成します..\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s がオープンできません: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: -p または --pass-fd 引数は数字でなければなりません"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s を速度設定用にオープンできません"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: 速度の設定ができません: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: mtab によると、%s は %s にマウント済です\n"
 
-#: mount/mount.c:1371
-#, fuzzy, c-format
+#: mount/mount.c:1435
+#, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
-msgstr "umount: %s は使用中です -- 読込み専用として再マウントします\n"
+msgstr "mount: 警告: %s は読み書き可能としてマウントされているようです。\n"
+
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "mount: 警告: %s は読み書き可能としてマウントされているようです。\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: none が指定されましたが、ファイルシステムタイプを決定できません"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: ファイルシステムタイプを指定する必要があります"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: マウントに失敗しました"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: マウントポイント %s はディレクトリではありません"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: 許可がありません"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount を使うにはスーパーユーザでなければなりません"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s は使用中です"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc はマウント済です"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s は マウント済か %s が使用中です"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: マウントポイント %s が存在しません"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: マウントポイント %s はどこもさしていないシンボリックリンクです"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: スペシャルデバイス %s が存在しません"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9082,12 +9298,12 @@ msgstr ""
 "mount: スペシャルデバイス %s が存在しません\n"
 "       (パスのディレクトリがありません)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s はまだマウントされていないか、不正なオプションです"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9097,134 +9313,129 @@ msgstr ""
 "       %s のスーパーブロックが不正、コードページまたは\n"
 "       ヘルパープログラムの未指定、或いは他のエラー"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "マウントテーブルがいっぱいです"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: スーパーブロックを読めません"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: 不明なデバイスです"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: 未知のファイルシステムタイプ '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: おそらくあなたは %s を指定したかったのでしょう"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: 多分あなたは 'iso9660' を指定したかったのでは？"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: 多分あなたは 'vfat' を指定したかったのでは？"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s は間違ったデバイス番号になっているか、ファイルシステムタイプ\n"
 "       %s がサポートされていません"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s はブロックデバイスではありません、だから stat が失敗？"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: このカーネルは %s をブロックデバイスとして認識しません\n"
-"       (多分、`insmod ドライバ' しないといけないのでは？)"
+"       (おそらく、`modprobe ドライバ' しないといけないのでは?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
-"mount: %s はブロックデバイスではありません (多分 `-o loop' とやってみたら？)"
+"mount: %s はブロックデバイスではありません (多分 `-o loop' とやってみたら?)"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s はブロックデバイスではありません"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s は正常なブロックデバイスではありません"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "ブロックデバイス "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s を読込み専用でマウントできません"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s は書き込み禁止ですが、`-w' フラグが明示的に与えられました"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: %s%s を読込み専用でマウントできません"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s は書き込み禁止です、読込み専用でマウントします"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: %s が見つかりません -- 作成します..\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s は %s にマウント済です\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9234,22 +9445,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: タイプが与えられていません -- コロンがあるので nfs の様ですが\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: タイプが与えられていません -- // があるので cifs の様ですが\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s は %s にマウント済です\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9318,39 +9529,39 @@ msgstr ""
 "その他のオプション: [-nfFrsvw] [-o オプション] [-p passwdfd]\n"
 "もっと詳しいことを知りたければ、man 8 mount と唱えてみましょう。\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: root だけがそれを行なえます"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: root だけがそれを行なえます"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "何もマウントされませんでした"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: そのようなパーティションは見つかりません"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %2$s や %3$s 内に %1$s を見つけられません"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: 警告: %s の最後に改行がありません\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: %2$s の %1$d 行目は不正です%3$s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "-- 無視します"
 
@@ -9363,7 +9574,7 @@ msgstr "xstrndup 呼び出しのバグ"
 msgid "not enough memory"
 msgstr "メモリが不十分です"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9380,7 +9591,7 @@ msgstr ""
 " <file>                               使用するファイルの名前\n"
 "\n"
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9402,7 +9613,7 @@ msgstr ""
 " %1$s -V                            バージョンの表示\n"
 "\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9421,167 +9632,171 @@ msgstr ""
 " %1$s -V                           バージョンの表示\n"
 "\n"
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: 予期しないファイル形式"
 
-#: mount/swapon.c:205
-#, fuzzy, c-format
+#: mount/swapon.c:217
+#, c-format
 msgid "%s: reinitializing the swap."
-msgstr ""
-"%s: %s: ソフトウェアサスペンドデータを検出しました。スワップを再初期化しま"
-"す\n"
+msgstr "%s: スワップを再初期化しています。"
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 msgid "fork failed"
 msgstr "子プロセスの起動に失敗"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 msgid "execv failed"
 msgstr "実行に失敗"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
 msgstr "waitpid に失敗"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: シークに失敗"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: 署名の書き込みに失敗"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
-msgstr ""
+msgstr "異なる"
 
-#: mount/swapon.c:355
-#, fuzzy
+#: mount/swapon.c:367
 msgid "same"
-msgstr "名前"
+msgstr "同じ"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat が失敗"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: 警告: %s は安全でない権限 %04o を持ちます。 %04o がお勧めです\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: ファイル %s をスキップ -- ホールを検出。\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: サイズの取得に失敗"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: スワップヘッダの読み込みに失敗しました"
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s: ソフトウェアサスペンドデータを検出しました。スワップ署名を書きなおしま"
 "す。"
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%2$s に %1$s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s swaponは失敗しました"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "%s 用のデバイスが見つかりません"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr "スーパーユーザーではありません"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoffは失敗しました"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
+"'%s' はサポートしていないプログラム名です ('swapon' または 'swapoff' であるべ"
+"きです)。"
 
 #: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "mount: -f オプションのサポート無しでコンパイルされています\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: グループ id をセットできません: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: ユーザー id をセットできません: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: 子プロセスを起動できません: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s は不正なブロックデバイスです"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: マウントされていません"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: スーパーブロックに書き込めません"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9592,51 +9807,51 @@ msgstr ""
 "       (このデバイスがプロセスによって使われているのであれば、lsof(8)やfuser"
 "(1)を使って調査するのが有益かもしれません)"
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: 見つかりません"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: アンマウントするにはスーパーユーザでなければなりません"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ブロックデバイスはファイルシステム上で許可されません"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 がありません、umount してみます...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s は使用中です -- 読込み専用として再マウントします\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s を読込み専用で再マウントできませんでした\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s はアンマウントされました\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: アンマウントのためのファイルシステムリストを見つけられません"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9647,81 +9862,86 @@ msgstr ""
 "        umount -a [-d] [-f] [-r] [-n] [-v] [-t vfsタイプ] [-O オプション]\n"
 "        umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
 msgstr "デバイス %s は %s に関連づけされています\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "デバイス %s は %s に関連づけされていません\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "\"\" をアンマウントできません\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "%s をアンマウントします\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab に %s が見つかりません\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s マウントされていません (mtab によると)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s は複数マウントされているようです"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 "umount: %s は fstab にありません (さらに、あなたは root ではありません)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s は fstab と一致しないマウントです"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: %s だけが %s を %s からアンマウントできます"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: root だけがそれを行なえます"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9729,76 +9949,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: schedutils/chrt.c:87
-#, c-format
-msgid "pid %d's %s scheduling policy: "
-msgstr ""
+#: schedutils/chrt.c:104
+#, fuzzy, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr "pid %d's %s scheduling priority: %d\n"
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:106
 #, fuzzy, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr "pid %d's %s scheduling priority: %d\n"
+
+#: schedutils/chrt.c:139
+#, c-format
 msgid "unknown\n"
-msgstr "不明な"
+msgstr "不明\n"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
-#, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+#: schedutils/chrt.c:146
+#, fuzzy, c-format
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr "pid %d's %s scheduling priority: %d\n"
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, fuzzy, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr "pid %d's %s scheduling priority: %d\n"
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s min/max priority\t: %d/%d\n"
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "TCP 経由の NFS はサポートされていません。\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: open に失敗: %s\n"
 
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr "現在"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "新たに"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "typescript ファイル %s の読み込みが失敗しました"
@@ -9819,7 +10059,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9846,9 +10086,9 @@ msgstr ""
 "\n"
 
 #: schedutils/ionice.c:110 schedutils/ionice.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "cannot parse number '%s'"
-msgstr "%s を open できません"
+msgstr "数字 '%s' を解析できません"
 
 #: schedutils/ionice.c:151
 msgid "ignoring given class data for none class"
@@ -9863,9 +10103,120 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-msgid "execvp failed"
-msgstr "execvpに失敗"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
+msgstr "exec %s に失敗"
+
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "使い方: %s [オプション] <プログラム> [引数 ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"詳細情報は、namei(1) を確認してください。\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "%s のサイズを取得できません"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "calloc が失敗しました"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "%s のパーティション書き込みに失敗\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: open に失敗: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "%s のパーティション書き込みに失敗\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "解析エラー\n"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "解析エラー\n"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " 及び "
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -10007,11 +10358,22 @@ msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f 整数/秒 -- %f 記録 (キャラクタ/秒)\n"
 
 #: sys-utils/dmesg.c:45
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
-msgstr "使い方: %s [-c] [-n レベル] [-s バッファサイズ]\n"
+msgstr "使い方: %s [-c] [-n レベル] [-r] [-s バッファサイズ]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"使い方: %s [オプション] <ファイル名>\n"
+"\n"
+"オプション:\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10020,7 +10382,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10029,34 +10391,39 @@ msgstr ""
 "\n"
 "詳細情報は、namei(1) を確認してください。\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "引数が十分ではありません"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "不正な設定値: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "不正な設定値: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "--date オプションが指定されていません。\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "%sで予期しないファイルの終端"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
-#, fuzzy, c-format
+#: sys-utils/fallocate.c:147
+#, c-format
 msgid "%s: fallocate failed"
-msgstr "openpty が失敗\n"
+msgstr "%s: fallocate が失敗"
 
 #: sys-utils/flock.c:65
 #, c-format
@@ -10094,14 +10461,14 @@ msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s は引数を要求します\n"
 
 #: sys-utils/flock.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot open lock file %s: %s\n"
-msgstr "%s: %s を開けません: %s\n"
+msgstr "%s: ロックファイル %s を開けません: %s\n"
 
 #: sys-utils/flock.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad number: %s\n"
-msgstr "不正な数: %s\n"
+msgstr "%s: 不正な数値: %s\n"
 
 #: sys-utils/flock.c:238
 #, c-format
@@ -10113,6 +10480,64 @@ msgstr "%s: ファイルディスクリプタかファイルかディレクト�
 msgid "%s: fork failed: %s\n"
 msgstr "%s: 子プロセスの起動に失敗: %s\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"使い方: %s [オプション] <ファイル名>\n"
+"\n"
+"オプション:\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"詳細情報は、wipefs(8) を確認してください。\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "--date オプションが指定されていません。\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "--date オプションが指定されていません。\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s: stat が失敗"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "root inode がディレクトリではありません "
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "%s: write が失敗"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s: write が失敗"
+
 #: sys-utils/ipcmk.c:84
 #, c-format
 msgid ""
@@ -10182,9 +10607,9 @@ msgid "cannot remove id %s (%s)\n"
 msgstr "id %s (%s) を削除できません\n"
 
 #: sys-utils/ipcrm.c:97
-#, fuzzy, c-format
+#, c-format
 msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
-msgstr "使い方: %s {shm | msg | sem} id ...\n"
+msgstr "廃止予定の使い方: %s {shm | msg | sem} id ...\n"
 
 #: sys-utils/ipcrm.c:124
 #, c-format
@@ -10205,476 +10630,451 @@ msgstr ""
 "使い方: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "           [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: 不正なオプション -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: 不正なキー (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "キーの許可がありません"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "既にキーは削除されています"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "不正なキー"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 #, fuzzy
 msgid "permission denied for id"
 msgstr "mount: 許可がありません"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "不正な id"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "既に削除されたidです"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: 不明な引数 %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "使い方 : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h でヘルプを表示。\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s はあなたが読み込みアクセスできる ipc の資源状況などの情報を提供します。\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"リソース指定:\n"
-"\t-m : 共有メモリ\n"
-"\t-q : メッセージ\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : セマフォ\n"
-"\t-a : 全て (初期値)\n"
+"%s はあなたが読み込みアクセスできる ipc の資源状況などの情報を提供します。\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"出力書式:\n"
-"\t-t : 時間\n"
-"\t-p : プロセスID\n"
-"\t-c : 作成者\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : id によって識別されるリソースの詳細\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : 制限\n"
-"\t-u : 要約\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : id によって識別されるリソースの詳細\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "カーネルでの共有メモリの為の設定がされていません\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ 共有メモリの制限 --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "セグメント数の最大値 = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "セグメントサイズの最大 (単位:KB) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "合計共有メモリの最大 (単位:KB) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "最小セグメントサイズ (単位:バイト) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ 共有メモリの状態 --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "確保されたセグメント %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "確保されたページ     %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "固定されたページ     %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "スワップされたページ %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "スワップの動作: %ld 回試み %ld 回成功\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ 共有メモリセグメント 作成者/所有者 --------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "権限"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ 共有メモリ 結合/分離/変更回数 --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "所有者"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "結合"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "分離"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "変更"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ 共有メモリ 作成者/直近の命令 --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ 共有メモリセグメント --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "キー"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "バイト"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "状態"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "セットされていません"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "対象"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "ロック"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "カーネルでのセマフォの為の設定がされていません\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ セマフォの制限 --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "最大配列数 = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "配列毎の最大セマフォ数 = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "システム全体の最大セマフォ数 = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "semop 呼び出し毎の最大命令数 = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "セマフォ最大値 = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ セマフォの状態 --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "使用配列数 = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "確保されたセマフォ数 = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ セマフォ配列 作成者/所有者 --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ セマフォ 命令/変更回数 --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "最終操作"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "最終の変更"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ セマフォ配列 --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "カーネルでのメッセージキューの為の設定がされていません\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ メッセージ: 制限 --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "システム全体での最大キュー数 = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "最大メッセージサイズ (バイト) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "キューサイズ最大値の初期値 (バイト) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ メッセージ: 状態 --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "確保済みキュー数 = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "使用済ヘッダ = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "使用済空間 = %d バイト\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ メッセージキュー: 作成者/所有者 --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ メッセージキュー 送信/受信/変更回数 --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "送信"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "受信"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "変更"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ メッセージキュー PIDs --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ メッセージキュー --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "使用バイト数"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "メッセージ"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
 msgstr "shmctl に失敗しました"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10683,41 +11083,41 @@ msgstr ""
 "\n"
 "シェアードメモリセグメント shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "モード=%#o\tアクセス権=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
 msgstr "msgctlが失敗"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10726,31 +11126,31 @@ msgstr ""
 "\n"
 "メッセージキュー msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
 msgstr "semctl が失敗しました"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10759,155 +11159,179 @@ msgstr ""
 "\n"
 "セマフォ配列 semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "モード=%#o, アクセス権=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "値"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
-#, c-format
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "不正な id: %s\n"
+
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "使い方: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "不正な速度: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s from %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "不正なオプション"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "不正な id: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s はシリアルラインではありません"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "%s のサイズを取得できません"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr "速度 %d はサポートされません"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "ディスクドライブ上で seek できません"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "%s を open できません"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 msgid "none"
 msgstr "なし"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr "準仮想化"
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr "完全仮想化"
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, c-format
-msgid "error: %s"
-msgstr "エラー: %s"
+#: sys-utils/lscpu.c:158
+#, fuzzy, c-format
+msgid "error: cannot open %s"
+msgstr "%s: %s を開けません\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "%s の読み取りエラー\n"
+msgid "failed to read: %s"
+msgstr "stat が失敗しました: %s"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "解析エラー\n"
+
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "標準出力への書き込みが失敗しました"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "出力バッファの確保に失敗しました"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: open に失敗: %s\n"
+
+#: sys-utils/lscpu.c:318
 msgid "error: uname failed"
 msgstr "エラー: uname が失敗"
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+#, fuzzy
+msgid "error: calloc failed"
 msgstr "エラー: malloc に失敗"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr "エラー: /sys ファイルシステムはアクセス不可能です。"
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10920,70 +11344,84 @@ msgstr ""
 "# starting from zero.\n"
 "# CPU,Core,Socket,Node"
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 #, fuzzy
 msgid "CPU op-mode(s):"
 msgstr "CPUソケット数:"
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+#, fuzzy
+msgid "CPU(s):"
+msgstr "CPUソケット数:"
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr "コアあたりのスレッド数:"
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr "ソケットあたりのコア数:"
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr "CPUソケット数:"
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr "NUMAノード:"
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr "ベンダーID:"
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr "CPUファミリー:"
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr "モデル:"
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr "ステッピング:"
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr "仮想化:"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr "ハイパーバイザーベンダー:"
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr "仮想化タイプ:"
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr "%s キャッシュ:"
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, fuzzy, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "NUMAノード:"
+
+#: sys-utils/lscpu.c:816
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "使い方: %s [オプション]\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10998,68 +11436,6 @@ msgstr ""
 "る。\n"
 "  -s, --sysroot  新しいシステムルートとしてこのディレクトリを使う。\n"
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr "エラー: %sへ作業ディレクトリを変更する。 "
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"使い方: rdev [ -rv ] [ -o オフセット ] [ イメージ [ 値 [ オフセット ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (or rdev /linux, etc.) 現在のルートデバイスを表示"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         ルートを /dev/hda2 に設定"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr "  rdev -R /dev/fd0 1              ルートフラグを設定 (読込専用状態)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            RAM ディスクサイズを設定"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              ブート時のビデオモードを設定"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   バイトオフセット N を利用"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   rdev -R と同じ"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     rdev -r と同じ"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     rdev -v と同じ"
-
-#: sys-utils/rdev.c:87
-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:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      ルートを読込専用マウントするには -R 1 を、-R 0 で読み書きマウント。"
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "カンマを欠いています"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11179,11 +11555,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: 古い優先度は %d、新たな優先度は %d です\n"
 
-#: sys-utils/rtcwake.c:83
-#, c-format
+#: sys-utils/rtcwake.c:85
+#, fuzzy, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11202,104 +11579,129 @@ msgstr ""
 "    -v | --verbose            メッセージを表示する\n"
 "    -V | --version            バージョンを表示する\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "rtc時間を変換する"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr "rtcアラームを有効にする"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr "%s: 認識できないサスペンド状態 '%s'\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "不正なキー"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: 不正な time_t 値 %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: バージョン %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "UTC 時間を使います。\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "ローカル時間を使います。\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "malloc() に失敗"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s は lp デバイスではありません。\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: %s の名前を %s に変更できません: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr ""
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr "rtcアラームの割り込みを無効にする"
 
@@ -11358,9 +11760,9 @@ msgstr ""
 "詳細情報を得るには、`%s --help' を実行して下さい。\n"
 
 #: sys-utils/setarch.c:215 sys-utils/setarch.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Unrecognized architecture"
-msgstr " %s: 認識できないパーティション\n"
+msgstr " %s: 認識できないアーキテクチャ"
 
 #: sys-utils/setarch.c:249 sys-utils/setarch.c:256
 msgid "Not enough arguments"
@@ -11401,6 +11803,11 @@ msgstr "%s: 不正な値です\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s は lp デバイスではありません。\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "LPGETIRQ エラー"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11431,6 +11838,11 @@ msgstr ", つながっています"
 msgid ", error"
 msgstr ", エラー"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: マウントに失敗しました"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ エラー"
@@ -11446,9 +11858,9 @@ msgid "%s using polling\n"
 msgstr "%s はポーリングを行います\n"
 
 #: sys-utils/unshare.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [options] <program> [args...]\n"
-msgstr "使い方: %s プログラム [引数 ...]\n"
+msgstr "使い方: %s [オプション] <プログラム> [引数 ...]\n"
 
 #: sys-utils/unshare.c:60
 msgid ""
@@ -11462,23 +11874,32 @@ msgid ""
 msgstr ""
 
 #: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
 "\n"
-"詳細情報は、namei(1) を確認してください。\n"
+"詳細情報は、unshare(1) を確認してください。\n"
 
 #: sys-utils/unshare.c:114
-#, fuzzy
 msgid "unshare failed"
-msgstr "シークに失敗"
+msgstr "unshareに失敗"
 
 #: sys-utils/unshare.c:118
-#, fuzzy, c-format
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: グループid を設定できません: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: ユーザーid を設定できません: %s"
+
+#: sys-utils/unshare.c:125
+#, c-format
 msgid "exec %s failed"
-msgstr "実行に失敗\n"
+msgstr "exec %s に失敗"
 
 #: text-utils/col.c:154
 #, c-format
@@ -11914,10 +12335,10 @@ msgid "cannot stat \"%s\""
 msgstr "\"%s\"をstatできません"
 
 #: text-utils/tailf.c:109
-#, fuzzy, c-format
+#, c-format
 msgid "incomplete write to \"%s\" (written %zd, expected %zd)\n"
 msgstr ""
-"\"%s\" への書き込みが完了しません (%ld 書き込み完了、%ld 書き込み予定)\n"
+"\"%s\" への書き込みが完了しません (%zd 書き込み完了、%zd 書き込み予定)\n"
 
 #: text-utils/tailf.c:147
 #, c-format
@@ -11972,9 +12393,221 @@ msgstr "入力行が長すぎます。\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "バッファを拡大するときにメモリが足りなくなりました。\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: 不正なオプション -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "確保されたセグメント %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "確保されたページ     %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "固定されたページ     %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "スワップされたページ %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "スワップの動作: %ld 回試み %ld 回成功\n"
+
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "programme実行時にエラーが発生しました: \"%s\"\n"
+
 #, fuzzy
-#~ msgid "out if memory"
-#~ msgstr "メモリが足りません"
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "不正な設定値: %s\n"
+
+#~ msgid "current"
+#~ msgstr "現在"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "新たに"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: %s が見つかりません -- 作成します..\n"
+
+#~ msgid "execvp failed"
+#~ msgstr "execvpに失敗"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "使い方 : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h でヘルプを表示。\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "リソース指定:\n"
+#~ "\t-m : 共有メモリ\n"
+#~ "\t-q : メッセージ\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : セマフォ\n"
+#~ "\t-a : 全て (初期値)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "出力書式:\n"
+#~ "\t-t : 時間\n"
+#~ "\t-p : プロセスID\n"
+#~ "\t-c : 作成者\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : 制限\n"
+#~ "\t-u : 要約\n"
+
+#~ msgid "error: %s"
+#~ msgstr "エラー: %s"
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "%s の読み取りエラー\n"
+
+#~ msgid "error: /sys filesystem is not accessable."
+#~ msgstr "エラー: /sys ファイルシステムはアクセス不可能です。"
+
+#~ msgid "error: change working directory to %s."
+#~ msgstr "エラー: %sへ作業ディレクトリを変更する。 "
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "使い方: rdev [ -rv ] [ -o オフセット ] [ イメージ [ 値 [ オフセット ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr "  rdev /dev/fd0  (or rdev /linux, etc.) 現在のルートデバイスを表示"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         ルートを /dev/hda2 に設定"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr "  rdev -R /dev/fd0 1              ルートフラグを設定 (読込専用状態)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            RAM ディスクサイズを設定"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              ブート時のビデオモードを設定"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   バイトオフセット N を利用"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   rdev -R と同じ"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     rdev -r と同じ"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     rdev -v と同じ"
+
+#~ 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 "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      ルートを読込専用マウントするには -R 1 を、-R 0 で読み書きマウント。"
+
+#~ msgid "missing comma"
+#~ msgstr "カンマを欠いています"
+
+#~ 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 ""
+#~ "使い方: fdisk [-b SSZ] [-u] ディスク     領域テーブルの変更\n"
+#~ "        fdisk -l [-b SSZ] [-u] ディスク  領域テーブルリストの表示\n"
+#~ "        fdisk -s パーティション          ブロックの領域サイズ表示\n"
+#~ "        fdisk -v                         fdisk のバージョン表示\n"
+#~ "ここで `ディスク' とは /dev/hdb や /dev/sda の様な何かの事です\n"
+#~ "そして `領域' とは /dev/hda7 の様な何かの事です\n"
+#~ "-u: (シリンダの代わりに)セクタユニットの開始、終点を与えます\n"
+#~ "-b 2048: (ある種の MO ドライブ用に) 2048 バイトのセクタサイズを使います\n"
+
+#~ 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 ""
+#~ "使い方: fdisk [-l] [-b SSZ] [-u] デバイス\n"
+#~ "   例: fdisk /dev/hda  (一番目の IDE ディスク)\n"
+#~ " 又は: fdisk /dev/sdc  (三番目の SCSI ディスク)\n"
+#~ " 又は: fdisk /dev/eda  (一番目の PS/2 ESDI ドライブ)\n"
+#~ " 又は: fdisk /dev/rd/c0d0  又は: fdisk /dev/ida/c0d0  (RAID デバイス)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "このディスクのシリンダ数は %d に設定されています。\n"
+#~ "間違いではないのですが、1024 を超えているため、以下の場合\n"
+#~ "に問題を生じうる事を確認しましょう:\n"
+#~ "1) ブート時に実行するソフトウェア (例. バージョンが古い LILO)\n"
+#~ "2) 別の OS のブートやパーティション作成ソフト\n"
+#~ "   (例. DOS FDISK, OS/2 FDISK)\n"
 
 #~ msgid "# partition table of %s\n"
 #~ msgstr "# %s のパーティションテーブル\n"
diff --git a/po/nl.po b/po/nl.po
index e5514123..6f76a416 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,4 +1,4 @@
-# Dutch translations for util-linux-ng-2.14.2-rc2.
+# Dutch translations for util-linux-ng.
 # This file is distributed under the same license as the util-linux-ng package.
 #
 # block    -> blok
@@ -9,22 +9,20 @@
 #
 # Taco Witte <tcwitte@cs.uu.nl>, 2002, 2003.
 # Luk Claes <luk.claes@ugent.be>, 2005.
-# Benno Schulenberg <benno@vertaalt.nl>, 2006, 2007, 2008, 2009.
+# Benno Schulenberg <benno@vertaalt.nl>, 2006, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng-2.14.2-rc2\n"
+"Project-Id-Version: util-linux-ng-2.18-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
-"PO-Revision-Date: 2009-01-31 20:52+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
+"PO-Revision-Date: 2010-06-21 21:08+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Dutch\n"
-"X-Poedit-Country: NETHERLANDS\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
 #: disk-utils/blockdev.c:63
 msgid "set read-only"
@@ -36,39 +34,35 @@ msgstr "lezen-en-schrijven instellen"
 
 #: disk-utils/blockdev.c:76
 msgid "get read-only"
-msgstr "schrijfstatus opvragen"
+msgstr "schrijfstatus tonen"
 
 #: disk-utils/blockdev.c:82
-#, fuzzy
 msgid "get logical block (sector) size"
-msgstr "sectorgrootte opvragen"
+msgstr "logische sectorgrootte tonen"
 
 #: disk-utils/blockdev.c:88
-#, fuzzy
 msgid "get physical block (sector) size"
-msgstr "sectorgrootte opvragen"
+msgstr "fysieke sectorgrootte tonen"
 
 #: disk-utils/blockdev.c:94
 msgid "get minimum I/O size"
-msgstr ""
+msgstr "minimale in-/uitvoergrootte tonen"
 
 #: disk-utils/blockdev.c:100
 msgid "get optimal I/O size"
-msgstr ""
+msgstr "optimale in-/uitvoergrootte tonen"
 
 #: disk-utils/blockdev.c:106
-#, fuzzy
 msgid "get alignment offset"
-msgstr "ongeldige inode-grootte"
+msgstr "uitlijningspositie tonen"
 
 #: disk-utils/blockdev.c:112
-#, fuzzy
 msgid "get max sectors per request"
-msgstr "Extra sectoren per cilinder"
+msgstr "maximum aantal sectoren per verzoek tonen"
 
 #: disk-utils/blockdev.c:118
 msgid "get blocksize"
-msgstr "blokgrootte opvragen"
+msgstr "blokgrootte tonen"
 
 #: disk-utils/blockdev.c:125
 msgid "set blocksize"
@@ -76,11 +70,11 @@ msgstr "blokgrootte instellen"
 
 #: disk-utils/blockdev.c:131
 msgid "get 32-bit sector count"
-msgstr "sectoraantal opvragen (32-bits)"
+msgstr "sectoraantal tonen (32-bits)"
 
 #: disk-utils/blockdev.c:137
 msgid "get size in bytes"
-msgstr "grootte in bytes opvragen"
+msgstr "grootte in bytes tonen"
 
 #: disk-utils/blockdev.c:144
 msgid "set readahead"
@@ -88,7 +82,7 @@ msgstr "vooruitlezing instellen"
 
 #: disk-utils/blockdev.c:150
 msgid "get readahead"
-msgstr "vooruitlezing opvragen"
+msgstr "vooruitlezing tonen"
 
 #: disk-utils/blockdev.c:157
 msgid "set filesystem readahead"
@@ -96,7 +90,7 @@ msgstr "vooruitlezing van bestandssysteem instellen"
 
 #: disk-utils/blockdev.c:163
 msgid "get filesystem readahead"
-msgstr "vooruitlezing van bestandssysteem opvragen"
+msgstr "vooruitlezing van bestandssysteem tonen"
 
 #: disk-utils/blockdev.c:167
 msgid "flush buffers"
@@ -111,6 +105,11 @@ msgstr "partitietabel opnieuw inlezen"
 msgid "Usage:\n"
 msgstr "Gebruik:\n"
 
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid "  %s -V\n"
+msgstr "  %s -V\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -128,7 +127,18 @@ msgstr "Beschikbare opdrachten:\n"
 
 #: disk-utils/blockdev.c:187
 msgid "get size in 512-byte sectors"
-msgstr "grootte in 512-byte sectoren opvragen"
+msgstr "grootte in 512-byte sectoren tonen"
+
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:321
 #, c-format
@@ -143,7 +153,7 @@ msgstr "%s vereist een argument\n"
 #: disk-utils/blockdev.c:375
 #, c-format
 msgid "%s failed.\n"
-msgstr "%s is mislukt.\n"
+msgstr "'%s' is mislukt.\n"
 
 #: disk-utils/blockdev.c:382
 #, c-format
@@ -163,7 +173,7 @@ msgstr "%s: ioctl()-fout voor %s\n"
 #: disk-utils/blockdev.c:481
 #, c-format
 msgid "RO    RA   SSZ   BSZ   StartSec            Size   Device\n"
-msgstr "Stat. RA SecGt BloGt   StartSec         Grootte  Apparaat\n"
+msgstr "Stat. RA SecGt BlkGt StartSector        Grootte   Apparaat\n"
 
 #: disk-utils/elvtune.c:48
 #, c-format
@@ -173,17 +183,17 @@ msgstr "Gebruik:\n"
 #: disk-utils/elvtune.c:53
 #, c-format
 msgid "\tNOTE: elvtune only works with 2.4 kernels\n"
-msgstr ""
+msgstr "    Opmerking: 'elvtune' werkt alleen met 2.4 kernels\n"
 
 #: disk-utils/elvtune.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "parse error\n"
-msgstr "'seek'-fout"
+msgstr "ontledingsfout\n"
 
 #: disk-utils/elvtune.c:110
 #, c-format
 msgid "missing blockdevice, use -h for help\n"
-msgstr ""
+msgstr "ontbrekend blok-apparaat; gebruik '-h' voor hulp\n"
 
 #: disk-utils/elvtune.c:131
 #, c-format
@@ -192,6 +202,9 @@ msgid ""
 "elvtune is only useful on older kernels;\n"
 "for 2.6 use IO scheduler sysfs tunables instead..\n"
 msgstr ""
+"\n"
+"'elvtune' is enkel nuttig op oudere kernels;\n"
+"gebruik voor versie 2.6 de IO-scheduler 'sysfs tunables'\n"
 
 #: disk-utils/fdformat.c:31
 #, c-format
@@ -231,15 +244,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Gebruik:  %s [ -n ] apparaat\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -272,241 +276,239 @@ msgid ""
 " file       file to test\n"
 msgstr ""
 "Gebruik:  %s [-hv] [-x map] bestand\n"
+"\n"
 "  -h        deze hulptekst tonen\n"
 "  -v        meer informatie weergeven\n"
 "  -x map    uitpakken in deze map\n"
 "  bestand   te testen bestand\n"
 
 #: disk-utils/fsck.cramfs.c:163
-#, fuzzy, c-format
+#, c-format
 msgid "stat failed: %s"
-msgstr "(Volgend bestand: %s)"
+msgstr "status opvragen is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:167 disk-utils/fsck.cramfs.c:551
-#, fuzzy, c-format
+#, c-format
 msgid "open failed: %s"
-msgstr "openpty() is mislukt\n"
+msgstr "openen is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:172
 #, c-format
 msgid "ioctl failed: unable to determine device size: %s"
-msgstr ""
+msgstr "ioctl() is mislukt: kan grootte van apparaat niet bepalen: %s"
 
 #: disk-utils/fsck.cramfs.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "not a block device or file: %s"
-msgstr "%s: is geen blok-apparaat\n"
+msgstr "is geen blok-apparaat noch bestand: %s"
 
 #: disk-utils/fsck.cramfs.c:184 disk-utils/fsck.cramfs.c:226
 msgid "file length too short"
-msgstr ""
+msgstr "bestandslengte is te klein"
 
 #: disk-utils/fsck.cramfs.c:189 disk-utils/fsck.cramfs.c:197
 #: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "read failed: %s"
-msgstr "(Volgend bestand: %s)"
+msgstr "lezen is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:207
 msgid "superblock magic not found"
-msgstr ""
+msgstr "geen magisch getal van superblok gevonden"
 
 #: disk-utils/fsck.cramfs.c:216
-#, fuzzy
 msgid "unsupported filesystem features"
-msgstr "Geef het soort bestandssysteem: "
+msgstr "niet-ondersteunde bestandssysteemfuncties"
 
 #: disk-utils/fsck.cramfs.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "superblock size (%d) too small"
-msgstr "aantal blokken is te klein"
+msgstr "grootte (%d) van superblok is te klein"
 
 #: disk-utils/fsck.cramfs.c:223
 msgid "zero file count"
-msgstr ""
+msgstr "nul bestanden geteld"
 
 #: disk-utils/fsck.cramfs.c:229
-#, fuzzy, c-format
+#, c-format
 msgid "warning: file extends past end of filesystem\n"
-msgstr "Waarschuwing: partitie %s loopt tot na het einde van de schijf\n"
+msgstr ""
+"Waarschuwing: bestand loopt door tot voorbij het einde van het "
+"bestandssysteem\n"
 
 #: disk-utils/fsck.cramfs.c:233
 #, c-format
 msgid "warning: old cramfs format\n"
-msgstr ""
+msgstr "Waarschuwing: oude cramfs-indeling\n"
 
 #: disk-utils/fsck.cramfs.c:246
 msgid "unable to test CRC: old cramfs format"
-msgstr ""
+msgstr "kan controlesom niet testen: oude cramfs-indeling"
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc() is mislukt"
 
 #: disk-utils/fsck.cramfs.c:297
-#, fuzzy
 msgid "crc error"
-msgstr ", fout"
+msgstr "foutieve controlesom"
 
 #: disk-utils/fsck.cramfs.c:364
-#, fuzzy
 msgid "root inode is not directory"
 msgstr "hoofd-inode is geen map"
 
 #: disk-utils/fsck.cramfs.c:369
 #, c-format
 msgid "bad root offset (%lu)"
-msgstr ""
+msgstr "foutieve positie (%lu) van hoofdmap"
 
 #: disk-utils/fsck.cramfs.c:387
 msgid "data block too large"
-msgstr ""
+msgstr "datablok is te groot"
 
 #: disk-utils/fsck.cramfs.c:391
 #, c-format
 msgid "decompression error %p(%d): %s"
-msgstr ""
+msgstr "decompressiefout %p(%d): %s"
 
 #: disk-utils/fsck.cramfs.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "  hole at %ld (%zd)\n"
-msgstr "moet zijn (%d, %d, %d)\n"
+msgstr "  gat op %ld (%zd)\n"
 
 #: disk-utils/fsck.cramfs.c:423 disk-utils/fsck.cramfs.c:595
 #, c-format
 msgid "  uncompressing block at %ld to %ld (%ld)\n"
-msgstr ""
+msgstr "  decromprimeren van blok op %ld naar %ld (%ld)\n"
 
 #: disk-utils/fsck.cramfs.c:429
-#, fuzzy, c-format
+#, c-format
 msgid "non-block (%ld) bytes"
-msgstr "Superblok: %zd bytes\n"
+msgstr "geen blok (%ld bytes)"
 
 #: disk-utils/fsck.cramfs.c:433
 #, c-format
 msgid "non-size (%ld vs %ld) bytes"
-msgstr ""
+msgstr "onjuiste grootte (%ld ipv %ld bytes)"
 
 #: disk-utils/fsck.cramfs.c:439
-#, fuzzy, c-format
+#, c-format
 msgid "write failed: %s"
-msgstr "(Volgend bestand: %s)"
+msgstr "schrijven is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:452
-#, fuzzy, c-format
+#, c-format
 msgid "lchown failed: %s"
-msgstr "aankoppelen is mislukt"
+msgstr "'lchown' is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:458
-#, fuzzy, c-format
+#, c-format
 msgid "chown failed: %s"
-msgstr "aankoppelen is mislukt"
+msgstr "'chown' is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:465
-#, fuzzy, c-format
+#, c-format
 msgid "utime failed: %s"
-msgstr "ongeldige tijdslimiet: %s"
+msgstr "'utime' is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:480
 #, c-format
 msgid "directory inode has zero offset and non-zero size: %s"
-msgstr ""
+msgstr "positie nul en niet-nul grootte van inode van map: %s"
 
 #: disk-utils/fsck.cramfs.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "mkdir failed: %s"
-msgstr "/dev: chdir() is mislukt: %m"
+msgstr "'mkdir' is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:511
 msgid "filename length is zero"
-msgstr ""
+msgstr "lengte van bestandsnaam is nul"
 
 #: disk-utils/fsck.cramfs.c:514
 msgid "bad filename length"
-msgstr ""
+msgstr "ongeldige lengte van bestandsnaam "
 
 #: disk-utils/fsck.cramfs.c:521
-#, fuzzy
 msgid "bad inode offset"
-msgstr "ongeldige inode-grootte"
+msgstr "ongeldige inode-positie"
 
 #: disk-utils/fsck.cramfs.c:537
 msgid "file inode has zero offset and non-zero size"
-msgstr ""
+msgstr "bestands-inode heeft positie nul en niet-nul grootte"
 
 #: disk-utils/fsck.cramfs.c:540
 msgid "file inode has zero size and non-zero offset"
-msgstr ""
+msgstr "bestands-inode heeft grootte nul en niet-nul positie"
 
 #: disk-utils/fsck.cramfs.c:571
 msgid "symbolic link has zero offset"
-msgstr ""
+msgstr "symbolische koppeling heeft positie nul"
 
 #: disk-utils/fsck.cramfs.c:574
 msgid "symbolic link has zero size"
-msgstr ""
+msgstr "symbolische koppeling heeft grootte nul"
 
 #: disk-utils/fsck.cramfs.c:586
-#, fuzzy, c-format
+#, c-format
 msgid "size error in symlink: %s"
-msgstr "fout bij schrijven van %s: %s"
+msgstr "foutieve grootte in symbolische koppeling: %s"
 
 #: disk-utils/fsck.cramfs.c:601
-#, fuzzy, c-format
+#, c-format
 msgid "symlink failed: %s"
-msgstr "fsync() is mislukt"
+msgstr "symbolische koppeling is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:613
 #, c-format
 msgid "special file has non-zero offset: %s"
-msgstr ""
+msgstr "speciaal bestand heeft niet-nul positie: %s"
 
 #: disk-utils/fsck.cramfs.c:625
 #, c-format
 msgid "fifo has non-zero size: %s"
-msgstr ""
+msgstr "fifo heeft niet lengte nul: %s"
 
 #: disk-utils/fsck.cramfs.c:631
 #, c-format
 msgid "socket has non-zero size: %s"
-msgstr ""
+msgstr "socket heeft niet lengte nul: %s"
 
 #: disk-utils/fsck.cramfs.c:636
 #, c-format
 msgid "bogus mode: %s (%o)"
-msgstr ""
+msgstr "ongeldige modus: %s (%o)"
 
 #: disk-utils/fsck.cramfs.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "mknod failed: %s"
-msgstr "aankoppelen is mislukt"
+msgstr "'mknod' is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:682
 #, c-format
 msgid "directory data start (%ld) < sizeof(struct cramfs_super) + start (%ld)"
 msgstr ""
+"begin van mapdata (%ld) is kleiner dan sizeof(struct cramfs_super) plus "
+"start (%ld)"
 
 #: disk-utils/fsck.cramfs.c:685
 #, c-format
 msgid "directory data end (%ld) != file data start (%ld)"
-msgstr ""
+msgstr "einde van mapdata (%ld) is ongelijk aan begin van bestandsdata (%ld)"
 
 #: disk-utils/fsck.cramfs.c:690
-#, fuzzy
 msgid "invalid file data offset"
-msgstr "ongeldig ID: %s\n"
+msgstr "ongeldige positie van bestandsgegevens"
 
 #: disk-utils/fsck.cramfs.c:714
-#, fuzzy
 msgid "failed to allocate outbuffer"
-msgstr "Reserveren van buffer is mislukt\n"
+msgstr "reserveren van uitvoerbuffer is mislukt"
 
 #: disk-utils/fsck.cramfs.c:727
-#, fuzzy
 msgid "compiled without -x support"
-msgstr "umount: gecompileerd zonder ondersteuning voor '-f'\n"
+msgstr "gecompileerd zonder ondersteuning voor '-x'"
 
 #: disk-utils/fsck.minix.c:207
 #, c-format
@@ -525,7 +527,7 @@ msgstr "Wilt u echt doorgaan"
 #: disk-utils/fsck.minix.c:329
 #, c-format
 msgid "check aborted.\n"
-msgstr "controle is afgebroken.\n"
+msgstr "De controle is afgebroken.\n"
 
 #: disk-utils/fsck.minix.c:348 disk-utils/fsck.minix.c:371
 #, c-format
@@ -594,9 +596,8 @@ msgid "seek failed"
 msgstr "'seek' is mislukt"
 
 #: disk-utils/fsck.minix.c:591 disk-utils/mkfs.minix.c:399
-#, fuzzy
 msgid "unable to alloc buffer for superblock"
-msgstr "reserveren van buffers voor bitkaarten is mislukt"
+msgstr "reserveren van buffer voor superblok is mislukt"
 
 #: disk-utils/fsck.minix.c:594
 msgid "unable to read super block"
@@ -604,7 +605,7 @@ msgstr "kan superblok niet lezen"
 
 #: disk-utils/fsck.minix.c:612
 msgid "bad magic number in super-block"
-msgstr "ongeldig magisch nummer in superblok"
+msgstr "ongeldig magisch getal in superblok"
 
 #: disk-utils/fsck.minix.c:614
 msgid "Only 1k blocks/zones supported"
@@ -956,7 +957,7 @@ msgstr "kan apparaat %s niet vinden"
 msgid "%s is not a block special device"
 msgstr "%s is geen blok-apparaat"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "kan %s niet openen"
@@ -967,20 +968,20 @@ msgid "cannot get size of %s"
 msgstr "kan grootte van %s niet bepalen"
 
 #: disk-utils/mkfs.bfs.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "blocks argument too large, max is %llu"
-msgstr "argument voor blokken is te groot -- maximum is %lu"
+msgstr "argument voor blokken is te groot -- maximum is %llu"
 
 #: disk-utils/mkfs.bfs.c:202
 msgid "too many inodes - max is 512"
 msgstr "te veel inodes -- maximum is 512"
 
 #: disk-utils/mkfs.bfs.c:211
-#, fuzzy, c-format
+#, c-format
 msgid "not enough space, need at least %llu blocks"
-msgstr "niet genoeg ruimte: minstens %lu blokken nodig"
+msgstr "niet genoeg ruimte: minstens %llu blokken nodig"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Apparaat: %s\n"
@@ -1006,14 +1007,14 @@ msgid "Inodes: %d (in 1 block)\n"
 msgstr "Inodes: %d (in 1 blok)\n"
 
 #: disk-utils/mkfs.bfs.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "Inodes: %d (in %lld blocks)\n"
-msgstr "Inodes: %d (in %ld blokken)\n"
+msgstr "Inodes: %d (in %lld blokken)\n"
 
 #: disk-utils/mkfs.bfs.c:233
-#, fuzzy, c-format
+#, c-format
 msgid "Blocks: %lld\n"
-msgstr "Blokken: %ld\n"
+msgstr "Blokken: %lld\n"
 
 #: disk-utils/mkfs.bfs.c:234
 #, c-format
@@ -1056,7 +1057,7 @@ msgstr ""
 "Gebruik:  mkfs [-V] [-t bestandssysteemsoort] [bestandssysteemopties] "
 "apparaat [grootte]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1068,7 +1069,7 @@ msgid "mkfs (%s)\n"
 msgstr "mkfs (%s)\n"
 
 #: disk-utils/mkfs.cramfs.c:126
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n "
 "name] dirname outfile\n"
@@ -1087,7 +1088,7 @@ msgid ""
 " outfile    output file\n"
 msgstr ""
 "Gebruik:  %s [-h] [-v] [-b blokgrootte] [-e editie] [-i bestand]\n"
-"          [-n naam] mapnaam uitvoerbestand\n"
+"                 [-N endian] [-n naam] mapnaam uitvoerbestand\n"
 "\n"
 " -h          deze hulptekst tonen\n"
 " -v          gedetailleerde uitvoer produceren\n"
@@ -1301,7 +1302,7 @@ msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 "Vreemde waarden in do_check(): waarschijnlijk een interne programmafout\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "'seek' is mislukt in check_blocks()"
 
@@ -1383,292 +1384,353 @@ msgstr ""
 "De opgegeven paginagrootte %d wordt gebruikt, in plaats van systeemwaarde %"
 "d.\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s: calloc() is mislukt: %s\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 "Onjuiste grootte van kop van wisselgeheugen; er is geen label geschreven.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Label is afgekapt.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "geen label, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "geen UUID\n"
 
-#: disk-utils/mkswap.c:283
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:286
+#, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
-"Gebruik:  %s [-c] [-v0|-v1] [-ppaginagrootte]           [-L label] [-U "
-"UUID]  /dev/naam  [blokken]\n"
+"Gebruik:  %s [-c] [-ppaginagrootte] [-L label] [-U UUID]  /dev/naam  "
+"[blokken]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "te veel slechte pagina's"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Onvoldoende geheugen beschikbaar"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "één slechte pagina\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu slechte pagina's\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "terugspoelen van wisselgeheugenapparaat is mislukt"
 
-#: disk-utils/mkswap.c:413
-#, fuzzy
+#: disk-utils/mkswap.c:398
 msgid "unable to alloc new libblkid probe"
-msgstr "reserveren van buffer voor inodes is mislukt"
+msgstr "onvoldoende geheugen beschikbaar voor nieuwe libblkid-sonde"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+msgid "unable to assign device to libblkid probe"
+msgstr "kan apparaat niet aan libblkid-sonde toewijzen"
 
-#: disk-utils/mkswap.c:443
-#, fuzzy
+#: disk-utils/mkswap.c:428
 msgid "unable to erase bootbits sectors"
-msgstr "wissen van opstartsector is mislukt"
+msgstr "wissen van bootbits-sectoren is mislukt"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
-msgstr ""
+msgstr "%s: %s: waarschuwing: bootbits-sectoren niet wissen\n"
 
-#: disk-utils/mkswap.c:450
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:435
+#, c-format
 msgid "        (%s partition table detected). "
-msgstr "   p      BSD-partitietabel weergeven"
+msgstr "        (%s-partitietabel gedetecteerd). "
 
-#: disk-utils/mkswap.c:452
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:437
+#, c-format
 msgid "        on whole disk. "
-msgstr "   s      complete schijflabel weergeven"
+msgstr "        op de gehele schijf. "
 
-#: disk-utils/mkswap.c:454
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:439
+#, c-format
 msgid "        (compiled without libblkid). "
-msgstr "   s      complete schijflabel weergeven"
+msgstr "        (gecompileerd zonder 'libblkid'). "
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 "%1$s: waarschuwing: optie '-U' wordt genegeerd\n"
 "(UUID's worden door %1$s niet ondersteund)\n"
 
-#: disk-utils/mkswap.c:540
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:526
+#, c-format
 msgid "%s: does not support swapspace version %d.\n"
-msgstr "%s: fout: onbekende versie %d\n"
+msgstr "%s: Ondersteunt wisselgeheugenversie %d niet.\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "fout: kan UUID niet ontleden"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:569
+#, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
-msgstr "%s: fout: grootte %lu KiB is groter dan apparaatgrootte van %lu KiB\n"
+msgstr "%s: fout: grootte %llu KiB is groter dan apparaatgrootte (%llu KiB)\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: fout: wisselgeheugen moet minstens %ld KiB zijn\n"
 
-#: disk-utils/mkswap.c:603
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:595
+#, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
-msgstr "%s: waarschuwing: wisselgeheugen is afgekapt tot %ld KiB\n"
+msgstr "%s: waarschuwing: wisselgeheugen is afgekapt tot %llu KiB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: fout: zal niet proberen wisselgeheugen te maken op '%s'\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: fout: %s is aangekoppeld; zal hier geen wisselgeheugen maken\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Instellen van wisselgeheugen is mislukt: onleesbaar"
 
-#: disk-utils/mkswap.c:651
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:644
+#, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
-msgstr "Instellen van wisselgeheugen, versie %d, grootte = %llu KiB\n"
+msgstr "Instellen van wisselgeheugen, versie 1, grootte = %llu KiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: schrijven van vingerafdrukpagina is mislukt: %s"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync() is mislukt"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: kan geen SELinux-bestandslabel verkrijgen: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "kan uit het pad geen context bepalen"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "kan geen nieuwe SELinux-context aanmaken"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "kan geen nieuwe SELinux-context berekenen"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: kan %s niet herlabelen naar %s: %s\n"
 
 #: disk-utils/raw.c:50
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usage:\n"
 "  %s "
-msgstr "Gebruik:\n"
+msgstr ""
+"Gebruik:\n"
+"  %s "
 
 #: disk-utils/raw.c:125
 #, c-format
 msgid ""
 "Device '%s' is control raw dev (use raw<N> where <N> is greater than zero)\n"
 msgstr ""
+"Apparaat '%s' is de 'raw'-besturing;\n"
+"(gebruik rawN, waar N groter is dan nul)\n"
 
 #: disk-utils/raw.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot locate block device '%s' (%s)\n"
-msgstr "kan vergrendelingsbestand %s niet vergrendelen: %s\n"
+msgstr "Kan blok-apparaat '%s' niet lokaliseren (%s)\n"
 
 #: disk-utils/raw.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "Device '%s' is not a block dev\n"
-msgstr "Waarschuwing: %s is geen blok-apparaat\n"
+msgstr "Apparaat '%s' is geen blok-apparaat\n"
 
 #: disk-utils/raw.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open master raw device '"
-msgstr "kan apparaat %s niet vinden"
+msgstr "Kan hoofd-'raw'-apparaat niet openen: '"
 
 #: disk-utils/raw.c:205
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot locate raw device '%s' (%s)\n"
-msgstr "kan apparaat %s niet vinden"
+msgstr "Kan 'raw'-apparaat '%s' niet lokaliseren (%s)\n"
 
 #: disk-utils/raw.c:211
-#, fuzzy, c-format
+#, c-format
 msgid "Raw device '%s' is not a character dev\n"
-msgstr "/dev/%s: is geen byte-apparaat"
+msgstr "'raw'-apparaat '%s' is geen byte-apparaat\n"
 
 #: disk-utils/raw.c:216
-#, fuzzy, c-format
+#, c-format
 msgid "Device '%s' is not a raw dev\n"
-msgstr "%s is geen seriële lijn"
+msgstr "Apparaat '%s' is geen 'raw'-apparaat\n"
 
 #: disk-utils/raw.c:231
 #, c-format
 msgid "Error querying raw device (%s)\n"
-msgstr ""
+msgstr "Fout tijdens polsen van 'raw'-apparaat (%s)\n"
 
 #: disk-utils/raw.c:241 disk-utils/raw.c:261
 #, c-format
 msgid "raw%d:\tbound to major %d, minor %d\n"
-msgstr ""
+msgstr "raw%d:\tgebonden aan hoofdnummer %d, subnummer %d\n"
 
 #: disk-utils/raw.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "Error setting raw device (%s)\n"
-msgstr "fout bij stoppen van service: \"%s\""
+msgstr "Fout bij instellen van 'raw'-apparaat (%s)\n"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "[onbruikbaar]"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, c-format
+msgid "%s: unable to probe device"
+msgstr "%s: kan apparaat niet sonderen"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Vrije ruimte"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr "%s: onduidelijk sonderingsresultaat; gebruik wipefs(8)"
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: geen geldige wisselgeheugenpartitie"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: niet-ondersteunde wisselgeheugenversie '%s'"
+
+#: disk-utils/swaplabel.c:108
+#, c-format
+msgid "%s: failed to open"
+msgstr "%s: openen is mislukt"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:117
+#, c-format
+msgid "failed to parse UUID: %s"
+msgstr "ontleden van UUID '%s' is mislukt"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:121
+#, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: 'seek' naar wisselgeheugen-UUID is mislukt"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:125
+#, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: schrijven van wisselgeheugen-UUID is mislukt"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:136
+#, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: 'seek' naar wisselgeheugenlabel is mislukt"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr "label is te lang; wordt afgekapt tot '%s'"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:146
+#, c-format
+msgid "%s: failed to write label"
+msgstr "%s: schrijven van label is mislukt"
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Gebruik:  %s [opties] <apparaat>\n"
+"\n"
+"Opties:\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+"  -h, --help            deze hulptekst tonen\n"
+"  -L, --label <label>   te gebruiken nieuw label\n"
+"  -U, --uuid <UUID>     te gebruiken nieuwe UUID\n"
+
+#: disk-utils/swaplabel.c:169
+#, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Voor meer informatie zie swaplabel(8).\n"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr "optie '-U' wordt genegeerd (UUID's worden niet ondersteund)"
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "[onbruikbaar]"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Vrije ruimte"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "De schijf is veranderd.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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"
+"Herstart het systeem om er zeker van te zijn dat de juiste partitietabel "
+"wordt gezien.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1680,322 +1742,322 @@ msgstr ""
 "WAARSCHUWING: Als u DOS-6.x-partities gemaakt of gewijzigd hebt,\n"
 "raadpleeg dan het cfdisk-handboek voor meer informatie.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "FATALE FOUT"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Druk op een toets om cfdisk af te sluiten"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Kan geen 'seek' doen op schijf"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Kan schijf niet lezen"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Kan niet naar schijf schrijven"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Te veel partities"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Partitie begint vóór sector 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Partitie eindigt vóór sector 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Partitie begint na einde van schijf"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Partitie eindigt na einde van schijf"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitie eindigt in de laatste gedeeltelijke cilinder"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "logische partities liggen niet in schijfvolgorde"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "logische partities overlappen"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "vergrote logische partities overlappen"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!! Interne fout bij het maken van logische schijf zonder uitgebreide "
-"partitie !!!"
+"**Interne programmafout** bij het maken van logische schijf zonder "
+"uitgebreide partitie"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menu-item is te lang.  Menu ziet er misschien raar uit."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menu zonder richting.  Standaard wordt gebruikt: horizontaal."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Ongeldige toets"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Druk op een toets om verder te gaan"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primair"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "P = een nieuwe primaire partitie maken"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logisch"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "L = een nieuwe logische partitie maken"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "annuleren"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Esc,Esc = Geen partitie maken"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
-msgstr "!!! Interne fout !!!"
+msgstr "**Interne programmafout**"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Grootte (in MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Begin"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "B = partitie toevoegen aan begin van vrije ruimte"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Einde"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "E = Partitie toevoegen aan einde van vrije ruimte"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Er is geen ruimte om de uitgebreide partitie te maken"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Geen partitietabel aanwezig.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Geen partitietabel aanwezig.  Gestart met een lege tabel."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Onjuiste vingerafdruk in partitietabel"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Onbekend partitietabeltype"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
-msgstr "Wilt u met een lege tabel beginnen [j/N] ?"
+msgstr "Wilt u met een lege tabel beginnen? [j/N]"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "U hebt meer cilinders aangegeven dan er op de schijf passen"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Kan schijf niet openen"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 "Schijf is als alleen-lezen geopend -- u hebt geen toegangsrechten om te "
 "schrijven"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
-"Waarschuwing: niet-ondersteunde GPT (GUID-partitietabel) gevonden!\n"
+"Waarschuwing!!  Niet-ondersteunde GPT (GUID-partitietabel) gevonden!\n"
 "Gebruik GNU 'parted'."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Kan schijfgrootte niet bepalen"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Ongeldige primaire partitie"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Ongeldige logische partitie"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Waarschuwing!!  Dit kan gegevens op uw schijf wissen!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "Weet u zeker dat u de partitietabel naar schijf wilt schrijven? (ja of nee): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "nee"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Partitietabel is niet naar schijf geschreven."
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
-msgstr "Antwoord met 'ja' of 'nee'"
+msgstr "Antwoord met 'ja' of 'nee'."
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Schrijven van partitietabel naar schijf..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "De partitietabel is naar schijf geschreven."
 
-#: fdisk/cfdisk.c:1926
-#, fuzzy
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
 msgstr ""
-"Partitietabel is geschreven, maar opnieuw inlezen is mislukt.  Herstart uw "
-"systeem om de tabel bij te werken."
+"Partitietabel is geschreven, maar opnieuw inlezen is mislukt.\n"
+"Draai partprobe(8) of kpartx(8), of herstart uw systeem om de\n"
+"juiste tabel te gebruiken."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Er is geen primaire partitie als opstartbaar aangegeven.  DOS MBR kan dit "
 "niet opstarten."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Meer dan één primaire partitie is als opstartbaar aangegeven.  DOS MBR kan "
 "dit niet opstarten."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Geef een bestandsnaam op, of druk op Enter voor weergave op het scherm: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan bestand '%s' niet openen"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Schijf: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sector 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sector %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   [geen] "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primair"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logisch"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "[onbekend]"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Opst."
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "geen"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitietabel van %s:\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "                Eerste     Laatste\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -2003,7 +2065,7 @@ msgstr ""
 " # Type         sector      sector Plaats      Lengte Bestandssysteem (ID) "
 "Vlag\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2011,468 +2073,472 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
-msgstr "          ----Begin----        ----Einde----                  Aantal\n"
+msgstr ""
+"          ----Begin-----       ----Einde-----                  Aantal\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
-msgstr " #  Vlag  Kop  Sec  Cil   ID   Kop  Sec  Cil Startsector    sectoren\n"
+msgstr ""
+" #  Vlag  Kop  Sec  Cil   ID   Kop  Sec   Cil Startsector    sectoren\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
-msgstr "--  ----  ---  --- ---- ----   ---  --- ---- ----------- -----------\n"
+msgstr ""
+"--  ----  ---  --- ---- ----   ---  --- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Ruw"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "R = de tabel in ruwe-gegevensindeling weergeven"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sectoren"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "S = de tabel geordend op sectoren weergeven"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "T = gewoon de partitietabel weergeven"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Esc,Esc = tabel niet weergeven"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Hulpscherm voor cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dit is cfdisk, een schijfpartitioneringsprogramma waarmee u op"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "uw harde schijf partities kunt maken, wijzigen of verwijderen."
 
-#: fdisk/cfdisk.c:2291
+# Deze vertaling is met opzet leeg.
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "  "
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Opdracht   Betekenis"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "--------   ---------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "    b      'opstartbaar'-vlag voor huidige partitie aan/uitzetten"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "    d      huidige partitie verwijderen"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "    g      cilinders, koppen, sectoren-per-spoor wijzigen;"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 "             *waarschuwing*: deze optie dient alleen te worden gebruikt"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             door mensen die echt weten wat ze doen"
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "    h      dit hulpscherm tonen"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "    m      schijfgebruik van de huidige partitie maximaliseren;"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             dit kan een partitie incompatibel maken met DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "           "
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "    n      nieuwe partitie maken in de vrije ruimte"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "    p      partitietabel weergeven op scherm of naar bestand;"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             er zijn verschillende opmaken waaruit u kunt kiezen:"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "           "
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "             r - ruwe gegevens (exact wat naar schijf zou worden geschreven)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "             s - tabel geordend op sectoren"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "             t - tabel in ruwe opmaak"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "    q      programma afsluiten zonder de partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "    t      bestandssysteemsoort wijzigen"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "    u      gebruikte eenheid voor partitiegrootte wijzigen"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             (roteert door MB, sectoren en cilinders)"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "    W      partitietabel naar schijf schrijven (moet met hoofdletter);"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 "             omdat dit mogelijk gegevens op de schijf wist, dient u het"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             schrijven te bevestigen met 'ja' of te weigeren met 'nee'"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "           "
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "  omhoog   aanwijzer naar vorige partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "  omlaag   aanwijzer naar volgende partitie verplaatsen"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "  Ctrl-L   het scherm opnieuw tekenen"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "    ?      dit hulpscherm tonen"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 "Opmerking: alle opdrachten kunnen zowel met hoofdletter als kleine letter"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "worden ingevoerd -- behalve W."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cilinders"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Cilindergeometrie wijzigen"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Koppen"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Koppengeometrie wijzigen"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Sectorgeometrie wijzigen"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Klaar"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Klaar met wijzigen van geometrie"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Geef het aantal cilinders: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Onjuiste waarde voor cilinders"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Geef het aantal koppen: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Onjuiste waarde voor koppen"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Geef het aantal sectoren per spoor: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Onjuiste waarde voor sectoren"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Geef het soort bestandssysteem: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Kan bestandssysteemsoort niet naar 'leeg' veranderen"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Kan bestandssysteemsoort niet naar 'uitgebreid' veranderen"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "?(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Onbekend (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Schijf: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Grootte: %lld bytes, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Grootte: %lld bytes, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Koppen: %d   Sectoren per spoor: %d   Cilinders: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Naam"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Vlag"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Part.type"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Bestandssysteem"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Label]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "   Sectoren"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cilinders"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "Grootte (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "Grootte (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "opstartBaar"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "B = huidige partitie wel/niet als opstartbaar markeren"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "verwijDeren"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "D = deze partitie verwijderen"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "G = schijfgeometrie wijzigen (alleen voor experts)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Hulp"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "H = hulpscherm tonen"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maximeren"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "M = schijfgebruik maximaliseren voor huidige partitie (alleen voor experts)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nieuw"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "N = nieuwe partitie maken in de vrije ruimte"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "P:tonen"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "P = partitietabel weergeven (op het scherm of naar een bestand)"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Q:stoppen"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Q = programma afsluiten zonder partitietabel te schrijven"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "T:systeem"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "T = bestandssysteemsoort wijzigen (DOS, Linux, OS/2, ...)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "U:eenheid"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "U = weergave-eenheid wijzigen (MB, sectoren, cilinders)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "W:schrijven"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "W = partitietabel naar schijf schrijven (dit kan gegevens wissen)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Kan deze partitie niet opstartbaar maken"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Kan geen lege partitie verwijderen"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Kan deze partitie niet maximaliseren"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Deze partitie is onbruikbaar"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Deze partitie is al in gebruik"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
-msgstr "Kan niet het type van een lege partitie wijzigen"
+msgstr "Kan het type van een lege partitie niet wijzigen"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Geen partities meer over"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Onjuiste opdracht"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2499,9 +2565,8 @@ msgstr ""
 "-a   een pijl gebruiken in plaats van een inverse balk;\n"
 "-z   met lege partitietabel starten, in plaats van deze van schijf te "
 "lezen;\n"
-"-c C -h K -s S   andere waarden afdwingen voor het aantal cilinders, koppen "
-"en\n"
-"                 sectoren/spoor dan de kernel aangeeft.\n"
+"-c C -h K -s S   andere waarden afdwingen voor het aantal cilinders,\n"
+"                 koppen en sectoren/spoor dan de kernel aangeeft.\n"
 "\n"
 
 #: fdisk/fdiskaixlabel.c:27
@@ -2539,9 +2604,9 @@ msgstr ""
 "\n"
 "BSD-label voor apparaat: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Opdracht  Actie"
 
@@ -2561,9 +2626,9 @@ msgstr "   i      bootstrap installeren"
 msgid "   l   list known filesystem types"
 msgstr "   l      bekende bestandssysteemsoorten opsommen"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m      dit menu tonen"
 
@@ -2575,14 +2640,14 @@ msgstr "   n      een nieuwe BSD-partitie toevoegen"
 msgid "   p   print BSD partition table"
 msgstr "   p      BSD-partitietabel weergeven"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q      afsluiten zonder wijzigingen op te slaan"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r      terug naar hoofdmenu"
 
@@ -2625,13 +2690,13 @@ msgstr "Er is geen *BSD-partitie op %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD-schijflabelopdracht (m voor hulp): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Eerste %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Laatste %s of +aantal of +aantalK of +aantalM"
@@ -2778,7 +2843,7 @@ msgstr "sectoren/spoor"
 msgid "tracks/cylinder"
 msgstr "sporen/cilinder"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cilinders"
@@ -2836,7 +2901,7 @@ msgstr "Bootstrap geïnstalleerd op %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partitie (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Het maximum aantal partities is aangemaakt.\n"
@@ -2860,229 +2925,207 @@ msgstr ""
 "\n"
 "Leegmaken van schijfbuffers...\n"
 
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:257
 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 ""
-"Gebruik:  fdisk [-b SECTORGROOTTE] [-u] APPARAAT       partitietabel "
-"wijzigen\n"
-"          fdisk -l [-b SECTORGROOTTE] [-u] APPARAAT    partitietabel "
-"weergeven\n"
-"          fdisk -s PARTITIE    partitiegrootte in blokken weergeven\n"
-"          fdisk -v             programmaversie tonen\n"
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
 "\n"
-"Hier is APPARAAT zoiets als /dev/hda of /dev/sdb,\n"
-"en PARTITIE zoiets als /dev/hda7 of /dev/sdb4.\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
 "\n"
-"-u        Begin en Einde in sectoreenheden (in plaats van cilindereenheden)\n"
-"-b 2048   (voor sommige MO-schijven) 2048-byte sectoren gebruiken\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Gebruik:  fdisk [-l] [-b SECTORGROOTTE] [-u] APPARAAT\n"
-"\n"
-"Bijvoorbeeld:  fdisk /dev/hda      (voor de eerste IDE-schijf)\n"
-"          of:  fdisk /dev/sdc      (voor de derde SCSI-schijf)\n"
-"          of:  fdisk /dev/edb      (voor de tweede PS/2-ESDI-schijf)\n"
-"          of:  fdisk /dev/rd/c0d0  (voor RAID-apparaten)\n"
-"          ...\n"
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan %s niet openen\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan %s niet lezen\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan geen 'seek' doen op %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan niet schrijven naar %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl(BLKGETSIZE) is mislukt op %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan geen geheugen meer reserveren\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Fatale fout\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a      wel/niet als alleen-lezen instellen"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b      een BSD-schijflabel bewerken"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c      wel/niet als aankoppelbaar instellen"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d      een partitie verwijderen"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l      alle bekende partitietypen opsommen"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n      een nieuwe partitie toevoegen"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o      een nieuwe, lege DOS-partitietabel maken"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p      de partitietabel weergeven"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s      een nieuw, leeg Sun-schijflabel maken"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t      systeem-ID van partitie wijzigen"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u      weergave/invoer-eenheid wijzigen"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v      de partitietabel controleren"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w      de tabel naar schijf schrijven en afsluiten"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x      extra functionaliteit (alleen voor experts)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a      opstartbare partitie selecteren"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b      opstartbestand-item bewerken"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c      SGI-wisselgeheugenpartitie selecteren"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a      wel/niet als opstartbaar instellen"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c      wel/niet als DOS-compatibel instellen"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a      aantal alternatieve cilinders wijzigen"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c      aantal cilinders wijzigen"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d      ruwe gegevens van partitietabel weergeven"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e      aantal extra sectoren per cilinder wijzigen"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h      aantal koppen wijzigen"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i      tussenruimtefactor wijzigen"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o      rotatiesnelheid wijzigen (rondjes per minuut)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s      aantal sectoren/spoor wijzigen"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y      aantal fysieke cilinders wijzigen"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b      begin van gegevens in een partitie verplaatsen"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e      uitgebreide partities weergeven"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g      een nieuw, leeg IRIX(SGI)-schijflabel maken"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f      partitievolgorde repareren"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i      schijf-ID wijzigen"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "U moet instellen:"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "koppen"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sectoren"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3091,30 +3134,11 @@ msgstr ""
 "%s%s.\n"
 "U kunt dit doen vanuit het menu met extra functies.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " en "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Het aantal cilinders van deze schijf is ingesteld op %d.\n"
-"Hier is niets mis mee, maar het is groter dan 1024 en kan\n"
-"bij bepaalde instellingen problemen veroorzaken met:\n"
-"1) opstartsoftware (bijvoorbeeld oude versies van LILO),\n"
-"2) partitioneringssoftware van andere besturingssytemen\n"
-"   (bijvoorbeeld DOS FDISK of OS/2 FDISK).\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3124,39 +3148,54 @@ msgid ""
 "partition table format (GPT).\n"
 "\n"
 msgstr ""
+"\n"
+"WAARSCHUWING: De grootte van deze schijf is %d,%d TB (%llu bytes).\n"
+"Een DOS-partitietabel is niet mogelijk op volumens die groter\n"
+"zijn dan %llu bytes (bij sectoren van %d bytes).\n"
+"Gebruik GNU parted(1) en een GUID-partitietabel (GPT).\n"
+"\n"
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
+"\n"
+"Op het apparaat is de logische sectorgrootte kleiner dan de fysieke.\n"
+"Uitlijning op een fysieke sectorgrens (of optimale in-/uitvoergrootte)\n"
+"wordt aangeraden, anders kunnen de prestaties er onder lijden.\n"
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
+"\n"
+"WAARSCHUWING: De DOS-compatibele modus wordt sterk ontraden.\n"
+"              Schakel de modus uit met opdracht 'c'."
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
+"\n"
+"WAARSCHUWING: De weergave-eenheid 'cilinders' wordt ontraden.\n"
+"              Gebruik 'u' om de eenheid op 'sectoren' in te stellen.\n"
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ongeldige plaats in primaire uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3165,32 +3204,32 @@ msgstr ""
 "Waarschuwing: partities na #%d worden genegeerd.\n"
 "Ze zullen worden *verwijderd* als u deze partitietabel opslaat.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Waarschuwing: extra koppelingsverwijzer in partitietabel %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, 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:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "lege partitie (%d) wordt weggelaten\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Schijf-ID: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Nieuw schijf-ID (huidige is 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3205,26 +3244,17 @@ msgstr ""
 "herstelbaar.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Let op: sectorgrootte is %d (niet %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3233,24 +3263,24 @@ msgstr ""
 "Deze schijf bevat zowel DOS- als BSD-vingerafdrukken.\n"
 "Geef de opdracht 'b' om naar BSD-modus te gaan.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr "Apparaat bevat geen geldig DOS-, Sun-, SGI- of OSF-schijflabel.\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Interne fout\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Extra uitgebreide partitie %d wordt genegeerd.\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3259,7 +3289,7 @@ msgstr ""
 "Waarschuwing: onjuiste optie 0x%04x van partitietabel %d zal\n"
 "worden gecorrigeerd bij het schrijven.\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3268,21 +3298,21 @@ msgstr ""
 "\n"
 "driemaal EOF ontvangen -- afsluiting...\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Hex-code (typ L om alle codes te tonen): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standaard %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "Onbekend achtervoegsel: '%s'.\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3291,74 +3321,80 @@ msgstr ""
 "Mogelijk zijn: 10^N: KB (kilobyte), MB (Megabyte), GB (Gigabyte)\n"
 "                2^N: K  (Kibibyte), M  (Mebibyte), G  (Gibibyte)\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Standaardwaarde %u wordt gebruikt\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Waarde ligt buiten bereik.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Partitienummer"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Waarschuwing: partitie %d heeft een lege typeaanduiding\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Geselecteerde partitie is %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Er zijn nog geen partities gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alle primaire partities zijn al gedefinieerd!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cilinder"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:1548
+#: fdisk/fdisk.c:1614
+#, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr ""
+"Eenheid voor weergave/invoer is veranderd naar cilinders (VEROUDERD!)\n"
+
+#: fdisk/fdisk.c:1616
 #, c-format
-msgid "Changing display/entry units to %s\n"
-msgstr "Eenheid voor weergave/invoer is veranderd naar: %s\n"
+msgid "Changing display/entry units to sectors\n"
+msgstr "Eenheid voor weergave/invoer is veranderd naar sectoren\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WAARSCHUWING: Partitie %d is een uitgebreide partitie\n"
 
-#: fdisk/fdisk.c:1569
+#: fdisk/fdisk.c:1636
 #, c-format
-msgid "DOS Compatibility flag is set\n"
-msgstr "DOS-compatibiliteit is aangezet\n"
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
+msgstr "DOS-compatibiliteit is aangezet (VEROUDERD!)\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-compatibiliteit is uitgezet\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partitie %d bestaat nog niet!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3371,7 +3407,7 @@ msgstr ""
 "verstandig om partities te hebben van type 0.\n"
 "Een partitie verwijderen kan met de opdracht 'd'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3380,7 +3416,7 @@ msgstr ""
 "U kunt een gewone partitie niet veranderen in een uitgebreide of andersom.\n"
 "Verwijder de partitie eerst.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3391,7 +3427,7 @@ msgstr ""
 "SunOS/Solaris het verwacht en ook Linux het het liefst heeft.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3402,63 +3438,63 @@ msgstr ""
 "partitie 11 als geheel volumen (6), zoals IRIX het verwacht.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Systeemtype van partitie %d is veranderd naar %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Systeemtype van partitie %d is onveranderd: %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Partitie %d heeft verschillende fysieke/logische beginpunten (niet-Linux?):\n"
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fysiek=(%d, %d, %d)  "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partitie %d heeft verschillende fysieke/logische eindpunten:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partitie %i begint niet op een cilindergrens:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "moet zijn (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partitie %i eindigt niet op een cilindergrens.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "moet zijn (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
-#, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
-msgstr "Partitie %i begint niet op een cilindergrens:\n"
+#: fdisk/fdisk.c:1883
+#, c-format
+msgid "Partition %i does not start on physical sector boundary.\n"
+msgstr "Partitie %i begint niet op een fysieke sectorgrens:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3467,7 +3503,7 @@ msgstr ""
 "\n"
 "Schijf %s: %ld MB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3476,34 +3512,39 @@ msgstr ""
 "\n"
 "Schijf %s: %ld.%ld GB, %lld bytes\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d koppen, %llu sectoren/spoor, %d cilinders"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", totaal %llu sectoren"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 "Eenheid = %s van %d * %d = %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
-msgstr ""
+msgstr "Sectorgrootte (logischl/fysiek): %u bytes / %lu bytes\n"
 
-#: fdisk/fdisk.c:1843
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr "in-/uitvoergrootte (minimaal/optimaal): %lu bytes / %lu bytes\n"
+
+#: fdisk/fdisk.c:1915
+#, c-format
 msgid "Alignment offset: %lu bytes\n"
-msgstr "ongeldige inode-grootte"
+msgstr "Uitlijningspositie: %lu bytes\n"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3512,12 +3553,12 @@ msgstr ""
 "Er hoeft niets gedaan te worden.  De ordening is al goed.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "Voltooid.\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3528,16 +3569,16 @@ msgstr ""
 "Waarschijnlijk koos u een verkeerd apparaat.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Opstart   Begin       Einde     Blokken   ID  Systeem\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Apparaat"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3546,7 +3587,7 @@ msgstr ""
 "\n"
 "Partitietabel-items liggen niet in schijfvolgorde.\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3557,91 +3598,91 @@ msgstr ""
 "Schijf %s: %d koppen, %llu sectoren, %d cilinders\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF Kop Sec  Cil Kop Sec  Cil      Begin    Grootte ID\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Waarschuwing: partitie %d bevat sector 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partitie %d: kopnummer %d is groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partitie %d: sectornummer %d is groter dan maximum %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partities %d: cilindernummer %d is groter dan maximum %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partitie %d: einde van vorige partitie in sectoren %d verschilt van totaal %"
 "d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Waarschuwing: ongeldige start-van-gegevens in partitie %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Waarschuwing: partitie %d overlapt partitie %d\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Waarschuwing: partitie %d is leeg\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logische partitie %d ligt niet geheel binnen partitie %d\n"
 
-#: fdisk/fdisk.c:2206
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2278
+#, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
-msgstr "Totaal aantal gereserveerde sectoren %ld is groter dan maximum %lld\n"
+msgstr "Totaal aantal gereserveerde sectoren %llu is groter dan maximum %llu\n"
 
-#: fdisk/fdisk.c:2209
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2281
+#, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
-msgstr "%lld niet-gereserveerde sectoren\n"
+msgstr "Er resteren %lld niet-gereserveerde %d-byte sectoren\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Partitie %d is al gedefinieerd.  Verwijder deze eerst,\n"
 "en voeg hem dan opnieuw toe.\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sector %llu is al gereserveerd\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Geen vrije sectoren beschikbaar\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Laatste %s, +%s of +grootte{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3654,7 +3695,7 @@ msgstr ""
 "    eerst een nieuwe, lege DOS-partitietabel.  (Gebruik 'o'.)\n"
 "    WAARSCHUWING: Dit zal de huidige schijfinhoud wissen.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3667,24 +3708,24 @@ msgstr ""
 "    eerst een nieuwe, lege DOS-partitietabel.  (Gebruik 'o'.)\n"
 "    WAARSCHUWING: Dit zal de huidige schijfinhoud wissen.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "U dient eerst een partitie te verwijderen\n"
 "en een uitgebreide partitie toe te voegen.\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Alle logische partities zijn in gebruik.\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Een primaire partitie wordt toegevoegd.\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3695,20 +3736,20 @@ msgstr ""
 "   %s\n"
 "   p      primaire partitie (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l      logische partitie (5 of hoger)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e      uitgebreide partitie"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Onjuist partitienummer voor type '%c'\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3717,13 +3758,13 @@ msgstr ""
 "De partitietabel is gewijzigd!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Aanroepen van ioctl() om partitietabel opnieuw in te lezen...\n"
 
-#: fdisk/fdisk.c:2532
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2603
+#, c-format
 msgid ""
 "\n"
 "WARNING: Re-reading the partition table failed with error %d: %s.\n"
@@ -3732,10 +3773,10 @@ msgid ""
 msgstr ""
 "\n"
 "WAARSCHUWING: Opnieuw inlezen van partitietabel is mislukt met fout %d: %s.\n"
-"De kernel gebruikt nog de oude tabel.\n"
-"De nieuwe tabel wordt alleen na opnieuw opstarten gebruikt.\n"
+"De kernel gebruikt nog de oude tabel.  De nieuwe tabel wordt alleen na\n"
+"opnieuw opstarten gebruikt, of na uitvoeren van partprobe(8) of kpartx(8).\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3747,7 +3788,7 @@ msgstr ""
 "WAARSCHUWING: Als u DOS-6.x-partities gemaakt of gewijzigd hebt,\n"
 "raadpleeg dan het fdisk-handboek voor meer informatie.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3756,42 +3797,42 @@ msgstr ""
 "\n"
 "Fout bij sluiten van bestand\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Leegmaken van schijfbuffers...\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitie %d heeft geen gegevensgebied\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Nieuw begin van gegevens"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Expertopdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Aantal cilinders"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Aantal koppen"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Aantal sectoren"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Waarschuwing: sectorplaats wordt ingesteld voor DOS-compatibiliteit\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3804,33 +3845,33 @@ msgstr ""
 "Het programma 'fdisk' ondersteunt GPT niet.  Gebruik GNU 'parted'.\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Schijf %s bevat geen geldige partitietabel\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: onbekende opdracht\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Deze kernel vindt zelf de sectorgrootte -- optie '-b' wordt genegeerd\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3839,16 +3880,16 @@ msgstr ""
 "Waarschuwing: optie '-b' (sectorgrootte instellen) dient met\n"
 "slechts één apparaat gebruikt te worden.\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "OSF/1-schijflabel gevonden op %s; overgegaan in schijflabelmodus.\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3857,16 +3898,16 @@ msgstr ""
 "\n"
 "Het huidige opstartbestand is: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Geef de naam van het nieuwe opstartbestand: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Opstartbestand blijft ongewijzigd.\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3955,15 +3996,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux wisselgeheugen"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4098,7 +4139,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Er is meer dan één schijfingang aanwezig.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Geen partities gedefinieerd\n"
@@ -4202,7 +4243,7 @@ msgstr ""
 "'SGI volumen' mag deze regel overtreden.  Typ JA als u zeker weet\n"
 "dat u de soort van deze partitie wilt wijzigen.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -4258,7 +4299,7 @@ msgstr ""
 "Daarna is de oude inhoud uiteraard niet meer herstelbaar.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4267,7 +4308,7 @@ msgid ""
 msgstr ""
 "Waarschuwing: ioctl(BLKGETSIZE) is mislukt op %s.\n"
 "Cilindergeometriewaarde %d wordt nu gebruikt.\n"
-"Deze waarde kan voor apparaten > 33.8 GB worden afgekapt.\n"
+"Deze waarde kan voor apparaten groter dan 33.8 GB afgekapt zijn.\n"
 
 #: fdisk/fdisksgilabel.c:732
 #, c-format
@@ -4279,55 +4320,55 @@ msgstr "Er wordt geprobeerd de parameters van partitie %d te behouden.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tStart=%d\tLengte=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "(niet-toegewezen)"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS wisselgeheugen"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Gehele schijf"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt-sectoren"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS gereserveerd"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raidautodetectie"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4340,22 +4381,22 @@ msgstr ""
 "zoals koppen, sectoren, cilinders en partities, of een\n"
 "verse label moeten maken (opdracht 's' in hoofdmenu).\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Sun-schijflabel gevonden met foutief versienummer [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Sun-schijflabel gevonden met foutief controlenummer [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Sun-schijflabel gevonden met foutief partitie-aantal [%u].\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4363,7 +4404,7 @@ msgstr ""
 "Waarschuwing: onjuiste waardes dienen verbeterd te worden en\n"
 "zullen gecorrigeerd worden bij het wegschrijven ('w').\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4376,31 +4417,31 @@ msgstr ""
 "Daarna is de oude inhoud uiteraard niet meer herstelbaar.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sectoren/spoor"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partitie %d eindigt niet op een cilindergrens\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Ongebruikt gat: sectoren 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ongebruikt gat: sectoren %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4409,7 +4450,7 @@ msgstr ""
 "Andere partities beslaan al de gehele schijf.\n"
 "Verwijder/verklein ze alvorens het opnieuw te proberen.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4418,12 +4459,12 @@ msgstr ""
 "Het wordt sterk aangeraden om de derde partitie de gehele schijf\n"
 "te laten beslaan en van het soort 'Gehele schijf' te laten zijn.\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sector %d is al gereserveerd\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4434,7 +4475,7 @@ msgstr ""
 "uw waarde %d %s overlapt een andere partitie.\n"
 "Uw invoer is gewijzigd tot %d %s.\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4444,7 +4485,7 @@ msgstr ""
 "beter\n"
 "als gehele schijf (5) laten, beginnend bij 0, met %u sectoren.\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4458,12 +4499,12 @@ msgstr ""
 "en opstartblok.  Typ JA als u erg zeker bent dat u die partitie van type 82\n"
 "(Linux-wisselgeheugen) wilt laten zijn: "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4471,49 +4512,49 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Schijf %s (Sun-schijflabel): %d koppen, %llu sectoren, %d rpm\n"
-"%d cilinders, %d alternatieve cilinders, %d fysieke cilinders\n"
+"Schijf %s (Sun-schijflabel): %u koppen, %llu sectoren, %d rpm\n"
+"%u cilinders, %d alternatieve cilinders, %d fysieke cilinders\n"
 "%d extra sectoren/cilinder, tussenruimte %d:1\n"
 "Label-ID: %s\n"
 "Volumen-ID: %s\n"
 "Eenheid = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
 "\n"
-"Schijf %s (Sun-schijflabel): %d koppen, %llu sectoren, %d cilinders\n"
+"Schijf %s (Sun-schijflabel): %u koppen, %llu sectoren, %u cilinders\n"
 "Eenheid = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Optie   Begin     Einde   Blokken   ID  Systeem\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Aantal alternatieve cilinders"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Extra sectoren per cilinder"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Tussenruimtefactor"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Rotatiesnelheid (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Aantal fysieke cilinders"
 
@@ -4539,7 +4580,7 @@ msgstr "FAT16 <32M"
 
 #: fdisk/i386_sys_types.c:11
 msgid "Extended"
-msgstr "Uitgebreid"
+msgstr "uitgebreid"
 
 #: fdisk/i386_sys_types.c:12
 msgid "FAT16"
@@ -4583,7 +4624,7 @@ msgstr "OPUS"
 
 #: fdisk/i386_sys_types.c:22
 msgid "Hidden FAT12"
-msgstr "Verborgen FAT12"
+msgstr "verborgen FAT12"
 
 #: fdisk/i386_sys_types.c:23
 msgid "Compaq diagnostics"
@@ -4591,15 +4632,15 @@ msgstr "Compaq diagnostiek"
 
 #: fdisk/i386_sys_types.c:24
 msgid "Hidden FAT16 <32M"
-msgstr "Verborgen FAT16 <32M"
+msgstr "verborgen FAT16 <32M"
 
 #: fdisk/i386_sys_types.c:25
 msgid "Hidden FAT16"
-msgstr "Verborgen FAT16"
+msgstr "verborgen FAT16"
 
 #: fdisk/i386_sys_types.c:26
 msgid "Hidden HPFS/NTFS"
-msgstr "Verborgen HPFS/NTFS"
+msgstr "verborgen HPFS/NTFS"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST SmartSleep"
@@ -4607,15 +4648,15 @@ msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
 msgid "Hidden W95 FAT32"
-msgstr "Verborgen W95 FAT32"
+msgstr "verborgen W95 FAT32"
 
 #: fdisk/i386_sys_types.c:29
 msgid "Hidden W95 FAT32 (LBA)"
-msgstr "Verb. W95 FAT32 (LBA)"
+msgstr "verb. W95 FAT32 (LBA)"
 
 #: fdisk/i386_sys_types.c:30
 msgid "Hidden W95 FAT16 (LBA)"
-msgstr "Verb. W95 FAT16 (LBA)"
+msgstr "verb. W95 FAT16 (LBA)"
 
 #: fdisk/i386_sys_types.c:31
 msgid "NEC DOS"
@@ -4712,7 +4753,7 @@ msgstr "PC/IX"
 
 #: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
-msgstr "Oude Minix"
+msgstr "oude Minix"
 
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
@@ -4722,6 +4763,10 @@ msgstr "Minix / oude Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux wisselgeheugen"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 verborgen C:"
@@ -4779,17 +4824,16 @@ msgid "Darwin boot"
 msgstr "Darwin opstart"
 
 #: fdisk/i386_sys_types.c:74
-#, fuzzy
 msgid "HFS / HFS+"
-msgstr "OS/2 HPFS"
+msgstr "HFS / HFS+"
 
 #: fdisk/i386_sys_types.c:75
 msgid "BSDI fs"
-msgstr "BSDI bestandssysteem"
+msgstr "BSDI-bestandssysteem"
 
 #: fdisk/i386_sys_types.c:76
 msgid "BSDI swap"
-msgstr "BSDI wisselgeheugen"
+msgstr "BSDI-wisselgeheugen"
 
 #: fdisk/i386_sys_types.c:77
 msgid "Boot Wizard hidden"
@@ -4821,7 +4865,7 @@ msgstr "Syrinx"
 
 #: fdisk/i386_sys_types.c:84
 msgid "Non-FS data"
-msgstr "Non-BS-gegevens"
+msgstr "non-BS-gegevens"
 
 #: fdisk/i386_sys_types.c:85
 msgid "CP/M / CTOS / ..."
@@ -5050,14 +5094,14 @@ msgid "Re-reading the partition table ...\n"
 msgstr "Herinlezen van partitietabel...\n"
 
 #: fdisk/sfdisk.c:811
-#, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
 "before using mkfs\n"
 msgstr ""
 "Het opnieuw inlezen van de partitietabel is mislukt.\n"
-"Herstart uw systeem nu, vóór mkfs te gebruiken.\n"
+"Voer partprobe(8) of kpartx(8) uit, of herstart uw systeem nu,\n"
+"alvorens 'mkfs' te gebruiken.\n"
 
 #: fdisk/sfdisk.c:817
 #, c-format
@@ -5228,7 +5272,8 @@ msgstr "Waarschuwing: partitie %s begint op sector 0\n"
 #: fdisk/sfdisk.c:1254
 #, 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"
+msgstr ""
+"Waarschuwing: partitie %s loopt door tot voorbij het einde van de schijf\n"
 
 #: fdisk/sfdisk.c:1269
 msgid ""
@@ -5356,95 +5401,95 @@ msgstr "optie '-n' werd gegeven: er is niets gewijzigd\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Opslaan van oude sectoren is mislukt -- gestopt\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Schrijven van partitie op %s is mislukt\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "lange of incomplete invoerregel -- gestopt\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "invoerfout: '=' verwacht na veld %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "invoerfout: onverwacht teken %c na veld %s\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "invoer niet herkend: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "getal is te groot\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "onbegrepen tekens na getal\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "geen ruimte voor partitiebeschrijver\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan omvattende uitgebreide partitie niet maken\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "te veel invoervelden\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Geen ruimte voor meer\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Onjuiste soort\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, 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"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Waarschuwing: lege partitie\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Waarschuwing: ongeldig partitiebegin (eerste mogelijkheid is %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "onbekende 'opstartbaar'-vlag -- kies '-' of '*'\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "een gedeeltelijke c,k,s-specificatie?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Uitgebreide partitie waar die niet verwacht werd\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "ongeldige invoer\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "te veel partities\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5457,98 +5502,98 @@ msgstr ""
 "Meestal hoeft u alleen <begin> en <grootte> te gebruiken (en mogelijk "
 "<soort>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Gebruik:  %s [opties] apparaat ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "  (apparaat is zoiets als /dev/hda of /dev/sda)"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "Nuttige opties:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "  -s, --show-size     partitiegroottes tonen"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "  -c, --id            partitie-ID tonen of wijzigen"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "  -l, --list          partities weergeven"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "  -d, --dump          idem, maar in een opmaak geschikt voor latere invoer"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "  -i, --increment     cilinders/sectoren/... nummeren vanaf 1 in plaats "
 "vanaf 0"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "  -uS, -uB, -uC, -uM  invoeren/weergeven in sectoren/blokken/cilinders/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "  -T, --list-types    bekende partitietypen opsommen"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "  -D, --DOS           een beetje ruimte verspillen (voor DOS-compatibiliteit)"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "  -R, --re-read       de partitietabel opnieuw in laten lezen door de kernel"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "  -N#                 alleen partitie met nummer # wijzigen"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "  -n                  niet echt naar de schijf schrijven, doen alsof"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "  -O bestand          de te overschrijven sectoren opslaan in dit bestand"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "  -I bestand          deze opgeslagen sectoren herstellen"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "  -v, --version       programmaversie tonen"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "  -?, --help          deze hulptekst tonen"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "Gevaarlijke opties:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "  -g, --show-geometry     de kernelvisie van de geometrie weergeven"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5556,7 +5601,7 @@ msgstr ""
 "  -G, --show-pt-geometry  de uit de partitietabel afgeleide geometrie "
 "weergeven"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5564,63 +5609,63 @@ msgstr ""
 "  -x, --show-extended     ook uitgebreide partities opnemen in de uitvoer,\n"
 "                          of beschrijvers ervan verwachten in de invoer"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "  -L, --Linux         niet klagen over dingen die niet relevant zijn voor "
 "Linux"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "  -q, --quiet         waarschuwingen onderdrukken"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "U kunt een andere dan de gevonden geometrie afdwingen met:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "  -C#, --cylinders #  het aantal te gebruiken cilinders"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "  -H#, --heads #      het aantal te gebruiken koppen"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "  -S#, --sectors #    het aantal te gebruiken sectoren"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "U kunt alle consistentiecontroles uitzetten met:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "  -f, --force         precies doen als gegeven, *ook* als het dom is"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Gebruik: "
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s apparaat            actieve partities op apparaat weergeven\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s apparaat n1 n2 ...  genoemde partities activeren, de rest de-activeren\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An apparaat        partitie n activeren, alle andere de-activeren\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5633,67 +5678,67 @@ msgstr ""
 "Het programma 'sfdisk' ondersteunt GPT niet.  Gebruik GNU 'parted'.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Gebruik '--force' om deze controle over te slaan.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "geen opdracht?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totaal: %llu blokken\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Gebruik:  sfdisk --print-id apparaat partitienummer\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Gebruik:  sfdisk --change-id apparaat partitienummer ID\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Gebruik:  sfdisk --id apparaat partitienummer [ID]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "slechts één apparaat is mogelijk (behalve met '-l' of '-s')\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan %s niet openen voor lezen-en-schrijven\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan %s niet openen om te lezen\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilinders, %ld koppen, %ld sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "kan grootte van %s niet opvragen\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "onjuiste 'opstartbaar'-vlag: 0x%x in plaats van 0x80\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5701,7 +5746,7 @@ msgstr ""
 "Voltooid\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5710,35 +5755,35 @@ msgstr ""
 "U hebt %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:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ongeldig ID %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Deze schijf is op dit moment in gebruik.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatale fout: kan %s niet vinden\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Waarschuwing: %s is geen blok-apparaat\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Even controleren of iemand deze schijf nu gebruikt...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5751,30 +5796,30 @@ msgstr ""
 "wisselgeheugenpartities op deze schijf uit.\n"
 "Of gebruik optie '--no-reread' om deze controle te onderdrukken.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Gebruik --force om alle controles te negeren.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Oude situatie:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partitie %d bestaat niet; kan deze dus niet veranderen!\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Nieuwe situatie:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5782,21 +5827,21 @@ msgstr ""
 "Hmm... vreemde partities -- er is niets gewijzigd.\n"
 "(Als u dit echt wilt, kunt u --force gebruiken.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Hmm... vreemde partities -- misschien moet u Nee antwoorden.\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bent u hiermee tevreden? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Wilt u dit naar de schijf schrijven? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5805,16 +5850,16 @@ msgstr ""
 "\n"
 "sfdisk: voortijdig einde van de invoer\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Gestopt -- er is niets gewijzigd.\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Antwoord met 'y' (ja) of 'n' (nee) of 'q' (stoppen).\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5823,7 +5868,7 @@ msgstr ""
 "De nieuwe partitietabel is succesvol geschreven.\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5833,139 +5878,145 @@ msgstr ""
 "gebruik dan dd(1) om de eerste 512 bytes nul te maken:\n"
 "  dd if=/dev/zero of=/dev/foo7 bs=512 count=1  (zie man fdisk(8))\n"
 
-#: fsck/fsck.c:327
-#, fuzzy, c-format
+#: fsck/fsck.c:326
+#, c-format
 msgid "WARNING: couldn't open %s: %s\n"
-msgstr "%s: kan %s niet openen: %s\n"
+msgstr "WAARSCHUWING: kan %s niet openen: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
-msgstr ""
+msgstr "WAARSCHUWING: ongeldige syntax op regel %d van %s\n"
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 "\n"
 msgstr ""
+"WAARSCHUWING: /etc/fstab bevat geen zesde veld (een fsck-volgnummer).\n"
+"    Er wordt nu omheengewerkt, maar u zou dit veld bij\n"
+"    de eerstvolgende gelegenheid dienen toe te voegen.\n"
+"\n"
 
-#: fsck/fsck.c:461
-#, fuzzy, c-format
+#: fsck/fsck.c:460
+#, c-format
 msgid "fsck: %s: not found\n"
-msgstr "umount: %s: niet gevonden"
+msgstr "fsck: %s: niet gevonden\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
-msgstr ""
+msgstr "%s: wait: Geen dochterprocessen meer?!?\n"
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
-msgstr ""
+msgstr "Waarschuwing... %s voor apparaat %s eindigde met signaal %d.\n"
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
-msgstr ""
+msgstr "%s %s: status is %x -- zou nooit mogen gebeuren.\n"
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
-msgstr ""
+msgstr "Klaar met %s (afsluitwaarde %d)\n"
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
-msgstr ""
+msgstr "%s: Fout %d tijdens uitvoeren van 'fsck.%s' voor %s\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
+"Ofwel alle ofwel geen van de bestandssysteemsoorten bij optie '-t'\n"
+"dienen te beginnen met 'no' of '!'.\n"
 
-#: fsck/fsck.c:744
-#, fuzzy
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
-msgstr "mount: u moet een bestandssysteemsoort aangeven"
+msgstr "onvoldoende geheugen beschikbaar voor bestandssysteemsoorten\n"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
+"%s: onjuiste regel in /etc/fstab wordt overgeslagen:\n"
+"een 'bind'-aankoppeling met een niet-nul fsck-volgnummer\n"
 
-#: fsck/fsck.c:893
-#, fuzzy, c-format
+#: fsck/fsck.c:892
+#, c-format
 msgid "%s: skipping nonexistent device\n"
-msgstr "%s: %s is geen printerapparaat\n"
+msgstr "%s: niet-bestaand apparaat wordt overgeslagen\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
-msgstr ""
+msgstr "fsck: kan %s niet controleren: geen 'fsck.%s' gevonden\n"
 
-#: fsck/fsck.c:975
-#, fuzzy
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
-msgstr "Gedwongen bestandssysteemcontrole van %s.\n"
+msgstr "Alle bestandssystemen worden gecontroleerd.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
-msgstr ""
+msgstr "--wachtend-- (stap %d)\n"
 
-#: fsck/fsck.c:1086
-#, fuzzy
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
-"Gebruik:  mkfs [-V] [-t bestandssysteemsoort] [bestandssysteemopties] "
-"apparaat [grootte]\n"
+"Gebruik: fsck [-AMNPRTV] [-C [bestandsdescriptor]] [-t bestandssyteemsoort]\n"
+"              [bestandssysteemopties] [bestandssysteem...]\n"
 
-#: fsck/fsck.c:1124
-#, fuzzy, c-format
+#: fsck/fsck.c:1123
+#, c-format
 msgid "%s: too many devices\n"
-msgstr "%s: %s is geen printerapparaat\n"
+msgstr "%s: te veel apparaten\n"
 
-#: fsck/fsck.c:1135
-#, fuzzy, c-format
+#: fsck/fsck.c:1134
+#, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Kan %s niet openen: %s\n"
 
-#: fsck/fsck.c:1137
-#, fuzzy, c-format
+#: fsck/fsck.c:1136
+#, c-format
 msgid "Is /proc mounted?\n"
-msgstr "%s is ontkoppeld\n"
+msgstr "Is /proc wel aangekoppeld?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
+"U dient root te zijn om naar overeenkomende bestandssystemen te zoeken: %s\n"
 
-#: fsck/fsck.c:1149
-#, fuzzy, c-format
+#: fsck/fsck.c:1148
+#, c-format
 msgid "Couldn't find matching filesystem: %s\n"
-msgstr "Ontkoppelen van resterende bestandssystemen..."
+msgstr "Kan geen overeenkomend bestandssysteem vinden: %s\n"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
-#, fuzzy, c-format
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
+#, c-format
 msgid "%s: too many arguments\n"
-msgstr "%s: onbekend argument: %s\n"
+msgstr "%s: te veel argumenten\n"
 
-#: fsck/fsck.c:1277
-#, fuzzy, c-format
+#: fsck/fsck.c:1276
+#, c-format
 msgid "fsck from %s\n"
-msgstr "%s (%s)\n"
+msgstr "'fsck' uit %s\n"
 
-#: fsck/fsck.c:1289
-#, fuzzy, c-format
+#: fsck/fsck.c:1288
+#, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
-msgstr "Kan geen buffer reserveren voor inodes"
+msgstr "%s: Onvoldoende geheugen beschikbaar voor fsck_path()\n"
 
 #: getopt/getopt.c:229
 msgid "Try `getopt --help' for more information.\n"
@@ -6072,7 +6123,7 @@ msgstr "Ruffiaanse BCD-klok\n"
 #: hwclock/cmos.c:201
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
-msgstr "klokpoort aangepast tot 0x%x\n"
+msgstr "klokpoort aangepast naar 0x%x\n"
 
 #: hwclock/cmos.c:213
 #, c-format
@@ -6087,22 +6138,22 @@ msgstr "%s: atomische %s is duizend keer mislukt!"
 #: hwclock/cmos.c:273
 #, c-format
 msgid "cmos_read(): write to control address %X failed: %s\n"
-msgstr ""
+msgstr "cmos_read(): schrijven naar besturingsadres %X is mislukt: %s\n"
 
 #: hwclock/cmos.c:276
 #, c-format
 msgid "cmos_read(): read data address %X failed: %s\n"
-msgstr ""
+msgstr "cmos_read(): lezen van data-adres %X is mislukt: %s\n"
 
 #: hwclock/cmos.c:307
 #, c-format
 msgid "cmos_write(): write to control address %X failed: %s\n"
-msgstr ""
+msgstr "cmos_write(): schrijven naar besturingsadres %X is mislukt: %s\n"
 
 #: hwclock/cmos.c:311
 #, c-format
 msgid "cmos_write(): write to data address %X failed: %s\n"
-msgstr ""
+msgstr "cmos_write(): schrijven naar data-adres %X is mislukt: %s\n"
 
 #: hwclock/cmos.c:574
 #, c-format
@@ -6174,7 +6225,7 @@ msgstr "Wachten op kloktik...\n"
 #: hwclock/hwclock.c:356
 #, c-format
 msgid "...synchronization failed\n"
-msgstr ""
+msgstr "...synchronisatie is mislukt.\n"
 
 #: hwclock/hwclock.c:358
 #, c-format
@@ -6210,13 +6261,13 @@ msgid "Clock not changed - testing only.\n"
 msgstr "Klok niet gewijzigd -- in testmodus.\n"
 
 #: hwclock/hwclock.c:535
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the new time.\n"
 msgstr ""
 "Verlopen tijd sinds laatste referentietijd is %.6f seconden.\n"
-"Uitgesteld tot de volgende volle seconde.\n"
+"Wordt verder uitgesteld om de nieuwe tijd te bereiken.\n"
 
 #: hwclock/hwclock.c:571
 #, c-format
@@ -6236,12 +6287,12 @@ msgstr "%s  %.6f seconden\n"
 #: hwclock/hwclock.c:615
 #, c-format
 msgid "No --date option specified.\n"
-msgstr "Geen optie --date gegeven.\n"
+msgstr "Er is geen optie '--date' gegeven.\n"
 
 #: hwclock/hwclock.c:621
 #, c-format
 msgid "--date argument too long\n"
-msgstr "argument van --date is te lang\n"
+msgstr "argument van '--date' is te lang\n"
 
 #: hwclock/hwclock.c:628
 #, c-format
@@ -6249,7 +6300,7 @@ msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
-"Het argument van --date is geen geldige datum.\n"
+"Het argument van '--date' is geen geldige datum.\n"
 "In het bijzonder bevat het aanhalingstekens.\n"
 
 #: hwclock/hwclock.c:636
@@ -6342,14 +6393,14 @@ msgid "settimeofday() failed"
 msgstr "settimeofday() is mislukt"
 
 #: hwclock/hwclock.c:781
-#, fuzzy, c-format
+#, c-format
 msgid "Current system time: %ld = %s\n"
-msgstr "lezen van systeemtijd"
+msgstr "Huidige systeemtijd: %ld = %s\n"
 
 #: hwclock/hwclock.c:805
 #, c-format
 msgid "\tUTC: %s\n"
-msgstr ""
+msgstr "\tUTC: %s\n"
 
 #: hwclock/hwclock.c:852
 #, c-format
@@ -6366,7 +6417,7 @@ 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,\n"
+"De verschuivingsfactor wordt niet aangepast\n"
 "omdat de laatste calibratietijd nul was.\n"
 "Er is dus geen bruikbare geschiedenis,\n"
 "en een latere hercalibratie is nodig.\n"
@@ -6423,11 +6474,12 @@ msgid ""
 "Could not open file with the clock adjustment parameters in it (%s) for "
 "writing"
 msgstr ""
+"Kan bestand met klokaanpassingsgegevens (%s) niet openen om te schrijven"
 
 #: hwclock/hwclock.c:1006 hwclock/hwclock.c:1011
 #, c-format
 msgid "Could not update file with the clock adjustment parameters (%s) in it"
-msgstr ""
+msgstr "Kan bestand met klokaanpassingsgegevens (%s) niet bijwerken"
 
 #: hwclock/hwclock.c:1017
 #, c-format
@@ -6443,21 +6495,20 @@ msgstr ""
 "worden.\n"
 
 #: hwclock/hwclock.c:1066
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Not setting clock because last adjustment time is zero, so history is bad."
 msgstr ""
-"De verschuivingsfactor wordt niet aangepast,\n"
-"omdat de laatste calibratietijd nul was.\n"
-"Er is dus geen bruikbare geschiedenis,\n"
-"en een latere hercalibratie is nodig.\n"
+"De klok wordt niet ingesteld\n"
+"omdat de laatste aanpassingstijd nul is.\n"
+"Er is dus geen bruikbare geschiedenis."
 
 #: hwclock/hwclock.c:1089
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
-"De benodigde aanpassing is minder dan één seconde; de klok wordt niet "
-"veranderd.\n"
+"De benodigde aanpassing is minder dan één seconde;\n"
+"de klok wordt niet veranderd.\n"
 
 #: hwclock/hwclock.c:1115
 #, c-format
@@ -6474,7 +6525,15 @@ msgstr "Geen bruikbare klok-interface gevonden.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Instellen van de systeemklok is mislukt.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+"Op %ld seconden na 1969 is de voorspelde waarde van RTC %ld seconden na "
+"1969.\n"
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6487,17 +6546,17 @@ msgstr ""
 "Deze versie van 'hwclock' is gemaakt voor een ander systeem dan de Alpha\n"
 "(en draait nu dus vermoedelijk niet op een Alpha).  Geen actie ondernomen.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Verkrijgen van de tijdperkwaarde van de kernel is mislukt.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernel neemt als tijdperkwaarde %lu aan.\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6505,23 +6564,23 @@ msgid ""
 msgstr ""
 "Om de tijdperkwaarde in te stellen dient u de optie --epoch te gebruiken.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Tijdperk wordt niet ingesteld op %d -- in testmodus.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Instellen van de tijdperkwaarde in de kernel is mislukt.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
-msgstr "%s (%s)\n"
+msgstr "'%s' uit %s\n"
 
-#: hwclock/hwclock.c:1311
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1325
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -6539,6 +6598,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6564,56 +6624,66 @@ msgstr ""
 "Gebruik:  hwclock [functie] [opties...]\n"
 "\n"
 "Functies:\n"
-"  --help        deze hulptekst tonen\n"
-"  --show        de hardwareklok lezen en het resultaat weergeven\n"
-"  --set         de hardwareklok instellen op de tijd gegeven met '--date'\n"
-"  --hctosys     aan de hand van de hardwareklok de systeemklok instellen\n"
-"  --systohc     aan de hand van de systeemklok de hardwareklok instellen\n"
-"  --adjust      de hardwareklok aanpassen ter compensatie van de "
+"  -h|--help        deze hulptekst tonen\n"
+"  -r|--show        de hardwareklok lezen en het resultaat weergeven\n"
+"     --set         de hardwareklok instellen op de tijd gegeven met '--"
+"date'\n"
+"  -s|--hctosys     aan de hand van de hardwareklok de systeemklok instellen\n"
+"  -w|--systohc     aan de hand van de systeemklok de hardwareklok instellen\n"
+"     --systz       de systeemklok instellen aan de hand van de tijdzone\n"
+"     --adjust      de hardwareklok aanpassen ter compensatie van "
 "systematische\n"
-"                verschuiving sinds de laatste instelling/aanpassing\n"
-"  --getepoch    tijdperkwaarde van de kernel tonen\n"
-"  --setepoch    tijdperkwaarde van de kernel instellen op de waarde\n"
-"                gegeven met de optie '--epoch'\n"
-"  --version     programmaversie tonen\n"
+"                   verschuiving sinds de laatste instelling/aanpassing\n"
+"     --getepoch    tijdperkwaarde van de kernel tonen\n"
+"     --setepoch    tijdperkwaarde van de kernel instellen op de waarde\n"
+"                   gegeven met de optie '--epoch'\n"
+"     --predict     hardwarekloktijd voorspellen op moment gegeven met '--"
+"date'\n"
+"  -v|--version     programmaversie tonen\n"
 "\n"
 "Opties: \n"
-"  --utc         de hardwareklok bevat de gecoördineerde universele tijd\n"
-"  --localtime   de hardwareklok bevat de lokale tijd\n"
-"  --rtc=BESTAND te gebruiken RTC-bestand in /dev/ in plaats van standaard\n"
-"  --directisa   de ISA-bus direct benaderen in plaats van via %s\n"
-"  --badyear     het jaartal van de hardwareklok negeren, omdat de BIOS stuk "
+"  -u|--utc         de hardwareklok bevat de gecoördineerde universele tijd\n"
+"     --localtime   de hardwareklok bevat de lokale tijd\n"
+"  -f|--rtc=BESTAND te gebruiken RTC-bestand in /dev/ in plaats van "
+"standaard\n"
+"     --directisa   de ISA-bus direct benaderen in plaats van via %s\n"
+"     --badyear     het jaartal van de hardwareklok negeren omdat de BIOS "
+"stuk is\n"
+"     --date=TIJD   de tijd waarop de hardwareklok moet worden ingesteld\n"
+"     --epoch=JAAR  het jaartal dat het tijdperkbegin voor de hardwareklok "
 "is\n"
-"  --date=TIJD   de tijd waarop de hardwareklok moet worden ingesteld\n"
-"  --epoch=JAAR  het jaartal dat het tijdperkbegin voor de hardwareklok is\n"
-"  --noadjfile   /etc/adjtime niet gebruiken (vereist '--utc' of '--"
+"     --noadjfile   /etc/adjtime niet gebruiken (met '--utc' of '--"
 "localtime')\n"
-"  --adjfile=BESTAND  te gebruiken verschuivingsregistratiebestand\n"
-"                     (standaard is /etc/adjtime)\n"
+"     --adjfile=BESTAND  te gebruiken verschuivingsregistratiebestand\n"
+"                        (standaard is /etc/adjtime)\n"
+"     --test        alles doen behalve daadwerkelijk iets veranderen\n"
+"  -D|--debug       debug-modus inschakelen\n"
+"\n"
 
-#: hwclock/hwclock.c:1346
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1361
+#, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "       tell hwclock the type of alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
-"  --jensen, --arc, --srm, --funky-toy\n"
-"                het soort Alpha dat u gebruikt  (zie hwclock(8))\n"
+"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"                   het soort Alpha dat u gebruikt  (zie hwclock(8))\n"
+"\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "%s: Kan geen verbinding maken met auditsysteem\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s kent geen andere argumenten dan functies en opties.\n"
 "U gaf %d.\n"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6622,48 +6692,48 @@ msgstr ""
 "U hebt verschillende functies aangegeven.\n"
 "Per aanroep kan slechts één functie worden gebruikt.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr "%s: De opties --utc en --localtime sluiten elkaar uit.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr "%s: De opties --adjust en --noadjfile sluiten elkaar uit.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr "%s: De opties --adjfile en --noadjfile sluiten elkaar uit.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: Bij --noadjfile moet u of --utc of --localtime aangeven.\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Geen bruikbare insteltijd.  Kan klok niet instellen.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Sorry, alleen root kan de hardwareklok instellen.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Sorry, alleen root kan de systeemklok instellen.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6672,13 +6742,13 @@ msgstr ""
 "Sorry, alleen root kan in de kernel de tijdperkwaarde voor de klok "
 "instellen.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "Kan op geen enkele bekende manier toegang krijgen tot de hardwareklok.\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6970,12 +7040,12 @@ msgstr "%s: Kan standaardcontext voor /etc/passwd niet instellen"
 msgid "Changing finger information for %s.\n"
 msgstr "Wijzigen van finger-informatie voor %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM-fout -- gestopt: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -6993,7 +7063,7 @@ msgstr "Finger-informatie is niet gewijzigd.\n"
 #: login-utils/chfn.c:328
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Gebruik:  %s [ -f volledige_naam ] [ -o kantoor ] "
+msgstr "Gebruik:  %s [-f volledige_naam] [-o kantoor] "
 
 #: login-utils/chfn.c:329
 #, c-format
@@ -7001,25 +7071,25 @@ msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
-"[ -p kantoor_telefoon ]\n"
-"          [ -h thuis_telefoon ] "
+"[-p kantoortelefoon]\n"
+"              [-h thuistelefoon] "
 
 #: login-utils/chfn.c:330
 #, c-format
 msgid "[ --help ] [ --version ]\n"
-msgstr "[ --help ] [ --version ]\n"
+msgstr "[--help] [--version]\n"
 
 #: login-utils/chfn.c:378
 msgid "Office"
-msgstr ""
+msgstr "Kantoor"
 
 #: login-utils/chfn.c:379
 msgid "Office Phone"
-msgstr ""
+msgstr "Kantoortelefoon"
 
 #: login-utils/chfn.c:380
 msgid "Home Phone"
-msgstr ""
+msgstr "Thuistelefoon"
 
 #: login-utils/chfn.c:401 login-utils/chsh.c:321
 #, c-format
@@ -7204,35 +7274,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "FATAAL: kan tty niet heropenen: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "FATAAL: %s is geen terminal"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "FATAAL: slechte tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: optie '-h' kan alleen door root gebruikt worden\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Gebruik:  login [-fp] [gebruikersnaam]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kan PAM niet initialiseren: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "inlognaam: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "INLOGPOGING %d IS MISLUKT VANAF %s VOOR %s -- %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7241,17 +7316,17 @@ msgstr ""
 "Inloggegevens onjuist\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TE VEEL INLOGPOGINGEN (%d) VANAF %s VOOR %s -- %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "INLOGSESSIE IS MISLUKT VANAF %s VOOR %s -- %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7260,7 +7335,7 @@ msgstr ""
 "\n"
 "Inloggegevens onjuist\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7269,120 +7344,120 @@ msgstr ""
 "\n"
 "Sessie-instellingsprobleem -- gestopt\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Lege gebruikersnaam in %s:%d -- gestopt"
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Onjuiste gebruikersnaam '%s' in %s:%d -- gestopt"
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Onvoldoende geheugen beschikbaar\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Inloggen door %s op deze terminal is geweigerd.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "INLOGGEN DOOR %s VANAF %s IS GEWEIGERD OP TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "INLOGGEN DOOR %s IS GEWEIGERD OP TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Inloggegevens onjuist\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "INBELLEN OP %s DOOR %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT-LOGIN OP %s VANAF %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT-LOGIN OP %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN OP %s DOOR %s VANAF %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN OP %s DOOR %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "U hebt nieuwe e-mail.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "U hebt e-mail.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: kan geen nieuw proces starten: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "ioctl(TIOCSCTTY) is mislukt: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() is mislukt"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Er is geen map %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Ingelogd met home = '/'.\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: onvoldoende geheugen beschikbaar voor shell-script\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kan shell-script niet uitvoeren: %s\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: geen shell: %s\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7391,65 +7466,65 @@ msgstr ""
 "\n"
 "%s inlognaam: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "inlognaam is veel te lang\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NAAM is te lang"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "inlognamen mogen niet beginnen met '-'\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "te veel witregels\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "EXCESSIEF aantal witregels"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggen duurde te lang: afgebroken na %d seconden.\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Laatste keer ingelogd: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "vanaf %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "op %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "INLOGGEN IS MISLUKT VANAF %s -- %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "INLOGGEN IS MISLUKT OP %s -- %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d INLOGMISLUKKINGEN VANAF %s -- %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d INLOGMISLUKKINGEN OP %s --  %s"
@@ -7686,7 +7761,7 @@ msgstr "openen van map is mislukt\n"
 #: login-utils/simpleinit.c:501
 #, c-format
 msgid "respawning: \"%s\" too fast: quenching entry\n"
-msgstr ""
+msgstr "\"%s\" wordt te frequent herboren: item wordt afgeknepen\n"
 
 #: login-utils/simpleinit.c:509
 msgid "fork failed\n"
@@ -7694,35 +7769,35 @@ msgstr "fork() is mislukt\n"
 
 #: login-utils/simpleinit.c:540 text-utils/more.c:1663
 msgid "exec failed\n"
-msgstr "uitvoeren is mislukt\n"
+msgstr "exec() is mislukt\n"
 
 #: login-utils/simpleinit.c:564
 msgid "cannot open inittab\n"
-msgstr "kan 'inittab' niet openen\n"
+msgstr "kan bestand 'inittab' niet openen\n"
 
 #: login-utils/simpleinit.c:631
 msgid "no TERM or cannot stat tty\n"
-msgstr "geen TERM, of kan tty niet vinden\n"
+msgstr "geen TERM ingesteld, of kan status van terminal niet opvragen\n"
 
 #: login-utils/simpleinit.c:938
-#, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
-msgstr "fout bij stoppen van service: \"%s\""
+#, c-format
+msgid "error at stopping service \"%s\"\n"
+msgstr "fout bij stoppen van dienst \"%s\"\n"
 
 #: login-utils/simpleinit.c:950
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped service: %s\n"
-msgstr "fout bij stoppen van service: \"%s\""
+msgstr "Gestopte dienst: \"%s\"\n"
 
 #: login-utils/simpleinit.c:1070
-#, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "fout bij uitvoeren van finalprog\n"
+#, c-format
+msgid "error at starting service \"%s\"\n"
+msgstr "fout bij starten van dienst \"%s\"\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr ""
-"Interne fout: te veel IOV's  [de code in wall/ttymsg.c dient veranderd]"
+"**Interne fout**: te veel IOV's  [de code in wall/ttymsg.c dient veranderd]"
 
 #: login-utils/ttymsg.c:85
 #, c-format
@@ -7844,25 +7919,25 @@ msgstr "%s: kan tijdelijk bestand niet vinden\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: kan tijdelijk bestand niet lezen\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "onjuiste dagwaarde;  gebruik 1-%d"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "onjuiste maandwaarde;  gebruik 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "onjuiste jaarwaarde;  gebruik 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Gebruik:  cal [-13smjyV] [[[dag] maand] jaar]\n"
@@ -7879,12 +7954,121 @@ msgstr "Sint Tibs"
 #: misc-utils/findfs.c:24
 #, c-format
 msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
+msgstr "Gebruik:  %s LABEL=<label>|UUID=<uuid>\n"
 
 #: misc-utils/findfs.c:55
-#, fuzzy, c-format
+#, c-format
 msgid "unable to resolve '%s'"
-msgstr "openen van %s is mislukt"
+msgstr "kan '%s' niet herleiden"
+
+#: misc-utils/findmnt.c:192
+#, c-format
+msgid "unknown column: %s"
+msgstr "onbekende kolom: %s"
+
+#: misc-utils/findmnt.c:308
+msgid "failed to add line to output"
+msgstr "toevoegen van regel aan uitvoer is mislukt"
+
+#: misc-utils/findmnt.c:359
+msgid "failed to initialize libmount tab"
+msgstr "initialiseren van libmount-tabel is mislukt"
+
+#: misc-utils/findmnt.c:364
+#, c-format
+msgid "can't read: %s"
+msgstr "kan %s niet lezen"
+
+#: misc-utils/findmnt.c:370
+#, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: ontledingsfout: %s"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+"\n"
+"Gebruik:\n"
+"  %1$s [opties]\n"
+"  %1$s [opties] <apparaat> | <aankoppelingspunt>\n"
+"  %1$s [opties] <apparaat> <aankoppelingspunt>\n"
+"  %1$s [opties] [--source <apparaat>] [--target <aankoppelingspunt>]\n"
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Voor meer informatie zie findmnt(1).\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr "opties gaan niet samen"
+
+#: misc-utils/findmnt.c:564
+#, c-format
+msgid "unknown direction '%s'"
+msgstr "onbekende richting '%s'"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr "opties '--target' en '--source' gaan niet samen met andere argumenten"
+
+#: misc-utils/findmnt.c:679
+msgid "failed to initialize libmount iterator"
+msgstr "initialiseren van libmount-iterator is mislukt"
+
+#: misc-utils/findmnt.c:685
+msgid "failed to initialize libmount cache"
+msgstr "initialiseren van libmount-cache is mislukt"
+
+#: misc-utils/findmnt.c:695
+msgid "failed to initialize output table"
+msgstr "initialiseren van uitvoertabel is mislukt"
+
+#: misc-utils/findmnt.c:707
+msgid "failed to initialize output column"
+msgstr "initialiseren van uitvoerkolom is mislukt"
 
 #: misc-utils/kill.c:207
 #, c-format
@@ -7966,35 +8150,36 @@ msgstr "%d bytes ontvangen van %s\n"
 
 #: misc-utils/namei.c:143 misc-utils/namei.c:198 misc-utils/namei.c:225
 #: misc-utils/namei.c:245 misc-utils/namei.c:252 misc-utils/namei.c:294
-#, fuzzy
 msgid "out of memory?"
-msgstr "onvoldoende geheugen beschikbaar\n"
+msgstr "onvoldoende geheugen beschikbaar?"
 
 #: misc-utils/namei.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "failed to read symlink: %s"
-msgstr "kan timingsbestand %s niet lezen"
+msgstr "lezen van symlink %s is mislukt"
 
 #: misc-utils/namei.c:231 misc-utils/namei.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "could not stat '%s'"
 msgstr "kan status van '%s' niet opvragen"
 
 #: misc-utils/namei.c:449
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Usage: %s [options] pathname [pathname ...]\n"
-msgstr "Gebruik:  namei [-mx] padnaam [padnaam ...]\n"
+msgstr ""
+"\n"
+"Gebruik:  %s [opties] padnaam [padnaam...]\n"
 
 #: misc-utils/namei.c:450
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 "\n"
-"%d partities:\n"
+"Opties:\n"
 
 #: misc-utils/namei.c:453
 #, c-format
@@ -8007,25 +8192,32 @@ msgid ""
 " -n, --nosymlinks    don't follow symlinks\n"
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
+"  -h, --help           deze hulptekst tonen\n"
+"  -l, --long           uitgebreide extra informatie tonen ('-m -o -v')\n"
+"  -m, --modes          de modus van elk bestand tonen\n"
+"  -o, --owners         namen van eigenaar en groep van elk bestand tonen\n"
+"  -v, --vertical       bestandsmodus en eigenaarnamen verticaal uitlijnen\n"
+"  -n, --nosymlinks     symbolische koppelingen niet volgen\n"
+"  -x, --mountpoints    aankoppelingspunten markeren met een 'D'\n"
 
 #: misc-utils/namei.c:461
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 "\n"
-"Voor meer informatie zie setarch(8).\n"
+"Voor meer informatie zie namei(1).\n"
 
 #: misc-utils/namei.c:522
-#, fuzzy, c-format
+#, c-format
 msgid "failed to stat: %s"
 msgstr "kan status van %s niet bepalen"
 
 #: misc-utils/namei.c:533
 #, c-format
 msgid "%s: exceeded limit of symlinks"
-msgstr ""
+msgstr "%s: limiet op aantal symbolische koppelingen is overschreden"
 
 #: misc-utils/rename.c:38
 #, c-format
@@ -8042,7 +8234,7 @@ msgstr "%s: hernoemen van %s tot %s is mislukt: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "Gebruik:  %s van naar bestanden...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8053,37 +8245,37 @@ msgstr ""
 "gebruik '%s [opties] %s' als u deze echt wilt gebruiken.\n"
 "Script is niet gestart.\n"
 
-#: misc-utils/script.c:173
+#: misc-utils/script.c:182
 #, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr "Gebruik:  script [-a] [-f] [-q] [-t] [bestand]\n"
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
+msgstr "Gebruik:  script [-a] [-e] [-f] [-q] [-t] [bestand]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script is gestart, het bestand heet '%s'.\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s: schrijffout %d: %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Script is gestart op %s."
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s: schrijffout: %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: kan scriptbestand niet schrijven: %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8092,17 +8284,17 @@ msgstr ""
 "\n"
 "Script is beëindigd op %s."
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script is beëindigd, het bestand heet '%s'.\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty() is mislukt\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Onvoldoende PTY's\n"
@@ -8152,7 +8344,7 @@ msgid "failed to read timing file %s"
 msgstr "kan timingsbestand %s niet lezen"
 
 #: misc-utils/scriptreplay.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "timingsbestand %s: %lu: onverwachte opmaak"
 
@@ -8403,231 +8595,241 @@ msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM is niet gedefinieerd.\n"
 
 #: misc-utils/uuidd.c:46
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
-msgstr ""
-"Gebruik:  last [-#] [-f bestand] [-t tty] [-h hostnaam] [gebruiker ...]\n"
+msgstr "Gebruik:  %s [-d] [-p PID-bestand] [-s socket-pad] [-T tijslimiet]\n"
 
 #: misc-utils/uuidd.c:48
 #, c-format
 msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
-msgstr ""
+msgstr "          %s [-r|t] [-n nummer] [-s socket-pad]\n"
 
 #: misc-utils/uuidd.c:50
-#, fuzzy, c-format
+#, c-format
 msgid "       %s -k\n"
-msgstr "          %s -l [ signaal ]\n"
+msgstr "          %s -k\n"
 
 #: misc-utils/uuidd.c:152
-#, fuzzy
 msgid "bad arguments"
-msgstr "col: ongeldig argument '%s' van '-l'\n"
+msgstr "ongeldige argumenten"
 
 #: misc-utils/uuidd.c:159
-#, fuzzy
 msgid "socket"
-msgstr "socket: %s.\n"
+msgstr "socket"
 
 #: misc-utils/uuidd.c:170
-#, fuzzy
 msgid "connect"
-msgstr "verbinding: %s.\n"
+msgstr "verbinden"
 
 #: misc-utils/uuidd.c:189
-#, fuzzy
 msgid "write"
-msgstr "W:schrijven"
+msgstr "schrijven"
 
 #: misc-utils/uuidd.c:197
-#, fuzzy
 msgid "read count"
-msgstr "duurde te lang"
+msgstr "gelezen aantal"
 
 #: misc-utils/uuidd.c:203
 msgid "bad response length"
-msgstr ""
+msgstr "ongeldige antwoordlengte"
+
+#: misc-utils/uuidd.c:244
+#, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "Openen/aanmaken van %s is mislukt: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "Vergrendelen van %s is mislukt: %s\n"
 
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
-msgstr ""
+msgstr "uuidd-dienst draait al onder PID %s\n"
 
 #: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
-msgstr ""
+msgstr "Kan geen UNIX-stream-socket aanmaken: %s"
 
 #: misc-utils/uuidd.c:305
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
-msgstr "Kan %s niet openen: %s\n"
+msgstr "Kan UNIX-socket %s niet binden: %s\n"
 
 #: misc-utils/uuidd.c:313
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
-msgstr "Kan %s niet openen: %s\n"
+msgstr "Kan niet luisteren op UNIX-socket %s: %s\n"
 
 #: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
-msgstr ""
+msgstr "Fout tijdens lezen van cliënt; lengte = %d\n"
 
 #: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
-msgstr ""
+msgstr "bewerking %d, gegeven getal = %d\n"
+
+#: misc-utils/uuidd.c:362
+#, c-format
+msgid "operation %d\n"
+msgstr "bewerking %d\n"
 
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
-msgstr ""
+msgstr "Gegenereerde tijds-UUID: %s\n"
 
 #: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
-msgstr ""
+msgstr "Gegenereerde willekeurige UUID: %s\n"
 
 #: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgstr "Gegenereerde tijds-UUID: %s, en %d opvolgende\n"
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
-msgstr ""
+msgid "Generated %d UUIDs:\n"
+msgstr "Gegenereerde %d UUID's:\n"
 
 #: misc-utils/uuidd.c:427
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid operation %d\n"
-msgstr "ongeldige optie"
+msgstr "Ongeldige bewerking %d\n"
 
 #: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "Bad number: %s\n"
-msgstr "%s: ongeldige waarde\n"
+msgstr "Ongeldig getal: %s\n"
 
 #: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
-#, fuzzy, c-format
+#, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
-msgstr "fout bij wijzigen van modus van %s: %s\n"
+msgstr "Fout bij aanroepen van uuidd-dienst (%s): %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
-msgstr ""
+msgid "%s and subsequent %d UUIDs\n"
+msgstr "%s en opvolgende %d UUID's\n"
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
-msgstr ""
+msgid "List of UUIDs:\n"
+msgstr "Lijst van UUID's:\n"
 
 #: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
-msgstr ""
+msgstr "Onverwachte antwoordlengte (%d) van server\n"
 
 #: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
-msgstr ""
+msgstr "Kan uuidd met PID %d niet elimineren: %s\n"
 
 #: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
-msgstr ""
+msgstr "uuidd met PID %d is geëlimineerd\n"
 
 #: misc-utils/uuidgen.c:32
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-r] [-t]\n"
-msgstr "Gebruik:  %s [opties] apparaat ...\n"
+msgstr "Gebruik:  %s [-r] [-t]\n"
 
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "Gebruik:  whereis [-bmsu] [-BMS map... -f] naam...\n"
 
-#: misc-utils/wipefs.c:128
-#, fuzzy
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
-msgstr "malloc() is mislukt"
+msgstr "calloc() is mislukt"
 
-#: misc-utils/wipefs.c:150
-#, fuzzy
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
-msgstr "schrijven naar standaarduitvoer is mislukt"
+msgstr "strdup() is mislukt"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr ""
+#: misc-utils/wipefs.c:202
+#, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "fout: %s: initialisatie van sondering is mislukt"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
-msgstr ""
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "WAARSCHUWING: %s schijnt een '%s'-partitietabel te bevatten"
 
-#: misc-utils/wipefs.c:250
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:259
+#, c-format
+msgid "no magic string found at offset 0x%jx -- ignored"
+msgstr "geen magische tekenreeks gevonden op positie 0x%jx -- genegeerd"
+
+#: misc-utils/wipefs.c:266
+#, c-format
 msgid "%s: failed to seek to offset 0x%jx"
-msgstr "%s: openen is mislukt: %s\n"
+msgstr "%s: 'seek' naar positie 0x%jx is mislukt"
 
-#: misc-utils/wipefs.c:257
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:273
+#, c-format
 msgid "%s: write failed"
-msgstr "openpty() is mislukt\n"
+msgstr "%s: schrijven is mislukt"
 
-#: misc-utils/wipefs.c:259
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:275
+#, c-format
 msgid "%zd bytes ["
-msgstr "bytes"
+msgstr "%zd bytes ["
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
-msgstr ""
+msgstr "] gewist vanaf positie 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
+#, c-format
 msgid "%s: open failed"
-msgstr "openpty() is mislukt\n"
+msgstr "%s: openen is mislukt"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
-#, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
-msgstr "Ongeldige drempelwaarde: %s\n"
-
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Gebruik:  %s [opties] apparaat ...\n"
+#: misc-utils/wipefs.c:329
+#, c-format
+msgid "invalid offset value '%s' specified"
+msgstr "ongeldige plaatswaarde '%s' gegeven"
 
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
+"  -a, --all           alle magische tekenreeksen wissen (WEET WAT U DOET!)\n"
+"  -h, --help          deze hulptekst tonen\n"
+"  -n, --no-act        doen alsof: alles behalve het feitelijke schrijven\n"
+"  -o, --offset GETAL  startpositie voor wissen, in bytes\n"
+"  -p, --parsable      herbruikbare i.p.v. leesbare uitvoer produceren\n"
 
-#: misc-utils/wipefs.c:322
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:347
+#, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 "\n"
-"Voor meer informatie zie setarch(8).\n"
+"Voor meer informatie zie wipefs(8).\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
-msgstr ""
+msgstr "opties '--offset' en '--all' gaan niet samen"
 
 #: misc-utils/write.c:101
 #, c-format
@@ -8764,9 +8966,9 @@ msgid "can't rename %s to %s: %s\n"
 msgstr "kan %s niet hernoemen tot %s: %s\n"
 
 #: mount/lomount.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
-msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
+msgstr "loop: kan grootte van apparaat %s niet instellen: %s\n"
 
 #: mount/lomount.c:386
 #, c-format
@@ -8810,9 +9012,9 @@ msgid "%s: /dev directory does not exist."
 msgstr "%s: map '/dev' bestaat niet."
 
 #: mount/lomount.c:459 mount/lomount.c:600
-#, fuzzy, c-format
+#, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
-msgstr "%s: geen toegangsrechten tot /dev/loop#"
+msgstr "%s: geen toegangsrechten tot /dev/loop%s<N>"
 
 #: mount/lomount.c:603
 #, c-format
@@ -8877,8 +9079,8 @@ msgstr ""
 "Deze versie van 'mount' is gecompileerd zonder lus-ondersteuning.\n"
 "Hercompilatie is nodig.\n"
 
-#: mount/lomount.c:886
-#, fuzzy, c-format
+#: mount/lomount.c:888
+#, c-format
 msgid ""
 "\n"
 "Usage:\n"
@@ -8893,14 +9095,16 @@ msgid ""
 msgstr ""
 "\n"
 "Gebruik:\n"
-"  %1$s <lus-apparaat>                                 info tonen\n"
-"  %1$s -a | --all                                     alle gebruikte tonen\n"
-"  %1$s -d | --detach <lus-apparaat>                   verwijderen\n"
-"  %1$s -f | --find                                    een ongebruikte tonen\n"
-"  %1$s -j | --associated <bestand> [-o <nummer>]      gerelateerden tonen\n"
-"  %1$s [opties] {-f|--find|<lus-apparaat>} <bestand>  instellen\n"
+"  %1$s <lus-apparaat>                                  info tonen\n"
+"  %1$s -a | --all                                      alle gebruikte tonen\n"
+"  %1$s -d | --detach <lus-apparaat>...                 verwijderen\n"
+"  %1$s -f | --find                                     een ongebruikte "
+"tonen\n"
+"  %1$s -c | --set-capacity <loopdev>                   de grootte wijzigen\n"
+"  %1$s -j | --associated <bestand> [-o <nummer>]       gerelateerden tonen\n"
+"  %1$s [opties] {-f|--find|<lus-apparaat>} <bestand>   instellen\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8927,253 +9131,307 @@ msgstr ""
 "       --show                apparaatnaam tonen (bij '-f <bestand>')\n"
 "  -v | --verbose             gedetailleerde uitvoer produceren\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "%s: ongeldige positie '%s' opgegeven"
+
+#: mount/lomount.c:1023
+#, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "%s: ongeldige groottegrens '%s' opgegeven"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Lus-apparaat is %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "afgepakt lus-apparaat=%s; ... nieuwe poging\n"
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: apparaat %s is bezig"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Bij het compileren was geen lus-ondersteuning beschikbaar.  Hercompilatie is "
 "nodig.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+"\n"
+"mount: Waarschuwing: /etc/mtab is niet schrijfbaar (mogelijk wegens een\n"
+"       alleen-lezen bestandssysteem).  Het kan dus zijn dat de informatie\n"
+"       gerapporteerd door mount(8) niet correct is.  Zie voor actuele\n"
+"       info over aankoppelingspunten het bestand '/proc/mounts'.\n"
+"\n"
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr "mount: onjuist aangehaalde tekenreeks '%s'"
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: argument van %s is vertaald van '%s' naar '%s'\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, 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:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: volgens mtab is %s aangekoppeld op %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan %s niet openen om te schrijven: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fout bij schrijven van %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fout bij wijzigen van modus van %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
-msgstr "mount: kan groep-ID niet instellen: %s"
+msgstr "mount: kan groeps-ID niet instellen: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
-msgstr "mount: kan gebruiker-ID niet instellen: %s"
+msgstr "mount: kan gebruikers-ID niet instellen: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kan geen nieuw proces starten: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "soort %s wordt geprobeerd\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: U gaf geen bestandssysteemsoort aan voor %s;\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       alle soorten genoemd in %s of %s worden geprobeerd\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       het lijkt erop dat dit wisselgeheugen is\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       soort %s wordt geprobeerd\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ziet er uit als wisselgeheugen -- niet aangekoppeld"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+"mount: %s: er zijn meerdere bestandssystemen gedetecteerd.\n"
+"    Dit zou niet mogen gebeuren.  Gebruik '-t SOORT' om expliciet de\n"
+"    bestandssysteemsoort aan te geven, of gebruik wipefs(8) om het\n"
+"    apparaat op te schonen.\n"
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "aankoppelen is mislukt"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: alleen root kan %s aankoppelen op %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: lus-apparaat is twee keer aangegeven"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: soort is twee keer aangegeven"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: instellen van lus-apparaat wordt overgeslagen\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "mount: ongeldige positie '%s' opgegeven"
+
+#: mount/mount.c:1155
+#, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "mount: ongeldige groottegrens '%s' opgegeven"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: volgens mtab is %s al als lus-apparaat aangekoppeld op %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: lus-apparaat %s zal worden gebruikt\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 "mount: lus-apparaat %s is door ander proces afgepakt; ... nieuwe poging\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: lus-apparaat %s is door ander proces afgepakt"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: instellen van lus-apparaat is mislukt\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: lus-apparaat is succesvol ingesteld\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: geen %s gevonden -- wordt nu aangemaakt...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan %s niet openen: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument van '-p' of '--pass-fd' moet een getal zijn"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kan %s niet openen om snelheid in te stellen"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan snelheid niet instellen: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: volgens mtab is %s al aangekoppeld op %s\n"
 
-#: mount/mount.c:1371
-#, fuzzy, c-format
+#: mount/mount.c:1435
+#, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
-msgstr "umount: %s is bezig -- als alleen-lezen heraangekoppeld\n"
+msgstr "mount: waarschuwing: %s schijnt aangekoppeld als lezen-en-schrijven\n"
+
+#: mount/mount.c:1447
+#, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "mount: waarschuwing: %s schijnt aangekoppeld als alleen-lezen\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: kan bestandssysteemsoort niet bepalen, en er is geen aangegeven"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: u moet een bestandssysteemsoort aangeven"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: aankoppelen is mislukt"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: aankoppelingspunt %s is geen map"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: toegang geweigerd"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: u moet root zijn om aan te kunnen koppelen"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s is bezig"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc is al aangekoppeld"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s is al aangekoppeld of %s is bezig"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: aankoppelingspunt %s bestaat niet"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: apparaat %s bestaat niet"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9181,12 +9439,12 @@ msgid ""
 msgstr ""
 "mount: apparaat %s bestaat niet  (het pad bevat iets dat geen map is)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s is nog niet aangekoppeld, of een ongeldige optie"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9196,7 +9454,7 @@ msgstr ""
 "codepagina,\n"
 "       ontbrekend hulpprogramma, slecht superblok op %s, of een andere fout"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
@@ -9204,7 +9462,7 @@ msgstr ""
 "       (voor sommige bestandssystemen (bijvoorbeeld nfs of cifs) kan\n"
 "       een /sbin/mount.<type> hulpprogramma nodig zijn)"
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9213,7 +9471,7 @@ msgstr ""
 "gebruikt,\n"
 "       zodat sr0 of sda of iets dergelijks nodig is?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9221,7 +9479,7 @@ msgstr ""
 "       (probeert u misschien een uitgebreide partitie aan te koppelen,\n"
 "       in plaats van een daarin opgenomen logische partitie?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9229,109 +9487,106 @@ msgstr ""
 "       Soms staat er nuttige informatie in het systeemlog --\n"
 "       probeer zoiets als:  dmesg | tail\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "aankoppelingstabel is vol"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan superblok niet lezen"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: onbekend apparaat"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: onbekende bestandssysteemsoort '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: waarschijnlijk bedoelde u %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: mogelijk bedoelde u 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: mogelijk bedoelde u 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s heeft onjuist apparaatnummer, of bestandssysteemsoort %s wordt "
 "niet ondersteund"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s is geen blok-apparaat, en stat() is mislukt... heel vreemd"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: de kernel herkent %s niet als een blok-apparaat\n"
-"       (misschien is 'insmod stuurprogramma' nodig?)"
+"       (misschien is 'modprobe stuurprogramma' nodig?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s is geen blok-apparaat"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s is geen geldig blok-apparaat"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "blok-apparaat "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan %s%s niet aankoppelen voor alleen-lezen"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s is schrijfbeveiligd, maar expliciete optie '-w' is gegeven"
 
-#: mount/mount.c:1573
-#, fuzzy, c-format
+#: mount/mount.c:1651
+#, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
-msgstr "mount: kan %s%s niet aankoppelen voor alleen-lezen"
+msgstr ""
+"mount: kan %s%s niet heraankoppelen als lezen-en-schrijven, want is "
+"schrijfbeveiligd"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s is schrijfbeveiligd en wordt als alleen-lezen aangekoppeld"
 
-#: mount/mount.c:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: geen medium gevonden op %s; ... nieuwe poging\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: geen medium gevonden op %s"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9349,23 +9604,23 @@ msgstr ""
 "bestandssysteem\n"
 "    kunnen krijgen.  Voor meer details zie restorecon(8) en mount(8).\n"
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: geen soort gegeven -- NFS aangenomen, vanwege de dubbele punt\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: geen soort gegeven -- CIFS aangenomen, vanwege het //-voorvoegsel\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s is al aangekoppeld op %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9438,42 +9693,42 @@ msgstr ""
 "wachtwoordbestandsdescriptor].\n"
 "Voor meer informatie, zie man mount(8).\n"
 
-#: mount/mount.c:2265
-#, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
-msgstr "mount: alleen root kan dat doen"
+#: mount/mount.c:2335
+#, c-format
+msgid "mount: only root can do that (effective UID is %u)"
+msgstr "mount: alleen root kan dat doen (feitelijke UID is %u)"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: alleen root kan dat doen"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
-msgstr "er is niets aangekoppeld"
+msgstr "er werd niets aangekoppeld"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: die partitie is niet gevonden"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan %s niet vinden in %s noch in %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 "[mntent]: waarschuwing: geen afsluitend regeleindeteken aan het eind van %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: regel %d in %s is ongeldig%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
-msgstr "; rest van bestand genegeerd"
+msgstr "; rest van bestand is genegeerd"
 
 #: mount/sundries.c:32
 msgid "bug in xstrndup call"
@@ -9484,7 +9739,7 @@ msgstr "*programmeerfout* in aanroep van xstrndup()"
 msgid "not enough memory"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9494,15 +9749,15 @@ msgid ""
 " <file>                               name of file to be used\n"
 "\n"
 msgstr ""
-"De parameter <naam> kan zijn:\n"
+"De parameter NAAM kan zijn:\n"
 "  {-L label | LABEL=label}    label van te gebruiken apparaat\n"
 "  {-U UUID  | UUID=UUID}      UUID van te gebruiken apparaat\n"
 "  <apparaat>                  naam van te gebruiken apparaat\n"
 "  <bestand>                   naam van te gebruiken bestand\n"
 "\n"
 
-#: mount/swapon.c:92
-#, fuzzy, c-format
+#: mount/swapon.c:93
+#, c-format
 msgid ""
 "\n"
 "Usage:\n"
@@ -9515,16 +9770,16 @@ msgid ""
 msgstr ""
 "\n"
 "Gebruik:\n"
-"  %1$s -a [-e] [-v]                     alle wisselgeheugens inschakelen "
+"  %1$s -a [-e] [-v] [-f]                 alle wisselgeheugens inschakelen "
 "die\n"
-"                                          vermeld staan in /etc/fstab\n"
-"  %1$s [-p <prioriteit>] [-v] <naam>    dit wisselgeheugen inschakelen\n"
-"  %1$s -s                               gebruikssamenvatting tonen\n"
-"  %1$s -h                               deze hulptekst tonen\n"
-"  %1$s -V                               programmaversie tonen\n"
+"                                           vermeld staan in /etc/fstab\n"
+"  %1$s [-p PRIORITEIT] [-v] [-f] NAAM    dit wisselgeheugen inschakelen\n"
+"  %1$s -s                                gebruikssamenvatting tonen\n"
+"  %1$s -h                                deze hulptekst tonen\n"
+"  %1$s -V                                programmaversie tonen\n"
 "\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9537,179 +9792,181 @@ msgid ""
 msgstr ""
 "\n"
 "Gebruik:\n"
-"  %1$s -a [-v]         alle wisselgeheugens uitschakelen\n"
-"  %1$s [-v] <naam>     dit wisselgeheugen uitschakelen\n"
-"  %1$s -h              deze hulptekst tonen\n"
-"  %1$s -V              programmaversie tonen\n"
+"  %1$s -a [-v]      alle wisselgeheugens uitschakelen\n"
+"  %1$s [-v] NAAM    dit wisselgeheugen uitschakelen\n"
+"  %1$s -h           deze hulptekst tonen\n"
+"  %1$s -V           programmaversie tonen\n"
 "\n"
 
-#: mount/swapon.c:140
-#, fuzzy, c-format
+#: mount/swapon.c:142
+#, c-format
 msgid "%s: unexpected file format"
-msgstr "%s: %s: Onverwachte bestandsindeling\n"
+msgstr "%s: Onverwachte bestandsindeling"
 
-#: mount/swapon.c:205
-#, fuzzy, c-format
+#: mount/swapon.c:217
+#, c-format
 msgid "%s: reinitializing the swap."
-msgstr ""
-"%s: %s: sluimergegevens gevonden --\n"
-"wisselgeheugen wordt opnieuw ingesteld\n"
+msgstr "%s: herinitialisatie van het wisselgeheugen"
 
-#: mount/swapon.c:209
-#, fuzzy
+#: mount/swapon.c:221
 msgid "fork failed"
-msgstr "fork() is mislukt\n"
+msgstr "fork() is mislukt"
 
-#: mount/swapon.c:225
-#, fuzzy
+#: mount/swapon.c:237
 msgid "execv failed"
-msgstr "uitvoeren is mislukt\n"
+msgstr "execv() is mislukt"
 
-#: mount/swapon.c:233
-#, fuzzy
+#: mount/swapon.c:245
 msgid "waitpid failed"
-msgstr "setuid() is mislukt"
+msgstr "waitpid() is mislukt"
 
-#: mount/swapon.c:257
-#, fuzzy, c-format
+#: mount/swapon.c:269
+#, c-format
 msgid "%s: lseek failed"
-msgstr "'seek' is mislukt"
+msgstr "%s: 'lseek' is mislukt"
 
-#: mount/swapon.c:263
-#, fuzzy, c-format
+#: mount/swapon.c:275
+#, c-format
 msgid "%s: write signature failed"
-msgstr "schrijven naar standaarduitvoer is mislukt"
+msgstr "%s: schrijven van vingerafdruk is mislukt"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
+"%s: wisselgeheugenvingerafdruk gevonden: versie %d, paginagrootte %d, %s "
+"byte-volgorde"
 
-#: mount/swapon.c:355
+# Eén van de volgende twee berichten wordt ingevuld voor bovenstaand woord "byte-volgorde".
+#: mount/swapon.c:367
 msgid "different"
-msgstr ""
+msgstr "verschillende"
 
-#: mount/swapon.c:355
-#, fuzzy
+#: mount/swapon.c:367
 msgid "same"
-msgstr "Naam"
+msgstr "zelfde"
 
-#: mount/swapon.c:370
-#, fuzzy, c-format
+#: mount/swapon.c:382
+#, c-format
 msgid "%s: stat failed"
-msgstr "%s is mislukt.\n"
+msgstr "%s: stat() is mislukt"
 
-#: mount/swapon.c:380
-#, fuzzy, c-format
+#: mount/swapon.c:392
+#, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
-msgstr ""
-"%s: Waarschuwing: %s heeft onveilige toegangsrechten: %04o --\n"
-"aangeraden wordt: %04o\n"
+msgstr "%s: onveilige toegangsrechten: %04o -- aangeraden wordt: %04o"
 
-#: mount/swapon.c:388
-#, fuzzy, c-format
+#: mount/swapon.c:400
+#, c-format
 msgid "%s: skipping - it appears to have holes."
-msgstr "%s: Bestand %s wordt overgeslagen -- het lijkt gaten te hebben.\n"
+msgstr "%s: wordt overgeslagen -- het lijkt gaten te hebben."
 
-#: mount/swapon.c:402
-#, fuzzy, c-format
+#: mount/swapon.c:414
+#, c-format
 msgid "%s: get size failed"
-msgstr "'seek' is mislukt"
+msgstr "%s: bepalen van grootte is mislukt"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
-msgstr ""
+msgstr "%s: lezen van kop van wisselgeheugen is mislukt"
+
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr "%s: paginagrootte=%d, wisselgrootte=%llu, apparaatgrootte=%llu"
 
-#: mount/swapon.c:421
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
+"%s: opgeslagen grootte (0x%08llx) van wisselgeheugen is groter dan de "
+"feitelijke ruimte"
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
-msgstr ""
+msgstr "%s: opgeslagen paginagrootte klopt niet"
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
+"%s: opgeslagen paginagrootte klopt niet;\n"
+"gebruik '--fixpgsz' om dit te corrigeren"
 
-#: mount/swapon.c:440
-#, fuzzy, c-format
+#: mount/swapon.c:452
+#, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
-msgstr ""
-"%s: %s: sluimergegevens gevonden --\n"
-"wisselgeheugen wordt opnieuw ingesteld\n"
+msgstr "%s: slaapgegevens gevonden -- vingerafdruk wordt opnieuw geschreven"
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s op %s\n"
 
-#: mount/swapon.c:486
-#, fuzzy, c-format
+#: mount/swapon.c:498
+#, c-format
 msgid "%s: swapon failed"
-msgstr "%s is mislukt.\n"
+msgstr "%s: swapon is mislukt"
 
-#: mount/swapon.c:493
-#, fuzzy, c-format
+#: mount/swapon.c:505
+#, c-format
 msgid "cannot find the device for %s"
-msgstr "%s: kan geen apparaat vinden voor %s\n"
+msgstr "kan geen apparaat vinden voor %s"
 
-#: mount/swapon.c:526
-#, fuzzy
+#: mount/swapon.c:538
 msgid "Not superuser."
-msgstr "U bent niet root.\n"
+msgstr "U bent niet root."
 
-#: mount/swapon.c:529
-#, fuzzy, c-format
+#: mount/swapon.c:541
+#, c-format
 msgid "%s: swapoff failed"
-msgstr "%s is mislukt.\n"
+msgstr "%s: swapoff is mislukt"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
+"'%s' is niet-toegestane programmanaam (moet 'swapon' of 'swapoff' zijn)"
 
 #: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: gecompileerd zonder ondersteuning voor '-f'\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
-msgstr "umount: kan groep-ID niet instellen: %s"
+msgstr "umount: kan groeps-ID niet instellen: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
-msgstr "umount: kan gebruiker-ID niet instellen: %s"
+msgstr "umount: kan gebruikers-ID niet instellen: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan geen nieuw proces starten: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ongeldig blok-apparaat"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: niet aangekoppeld"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan niet naar superblok schrijven"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9720,135 +9977,149 @@ msgstr ""
 "        (Welke processen het apparaat gebruiken kan mogelijk\n"
 "         gevonden worden met behulp van lsof(8) of fuser(1).)"
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: niet gevonden"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: u moet root zijn om te kunnen ontkoppelen"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blok-apparaten niet toegestaan op bestandssysteem"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "geen umount2 aanwezig; poging met gewone umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s is bezig -- als alleen-lezen heraangekoppeld\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: kan %s niet als alleen-lezen heraankoppelen\n"
 
-#: mount/umount.c:272
+#: mount/umount.c:278
 #, c-format
-msgid "%s umounted\n"
-msgstr "%s is ontkoppeld\n"
+msgid "%s has been unmounted\n"
+msgstr "%s werd ontkoppeld\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan geen lijst vinden met bestandssystemen om te ontkoppelen"
 
-#: mount/umount.c:399
-#, fuzzy, c-format
+#: mount/umount.c:405
+#, c-format
 msgid ""
 "Usage: umount -h | -V\n"
 "       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Gebruik:  umount [-dfnlrv] map|apparaat ...\n"
-"          umount -a [-dfnlrv] [-t bestandssysteemsoorten] [-O opties]\n"
-"          umount [-hV]\n"
+"Gebruik:  umount [-dfnrv] map|apparaat...\n"
+"          umount -a [-dfnrv] [-t bestandssysteemsoorten] [-O opties]\n"
+"          umount -h|-V\n"
 
-#: mount/umount.c:468
-#, fuzzy, c-format
+#: mount/umount.c:474
+#, c-format
 msgid "device %s is associated with %s\n"
-msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
+msgstr "apparaat %s is gerelateerd aan %s\n"
 
-#: mount/umount.c:474
-#, fuzzy, c-format
+#: mount/umount.c:480
+#, c-format
 msgid "device %s is not associated with %s\n"
-msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
-
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
-msgstr "kan niet \"\" ontkoppelen\n"
+msgstr "apparaat %s is niet gerelateerd aan %s\n"
 
 #: mount/umount.c:493
+msgid "Cannot unmount \"\"\n"
+msgstr "Kan niet \"\" ontkoppelen\n"
+
+#: mount/umount.c:499
 #, c-format
-msgid "Trying to umount %s\n"
+msgid "Trying to unmount %s\n"
 msgstr "Poging tot ontkoppelen van %s...\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
-msgstr ""
+msgstr "umount: verward tijdens analyse van 'mtab'-bestand"
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
+"umount: kan %s niet ontkoppelen -- %s is er op hetzelfde punt overheen "
+"aangekoppeld"
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kan %s niet vinden in mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s is niet aangekoppeld (volgens mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, 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:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: aankoppeling op %s komt niet overeen met fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: alleen %s kan %s ontkoppelen van %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: alleen root kan dat doen"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
+msgstr ""
 "\n"
+"chrt - de realtime-eigenschappen van een proces instellen\n"
+"\n"
+"Beleid instellen:\n"
+"  chrt [opties] <beleid> <prioriteit> {<PID> | <opdracht> [<argument>...]}\n"
+"\n"
+"Beleid opvragen:\n"
+"  chrt [opties] {<PID> | <opdracht> [<argument>...]}\n"
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9856,90 +10127,125 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+"\n"
+"Scheduling-beleid:\n"
+"  -b | --batch          beleid op SCHED_BATCH instellen\n"
+"  -f | --fifo           beleid op SCHED_FIFO instellen\n"
+"  -i | --idle           beleid op SCHED_IDLE instellen\n"
+"  -o | --other          beleid op SCHED_OTHER instellen\n"
+"  -r | --rr             beleid op SCHED_RR instellen (standaard)\n"
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+"\n"
+"Scheduling-vlag:\n"
+"  -R | --reset-on-fork  SCHED_RESET_ON_FORK instellen voor FIFO of RR\n"
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
+"\n"
+"Opties:\n"
+"  -h | --help           deze hulptekst tonen\n"
+"  -m | --max            minimum en maximum geldige prioriteiten tonen\n"
+"  -p | --pid            de gegeven bestaande PID beïnvloeden\n"
+"  -v | --verbose        statusinformatie tonen\n"
+"  -V | --version        programmaversie tonen\n"
+"\n"
 
-#: schedutils/chrt.c:85
-#, fuzzy, c-format
+#: schedutils/chrt.c:101
+#, c-format
 msgid "failed to get pid %d's policy"
-msgstr "Instellen van systeemeigenschappen voor %s is mislukt"
+msgstr "opvragen van beleid voor PID %d is mislukt"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
 #, c-format
-msgid "pid %d's %s scheduling policy: "
-msgstr ""
+msgid "pid %d's new scheduling policy: "
+msgstr "Nieuw scheduling-beleid voor PID %d: "
+
+#: schedutils/chrt.c:106
+#, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr "Huidig scheduling-beleid voor PID %d: "
 
-#: schedutils/chrt.c:109
-#, fuzzy, c-format
+#: schedutils/chrt.c:139
+#, c-format
 msgid "unknown\n"
-msgstr "onbekende tijd"
+msgstr "onbekend\n"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
-msgstr ""
+msgstr "opvragen van eigenschappen voor PID %d is mislukt"
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
-msgstr ""
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr "Nieuwe scheduling-prioriteit van PID %d: %d\n"
+
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr "Huidige scheduling-prioriteit van PID %d: %d\n"
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
-msgstr ""
+msgstr "SCHED_%s minimum/maximum prioriteit:\t %d/%d\n"
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
-msgstr ""
+msgstr "SCHED_%s wordt niey ondersteund?\n"
 
-#: schedutils/chrt.c:203
-#, fuzzy
+#: schedutils/chrt.c:243
 msgid "failed to parse pid"
-msgstr "%s: openen is mislukt: %s\n"
+msgstr "ontleden van PID is mislukt"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "ncount"
-
-#: schedutils/chrt.c:233
-#, fuzzy
+#: schedutils/chrt.c:273
 msgid "failed to parse priority"
-msgstr "Instellen van systeemeigenschappen voor %s is mislukt"
+msgstr "ontleden van prioriteit is mislukt"
 
-#: schedutils/chrt.c:239
-#, fuzzy, c-format
-msgid "failed to set pid %d's policy"
-msgstr "Instellen van systeemeigenschappen voor %s is mislukt"
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+"De vlag SCHED_RESET_ON_FORK wordt alleen voor SCHED_FIFO- en SCHED_RR-beleid "
+"ondersteund"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Nieuw"
+#: schedutils/chrt.c:289
+#, c-format
+msgid "failed to set pid %d's policy"
+msgstr "instellen van beleid voor PID %d is mislukt"
 
-#: schedutils/chrt.c:248
-#, fuzzy, c-format
+#: schedutils/chrt.c:298
+#, c-format
 msgid "failed to execute %s"
-msgstr "kan scriptbestand %s niet lezen"
+msgstr "uitvoeren van %s is mislukt"
 
 #: schedutils/ionice.c:57
-#, fuzzy
 msgid "ioprio_get failed"
-msgstr "openpty() is mislukt\n"
+msgstr "ioprio_get() is mislukt"
 
 #: schedutils/ionice.c:75
-#, fuzzy
 msgid "ioprio_set failed"
-msgstr "openpty() is mislukt\n"
+msgstr "ioprio_set() is mislukt"
 
 #: schedutils/ionice.c:81
 #, c-format
@@ -9949,7 +10255,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9959,29 +10265,170 @@ msgid ""
 "  -h                  this help\n"
 "\n"
 msgstr ""
+"\n"
+"ionice - zet of toont de in-/uitvoer-scheduling-klasse en -prioriteit\n"
+"\n"
+"Gebruik:\n"
+"  ionice [opties] -p <PID>...\n"
+"  ionice [opties] <opdracht> [<argument>...]\n"
+"\n"
+"Opties:\n"
+"  -n <klassedata>    klassedata (0-7, lager is hogere prioriteit)\n"
+"  -c <klasse>        scheduling-klasse -- 0=geen, 1=realtime,\n"
+"                       2=zo_goed_als_het_gaat, 3=als_er_niks_anders_is\n"
+"  -t                 mislukkingen negeren\n"
+"  -h                 deze hulptekst tonen\n"
+"\n"
 
 #: schedutils/ionice.c:110 schedutils/ionice.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "cannot parse number '%s'"
-msgstr "kan %s niet openen"
+msgstr "kan getal '%s' niet ontleden"
 
 #: schedutils/ionice.c:151
 msgid "ignoring given class data for none class"
-msgstr ""
+msgstr "klassegegevens voor 'none'-klasse worden genegeerd"
 
 #: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
-msgstr ""
+msgstr "klassegegevens voor 'idle'-klasse worden genegeerd"
 
 #: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
+msgstr "ongeldige prioriteitsklasse %d"
+
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, c-format
+msgid "executing %s failed"
+msgstr "uitvoeren van '%s' is mislukt"
+
+#: schedutils/taskset.c:38
+#, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
 msgstr ""
+"Gebruik:  %s [optie...] [masker|CPU-lijst] [PID|opdracht [argument...]]\n"
+"\n"
+"Processoraffiniteit tonen of instellen van de gegeven PID,\n"
+"of een nieuw proces starten met de gegeven affiniteit.\n"
+"\n"
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
-msgstr "uitvoeren is mislukt\n"
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+"Opties:\n"
+"  -p, --pid         de gegeven bestaande PID beïnvloeden\n"
+"  -c, --cpu-list    de te gebruiken processoren (gegeven als lijst)\n"
+"  -h, --help        deze hulptekst tonen\n"
+"  -V, --version     programmaversie tonen\n"
+"\n"
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+"Standaard wordt een nieuw proces gestart, bijvoorbeeld:\n"
+"    %1$s 03 sshd -b 1024\n"
+"U kunt het masker van een bestaand proces opvragen:\n"
+"    %1$s -p 700\n"
+"Of instellen:\n"
+"    %1$s -p 03 700\n"
+"In plaats van een masker is een kommagescheiden lijst mogelijk:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"In een lijst kan op een bereik een stapargument volgen:\n"
+"    0-31:2 is bijvoorbeeld hetzelfde als masker 0x55555555\n"
+
+#: schedutils/taskset.c:61
+#, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Voor meer informatie zie taskset(1).\n"
+
+#: schedutils/taskset.c:113
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "kan aantal processoren niet bepalen -- gestopt"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+msgid "cpuset_alloc failed"
+msgstr "cpuset_alloc() is mislukt"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "opvragen van affiniteit van PID %d is mislukt"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr "Huidige affiniteitslijst van PID %d: %s\n"
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr "Huidig affiniteitsmasker van PID %d: %s\n"
+
+#: schedutils/taskset.c:157
+#, c-format
+msgid "failed to parse %s %s"
+msgstr "ontleden van %s '%s' is mislukt"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr "processorenlijst"
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr "processorenmasker"
+
+#: schedutils/taskset.c:162
+#, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "instellen van affiniteit van PID %d is mislukt"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr "Nieuwe affiniteitslijst van PID %d: %s\n"
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr "Nieuw affiniteitsmasker van PID %d: %s\n"
+
+#: shlibs/mount/src/tab_parse.c:501
+msgid "parse error at lines: "
+msgstr "ontledingsfouten op regels: "
+
+#: shlibs/mount/src/tab_parse.c:503
+msgid "parse error at line: "
+msgstr "ontledingsfout op regel: "
+
+#: shlibs/mount/src/tab_parse.c:523
+#, c-format
+msgid " and %d."
+msgstr " en %d."
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -10088,7 +10535,7 @@ msgstr "%s: %ld is standaard drempelwaarde en %ld is standaard tijdslimiet\n"
 
 #: sys-utils/cytune.c:327
 msgid "Can't set signal handler"
-msgstr "Kan geen signaalhandvat instellen"
+msgstr "Kan geen signaalverwerker instellen"
 
 #: sys-utils/cytune.c:331 sys-utils/cytune.c:366
 msgid "gettimeofday failed"
@@ -10126,11 +10573,22 @@ msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f onderbrekingen/sec; %f ontvangen (tekens/sec)\n"
 
 #: sys-utils/dmesg.c:45
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
-msgstr "Gebruik:  %s [-c] [-n niveau] [-s buffergrootte]\n"
+msgstr "Gebruik:  %s [-c] [-n niveau] [-r] [-s buffergrootte]\n"
+
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Gebruik:  %s [opties] <bestandsnaam>\n"
+"\n"
+"Opties:\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10138,44 +10596,48 @@ msgid ""
 " -o, --offset <num>  offset of the allocation, in bytes\n"
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
+"  -h, --help             deze hulptekst tonen\n"
+"  -n, --keep-size        lengte van bestand niet wijzigen\n"
+"  -o, --offset <getal>   positie van de reservering, in bytes\n"
+"  -l, --length <getal>   lengte van de reservering, in bytes\n"
 
-#: sys-utils/fallocate.c:56
-#, fuzzy, c-format
+#: sys-utils/fallocate.c:57
+#, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 "\n"
-"Voor meer informatie zie setarch(8).\n"
+"Voor meer informatie zie fallocate(1).\n"
 
-#: sys-utils/fallocate.c:147
-#, fuzzy
+#: sys-utils/fallocate.c:115
 msgid "no length argument specified"
-msgstr "Te weinig argumenten"
+msgstr "geen lengte gegeven"
 
-#: sys-utils/fallocate.c:149
-#, fuzzy
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
-msgstr "Ongeldige drempelwaarde: %s\n"
+msgstr "ongeldige lengte gegeven"
 
-#: sys-utils/fallocate.c:151
-#, fuzzy
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
-msgstr "Ongeldige drempelwaarde: %s\n"
+msgstr "ongeldige plaatswaarde gegeven"
 
-#: sys-utils/fallocate.c:153
-#, fuzzy
+#: sys-utils/fallocate.c:121
 msgid "no filename specified."
-msgstr "Geen optie --date gegeven.\n"
+msgstr "geen bestandsnaam gegeven"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+msgid "unexpected number of arguments"
+msgstr "onverwacht aantal argumenten"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
-msgstr ""
+msgstr "'keep-size'-modus (optie '-n') wordt niet ondersteund"
 
-#: sys-utils/fallocate.c:174
-#, fuzzy, c-format
+#: sys-utils/fallocate.c:147
+#, c-format
 msgid "%s: fallocate failed"
-msgstr "openpty() is mislukt\n"
+msgstr "%s: fallocate() is mislukt"
 
 #: sys-utils/flock.c:65
 #, c-format
@@ -10195,37 +10657,99 @@ msgid ""
 msgstr ""
 
 #: sys-utils/flock.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s requires exactly one command argument\n"
-msgstr "%s vereist een argument\n"
+msgstr "%s: %s vereist precies één opdrachtargument\n"
 
 #: sys-utils/flock.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot open lock file %s: %s\n"
-msgstr "%s: kan %s niet openen: %s\n"
+msgstr "%s: kan vergrendelingsbestand %s niet openen: %s\n"
 
 #: sys-utils/flock.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad number: %s\n"
-msgstr "%s: ongeldige waarde\n"
+msgstr "%s: ongeldig getal: %s\n"
 
 #: sys-utils/flock.c:238
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
-msgstr ""
+msgstr "%s: vereist een bestandsdescriptor, een bestand of een map\n"
 
 #: sys-utils/flock.c:296
-#, fuzzy, c-format
+#, c-format
 msgid "%s: fork failed: %s\n"
-msgstr "fork() is mislukt\n"
+msgstr "%s: fork() is mislukt: %s\n"
+
+#: sys-utils/fsfreeze.c:41
+#, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Gebruik:  %s [opties] <aankoppelingspunt>\n"
+"\n"
+"Opties:\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+"  -h, --help        deze hulptekst tonen\n"
+"  -f, --freeze      het bestandssysteem bevriezen\n"
+"  -u, --unfreeze    het bestandssysteem ontdooien\n"
+
+#: sys-utils/fsfreeze.c:49
+#, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Voor meer informatie zie fsfreeze(8).\n"
+
+#: sys-utils/fsfreeze.c:90
+msgid "no action specified"
+msgstr "geen actie gegeven"
+
+#: sys-utils/fsfreeze.c:92
+msgid "no filename specified"
+msgstr "geen bestandsnaam gegeven"
+
+#: sys-utils/fsfreeze.c:105
+#, c-format
+msgid "%s: fstat failed"
+msgstr "%s: fstat() is mislukt"
+
+#: sys-utils/fsfreeze.c:110
+#, c-format
+msgid "%s: is not a directory"
+msgstr "%s: is geen map"
+
+#: sys-utils/fsfreeze.c:116
+#, c-format
+msgid "%s: freeze failed"
+msgstr "%s: bevriezen is mislukt"
+
+#: sys-utils/fsfreeze.c:121
+#, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s: ontdooien is mislukt"
 
 #: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Usage: %s [options]\n"
 "\n"
-msgstr "Gebruik:  %s [opties] apparaat ...\n"
+msgstr ""
+"\n"
+"Gebruik:  %s [opties]\n"
+"\n"
 
 #: sys-utils/ipcmk.c:86
 #, c-format
@@ -10235,50 +10759,47 @@ msgid ""
 "  -Q            create message queue\n"
 "  -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
+"  -M <grootte>   gedeeld geheugensegment aanmaken met deze grootte\n"
+"  -S <aantal>    semafoorarray aanmaken met <aantal> elementen\n"
+"  -Q             berichtenwachtrij aanmaken\n"
+"  -p <modus>     deze toegangsrechten toekennen (standaard 0644)\n"
 
 #: sys-utils/ipcmk.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
 "\n"
 msgstr ""
 "\n"
-"Voor meer informatie zie setarch(8).\n"
+"Voor meer informatie zie ipcmk(1).\n"
 
 #: sys-utils/ipcmk.c:142
 msgid "create share memory failed"
-msgstr ""
+msgstr "aanmaken van gedeeld geheugensegment is mislukt"
 
 #: sys-utils/ipcmk.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "Shared memory id: %d\n"
-msgstr ""
-"\n"
-"Gedeeld geheugensegment met shm-ID=%d\n"
+msgstr "Gedeeld geheugensegment-ID: %d\n"
 
 #: sys-utils/ipcmk.c:150
 msgid "create message queue failed"
-msgstr ""
+msgstr "aanmaken van berichtenwachtrij is mislukt"
 
 #: sys-utils/ipcmk.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "Message queue id: %d\n"
-msgstr ""
-"\n"
-"Berichtwachtrij met msq-ID=%d\n"
+msgstr "Berichtenwachtrij-ID: %d\n"
 
 #: sys-utils/ipcmk.c:158
-#, fuzzy
 msgid "create semaphore failed"
-msgstr "gereserveerde semaforen = %d\n"
+msgstr "aanmaken van semafoor is mislukt"
 
 #: sys-utils/ipcmk.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Semaphore id: %d\n"
-msgstr ""
-"\n"
-"Semafoorarray met sem-ID=%d\n"
+msgstr "Semafoor-ID: %d\n"
 
 #: sys-utils/ipcrm.c:64
 #, c-format
@@ -10314,476 +10835,474 @@ msgstr ""
 "Gebruik:  %s [ [-q msq_ID] [-m shm_ID] [-s sem_ID]\n"
 "                  [-Q msq_sleutel] [-M shm_sleutel] [-S sem_sleutel] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ongeldige optie -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: ongeldige sleutel (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "toegang geweigerd voor sleutel"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "sleutel is al verwijderd"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "ongeldige sleutel"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "onbekende fout in sleutel"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "toegang geweigerd voor ID"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "ongeldig ID"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "ID is al verwijderd"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "onbekende fout in ID"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: onbekend argument: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "Gebruik:  %s -asmq -tclup\n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "          %s [-s] [-m] [-q] -i ID\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "          %s -h  (voor hulp)\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s geeft informatie over IPC-voorzieningen waarvoor u leestoegang hebt.\n"
+"Gebruik: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"         %1$s [-s|-m|-q] -i ID\n"
+"         %1$s -h    (voor hulp)\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Bronnenkeuze:\n"
-"    -m : gedeeld geheugen\n"
-"    -q : berichten\n"
+"Gebruik: %1$s [bron]... [uitvoeropmaak]\n"
+"         %1$s [bron] -i ID\n"
+"\n"
 
 #: sys-utils/ipcs.c:127
 #, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"    -s : semaforen\n"
-"    -a : alle (is standaard)\n"
+"Geeft informatie over IPC-voorzieningen waarvoor u leestoegang hebt.\n"
+"\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
 #, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
-"Uitvoerindeling:\n"
-"    -t : tijd\n"
-"    -p : PID\n"
-"    -c : aanmaker\n"
+"    -h      deze hulptekst tonen\n"
+"    -i ID   details weergeven over de met ID aangegeven bron\n"
+"\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"    -l : grenzen\n"
-"    -u : samenvatting\n"
+"Bronopties:\n"
+"    -m      gedeelde geheugensegmenten\n"
+"    -q      berichtwachtrijen\n"
+"    -s      semaforen\n"
+"    -a      alle (is standaard)\n"
+"\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "    -i ID [-s] [-m] [-q] : details over de met ID aangegeven bron\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
+"Uitvoeropmaak:\n"
+"    -t      tijd\n"
+"    -p      PID\n"
+"    -c      aanmaker\n"
+"    -l      grenzen\n"
+"    -u      samenvatting\n"
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
-msgstr "kernel niet ingesteld voor gedeeld geheugen\n"
+msgstr "kernel is niet ingesteld voor gedeeld geheugen\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Gedeeld geheugen: grenzen --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "maximum aantal segmenten = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "maximale segmentgrootte (kilobytes) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "maximum totaal gedeeld geheugen (kilobytes) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "minimale segmentgrootte (bytes) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Gedeeld geheugen: status --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "gereserveerde segmenten =  %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "gereserveerde pagina's = %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "pagina's in geheugen = %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "pagina's in wisselgeheugen = %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Wisselgeheugenprestaties: %ld pogingen, %ld succesvol\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Gedeeld geheugen: segmentaanmakers/eigenaars --------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shm-ID"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "rechten"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "maker-UID"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "maker-GID"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "UID"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "GID"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Gedeeld geheugen: aanhecht/onthecht/wijzigingstijden --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "eigenaar"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "aangehecht"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "onthecht"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "gewijzigd"
 
-#: sys-utils/ipcs.c:299
+#: sys-utils/ipcs.c:327
 #, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr "------ Gedeeld geheugen: aanmaker/laatste-operatie --------\n"
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
+msgstr ""
+"------ Gedeeld geheugen: PID's van aanmaker/laatste-operatie --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "maker-PID"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "laatste-PID"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Gedeeld geheugen: segmenten --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "sleutel"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "bytes"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "gehecht"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "status"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "(geen)"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "doel"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "vergrendeld"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "deze kernel kent geen semaforen\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Semaforen: grenzen --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "maximum aantal arrays = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "maximum aantal semaforen per array = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "maximum aantal semaforen systeemwijd = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "maximum aantal operaties per semop()-aanroep = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "maximale semafoorwaarde = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Semaforen: status --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "gebruikte arrays = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "gereserveerde semaforen = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
-msgstr "------ Semaforen: arrayaanmakers/eigenaars --------\n"
+msgstr "------ Semaforen: arrayaanmakers/-eigenaars --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "sem-ID"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
-msgstr "------ Semaforen: operatie/wijzigingstijden --------\n"
+msgstr "------ Semaforen: operatie-/wijzigingstijden --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "laatste operatie"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "laatst gewijzigd"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Semaforen: arrays --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
-msgstr "kernel niet ingesteld voor berichtwachtrijen\n"
+msgstr "kernel is niet ingesteld voor berichtwachtrijen\n"
 
-#: sys-utils/ipcs.c:490
+#: sys-utils/ipcs.c:518
 #, c-format
-msgid "------ Messages: Limits --------\n"
+msgid "------ Messages Limits --------\n"
 msgstr "------ Berichten: grenzen --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "maximum aantal wachtrijen systeemwijd = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "maximumgrootte van bericht (bytes) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "standaard-maximumgrootte van wachtrij (bytes) = %d\n"
 
-#: sys-utils/ipcs.c:497
+#: sys-utils/ipcs.c:525
 #, c-format
-msgid "------ Messages: Status --------\n"
+msgid "------ Messages Status --------\n"
 msgstr "------ Berichten: status --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "gereserveerde wachtrijen = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "gebruikte koppen = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "gebruikte ruimte = %d bytes\n"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:532
 #, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ Berichtwachtrijen: aanmakers/eigenaars --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msq-ID"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
-msgstr "------ Berichtwachtrijen: verzend/ontvang/wijzigingstijden --------\n"
+msgstr ""
+"------ Berichtwachtrijen: verzend-/ontvang/-wijzigingstijden --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "verzending"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "ontvangst"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "wijziging"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ Berichtwachtrijen: PID's --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "la.ze.PID"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "la.ov.PID"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Berichtwachtrijen --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "gebruikt"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "berichten"
 
-#: sys-utils/ipcs.c:589
-#, fuzzy
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
-msgstr "fsync() is mislukt"
+msgstr "shmctl() is mislukt"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10792,78 +11311,76 @@ msgstr ""
 "\n"
 "Gedeeld geheugensegment met shm-ID=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr "UID=%d  GID=%d,  maker-UID=%d\t  maker-GID=%d\n"
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "modus=%#o  toegangsrechten=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld  laatste-PID=%d  maker-PID=%d  aanhechtingen=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "aanhechttijd   = %-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "onthechttijd   = %-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "wijzigingstijd = %-26.24s\n"
 
-#: sys-utils/ipcs.c:615
-#, fuzzy
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
-msgstr "fsync() is mislukt"
+msgstr "msgctl() is mislukt"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
 "\n"
-"Berichtwachtrij met msq-ID=%d\n"
+"Berichtenwachtrij met msq-ID=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "UID=%d  GID=%d,  maker-UID=%d  maker-GID=%d,  modus=%#o\n"
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr ""
 "gebruikte bytes=%ld  wachtrijbytes=%ld  aantal berichten=%ld\n"
 "laatste-zender-PID=%d  laatste-ontvanger-PID=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "verzendtijd   = %-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "ontvangsttijd = %-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
-#, fuzzy
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
-msgstr "'seek' is mislukt"
+msgstr "semctl() is mislukt"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10872,61 +11389,67 @@ msgstr ""
 "\n"
 "Semafoorarray met sem-ID=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 msgstr "UID=%d  GID=%d,  maker-UID=%d  maker-GID=%d\n"
 
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "modus=%#o, toegangsrechten=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "aantal semaforen = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "laatste operatietijd   = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "laatste wijzigingstijd = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "waarde"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "PID"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, c-format
+msgid "invalid iflag: %s"
+msgstr "ongeldige invoervlag: %s"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
-"Gebruik:  %s [-dhV78neo12] [-s <snelheid>] <lijnprotocol> <apparaat>\n"
+"Gebruik:  %s [-dhV78neo12] [-s <snelheid>] [-i [-]<invoervlag>]\n"
+"                  <lijnprotocol> <apparaat>\n"
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10934,96 +11457,111 @@ msgstr ""
 "\n"
 "Mogelijke lijnprotocollen zijn:\n"
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+"\n"
+"Mogelijke invoervlaggen zijn:\n"
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "ongeldige snelheid: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
-msgstr "ldattach (%s)\n"
+msgstr "'ldattach' uit %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "ongeldige optie"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "ongeldig lijnprotocol: %s"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s is geen seriële lijn"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan terminaleigenschappen van %s niet bepalen"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr "snelheid %d is niet mogelijk"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan terminaleigenschappen van %s niet instellen"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr "kan lijnprotocol niet instellen"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
-msgstr "kan er geen achtergrondservice van maken"
+msgstr "kan er geen achtergronddienst van maken"
 
-#: sys-utils/lscpu.c:64
-#, fuzzy
+#: sys-utils/lscpu.c:54
 msgid "none"
 msgstr "geen"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
-msgstr ""
+msgstr "semi"
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
-msgstr ""
+msgstr "compleet"
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, fuzzy, c-format
-msgid "error: %s"
-msgstr "Fout in reguliere expressie: "
+#: sys-utils/lscpu.c:158
+#, c-format
+msgid "error: cannot open %s"
+msgstr "fout: kan %s niet openen"
 
-#: sys-utils/lscpu.c:162
-#, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "fout bij lezen van %s\n"
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
+#, c-format
+msgid "failed to read: %s"
+msgstr "lezen van %s is mislukt"
 
-#: sys-utils/lscpu.c:184
-#, fuzzy
+#: sys-utils/lscpu.c:209
+#, c-format
+msgid "parse error: %s"
+msgstr "ontledingsfout: %s"
+
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
-msgstr "schrijven naar standaarduitvoer is mislukt"
+msgstr "fout: strdup() is mislukt"
 
-#: sys-utils/lscpu.c:267
-#, fuzzy
-msgid "error: uname failed"
-msgstr "fout: kan UUID niet ontleden"
+#: sys-utils/lscpu.c:260
+msgid "failed to callocate cpu set"
+msgstr "reserveren van geheugen voor processorenset is mislukt"
 
-#: sys-utils/lscpu.c:506
-#, fuzzy
-msgid "error: malloc failed"
-msgstr "malloc() is mislukt"
+#: sys-utils/lscpu.c:263
+#, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "ontleden van processorenmasker %s is mislukt"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
+#: sys-utils/lscpu.c:318
+msgid "error: uname failed"
+msgstr "fout: uname() is mislukt"
 
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+msgid "error: calloc failed"
+msgstr "fout: calloc() is mislukt"
+
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11031,71 +11569,88 @@ msgid ""
 "# starting from zero.\n"
 "# CPU,Core,Socket,Node"
 msgstr ""
+"# Hieronder volgt de ontleedbare uitvoer die als invoer voor\n"
+"# andere programma's gebruikt kan worden.  Elk verschillend\n"
+"# item in elke kolom heeft een uniek ID, beginnend bij nul.\n"
+"# CPU,kern,voet,node"
+
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr "Architectuur:"
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
-msgstr ""
+msgstr "CPU-modus(sen):"
+
+#: sys-utils/lscpu.c:759
+#, fuzzy
+msgid "CPU(s):"
+msgstr "CPU-voet(en):"
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
-msgstr ""
+msgstr "Draden per kern:"
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
-msgstr ""
+msgstr "Kern(en) per voet:"
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
-msgstr ""
+msgstr "CPU-voet(en):"
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
-msgstr ""
+msgstr "NUMA-node(s):"
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
-msgstr ""
+msgstr "Producent-ID:"
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
-msgstr ""
+msgstr "CPU-familie:"
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
-msgstr ""
+msgstr "Model:"
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
-msgstr ""
+msgstr "Stepping:"
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
-msgstr ""
+msgstr "CPU-frequentie (MHz):"
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
-#, fuzzy
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
-msgstr "Oude situatie:\n"
+msgstr "Virtualisatie:"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
-msgstr ""
+msgstr "Hypervisorproducent:"
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
-msgstr ""
+msgstr "Virtualisatiesoort:"
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
-msgstr ""
+msgstr "%s-cache:"
+
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "NUMA-node%d CPU('s):"
 
-#: sys-utils/lscpu.c:666
-#, fuzzy, c-format
+#: sys-utils/lscpu.c:816
+#, c-format
 msgid "Usage: %s [option]\n"
-msgstr "Gebruik:  %s [opties] apparaat ...\n"
+msgstr "Gebruik:  %s [optie]\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11103,71 +11658,11 @@ msgid ""
 "  -p, --parse    print out in parsable instead of printable format.\n"
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
-
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "fout bij wijzigen van modus van %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"Gebruik:  rdev [ -rv ] [ -o PLAATS ] [ AFBEELDING [ WAARDE [ PLAATS ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (of rdev /linux, enz.)  huidig ROOT-apparaat tonen"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         ROOT instellen op /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              ROOTFLAGS instellen (alleen-lezenstatus)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            RAMDISK-grootte instellen"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              VIDEOMODUS bij opstarten instellen"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   de byteplaats N gebruiken"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   is hetzelfde als rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     is hetzelfde als rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     is hetzelfde als rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Opmerking: videomodi zijn: -3=vragen, -2=uitgebreid, -1=gewoon,\n"
-"                           1=sleutel1, 2=sleutel2, ..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"Gebruik '-R 1' om root als alleen-lezen aan te koppelen,\n"
-"     of '-R 0' voor lezen-en-schrijven."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "komma ontbreekt"
+"Toont informatie over de processorarchitectuur.\n"
+"\n"
+"  -h, --help          deze hulptekst tonen\n"
+"  -p, --parse         ontleedbare i.p.v. leesbare uitvoer produceren\n"
+"  -s, --sysroot MAP   deze MAP als hoofdmap gebruiken\n"
 
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
@@ -11215,7 +11710,7 @@ msgstr "readprofile: fout bij schrijven van %s: %s\n"
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 "Omgekeerde byte-volgorde wordt aangenomen.\n"
-"Gebruik '-n' om de werkelijke byte-volgorde te gebruiken.\n"
+"Gebruik '-n' om de normale byte-volgorde te gebruiken.\n"
 
 #: sys-utils/readprofile.c:284
 #, c-format
@@ -11242,7 +11737,7 @@ msgid "total"
 msgstr "totaal"
 
 #: sys-utils/renice.c:53
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Usage:\n"
@@ -11255,9 +11750,9 @@ msgid ""
 msgstr ""
 "\n"
 "Gebruik:\n"
-"  renice priority [-p|--pid] PID...\n"
-"  renice priority  -g|--pgrp PGID...\n"
-"  renice priority  -u|--user gebruiker...\n"
+"  renice [-n] prioriteit [-p|--pid] PID...\n"
+"  renice [-n] prioriteit  -g|--pgrp PGID...\n"
+"  renice [-n] prioriteit  -u|--user gebruiker...\n"
 "  renice -h | --help\n"
 "  renice -v | --version\n"
 "\n"
@@ -11265,7 +11760,7 @@ msgstr ""
 #: sys-utils/renice.c:89
 #, c-format
 msgid "renice from %s\n"
-msgstr "renice (%s)\n"
+msgstr "'renice' uit %s\n"
 
 #: sys-utils/renice.c:126
 #, c-format
@@ -11290,11 +11785,12 @@ msgstr "setpriority()"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: oude prioriteit is %d, nieuwe prioriteit is %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11307,111 +11803,139 @@ msgstr ""
 "\n"
 "    -d | --device <apparaat>   te gebruiken hardwarklok (rtc0|rtc1|...)\n"
 "    -l | --local               de hardwareklok bevat lokale tijd\n"
-"    -m | --mode                slaapmodus (standby|mem|...)\n"
+"    -m | --mode <modus>        slaapmodus (waarden: standby|mem|disk|...\n"
+"                                 oftewel: wachtstand,pauzestand,"
+"slaapstand,...)\n"
+"    -n | --dry-run             alles doen behalve gaan slapen\n"
 "    -s | --seconds <seconden>  aantal te slapen seconden\n"
 "    -t | --time <tijdstip>     ontwakingstijdstip\n"
 "    -u | --utc                 de hardwareklok bevat UTC\n"
 "    -v | --verbose             gedetailleerde uitvoer produceren\n"
 "    -V | --version             programmaversie tonen\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "lezen van hardwareklok"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "lezen van systeemtijd"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "omzetten van hardwarekloktijd"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "zetten van de wekker"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
-msgstr "aanzetten van de wekker"
+msgstr "inschakelen van de wekker"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr "zetten van de wekker"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr "%s: onbekende slaaptoestand '%s'\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: ongeldig interval: %s seconden\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: ongeldige waarde %s voor ontwakingstijdstip\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: versie %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: aangenomen wordt dat de hardwareklok UTC bevat...\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "UTC wordt gebruikt.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "Lokale tijd wordt gebruikt.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: u dient een wektijd op te geven, via '-s' of '-t'\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: wekgebeurtenissen voor %s zijn niet ingeschakeld\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "wektijdstip %ld, systeemtijd %ld, hardwarekloktijd %ld, seconden %u\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr "%s: tijd loopt niet achteruit naar %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s: ontwaking uit '%s' via %s op %s\n"
 
-#: sys-utils/rtcwake.c:487
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr "slaapmodus: nee -- gestopt\n"
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr "slaapmodus: uit -- uitvoeren van %s\n"
+
+#: sys-utils/rtcwake.c:503
+#, c-format
 msgid "%s: unable to execute %s: %s\n"
-msgstr "%s: kan %s niet herlabelen naar %s: %s\n"
+msgstr "%s: kan '%s' niet uitvoeren: %s\n"
+
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr "slaapmodus: aan -- lezen van hardwareklok\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "lezen van hardwareklok"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr "slaapmodus: uitgeschakeld -- wekker wordt uitgeschakeld\n"
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr "slaapmodus: %s -- de computer gaat slapen\n"
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr "uitschakelen van hardwareklok-interrupt"
 
@@ -11527,6 +12051,10 @@ msgstr "%s: ongeldige waarde\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s is geen printerapparaat\n"
 
+#: sys-utils/tunelp.c:259
+msgid "LPGETSTATUS error"
+msgstr "ioctl(LPGETSTATUS) is mislukt"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11557,6 +12085,10 @@ msgstr ", staat aan"
 msgid ", error"
 msgstr ", fout"
 
+#: sys-utils/tunelp.c:274
+msgid "tunelp: ioctl failed"
+msgstr "tunelp: ioctl() is mislukt"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "ioctl(LPGETIRQ) is mislukt"
@@ -11572,9 +12104,9 @@ msgid "%s using polling\n"
 msgstr "%s wordt actief gepolst\n"
 
 #: sys-utils/unshare.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [options] <program> [args...]\n"
-msgstr "Gebruik:  %s programma [argument ...]\n"
+msgstr "Gebruik:  %s [optie...] <programma> [argument...]\n"
 
 #: sys-utils/unshare.c:60
 msgid ""
@@ -11586,25 +12118,40 @@ msgid ""
 "  -i, --ipc         unshare System V IPC namespace\n"
 "  -n, --net         unshare network namespace\n"
 msgstr ""
+"Voert een programma uit met sommige naamsruimten ontkoppeld van "
+"moederproces.\n"
+"\n"
+"  -h, --help     deze hulptekst tonen\n"
+"  -i, --ipc      'System V IPC'-naamsruimte niet delen\n"
+"  -m, --mount    aankoppelingennaamsruimte niet delen\n"
+"  -n, --net      netwerknaamsruimte niet delen\n"
+"  -u, --uts      UTS-naamsruimte niet delen (hostnaam en dergelijke)\n"
 
 #: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
 "\n"
-"Voor meer informatie zie setarch(8).\n"
+"Voor meer informatie zie unshare(1).\n"
 
 #: sys-utils/unshare.c:114
-#, fuzzy
 msgid "unshare failed"
-msgstr "'seek' is mislukt"
+msgstr "ushare() is mislukt"
 
 #: sys-utils/unshare.c:118
-#, fuzzy, c-format
+msgid "cannot set group id"
+msgstr "kan groeps-ID niet instellen"
+
+#: sys-utils/unshare.c:121
+msgid "cannot set user id"
+msgstr "kan gebruikers-ID niet instellen"
+
+#: sys-utils/unshare.c:125
+#, c-format
 msgid "exec %s failed"
-msgstr "uitvoeren is mislukt\n"
+msgstr "uitvoeren van '%s' is mislukt"
 
 #: text-utils/col.c:154
 #, c-format
@@ -11637,7 +12184,7 @@ msgstr "-- regel is al doorgespoeld"
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "Gebruik:  %s [ - ] [ -2 ] [ bestand ... ]\n"
+msgstr "Gebruik:  %s [-] [-2] [BESTAND...]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
@@ -11673,9 +12220,9 @@ msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "Gebruik:  %s [-cdflpsu] [+regelnummer | +/patroon] naam1 naam2 ...\n"
 
 #: text-utils/more.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "failed to initialize line buffer\n"
-msgstr "Reserveren van buffer is mislukt\n"
+msgstr "initialiseren van regelbuffer is mislukt\n"
 
 #: text-utils/more.c:485
 #, c-format
@@ -11761,8 +12308,8 @@ msgid ""
 msgstr ""
 "\n"
 "Aan de meeste opdrachten kan een geheel getal (k) voorafgaan.\n"
-"De standaardwaarde staat tussen haken.  Een ster (*) geeft aan\n"
-"dat de waarde k de nieuwe standaardinstelling wordt.\n"
+"De standaardwaarde staat tussen rechte haken.  Een ster (*)\n"
+"geeft aan dat de gegeven k de nieuwe standaardwaarde wordt.\n"
 
 #: text-utils/more.c:1335
 msgid ""
@@ -11786,27 +12333,25 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
-"<spatie>                De volgende k regels tonen  [huidige schermgrootte]\n"
-"z                       De volgende k regels tonen  [huidige schermgrootte]"
-"*\n"
-"<enter>                 De volgende k regels tonen  [1]*\n"
-"d of ctrl-D             De tekst k regels scrollen  [11]*\n"
-"q of Q of <interrupt>   Afsluiten\n"
-"s                       Een scherm verder en k regels overslaan  [1]\n"
-"f                       Een scherm verder en k schermen overslaan  [1]\n"
-"b of ctrl-B             Een scherm terug en k schermen overslaan  [1]\n"
-"=                       Huidige regelnummer tonen\n"
-"/<reguliere expressie>  De k-de overeenkomst van deze expressie zoeken  [1]\n"
-"n                       De k-de overeenkomst van vorige expressie zoeken  "
-"[1]\n"
-"'                       Terug naar waar de vorige zoekopdracht startte\n"
-"!<cmd> of :!<cmd>       De opdracht <cmd> in een subshell uitvoeren\n"
-"v                       Editor starten (beginnend op de huidige regel)\n"
-"ctrl-L                  Het scherm verversen (opnieuw tekenen)\n"
-":n                      Naar het k-de volgende bestand  [1]\n"
-":p                      Naar het k-de vorige bestand  [1]\n"
-":f                      Huidige bestandsnaam en regelnummer tonen\n"
-".                       De vorige opdracht herhalen\n"
+"<spatie>            De volgende k regels tonen  [huidige schermgrootte]\n"
+"z                   De volgende k regels tonen  [huidige schermgrootte]*\n"
+"<enter>             De volgende k regels tonen  [1]*\n"
+"d of ctrl-D         De tekst k regels scrollen  [11]*\n"
+"q of Q of ctrl-C    Afsluiten\n"
+"s                   Een scherm verder en k regels overslaan  [1]\n"
+"f                   Een scherm verder en k schermen overslaan  [1]\n"
+"b of ctrl-B         Een scherm terug en k schermen overslaan  [1]\n"
+"=                   Huidige regelnummer tonen\n"
+"/<reguliere exp.>   De k-de overeenkomst van deze expressie zoeken  [1]\n"
+"n                   De k-de overeenkomst van vorige expressie zoeken  [1]\n"
+"'                   Terug naar waar de vorige zoekopdracht startte\n"
+"!<cmd> of :!<cmd>   De opdracht <cmd> in een sub-shell uitvoeren\n"
+"v                   Editor starten (beginnend op de huidige regel)\n"
+"ctrl-L              Het scherm verversen (opnieuw tekenen)\n"
+":n                  Naar het k-de volgende bestand  [1]\n"
+":p                  Naar het k-de vorige bestand  [1]\n"
+":f                  Huidige bestandsnaam en regelnummer tonen\n"
+".                   De vorige opdracht herhalen\n"
 
 #: text-utils/more.c:1404 text-utils/more.c:1409
 #, c-format
@@ -11902,17 +12447,17 @@ msgstr "hexdump: regel is te lang\n"
 #: text-utils/parse.c:401
 #, c-format
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr "hexdump: byteaantal met meerdere conversietekens\n"
+msgstr "hexdump: byte-aantal met meerdere conversietekens\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr "hexdump: ongeldig byteaantal voor conversieteken %s\n"
+msgstr "hexdump: ongeldig byte-aantal voor conversieteken %s\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr "hexdump: %%s vereist een precisie of een byteaantal\n"
+msgstr "hexdump: %%s vereist een precisie of een byte-aantal\n"
 
 #: text-utils/parse.c:496
 #, c-format
@@ -11953,9 +12498,8 @@ msgid ""
 msgstr ""
 
 #: text-utils/pg.c:223
-#, fuzzy
 msgid "Out of memory\n"
-msgstr "Onvoldoende geheugen beschikbaar"
+msgstr "Onvoldoende geheugen beschikbaar\n"
 
 #: text-utils/pg.c:236
 #, c-format
@@ -11989,7 +12533,7 @@ msgstr "Geen volgend bestand"
 
 #: text-utils/pg.c:398
 msgid "No previous file"
-msgstr "Geen vorig bestand"
+msgstr "Geen voorgaand bestand"
 
 #: text-utils/pg.c:931
 #, c-format
@@ -12055,7 +12599,7 @@ msgstr "Gebruik:  rev [bestand ...]\n"
 #: text-utils/tailf.c:58 text-utils/tailf.c:93
 #, c-format
 msgid "cannot open \"%s\" for read"
-msgstr "Kan '%s' niet openen voor lezen"
+msgstr "kan '%s' niet openen voor lezen"
 
 #: text-utils/tailf.c:96 text-utils/tailf.c:215
 #, c-format
@@ -12063,24 +12607,24 @@ msgid "cannot stat \"%s\""
 msgstr "kan status van '%s' niet opvragen"
 
 #: text-utils/tailf.c:109
-#, fuzzy, c-format
+#, c-format
 msgid "incomplete write to \"%s\" (written %zd, expected %zd)\n"
-msgstr "onvolledige schrijfoperatie naar '%s' (%ld geschreven, %ld verwacht)\n"
+msgstr "onvolledige schrijfoperatie naar '%s' (%zd geschreven, %zd verwacht)\n"
 
 #: text-utils/tailf.c:147
 #, c-format
 msgid "%s: cannot add inotify watch (limit of inotify watches was reached)."
-msgstr ""
+msgstr "%s: kan geen 'inotify'-wachter toevoegen (maximum aantal is bereikt)"
 
 #: text-utils/tailf.c:151
 #, c-format
 msgid "%s: cannot add inotify watch."
-msgstr ""
+msgstr "%s: kan geen 'inotify'-wachter toevoegen"
 
 #: text-utils/tailf.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot read inotify events"
-msgstr "%s: kan %s niet openen\n"
+msgstr "%s: kan geen 'inotify'-gebeurtenissen lezen"
 
 #: text-utils/tailf.c:199 text-utils/tailf.c:203
 msgid "invalid number of lines"
@@ -12120,32 +12664,171 @@ msgstr "Invoerregel is te lang\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Onvoldoende geheugen beschikbaar tijdens groeien van buffer\n"
 
-#, fuzzy
-#~ msgid "out if memory"
-#~ msgstr "onvoldoende geheugen beschikbaar"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ongeldige optie -- %c\n"
 
-#~ msgid "# partition table of %s\n"
-#~ msgstr "# Partitietabel van %s\n"
+#~ msgid "segments allocated %d\n"
+#~ msgstr "gereserveerde segmenten =  %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "gereserveerde pagina's = %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "pagina's in geheugen = %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "pagina's in wisselgeheugen = %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Wisselgeheugenprestaties: %ld pogingen, %ld succesvol\n"
+
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "fout bij uitvoeren van programma: \"%s\"\n"
+
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "ongeldige positiewaarde '%s' opgegeven"
+
+# Met een hoofdletter want komt aan begin van zin, en voor "beleid" of "prioriteit".
+#~ msgid "current"
+#~ msgstr "Huidig(e)"
+
+# Met een hoofdletter want komt aan begin van zin, en voor "beleid" of "prioriteit".
+#~ msgid "new"
+#~ msgstr "Nieuw(e)"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: geen medium gevonden op %s; ... nieuwe poging\n"
+
+#~ msgid "execvp failed"
+#~ msgstr "execvp() is mislukt"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "Gebruik:  %s -asmq -tclup\n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "          %s [-s] [-m] [-q] -i ID\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "          %s -h  (voor hulp)\n"
 
 #~ msgid ""
-#~ "unit: sectors\n"
-#~ "\n"
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
 #~ msgstr ""
-#~ "eenheid: sectoren \n"
-#~ "\n"
+#~ "Bronnenkeuze:\n"
+#~ "    -m : gedeeld geheugen\n"
+#~ "    -q : berichten\n"
 
-#~ msgid " start=%9lu"
-#~ msgstr " begin=%9lu"
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "    -s : semaforen\n"
+#~ "    -a : alle (is standaard)\n"
 
-#~ msgid ", size=%9lu"
-#~ msgstr ", grootte=%9lu"
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Uitvoerindeling:\n"
+#~ "    -t : tijd\n"
+#~ "    -p : PID\n"
+#~ "    -c : aanmaker\n"
 
-#~ msgid ", bootable"
-#~ msgstr ", opstartbaar"
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "    -l : grenzen\n"
+#~ "    -u : samenvatting\n"
 
-#, fuzzy
-#~ msgid "Clock in UTC, not changed.\n"
-#~ msgstr "Shell is niet gewijzigd.\n"
+#~ msgid "error: %s"
+#~ msgstr "fout: %s"
+
+#~ msgid "error parse: %s"
+#~ msgstr "ontledingsfout: %s"
+
+#~ msgid "error: /sys filesystem is not accessable."
+#~ msgstr "fout: het /sys-bestandssysteem is ontoegankelijk"
+
+#~ msgid "error: change working directory to %s."
+#~ msgstr "fout: bij wijzigen van huidige werkmap naar %s"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr "Gebruik:  rdev [-rv] [-o PLAATS] [AFBEELDING [WAARDE [PLAATS]]]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr "  rdev /dev/fd0  (of rdev /linux, enz.)  huidig ROOT-apparaat tonen"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         ROOT instellen op /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              ROOTFLAGS instellen (alleen-lezenstatus)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            RAMDISK-grootte instellen"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr ""
+#~ "  rdev -v /dev/fd0 1              VIDEOMODUS bij opstarten instellen"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   de byteplaats N gebruiken"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   is hetzelfde als rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     is hetzelfde als rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     is hetzelfde als rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Opmerking: videomodi zijn: -3=vragen, -2=uitgebreid, -1=gewoon,\n"
+#~ "                           1=sleutel1, 2=sleutel2, ..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "Gebruik '-R 1' om root als alleen-lezen aan te koppelen,\n"
+#~ "     of '-R 0' voor lezen-en-schrijven."
+
+#~ msgid "missing comma"
+#~ msgstr "komma ontbreekt"
 
 #~ msgid "%s: error: label only with v1 swap area\n"
 #~ msgstr "%s: fout: label is alleen mogelijk bij versie-1-wisselgeheugen\n"
@@ -12166,6 +12849,82 @@ msgstr "Onvoldoende geheugen beschikbaar tijdens groeien van buffer\n"
 #~ "Als u echt versie-0-wisselgeheugen op dit apparaat wilt maken,\n"
 #~ "kunt u de optie '-f' gebruiken om het af te dwingen.\n"
 
+#~ 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 ""
+#~ "Gebruik:  fdisk [-b SECTORGROOTTE] [-u] APPARAAT       partitietabel "
+#~ "wijzigen\n"
+#~ "          fdisk -l [-b SECTORGROOTTE] [-u] APPARAAT    partitietabel "
+#~ "weergeven\n"
+#~ "          fdisk -s PARTITIE    partitiegrootte in blokken weergeven\n"
+#~ "          fdisk -v             programmaversie tonen\n"
+#~ "\n"
+#~ "Hier is APPARAAT zoiets als /dev/hda of /dev/sdb,\n"
+#~ "en PARTITIE zoiets als /dev/hda7 of /dev/sdb4.\n"
+#~ "\n"
+#~ "-u        Begin en Einde in sectoreenheden (in plaats van "
+#~ "cilindereenheden)\n"
+#~ "-b 2048   (voor sommige MO-schijven) 2048-byte sectoren gebruiken\n"
+
+#~ 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 ""
+#~ "Gebruik:  fdisk [-l] [-b SECTORGROOTTE] [-u] APPARAAT\n"
+#~ "\n"
+#~ "Bijvoorbeeld:  fdisk /dev/hda      (voor de eerste IDE-schijf)\n"
+#~ "          of:  fdisk /dev/sdc      (voor de derde SCSI-schijf)\n"
+#~ "          of:  fdisk /dev/edb      (voor de tweede PS/2-ESDI-schijf)\n"
+#~ "          of:  fdisk /dev/rd/c0d0  (voor RAID-apparaten)\n"
+#~ "          ...\n"
+
+#~ 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"
+#~ "Het aantal cilinders van deze schijf is ingesteld op %d.\n"
+#~ "Hier is niets mis mee, maar het is groter dan 1024 en kan\n"
+#~ "bij bepaalde instellingen problemen veroorzaken met:\n"
+#~ "1) opstartsoftware (bijvoorbeeld oude versies van LILO),\n"
+#~ "2) partitioneringssoftware van andere besturingssytemen\n"
+#~ "   (bijvoorbeeld DOS FDISK of OS/2 FDISK).\n"
+
+#~ msgid "# partition table of %s\n"
+#~ msgstr "# Partitietabel van %s\n"
+
+#~ msgid ""
+#~ "unit: sectors\n"
+#~ "\n"
+#~ msgstr ""
+#~ "eenheid: sectoren \n"
+#~ "\n"
+
+#~ msgid " start=%9lu"
+#~ msgstr " begin=%9lu"
+
+#~ msgid ", size=%9lu"
+#~ msgstr ", grootte=%9lu"
+
+#~ msgid ", bootable"
+#~ msgstr ", opstartbaar"
+
 #~ msgid "namei: unable to get current directory - %s\n"
 #~ msgstr "namei: bepalen van huidige map is mislukt -- %s\n"
 
diff --git a/po/pl.po b/po/pl.po
index 49243182..dc84be3d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the util-linux-ng package.
 # Andrzej Krzysztofowicz <ankry@mif.pg.gda.pl>, 2006.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2009.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2009-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.17-rc3\n"
+"Project-Id-Version: util-linux-ng 2.18-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
-"PO-Revision-Date: 2009-12-17 15:05+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
+"PO-Revision-Date: 2010-06-21 19:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -99,6 +99,11 @@ msgstr "ponowne odczytanie tablicy partycji"
 msgid "Usage:\n"
 msgstr "Sk�adnia:\n"
 
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid "  %s -V\n"
+msgstr "  %s -V\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -118,6 +123,17 @@ msgstr "Dost�pne polecenia:\n"
 msgid "get size in 512-byte sectors"
 msgstr "pobranie rozmiaru w sektorach 512-bajtowych"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -222,15 +238,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Sk�adnia: %s [ -n ] urz�dzenie\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -331,7 +338,7 @@ msgstr "nie mo�na sprawdzi� CRC: stary format cramfs"
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc nie powiod�o si�"
 
@@ -939,7 +946,7 @@ msgstr "nie mo�na wykona� stat na urz�dzeniu %s"
 msgid "%s is not a block special device"
 msgstr "%s nie jest specjalnym urz�dzeniem blokowym"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "nie mo�na otworzy� %s"
@@ -963,7 +970,7 @@ msgstr "za du�o i-w�z��w - maksimum to 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "za ma�o miejsca, potrzeba co najmniej %llu blok�w"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Urz�dzenie: %s\n"
@@ -1037,7 +1044,7 @@ msgstr "b��d zamykania %s"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Sk�adnia: mkfs [-V] [-t typfs] [opcje-fs] urz�dzenie [rozmiar]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1208,7 +1215,7 @@ msgstr "Sk�adnia: %s [-c | -l plik] [-nXX] [-iXX] /dev/nazwa [bloki]\n"
 #: disk-utils/mkfs.minix.c:178
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
-msgstr "%s jest podmontowany; odmowa utworzenia tam systemu plik�w!"
+msgstr "%s jest zamontowany; odmowa utworzenia tam systemu plik�w!"
 
 #: disk-utils/mkfs.minix.c:188
 msgid "seek to boot block failed in write_tables"
@@ -1273,7 +1280,7 @@ msgstr "przemieszczenie nie powiod�o si� podczas sprawdzania blok�w"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Dziwna warto�� w do_check: prawdopodobnie b��dy\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "przemieszczenie nie powiod�o si� w check_blocks"
 
@@ -1354,168 +1361,173 @@ msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "U�ycie podanego przez u�ytkownika rozmiaru strony %d zamiast systemowego %d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s: calloc() nie powiod�o si�: %s\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "B��dny rozmiar nag��wka obszaru wymiany, nie zapisano etykiety.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Etykieta zosta�a skr�cona.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "brak etykiety, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "brak uuida\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Sk�adnia: %s [-c] [-pROZMSTRONY] [-L etykieta] [-U UUID] /dev/nazwa [bloki]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "za du�o wadliwych stron"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Brak pami�ci"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "jedna wadliwa strona\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu wadliwych stron\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "nie uda�o si� przewin�� urz�dzenia swapa"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 msgid "unable to alloc new libblkid probe"
 msgstr "nie uda�o si� przydzieli� nowej sondy libblkid"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
+#: disk-utils/mkswap.c:400
+msgid "unable to assign device to libblkid probe"
 msgstr "nie uda�o si� przypisa� urz�dzenia do sondy libblkid"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 msgid "unable to erase bootbits sectors"
 msgstr "nie uda�o si� usun�� sektor�w rozruchowych"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s: %s: uwaga: nie usuni�to sektor�w rozruchowych\n"
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (wykryto tablic� partycji %s). "
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "        on whole disk. "
 msgstr "        na ca�ym dysku. "
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, c-format
 msgid "        (compiled without libblkid). "
 msgstr "        (zbudowano bez libblkid). "
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: uwaga: zignorowano -U (UUID-y nie s� obs�ugiwane przez %1$s)\n"
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: brak obs�ugi obszaru wymiany w wersji %d.\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "b��d: analiza UUID-a nie powiod�a si�"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: b��d: Nie ma gdzie utworzy� obszaru wymiany?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 "%s: b��d: rozmiar %llu KiB jest wi�kszy ni� rozmiar urz�dzenia %llu KiB\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: b��d: obszar wymiany musi mie� przynajmniej %ld KiB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: uwaga: zmniejszono rozmiar wymiany do %llu KiB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: b��d: odmowa utworzenia obszaru wymiany na '%s'\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
-msgstr "%s: b��d: %s jest podmontowany; odmowa utworzenia obszaru wymiany.\n"
+msgstr "%s: b��d: %s jest zamontowany; odmowa utworzenia obszaru wymiany.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Nie uda�o si� utworzy� obszaru wymiany: nieczytelny"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Tworzenie obszaru wymiany w wersji 1, rozmiar = %llu KiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: nie uda�o si� zapisa� strony sygnatury: %s"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync nie powi�d� si�"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: nie uda�o si� uzyska� etykiety pliku SELinuksa: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "matchpathcon() nie powiod�o si�"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "nie uda�o si� utworzyc nowego kontekstu SELinuksa"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "nie uda�o si� wyliczy� kontekstu SELinuksa"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: nie uda�o si� przeetykietowa� %s na %s: %s\n"
@@ -1582,63 +1594,117 @@ msgstr "raw%d:\tprzypisano do urz�dzenia major %d, minor %d\n"
 msgid "Error setting raw device (%s)\n"
 msgstr "B��d ustawiania urz�dzenia surowego (%s)\n"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Bezu�yteczne"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, c-format
+msgid "%s: unable to probe device"
+msgstr "%s: nie uda�o si� sprawdzi� urz�dzenia"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Wolne miejsce"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr "%s: niejednoznaczny wynik pr�by, prosz� u�y� wipefs(8)"
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: nie jest poprawn� partycj� wymiany"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: nieobs�ugiwana wersja obszaru wymiany '%s'"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, c-format
+msgid "%s: failed to open"
+msgstr "%s: nie uda�o si� otworzy�"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, c-format
+msgid "failed to parse UUID: %s"
+msgstr "nie uda�o si� przeanalizowa� UUID-a: %s"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: nie uda�o si� zmieni� po�o�enia na UUID obszaru wymiany"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: nie uda�o si� zapisa� UUID-a"
+
+#: disk-utils/swaplabel.c:136
+#, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: nie uda�o si� zmieni� po�o�enia na etykiet� obszaru wymiany "
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr "etykieta jest zbyt d�uga. Obci�to do '%s'"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:146
+#, c-format
+msgid "%s: failed to write label"
+msgstr "%s: nie uda�o si� zapisa� etykiety"
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sk�adnia: %s [opcje] <urz�dzenie>\n"
+"\n"
+"Opcje:\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+" -h, --help              ten opis\n"
+" -L, --label <etykieta>  okre�lenie nowej etykiety\n"
+" -U, --uuid <uuid>       okre�lenie nowego UUID-a\n"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:169
+#, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Wi�cej informacji w swaplabel(8).\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr "zignorowano -U (UUID-y nie s� obs�ugiwane przez)"
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Bezu�yteczne"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Wolne miejsce"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Dysk zosta� zmieniony.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Nale�y zrestartowa� system, aby zapewni� poprawne uaktualnienie tablicy "
 "partycji.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1651,230 +1717,230 @@ msgstr ""
 "jakiekolwiek partycje DOS 6.x, prosz� poszuka�\n"
 "dodatkowych informacji w manualu do cfdiska.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "B��D KRYTYCZNY"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Prosz� nacisn�� dowolny klawisz, aby zako�czy� cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Nie uda�o przemie�ci� si� po dysku"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Nie uda�o si� odczyta� dysku"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Nie uda�o si� zapisa� dysku"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Zbyt du�o partycji"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Partycja zaczyna si� przed sektorem 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Partycja ko�czy si� przed sektorem 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Partycja zaczyna si� za ko�cem dysku"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Partycja ko�czy si� za ko�cem dysku"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partycja ko�czy si� na ostatnim, cz�ciowym cylindrze"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "Partycje logiczne nie s� w kolejno�ci na dysku"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "Partycje logiczne zachodz� na siebie"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "Powi�kszone partycje logiczne zachodz� na siebie"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! B��d wewn�trzny przy tworzeniu partycji logicznej bez rozszerzonej !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Nie mo�na tu utworzy� nap�du logicznego - powsta�yby dwie partycje "
 "rozszerzone"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Za d�uga pozycja w menu, mo�e wygl�da� dziwnie."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menu bez kierunku, przyj�cie domy�lnego poziomego."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Niedozwolony klawisz"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Prosz� nacisn�� klawisz, aby kontynuowa�"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "G��wna"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Utworzenie nowe partycji g��wnej"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logiczna"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Utworzenie nowej partycji logicznej"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Bez tworzenia partycji"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! B��d wewn�trzny !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Rozmiar (w MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Pocz�tek"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Dodanie partycji na pocz�tku wolnego miejsca"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Koniec"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Dodanie partycji na ko�cu wolnego miejsca"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Brak miejsca na utworzenie partycji rozszerzonej"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Brak tablicy partycji.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Brak tablicy partycji. Rozpocz�cie od pustej tablicy."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "B��dna sygnatura tablicy partycji"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Nieznany typ tablicy partycji"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Czy zacz�� od pustej tablicy [t/N] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Podano wi�cej cylindr�w ni� mie�ci si� na dysku"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Nie mo�na otworzy� urz�dzenia dysku"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Otwarto dysk w trybie tylko do odczytu - brak prawa zapisu"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "Uwaga! Wykryto nieobs�ugiwan� tablic� GPT (GUID Partition Table). Nale�y "
 "u�y� GNU Parteda."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Nie mo�na pobra� rozmiaru dysku"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "B��dna partycja g��wna"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "B��dna partycja logiczna"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Uwaga! To mo�e zniszczy� dane na dysku!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr "Czy na pewno zapisa� na dysk tablic� partycji? (tak lub nie): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "nie"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Nie zapisano tablicy partycji"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "tak"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Prosz� wpisa� \"tak\" lub \"nie\""
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Zapisywanie tablicy partycji na dysku..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Zapisano tablic� partycji"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
@@ -1883,87 +1949,87 @@ msgstr ""
 "uruchomi� partprobe(8), kpartx(8) lub zrestartowa� system, aby uaktualni� "
 "tablic�."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "�adna z g��wnych partycji nie jest zaznaczona jako rozruchowa. DOS-owy MBR "
 "tego nie uruchomi."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Wi�cej ni� jedna g��wna partycja jest zaznaczona jako rozruchowa. DOS-owy "
 "MBR tego nie uruchomi."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 "Prosz� wprowadzi� nazw� pliku lub wcisn�� RETURN, aby wy�wietli� na ekranie: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Nie mo�na otworzy� pliku '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Urz�dzenie dysku: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Brak    "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   G�./Log."
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   G��wna  "
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logiczna"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Rozruch"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Brak"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tablica partycji dla %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "              Pierwszy    Ostatni\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1971,7 +2037,7 @@ msgstr ""
 " # Typ        sektor      sektor    Offset   D�ugo��    ID systemu plik�w   "
 "Flaga\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1979,466 +2045,466 @@ msgstr ""
 "-- -------- ----------- ----------- ------ ----------- -------------------- "
 "------\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         --Pocz�tkowe---      ----Ko�cowe----   Pierwszy   Liczba\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr " # Flagi G�ow.Sekt. Cyl.  ID  G�ow.Sekt. Cyl.    Sektor    sektor�w\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Surowy"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Wypisanie tablicy w surowym formacie danych"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektory"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Wypisanie tablicy w kolejno�ci sektor�w"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tablica"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Zwyk�e wypisanie tablicy partycji"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Bez wypisywania tablicy"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Ekran pomocy dla cfdiska"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "To jest cfdisk - oparty na curses program do partycjonowania dysku,"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "pozwalaj�cy tworzy�, usuwa� i modyfikowa� partycje na twardym"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "dysku."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin i aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Polecenie    Znaczenie"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "---------    ---------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Prze��czenie flagi rozruchu dla bie��cej partycji"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Usuni�cie bie��cej partycji"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Zmiana parametr�w cylindr�w, g�owic i sektor�w na �cie�ce"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             UWAGA: ta opcja powinna by� u�ywana tylko przez osoby"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             wiedz�ce co robi�."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Wy�wietlenie tego ekranu"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 "  m          Zmaksymalizowanie wykorzystania dysku przez bie��c� partycj�"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Uwaga: mo�e to spowodowa� niekompatybilno�� partycji"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             z DOS-em, OS/2 itp."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Utworzenie nowej partycji na wolnym miejscu"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Wypisanie tablicy partycji na ekranie lub do pliku"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Mo�na wybra� jeden z kilku r�nych format�w listy"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             partycji:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - surowe dane (w takiej postaci, jak na dysku)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - tablica w kolejno�ci sektor�w"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - tablica w formacie surowym"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Zako�czenie programu bez zapisu tablicy partycji"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Zmiana typu systemu plik�w"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Zmiana jednostek wy�wietlania rozmiaru partycji"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Prze��cza mi�dzy MB, sektorami i cylindrami"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Zapis tablicy partycji na dysk (musi by� wielkie W)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Poniewa� mo�e to zniszczy� dane na dysku, nale�y"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             potwierdzi� lub anulowa� zapis wpisuj�c \"tak\" lub"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             \"nie\""
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "G�ra         Przesuni�cie kursora na poprzedni� partycj�"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "D�          Przesuni�cie kursora na nast�pn� partycj�"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "Ctrl-L       Odrysowanie ekranu"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Wy�wietlenie tego ekranu"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Uwaga: wszystkie polecenia mog� by� uruchomione wielkimi lub ma�ymi"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "literami (z wyj�tkiem zapisu - W)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Zmiana liczby cylindr�w"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "G�owice"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Zmiana liczby g�owic"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Zmiana liczby sektor�w"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Koniec"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Zako�czenie zmian w geometrii"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Liczba cylindr�w: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Niedozwolona liczba cylindr�w"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Liczba g�owic: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Niedozwolona liczba g�owic"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Liczba sektor�w na �cie�ce: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Niedozwolona liczba sektor�w"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Typ systemu plik�w: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Nie mo�na zmieni� typu systemu plik�w na pusty"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Nie mo�na zmieni� typu systemu plik�w na partycj� rozszerzon�"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "???(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NK"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NK"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "G�/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Nieznany (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Urz�dzenie: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Rozmiar: %lld bajt�w, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Rozmiar: %lld bajt�w, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "G�owic: %d   Sektor�w na �cie�ce: %d   Cylindr�w: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nazwa"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Flagi"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Typ partycji"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "System plik�w"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Etykieta]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Sektor�w"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cylindr�w"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Rozmiar (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Rozmiar (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Rozruch"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Prze��czenie flagi rozruchu dla bie��cej partycji"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Usu�"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Usuni�cie bie��cej partycji"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Zmiana geometrii dysku (tylko dla ekspert�w)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Pomoc"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Wy�wietlenie ekranu pomocy"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maksymalizuj"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Zmaksymalizowanie wykorzystania dysku przez bie��c� partycj� (tylko dla "
 "ekspert�w)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nowa"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Utworzenie nowej partycji na wolnym miejscu"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Wypisz"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "Wypisanie tablicy partycji na ekranie lub do pliku"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Zako�cz"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Zako�czenie programu bez zapisu tablicy partycji"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Zmiana typu systemu plik�w (DOS, Linux, OS/2 itd.)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Jednostki"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Zmiana jednostek wy�wietlania rozmiaru partycji (MB, sekt., cyl.)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Zapisz"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Zapis tablicy partycji na dysk (mo�e to zniszczy� dane)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Nie mo�na uczyni� tej partycji rozruchow�"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Nie mo�na usun�� pustej partycji"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Nie mo�na zmaksymalizowa� tej partycji"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Ta partycja jest bezu�yteczna"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Ta partycja ju� jest u�ywana"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Nie mo�na zmieni� typu pustej partycji"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Nie ma wi�cej partycji"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Niedozwolone polecenie"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2002 Kevin E. Martin i aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2511,9 +2577,9 @@ msgstr ""
 "\n"
 "Etykieta BSD dla urz�dzenia: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Polecenie"
 
@@ -2533,9 +2599,9 @@ msgstr "   i   zainstalowanie kodu rozruchowego"
 msgid "   l   list known filesystem types"
 msgstr "   l   wypisanie znanych typ�w system�w plik�w"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   wy�wietlenie tego menu"
 
@@ -2547,14 +2613,14 @@ msgstr "   n   dodanie nowej partycji BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   wypisanie tablicy partycji BSD"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   zako�czenie bez zapisywania zmian"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   powr�t do g��wnego menu"
 
@@ -2597,13 +2663,13 @@ msgstr "Na %s nie ma partycji *BSD.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Polecenie dla etykiety dysku BSD (m wy�wietla pomoc): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Pierwszy %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Ostatni %s albo +rozmiar, +rozmiarM lub +rozmiarK"
@@ -2748,7 +2814,7 @@ msgstr "sektor�w/�cie�k�"
 msgid "tracks/cylinder"
 msgstr "�cie�ek/cylinder"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cylindr�w"
@@ -2806,7 +2872,7 @@ msgstr "Zainstalowano kod rozruchowy na %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partycja (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Utworzono ju� maksymaln� liczb� partycji\n"
@@ -2830,225 +2896,223 @@ msgstr ""
 "\n"
 "Synchronizacja dysk�w.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Sk�adnia: fdisk [-b RSEKT] [-u] DYSK     Zmiana tablicy partycji\n"
-"          fdisk -l [-b RSEKT] [-u] DYSK  Wypisanie tablicy partycji\n"
-"          fdisk -s PARTYCJA              Podanie rozmiaru partycji w "
-"blokach\n"
-"          fdisk -v                       Podanie wersji fdiska\n"
-"Tutaj DYSK to co� w rodzaju /dev/hdb lub /dev/sda,\n"
-"natomiast PARTYCJA to co� w rodzaju /dev/hda7\n"
-"-u: podanie pocz�tku i ko�ca w sektorach (zamiast cylindrach)\n"
-"-b 2048 (dla niekt�rych dysk�w MO): u�ycie sektor�w 2048-bajtowych\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Sk�adnia: fdisk [-l] [-b RSEKT] [-u] urz�dzenie\n"
-"Np.: fdisk /dev/hda  (dla pierwszego dysku IDE)\n"
-"lub: fdisk /dev/sdc  (dla trzeciego dysku SCSI)\n"
-"lub: fdisk /dev/eda  (dla pierwszego dysku PS/2 ESDI)\n"
-"lub: fdisk /dev/rd/c0d0  lub fdisk /dev/ida/c0d0 (dla urz�dze� RAID)\n"
-" ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+"Sk�adnia:\n"
+" fdisk [opcje] <dysk>     zmiana tablicy partycji\n"
+" fdisk [opcje] -l <dysk>  wypisanie tablic(y) partycji\n"
+" fdisk -s <partycja>      podanie rozmiaru partycji w blokach\n"
+"\n"
+"Opcje:\n"
+" -b <rozmiar>             rozmiar bloku (512, 1024, 2048 lub 4096)\n"
+" -c[=<tryb>]              tryb kompatybilno�ci: 'dos' lub "
+"'nondos' (domy�lny)\n"
+" -h                       wy�wietlenie opisu\n"
+" -u[=<jednostka>]         jednostki wy�w.: 'cylinders' lub "
+"'sectors' (domy�lne)\n"
+" -v                       wy�wietlenie wersji\n"
+" -C <liczba>              podanie liczby cylindr�w\n"
+" -H <liczba>              podanie liczby g�owic\n"
+" -S <liczba>              podanie liczby sektor�w na �cie�ce\n"
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Nie mo�na otworzy� %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Nie mo�na odczyta� %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Nie mo�na zmieni� pozycji na %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Nie mo�na zapisa� %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE nie powi�d� si� na %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Nie mo�na przydzieli� wi�cej pami�ci\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "B��d krytyczny\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   zmiana flagi tylko do odczytu"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   modyfikacja etykiety dysku BSD"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   zmiana flagi montowalno�ci"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   usuni�cie partycji"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   wypisanie znanych typ�w partycji"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   dodanie nowej partycji"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   utworzenie nowej, pustej DOS-owej tablicy partycji"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   wypisanie tablicy partycji"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   utworzenie nowej, pustej etykiety dysku Suna"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   zmiana ID systemu partycji"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   zmiana jednostek wy�wietlania/wprowadzania"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   weryfikacja tablicy partycji"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   zapis tablicy partycji na dysk i zako�czenie"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   dodatkowe funkcje (tylko dla ekspert�w)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   wyb�r partycji rozruchowej"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   edycja wpisu pliku rozruchowego"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   wyb�r partycji wymiany SGI"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   zmiana flagi rozruchu"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   zmiana flagi kompatybilno�ci z DOS-em"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   zmiana liczby zmiennych cylindr�w"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   zmiana liczby cylindr�w"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   wypisanie surowych danych tablicy partycji"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   zmiana liczby dodatkowych sektor�w na cylinder"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   zmiana liczby g�owic"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   zmiana wsp�czynnika przeplotu"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   zmiana pr�dko�ci obrotowej (obr./min)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   zmiana liczby sektor�w na �cie�k�"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   zmiana liczby fizycznych cylindr�w"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   przesuni�cie pocz�tku danych na partycji"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   wypisanie partycji rozszerzonych"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   utworzenie tablicy partycji typu IRIX (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   poprawienie kolejno�ci partycji"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i   zmiana identyfikatora dysku"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Trzeba wprowadzi� liczb�"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "g�owic"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektor�w"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3057,30 +3121,11 @@ msgstr ""
 "%s%s.\n"
 "Mo�na to zrobi� z poziomu menu funkcji dodatkowych.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " oraz "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Liczba cylindr�w dla tego dysku jest ustawiona na %d.\n"
-"Nie ma w tym nic z�ego, ale jest to wi�cej ni� 1024,\n"
-"i mo�e w pewnych konfiguracjach sprawia� problemy z:\n"
-"1) programami rozruchowymi (np. starymi wersjami LILO)\n"
-"2) programami rozruchowymi i partycjonuj�cymi z innych system�w\n"
-"   operacyjnych (np. fdisk z DOS-a lub OS/2)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3097,38 +3142,49 @@ msgstr ""
 "Nale�y u�y� parted(1)a i formatu tablicy partycji GUID (GPT).\n"
 "\n"
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
+"\n"
+"Urz�dzenie przedstawia logiczny rozmiar sektora mniejszy od rozmiaru\n"
+"fizycznego. Zaleca si� wyr�wnanie do granicy sektora fizycznego\n"
+"(lub optymalnego dla we/wy), w przeciwnym wypadku mo�e to wp�yn��\n"
+"na wydajno��.\n"
+"\n"
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
+"\n"
+"UWAGA: tryb kompatybilno�ci z DOS-em jest przestarza�y. Zdecydowanie\n"
+"       zaleca si� wy��czy� ten tryb (polecenie 'c')."
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
+"\n"
+"UWAGA: cylindry jako jednostki wy�wietlania s� przestarza�e. Lepiej\n"
+"       u�y� polecenia 'u', aby zmieni� jednostki na sektory.\n"
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "B��dny offset w g��wnej partycji rozszerzonej\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3137,32 +3193,32 @@ msgstr ""
 "Uwaga: pomini�to partycje po #%d.\n"
 "B�d� usuni�te, je�li tablica partycji zostanie zapisana.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Uwaga: nadmiarowy wska�nik ��cz�cy w tablicy partycji %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Uwaga: zignorowano nadmiarowe dane w tablicy partycji %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "pomini�to pust� partycj� (%d)\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Identyfikator dysku: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Nowy identyfikator dysku (bie��cy 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3174,26 +3230,17 @@ msgstr ""
 "Zmiany pozostan� tylko w pami�ci do chwili ich zapisania.\n"
 "Potem, oczywi�cie, poprzednia zawarto�� b�dzie nie do odzyskania.\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Uwaga: rozmiar sektora to %d (nie %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Nie b�dzie mo�na zapisa� tablicy partycji.\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3202,7 +3249,7 @@ msgstr ""
 "Ten dysk ma znaczniki magiczne zar�wno DOS-a, jak i BSD.\n"
 "Polecenie 'b' prze��czy w tryb BSD.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3211,17 +3258,17 @@ msgstr ""
 "Urz�dzenie nie zawiera poprawnej DOS-owej tablicy partycji ani etykiety "
 "dysku Sun, SGI ani OSF\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "B��d wewn�trzny\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Zignorowano nadmiarow� partycj� rozszerzon� %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3230,7 +3277,7 @@ msgstr ""
 "Uwaga: niepoprawna flaga 0x%04x tablicy partycji %d b�dzie poprawiona przy "
 "zapisie (w)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3239,21 +3286,21 @@ msgstr ""
 "\n"
 "trzy razy otrzymano EOF - zako�czenie...\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Kod szesnastkowy (L wy�wietla list�): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, domy�lnie %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "Nieobs�ugiwany przyrostek: '%s'.\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3262,74 +3309,80 @@ msgstr ""
 "Obs�ugiwane: 10^N: KB (kilobajty), MB (megabajty), GB (gigabajty)\n"
 "              2^N: K  (kibibajty), M  (mebibajty), G  (gibibajty)\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Przyj�to warto�� domy�ln� %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Warto�� spoza zakresu.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Numer partycji"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Uwaga: partycja %d ma pusty typ\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Wybrano partycj� %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nie zdefiniowano jeszcze partycji!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Wszystkie g��wne partycje zosta�y ju� zdefiniowane!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1548
+#: fdisk/fdisk.c:1614
 #, c-format
-msgid "Changing display/entry units to %s\n"
-msgstr "Zmiana jednostek wy�wietlania/wprowadzania na liczb� %s\n"
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr ""
+"Zmiana jednostek wy�wietlania/wprowadzania na cylindry (PRZESTARZA�E!)\n"
+
+#: fdisk/fdisk.c:1616
+#, c-format
+msgid "Changing display/entry units to sectors\n"
+msgstr "Zmiana jednostek wy�wietlania/wprowadzania na sektory\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "UWAGA: partycja %d jest partycj� rozszerzon�\n"
 
-#: fdisk/fdisk.c:1569
+#: fdisk/fdisk.c:1636
 #, c-format
-msgid "DOS Compatibility flag is set\n"
-msgstr "Flaga kompatybilno�ci z DOS-em jest ustawiona\n"
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
+msgstr "Flaga kompatybilno�ci z DOS-em jest ustawiona (PRZESTARZA�E!)\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Flaga kompatybilno�ci z DOS-em nie jest ustawiona\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partycja %d jeszcze nie istnieje!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3342,7 +3395,7 @@ msgstr ""
 "jest raczej niem�dre. Mo�na usun�� partycj� przy\n"
 "u�yciu polecenia `d'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3351,7 +3404,7 @@ msgstr ""
 "Nie mo�na zmieni� istniej�cej partycji na rozszerzon� ani odwrotnie.\n"
 "Nale�y j� najpierw usun��.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3361,7 +3414,7 @@ msgstr ""
 "Najlepiej pozostawi� partycj� 3 jako ca�y dysk (5),\n"
 "poniewa� tego oczekuje SunOS/Solaris i nawet Linux to lubi.\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3371,63 +3424,63 @@ msgstr ""
 "Najpepiej pozostawi� partycj� 9 jako nag��wek wolumenu (0),\n"
 "a partycj� 11 jako ca�y wolumen (6), poniewa� tego oczekuje IRIX.\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Zmieniono typ systemu partycji %d na %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Typ systemu partycji %d nie zosta� zmieniony: %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Partycja %d ma r�ne pocz�tki fizyczy i logiczny (nie jest linuksowa?):\n"
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " fizyczny=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logiczny=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partycja %d ma r�ne ko�ce fizyczny i logiczny:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partycja %i nie zaczyna si� na granicy cylindra:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "powinno by� (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partycja %i nie ko�czy si� na granicy cylindra.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "powinno by� (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "Partycja %i nie zaczyna si� na granicy bloku fizycznego.\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3436,7 +3489,7 @@ msgstr ""
 "\n"
 "Dysk %s: %ld MB, bajt�w: %lld\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3445,32 +3498,37 @@ msgstr ""
 "\n"
 "Dysk %s: %ld.%ld GB, bajt�w: %lld\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "g�owic: %d, sektor�w/�cie�k�: %llu, cylindr�w: %d"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", w sumie sektor�w: %llu"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Jednostka = %s, czyli %d * %d = %d bajt�w\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
-msgstr ""
+msgstr "Rozmiar sektora (logiczny/fizyczny) w bajtach: %u / %lu\n"
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr "Rozmiar we/wy (minimalny/optymalny) w bajtach: %lu / %lu\n"
+
+#: fdisk/fdisk.c:1915
 #, c-format
 msgid "Alignment offset: %lu bytes\n"
-msgstr ""
+msgstr "Offset wyr�wnania w bajtach: %lu\n"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3479,12 +3537,12 @@ msgstr ""
 "Nie ma nic do zrobienia, kolejno�� ju� jest prawid�owa.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "Zako�czone.\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3495,16 +3553,16 @@ msgstr ""
 "Prawdopodobnie wybrano niew�a�ciwe urz�dzenie.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Rozruch   Pocz�tek      Koniec   Blok�w   ID  System\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Urz�dzenie"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3513,7 +3571,7 @@ msgstr ""
 "\n"
 "Wpisy w tablicy partycji nie s� w tej kolejno�ci, co na dysku\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3524,92 +3582,92 @@ msgstr ""
 "Dysk %s: g�owic: %d, sektor�w: %llu, cylindr�w: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr Fl  G� Sekt Cyl  G� Sekt Cyl     Pocz�tek   Rozm ID\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Uwaga: partycja %d zawiera sektor 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partycja %d: g�owica %d wi�ksza ni� maksymalna %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partycja %d: sektor %d wi�kszy ni� maksymalny %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partycja %d: cylinder %d wi�kszy ni� maksymalny %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partycja %d: poprzednia liczba sektor�w %d nie zgadza si� z ca�kowit� %d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Uwaga: b��dny pocz�tek danych dla partycji %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Uwaga: partycja %d zachodzi na partycj� %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Uwaga: partycja %d jest pusta\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Partycja logiczna %d nie zawiera si� w pe�ni w partycji %d\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 "Ca�kowita liczba przydzielonych sektor�w %llu jest wi�ksza ni� maksymalna %"
 "llu\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "Pozosta�o %lld nieprzydzielonych sektor�w %d-bajtowych\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Partycja %d jest ju� zdefiniowana. Nale�y j� usun�� przed ponownym "
 "dodaniem.\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektor %llu jest ju� przydzielony\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Nie ma ju� wolnych sektor�w\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Ostatni %1$s, +%2$s lub +rozmiar{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3622,7 +3680,7 @@ msgstr ""
 "\tpust� DOS-ow� tablic� partycji (poleceniem o).\n"
 "\tUWAGA: zniszczy to obecn� zawarto�� dysku.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3635,22 +3693,22 @@ msgstr ""
 "\tpust� DOS-ow� tablic� partycji (poleceniem o).\n"
 "\tUWAGA: zniszczy to obecn� zawarto�� dysku.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Najpierw trzeba usun�� jak�� partycj� i doda� partycj� rozszerzon�\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Wszystkie partycje logiczne s� wykorzystane\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Dodanie partycji g��wnej\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3661,20 +3719,20 @@ msgstr ""
 "   %s\n"
 "   p   partycja g��wna (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   partycja logiczna (5 wzwy�)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   partycja rozszerzona"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Niepoprawny numer partycji dla typu `%c'\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3683,12 +3741,12 @@ msgstr ""
 "Tablica partycji zosta�a zmodyfikowana!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Wywo�ywanie ioctl() w celu ponownego odczytu tablicy partycji.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3701,7 +3759,7 @@ msgstr ""
 "J�dro nadal u�ywa starej tablicy. Nowa tablica b�dzie u�ywana po\n"
 "nast�pnym restarcie systemu albo po uruchomieniu partprobe(8) lub kpartx(8)\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3713,7 +3771,7 @@ msgstr ""
 "UWAGA: Je�li zosta�y utworzone lub zmodyfikowane partycje DOS-a 6.x,\n"
 "prosz� zobaczy� dodatkowe informacje w manualu do fdiska.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3722,42 +3780,42 @@ msgstr ""
 "\n"
 "B��d podczas zamykania pliku\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synchronizacja dysk�w.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partycja %d nie ma obszaru danych\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Nowy pocz�tek danych"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Polecenie eksperta (m wy�wietla pomoc): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Liczba cylindr�w"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Liczba g�owic"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Liczba sektor�w"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Uwaga: ustawianie offsetu sektora dla kompatybilno�ci z DOS-em\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3770,32 +3828,32 @@ msgstr ""
 "nie obs�uguje GPT. Nale�y u�y� GNU Parteda.\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Dysk %s nie zawiera poprawnej tablicy partycji\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Nie mo�na otworzy� %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "nie mo�na otworzy� %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: nieznane polecenie\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "J�dro samo rozpoznaje rozmiar sektora - opcja -b zignorowana\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3804,16 +3862,16 @@ msgstr ""
 "Uwaga: opcja -b (rozmiar sektora) powinna by� u�ywana z okre�lonym "
 "urz�dzeniem\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Na %s wykryto etykiet� dysku OSF/1, wej�cie w tryb etykiety dysku\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Polecenie (m wy�wietla pomoc): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3822,16 +3880,16 @@ msgstr ""
 "\n"
 "Obecny plik rozruchowy to: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Prosz� wpisa� nazw� nowego pliku rozruchowego: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Plik rozruchowy pozosta� bez zmian\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3920,15 +3978,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4063,7 +4121,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Istnieje wi�cej ni� jeden wpis dla ca�ego dysku.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nie zdefiniowano �adnej partycji\n"
@@ -4167,7 +4225,7 @@ msgstr ""
 "dysku \"SGI volume\" mo�e by� niezgodna z tym zaleceniem.\n"
 "Prosz� wpisa� TAK, je�li na pewno ta partycja ma by� oznaczona inaczej.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "TAK\n"
 
@@ -4226,7 +4284,7 @@ msgstr ""
 "b�dzie nie do odzyskania.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4247,55 +4305,55 @@ msgstr "Pr�ba zachowania parametr�w partycji %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tPOCZ�TEK=%d\tD�UGO��=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "Bez przydzia�u"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Ca�y dysk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt sectors"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS reserved"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux RAID autodetect"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4308,30 +4366,30 @@ msgstr ""
 "tzn. g�owice, sektory, cylindry i partycje albo wymusi�\n"
 "utworzenie nowej etykiety (polecenie s w menu g��wnym)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Wykryto etykiet� dysku Suna z b��dn� wersj� [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr ""
 "Wykryto etykiet� dysku Suna z b��dnym znacznikiem poprawno�ci [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Wykryto etykiet� dysku Suna z b��dn� liczb� partycji [%u].\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
 msgstr ""
 "Uwaga: B��dne warto�ci musz� by� poprawione, co nast�pi przy zapisie (w)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4344,31 +4402,31 @@ msgstr ""
 "nie do odzyskania.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektor�w/�cie�k�"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partycja %d nie ko�czy si� na granicy cylindra\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partycja %d zachodzi na inne w sektorach %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Nieu�ywany odst�p - sektory 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nieu�ywany odst�p - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4377,7 +4435,7 @@ msgstr ""
 "Inne partycje ju� pokrywaj� ca�y dysk.\n"
 "Najpierw trzeba co� usun��/zmniejszy�.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4386,12 +4444,12 @@ msgstr ""
 "Zdecydowanie zaleca si�, aby trzecia partycja pokrywa�a ca�y dysk\n"
 "i by�a typu `Ca�y dysk'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d jest ju� przydzielony\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4401,7 +4459,7 @@ msgstr ""
 "Nie pokryto ca�ego dysku trzeci� partycj�, ale warto�� %d %s\n"
 "pokrywa inn� partycj�. Wpis zosta� zmieniony na %d %s\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4410,7 +4468,7 @@ msgstr ""
 "Aby zachowa� kompatybilno�� z SunOS-em/Solarisem, najlepiej pozostawi�\n"
 "t� partycj� jako ca�y dysk (5), zaczynaj�c� si� od 0, o %u sektorach\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4424,12 +4482,12 @@ msgstr ""
 "rozruchowy. Prosz� wpisa� TA, je�li na pewno ta partycja ma\n"
 "mie� typ 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4437,49 +4495,49 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Dysk %s (etykieta dysku Suna): g�owic: %d, sektor�w: %llu, rpm: %d\n"
-"cylindr�w: %d, zmiennych cylindr�w: %d, fizycznych cylindr�w: %d\n"
+"Dysk %s (etykieta dysku Suna): g�owic: %u, sektor�w: %llu, rpm: %d\n"
+"cylindr�w: %u, zmiennych cylindr�w: %d, fizycznych cylindr�w: %d\n"
 "dodatkowych sektor�w/cylinder: %d, przeplot: %d:1\n"
 "ID etykiety: %s\n"
 "ID wolumenu: %s\n"
 "Jednostka: %s, czyli %d * 512 bajt�w\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
 "\n"
-"Dysk %s (etykieta dysku Suna): g�owic: %d, sektor�w: %llu, cylindr�w: %d\n"
+"Dysk %s (etykieta dysku Suna): g�owic: %u, sektor�w: %llu, cylindr�w: %u\n"
 "Jednostka: %s, czyli %d * 512 bajt�w\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flaga   Pocz�tek    Koniec Blok�w   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Liczba zmiennych cylindr�w"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Dodatkowych sektor�w na cylinder"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Wsp�czynnik przeplotu"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Pr�dko�� obrotowa (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Liczba fizycznych cylindr�w"
 
@@ -4688,6 +4746,10 @@ msgstr "Minix / stary Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 ukryty dysk C:"
@@ -5314,93 +5376,93 @@ msgstr "podano flag� -n: bez zmian\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Nie uda�o si� zapisa� starych sektor�w - przerwano\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Nie uda�o si� zapisa� partycji na %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "d�uga lub niekompletna linia na wej�ciu - zako�czenie\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "b��d wej�cia: oczekiwano `=' po polu %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "b��d wej�cia: oczekiwano znaku %c po polu %s\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nierozpoznane wej�cie: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "liczba zbyt du�a\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "ko�cowe �mieci po liczbie\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "brak miejsca na deskryptor partycji\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "nie mo�na zbudowa� otaczaj�cej partycji rozszerzonej\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "zbyt du�o p�l wej�ciowych\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Brak miejsca na wi�cej\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Niedozwolony typ\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Uwaga: podany rozmiar (%lu) przekracza maksymalny dopuszczalny (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Uwaga: pusta partycja\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Uwaga: b��dny pocz�tek partycji (najbli�szy %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nierozpoznana flaga rozruchu - prosz� wybra� - lub *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "cz�ciowa specyfikacja c,h,s?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Partycja rozszerzona nie tam, gdzie jej oczekiwano\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "b��dne wej�cie\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "zbyt du�o partycji\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5411,96 +5473,96 @@ msgstr ""
 "<pocz�tek> <rozmiar> <typ [E,S,L,X,hex]> <rozruch [-,*> <c,h,s> <c,h,s>\n"
 "Zwykle trzeba poda� tylko <pocz�tek> i <rozmiar> (oraz ewentualnie <typ>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Sk�adnia: %s [opcje] urz�dzenie...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "urz�dzenie: co� w stylu /dev/hda lub /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "przydatne opcje:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [lub --show-size]: wypisanie rozmiaru partycji"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [lub --id]:        wypisanie lub zmiana ID partycji"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [lub --list]:      wypisanie partycji z ka�dego urz�dzenia"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [lub --dump]:      jw., ale w formacie odpowiednim dla wej�cia"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [lub --increment]: liczba cylindr�w itp. od 1 zamiast od 0"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:   operowanie na jednostkach: sektor/blok/cylinder/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [lub --list-types]: wypisanie znanych typ�w partycji"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [lub --DOS]:       kompatybilno�� z DOS-em: marnowanie odrobiny "
 "miejsca"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [lub --re-read]:   wymuszenie odczytu tablicy partycji przez j�dro"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                 zmiana tylko partycji o numerze #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                  nie zapisywanie niczego na dysk"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O plik :             zapis do pliku sektor�w przed ich nadpisaniem"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I plik :             odtworzenie tych sektor�w"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [lub --version]:   wypisanie wersji"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [lub --help]:      wypisanie tej informacji"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "niebezpieczne opcje:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [lub --show-geometry]: wypisanie informacji j�dra o geometrii"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5508,7 +5570,7 @@ msgstr ""
 "    -G [lub --show-pt-geometry]: wypisanie geometrii odgadni�tej z tabl. "
 "part."
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5516,62 +5578,62 @@ msgstr ""
 "    -x [lub --show-extended]: wypisywanie tak�e partycji rozszerzonych\n"
 "                              lub oczekiwanie ich deskryptor�w na wej�ciu"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [lub --Linux]:     pomini�cie ostrze�e� bez znaczenia dla Linuksa"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [lub --quiet]:     pomini�cie ostrze�e�"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Mo�na wymusi� inn� geometri� przy u�yciu:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [lub --cylinders #]: ustawienie liczby cylindr�w"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [lub --heads #]:   ustawienie liczby g�owic"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [lub --sectors #]: ustawienie liczby sektor�w"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Mo�na wy��czy� sprawdzanie sp�jno�ci przy u�yciu opcji:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [lub --force]:     wykonywanie wszystkich, nawet g�upich polece�"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s urz�dzenie\t\t wypisanie aktywnych partycji na urz�dzeniu\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s urz�dzenie n1 n2 ... uaktywnienie partycji n1 ..., wy��czenie reszty\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An urz�dzenie\t uaktywnienie partycji n, wy��czenie pozosta�ych\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5584,67 +5646,67 @@ msgstr ""
 "Narz�dzie sfdisk nie obs�uguje GPT. Nale�y u�y� GNU Parteda.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Aby wy��czy� ten test, nale�y u�y� flagi --force.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "brak polecenia?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "razem: %llu blok�w\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "sk�adnia: sfdisk --print-id urz�dzenie numer-partycji\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "sk�adnia: sfdisk --change-id urz�dzenie numer-partycji ID\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "sk�adnia: sfdisk --id urz�dzenie numer-partycji [ID]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "mo�na okre�li� tylko jedno urz�dzenie (chyba �e z -l lub -s)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "nie mo�na otworzy� %s do odczytu i zapisu\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "nie mo�na otworzy� %s do odczytu\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: cylindr�w: %ld, g�owic: %ld, sektor�w na �cie�ce: %ld\n"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Nie mo�na pobra� rozmiaru %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "b��dny bajt ruzruchu: 0x%x zamiast 0x80\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5652,7 +5714,7 @@ msgstr ""
 "Gotowe\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5661,35 +5723,35 @@ msgstr ""
 "Na dysku s� %d aktywne partycje g��wne. Nie ma to znaczenia dla LILO,\n"
 "ale DOS-owy MBR potrafi uruchomi� dysk tylko z jedn� aktywn� partycj�.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partycja %s ma ID %x i nie jest ukryta\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "B��dny ID %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Ten dysk jest aktualnie u�ywany.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "B��d krytyczny: nie mo�na odnale�� %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Uwaga: %s nie jest urz�dzeniem blokowym\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Sprawdzanie czy nikt nie u�ywa teraz tego dysku...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5703,30 +5765,30 @@ msgstr ""
 "z tego dysku.\n"
 "Aby pomin�� ten test, mo�na u�y� flagi --no-reread.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Mo�na u�y� flagi --force, aby pomin�� wszystkie testy.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Stara sytuacja:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partycja %d nie istnieje, nie mo�na jej zmieni�\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Nowa sytuacja:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5734,21 +5796,21 @@ msgstr ""
 "Nie podobaj� mi si� te partycje - nie zmieniono\n"
 "(je�li na pewno tak maj� wygl�da� - prosz� u�y� opcji --force).\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Nie podoba mi si� to - prawdopodobnie nale�y odpowiedzie� Nie\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Czy te zmiany s� satysfakcjonuj�ce? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Czy zapisa� zmiany na dysk [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5757,16 +5819,16 @@ msgstr ""
 "\n"
 "sfdisk: przedwczesny koniec wej�cia\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Wyj�cie - bez zmian\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Prosz� odpowiedzie� jednym z y,n,q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5775,7 +5837,7 @@ msgstr ""
 "Zapisano now� tablic� partycji\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5786,17 +5848,17 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(wi�cej w fdisk(8))\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "UWAGA: nie uda�o si� otworzy� %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr "UWAGA: b��dny format w linii %d z %s\n"
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5808,37 +5870,37 @@ msgstr ""
 "\tjak najszybciej.\n"
 "\n"
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr "fsck: %s: nie znaleziono\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr "%s: wait: Brak procesu potomnego?!\n"
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr "Uwaga... %s dla urz�dzenia %s zako�czone sygna�em %d.\n"
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr "%s %s: status to %x, to nie powinno si� nigdy zdarzy�.\n"
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Zako�czono %s (kod wyj�cia %d)\n"
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: B��d %d podczas wywo�ywania fsck.%s dla %s\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
@@ -5846,11 +5908,11 @@ msgstr ""
 "Albo wszystkie, albo �aden z typ�w przekazanych opcji -t musi by�\n"
 "poprzedzony 'no' lub '!'.\n"
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "Nie mo�na przydzieli� pami�ci dla typ�w system�w plik�w\n"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
@@ -5859,68 +5921,68 @@ msgstr ""
 "%s: pomini�to b��dn� lini� w /etc/fstab: montowanie typu bind z niezerowym "
 "numerem przebiegu fsck\n"
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: pomini�to nieistniej�ce urz�dzenie\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr "fsck: nie mo�na sprawdzi� %s: nie znaleziono fsck.%s\n"
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr "Sprawdzanie wszystkich system�w plik�w.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--oczekiwanie-- (przebieg %d)\n"
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "Sk�adnia: fsck [-AMNPRTV] [ -C [ fd ] ] [-t typfs] [opcje-fs] [system-"
 "plik�w ...]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: za du�o urz�dze�\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Nie mo�na otworzy� %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "Czy /proc jest zamontowany?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr "Trzeba by� rootem, aby znale�� pasuj�ce systemy plik�w: %s\n"
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Nie uda�o si� odnale�� pasuj�cego systemu plik�w: %s\n"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: zbyt du�o argument�w\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, c-format
 msgid "fsck from %s\n"
 msgstr "fsck z pakietu %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "%s: Nie mo�na przydzieli� pami�ci dla fsck_path\n"
@@ -6432,7 +6494,13 @@ msgstr "Nie znaleziono u�ytecznego interfejsu zegara.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Nie uda�o si� ustawi� zegara systemowego.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr "W %ld sekund po 1969 przewiduje si� odczyt %ld sekund po 1969.\n"
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6445,17 +6513,17 @@ msgstr ""
 "Ta kopia hwclocka zosta�a zbudowana dla innej maszyny (wi�c raczej nie\n"
 "dzia�a teraz na maszynie Alpha). Zaniechano dzia�ania.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Nie uda�o si� uzyska� warto�ci epoch z j�dra.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "J�dro przyjmuje warto�� epoch %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6464,22 +6532,22 @@ msgstr ""
 "Aby ustawi� warto�� epoch, nale�y u�y� opcji 'epoch' w celu przekazania "
 "warto�ci.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Bez ustawiania warto�ci epoch na %d - tryb testowy.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Nie uda�o si� ustawi� warto�ci epoch w j�drze.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s z pakietu %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6498,6 +6566,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6518,186 +6587,244 @@ msgid ""
 "  -D | --debug        debug mode\n"
 "\n"
 msgstr ""
+"hwclock - odczytywanie i ustawianie zegara sprz�towego (RTC)\n"
+"\n"
+"Sk�adnia: hwclock [funkcja] [opcje...]\n"
+"\n"
+"Funkcje:\n"
+"  -h | --help         wy�wietlenie tego opisu\n"
+"  -r | --show         odczyt zegara sprz�towego i wypisanie wyniku\n"
+"       --set          ustawienie RTC na czas podany przy u�yciu --date\n"
+"  -s | --hctosys      ustawienie czasu systemowego wg zegara sprz�towego\n"
+"  -w | --systohc      ustawienie zegara sprz�towego wg czasu systemowego\n"
+"       --systz        ustawienie czasu systemowego w oparciu o bie��c� "
+"stref�\n"
+"                      czasow�\n"
+"       --adjust       korekta RTC pod k�tem b��du systematycznego od czasu\n"
+"                      ostatniego ustawiania lub korygowania zegara\n"
+"       --getepoch     wypisanie warto�ci epoch zegara sprz�towego w j�drze\n"
+"       --setepoch     ustawienie warto�ci epoch zegara sprz�towego w j�drze\n"
+"                      na warto�� podan� przy u�yciu opcji --epoch\n"
+"       --predict      przewidzenie odczytu RTC o czasie podanym przez --"
+"date\n"
+"  -v | --version      wypisanie informacji o wersji hwclocka na standardowe\n"
+"                      wyj�cie\n"
+"\n"
+"Opcje:\n"
+"  -u | --utc          zegar sprz�towy przechowuje czas w UTC\n"
+"       --localtime    zegar sprz�towy przechowuje czas lokalny\n"
+"  -f | --rtc=�cie�ka  plik specjalny /dev/... do u�ycia zamiast domy�lnego\n"
+"       --directisa    bezpo�redni dost�p do szyny ISA zamiast %s\n"
+"       --badyear      zignorowanie roku RTC ze wzgl�du na wadliwy BIOS\n"
+"       --date         okre�lenie czasu do ustawienia zegara sprz�towego\n"
+"       --epoch=rok    okre�lenie roku, od kt�rego rozpoczyna si� warto��\n"
+"                      epoch zegara sprz�towego\n"
+"       --noadjfile    pomini�cie u�ycia pliku /etc/adjtime. Wymaga podania\n"
+"                      --utc lub --localtime\n"
+"       --adjfile=plik okre�lenie �cie�ki do pliku korekty (domy�lna to\n"
+"                      /etc/adjtime)\n"
+"       --test         wykonanie wszystkiego opr�cz w�a�ciwego uaktualniania\n"
+"                      zegara sprz�towego czy czegokolwiek innego\n"
+"  -D | --debug        tryb diagnostyczny\n"
+"\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "       tell hwclock the type of alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
+"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"       okre�lenie rodzaju Alphy na potrzeby hwclocka (szczeg�y w man hwclock"
+"(8))\n"
+"\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
-msgstr ""
+msgstr "%s: Nie mo�na po��czy� si� z systemem audytu\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
-msgstr ""
+msgstr "%s nie przyjmuje argument�w nie b�d�cych opcjimi. Podano %d.\n"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
+"Podano wiele funkcji.\n"
+"Jednorazowo mo�na wykona� tylko jedn�.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
-msgstr ""
+msgstr "%s: Opcje --utc i --localtime wykluczaj� si� wzajemnie. Podano obie.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
+"%s: Opcje --adjust i --noadjfile wykluczaj� si� wzajemnie. Podano obie.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
+"%s: Opcje --adjfile i --noadjfile wykluczaj� si� wzajemnie. Podano obie.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
+"%s: W przypadku u�ycia --noadjfile trzeba poda� --utc lub --localtime\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
+"Brak zdatnego do u�ycia czasu do ustawienia. Nie mo�na ustawi� zegara.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr ""
+msgstr "Niestety tylko superu�ytkownik mo�e zmieni� zegar sprz�towy.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
-msgstr ""
+msgstr "Niestety tylko superu�ytkownik mo�e zmieni� zegar systemowy.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
+"Niestety tylko superu�ytkownik mo�e zmieni� warto�� epoch zegara sprz�towego "
+"w j�drze.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
-msgstr ""
+msgstr "Nie mo�na uzyska� dost�pu do zegara sprz�towego �adn� znan� metod�.\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
 "method.\n"
 msgstr ""
+"Prosz� u�y� opcji --debug, aby zobaczy� szczeg�y poszukiwania metody "
+"dost�pu.\n"
 
 #: hwclock/kd.c:54
 #, c-format
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr ""
+msgstr "Oczekiwanie w p�tli na zmian� czasu z KDGHWCLK\n"
 
 #: hwclock/kd.c:57
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr ""
+msgstr "nie powi�d� si� ioctl KDGHWCLK do odczytu czasu"
 
 #: hwclock/kd.c:75
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr ""
+msgstr "nie powi�d� si� ioctl KDGHWCLK do odczytu czasu w p�tli"
 
 #: hwclock/kd.c:82 hwclock/rtc.c:221
 #, c-format
 msgid "Timed out waiting for time change.\n"
-msgstr ""
+msgstr "Przekroczono limit czasu oczekiwania na zmian� czasu.\n"
 
 #: hwclock/kd.c:104
 #, c-format
 msgid "ioctl() failed to read time from %s"
-msgstr ""
+msgstr "nie powi�d� si� ioctl() do odczytu czasu z %s"
 
 #: hwclock/kd.c:140
 msgid "ioctl KDSHWCLK failed"
-msgstr ""
+msgstr "ioctl KDSHWCLK nie powi�d� si�"
 
 #: hwclock/kd.c:176
 msgid "Can't open /dev/tty1 or /dev/vc/1"
-msgstr ""
+msgstr "Nie mo�na otworzy� /dev/tty1 ani /dev/vc/1"
 
 #: hwclock/kd.c:180
 msgid "KDGHWCLK ioctl failed"
-msgstr ""
+msgstr "ioctl KDGHWCLK nie powi�d� si�"
 
 #: hwclock/rtc.c:147 hwclock/rtc.c:241
 #, c-format
 msgid "open() of %s failed"
-msgstr ""
+msgstr "nie powiod�o si� open() dla %s"
 
 #: hwclock/rtc.c:181
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
-msgstr ""
+msgstr "nie powi�d� si� ioctl() na %s do odczytu czasu.\n"
 
 #: hwclock/rtc.c:203
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
-msgstr ""
+msgstr "Oczekiwanie w p�tli na zmian� czasu z %s\n"
 
 #: hwclock/rtc.c:259
 #, c-format
 msgid "%s does not have interrupt functions. "
-msgstr ""
+msgstr "%s nie ma funkcji przerwa�. "
 
 #: hwclock/rtc.c:270
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
-msgstr ""
+msgstr "nie powiod�o si� read() na %s w celu oczekiwania na przeskok zegara"
 
 #: hwclock/rtc.c:288
 #, c-format
 msgid "select() to %s to wait for clock tick failed"
-msgstr ""
+msgstr "nie powi�d� si� select() na %s w celu oczekiwania na przeskok zegara"
 
 #: hwclock/rtc.c:291
 #, c-format
 msgid "select() to %s to wait for clock tick timed out\n"
 msgstr ""
+"select() na %s w celu oczekiwania na przeskok zegara przekroczy� limit "
+"czasu\n"
 
 #: hwclock/rtc.c:300
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
-msgstr ""
+msgstr "nie powi�d� si� ioctl() na %s w celu wy��czenia przerwa� uaktualnie�"
 
 #: hwclock/rtc.c:303
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
+"nieoczekiwanie nie powi�d� si� ioctl() na %s w celu w��czenia przerwa�a "
+"uaktualnie�"
 
 #: hwclock/rtc.c:360
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
-msgstr ""
+msgstr "nie powi�d� si� ioctl() na %s w celu ustawienia czasu\n"
 
 #: hwclock/rtc.c:366
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr ""
+msgstr "ioctl(%s) powi�d� si�.\n"
 
 #: hwclock/rtc.c:392
 #, c-format
 msgid "Open of %s failed"
-msgstr ""
+msgstr "Otwarcie %s nie powiod�o si�"
 
 #: hwclock/rtc.c:410 hwclock/rtc.c:454
 #, c-format
@@ -6706,110 +6833,114 @@ msgid ""
 "device driver via the device special file %s.  This file does not exist on "
 "this system.\n"
 msgstr ""
+"Aby zmieni� warto�� epoch w j�drze, trzeba dosta� si� do linuksowego "
+"sterownika urz�dzenia 'rtc' poprzez plik urz�dzenia specjalnego %s. Ten plik "
+"nie istnieje w tym systemie.\n"
 
 #: hwclock/rtc.c:415 hwclock/rtc.c:459
 #, c-format
 msgid "Unable to open %s"
-msgstr ""
+msgstr "Nie mo�na otworzy� %s"
 
 #: hwclock/rtc.c:422
 #, c-format
 msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr ""
+msgstr "nie powi�d� si� ioctl(RTC_EPOCH_READ) na %s"
 
 #: hwclock/rtc.c:427
 #, c-format
 msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
+msgstr "odczytano warto�� epoch %ld z %s przy u�yciu ioctl-a RTC_EPOCH_READ.\n"
 
 #: hwclock/rtc.c:446
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
-msgstr ""
+msgstr "Warto�� epoch nie mo�e by� mniejsza ni� 1900. ��dano %ld\n"
 
 #: hwclock/rtc.c:464
 #, c-format
 msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr ""
+"ustawianie warto�ci epoch na %ld przy u�yciu ioctl-a RTC_EPOCH_SET na %s.\n"
 
 #: hwclock/rtc.c:469
 #, c-format
 msgid ""
 "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
-msgstr ""
+msgstr "Sterownik urz�dzenia w j�drze dla %s nie ma ioctl-a RTC_EPOCH_SET.\n"
 
 #: hwclock/rtc.c:472
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr ""
+msgstr "nie powi�d� si� ioctl(RTC_EPOCH_SET) na %s"
 
 #: login-utils/agetty.c:360
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr ""
+msgstr "%s: nie mo�na wywo�a� %s: %m"
 
 #: login-utils/agetty.c:383
 msgid "can't malloc initstring"
-msgstr ""
+msgstr "nie mo�na wykona� malloc dla �a�cucha inicjuj�cego"
 
 #: login-utils/agetty.c:448
 #, c-format
 msgid "bad timeout value: %s"
-msgstr ""
+msgstr "b��dna warto�� limitu czasu: %s"
 
 #: login-utils/agetty.c:525
 #, c-format
 msgid "bad speed: %s"
-msgstr ""
+msgstr "b��dna szybko��: %s"
 
 #: login-utils/agetty.c:527
 msgid "too many alternate speeds"
-msgstr ""
+msgstr "zbyt du�o zamiennych szybko�ci"
 
 #: login-utils/agetty.c:629
 #, c-format
 msgid "/dev: chdir() failed: %m"
-msgstr ""
+msgstr "/dev: chdir() nie powiod�o si�: %m"
 
 #: login-utils/agetty.c:633
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr ""
+msgstr "/dev/%s: to nie jest urz�dzenie znakowe"
 
 #: login-utils/agetty.c:642
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr ""
+msgstr "/dev/%s: nie mo�na otworzy� jako standardowe wej�cie: %m"
 
 #: login-utils/agetty.c:652
 #, c-format
 msgid "%s: not open for read/write"
-msgstr ""
+msgstr "%s: nie jest otwarte do odczytu i zapisu"
 
 #: login-utils/agetty.c:658
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr ""
+msgstr "%s: problem z dup: %m"
 
 #: login-utils/agetty.c:945
 #, c-format
 msgid "user"
-msgstr ""
+msgstr "u�ytkownik"
 
 #: login-utils/agetty.c:945
 #, c-format
 msgid "users"
-msgstr ""
+msgstr "u�ytkownik�w"
 
 #: login-utils/agetty.c:1030
 #, c-format
 msgid "%s: read: %m"
-msgstr ""
+msgstr "%s: read: %m"
 
 #: login-utils/agetty.c:1077
 #, c-format
 msgid "%s: input overrun"
-msgstr ""
+msgstr "%s: przepe�nienie wej�cia"
 
 #: login-utils/agetty.c:1206
 #, c-format
@@ -6819,88 +6950,94 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
+"Sk�adnia: %s [-8hiLmUw] [-l program_login] [-t limit_czasu] [-I "
+"�a�cuch_inicjuj�cy] [-H host] liczba_bod�w,... [typ_terminala]\n"
+"lub\t[-hiLmw] [-l program_login] [-t limit_czasu] [-I �a�cuch_inicjuj�cy] [-"
+"H host] linia liczba_bod�w,... [typ_terminala]\n"
 
 #: login-utils/checktty.c:91 login-utils/checktty.c:112
 #, c-format
 msgid "login: memory low, login may fail\n"
-msgstr ""
+msgstr "login: ma�o pami�ci, logowanie mo�e si� nie uda�\n"
 
 #: login-utils/checktty.c:92
 msgid "can't malloc for ttyclass"
-msgstr ""
+msgstr "nie mo�na wykona� malloc dla ttyclass"
 
 #: login-utils/checktty.c:113
 msgid "can't malloc for grplist"
-msgstr ""
+msgstr "nie mo�na wykona� malloc dla grplist"
 
 #: login-utils/checktty.c:554
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr ""
+msgstr "Logowanie na %s z %s domy�lnie zabronione.\n"
 
 #: login-utils/checktty.c:565
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr ""
+msgstr "Logowanie na %s z %s zabronione.\n"
 
 #: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
-msgstr ""
+msgstr "%s: Ty (u�ytkownik %d) nie istniejesz.\n"
 
 #: login-utils/chfn.c:140 login-utils/chsh.c:126
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr ""
+msgstr "%s: u�ytkownik \"%s\" nie istnieje.\n"
 
 #: login-utils/chfn.c:145 login-utils/chsh.c:131
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
+"%s: tym narz�dziem mo�na zmieni� tylko wpisy lokalne; prosz� u�y� yp%s.\n"
 
 #: login-utils/chfn.c:156 login-utils/chsh.c:142
 msgid "Unknown user context"
-msgstr ""
+msgstr "Nieznany kontekst u�ytkownika"
 
 #: login-utils/chfn.c:157
 #, c-format
 msgid "%s: %s is not authorized to change the finger info of %s\n"
 msgstr ""
+"%s: %s nie jest autoryzowany do zmiany informacji finger u�ytkownika %s\n"
 
 #: login-utils/chfn.c:164 login-utils/chsh.c:150
 #, c-format
 msgid "%s: Can't set default context for /etc/passwd"
-msgstr ""
+msgstr "%s: Nie mo�na ustawi� domy�lnego kontekstu dla /etc/passwd"
 
 #: login-utils/chfn.c:178
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr ""
+msgstr "Zmiana informacji finger dla %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
-#, fuzzy, c-format
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
+#, c-format
 msgid "%s: PAM failure, aborting: %s\n"
-msgstr "%s: nie uda�o si� otworzy�: %s\n"
+msgstr "%s: niepowodzenie PAM, przerwano: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
-msgstr ""
+msgstr "Has�o: "
 
 #: login-utils/chfn.c:215 login-utils/chsh.c:214
 msgid "Incorrect password."
-msgstr ""
+msgstr "Has�o nieprawid�owe."
 
 #: login-utils/chfn.c:226
 #, c-format
 msgid "Finger information not changed.\n"
-msgstr ""
+msgstr "Informacje finger nie zosta�y zmienione.\n"
 
 #: login-utils/chfn.c:328
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr ""
+msgstr "Sk�adnia: %s [ -f pe�na-nazwa ] [ -o pok�j ] "
 
 #: login-utils/chfn.c:329
 #, c-format
@@ -6908,23 +7045,25 @@ msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
+"[ -p telefon-biurowy ]\n"
+"\t[ -h telefon-domowy ] "
 
 #: login-utils/chfn.c:330
 #, c-format
 msgid "[ --help ] [ --version ]\n"
-msgstr ""
+msgstr "[ --help ] [ --version ]\n"
 
 #: login-utils/chfn.c:378
 msgid "Office"
-msgstr ""
+msgstr "Biuro"
 
 #: login-utils/chfn.c:379
 msgid "Office Phone"
-msgstr ""
+msgstr "Tel. biurowy"
 
 #: login-utils/chfn.c:380
 msgid "Home Phone"
-msgstr ""
+msgstr "Tel. domowy"
 
 #: login-utils/chfn.c:401 login-utils/chsh.c:321
 #, c-format
@@ -6932,36 +7071,38 @@ msgid ""
 "\n"
 "Aborted.\n"
 msgstr ""
+"\n"
+"Przerwano.\n"
 
 #: login-utils/chfn.c:434
 #, c-format
 msgid "field is too long.\n"
-msgstr ""
+msgstr "pole zbyt d�ugie.\n"
 
 #: login-utils/chfn.c:442
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr ""
+msgstr "'%c' nie jest dozwolony.\n"
 
 #: login-utils/chfn.c:447
 #, c-format
 msgid "Control characters are not allowed.\n"
-msgstr ""
+msgstr "Znaki steruj�ce nie s� dozwolone.\n"
 
 #: login-utils/chfn.c:512
 #, c-format
 msgid "Finger information *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "Informacje finger *NIE* zosta�y zmienione. Prosz� spr�bowa� p�niej.\n"
 
 #: login-utils/chfn.c:515
 #, c-format
 msgid "Finger information changed.\n"
-msgstr ""
+msgstr "Informacje finger zmienione.\n"
 
 #: login-utils/chsh.c:143
 #, c-format
 msgid "%s: %s is not authorized to change the shell of %s\n"
-msgstr ""
+msgstr "%s: %s nie jest autoryzowany do zmiany pow�oki %s\n"
 
 #: login-utils/chsh.c:164
 #, c-format
@@ -6969,35 +7110,37 @@ msgid ""
 "%s: Running UID doesn't match UID of user we're altering, shell change "
 "denied\n"
 msgstr ""
+"%s: Bie��cy UID nie zgadza si� z UID-em u�ytkownika, kt�rego dotyczy zmiana; "
+"zmiana zabroniona\n"
 
 #: login-utils/chsh.c:170
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr ""
+msgstr "%s: Pow�oka nie jest w /etc/shells, zmiana zabroniona\n"
 
 #: login-utils/chsh.c:177
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr ""
+msgstr "Zmiana pow�oki dla %s.\n"
 
 #: login-utils/chsh.c:222
 msgid "New shell"
-msgstr ""
+msgstr "Nowa pow�oka"
 
 #: login-utils/chsh.c:229
 #, c-format
 msgid "Shell not changed.\n"
-msgstr ""
+msgstr "Pow�oka nie zosta�a zmieniona.\n"
 
 #: login-utils/chsh.c:235
 #, c-format
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr ""
+msgstr "Pow�oka *NIE* zosta�a zmieniona. Prosz� spr�bowa� p�niej.\n"
 
 #: login-utils/chsh.c:238
 #, c-format
 msgid "Shell changed.\n"
-msgstr ""
+msgstr "Pow�oka zmieniona.\n"
 
 #: login-utils/chsh.c:303
 #, c-format
@@ -7005,69 +7148,71 @@ msgid ""
 "Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
 "       [ username ]\n"
 msgstr ""
+"Sk�adnia: %s [ -s pow�oka ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ u�ytkownik ]\n"
 
 #: login-utils/chsh.c:349
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr ""
+msgstr "%s: pow�oka musi by� podana pe�n� �cie�k�.\n"
 
 #: login-utils/chsh.c:353
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
-msgstr ""
+msgstr "%s: \"%s\" nie istnieje.\n"
 
 #: login-utils/chsh.c:357
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
-msgstr ""
+msgstr "%s: \"%s\" nie jest wykonywalny.\n"
 
 #: login-utils/chsh.c:364
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr ""
+msgstr "%s: '%c' nie jest dozwolony.\n"
 
 #: login-utils/chsh.c:368
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
-msgstr ""
+msgstr "%s: Znaki steruj�ce nie s� dozwolone.\n"
 
 #: login-utils/chsh.c:375 login-utils/chsh.c:385
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
-msgstr ""
+msgstr "Uwaga: \"%s\" nie wyst�puje w /etc/shells.\n"
 
 #: login-utils/chsh.c:377
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
-msgstr ""
+msgstr "%s: \"%s\" nie wyst�puje w /etc/shells.\n"
 
 #: login-utils/chsh.c:379
 #, c-format
 msgid "%s: Use -l option to see list.\n"
-msgstr ""
+msgstr "%s: Opcja -l poka�e list�.\n"
 
 #: login-utils/chsh.c:386
 #, c-format
 msgid "Use %s -l to see list.\n"
-msgstr ""
+msgstr "Polecenie %s -l poka�e list�.\n"
 
 #: login-utils/chsh.c:406
 #, c-format
 msgid "No known shells.\n"
-msgstr ""
+msgstr "Brak znanych pow�ok.\n"
 
 #: login-utils/islocal.c:87
 #, c-format
 msgid "Failed to open %s for reading, exiting."
-msgstr ""
+msgstr "Nie uda�o si� otworzy� %s do odczytu, zako�czenie."
 
 #: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
-msgstr ""
+msgstr "Sk�adnia: last [-#] [-f plik] [-t tty] [-h host] [u�ytkownik ...]\n"
 
 #: login-utils/last.c:302
 msgid "  still logged in"
-msgstr ""
+msgstr "  nadal zalogowany"
 
 #: login-utils/last.c:324
 #, c-format
@@ -7075,14 +7220,16 @@ msgid ""
 "\n"
 "wtmp begins %s"
 msgstr ""
+"\n"
+"wtmp zaczyna si� %s"
 
 #: login-utils/last.c:380 login-utils/last.c:398 login-utils/last.c:449
 msgid "last: malloc failure.\n"
-msgstr ""
+msgstr "last: malloc nie powiod�o si�.\n"
 
 #: login-utils/last.c:425
 msgid "last: gethostname"
-msgstr ""
+msgstr "last gethostname"
 
 #: login-utils/last.c:474
 #, c-format
@@ -7090,770 +7237,930 @@ msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
+"\n"
+"przerwano %10.10s %5.5s \n"
 
 #: login-utils/login.c:197
 #, c-format
 msgid "FATAL: can't reopen tty: %s"
-msgstr ""
+msgstr "B��D KRYTYCZNY: nie mo�na ponownie otworzy� tty: %s"
+
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "B��D KRYTYCZNY: %s nie jest terminalem"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
-msgstr ""
+msgstr "B��D KRYTYCZNY: b��dny tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
-msgstr ""
+msgstr "login: -h jest tylko dla superu�ytkownika.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
-msgstr ""
+msgstr "Sk�adnia: login [-fp] [u�ytkownik]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
-msgstr ""
+msgstr "Nie uda�o si� zainicjowa� PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
-msgstr ""
+msgstr "login: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr ""
+msgstr "B��DNE LOGOWANIE %d. Z %s NA KONTO %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
+"Niepoprawne logowanie\n"
+"\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr ""
+msgstr "ZBYT DU�O PR�B LOGOWANIA (%d) Z %s NA KONTO %s, %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr ""
+msgstr "NIEUDANA SESJA LOGOWANIA Z %s NA KONTO %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
+"\n"
+"Niepoprawne logowanie\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
+"\n"
+"Problem z ustanowieniem sesji, przerwano.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
-msgstr ""
+msgstr "PUSTA nazwa u�ytkownika w %s:%d. Przerwano."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
-msgstr ""
+msgstr "Niepoprawna nazwa u�ytkownika \"%s\" w %s:%d. Przerwano."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
-msgstr ""
+msgstr "login: brak pami�ci\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
-msgstr ""
+msgstr "Niedozwolona nazwa u�ytkownika"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr ""
+msgstr "Logowanie na konto %s z tego terminala nie jest dozwolone.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr ""
+msgstr "LOGOWANIE NA KONTO %s ZABRONIONE Z %s NA TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr ""
+msgstr "LOGOWANIE %s ZABRONIONE NA TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
-msgstr ""
+msgstr "Niepoprawne logowanie\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr ""
+msgstr "WDZWONIENIE NA %s PRZEZ %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr ""
+msgstr "LOGOWANIE NA ROOTA NA %s Z %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr ""
+msgstr "LOGOWANIE NA ROOTA NA %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
-msgstr ""
+msgstr "LOGOWANIE NA %s NA KONTO %s Z %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr ""
+msgstr "LOGOWANIE NA %s NA KONTO %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
-msgstr ""
+msgstr "Jest nowa poczta.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
-msgstr ""
+msgstr "Jest poczta.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
-msgstr ""
+msgstr "login: niepowodzenie fork: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
-msgstr ""
+msgstr "TIOCSCTTY nie powiod�o si�: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
-msgstr ""
+msgstr "setuid() nie powiod�o si�"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
-msgstr ""
+msgstr "Brak katalogu %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
-msgstr ""
+msgstr "Logowanie z katalogiem domowym = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
-msgstr ""
+msgstr "login: brak pami�ci dla skryptu pow�oki.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr ""
+msgstr "login: nie uda�o si� uruchomi� skryptu pow�oki: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
-msgstr ""
+msgstr "login: brak pow�oki: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
+"\n"
+"%s login: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
-msgstr ""
+msgstr "nazwa u�ytkownika zbyt d�uga.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
-msgstr ""
+msgstr "NAZWA zbyt d�uga"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
-msgstr ""
+msgstr "nazwy u�ytkownik�w nie mog� si� zaczyna� od '-'.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
-msgstr ""
+msgstr "zbyt du�o pustych linii.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
-msgstr ""
+msgstr "NADMIAROWE ko�ce linii"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr ""
+msgstr "Przekroczony limit czasu logowania (sekund: %d)\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
-msgstr ""
+msgstr "Ostatnie logowanie: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
-msgstr ""
+msgstr "z %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
-msgstr ""
+msgstr "na %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr ""
+msgstr "B��DNE LOGOWANIE Z %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr ""
+msgstr "B��DNE LOGOWANIE NA %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr ""
+msgstr "%d B��DNYCH LOGOWA� Z %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr ""
+msgstr "%d B��DNYCH LOGOWA� NA %s, %s"
 
 #: login-utils/mesg.c:89
 #, c-format
 msgid "is y\n"
-msgstr ""
+msgstr "jest w��czone (y)\n"
 
 #: login-utils/mesg.c:92
 #, c-format
 msgid "is n\n"
-msgstr ""
+msgstr "jest wy���zone (n)\n"
 
 #: login-utils/mesg.c:112
 #, c-format
 msgid "usage: mesg [y | n]\n"
-msgstr ""
+msgstr "Sk�adnia: mesg [y | n]\n"
 
 #: login-utils/newgrp.c:99
 msgid "newgrp: Who are you?"
-msgstr ""
+msgstr "newgrp: kim jeste�?"
 
 #: login-utils/newgrp.c:107 login-utils/newgrp.c:121
 msgid "newgrp: setgid"
-msgstr ""
+msgstr "newgrp: setgid"
 
 #: login-utils/newgrp.c:114 login-utils/newgrp.c:116
 msgid "newgrp: No such group."
-msgstr ""
+msgstr "newgrp: nie ma takiej grupy."
 
 #: login-utils/newgrp.c:125
 msgid "newgrp: Permission denied"
-msgstr ""
+msgstr "newgrp: brak uprawnie�"
 
 #: login-utils/newgrp.c:132
 msgid "newgrp: setuid"
-msgstr ""
+msgstr "newgrp: setuid"
 
 #: login-utils/newgrp.c:138
 msgid "No shell"
-msgstr ""
+msgstr "Brak pow�oki"
 
 #: login-utils/shutdown.c:116
 #, c-format
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr ""
+msgstr "Sk�adnia: shutdown [-h|-r] [-fqs] [now|hh:ss|+minut]\n"
 
 #: login-utils/shutdown.c:134
 msgid "Shutdown process aborted"
-msgstr ""
+msgstr "Proces wy��czania przerwany"
 
 #: login-utils/shutdown.c:165
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr ""
+msgstr "%s: Tylko root mo�e wy��czy� system.\n"
 
 #: login-utils/shutdown.c:259
 #, c-format
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr ""
+msgstr "To musi by� jutro, nie zaczeka� do tego czasu?\n"
 
 #: login-utils/shutdown.c:310
 msgid "for maintenance; bounce, bounce"
-msgstr ""
+msgstr "w celu konserwacji"
 
 #: login-utils/shutdown.c:339
 msgid "The system is being shut down within 5 minutes"
-msgstr ""
+msgstr "System wy��czy si� w ci�gu 5 minut"
 
 #: login-utils/shutdown.c:343
 msgid "Login is therefore prohibited."
-msgstr ""
+msgstr "Logowanie nie jest wi�c dozwolone."
 
 #: login-utils/shutdown.c:365
 #, c-format
 msgid "rebooted by %s: %s"
-msgstr ""
+msgstr "zrestartowany przez u�ytkownika %s: %s"
 
 #: login-utils/shutdown.c:368
 #, c-format
 msgid "halted by %s: %s"
-msgstr ""
+msgstr "zatrzymany przez u�ytkownika %s: %s"
 
 #: login-utils/shutdown.c:432
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
+"\n"
+"Czemu nadal �yj� po restarcie?"
 
 #: login-utils/shutdown.c:434
 msgid ""
 "\n"
 "Now you can turn off the power..."
 msgstr ""
+"\n"
+"Teraz mo�na wy��czy� zasilanie..."
 
 #: login-utils/shutdown.c:450
 #, c-format
 msgid "Calling kernel power-off facility...\n"
-msgstr ""
+msgstr "Wywo�ywanie funkcji wy��czenia zasilania w j�drze...\n"
 
 #: login-utils/shutdown.c:453
 #, c-format
 msgid "Error powering off\t%s\n"
-msgstr ""
+msgstr "B��d wy��czania zasilania\t%s\n"
 
 #: login-utils/shutdown.c:461
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr ""
+msgstr "Uruchamianie programu \"%s\"...\n"
 
 #: login-utils/shutdown.c:464
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr ""
+msgstr "B��d uruchamiania\t%s\n"
 
 #: login-utils/shutdown.c:491
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr ""
+msgstr "PILNE: zbiorowy komunikat od u�ytkownika %s:"
 
 #: login-utils/shutdown.c:497
 #, c-format
 msgid "System going down in %d hours %d minutes"
-msgstr ""
+msgstr "System wy��czy si� za %d godzin i %d minut"
 
 #: login-utils/shutdown.c:500
 #, c-format
 msgid "System going down in 1 hour %d minutes"
-msgstr ""
+msgstr "System wy��czy si� za godzin� i %d minut"
 
 #: login-utils/shutdown.c:503
 #, c-format
 msgid "System going down in %d minutes\n"
-msgstr ""
+msgstr "System wy��czy si� za %d minut\n"
 
 #: login-utils/shutdown.c:506
 #, c-format
 msgid "System going down in 1 minute\n"
-msgstr ""
+msgstr "System wy��czy si� za minut�\n"
 
 #: login-utils/shutdown.c:508
 #, c-format
 msgid "System going down IMMEDIATELY!\n"
-msgstr ""
+msgstr "System wy��czy si� ZARAZ!\n"
 
 #: login-utils/shutdown.c:513
 #, c-format
 msgid "\t... %s ...\n"
-msgstr ""
+msgstr "\t... %s ...\n"
 
 #: login-utils/shutdown.c:570
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr ""
+msgstr "Nie mo�na wykona� fork dla swapoff. Ehh..."
 
 #: login-utils/shutdown.c:578
 msgid "Cannot exec swapoff, hoping umount will do the trick."
-msgstr ""
+msgstr "Nie mo�na wykona� swapoff, by� mo�e umount to zrobi."
 
 #: login-utils/shutdown.c:597
 msgid "Cannot fork for umount, trying manually."
-msgstr ""
+msgstr "Nie mo�na wykona� fork dla umount, pr�ba zrobienia tego r�cznie."
 
 #: login-utils/shutdown.c:606
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr ""
+msgstr "Nie mo�na uruchomi� %s, pr�ba uruchomienia umount.\n"
 
 #: login-utils/shutdown.c:610
 msgid "Cannot exec umount, giving up on umount."
-msgstr ""
+msgstr "Nie mo�na uruchomi� umount, pomini�cie odmontowywania."
 
 #: login-utils/shutdown.c:615
 msgid "Unmounting any remaining filesystems..."
-msgstr ""
+msgstr "Odmontowywanie wszystkich pozosta�ych system�w plik�w..."
 
 #: login-utils/shutdown.c:662
 #, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr ""
+msgstr "shutdown: nie uda�o si� odmontowa� %s: %s\n"
 
 #: login-utils/simpleinit.c:132
 msgid "Booting to single user mode.\n"
-msgstr ""
+msgstr "Uruchamianie w trybie jednou�ytkownikowym.\n"
 
 #: login-utils/simpleinit.c:136
 msgid "exec of single user shell failed\n"
-msgstr ""
+msgstr "uruchomienie pow�oki trybu jednou�ytkownikowego nie powiod�o si�\n"
 
 #: login-utils/simpleinit.c:140
 msgid "fork of single user shell failed\n"
 msgstr ""
+"wykonanie fork dla pow�oki trybu jednou�ytkownikowego nie powiod�o si�\n"
 
 #: login-utils/simpleinit.c:208
 msgid "error opening fifo\n"
-msgstr ""
+msgstr "b��d podczas otwierania fifo\n"
 
 #: login-utils/simpleinit.c:212
 msgid "error setting close-on-exec on /dev/initctl"
-msgstr ""
+msgstr "b��d podczas ustawiania flagi close-on-exec na /dev/initctl"
 
 #: login-utils/simpleinit.c:259
 msgid "error running finalprog\n"
-msgstr ""
+msgstr "b��d uruchamiania procesu finalprog\n"
 
 #: login-utils/simpleinit.c:263
 msgid "error forking finalprog\n"
-msgstr ""
+msgstr "b��d podczas wykonywania fork dla procesu finalprog\n"
 
 #: login-utils/simpleinit.c:345
 msgid ""
 "\n"
 "Wrong password.\n"
 msgstr ""
+"\n"
+"B��dne has�o.\n"
 
 #: login-utils/simpleinit.c:418
 msgid "lstat of path failed\n"
-msgstr ""
+msgstr "lstat �cie�ki nie powiod�o si�\n"
 
 #: login-utils/simpleinit.c:426
 msgid "stat of path failed\n"
-msgstr ""
+msgstr "stat �cie�ki nie powiod�o si�\n"
 
 #: login-utils/simpleinit.c:434
 msgid "open of directory failed\n"
-msgstr ""
+msgstr "otwarcie katalogu nie powiod�o si�\n"
 
 #: login-utils/simpleinit.c:501
 #, c-format
 msgid "respawning: \"%s\" too fast: quenching entry\n"
-msgstr ""
+msgstr "zbyt szybkie odradzanie si� \"%s\": wyt�umienie wpisu\n"
 
 #: login-utils/simpleinit.c:509
 msgid "fork failed\n"
-msgstr ""
+msgstr "fork nie powiod�o si�\n"
 
 #: login-utils/simpleinit.c:540 text-utils/more.c:1663
 msgid "exec failed\n"
-msgstr ""
+msgstr "exec nie powiod�o si�\n"
 
 #: login-utils/simpleinit.c:564
 msgid "cannot open inittab\n"
-msgstr ""
+msgstr "nie mo�na otworzy� pliku inittab\n"
 
 #: login-utils/simpleinit.c:631
 msgid "no TERM or cannot stat tty\n"
-msgstr ""
+msgstr "brak TERM lub nie mo�na wykona� stat na tty\n"
 
 #: login-utils/simpleinit.c:938
 #, c-format
-msgid "error stopping service: \"%s\"\n"
-msgstr ""
+msgid "error at stopping service \"%s\"\n"
+msgstr "b��d zatrzymywania us�ugi \"%s\"\n"
 
 #: login-utils/simpleinit.c:950
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped service: %s\n"
-msgstr "Urz�dzenie: %s\n"
+msgstr "Zatrzymano us�ug�: %s\n"
 
 #: login-utils/simpleinit.c:1070
 #, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr ""
+msgid "error at starting service \"%s\"\n"
+msgstr "b��d uruchamiania us�ugi \"%s\"\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr ""
+msgstr "zbyt du�o iov (trzeba zmieni� kod w wall/ttymsg.c)"
 
 #: login-utils/ttymsg.c:85
 #, c-format
 msgid "excessively long line arg"
-msgstr ""
+msgstr "zbyt d�ugi argument"
 
 #: login-utils/ttymsg.c:140
 #, c-format
 msgid "cannot fork"
-msgstr ""
+msgstr "nie mo�na wykona� fork"
 
 #: login-utils/ttymsg.c:144
 #, c-format
 msgid "fork: %s"
-msgstr ""
+msgstr "fork: %s"
 
 #: login-utils/ttymsg.c:174
 #, c-format
 msgid "%s: BAD ERROR"
-msgstr ""
+msgstr "%s: Z�Y B��D"
 
 #: login-utils/vipw.c:143
 #, c-format
 msgid "%s: the password file is busy.\n"
-msgstr ""
+msgstr "%s: plik hase� jest zaj�ty.\n"
 
 #: login-utils/vipw.c:146
 #, c-format
 msgid "%s: the group file is busy.\n"
-msgstr ""
+msgstr "%s: plik grup jest zaj�ty.\n"
 
 #: login-utils/vipw.c:162
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr ""
+msgstr "%s: plik %s jest zaj�ty (istnieje %s\n"
 
 #: login-utils/vipw.c:168
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr ""
+msgstr "%s: nie mo�na dowi�za� %s: %s\n"
 
 #: login-utils/vipw.c:202
 #, c-format
 msgid "%s: Can't get context for %s"
-msgstr ""
+msgstr "%s: nie mo�na uzyska� kontekstu dla %s"
 
 #: login-utils/vipw.c:208
 #, c-format
 msgid "%s: Can't set context for %s"
-msgstr ""
+msgstr "%s: nie mo�na ustawi� kontekstu dla %s"
 
 #: login-utils/vipw.c:217
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
-msgstr ""
+msgstr "%s: nie mo�na odblokowa� %s: %s (zmiany s� nadal w %s)\n"
 
 #: login-utils/vipw.c:240
 #, c-format
 msgid "%s: Cannot fork\n"
-msgstr ""
+msgstr "%s: nie mo�na wykona� fork\n"
 
 #: login-utils/vipw.c:276
 #, c-format
 msgid "%s: %s unchanged\n"
-msgstr ""
+msgstr "%s: %s niezmieniony\n"
 
 #: login-utils/vipw.c:297
 #, c-format
 msgid "%s: no changes made\n"
-msgstr ""
+msgstr "%s: nie wykonano zmian\n"
 
 #: login-utils/vipw.c:350
 #, c-format
 msgid "You are using shadow groups on this system.\n"
-msgstr ""
+msgstr "W tym systemie u�ywane s� grupy ukryte (shadow).\n"
 
 #: login-utils/vipw.c:351
 #, c-format
 msgid "You are using shadow passwords on this system.\n"
-msgstr ""
+msgstr "W tym systemie u�ywane s� has�a ukryte (shadow).\n"
 
 #: login-utils/vipw.c:352
 #, c-format
 msgid "Would you like to edit %s now [y/n]? "
-msgstr ""
+msgstr "Czy modyfikowa� teraz %s [y/n]? "
 
 #: login-utils/wall.c:112
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr ""
+msgstr "Sk�adnia: %s [plik]\n"
 
 #: login-utils/wall.c:167
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr ""
+msgstr "%s: nie mo�na otworzy� pliku tymczasowego.\n"
 
 #: login-utils/wall.c:194
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr ""
+msgstr "Zbiorowy komunikat od u�ytkownika %s@%s"
 
 #: login-utils/wall.c:212
 #, c-format
 msgid "%s: will not read %s - use stdin.\n"
-msgstr ""
+msgstr "%s: odmowa czytania %s - u�yte b�dzie standardowe wej�cie.\n"
 
 #: login-utils/wall.c:217
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr ""
+msgstr "%s: nie mo�na odczyta� %s.\n"
 
 #: login-utils/wall.c:240
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr ""
+msgstr "%s: nie mo�na wykona� stat na pliku tymczasowym.\n"
 
 #: login-utils/wall.c:250
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr ""
+msgstr "%s: nie mo�na odczyta� pliku tymczasowego.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
-msgstr ""
+msgstr "niedozwolona warto�� dnia: dopuszczalne to 1-%d"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
-msgstr ""
+msgstr "niedozwolona warto�� miesi�ca: dopuszczalne to 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
-msgstr ""
+msgstr "niedozwolona warto�� roku: dopuszczalne to 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
-msgstr ""
+msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
-msgstr ""
+msgstr "Sk�adnia: cal [-13smjyV] [[[dzie�] miesi�c] rok]\n"
 
 #: misc-utils/ddate.c:203
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr ""
+msgstr "Sk�adnia: %s [+format] [dzie� miesi�c rok]\n"
 
 #: misc-utils/ddate.c:250
 msgid "St. Tib's Day"
-msgstr ""
+msgstr "Dzie� �wi�tego Tiba"
 
 #: misc-utils/findfs.c:24
 #, c-format
 msgid "Usage: %s LABEL=<label>|UUID=<uuid>\n"
-msgstr ""
+msgstr "Sk�adnia: %s LABEL=<etykieta>|UUID=<uuid>\n"
 
 #: misc-utils/findfs.c:55
-#, fuzzy, c-format
+#, c-format
 msgid "unable to resolve '%s'"
-msgstr "nie mo�na otworzy� '%s'"
+msgstr "nie mo�na odnale�� '%s'"
+
+#: misc-utils/findmnt.c:192
+#, c-format
+msgid "unknown column: %s"
+msgstr "nieznana kolumna: %s"
+
+#: misc-utils/findmnt.c:308
+msgid "failed to add line to output"
+msgstr "nie uda�o si� doda� linii do wyj�cia"
+
+#: misc-utils/findmnt.c:359
+msgid "failed to initialize libmount tab"
+msgstr "nie uda�o si� zainicjowa� tablicy libmount"
+
+#: misc-utils/findmnt.c:364
+#, c-format
+msgid "can't read: %s"
+msgstr "nie mo�na odczyta�: %s"
+
+#: misc-utils/findmnt.c:370
+#, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: b��d analizy: %s"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+"\n"
+"Sk�adnia:\n"
+" %1$s [opcje]\n"
+" %1$s [opcje] <urz�dzenie> | <punkt_montowania>\n"
+" %1$s [opcje] <urz�dzenie> <punkt_montowania>\n"
+" %1$s [opcje] [--source <urz�dzenie>] [--target <punkt_montowania>]\n"
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+"\n"
+"Opcje:\n"
+" -s, --fstab            szukanie w statycznej tablicy system�w plik�w\n"
+" -m, --mtab             szukanie w tablicy zamontowanych system�w plik�w\n"
+" -k, --kernel           szukanie w tablicy zamontowanych system�w plik�w\n"
+"                        w j�drze (domy�lne)\n"
+"\n"
+" -c, --canonicalize     wypisywanie �cie�ek w postaci kanonicznej\n"
+" -d, --direction <typ>  kierunek wyszukiwania - 'prz�d' lub 'ty�'\n"
+" -e, --evaluate         wypisanie wszystkich znanych znacznik�w (LABEL/"
+"UUID)\n"
+" -f, --first-only       wypisanie tylko pierwszego znalezionego systemu "
+"plik�w\n"
+" -h, --help             wy�wietlenie tego opisu\n"
+" -i, --invert           odwr�cenie dopasowania\n"
+" -l, --list             wyj�cie w postaci listy\n"
+" -n, --noheadings       bez wypisywania nag��wk�w\n"
+" -u, --notruncate       bez skracania tekstu w kolumnach\n"
+" -O, --options <lista>  ograniczenie zbioru system�w plik�w wg opcji mounta\n"
+" -o, --output <lista>   wypisywanie kolumn\n"
+" -r, --raw              wyj�cie w postaci surowej\n"
+" -a, --ascii            u�ycie znak�w ASCII do formatowania drzewa\n"
+" -t, --types <lista>    ograniczenie zbioru system�w plik�w wg typu FS\n"
+" -S, --source <�a�cuch> urz�dzenie, LABEL= lub UUID=urz�dzenie\n"
+" -T, --target <�a�cuch> punkt montowania\n"
+"\n"
+
+#: misc-utils/findmnt.c:483
+#, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Wi�cej informacji w findmnt(1).\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr "opcje wykluczaj� si� wzajemnie"
+
+#: misc-utils/findmnt.c:564
+#, c-format
+msgid "unknown direction '%s'"
+msgstr "nieznany kierunek '%s'"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+"opcji --target i --source nie mo�na u�ywa� jednocze�nie z elementem "
+"polecenia, kt�ry nie jest opcj�"
+
+#: misc-utils/findmnt.c:679
+msgid "failed to initialize libmount iterator"
+msgstr "nie uda�o si� zainicjowa� iteratora libmount"
+
+#: misc-utils/findmnt.c:685
+msgid "failed to initialize libmount cache"
+msgstr "nie uda�o si� zainicjowa� pami�ci podr�cznej libmount"
+
+#: misc-utils/findmnt.c:695
+msgid "failed to initialize output table"
+msgstr "nie uda�o si� zainicjowa� tabeli wyj�ciowej"
+
+#: misc-utils/findmnt.c:707
+msgid "failed to initialize output column"
+msgstr "nie uda�o si� zainicjowa� kolumny wyj�ciowej"
 
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
-msgstr ""
+msgstr "%s: nieznany sygna� %s\n"
 
 #: misc-utils/kill.c:270
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr ""
+msgstr "%s: nie znaleziono procese \"%s\"\n"
 
 #: misc-utils/kill.c:314
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
-msgstr ""
+msgstr "%s: nieznany sygna� %s; poprawne sygna�y:\n"
 
 #: misc-utils/kill.c:354
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr ""
+msgstr "Sk�adnia: %s [ -s sygna� | -p ] [ -a ] PID ...\n"
 
 #: misc-utils/kill.c:355
 #, c-format
 msgid "       %s -l [ signal ]\n"
-msgstr ""
+msgstr "          %s -l [ sygna� ]\n"
 
 #: misc-utils/logger.c:67
 #, c-format
 msgid "logger: openlog: pathname too long\n"
-msgstr ""
+msgstr "logger: openlog: �cie�ka zbyt d�uga\n"
 
 #: misc-utils/logger.c:75
-#, fuzzy, c-format
+#, c-format
 msgid "socket: %s.\n"
-msgstr "RozmiarBloku: %d\n"
+msgstr "socket: %s.\n"
 
 #: misc-utils/logger.c:80
 #, c-format
 msgid "connect: %s.\n"
-msgstr ""
+msgstr "connect: %s.\n"
 
 #: misc-utils/logger.c:139
 #, c-format
 msgid "logger: %s: %s.\n"
-msgstr ""
+msgstr "logger: %s: %s.\n"
 
 #: misc-utils/logger.c:246
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr ""
+msgstr "logger: nieznana nazwa kategorii: %s.\n"
 
 #: misc-utils/logger.c:258
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr ""
+msgstr "logger: nieznana nazwa priorytetu: %s.\n"
 
 #: misc-utils/logger.c:285
 #, c-format
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
+"Sk�adnia: logger [-is] [-f plik] [-p priorytet] [-t znacznik] [-u gniazdo] "
+"[ komunikat ... ]\n"
 
 #: misc-utils/look.c:351
 #, c-format
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr ""
+msgstr "Sk�adnia: look [-dfa] [-t znak] �a�cuch [plik]\n"
 
 #: misc-utils/mcookie.c:105 misc-utils/mcookie.c:132
 #, c-format
 msgid "Could not open %s\n"
-msgstr ""
+msgstr "Nie mo�na otworzy� %s\n"
 
 #: misc-utils/mcookie.c:109 misc-utils/mcookie.c:128
 #, c-format
 msgid "Got %d bytes from %s\n"
-msgstr ""
+msgstr "Odebrano %d bajt�w od %s\n"
 
 #: misc-utils/namei.c:143 misc-utils/namei.c:198 misc-utils/namei.c:225
 #: misc-utils/namei.c:245 misc-utils/namei.c:252 misc-utils/namei.c:294
-#, fuzzy
 msgid "out of memory?"
-msgstr "%s: Zabrak�o pami�ci!\n"
+msgstr "brak pami�ci?"
 
 #: misc-utils/namei.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "failed to read symlink: %s"
-msgstr "%s: nie uda�o si� otworzy�: %s\n"
+msgstr "nie uda�o si� odczyta� dowi�zania symbolicznego: %s"
 
 #: misc-utils/namei.c:231 misc-utils/namei.c:254
 #, c-format
 msgid "could not stat '%s'"
-msgstr ""
+msgstr "nie uda�o si� wykona� stat na '%s'"
 
 #: misc-utils/namei.c:449
 #, c-format
@@ -7861,6 +8168,8 @@ msgid ""
 "\n"
 "Usage: %s [options] pathname [pathname ...]\n"
 msgstr ""
+"\n"
+"Sk�adnia: %s [opcje] �cie�ka [�cie�ka ...]\n"
 
 #: misc-utils/namei.c:450
 #, c-format
@@ -7868,6 +8177,8 @@ msgid ""
 "\n"
 "Options:\n"
 msgstr ""
+"\n"
+"Opcje:\n"
 
 #: misc-utils/namei.c:453
 #, c-format
@@ -7880,6 +8191,13 @@ msgid ""
 " -n, --nosymlinks    don't follow symlinks\n"
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
+" -h, --help          wy�wietlenie tego opisu\n"
+" -x, --mountpoints   wypisanie katalog�w punkt�w montowania z 'D'\n"
+" -m, --modes         wypisanie bit�w uprawnie� ka�dego pliku\n"
+" -o, --owners        wypisanie w�a�ciciela i grupy ka�dego pliku\n"
+" -l, --long          u�ycie d�ugiego formatu listy (-m -o -v)\n"
+" -n, --nosymlinks    bez pod��ania za dowi�zaniami symbolicznymi\n"
+" -v, --vertical      pionowe wyr�wnanie uprawnie� i w�a�cicieli\n"
 
 #: misc-utils/namei.c:461
 #, c-format
@@ -7887,699 +8205,724 @@ msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
+"\n"
+"Wi�cej informacji w namei(1).\n"
 
 #: misc-utils/namei.c:522
-#, fuzzy, c-format
+#, c-format
 msgid "failed to stat: %s"
-msgstr "%s: nie uda�o si� otworzy�: %s\n"
+msgstr "nie uda�o si� wykona� stat: %s"
 
 #: misc-utils/namei.c:533
 #, c-format
 msgid "%s: exceeded limit of symlinks"
-msgstr ""
+msgstr "%s: przekroczono limit dowi�za� symbolicznych"
 
 #: misc-utils/rename.c:38
 #, c-format
 msgid "%s: out of memory\n"
-msgstr ""
+msgstr "%s: brak pami�ci\n"
 
 #: misc-utils/rename.c:56
 #, c-format
 msgid "%s: renaming %s to %s failed: %s\n"
-msgstr ""
+msgstr "%s: zmiana nazwy %s na %s nie powiod�a si�: %s\n"
 
 #: misc-utils/rename.c:86
 #, c-format
 msgid "call: %s from to files...\n"
-msgstr ""
+msgstr "Sk�adnia: %s z na pliki...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, 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 ""
+"Uwaga: `%s' jest dowi�zaniem.\n"
+"Prosz� u�y� `%s [opcje] %s', je�eli naprawd� ma by u�yty.\n"
+"Skrypt nie uruchomiony.\n"
 
-#: misc-utils/script.c:173
+#: misc-utils/script.c:182
 #, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
-msgstr ""
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
+msgstr "Sk�adnia: script [-a] [-e] [-f] [-q] [-t] [plik]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr ""
+msgstr "Skrypt uruchomiony, plik to %s\n"
 
-#: misc-utils/script.c:244
-#, fuzzy, c-format
+#: misc-utils/script.c:264
+#, c-format
 msgid "%s: write error %d: %s\n"
-msgstr "%s: b��d odczytu na %s\n"
+msgstr "%s: b��d zapisu %d: %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
-msgstr ""
+msgstr "Skrypt uruchomiony %s"
 
-#: misc-utils/script.c:347
-#, fuzzy, c-format
+#: misc-utils/script.c:358
+#, c-format
 msgid "%s: write error: %s\n"
-msgstr "%s: b��d odczytu na %s\n"
+msgstr "%s: b��d zapisu: %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
-msgstr ""
+msgstr "%s: nie mo�na zapisa� pliku skryptu, b��d: %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
+"\n"
+"Skrypt wykonany %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr ""
+msgstr "Skrypt wykonany, plik to %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
-msgstr ""
+msgstr "openpty nie powiod�o si�\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
-msgstr ""
+msgstr "Brak wolnych pty\n"
 
 #: misc-utils/scriptreplay.c:38
 #, c-format
 msgid "%s <timingfile> [<typescript> [<divisor>]]\n"
-msgstr ""
+msgstr "%s <plik_czas�w> [<skrypt> [<dzielnik>]]\n"
 
 #: misc-utils/scriptreplay.c:53
 #, c-format
 msgid "expected a number, but got '%s'"
-msgstr ""
+msgstr "oczekiwano liczby, otrzymano '%s'"
 
 #: misc-utils/scriptreplay.c:56 misc-utils/scriptreplay.c:60
 #, c-format
 msgid "divisor '%s'"
-msgstr ""
+msgstr "dzielnik '%s'"
 
 #: misc-utils/scriptreplay.c:104
 msgid "write to stdout failed"
-msgstr ""
+msgstr "zapis na standardowe wyj�cie nie powi�d� si�"
 
 #: misc-utils/scriptreplay.c:110
 #, c-format
 msgid "unexpected end of file on %s"
-msgstr ""
+msgstr "nieoczekiwany koniec pliku %s"
 
 #: misc-utils/scriptreplay.c:112
 #, c-format
 msgid "failed to read typescript file %s"
-msgstr ""
+msgstr "nie uda�o si� odczyta� pliku skryptu %s"
 
 #: misc-utils/scriptreplay.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open timing file %s"
-msgstr "nie mo�na otworzy� %s"
+msgstr "nie mo�na pliku czas�w %s"
 
 #: misc-utils/scriptreplay.c:148
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open typescript file %s"
-msgstr "nie mo�na otworzy� %s"
+msgstr "nie mo�na otworzy� pliku skryptu %s"
 
 #: misc-utils/scriptreplay.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "failed to read timing file %s"
-msgstr "Nie mo�na odczyta� i-w�z��w"
+msgstr "nie uda�o si� odczyta� pliku czas�w %s"
 
 #: misc-utils/scriptreplay.c:166
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
-msgstr ""
+msgstr "plik czas�w %s: %lu: nieoczekiwany format"
 
 #: misc-utils/setterm.c:759
 #, c-format
 msgid "%s: Argument error, usage\n"
-msgstr ""
+msgstr "%s: B��d argumentu, sk�adnia\n"
 
 #: misc-utils/setterm.c:762
 #, c-format
 msgid "  [ -term terminal_name ]\n"
-msgstr ""
+msgstr "  [ -term nazwa_terminala ]\n"
 
 #: misc-utils/setterm.c:763
 #, c-format
 msgid "  [ -reset ]\n"
-msgstr ""
+msgstr "  [ -reset ]\n"
 
 #: misc-utils/setterm.c:764
 #, c-format
 msgid "  [ -initialize ]\n"
-msgstr ""
+msgstr "  [ -initialize ]\n"
 
 #: misc-utils/setterm.c:765
 #, c-format
 msgid "  [ -cursor [on|off] ]\n"
-msgstr ""
+msgstr "  [ -cursor [on|off] ]\n"
 
 #: misc-utils/setterm.c:767
 #, c-format
 msgid "  [ -snow [on|off] ]\n"
-msgstr ""
+msgstr "  [ -snow [on|off] ]\n"
 
 #: misc-utils/setterm.c:768
 #, c-format
 msgid "  [ -softscroll [on|off] ]\n"
-msgstr ""
+msgstr "  [ -softscroll [on|off] ]\n"
 
 #: misc-utils/setterm.c:770
 #, c-format
 msgid "  [ -repeat [on|off] ]\n"
-msgstr ""
+msgstr "  [ -repeat [on|off] ]\n"
 
 #: misc-utils/setterm.c:771
 #, c-format
 msgid "  [ -appcursorkeys [on|off] ]\n"
-msgstr ""
+msgstr "  [ -appcursorkeys [on|off] ]\n"
 
 #: misc-utils/setterm.c:772
 #, c-format
 msgid "  [ -linewrap [on|off] ]\n"
-msgstr ""
+msgstr "  [ -linewrap [on|off] ]\n"
 
 #: misc-utils/setterm.c:773
 #, c-format
 msgid "  [ -default ]\n"
-msgstr ""
+msgstr "  [ -default ]\n"
 
 #: misc-utils/setterm.c:774
 #, c-format
 msgid "  [ -foreground black|blue|green|cyan"
-msgstr ""
+msgstr "  [ -foreground black|blue|green|cyan"
 
 #: misc-utils/setterm.c:775 misc-utils/setterm.c:777
 #, c-format
 msgid "|red|magenta|yellow|white|default ]\n"
-msgstr ""
+msgstr "|red|magenta|yellow|white|default ]\n"
 
 #: misc-utils/setterm.c:776
 #, c-format
 msgid "  [ -background black|blue|green|cyan"
-msgstr ""
+msgstr "  [ -background black|blue|green|cyan"
 
 #: misc-utils/setterm.c:778
 #, c-format
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
-msgstr ""
+msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
 #: misc-utils/setterm.c:779 misc-utils/setterm.c:781 misc-utils/setterm.c:783
 #: misc-utils/setterm.c:785
 #, c-format
 msgid "|red|magenta|yellow|white ]\n"
-msgstr ""
+msgstr "|red|magenta|yellow|white ]\n"
 
 #: misc-utils/setterm.c:780
 #, c-format
 msgid "  [ -ulcolor bright blue|green|cyan"
-msgstr ""
+msgstr "  [ -ulcolor bright blue|green|cyan"
 
 #: misc-utils/setterm.c:782
 #, c-format
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
-msgstr ""
+msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
 #: misc-utils/setterm.c:784
 #, c-format
 msgid "  [ -hbcolor bright blue|green|cyan"
-msgstr ""
+msgstr "  [ -hbcolor bright blue|green|cyan"
 
 #: misc-utils/setterm.c:787
 #, c-format
 msgid "  [ -standout [ attr ] ]\n"
-msgstr ""
+msgstr "  [ -standout [ atr ] ]\n"
 
 #: misc-utils/setterm.c:789
 #, c-format
 msgid "  [ -inversescreen [on|off] ]\n"
-msgstr ""
+msgstr "  [ -inversescreen [on|off] ]\n"
 
 #: misc-utils/setterm.c:790
 #, c-format
 msgid "  [ -bold [on|off] ]\n"
-msgstr ""
+msgstr "  [ -bold [on|off] ]\n"
 
 #: misc-utils/setterm.c:791
 #, c-format
 msgid "  [ -half-bright [on|off] ]\n"
-msgstr ""
+msgstr "  [ -half-bright [on|off] ]\n"
 
 #: misc-utils/setterm.c:792
 #, c-format
 msgid "  [ -blink [on|off] ]\n"
-msgstr ""
+msgstr "  [ -blink [on|off] ]\n"
 
 #: misc-utils/setterm.c:793
 #, c-format
 msgid "  [ -reverse [on|off] ]\n"
-msgstr ""
+msgstr "  [ -reverse [on|off] ]\n"
 
 #: misc-utils/setterm.c:794
 #, c-format
 msgid "  [ -underline [on|off] ]\n"
-msgstr ""
+msgstr "  [ -underline [on|off] ]\n"
 
 #: misc-utils/setterm.c:795
 #, c-format
 msgid "  [ -store ]\n"
-msgstr ""
+msgstr "  [ -store ]\n"
 
 #: misc-utils/setterm.c:796
 #, c-format
 msgid "  [ -clear [all|rest] ]\n"
-msgstr ""
+msgstr "  [ -clear [all|rest] ]\n"
 
 #: misc-utils/setterm.c:797
 #, c-format
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-msgstr ""
+msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
 #: misc-utils/setterm.c:798
 #, c-format
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-msgstr ""
+msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
 #: misc-utils/setterm.c:799
 #, c-format
 msgid "  [ -regtabs [1-160] ]\n"
-msgstr ""
+msgstr "  [ -regtabs [1-160] ]\n"
 
 #: misc-utils/setterm.c:800
 #, c-format
 msgid "  [ -blank [0-60|force|poke] ]\n"
-msgstr ""
+msgstr "  [ -blank [0-60|force|poke] ]\n"
 
 #: misc-utils/setterm.c:801
 #, c-format
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgstr "  [ -dump   [1-LICZBA_KONSOL] ]\n"
 
 #: misc-utils/setterm.c:802
 #, c-format
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
-msgstr ""
+msgstr "  [ -append [1-LICZBA_KONSOL] ]\n"
 
 #: misc-utils/setterm.c:803
 #, c-format
 msgid "  [ -file dumpfilename ]\n"
-msgstr ""
+msgstr "  [ -file plik_zrzutu ]\n"
 
 #: misc-utils/setterm.c:804
 #, c-format
 msgid "  [ -msg [on|off] ]\n"
-msgstr ""
+msgstr "  [ -msg [on|off] ]\n"
 
 #: misc-utils/setterm.c:805
 #, c-format
 msgid "  [ -msglevel [0-8] ]\n"
-msgstr ""
+msgstr "  [ -msglevel [0-8] ]\n"
 
 #: misc-utils/setterm.c:806
 #, c-format
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-msgstr ""
+msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
 #: misc-utils/setterm.c:807
 #, c-format
 msgid "  [ -powerdown [0-60] ]\n"
-msgstr ""
+msgstr "  [ -powerdown [0-60] ]\n"
 
 #: misc-utils/setterm.c:808
 #, c-format
 msgid "  [ -blength [0-2000] ]\n"
-msgstr ""
+msgstr "  [ -blength [0-2000] ]\n"
 
 #: misc-utils/setterm.c:809
 #, c-format
 msgid "  [ -bfreq freqnumber ]\n"
-msgstr ""
+msgstr "  [ -bfreq cz�stotliwo�� ]\n"
 
 #: misc-utils/setterm.c:1061
-#, fuzzy, c-format
+#, c-format
 msgid "cannot force blank\n"
-msgstr "nie mo�na otworzy� %s"
+msgstr "nie mo�na wymusi� wygaszenia\n"
 
 #: misc-utils/setterm.c:1065
 #, c-format
 msgid "cannot force unblank\n"
-msgstr ""
+msgstr "nie mo�na wymusi� braku wygaszenia\n"
 
 #: misc-utils/setterm.c:1071
 #, c-format
 msgid "cannot get blank status\n"
-msgstr ""
+msgstr "nie mo�na odczyta� stanu wygaszenia\n"
 
 #: misc-utils/setterm.c:1083
 #, c-format
 msgid "cannot (un)set powersave mode\n"
-msgstr ""
+msgstr "nie mo�na w��czy�/wy��czy� trybu oszcz�dzania energii\n"
 
 #: misc-utils/setterm.c:1122 misc-utils/setterm.c:1130
 #, c-format
 msgid "klogctl error: %s\n"
-msgstr ""
+msgstr "b��d klogctl: %s\n"
 
 #: misc-utils/setterm.c:1196
 #, c-format
 msgid "Error writing screendump\n"
-msgstr ""
+msgstr "B��d zapisu zrzutu ekranu\n"
 
 #: misc-utils/setterm.c:1203
 #, c-format
 msgid "Couldn't read %s\n"
-msgstr ""
+msgstr "Nie mo�na odczyta� %s\n"
 
 #: misc-utils/setterm.c:1257
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr ""
+msgstr "%s: nie zdefiniowano $TERM.\n"
 
 #: misc-utils/uuidd.c:46
 #, c-format
 msgid "Usage: %s [-d] [-p pidfile] [-s socketpath] [-T timeout]\n"
-msgstr ""
+msgstr "Sk�adnia: %s [-d] [-p plik_pid] [-s gniazdo] [-T limit_czasu]\n"
 
 #: misc-utils/uuidd.c:48
 #, c-format
 msgid "       %s [-r|t] [-n num] [-s socketpath]\n"
-msgstr ""
+msgstr "          %s [-r|t] [-n liczba] [-s gniazdo]\n"
 
 #: misc-utils/uuidd.c:50
 #, c-format
 msgid "       %s -k\n"
-msgstr ""
+msgstr "          %s -k\n"
 
 #: misc-utils/uuidd.c:152
 msgid "bad arguments"
-msgstr ""
+msgstr "b��dne argumenty"
 
 #: misc-utils/uuidd.c:159
 msgid "socket"
-msgstr ""
+msgstr "socket"
 
 #: misc-utils/uuidd.c:170
 msgid "connect"
-msgstr ""
+msgstr "connect"
 
 #: misc-utils/uuidd.c:189
 msgid "write"
-msgstr ""
+msgstr "zapis"
 
 #: misc-utils/uuidd.c:197
 msgid "read count"
-msgstr ""
+msgstr "odczytany rozmiar"
 
 #: misc-utils/uuidd.c:203
 msgid "bad response length"
-msgstr ""
+msgstr "b��dna d�ugo�� odpowiedzi"
+
+#: misc-utils/uuidd.c:244
+#, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "Nie uda�o si� otworzy�/utworzy� %s: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "Nie uda�o si� zablokowa� %s: %s\n"
 
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
-msgstr ""
+msgstr "demon uuidd ju� dzia�a z pidem %s\n"
 
 #: misc-utils/uuidd.c:276
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
-msgstr ""
+msgstr "Nie uda�o si� utworzy� gniazda uniksowego: %s"
 
 #: misc-utils/uuidd.c:305
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
-msgstr ""
+msgstr "Nie uda�o si� dowi�za� gniazda uniksowego %s: %s\n"
 
 #: misc-utils/uuidd.c:313
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
-msgstr ""
+msgstr "Nie uda�o si� uruchomi� nas�uchiwania na gnie�dzie uniksowym %s: %s\n"
 
 #: misc-utils/uuidd.c:351
 #, c-format
 msgid "Error reading from client, len = %d\n"
-msgstr ""
+msgstr "B��d odczytu od klienta, d�ugo�� = %d\n"
 
 #: misc-utils/uuidd.c:359
 #, c-format
 msgid "operation %d, incoming num = %d\n"
-msgstr ""
+msgstr "operacja %d, odebrana liczba = %d\n"
+
+#: misc-utils/uuidd.c:362
+#, c-format
+msgid "operation %d\n"
+msgstr "operacja %d\n"
 
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
-msgstr ""
+msgstr "Wygenerowany UUID czasowy: %s\n"
 
 #: misc-utils/uuidd.c:388
 #, c-format
 msgid "Generated random UUID: %s\n"
-msgstr ""
+msgstr "Wygenerowany UUID losowy: %s\n"
 
 #: misc-utils/uuidd.c:397
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgstr "Wygenerowany UUID czasowy %s i %d kolejnych\n"
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
-msgstr ""
+msgid "Generated %d UUIDs:\n"
+msgstr "Wygenerowane UUID-y w liczbie %d:\n"
 
 #: misc-utils/uuidd.c:427
 #, c-format
 msgid "Invalid operation %d\n"
-msgstr ""
+msgstr "Nieprawid�owa operacja %d\n"
 
 #: misc-utils/uuidd.c:468 misc-utils/uuidd.c:489
 #, c-format
 msgid "Bad number: %s\n"
-msgstr ""
+msgstr "B��dna liczba: %s\n"
 
 #: misc-utils/uuidd.c:524 misc-utils/uuidd.c:551
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
-msgstr ""
+msgstr "B��d wywo�ania demona uuidd (%s): %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
-msgstr ""
+msgid "%s and subsequent %d UUIDs\n"
+msgstr "%s i kolejne UUID-y w liczbie %d\n"
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
-msgstr ""
+msgid "List of UUIDs:\n"
+msgstr "Lista UUID-�w:\n"
 
 #: misc-utils/uuidd.c:557
 #, c-format
 msgid "Unexpected reply length from server %d\n"
-msgstr ""
+msgstr "Nieoczekiwana d�ugo�� odpowiedzi od serwera %d\n"
 
 #: misc-utils/uuidd.c:574
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
-msgstr ""
+msgstr "Nie uda�o si� zabi� uuidd dzia�aj�cego z pidem %d: %s\n"
 
 #: misc-utils/uuidd.c:580
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
-msgstr ""
+msgstr "Zabito uuidd dzia�aj�cego z pidem %d\n"
 
 #: misc-utils/uuidgen.c:32
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-r] [-t]\n"
-msgstr "u�ycie: %s [ -n ] urz�dzenie\n"
+msgstr "Sk�adnia: %s [-r] [-t]\n"
 
 #: misc-utils/whereis.c:159
 #, c-format
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
-msgstr ""
+msgstr "whereis [ -sbmu ] [ -SBM katalog ... -f ] nazwa...\n"
 
-#: misc-utils/wipefs.c:128
-#, fuzzy
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
-msgstr "malloc nie powiod�o si�"
+msgstr "calloc nie powiod�o si�"
 
-#: misc-utils/wipefs.c:150
-#, fuzzy
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
-msgstr "%s nie powiod�o si�.\n"
+msgstr "strdup nie powiod�o si�"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr ""
+#: misc-utils/wipefs.c:202
+#, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "b��d: %s: inicjalizacja pr�bowania nie powiod�a si�"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
-msgstr ""
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "UWAGA: %s: wydaje si� zawiera� tablic� partycji '%s'"
+
+#: misc-utils/wipefs.c:259
+#, c-format
+msgid "no magic string found at offset 0x%jx -- ignored"
+msgstr "nie znaleziono �a�cucha magicznego pod offsetem 0x%jx - zignorowano"
 
-#: misc-utils/wipefs.c:250
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:266
+#, c-format
 msgid "%s: failed to seek to offset 0x%jx"
-msgstr "%s: nie uda�o si� otworzy�: %s\n"
+msgstr "%s: nie uda�o si� zmieni� po�o�enia na 0x%jx"
 
-#: misc-utils/wipefs.c:257
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:273
+#, c-format
 msgid "%s: write failed"
 msgstr "zapis nie powi�d� si�: %s"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, c-format
 msgid "%zd bytes ["
-msgstr ""
+msgstr "%zd bajt�w ["
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
-msgstr ""
+msgstr "] usuni�to pod offsetem 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, c-format
 msgid "%s: open failed"
-msgstr ""
+msgstr "%s: nie uda�o si� otworzy�"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, c-format
-msgid "invalid offset '%s' value specified"
-msgstr ""
-
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Sk�adnia: %s [opcje] urz�dzenie...\n"
+msgid "invalid offset value '%s' specified"
+msgstr "podano b��dn� warto�� offsetu '%s'"
 
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
+" -a, --all           usuni�cie wszystkich �a�cuch�w magicznych (OSTRO�NIE!)\n"
+" -h, --help          wy�wietlenie tego opisu\n"
+" -n, --no-act        wszystko poza w�a�ciwymi operacjami zapisu\n"
+" -o, --offset <n>    offset do usuni�cia w bajtach\n"
+" -p, --parsable      wyj�cie w formacie do przetworzenia\n"
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
+"\n"
+"Wi�cej informacji w wipefs(8).\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
-msgstr ""
+msgstr "--offset i --all wykluczaj� si� wzajemnie"
 
 #: misc-utils/write.c:101
 #, c-format
 msgid "write: can't find your tty's name\n"
-msgstr ""
+msgstr "write: nie znaleziono nazwy tty\n"
 
 #: misc-utils/write.c:112
 #, c-format
 msgid "write: you have write permission turned off.\n"
-msgstr ""
+msgstr "write: prawo zapisu jest wy��czone.\n"
 
 #: misc-utils/write.c:133
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr ""
+msgstr "write: u�ytkownik %s nie jest zalogowany na %s.\n"
 
 #: misc-utils/write.c:141
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr ""
+msgstr "write: %s ma wy��czone komunikaty na %s\n"
 
 #: misc-utils/write.c:148
 #, c-format
 msgid "usage: write user [tty]\n"
-msgstr ""
+msgstr "Sk�adnia: write u�ytkownik [tty]\n"
 
 #: misc-utils/write.c:236
 #, c-format
 msgid "write: %s is not logged in\n"
-msgstr ""
+msgstr "write: u�ytkownik %s nie jest zalogowany\n"
 
 #: misc-utils/write.c:245
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr ""
+msgstr "write: %s ma wy��czone komunikaty\n"
 
 #: misc-utils/write.c:249
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
-msgstr ""
+msgstr "write: u�ytkownik %s jest zalogowany wi�cej ni� raz; napisano na %s\n"
 
 #: misc-utils/write.c:317
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
-msgstr ""
+msgstr "Komunikat od %s@%s (jako %s) na %s o %s..."
 
 #: misc-utils/write.c:320
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr ""
+msgstr "Komunikat od %s@%s na %s o %s..."
 
 #: mount/fstab.c:144
 #, c-format
 msgid "warning: error reading %s: %s"
-msgstr ""
+msgstr "uwaga: b��d odczytu %s: %s"
 
 #: mount/fstab.c:172 mount/fstab.c:197
 #, c-format
 msgid "warning: can't open %s: %s"
-msgstr ""
+msgstr "uwaga: nie mo��a otworzy� %s: %s"
 
 #: mount/fstab.c:177
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr ""
+msgstr "mount: nie uda�o si� otworzy� %s - u�ycie %s\n"
 
 #: mount/fstab.c:590
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr ""
+msgstr "nie mo�na utworzy� pliku blokady %s: %s (opcja -n pominie to)"
 
 #: mount/fstab.c:616
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr ""
+msgstr "nie mo�na dowi�za� pliku blokady %s: %s (opcja -n pominie to)"
 
 #: mount/fstab.c:632
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr ""
+msgstr "nie mo�na otworzy� pliku blokady %s: %s (opcja -n pominie to)"
 
 #: mount/fstab.c:647
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr ""
+msgstr "Nie mo�na zablokowa� pliku blokady %s: %s\n"
 
 #: mount/fstab.c:661
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr ""
+msgstr "nie mo�na zablokowa� pliku blokady %s: %s"
 
 #: mount/fstab.c:663
 msgid "timed out"
-msgstr ""
+msgstr "up�yn�� limit czasu"
 
 #: mount/fstab.c:670
 #, c-format
@@ -8587,87 +8930,89 @@ msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
+"Nie mo�na utworzy� dowi�zania %s\n"
+"By� mo�e pozosta� nieaktualny plik blokady?\n"
 
 #: mount/fstab.c:792 mount/fstab.c:847
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr ""
+msgstr "nie mo�na otworzy� %s (%s) - nie uaktualniono pliku mtab"
 
 #: mount/fstab.c:856
 #, c-format
 msgid "error writing %s: %s"
-msgstr ""
+msgstr "b��d zapisu %s: %s"
 
 #: mount/fstab.c:874
 #, c-format
 msgid "error changing mode of %s: %s\n"
-msgstr ""
+msgstr "b��d podczas zmiany uprawnie� pliku %s: %s\n"
 
 #: mount/fstab.c:887
 #, c-format
 msgid "error changing owner of %s: %s\n"
-msgstr ""
+msgstr "b��d podczas zmiany w�a�ciciela pliku %s: %s\n"
 
 #: mount/fstab.c:898
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr ""
+msgstr "nie mo�na zmieni� nazwy %s na %s: %s\n"
 
 #: mount/lomount.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
-msgstr "%s: nie mo�na otworzy� %s\n"
+msgstr "loop: nie mo�na ustawi� pojemno�ci urz�dzenia %s: %s\n"
 
 #: mount/lomount.c:386
 #, c-format
 msgid ", offset %<PRIu64>"
-msgstr ""
+msgstr ", offset %<PRIu64>"
 
 #: mount/lomount.c:389
 #, c-format
 msgid ", sizelimit %<PRIu64>"
-msgstr ""
+msgstr ", limit rozmiaru %<PRIu64>"
 
 #: mount/lomount.c:397
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
-msgstr ""
+msgstr ", szyfrowanie %s (typ %<PRIu32>)"
 
 #: mount/lomount.c:410
 #, c-format
 msgid ", offset %d"
-msgstr ""
+msgstr ", offset %d"
 
 #: mount/lomount.c:413
 #, c-format
 msgid ", encryption type %d\n"
-msgstr ""
+msgstr ", typ szyfrowania %d\n"
 
 #: mount/lomount.c:421
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
-msgstr ""
+msgstr "loop: nie mo�na uzyska� informacji o urz�dzeniu %s: %s\n"
 
 #: mount/lomount.c:432
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr ""
+msgstr "loop: nie mo�na otworzy� urz�dzenia %s: %s\n"
 
 #: mount/lomount.c:448 mount/lomount.c:480 mount/lomount.c:542
 #: mount/lomount.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "%s: /dev directory does not exist."
-msgstr "%s: b��dny katalog: '.' nie jest na pocz�tku\n"
+msgstr "%s: katalog /dev nie istnieje."
 
 #: mount/lomount.c:459 mount/lomount.c:600
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
-msgstr ""
+msgstr "%s: brak uprawnie� do sprawdzenia /dev/loop%s<N>"
 
 #: mount/lomount.c:603
 #, c-format
 msgid "%s: could not find any free loop device"
-msgstr ""
+msgstr "%s: nie uda�o si� odnale�� �adnego wolnego urz�dzenia loop"
 
 #: mount/lomount.c:606
 #, c-format
@@ -8675,52 +9020,58 @@ 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: Nie uda�o si� odnale�� �adnego urz�dzenia loop. Mo�e to j�dro\n"
+"       nie obs�uguje urz�dze� loop? (je�li tak, nale�y je zrekompilowa�,\n"
+"       lub wykona� `modprobe loop'.)"
 
 #: mount/lomount.c:636
 msgid "Out of memory while reading passphrase"
-msgstr ""
+msgstr "Brak pami�ci podczas odczytu has�a"
 
 #: mount/lomount.c:679
 #, c-format
 msgid "warning: %s is already associated with %s\n"
-msgstr ""
+msgstr "uwaga: %s jest ju� zwi�zany z %s\n"
 
 #: mount/lomount.c:695
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
+"uwaga: %s: zabezpieczony przed zapisem, u�ycie trybu tylko do odczytu\n"
 
 #: mount/lomount.c:731
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
-msgstr ""
+msgstr "Nie uda�o si� zablokowa� w pami�ci, zako�czenie.\n"
 
 #: mount/lomount.c:758
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
-msgstr ""
+msgstr "ioctl LOOP_SET_FD nie powi�d� si�: %s\n"
 
 #: mount/lomount.c:815
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
-msgstr ""
+msgstr "set_loop(%s,%s,%llu,%llu): sukces\n"
 
 #: mount/lomount.c:836
 #, c-format
 msgid "del_loop(%s): success\n"
-msgstr ""
+msgstr "del_loop(%s): sukces\n"
 
 #: mount/lomount.c:840
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
-msgstr ""
+msgstr "loop: nie mo�na usun�� urz�dzenia %s: %s\n"
 
 #: mount/lomount.c:851
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
+"Ten program mount zosta� skompilowany bez obs�ugi urz�dze� loop. Prosz� "
+"przekompilowa�.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8734,8 +9085,17 @@ msgid ""
 "<file>\n"
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
+"\n"
+"Sk�adnia:\n"
+" %1$s urz�dzenie_loop                         podanie informacji\n"
+" %1$s -a | --all                              lista wszystkich u�ywanych\n"
+" %1$s -d | --detach <urz�dz.> [<urz�dz.> ...] usuni�cie\n"
+" %1$s -f | --find                             znalezienie nieu�ywanego\n"
+" %1$s -c | --set-capacity <urz�dz.>           zmiana rozmiaru\n"
+" %1$s -j | --associated <plik> [-o <num>]     lista powi�zanych z <plikiem>\n"
+" %1$s [ opcje ] {-f|--find|urz�dz.} <plik>    konfiguracja\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8750,390 +9110,471 @@ msgid ""
 " -v | --verbose           verbose mode\n"
 "\n"
 msgstr ""
+"\n"
+"Opcje:\n"
+" -e | --encryption <typ>  w��czenie szyfrowania danych o <nazwie/numerze>\n"
+" -h | --help              ten opis\n"
+" -o | --offset <num>      rozpocz�cie od offsetu <num> w pliku\n"
+"      --sizelimit <num>   ograniczenie do najwy�ej <num> bajt�w pliku\n"
+" -p | --pass-fd <num>     odczyt has�a z deskryptora <num>\n"
+" -r | --read-only         ustawienie urz�dzenia loop tylko do odczytu\n"
+"      --show              wypisanie nazwy urz�dzenia (z -f <plik>)\n"
+" -v | --verbose           tryb ze szczeg�owymi informacjami\n"
+"\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
-#, fuzzy, c-format
+#: mount/lomount.c:1019
+#, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "%s: podano b��dn� warto�� offsetu '%s'"
+
+#: mount/lomount.c:1023
+#, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "%s: podano b��dny limit rozmiaru '%s'"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
+#, c-format
 msgid "Loop device is %s\n"
-msgstr "Urz�dzenie: %s\n"
+msgstr "Urz�dzenie loop: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
-msgstr ""
+msgstr "ukradziony loop=%s... ponowna pr�ba\n"
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
-msgstr ""
+msgstr "%s: %s: urz�dzenie jest zaj�te"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
+"Brak obs�ugi urz�dze� loop w trakcie kompilacji. Prosz� przekompilowa�.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
 #, c-format
-msgid "mount: improperly quoted option string '%s'"
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
 msgstr ""
+"\n"
+"mount: uwaga: pliku /etc/mtab nie mo�na zapisywa� (np. system plik�w\n"
+"       jest tylko do odczytu). Mo�liwe, �e informacje zg�aszane przez\n"
+"       mount(8) nie s� aktualne. W�a�ciwe informacje o punktach\n"
+"       montowania mo�na znale�� w pliku /proc/mounts.\n"
+"\n"
+
+#: mount/mount.c:339
+#, c-format
+msgid "mount: improperly quoted option string '%s'"
+msgstr "mount: niew�a�ciwie zacytowany �a�cuch opcji '%s'"
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
-msgstr ""
+msgstr "mount: przet�umaczono %s '%s' na '%s'\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr ""
+msgstr "mount: wed�ug mtaba %s jest ju� zamontowany w %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr ""
+msgstr "mount: wed�ug mtaba %s jest zamontowany w %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr ""
+msgstr "mount: nie mo�na otworzy� %s do zapisu: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
-msgstr ""
+msgstr "mount: b��d zapisu %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
-msgstr ""
+msgstr "mount: b��d podczas zmiany uprawnie� %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
-msgstr ""
+msgstr "mount: nie mo�na ustawi� identyfikatora grupy: %s"
 
-#: mount/mount.c:666
-#, fuzzy, c-format
+#: mount/mount.c:686
+#, c-format
 msgid "mount: cannot set user id: %s"
-msgstr "nie mo�na pobra� rozmiaru %s"
+msgstr "mount: nie mo�na ustawi� identyfikatora u�ytkownika: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr ""
+msgstr "mount: nie mo�na wykona� fork: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
-msgstr ""
+msgstr "Pr�bowanie %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
-msgstr ""
+msgstr "mount: nie podano typu systemu plik�w dla %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
-msgstr ""
+msgstr "       B�d� sprawdzane wszystkie typy wymienione w %s i %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
-msgstr ""
+msgstr "       i wygl�da to na przestrze� wymiany\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
-msgstr ""
+msgstr "       B�dzie sprawdzany typ %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
+msgstr "%s wygl�da na przestrze� wymiany - nie zamontowano"
+
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
 msgstr ""
+"mount: %s: wykryto wi�cej system�w plik�w. To nie powinno si� zdarzy�,\n"
+"       prosz� u�y� -t <typ>, aby okre�li� samemu typ systemu plik�w\n"
+"       lub u�y� wipefs(8), aby wyczy�ci� urz�dzenie.\n"
 
-#: mount/mount.c:993
+#: mount/mount.c:1022
 msgid "mount failed"
-msgstr ""
+msgstr "montowanie nie powiod�o si�"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr ""
+msgstr "mount: tylko root mo�e zamontowa� %s w %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
-msgstr ""
+msgstr "mount: urz�dzenie loop podano dwukrotnie"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
-msgstr ""
+msgstr "mount: typ podano dwukrotnie"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
-msgstr ""
+msgstr "mount: pomini�to tworzenie urz�dzenia loop\n"
+
+#: mount/mount.c:1151
+#, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "mount: podano b��dn� warto�� offsetu '%s'"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1155
+#, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "mount: podano b��dny limit rozmiaru '%s'"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
-msgstr ""
+msgstr "mount: wed�ug mtaba %s jest ju� zamontowany w %s jako loop"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr ""
+msgstr "mount: zostanie u�yte urz�dzenie loop %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
-msgstr ""
+msgstr "mount: loop=%s skradziony... ponowna pr�ba\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
-msgstr ""
+msgstr "mount: loop=%s skradziony"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
-msgstr ""
+msgstr "mount: nie uda�o si� utworzy� urz�dzenia loop\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
-msgstr ""
+msgstr "mount: utworzono urz�dzenie loop\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr ""
+msgstr "mount: nie znaleziono %s - tworzenie...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr ""
+msgstr "mount: nie mo�na otworzy� %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
-msgstr ""
+msgstr "mount: argument dla opcji -p lub --pass-fd musi by� liczb�"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
-msgstr ""
+msgstr "mount: nie mo�na otworzy� %s w celu ustawienia pr�dko�ci"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
-msgstr ""
+msgstr "mount: nie mo�na ustawi� pr�dko�ci: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
-msgstr ""
+msgstr "mount: wed�ug mtaba %s jest ju� zamontowany w %s\n"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
-msgstr ""
+msgstr "mount: uwaga: %s wygl�da na zamontowany do odczytu i zapisu.\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "mount: uwaga: %s wygl�da na zamontowany tylko do odczytu.\n"
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
+"mount: nie uda�o si� okre�li� typu systemu plik�w, a �aden nie zosta� podany"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
-msgstr ""
+msgstr "mount: trzeba okre�li� system plik�w"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
-msgstr ""
+msgstr "mount: montowanie nie powiod�o si�"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr ""
+msgstr "mount: punkt montowania %s nie jest katalogiem"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
-msgstr ""
+msgstr "mount: brak uprawnie�"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
-msgstr ""
+msgstr "mount: do u�ywania mounta trzeba by� superu�ytkownikiem"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
-msgstr ""
+msgstr "mount: %s jest zaj�ty"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
-msgstr ""
+msgstr "mount: proc jest ju� zamontowany"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
-msgstr ""
+msgstr "mount: %s jest ju� zamontowany lub %s jest zaj�ty"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
-msgstr ""
+msgstr "mount: punkt montowania %s nie istnieje"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
-msgstr ""
+msgstr "mount: punkt montowania %s jest dowi�zaniem symbolicznym donik�d"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
-msgstr ""
+msgstr "mount: urz�dzenie specjalne %s nie istnieje"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
+"mount: urz�dzenie specjalne %s nie istnieje\n"
+"       (przedrostek �cie�ki nie jest katalogiem)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
-msgstr ""
+msgstr "mount: %s nie jest jeszcze zamontowany, albo podano z�� opcj�"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or helper program, or other error"
 msgstr ""
+"mount: niew�a�ciwy typ systemu plik�w, b��dna opcja, b��dny superblok na %"
+"s,\n"
+"       brak strony kodowej lub programu pomocniczego albo jeszcze inny b��d"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
+"       (dla niekt�rych system�w plik�w (np. nfs, cifs) mo�e\n"
+"       by� potrzebny program pomocniczy /sbin/mount.<typ>)"
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 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 ""
+"       (by� mo�e to urz�dzenie IDE, kt�re wykorzystuje ide-scsi,\n"
+"       wi�c powinno by� u�yte sr0, sda lub podobne?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
+"       (czy to nie pr�ba zamontowania partycji rozszerzonej\n"
+"       zamiast le��cej na niej partycji logicznej?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
+"       W niekt�rych przypadkach przydatne informacje mo�na\n"
+"       znale�� w logu systemowym (np. dmesg | tail)\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
-msgstr ""
+msgstr "tablica montowania pe�na"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
-msgstr ""
+msgstr "mount: %s: nie mo�na odczyta� superbloku"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
-msgstr ""
+msgstr "mount: %s: nieznane urz�dzenie"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
-msgstr ""
+msgstr "mount: nieznany typ systemu plik�w '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr ""
+msgstr "mount: zapewne chodzi�o o %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
-msgstr ""
+msgstr "mount: mo�e chodzi�o o 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
-msgstr ""
+msgstr "mount: mo�e chodzi�o o 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
+"mount: %s ma b��dny numer urz�dzenia albo typ systemu plik�w %s nie jest "
+"obs�ugiwany"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr ""
+msgstr "mount: %s nie jest urz�dzeniem blokowym, a stat nie udaje si�?"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
+"mount: j�dro nie rozpoznaje %s jako urz�dzenia blokowego\n"
+"       (mo�e `modprobe sterownik'?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
-msgstr ""
+msgstr "mount: %s nie jest urz�dzeniem blokowym (mia�o by� `-o loop'?)"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
-msgstr ""
+msgstr "mount: %s nie jest urz�dzeniem blokowym"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
-msgstr ""
+msgstr "mount: %s nie jest poprawnym urz�dzeniem blokowym"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
-msgstr ""
+msgstr "urz�dzenie blokowe "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr ""
+msgstr "mount: %s%s nie mo�e by� zamontowane tylko do odczytu"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
-msgstr ""
+msgstr "mount: %s%s jest zabezpieczone przed zapisem, ale podano flag� `-w'"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr ""
+"mount: %s%s nie mo�e by� przemontowane do odczytu i zapisu - zabezpieczone "
+"przed zapisem"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
+"mount: %s%s jest zabezpieczone przed zapisem, montowanie tylko do odczytu"
 
-#: mount/mount.c:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr ""
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
-msgstr ""
+msgstr "mount: brak no�nika w %s"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9142,23 +9583,28 @@ msgid ""
 "       applications will generate AVC messages and not be allowed access to\n"
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
+"mount: %s nie zawiera etykiet SELinuksa.\n"
+"       W systemie z SELinuksem podmontowano system plik�w obs�uguj�cy\n"
+"       etykiety, ale ich nie zawieraj�cy. Najprawdopodobniej aplikacje\n"
+"       b�d� generowa� komunikaty AVC i nie b�d� mog�y dosta� si� do tego\n"
+"       systemu plik�w. Wi�cej szczeg��w w restorecon(8) i mount(8).\n"
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
-msgstr ""
+msgstr "mount: nie podano typu - przyj�to nfs ze wzgl�du na dwukropek\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
-msgstr ""
+msgstr "mount: nie podano typu - przyj�to cifs ze wzgl�du na prefiks //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
-msgstr ""
+msgstr "mount: %s jest ju� zamontowany w %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9194,53 +9640,85 @@ msgid ""
 "Other options: [-nfFrsvw] [-o options] [-p passwdfd].\n"
 "For many more details, say  man 8 mount .\n"
 msgstr ""
-
-#: mount/mount.c:2265
-#, c-format
-msgid "mount: only root can do that (effective UID is %d)"
-msgstr ""
-
-#: mount/mount.c:2268
+"Sk�adnia: mount -V              : wy�wietlenie wersji\n"
+"          mount -h              : wy�wietlenie tego opisu\n"
+"          mount                 : lista zamontowanych system�w plik�w\n"
+"          mount -l              : jw. wraz z etykietami wolumen�w\n"
+"Powy�ej cz�� informacyjna. Teraz montowanie.\n"
+"Polecenie to `mount [-t typ_fs] co� gdzie�'.\n"
+"Szczeg�y obecne w /etc/fstab mo�na pomin��.\n"
+"          mount -a [-t|-O] ...  : zamontowanie wszystkiego z /etc/fstab\n"
+"          mount urz�dzenie      : zamontowanie urz�dzenia w znanym miejscu\n"
+"          mount katalog         : zamontowanie tutaj znanego urz�dzenia\n"
+"          mount -t typ urz kat  : zwyk�e polecenie mount\n"
+"Uwaga: w�a�ciwie nie montuje si� urz�dzenia, ale system plik�w\n"
+"(podanego typu), kt�ry znajduje si� na urz�dzeniu.\n"
+"Mo�na tak�e zamontowa� ju� widoczne drzewo katalog�w w innym miejscu:\n"
+"          mount --bind stary_katalog nowy_katalog\n"
+"lub przenie�� poddrzewo:\n"
+"          mount --move stary_katalog nowy_katalog\n"
+"Mo�na zmieni� rodzaj montowania dla podanego katalogu:\n"
+"          mount --make-shared katalog\n"
+"          mount --make-slave katalog\n"
+"          mount --make-private katalog\n"
+"          mount --make-unbindable katalog\n"
+"Mo�na zmieni� rodzaj wszystkich montowa� w poddrzewie zawieraj�cym\n"
+"podany katalog:\n"
+"          mount --make-rshared katalog\n"
+"          mount --make-rslave katalog\n"
+"          mount --make-rprivate katalog\n"
+"          mount --make-runbindable katalog\n"
+"Urz�dzenie mo�e by� podane przy u�yciu nazwy, np. /dev/hda1 lub /dev/cdrom,\n"
+"przy u�yciu etykiety (-L etykieta) albo przy u�yciu UUID-a (-U uuid).\n"
+"Inne opcje: [-nfFrsvw] [-o opcje] [-p fdhas�a].\n"
+"Du�o wi�cej szczeg��w znajduje si� w `man 8 mount'.\n"
+
+#: mount/mount.c:2335
+#, c-format
+msgid "mount: only root can do that (effective UID is %u)"
+msgstr "mount: tylko root mo�e to zrobi� (efektywny UID to %u)"
+
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
-msgstr ""
+msgstr "mount: tylko root mo�e to zrobi�"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
-msgstr ""
+msgstr "nic nie by�o zamontowane"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
-msgstr ""
+msgstr "mount: nie znaleziono takiej partycji"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr ""
+msgstr "mount: nie znaleziono %s w %s ani %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
-msgstr ""
+msgstr "[mntent]: uwaga: brak znaku ko�ca linii na ko�cu pliku %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
-msgstr ""
+msgstr "[mntent]: linia %d w %s jest b��dna%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
-msgstr ""
+msgstr "; reszta pliku zignorowana"
 
 #: mount/sundries.c:32
 msgid "bug in xstrndup call"
-msgstr ""
+msgstr "b��d w wywo�aniu xstrndup"
 
 #: mount/sundries.c:225 mount/sundries.c:281 mount/sundries.c:296
 #: mount/xmalloc.c:11
 msgid "not enough memory"
-msgstr ""
+msgstr "brak pami�ci"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9250,8 +9728,14 @@ msgid ""
 " <file>                               name of file to be used\n"
 "\n"
 msgstr ""
+"Parametr <spec>:\n"
+" {-L etykieta | LABEL=etykieta}       ETYKIETA urz�dzenia do u�ycia\n"
+" {-U uuid     | UUID=uuid}            UUID urz�dzenia do u�ycia\n"
+" <urz�dzenie>                         nazwa urz�dzenia do u�ycia\n"
+" <plik>                               nazwa pliku do u�ycia\n"
+"\n"
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9263,8 +9747,16 @@ msgid ""
 " %1$s -V                            display version\n"
 "\n"
 msgstr ""
+"\n"
+"Sk�adnia:\n"
+" %1$s -a [-e] [-v] [-f]             w��czenie wszystkic swap�w z /etc/fstab\n"
+" %1$s [-p priorytet] [-v] [-f] <spec>  w��czenie podanego swapa\n"
+" %1$s -s                            informacja o wykorzystaniu swapa\n"
+" %1$s -h                            wy�wietlenie tego opisu\n"
+" %1$s -V                            wy�wietlenie informacji o wersji\n"
+"\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9275,297 +9767,334 @@ msgid ""
 " %1$s -V                           display version\n"
 "\n"
 msgstr ""
+"\n"
+"Sk�adnia:\n"
+" %1$s -a [-v]                      wy��czenie wszystkich swap�w\n"
+" %1$s [-v] <spec>                  wy��czenie podanego swapu\n"
+" %1$s -h                           wy�wietlenie tego opisu\n"
+" %1$s -V                           wy�wietlenie informacji o wersji\n"
+"\n"
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
-msgstr ""
+msgstr "%s: nieoczekiwany format pliku"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
-msgstr ""
+msgstr "%s: ponowna inicjalizacja swapa."
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 msgid "fork failed"
-msgstr ""
+msgstr "wywo�anie fork nie powiod�o si�"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 msgid "execv failed"
-msgstr ""
+msgstr "wywo�anie execv nie powiod�o si�"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
-msgstr ""
+msgstr "wywo�anie waitpid nie powiod�o si�"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, c-format
 msgid "%s: lseek failed"
-msgstr ""
+msgstr "%s: lseek nie powi�d� si�"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, c-format
 msgid "%s: write signature failed"
-msgstr ""
+msgstr "%s: zapis sygnatury nie powi�d� si�"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
+"%s: znaleziono sygnatur� swapa: wersja %d, rozmiar strony %d, %s kolejno�� "
+"bajt�w"
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
-msgstr ""
+msgstr "inna"
 
-#: mount/swapon.c:355
-#, fuzzy
+#: mount/swapon.c:367
 msgid "same"
-msgstr "Nazwa"
+msgstr "taka sama"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, c-format
 msgid "%s: stat failed"
-msgstr ""
+msgstr "%s: stat nie powi�d� si�"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
-msgstr ""
+msgstr "%s: niebezpieczne uprawnienia %04o, powinno by� %04o."
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
-msgstr ""
+msgstr "%s: pomini�to - wydaje si� mie� dziury."
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, c-format
 msgid "%s: get size failed"
-msgstr ""
+msgstr "%s: odczyt rozmiaru nie powi�d� si�"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
-msgstr ""
+msgstr "%s: odczyt nag��wka swapa nie powi�d� si�"
+
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 
-#: mount/swapon.c:421
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
-msgstr ""
+msgstr "%s: last_page 0x%08llx wynosi wi�cej ni� rozmiar przestrzeni wymiany"
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
-msgstr ""
+msgstr "%s: rozmiar strony formatu swapa nie zgadza si�."
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
+"%s: rozmiar strony formatu swapa nie zgadza si� (--fixpgsz pozwali to "
+"przeinicjowa�)."
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
+"%s: wykryto dane programowego wstrzymania. Ponowny zapis sygnatury swapa."
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
-msgstr ""
+msgstr "%s na %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, c-format
 msgid "%s: swapon failed"
-msgstr ""
+msgstr "%s: swapon nie powiod�o si�"
 
-#: mount/swapon.c:493
-#, fuzzy, c-format
+#: mount/swapon.c:505
+#, c-format
 msgid "cannot find the device for %s"
-msgstr "nie mo�na pobra� rozmiaru %s"
+msgstr "nie mo�na odnale�� urz�dzenia dla %s"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
-msgstr ""
+msgstr "Trzeba by� superu�ytkownikiem."
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, c-format
 msgid "%s: swapoff failed"
-msgstr ""
+msgstr "%s: swapoff nie powiod�o si�"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
+"'%s' nie jest obs�ugiwan� nazw� programu (musi by� 'swapon' lub 'swapoff')."
 
 #: mount/umount.c:41
 #, c-format
 msgid "umount: compiled without support for -f\n"
-msgstr ""
+msgstr "umount: skompilowano bez obs�ugi -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
-msgstr ""
+msgstr "umount: nie mo�na ustawi� identyfikatora grupy: %s"
 
-#: mount/umount.c:114
-#, fuzzy, c-format
+#: mount/umount.c:117
+#, c-format
 msgid "umount: cannot set user id: %s"
-msgstr "nie mo�na pobra� rozmiaru %s"
+msgstr "umount: nie mo�na ustawi� identyfikatora u�ytkownika: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
-msgstr ""
+msgstr "umount: nie mo�na wykona� fork: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
-msgstr ""
+msgstr "umount: %s: nieprawid�owe urz�dzenie blokowe"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr ""
+msgstr "umount: %s: nie jest zamontowane"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr ""
+msgstr "umount: %s: nie mo�na zapisa� superbloku"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
 "        (In some cases useful info about processes that use\n"
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
+"umount: %s: urz�dzenie jest zaj�te.\n"
+"        (w niekt�rych przypadkach informacje o procesach korzystaj�cych\n"
+"         z urz�dzenia mo�na znale�� przy pomocy lsof(8) lub fuser(1))"
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
-msgstr ""
+msgstr "umount: %s: nie znaleziono"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr ""
+msgstr "umount: %s: trzeba by� superu�ytkownikiem, �eby odmontowa�"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr ""
+msgstr "umount: %s: urz�dzenia blokowe nie s� dozwolone w systemie plik�w"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
-msgstr ""
+msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
-msgstr ""
+msgstr "brak umount2, pr�ba wykonania umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
-msgstr ""
+msgstr "umount: %s jest zaj�ty - przemontowano tylko do odczytu\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr ""
+msgstr "umount: nie uda�o si� przemontowa� %s tylko do odczytu\n"
 
-#: mount/umount.c:272
+#: mount/umount.c:278
 #, c-format
-msgid "%s umounted\n"
-msgstr ""
+msgid "%s has been unmounted\n"
+msgstr "%s zosta� odmontowany\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr ""
+msgstr "umount: nie mo�na odnale�� listy system�w plik�w do odmontowania"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
 "       umount -a [-d] [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n"
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
+"Sk�adnia: umount -h | -V\n"
+"          umount -a [-d] [-f] [-r] [-n] [-v] [-t typyvfs] [-O opcje]\n"
+"          umount [-d] [-f] [-r] [-n] [-v] spec | urz�dzenie...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
-msgstr ""
+msgstr "urz�dzenie %s jest powi�zane z %s\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
-msgstr ""
-
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
-msgstr ""
+msgstr "urz�dzenie %s nie jest powi�zane z %s\n"
 
 #: mount/umount.c:493
+msgid "Cannot unmount \"\"\n"
+msgstr "Nie mo�na odmontowa� \"\"\n"
+
+#: mount/umount.c:499
 #, c-format
-msgid "Trying to umount %s\n"
-msgstr ""
+msgid "Trying to unmount %s\n"
+msgstr "Pr�ba odmontowania %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
-msgstr ""
+msgstr "umount: zaskoczony przy analizie mtaba"
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
+"umount: nie mo�na odmontowa� %s - %s jest zamontowany na wierzchu w tym "
+"samym miejscu"
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr ""
+msgstr "Nie uda�o si� odnale�� %s w mtabie\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr ""
+msgstr "umount: %s nie jest zamontowany (wg mtaba)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr ""
+msgstr "umount: zdaje si�, �e %s jest zamontowany wiele razy"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr ""
+msgstr "umount: %s nie jest w fstabie (do odmontowania trzeba by� rootem)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr ""
+msgstr "umount: montowanie %s nie zgadza si� z fstabem"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
-msgstr ""
+msgstr "umount: tylko %s mo�e odmontowa� %s z %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
-msgstr ""
+msgstr "umount: tylko root mo�e to zrobi�"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
+msgstr ""
 "\n"
+"chrt - zmiana atrybut�w czasu rzeczywistego (real-time) procesu\n"
+"\n"
+"Ustawianie polityki:\n"
+"  chrt [opcje] <polityka> <priorytet> {<pid> | <polecenie> [<arg> ...]}\n"
+"\n"
+"Odczyt polityki:\n"
+"  chrt [opcje] {<pid> | <polecenie> [<arg> ...]}\n"
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9573,86 +10102,125 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+"\n"
+"Polityki szeregowania:\n"
+"  -b | --batch         ustawienie polityki na SCHED_BATCH\n"
+"  -f | --fifo          ustawienie polityki na SCHED_FIFO\n"
+"  -i | --idle          ustawienie polityki na SCHED_IDLE\n"
+"  -o | --other         ustawienie polityki na SCHED_OTHER\n"
+"  -r | --rr            ustawienie polityki na SCHED_RR (domy�lna)\n"
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+"\n"
+"Flagi szeregowania:\n"
+"  -R | --reset-on-fork ustawienie SCHED_RESET_ON_FORK dla FIFO lub RR\n"
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
+"\n"
+"Opcje:\n"
+"  -h | --help          wy�wietlenie tego opisu\n"
+"  -m | --max           pokazanie minimalnego i maksymalnego priorytetu\n"
+"  -p | --pid           operowanie na istniej�cym, podanym pidzie\n"
+"  -v | --verbose       wy�wietlanie informacji o stanie\n"
+"  -V | --version       wy�wietlenie informacji o wersji\n"
+"\n"
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
-msgstr ""
+msgstr "nie uda�o si� odczyta� polityki dla pidu %d"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
 #, c-format
-msgid "pid %d's %s scheduling policy: "
-msgstr ""
+msgid "pid %d's new scheduling policy: "
+msgstr "nowa polityka szeregowania pidu %d: "
+
+#: schedutils/chrt.c:106
+#, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr "aktualna polityka szeregowania dla pidu %d: "
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, c-format
 msgid "unknown\n"
-msgstr ""
+msgstr "nieznana\n"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
-msgstr ""
+msgstr "nie uda�o si� odczyta� atrybut�w pidu %d"
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
-msgstr ""
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr "nowy priorytet szeregowania dla pidu %d: %d\n"
+
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr "aktualny priorytet szeregowania dla pidu %d: %d\n"
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
-msgstr ""
+msgstr "Minimalny/maksymalny priorytet dla SCHED_%s: %d/%d\n"
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
-msgstr ""
+msgstr "Polityka SCHED_%s nie jest obs�ugiwana?\n"
 
-#: schedutils/chrt.c:203
-#, fuzzy
+#: schedutils/chrt.c:243
 msgid "failed to parse pid"
-msgstr "%s: nie uda�o si� otworzy�: %s\n"
-
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr ""
+msgstr "niezrozumia�y pid"
 
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 msgid "failed to parse priority"
+msgstr "niezrozumia�y priorytet"
+
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
 msgstr ""
+"flaga SCHED_RESET_ON_FORK jest obs�ugiwana tylko dla polityk SCHED_FIFO i "
+"SCHED_RR"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
-msgstr ""
+msgstr "nie uda�o si� ustawi� polityki dla pidu %d"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Nowa"
-
-#: schedutils/chrt.c:248
-#, fuzzy, c-format
+#: schedutils/chrt.c:298
+#, c-format
 msgid "failed to execute %s"
-msgstr "%s: nie uda�o si� otworzy�: %s\n"
+msgstr "nie uda�o si� uruchomi� %s"
 
 #: schedutils/ionice.c:57
 msgid "ioprio_get failed"
-msgstr ""
+msgstr "ioprio_get nie powiod�o si�"
 
 #: schedutils/ionice.c:75
 msgid "ioprio_set failed"
-msgstr ""
+msgstr "ioprio_set nie powiod�o si�"
 
 #: schedutils/ionice.c:81
 #, c-format
@@ -9662,7 +10230,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9672,38 +10240,177 @@ msgid ""
 "  -h                  this help\n"
 "\n"
 msgstr ""
+"\n"
+"ionice - ustawianie lub odczyt klasy i priorytetu szeregowania we/wy.\n"
+"\n"
+"Sk�adnia:\n"
+"  ionice [ opcje ] -p <pid> [<pid> ...]\n"
+"  ionice [ opcje ] <polecenie> [<arg> ...]\n"
+"\n"
+"Opcje:\n"
+"  -n <dane_klasy>     dane klasy (0-7, mniejsza liczba to wy�szy priorytet)\n"
+"  -c <klasa>          klasa szeregowania\n"
+"                      0: brak, 1: realtime, 2: best-effort, 3: idle\n"
+"  -t                  ignorowanie niepowodze�\n"
+"  -h                  ten opis\n"
+"\n"
 
 #: schedutils/ionice.c:110 schedutils/ionice.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "cannot parse number '%s'"
-msgstr "nie mo�na otworzy� %s"
+msgstr "niezrozumia�a liczba '%s'"
 
 #: schedutils/ionice.c:151
 msgid "ignoring given class data for none class"
-msgstr ""
+msgstr "zignorowano podane dane klasy dla braku klasy"
 
 #: schedutils/ionice.c:159
 msgid "ignoring given class data for idle class"
-msgstr ""
+msgstr "zignorowano podane dane klasy dla klasy idle"
 
 #: schedutils/ionice.c:163
 #, c-format
 msgid "bad prio class %d"
+msgstr "b��dna klasa priorytetu %d"
+
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, c-format
+msgid "executing %s failed"
+msgstr "uruchomienie %s nie powiod�o si�"
+
+#: schedutils/taskset.c:38
+#, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr ""
+"Sk�adnia: %s [opcje] [maska | lista-cpu] [pid|polecenie [arg...]]\n"
+"\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
 msgstr ""
+"Opcje:\n"
+" -p, --pid               operowanie na podanym, istniej�cym pidzie\n"
+" -c, --cpu-list          wypisanie i okre�lenie CPU w postaci listy\n"
+" -h, --help              wy�wietlenie tego opisu\n"
+" -V, --version           wy�wietlenie informacji o wersji\n"
+"\n"
 
-#: schedutils/ionice.c:187
-msgid "execvp failed"
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
 msgstr ""
+"Domy�lne zachowanie to uruchomienie nowego polecenia:\n"
+"    %1$s 03 sshd -b 1024\n"
+"Mo�na te� uzyska� mask� dla istniej�cego zadania:\n"
+"    %1$s -p 700\n"
+"Lub ustawi� j�:\n"
+"    %1$s -p 03 700\n"
+"Mo�na u�y� formatu listy oddzielonej przecinkami zamiast maski:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Przedzia�y w formacie listy mog� mie� argument kroku:\n"
+"    np. 0-31:2 odpowiada masce 0x55555555\n"
+
+#: schedutils/taskset.c:61
+#, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Wi�cej informacji w taskset(1).\n"
+
+#: schedutils/taskset.c:113
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "nie mo�na okre�li� NR_CPUS; przerwano"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+msgid "cpuset_alloc failed"
+msgstr "cpuset_alloc nie powiod�o si�"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "nie uda�o si� uzyska� przypisa� dla pidu %d"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr "aktualna lista przypisa� dla pidu %d: %s\n"
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr "aktualna maska przypisa� dla pidu %d: %s\n"
+
+#: schedutils/taskset.c:157
+#, c-format
+msgid "failed to parse %s %s"
+msgstr "nie uda�o si� przeanalizowa� %s %s"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr "listy CPU"
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr "maski CPU"
+
+#: schedutils/taskset.c:162
+#, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "nie uda�o si� ustawi� przypisa� dla pidu %d"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr "Nowa lista przypisa� dla pidu %d: %s\n"
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr "Nowa maska przypisa� dla pidu %d: %s\n"
+
+#: shlibs/mount/src/tab_parse.c:501
+msgid "parse error at lines: "
+msgstr "b��d sk�adni w liniach: "
+
+#: shlibs/mount/src/tab_parse.c:503
+msgid "parse error at line: "
+msgstr "b��d sk�adni w linii: "
+
+#: shlibs/mount/src/tab_parse.c:523
+#, c-format
+msgid " and %d."
+msgstr " oraz %d."
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr ""
+msgstr "Aby zmieni� zachowanie Ctrl-Alt-Del, trzeba by� rootem.\n"
 
 #: sys-utils/ctrlaltdel.c:42
 #, c-format
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr ""
+msgstr "Sk�adnia ctrlaltdel hard|soft\n"
 
 #: sys-utils/cytune.c:114
 #, c-format
@@ -9711,6 +10418,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 ""
+"Plik %s, warto�� progowa %lu, maksymalna liczba znak�w w kolejce %d,\n"
+"maksymalny transfer w znakach/sekund� wyni�s� %f\n"
 
 #: sys-utils/cytune.c:125
 #, c-format
@@ -9719,31 +10428,34 @@ msgid ""
 "in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
+"Plik %s, warto�� progowa %lu, limit czasu %lu, maksymalna liczba znak�w w "
+"kolejce %d,\n"
+"maksymalny transfer w znakakach/sekund� wyni�s� %f\n"
 
 #: sys-utils/cytune.c:189
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr ""
+msgstr "B��dna warto�� okresu: %s\n"
 
 #: sys-utils/cytune.c:197
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr ""
+msgstr "B��dna ustawiana warto�� progowa: %s\n"
 
 #: sys-utils/cytune.c:205
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr ""
+msgstr "B��dna warto�� domy�lna: %s\n"
 
 #: sys-utils/cytune.c:213
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr ""
+msgstr "B��dna ustawiana warto�� czasu: %s\n"
 
 #: sys-utils/cytune.c:221
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr ""
+msgstr "B��dna domy�lna warto�� czasu: %s\n"
 
 #: sys-utils/cytune.c:238
 #, c-format
@@ -9751,84 +10463,101 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
+"Sk�adnia: %s [-q [-i okres]] ([-s warto��]|[-S warto��]) ([-t warto��]|[-T "
+"warto��]) [-g|-G] plik [plik...]\n"
 
 #: sys-utils/cytune.c:250 sys-utils/cytune.c:269 sys-utils/cytune.c:289
 #: sys-utils/cytune.c:339
 #, c-format
 msgid "Can't open %s: %s\n"
-msgstr ""
+msgstr "Nie mo�na otworzy� %s: %s\n"
 
 #: sys-utils/cytune.c:257
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr ""
+msgstr "Nie mo�na ustawi� %s na warto�� progow� %d: %s\n"
 
 #: sys-utils/cytune.c:276
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr ""
+msgstr "Nie mo�na ustawi� %s na warto�� progow� czasu %d: %s\n"
 
 #: sys-utils/cytune.c:294 sys-utils/cytune.c:351 sys-utils/cytune.c:382
 #, c-format
 msgid "Can't get threshold for %s: %s\n"
-msgstr ""
+msgstr "Nie mo�na odczyta� warto�ci progowej dla %s: %s\n"
 
 #: sys-utils/cytune.c:300 sys-utils/cytune.c:357 sys-utils/cytune.c:388
 #, c-format
 msgid "Can't get timeout for %s: %s\n"
-msgstr ""
+msgstr "Nie mo�na odczyta� limitu czasu dla %s: %s\n"
 
 #: sys-utils/cytune.c:306
 #, c-format
 msgid "%s: %ld current threshold and %ld current timeout\n"
-msgstr ""
+msgstr "%s: bie��ca warto�� progowa %ld, bie��cy limit czasu %ld\n"
 
 #: sys-utils/cytune.c:309
 #, c-format
 msgid "%s: %ld default threshold and %ld default timeout\n"
-msgstr ""
+msgstr "%s: domy�lna warto�� progowa %ld, domy�lny limit czasu %ld\n"
 
 #: sys-utils/cytune.c:327
 msgid "Can't set signal handler"
-msgstr ""
+msgstr "Nie mo�na ustawi� procedury obs�ugi sygna�u"
 
 #: sys-utils/cytune.c:331 sys-utils/cytune.c:366
 msgid "gettimeofday failed"
-msgstr ""
+msgstr "gettimeofday nie powiod�o si�"
 
 #: sys-utils/cytune.c:344 sys-utils/cytune.c:376
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr ""
+msgstr "Nie mo�na wykona� CYGETMON na %s: %s\n"
 
 #: sys-utils/cytune.c:418
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
+"%s: %lu przerw., %lu/%lu znak�w; fifo: pr�g %lu, limit %lu, maks. %lu, teraz "
+"%lu\n"
 
 #: sys-utils/cytune.c:424
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
-msgstr ""
+msgstr "   %f przerwa�/sekund�; odbi�r %f, wysy�anie %f (znak�w/sekund�)\n"
 
 #: sys-utils/cytune.c:429
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
+"%s: %lu przerw., %lu znak�w; fifo: pr�g %lu, limit %lu, maks. %lu, teraz %"
+"lu\n"
 
 #: sys-utils/cytune.c:435
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
-msgstr ""
+msgstr "   %f przerwa�/sekund�; odbi�r %f (znak�w/sekund�)\n"
 
 #: sys-utils/dmesg.c:45
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
-msgstr "Sk�adnia: %s [-c | -l plik] [-nXX] [-iXX] /dev/nazwa [bloki]\n"
+msgstr "Sk�adnia: %s [-c] [-n poziom] [-r] [-s rozm_bufora]\n"
+
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sk�adnia: %s [opcje] <nazwa_pliku>\n"
+"\n"
+"Opcje:\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -9836,38 +10565,48 @@ msgid ""
 " -o, --offset <num>  offset of the allocation, in bytes\n"
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
+" -h, --help          ten opis\n"
+" -n, --keep-size     bez modyfikowania d�ugo�ci pliku\n"
+" -o, --offset <ile>  offset przydzia�u w bajtach\n"
+" -l, --length <ile>  d�ugo�� przydzia�u w bajtach\n"
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
+"\n"
+"Wi�cej informacji mo�na znale�� w fallocate(1).\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 msgid "no length argument specified"
-msgstr ""
+msgstr "nie podano argumentu d�ugo�ci"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
-msgstr ""
+msgstr "podano b��dn� warto�� d�ugo�ci"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
-msgstr ""
+msgstr "podano b��dn� warto�� offsetu"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 msgid "no filename specified."
-msgstr ""
+msgstr "nie podano nazwy pliku."
+
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+msgid "unexpected number of arguments"
+msgstr "nieoczekiwana liczba argument�w"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
-msgstr ""
+msgstr "tryb utrzymywania rozmiaru (opcja -n) nie jest obs�ugiwany"
 
-#: sys-utils/fallocate.c:174
-#, fuzzy, c-format
+#: sys-utils/fallocate.c:147
+#, c-format
 msgid "%s: fallocate failed"
-msgstr "malloc nie powiod�o si�"
+msgstr "%s: fallocate nie powiod�o si�"
 
 #: sys-utils/flock.c:65
 #, c-format
@@ -9885,31 +10624,103 @@ msgid ""
 "  -h  --help       Display this text\n"
 "  -V  --version    Display version\n"
 msgstr ""
+"Sk�adnia: %1$s [-sxun][-w #] fd#\n"
+"          %1$s [-sxon][-w #] plik [-c] polecenie...\n"
+"          %1$s [-sxon][-w #] katalog [-c] polecenie...\n"
+"  -s  --shared     Uzyskanie wsp�dzielonej blokady\n"
+"  -x  --exclusive  Uzyskanie wy��cznej blokady\n"
+"  -u  --unlock     Usuni�cie blokady\n"
+"  -n  --nonblock   Niepowodzenie zamiast oczekiwania\n"
+"  -w  --timeout    Oczekiwanie przez ograniczony czas\n"
+"  -o  --close      Zamkni�cie deskryptora pliku przed uruchomieniem "
+"polecenia\n"
+"  -c  --command    Uruchomienie pojedynczego polecenia w pow�oce\n"
+"  -h  --help       Wy�wietlenie tego opisu\n"
+"  -V  --version    Wy�wietlenie informacji o wersji\n"
 
 #: sys-utils/flock.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s requires exactly one command argument\n"
-msgstr "%s wymaga argumentu\n"
+msgstr "%s: %s wymaga dok�adnie jednego argumentu b�d�cego poleceniem\n"
 
 #: sys-utils/flock.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot open lock file %s: %s\n"
-msgstr "%s: nie mo�na otworzy� %s\n"
+msgstr "%s: nie mo�na otworzy� pliku blokady %s: %s\n"
 
 #: sys-utils/flock.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "%s: bad number: %s\n"
-msgstr "%s: b��d odczytu na %s\n"
+msgstr "%s: b��dna liczba: %s\n"
 
 #: sys-utils/flock.c:238
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
-msgstr ""
+msgstr "%s: wymaga deskryptora pliku, pliku lub katalogu\n"
 
 #: sys-utils/flock.c:296
-#, fuzzy, c-format
+#, c-format
 msgid "%s: fork failed: %s\n"
-msgstr "%s: nie uda�o si� otworzy�: %s\n"
+msgstr "%s: wywo�anie fork nie powiod�o si�: %s\n"
+
+#: sys-utils/fsfreeze.c:41
+#, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sk�adnia: %s [opcje] <punkt_montowania>\n"
+"\n"
+"Opcje:\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+" -h, --help          ten opis\n"
+" -f, --freeze        zamro�enie systemu plik�w\n"
+" -u, --unfreeze      odmro�enie systemu plik�w\n"
+
+#: sys-utils/fsfreeze.c:49
+#, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Wi�cej informacji w fsfreeze(8).\n"
+
+#: sys-utils/fsfreeze.c:90
+msgid "no action specified"
+msgstr "nie okre�lono akcji"
+
+#: sys-utils/fsfreeze.c:92
+msgid "no filename specified"
+msgstr "nie podano nazwy pliku"
+
+#: sys-utils/fsfreeze.c:105
+#, c-format
+msgid "%s: fstat failed"
+msgstr "%s: fstat nie powiod�o si�"
+
+#: sys-utils/fsfreeze.c:110
+#, c-format
+msgid "%s: is not a directory"
+msgstr "%s: nie jest katalogiem"
+
+#: sys-utils/fsfreeze.c:116
+#, c-format
+msgid "%s: freeze failed"
+msgstr "%s: zamro�enie nie powiod�o si�"
+
+#: sys-utils/fsfreeze.c:121
+#, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s: odmro�enie nie powiod�o si�"
 
 #: sys-utils/ipcmk.c:84
 #, c-format
@@ -9918,6 +10729,9 @@ msgid ""
 "Usage: %s [options]\n"
 "\n"
 msgstr ""
+"\n"
+"Sk�adnia: %s [opcje]\n"
+"\n"
 
 #: sys-utils/ipcmk.c:86
 #, c-format
@@ -9927,6 +10741,10 @@ msgid ""
 "  -Q            create message queue\n"
 "  -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
+"  -M <rozmiar>  utworzenie segmentu pami�ci dzielonej o danym rozmiarze\n"
+"  -S <lsem>     utworzenie tablicy semafor�w o <lsem> elementach\n"
+"  -Q            utworzenie kolejki komunikat�w\n"
+"  -p <tryb>     uprawnienia dla zasobu (domy�lnie 0644)\n"
 
 #: sys-utils/ipcmk.c:90
 #, c-format
@@ -9935,58 +10753,61 @@ msgid ""
 "For more information see ipcmk(1).\n"
 "\n"
 msgstr ""
+"\n"
+"Wi�cej informacji mo�na znale�� w ipcmk(1).\n"
+"\n"
 
 #: sys-utils/ipcmk.c:142
 msgid "create share memory failed"
-msgstr ""
+msgstr "tworzenie pami�ci dzielonej nie powiod�o si�"
 
 #: sys-utils/ipcmk.c:144
 #, c-format
 msgid "Shared memory id: %d\n"
-msgstr ""
+msgstr "Identyfikator pami�ci dzielonej: %d\n"
 
 #: sys-utils/ipcmk.c:150
 msgid "create message queue failed"
-msgstr ""
+msgstr "tworzenie kolejki komunikat�w nie powiod�o si�"
 
 #: sys-utils/ipcmk.c:152
 #, c-format
 msgid "Message queue id: %d\n"
-msgstr ""
+msgstr "Identyfikator kolejki komunikat�w: %d\n"
 
 #: sys-utils/ipcmk.c:158
 msgid "create semaphore failed"
-msgstr ""
+msgstr "tworzenie semafor�w nie powiod�o si�"
 
 #: sys-utils/ipcmk.c:160
 #, c-format
 msgid "Semaphore id: %d\n"
-msgstr ""
+msgstr "Identyfikator tablicy semafor�w: %d\n"
 
 #: sys-utils/ipcrm.c:64
 #, c-format
 msgid "invalid id: %s\n"
-msgstr ""
+msgstr "b��dny identyfikator: %s\n"
 
 #: sys-utils/ipcrm.c:82
 #, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr ""
+msgstr "nie mo�na usun�� identyfikatora %s (%s)\n"
 
 #: sys-utils/ipcrm.c:97
 #, c-format
 msgid "deprecated usage: %s {shm | msg | sem} id ...\n"
-msgstr ""
+msgstr "przestarza�a sk�adnia: %s {shm | msg | sem} id ...\n"
 
 #: sys-utils/ipcrm.c:124
 #, c-format
 msgid "unknown resource type: %s\n"
-msgstr ""
+msgstr "nieznany rodzaj zasobu: %s\n"
 
 #: sys-utils/ipcrm.c:128
 #, c-format
 msgid "resource(s) deleted\n"
-msgstr ""
+msgstr "zasoby usuni�te\n"
 
 #: sys-utils/ipcrm.c:138
 #, c-format
@@ -9994,688 +10815,732 @@ msgid ""
 "usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
+"Sk�adnia: %s [ [-q id_msg] [-m id_shm] [-s id_sem]\n"
+"             [-Q klucz_msg] [-M klucz_shm] [-S klucz_sem] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
-msgstr ""
+msgstr "%s: niedozwolony klucz (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
-msgstr ""
+msgstr "brak uprawnie� do tego klucza"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
-msgstr ""
+msgstr "klucz ju� usuni�ty"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
-msgstr ""
+msgstr "b��dny klucz"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
-msgstr ""
+msgstr "nieznany b��d w kluczu"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
-msgstr ""
+msgstr "brak uprawnie� do tego identyfikatora"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
-msgstr ""
+msgstr "b��dny identyfikator"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
-msgstr ""
+msgstr "identyfikator ju� usuni�ty"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
-msgstr ""
+msgstr "nieznany b��d w identyfikatorze"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
-msgstr ""
+msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr ""
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr ""
+msgstr "%s: nieznany argument: %s\n"
 
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
+"Sk�adnia: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"          %1$s [-s|-m|-q] -i id\n"
+"          %1$s -h wy�wietla opis\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
+"Sk�adnia: %1$s [zas�b]... [format-wyj�ciowy]\n"
+"          %1$s [zas�b] -i id\n"
+"\n"
 
 #: sys-utils/ipcs.c:127
 #, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
+"Udost�pnianie informacji o obiektach IPC, do kt�rych ma si� prawo odczytu.\n"
+"\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
 #, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
+"    -h      wy�wietlenie tego opisu\n"
+"    -i id   wypisanie szczeg��w na temat zasobu o podanym identyfikatorze\n"
+"\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
+"Opcje zasob�w:\n"
+"    -m      segmenty pami�ci dzielonej\n"
+"    -q      kolejki komunikat�w\n"
+"    -s      semafory\n"
+"    -a      wszystko (domy�lne)\n"
+"\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
+"Format wyj�ciowy:\n"
+"    -t      czas\n"
+"    -p      pid\n"
+"    -c      tw�rca\n"
+"    -l      limity\n"
+"    -u      podsumowanie\n"
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
-msgstr ""
+msgstr "j�dro nie zosta�o zkonfigurowane do obs�ugi pami�ci dzielonej\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
-msgstr ""
+msgstr "------ Limity pami�ci dzielonej ----\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
-msgstr ""
+msgstr "maksymalna liczba segment�w = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
-msgstr ""
+msgstr "maksymalny rozmiar segmentu (kB) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
-msgstr ""
+msgstr "maksymalny rozmiar ca�ej pami�ci dzielonej (kB) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
-msgstr ""
+msgstr "minimalny rozmiar segmentu (B) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:281
+msgstr "------ Stan pami�ci dzielonej ------\n"
+
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
-msgstr ""
+msgstr "------ Tw�rcy/w�a�ciciele pami�ci dzielonej ---------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
-msgstr ""
+msgstr "id_shm"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
-msgstr ""
+msgstr "uprawn."
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
-msgstr ""
+msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
-msgstr ""
+msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
-msgstr ""
+msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
-msgstr ""
+msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
-msgstr ""
+msgstr "------ Czas do��czania/od��czania/zmian pam.dziel. -----\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
-msgstr ""
+msgstr "w�a�ciciel"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
-msgstr ""
+msgstr "pod��czenie"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
-msgstr ""
+msgstr "od��czenie"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
-msgstr ""
+msgstr "zmiana"
 
-#: sys-utils/ipcs.c:299
+#: sys-utils/ipcs.c:327
 #, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr ""
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
+msgstr "------ PID tw�rcy/ost.op. na pami�ci dziel. ------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
-msgstr ""
+msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
-msgstr ""
+msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
-msgstr ""
+msgstr "------ Segmenty pami�ci dzielonej ----\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
-msgstr ""
+msgstr "klucz"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
-msgstr ""
+msgstr "bajt�w"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
-msgstr ""
+msgstr "pod��cze�"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
-msgstr ""
+msgstr "stan"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
-msgstr ""
+msgstr "Nie ustawiono"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
-msgstr ""
+msgstr "dest"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
-msgstr ""
+msgstr "blok."
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
-msgstr ""
+msgstr "j�dro nie zosta�o zkonfigurowane do obs�ugi semafor�w\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
-msgstr ""
+msgstr "------ Limity semafor�w --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
-msgstr ""
+msgstr "maksymalna liczba tablic = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
-msgstr ""
+msgstr "maksymalna liczba semafor�w w tablicy = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
-msgstr ""
+msgstr "maksymalna liczba semafor�w w systemie = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
-msgstr ""
+msgstr "maksymalna liczba operacji na sem. w wywo�aniu = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
-msgstr ""
+msgstr "maksymalna warto�� semafora = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
-msgstr ""
+msgstr "------ Stan semafor�w ----------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
-msgstr ""
+msgstr "tablic u�ywanych: %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
-msgstr ""
+msgstr "semafor�w przydzielonych: %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
-msgstr ""
+msgstr "------ Tw�rcy/w�a�ciciele tablic semafor�w -----\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
-msgstr ""
+msgstr "id_sem"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
-msgstr ""
+msgstr "------ Czasy operacji/zmian semafor�w ----------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
-msgstr ""
+msgstr "ost.op."
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
-msgstr ""
+msgstr "ost.zmiana"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
-msgstr ""
+msgstr "------ Tablice semafor�w -------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
-msgstr ""
+msgstr "lsem"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
-msgstr ""
+msgstr "j�dro nie zosta�o skonfigurowane do obs�ugi kolejek komunikat�w\n"
 
-#: sys-utils/ipcs.c:490
+#: sys-utils/ipcs.c:518
 #, c-format
-msgid "------ Messages: Limits --------\n"
-msgstr ""
+msgid "------ Messages Limits --------\n"
+msgstr "------ Limity komunikat�w ------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
-msgstr ""
+msgstr "maksymalna liczba kolejek w systemie = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
-msgstr ""
+msgstr "maksymalny rozmiar komunikatu (B) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
-msgstr ""
+msgstr "domy�lny maksymalny rozmiar kolejki (B) = %d\n"
 
-#: sys-utils/ipcs.c:497
+#: sys-utils/ipcs.c:525
 #, c-format
-msgid "------ Messages: Status --------\n"
-msgstr ""
+msgid "------ Messages Status --------\n"
+msgstr "------ Stan komunikat�w --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
-msgstr ""
+msgstr "kolejki przydzielone: %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
-msgstr ""
+msgstr "u�ywane nag��wki: %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
-msgstr ""
+msgstr "u�ywane miejsce: %d B\n"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:532
 #, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr ""
+msgid "------ Message Queues Creators/Owners --------\n"
+msgstr "----- Tw�rcy/w�a�ciciele kolejek komunikat�w -\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
-msgstr ""
+msgstr "id_msq"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
-msgstr ""
+msgstr "------ Kolejki komunikat�w: czas odb./wys./zmiany ---\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
-msgstr ""
+msgstr "wys�anie"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
-msgstr ""
+msgstr "odbi�r"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
-msgstr ""
+msgstr "zmiana"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
-msgstr ""
+msgstr "------ Kolejki komunikat�w: PID-y -\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
-msgstr ""
+msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
-msgstr ""
+msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
-msgstr ""
+msgstr "------ Kolejki komunikat�w ---\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
-msgstr ""
+msgstr "bajt�w"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
-msgstr ""
+msgstr "komunikat�w"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
-msgstr ""
+msgstr "shmctl nie powiod�o si�"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
+"\n"
+"Identyfikator segmentu pami�ci dzielonej (shmid)=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-msgstr ""
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
-msgstr ""
+msgstr "tryb=%#o\tprawa_dost�pu=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr ""
+msgstr "bajt�w=%ld\tlpid=%d\tcpid=%d\tpod��cze�=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
-msgstr ""
+msgstr "czas_pod�=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
-msgstr ""
+msgstr "czas_od�=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
-msgstr ""
+msgstr "czas_zmiany=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
-msgstr ""
+msgstr "msgctl nie powiod�o si�"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
+"\n"
+"Identyfikator kolejki komunikat�w (msqid)=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
-msgstr ""
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\ttryb=%#o\n"
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
-msgstr ""
+msgstr "bajt�w=%ld\tmaxbajt�w=%ld\tlkom=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
-msgstr ""
+msgstr "czas_wys�ania=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
-msgstr ""
+msgstr "czas_odbioru=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
-msgstr ""
+msgstr "semctl nie powiod�o si�"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
+"\n"
+"Identyfikator tablicy semafor�w (semid)=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
-msgstr ""
+msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
-msgstr ""
+msgstr "tryb=%#o, uprawnienia=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
-msgstr ""
+msgstr "lsem = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
-msgstr ""
+msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
-msgstr ""
+msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
-msgstr ""
+msgstr "n.sem."
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
-msgstr ""
+msgstr "warto��"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
-msgstr ""
+msgstr "oczek.n."
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
-msgstr ""
+msgstr "oczek.z."
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
-msgstr ""
+msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, c-format
+msgid "invalid iflag: %s"
+msgstr "b��dna flaga: %s"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
+"\n"
+"Sk�adnia: %s [-dhV78neo12 ] [-s <szybko��> ] [ -i [-]<flaga> ] <dyscl> "
+"<urz�dzenie>\n"
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
+"\n"
+"Znane nazwy <dyscl>:\n"
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+"\n"
+"Znane nazwy <flag>:\n"
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
-msgstr ""
+msgstr "b��dna szybko��: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
-msgstr ""
+msgstr "ldattach z pakietu %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
-msgstr ""
+msgstr "b��dna opcja"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
-msgstr ""
+msgstr "b��dna dyscyplina linii: %s"
 
-#: sys-utils/ldattach.c:204
-#, fuzzy, c-format
+#: sys-utils/ldattach.c:272
+#, c-format
 msgid "%s is not a serial line"
-msgstr "%s nie jest specjalnym urz�dzeniem blokowym"
+msgstr "%s nie jest interfejsem szeregowym"
 
-#: sys-utils/ldattach.c:210
-#, fuzzy, c-format
+#: sys-utils/ldattach.c:278
+#, c-format
 msgid "cannot get terminal attributes for %s"
-msgstr "nie mo�na pobra� rozmiaru %s"
+msgstr "nie mo�na pobra� atrybut�w terminala dla %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
-msgstr ""
+msgstr "szybko�� %d nie jest obs�ugiwana"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
-msgstr ""
+msgstr "nie mo�na ustawi� atrybut�w terminala dla %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
-msgstr ""
+msgstr "nie mo�na ustawi� dyscypliny linii"
 
-#: sys-utils/ldattach.c:257
-#, fuzzy
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
-msgstr "nie mo�na otworzy� %s"
+msgstr "nie mo�na sta� si� demonem"
 
-#: sys-utils/lscpu.c:64
-#, fuzzy
+#: sys-utils/lscpu.c:54
 msgid "none"
-msgstr "zako�czone\n"
+msgstr "brak"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
-msgstr ""
+msgstr "para"
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
-msgstr ""
+msgstr "pe�na"
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, fuzzy, c-format
-msgid "error: %s"
-msgstr "b��d zamykania %s"
+#: sys-utils/lscpu.c:158
+#, c-format
+msgid "error: cannot open %s"
+msgstr "b��d: nie mo�na otworzy� %s"
 
-#: sys-utils/lscpu.c:162
-#, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "b��d zamykania %s"
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
+#, c-format
+msgid "failed to read: %s"
+msgstr "nie uda�o si� odczyta�: %s"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:209
+#, c-format
+msgid "parse error: %s"
+msgstr "b��d sk�adni: %s"
+
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
-msgstr ""
+msgstr "b��d: strdup nie powi�d� si�"
 
-#: sys-utils/lscpu.c:267
-msgid "error: uname failed"
-msgstr ""
+#: sys-utils/lscpu.c:260
+msgid "failed to callocate cpu set"
+msgstr "nie uda�o si� wykona� calloc dla zbioru CPU"
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
-msgstr ""
+#: sys-utils/lscpu.c:263
+#, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "b��d sk�adni maski CPU %s"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
+#: sys-utils/lscpu.c:318
+msgid "error: uname failed"
+msgstr "b��d: uname nie powiod�o si�"
 
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+msgid "error: calloc failed"
+msgstr "b��d: calloc nie powi�d� si�"
+
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10683,70 +11548,88 @@ msgid ""
 "# starting from zero.\n"
 "# CPU,Core,Socket,Node"
 msgstr ""
+"# Poni�ej lista w formacie �atwym do przetworzenia przez inne programy.\n"
+"# Ka�dy inny element w ka�dej kolumnie ma unikalny identyfikator\n"
+"# z numeracj� zaczynaj�c� od zera.\n"
+"# CPU,rdze�,gniazdo,w�ze�"
+
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr "Architektura:"
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
-msgstr ""
+msgstr "Tryb(y) pracy CPU:"
+
+#: sys-utils/lscpu.c:759
+#, fuzzy
+msgid "CPU(s):"
+msgstr "Gniazd CPU:"
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
-msgstr ""
+msgstr "W�tk�w na rdze�:"
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
-msgstr ""
+msgstr "Rdzeni na gniazdo:"
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
-msgstr ""
+msgstr "Gniazd CPU:"
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
-msgstr ""
+msgstr "W�z��w NUMA:"
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
-msgstr ""
+msgstr "ID producenta:"
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
-msgstr ""
+msgstr "Rodzina CPU:"
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
-msgstr ""
+msgstr "Model:"
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
-msgstr ""
+msgstr "Wersja:"
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
-msgstr ""
+msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
-msgstr ""
+msgstr "Wirtualizacja:"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
-msgstr ""
+msgstr "Producent hiperwizora:"
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
-msgstr ""
+msgstr "Typ wirtualizacji:"
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
-msgstr ""
+msgstr "Cache %s:"
+
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "Procesory w�z�a NUMA %d:"
 
-#: sys-utils/lscpu.c:666
-#, fuzzy, c-format
+#: sys-utils/lscpu.c:816
+#, c-format
 msgid "Usage: %s [option]\n"
-msgstr "u�ycie: %s [ -n ] urz�dzenie\n"
+msgstr "Sk�adnia: %s [opcja]\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10754,70 +11637,16 @@ msgid ""
 "  -p, --parse    print out in parsable instead of printable format.\n"
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
-
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr ""
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr ""
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr ""
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr ""
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr ""
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr ""
+"Narz�dzie informuj�ce o architekturze CPU\n"
+"\n"
+"  -h, --help     informacja o sposobie u�ycia\n"
+"  -p, --parse    wypisanie danych w formacie do przetworzenia programowego\n"
+"  -s, --sysroot  u�ycie katalogu jako nowego drzewa systemowego\n"
 
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
-msgstr ""
+msgstr "brak pami�ci"
 
 #: sys-utils/readprofile.c:118
 #, c-format
@@ -10836,40 +11665,54 @@ msgid ""
 "\t -n            disable byte order auto-detection\n"
 "\t -V            print version and exit\n"
 msgstr ""
+"%s: Sk�adnia: \"%s [opcje]\n"
+"\t -m <plik_mapy>  (domy�lnie: \"%s\" i\n"
+"\t\t\t\t     \"%s\")\n"
+"\t -p <profil>     (domy�lny: \"%s\")\n"
+"\t -M <mno�nik>    ustawienie mno�nika profiluj�cego\n"
+"\t -i              wypisanie tylko informacji o kroku pr�bkowania\n"
+"\t -v              szczeg�owe wypisywanie danych\n"
+"\t -a              wypisanie wszystkich symboli, nawet z zerami\n"
+"\t -b              wypisanie licznik�w dla poszczeg�lnych histogram�w\n"
+"\t -s              wypisanie licznik�w wewn. poszczeg�lnych funkcji\n"
+"\t -r              wyzerowanie licznik�w (tylko dla roota)\n"
+"\t -n              wy��czenie wykrywania kolejno�ci bajt�w\n"
+"\t -V              wypisanie informacji o wersji i zako�czenie\n"
 
 #: sys-utils/readprofile.c:227
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
-msgstr ""
+msgstr "readprofile: b��d zapisu %s: %s\n"
 
 #: sys-utils/readprofile.c:268
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
+"Przyj�to odwr�con� kolejno�c bajt�w. Opcja -n wymusi natywn� kolejno��.\n"
 
 #: sys-utils/readprofile.c:284
 #, c-format
 msgid "Sampling_step: %i\n"
-msgstr ""
+msgstr "Krok pr�bkowania: %i\n"
 
 #: sys-utils/readprofile.c:305 sys-utils/readprofile.c:331
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr ""
+msgstr "%s: %s(%i): b��dna linia mapy\n"
 
 #: sys-utils/readprofile.c:318
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr ""
+msgstr "%s: nie znaleziono \"_stext\" w %s\n"
 
 #: sys-utils/readprofile.c:352
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
-msgstr ""
+msgstr "%s: adres profilu spoza zakresu. B��dny plik mapy?\n"
 
 #: sys-utils/readprofile.c:412
 msgid "total"
-msgstr ""
+msgstr "razem"
 
 #: sys-utils/renice.c:53
 #, c-format
@@ -10883,40 +11726,46 @@ msgid ""
 " renice -v | --version\n"
 "\n"
 msgstr ""
+"\n"
+"Sk�adnia:\n"
+" renice [-n] priorytet [-p|--pid] pid        [... pid]\n"
+" renice [-n] priorytet  -g|--pgrp grupap     [... grupap]\n"
+" renice [-n] priorytet  -u|--user u�ytkownik [... u�ytkownik]\n"
 
 #: sys-utils/renice.c:89
-#, fuzzy, c-format
+#, c-format
 msgid "renice from %s\n"
-msgstr "Urz�dzenie: %s\n"
+msgstr "renice z pakietu %s\n"
 
 #: sys-utils/renice.c:126
 #, c-format
 msgid "renice: %s: unknown user\n"
-msgstr ""
+msgstr "renice: %s: nieznany u�ytkownik\n"
 
 #: sys-utils/renice.c:134
 #, c-format
 msgid "renice: %s: bad value\n"
-msgstr ""
+msgstr "renice: %s: b��dna warto��\n"
 
 #: sys-utils/renice.c:152 sys-utils/renice.c:164
 msgid "getpriority"
-msgstr ""
+msgstr "getpriority"
 
 #: sys-utils/renice.c:157
 msgid "setpriority"
-msgstr ""
+msgstr "setpriority"
 
 #: sys-utils/renice.c:168
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
-msgstr ""
+msgstr "%d: stary priorytet %d, nowy priorytet %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -10925,112 +11774,147 @@ msgid ""
 "    -v | --verbose            verbose messages\n"
 "    -V | --version            show version\n"
 msgstr ""
-
-#: sys-utils/rtcwake.c:142
+"Sk�adnia: %s [opcje]\n"
+"    -d | --device <urz�dzenie>  wyb�r urz�dzenia RTC (rtc0|rtc1|...)\n"
+"    -n | --dry-run              wykonanie wszystkiego poza u�pieniem\n"
+"    -l | --local                RTC u�ywa lokalnej strefy czasowej\n"
+"    -m | --mode                 tryb snu standby|mem|...\n"
+"    -s | --seconds <sekundy>    liczba sekund snu\n"
+"    -t | --time <time_t>        czas pobudki\n"
+"    -u | --utc                  RTC u�ywa UTC\n"
+"    -v | --verbose              szczeg�owe komunikaty\n"
+"    -V | --version              wy�wietlenie wersji\n"
+
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
-msgstr ""
+msgstr "odczyt czasu RTC"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
-msgstr ""
+msgstr "odczyt czasu systemowego"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
-msgstr ""
+msgstr "przeliczanie czasu RTC"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
-msgstr ""
+msgstr "ustawianie alarmu RTC"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
-msgstr ""
+msgstr "w��czanie alarmu RTC"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
-msgstr ""
+msgstr "ustawianie budzika RTC"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
-msgstr ""
+msgstr "%s: nieznany stan u�pienia '%s'\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
-msgstr ""
+msgstr "%s: niedozwolony przedzia� %s s\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
-msgstr ""
+msgstr "%s: niedozwolona warto�� time_t %s\n"
 
-#: sys-utils/rtcwake.c:385
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:396
+#, c-format
 msgid "%s: version %s\n"
-msgstr "%s: b��d odczytu na %s\n"
+msgstr "%s: wersja %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
-msgstr ""
+msgstr "%s: za�o�ono, �e RTC u�ywa UTC...\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
-msgstr ""
+msgstr "U�ycie czasu UTC.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
-msgstr ""
+msgstr "U�ycie czasu lokalnego.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
-msgstr ""
+msgstr "%s: trzeba poda� czas pobudki\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
-msgstr ""
+msgstr "malloc() nie powi�d� si�"
 
-#: sys-utils/rtcwake.c:429
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:440
+#, c-format
 msgid "%s: %s not enabled for wakeup events\n"
-msgstr "%s: nie jest to urz�dzenie blokowe\n"
+msgstr "%s: %s nie ma w��czonych zdarze� budzenia\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
-msgstr ""
+msgstr "alarm %ld, sys_time %ld, rtc_time %ld, sekund: %u\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
-msgstr ""
+msgstr "%s: czas nie biegnie wstecz do %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
-msgstr ""
+msgstr "%s: pobudka z trybu \"%s\" przy u�yciu %s w chwili %s\n"
 
-#: sys-utils/rtcwake.c:487
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr "tryb u�pienia: brak; opuszczanie\n"
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr "tryb u�pienia: wy��czenie; wywo�ywanie %s\n"
+
+#: sys-utils/rtcwake.c:503
+#, c-format
 msgid "%s: unable to execute %s: %s\n"
-msgstr "%s: nie uda�o si� przeetykietowa� %s na %s: %s\n"
+msgstr "%s: nie uda�o si� wywo�a� %s: %s\n"
+
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr "tryb u�pienia: w��czony; odczytywanie RTC\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
-msgstr ""
+msgstr "odczyt RTC"
+
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr "tryb u�pienia: wy��czony; wy��czanie budzika\n"
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr "tryb u�pienia: %s; usypianie systemu\n"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
-msgstr ""
+msgstr "wy��czanie przerwania pobudki RTC"
 
 #: sys-utils/setarch.c:50
 #, c-format
 msgid "Switching on %s.\n"
-msgstr ""
+msgstr "W��czanie %s.\n"
 
 #: sys-utils/setarch.c:113
 #, c-format
@@ -11039,6 +11923,9 @@ msgid ""
 "\n"
 "Options:\n"
 msgstr ""
+"Sk�adnia: %s%s [opcje] [program [program argumenty]]\n"
+"\n"
+"Opcje:\n"
 
 #: sys-utils/setarch.c:117
 #, c-format
@@ -11059,6 +11946,22 @@ msgid ""
 "GB\n"
 "     --4gb                ignored (for backward compatibility only)\n"
 msgstr ""
+" -h, --help               wy�wietlenie tego opisu\n"
+" -v, --verbose            szczeg�owa informacja o w��czanych opcjach\n"
+" -R, --addr-no-randomize  wy��czenie losowo�ci wirtualnej przestrzeni "
+"adresowej\n"
+" -F, --fdpic-funcptrs     wska�niki funkcji wskazuj�ce na deskryptory\n"
+" -Z, --mmap-page-zero     w��czenie MMAP_PAGE_ZERO\n"
+" -L, --addr-compat-layout zmiany w sposobie przydzielania pami�ci "
+"wirtualnej\n"
+" -X, --read-implies-exec  w��czenie READ_IMPLIES_EXEC\n"
+" -B, --32bit              w��czenie ADDR_LIMIT_32BIT\n"
+" -I, --short-inode        w��czenie SHORT_INODE\n"
+" -S, --whole-seconds      w��czenie WHOLE_SECONDS\n"
+" -T, --sticky-timeouts    w��czenie STICKY_TIMEOUTS\n"
+" -3, --3gb                ograniczenie przestrzeni adresowej do maksimum 3 "
+"GB\n"
+"     --4gb                ignorowane (tylko dla kompatybilno�ci wstecznej)\n"
 
 #: sys-utils/setarch.c:131
 #, c-format
@@ -11066,6 +11969,8 @@ msgid ""
 "\n"
 "For more information see setarch(8).\n"
 msgstr ""
+"\n"
+"Wi�cej informacji mo�na znale�� w setarch(8).\n"
 
 #: sys-utils/setarch.c:143
 #, c-format
@@ -11073,25 +11978,27 @@ msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
 msgstr ""
+"%s: %s\n"
+"`%s --help' wy�wietli wi�cej informacji.\n"
 
 #: sys-utils/setarch.c:215 sys-utils/setarch.c:231
 #, c-format
 msgid "%s: Unrecognized architecture"
-msgstr ""
+msgstr "%s: Nieznana architektura"
 
 #: sys-utils/setarch.c:249 sys-utils/setarch.c:256
 msgid "Not enough arguments"
-msgstr ""
+msgstr "Za ma�o argument�w"
 
 #: sys-utils/setarch.c:265 sys-utils/setarch.c:318
 #, c-format
 msgid "Failed to set personality to %s"
-msgstr ""
+msgstr "Nie uda�o si� ustawi� osobowo�ci na %s"
 
 #: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr ""
+msgstr "Sk�adnia: %s program [argument ...]\n"
 
 #: sys-utils/tunelp.c:75
 #, c-format
@@ -11100,69 +12007,81 @@ msgid ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
+"Sk�adnia: %s <urz�dzenie> [ -i <IRQ> | -t <CZAS> | -c <ZNAKI> | -w <OCZEKIW> "
+"|\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 ""
+msgstr "b��d malloca"
 
 #: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
-msgstr ""
+msgstr "%s: b��dna warto��\n"
 
 #: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
-msgstr ""
+msgstr "%s: %s nie jest urz�dzeniem lp.\n"
+
+#: sys-utils/tunelp.c:259
+msgid "LPGETSTATUS error"
+msgstr "b��d LPGETSTATUS"
 
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
-msgstr ""
+msgstr "Stan drukarki %s: %d"
 
 #: sys-utils/tunelp.c:264
 #, c-format
 msgid ", busy"
-msgstr ""
+msgstr ", zaj�ta"
 
 #: sys-utils/tunelp.c:265
 #, c-format
 msgid ", ready"
-msgstr ""
+msgstr ", gotowa"
 
 #: sys-utils/tunelp.c:266
 #, c-format
 msgid ", out of paper"
-msgstr ""
+msgstr ", brak papieru"
 
 #: sys-utils/tunelp.c:267
 #, c-format
 msgid ", on-line"
-msgstr ""
+msgstr ", w��czona"
 
 #: sys-utils/tunelp.c:268
 #, c-format
 msgid ", error"
-msgstr ""
+msgstr ", b��d"
+
+#: sys-utils/tunelp.c:274
+msgid "tunelp: ioctl failed"
+msgstr "tunelp: ioctl nie powi�d� si�"
 
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
-msgstr ""
+msgstr "b��d LPGETIRQ"
 
 #: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr ""
+msgstr "%s u�ywa IRQ %d\n"
 
 #: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr ""
+msgstr "%s u�ywa odpytywania\n"
 
 #: sys-utils/unshare.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [options] <program> [args...]\n"
-msgstr "Sk�adnia: %s [opcje] urz�dzenie...\n"
+msgstr "Sk�adnia: %s [opcje] <program> [argumenty...]\n"
 
 #: sys-utils/unshare.c:60
 msgid ""
@@ -11174,6 +12093,13 @@ msgid ""
 "  -i, --ipc         unshare System V IPC namespace\n"
 "  -n, --net         unshare network namespace\n"
 msgstr ""
+"Uruchomienie programu z cz�ci� przestrzeni nazw odosobnionych od rodzica\n"
+"\n"
+"  -h, --help        opis u�ycia (czyli ten tekst)\n"
+"  -m, --mount       oddzielenie przestrzeni montowania\n"
+"  -u, --uts         oddzielenie przestrzeni UTS (nazwa hosta itp.)\n"
+"  -i, --ipc         oddzielenie przestrzeni SysV IPC\n"
+"  -n, --net         oddzielenie przestrzeni sieciowej\n"
 
 #: sys-utils/unshare.c:67
 #, c-format
@@ -11181,89 +12107,100 @@ msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
+"\n"
+"Wi�cej informacji mo�na znale�� w unshare(1).\n"
 
 #: sys-utils/unshare.c:114
-#, fuzzy
 msgid "unshare failed"
-msgstr "przemieszczenie nie powiod�o si�"
+msgstr "unshare nie powiod�o si�"
 
 #: sys-utils/unshare.c:118
-#, fuzzy, c-format
+msgid "cannot set group id"
+msgstr "nie mo�na ustawi� identyfikatora grupy"
+
+#: sys-utils/unshare.c:121
+msgid "cannot set user id"
+msgstr "nie mo�na ustawi� identyfikatora u�ytkownika"
+
+#: sys-utils/unshare.c:125
+#, c-format
 msgid "exec %s failed"
-msgstr "%s nie powiod�o si�.\n"
+msgstr "exec %s nie powiod�o si�"
 
 #: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr ""
+msgstr "col: b��dny argument -l %s.\n"
 
 #: text-utils/col.c:544
 #, c-format
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr ""
+msgstr "Sk�adnia: col [-bfpx] [-l liczba_linii]\n"
 
 #: text-utils/col.c:550
 #, c-format
 msgid "col: write error.\n"
-msgstr ""
+msgstr "col: b��d zapisu.\n"
 
 #: text-utils/col.c:557
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr ""
+msgstr "col: uwaga: nie mo�na cofn�� %s.\n"
 
 #: text-utils/col.c:558
 msgid "past first line"
-msgstr ""
+msgstr "po pierwszej linii"
 
 #: text-utils/col.c:558
 msgid "-- line already flushed"
-msgstr ""
+msgstr "- linia ju� zapisana"
 
 #: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr ""
+msgstr "Sk�adnia: %s [ - ] [ -2 ] [ plik ... ]\n"
 
 #: text-utils/column.c:297
 msgid "line too long"
-msgstr ""
+msgstr "linia zbyt d�uga"
 
 #: text-utils/column.c:374
 #, c-format
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr ""
+msgstr "Sk�adnia: column [-tx] [-c kolumny] [plik ...]\n"
 
 #: text-utils/hexsyntax.c:82
 #, c-format
 msgid "hexdump: bad length value.\n"
-msgstr ""
+msgstr "hexdump: b��dna warto�� d�ugo�ci.\n"
 
 #: text-utils/hexsyntax.c:93
 #, c-format
 msgid "hexdump: bad skip value.\n"
-msgstr ""
+msgstr "hexdump: b��dna warto�� pomini�cia.\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 plik_fmt] [-n d�ugo��] [-s pomin] "
+"[plik ...]\n"
 
 #: text-utils/more.c:258
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr ""
+msgstr "Sk�adnia: %s [-dflpcsu] [+linii | +/wzorzec] nazwa1 nazwa2 ...\n"
 
 #: text-utils/more.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "failed to initialize line buffer\n"
-msgstr "nie uda�o si� przydzieli� bufora wyj�ciowego"
+msgstr "nie uda�o si� zainicjowa� bufora linii\n"
 
 #: text-utils/more.c:485
 #, c-format
 msgid "%s: unknown option \"-%c\"\n"
-msgstr ""
+msgstr "%s: nieznana opcja \"-%c\"\n"
 
 #: text-utils/more.c:517
 #, c-format
@@ -11272,6 +12209,9 @@ msgid ""
 "*** %s: directory ***\n"
 "\n"
 msgstr ""
+"\n"
+"*** %s: katalog ***\n"
+"\n"
 
 #: text-utils/more.c:561
 #, c-format
@@ -11280,44 +12220,47 @@ msgid ""
 "******** %s: Not a text file ********\n"
 "\n"
 msgstr ""
+"\n"
+"******** %s: Nie jest plikiem tekstowym ********\n"
+"\n"
 
 #: text-utils/more.c:664
 #, c-format
 msgid "[Use q or Q to quit]"
-msgstr ""
+msgstr "[Klawisz q lub Q ko�czy]"
 
 #: text-utils/more.c:756
 #, c-format
 msgid "--More--"
-msgstr ""
+msgstr "--Wi�cej--"
 
 #: text-utils/more.c:758
 #, c-format
 msgid "(Next file: %s)"
-msgstr ""
+msgstr "(Nast�pny plik: %s)"
 
 #: text-utils/more.c:763
 #, c-format
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr ""
+msgstr "[Spacja kontynuuje, 'q' ko�czy.]"
 
 #: text-utils/more.c:1206
 #, c-format
 msgid "...back %d pages"
-msgstr ""
+msgstr "...wstecz stron: %d"
 
 #: text-utils/more.c:1208
 msgid "...back 1 page"
-msgstr ""
+msgstr "...wstecz 1 stron�"
 
 #: text-utils/more.c:1251
 msgid "...skipping one line"
-msgstr ""
+msgstr "...pomijanie jednej linii"
 
 #: text-utils/more.c:1253
 #, c-format
 msgid "...skipping %d lines"
-msgstr ""
+msgstr "...pomijanie linii: %d"
 
 #: text-utils/more.c:1290
 msgid ""
@@ -11325,6 +12268,9 @@ msgid ""
 "***Back***\n"
 "\n"
 msgstr ""
+"\n"
+"***Wstecz***\n"
+"\n"
 
 #: text-utils/more.c:1328
 msgid ""
@@ -11333,6 +12279,11 @@ msgid ""
 "brackets.\n"
 "Star (*) indicates argument becomes new default.\n"
 msgstr ""
+"\n"
+"Wi�kszo�� polece� opcjonalnie mo�e by� poprzedzona liczb� ca�kowit� k "
+"(domy�lna\n"
+"w nawiasach).\n"
+"Gwiazdka (*) oznacza argument, kt�ry staje si� now� warto�ci� domy�ln�.\n"
 
 #: text-utils/more.c:1335
 msgid ""
@@ -11356,118 +12307,145 @@ msgid ""
 ":f                      Display current file name and line number\n"
 ".                       Repeat previous command\n"
 msgstr ""
+"<spacja>               Wy�wietlenie nast�pnych k linii tekstu [rozmiar "
+"ekranu]\n"
+"z                      Wy�wietlenie nast�pnych k linii tekstu [rozmiar "
+"ekranu]*\n"
+"<return>               Wy�wietlenie nast�pnych k linii tekstu [1]*\n"
+"d lub Ctrl-D           Przewini�cie k linii [rozmiar przewijania, pocz. 11]"
+"*\n"
+"q, Q lub <przerwanie>  Zako�czenie more\n"
+"s                      Przewini�cie o k linii tekstu w prz�d [1]\n"
+"f                      Przewini�cie o k ekran�w tekstu w prz�d [1]\n"
+"b lub Ctrl-B           Przewini�cie o k ekran�w tekstu w ty� [1]\n"
+"'                      Przej�cie do miejsca rozpocz�cia poprz. wyszukiwania\n"
+"=                      Wy�wietlenie bie��cego numeru linii\n"
+"/<wyra�enie regularne> Szukanie k. wyst�pienia wyra�enia regularnego [1]\n"
+"n                      Szukanie k. wyst�pienia ostatniego wyr. regularnego "
+"[1]\n"
+"!<polec> lub :!<polec> Wykonanie <polecenia> w podpow�oce\n"
+"v                      Uruchomienie /usr/bin/vi na bie��cej linii\n"
+"Ctrl-L                 Odrysowanie ekranu\n"
+":n                     Przej�cie do k. nast�pnego pliku [1]\n"
+":p                     Przej�cie do k. poprzedniego pliku [1]\n"
+":f                     Wy�wietlenie bie��cej nazwy pliku i numeru linii\n"
+".                      Powt�rzenie poprzedniego polecenia\n"
 
 #: text-utils/more.c:1404 text-utils/more.c:1409
 #, c-format
 msgid "[Press 'h' for instructions.]"
-msgstr ""
+msgstr "[Klawisz 'h' wy�wietla opis.]"
 
 #: text-utils/more.c:1443
 #, c-format
 msgid "\"%s\" line %d"
-msgstr ""
+msgstr "\"%s\" linia %d"
 
 #: text-utils/more.c:1445
 #, c-format
 msgid "[Not a file] line %d"
-msgstr ""
+msgstr "[Nie plik] linia %d"
 
 #: text-utils/more.c:1529
 msgid "  Overflow\n"
-msgstr ""
+msgstr "  Przepe�nienie\n"
 
 #: text-utils/more.c:1576
 msgid "...skipping\n"
-msgstr ""
+msgstr "...pomijanie\n"
 
 #: text-utils/more.c:1605
 msgid "Regular expression botch"
-msgstr ""
+msgstr "Spartaczone wyra�enie regularne"
 
 #: text-utils/more.c:1613
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
+"\n"
+"Nie znaleziono wzorca\n"
 
 #: text-utils/more.c:1616 text-utils/pg.c:1127 text-utils/pg.c:1278
 msgid "Pattern not found"
-msgstr ""
+msgstr "Nie znaleziono wzorca"
 
 #: text-utils/more.c:1677
 msgid "can't fork\n"
-msgstr ""
+msgstr "nie mo�na wykona� fork\n"
 
 #: text-utils/more.c:1716
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
+"\n"
+"...Przewijanie "
 
 #: text-utils/more.c:1720
 msgid "...Skipping to file "
-msgstr ""
+msgstr "...Przej�cie do pliku "
 
 #: text-utils/more.c:1722
 msgid "...Skipping back to file "
-msgstr ""
+msgstr "...Przej�cie wstecz do pliku "
 
 #: text-utils/more.c:2000
 msgid "Line too long"
-msgstr ""
+msgstr "Linia zbyt d�uga"
 
 #: text-utils/more.c:2043
 msgid "No previous command to substitute for"
-msgstr ""
+msgstr "Brak poprzedniego polecenia do podstawienia"
 
 #: text-utils/odsyntax.c:130
 #, c-format
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr ""
+msgstr "od: od(1) jest przestarza�e i zast�pione przez hexdump(1).\n"
 
 #: text-utils/odsyntax.c:133
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr ""
+msgstr "od: kompatybilno�� z hexdump(1) nie obejmuje opcji -%c%s\n"
 
 #: text-utils/odsyntax.c:134
 msgid "; see strings(1)."
-msgstr ""
+msgstr "; p. strings(1)."
 
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr ""
+msgstr "hexdump: nie mo�na odczyta� %s.\n"
 
 #: text-utils/parse.c:68
 #, c-format
 msgid "hexdump: line too long.\n"
-msgstr ""
+msgstr "hexdump: linia zbyt d�uga.\n"
 
 #: text-utils/parse.c:401
 #, c-format
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr ""
+msgstr "hexdump: liczba bajt�w z wieloma znakami konwersji.\n"
 
 #: text-utils/parse.c:483
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr ""
+msgstr "hexdump: b��dna liczba bajt�w dla znaku konwersji %s.\n"
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
-msgstr ""
+msgstr "hexdump: %%s wymaga podania precyzji lub liczby bajt�w.\n"
 
 #: text-utils/parse.c:496
 #, c-format
 msgid "hexdump: bad format {%s}\n"
-msgstr ""
+msgstr "hexdump: b��dny format {%s}\n"
 
 #: text-utils/parse.c:502
 #, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr ""
+msgstr "hexdump: b��dny znak konwersji %%%s.\n"
 
 #: text-utils/pg.c:145
 msgid ""
@@ -11496,195 +12474,214 @@ msgid ""
 "See pg(1) for more information.\n"
 "-------------------------------------------------------\n"
 msgstr ""
+"Wszelkie prawa zastrze�one.\n"
+"-------------------------------------------------------\n"
+"  h                       ten ekran\n"
+"  q lub Q                 zako�czenie programu\n"
+"  <nowa linia>            nast�pna strona\n"
+"  f                       przewini�cie strony w prz�d\n"
+"  d lub ^D                nast�pne p� strony\n"
+"  l                       nast�pna linia\n"
+"  $                       ostatnia strona\n"
+"  /wyr_reg/               szukanie wyra�enia regularnego w prz�d\n"
+"  ?wyr_reg? lub ^wyr_reg^ szukanie wyra�enia regularnego w ty�\n"
+"  . lub ^L                przerysowanie ekranu\n"
+"  w lub z                 ustawienie rozmiaru strony i przej�cie na "
+"nast�pn�\n"
+"  s nazwa_pliku           zapisanie bie��cego pliku pod podan� nazw�\n"
+"  !polecenie              wywo�anie polecenia w pow�oce\n"
+"  p                       przej�cie do poprzedniego pliku\n"
+"  n                       przej�cie do nast�pnego pliku\n"
+"\n"
+"Wiele polece� przyjmuje liczby poprzedzaj�ce, np.:\n"
+"+1<nowa linia> (nast�pna strona); -1<nowa linia> (poprzednia strona);\n"
+"1<nowa linia> (pierwsza strona).\n"
+"\n"
+"Wi�cej informacji mo�na znale�� w pg(1).\n"
+"-------------------------------------------------------\n"
 
 #: text-utils/pg.c:223
-#, fuzzy
 msgid "Out of memory\n"
-msgstr "%s: Zabrak�o pami�ci!\n"
+msgstr "Brak pami�ci\n"
 
 #: text-utils/pg.c:236
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
+"%s: Sk�adnia: %s [-liczba] [-p �a�cuch] [-cefnrs] [+linia] [+/wzorzec/] "
+"[pliki]\n"
 
 #: text-utils/pg.c:245
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
-msgstr ""
+msgstr "%s: opcja musi mie� argument -- %s\n"
 
 #: text-utils/pg.c:253
 #, c-format
 msgid "%s: illegal option -- %s\n"
-msgstr ""
+msgstr "%s: b��dna opcja -- %s\n"
 
 #: text-utils/pg.c:370
 msgid "...skipping forward\n"
-msgstr ""
+msgstr "...przewijanie w prz�d\n"
 
 #: text-utils/pg.c:372
 msgid "...skipping backward\n"
-msgstr ""
+msgstr "...przewijanie w ty�\n"
 
 #: text-utils/pg.c:394
 msgid "No next file"
-msgstr ""
+msgstr "Brak nast�pnego pliku"
 
 #: text-utils/pg.c:398
 msgid "No previous file"
-msgstr ""
+msgstr "Brak poprzedniego pliku"
 
 #: text-utils/pg.c:931
 #, c-format
 msgid "%s: Read error from %s file\n"
-msgstr ""
+msgstr "%s: B��d odczytu z pliku %s\n"
 
 #: text-utils/pg.c:937
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
-msgstr ""
+msgstr "%s: Nieoczekiwany EOF w pliku %s\n"
 
 #: text-utils/pg.c:940
 #, c-format
 msgid "%s: Unknown error in %s file\n"
-msgstr ""
+msgstr "%s: Nieznany b��d w pliku %s\n"
 
 #: text-utils/pg.c:1035
 #, c-format
 msgid "%s: Cannot create tempfile\n"
-msgstr ""
+msgstr "%s: Nie mo�na utworzy� pliku tymczasowego\n"
 
 #: text-utils/pg.c:1044 text-utils/pg.c:1219 text-utils/pg.c:1246
 msgid "RE error: "
-msgstr ""
+msgstr "B��d wyra�enia regularnego: "
 
 #: text-utils/pg.c:1201
 msgid "(EOF)"
-msgstr ""
+msgstr "(EOF)"
 
 #: text-utils/pg.c:1227 text-utils/pg.c:1254
 msgid "No remembered search string"
-msgstr ""
+msgstr "Brak zapami�tanego szukanego �a�cucha"
 
 #: text-utils/pg.c:1310
 msgid "Cannot open "
-msgstr ""
+msgstr "Nie mo�na otworzy� "
 
 #: text-utils/pg.c:1358
 msgid "saved"
-msgstr ""
+msgstr "zapisano"
 
 #: text-utils/pg.c:1465
 msgid ": !command not allowed in rflag mode.\n"
-msgstr ""
+msgstr ": !polecenie nie jest dozwolone w trybie z opcj� -r.\n"
 
 #: text-utils/pg.c:1497
 msgid "fork() failed, try again later\n"
-msgstr ""
+msgstr "fork() nie powi�d� si�, prosz� spr�bowa� p�niej\n"
 
 #: text-utils/pg.c:1705
 msgid "(Next file: "
-msgstr ""
+msgstr "(Nast�pny plik: "
 
 #: text-utils/rev.c:113
-#, fuzzy
 msgid "unable to allocate bufferspace"
-msgstr "Nie mo�na przydzieli� bufora dla i-w�z��w"
+msgstr "nie mo�na przydzieli� bufora"
 
 #: text-utils/rev.c:143
 #, c-format
 msgid "usage: rev [file ...]\n"
-msgstr ""
+msgstr "Sk�adnia: rev [plik ...]\n"
 
 #: text-utils/tailf.c:58 text-utils/tailf.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "cannot open \"%s\" for read"
-msgstr "nie mo�na otworzy� %s"
+msgstr "nie mo�na otworzy� \"%s\" do odczytu"
 
 #: text-utils/tailf.c:96 text-utils/tailf.c:215
-#, fuzzy, c-format
+#, c-format
 msgid "cannot stat \"%s\""
-msgstr "nie mo�na otworzy� %s"
+msgstr "nie mo�na wykona� stat na \"%s\""
 
 #: text-utils/tailf.c:109
 #, c-format
 msgid "incomplete write to \"%s\" (written %zd, expected %zd)\n"
-msgstr ""
+msgstr "niepe�ny zapis do \"%s\" (zapisano %zd, oczekiwano %zd)\n"
 
 #: text-utils/tailf.c:147
 #, c-format
 msgid "%s: cannot add inotify watch (limit of inotify watches was reached)."
 msgstr ""
+"%s: nie mo�na doda� obserwatora inotify (osi�gni�to limit obserwator�w)."
 
 #: text-utils/tailf.c:151
 #, c-format
 msgid "%s: cannot add inotify watch."
-msgstr ""
+msgstr "%s: nie mo�na doda� obserwatora inotify."
 
 #: text-utils/tailf.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot read inotify events"
-msgstr "%s: nie mo�na otworzy� %s\n"
+msgstr "%s: nie mo�na odczyta� zdarze� inotify"
 
 #: text-utils/tailf.c:199 text-utils/tailf.c:203
 msgid "invalid number of lines"
-msgstr ""
+msgstr "b��dna liczba linii"
 
 #: text-utils/tailf.c:210
 msgid "usage: tailf [-n N | -N] logfile"
-msgstr ""
+msgstr "Sk�adnia: tailf [-n N | -N] plik_logu"
 
 #: text-utils/ul.c:141
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr ""
+msgstr "Sk�adnia: %s [ -i ] [ -tTerminal ] plik...\n"
 
 #: text-utils/ul.c:152
 #, c-format
 msgid "trouble reading terminfo"
-msgstr ""
+msgstr "problem z odczytem terminfo"
 
 #: text-utils/ul.c:242
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr ""
+msgstr "Nieznana sekwencja specjalna na wej�ciu: %o, %o\n"
 
 #: text-utils/ul.c:425
 #, c-format
 msgid "Unable to allocate buffer.\n"
-msgstr ""
+msgstr "Nie mo�na przydzieli� bufora.\n"
 
 #: text-utils/ul.c:586
 #, c-format
 msgid "Input line too long.\n"
-msgstr ""
+msgstr "Linia wej�ciowa zbyt d�uga.\n"
 
 #: text-utils/ul.c:599
 #, c-format
 msgid "Out of memory when growing buffer.\n"
-msgstr ""
-
-#~ msgid "# partition table of %s\n"
-#~ msgstr "# tablica partycji %s\n"
+msgstr "Brak pami�ci przy powi�kszaniu bufora.\n"
 
-#~ msgid ""
-#~ "unit: sectors\n"
-#~ "\n"
-#~ msgstr ""
-#~ "jednostka: sektory\n"
-#~ "\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: niedozwolona opcja - %c\n"
 
-#~ msgid " start=%9lu"
-#~ msgstr " pocz�tek=%9lu"
+#~ msgid "segments allocated %d\n"
+#~ msgstr "segment�w przydzielonych: %d\n"
 
-#~ msgid ", size=%9lu"
-#~ msgstr ", rozmiar=%9lu"
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "stron przydzielonych:  %ld\n"
 
-#~ msgid ", bootable"
-#~ msgstr ", rozruchowa"
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "stron w pami�ci:       %ld\n"
 
-#~ msgid "`%s': bad directory: '.' isn't first\n"
-#~ msgstr "`%s': b��dny katalog: '.' nie jest na pocz�tku\n"
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "stron w pliku wymiany: %ld\n"
 
-#~ msgid "`%s': bad directory: '..' isn't second\n"
-#~ msgstr "`%s': b��dny katalog: '..' nie jest na drugiej pozycji\n"
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Wydajno�� wymiany: %ld pr�b\t %ld z sukcesem\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9ca67abb..46a3ec01 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11b\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+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"
@@ -113,6 +113,11 @@ msgstr "ler novamente tabela de parti��es"
 msgid "Usage:\n"
 msgstr "Uso:"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ sinal ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -133,6 +138,17 @@ msgstr "Comandos dispon�veis:\n"
 msgid "get size in 512-byte sectors"
 msgstr "obter tamanho"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, fuzzy, c-format
+msgid "%s (%s)\n"
+msgstr "%s em %s\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -234,15 +250,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Uso: %s [ -n ] dispositivo\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, fuzzy, c-format
-msgid "%s (%s)\n"
-msgstr "%s em %s\n"
-
 #: disk-utils/fdformat.c:132
 #, fuzzy, c-format
 msgid "%s: not a block device\n"
@@ -340,7 +347,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc falhou"
 
@@ -956,7 +963,7 @@ msgstr "n�o foi poss�vel verificar status de dispositivo %s"
 msgid "%s is not a block special device"
 msgstr "%s n�o � um dispositivo de blocos especial"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "n�o foi poss�vel abrir %s"
@@ -980,7 +987,7 @@ msgstr "muitos inodes - m�ximo � 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "pouco espa�o, � necess�rio pelo menos %lu blocos"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -1055,7 +1062,7 @@ 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:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1265,7 +1272,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "busca falhou em check_blocks"
 
@@ -1351,171 +1358,177 @@ msgstr ""
 "Usando tamanho de p�gina especificado pelo usu�rio %d, em vez dos valores do "
 "sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "o fork falhou\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "r�tulo"
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTamP�g] dispositivo [blocos]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "n�mero excessivo de p�ginas inv�lidas"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Mem�ria insuficiente"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "uma p�gina inv�lida\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%d p�ginas inv�lidas\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "N�o foi poss�vel rebobinar o dispositivo de permuta (swap)"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "n�o foi poss�vel alocar buffers para inodes"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "n�o foi poss�vel alocar buffers para inodes"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "n�o foi poss�vel limpar o setor de boot"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   mostra a tabela de parti��es BSD"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   mostra o r�tulo do disco completo"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   mostra o r�tulo do disco completo"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s - erro: vers�o %d desconhecida\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr "Erro no fechamento de %s\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: erro - tamanho %ld � maior do que o tamanho do dispositivo %d\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s - erro: a �rea de permuta (swap) precisa ter pelo menos %ld kB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s -- aviso: reduzindo �rea de permuta (swap) para %ld kB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "N�o ser� tentado criar dispositivo de permuta (swap) em '%s'"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s est� montado; n�o criar� um sistema de arquivos aqui!"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 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:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Configurando espa�o de permuta (swap) vers�o %d, tamanho = %ld bytes\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "N�o foi poss�vel gravar a p�gina de assinatura"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync falhou"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "n�o foi poss�vel stat %s"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "n�o foi poss�vel gravar inodes"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "n�o foi poss�vel renomear %s para %s: %s\n"
@@ -1578,67 +1591,109 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "erro ao gravar %s: %s"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Inutiliz�vel"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "N�o foi poss�vel rebobinar o dispositivo de permuta (swap)"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Espa�o livre"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: parti��o inexistente\n"
 
-#: fdisk/cfdisk.c:385
-#, fuzzy
-msgid "Linux ext3"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s - erro: vers�o %d desconhecida\n"
 
-#: fdisk/cfdisk.c:387
-#, fuzzy
-msgid "Linux XFS"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: fdisk/cfdisk.c:389
-#, fuzzy
-msgid "Linux JFS"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: fdisk/cfdisk.c:391
-#, fuzzy
-msgid "Linux ReiserFS"
-msgstr "Linux nativa"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "HPFS do OS/2"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "IFS do OS/2"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "busca falhou em write_tables"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "As informa��es de finger foram alteradas.\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Inutiliz�vel"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Espa�o livre"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "O disco foi alterado.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1651,202 +1706,202 @@ msgstr ""
 "parti��o DOS 6.x, consulte a p�gina de manual\n"
 "do cfdisk para obter informa��es adicionais.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ERRO FATAL"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Pressione qualquer tecla para sair do cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "N�o foi poss�vel realizar busca na unidade de disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "N�o foi poss�vel ler a unidade de disco"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "N�o foi poss�vel gravar na unidade de disco"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "N�mero excessivo de parti��es"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "A parti��o come�a antes do setor 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "A parti��o termina antes do setor 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "A parti��o come�a depois do fim do disco"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "A parti��o se estende at� depois do fim do disco"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "parti��es l�gicas fora da ordem do disco"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "parti��es l�gicas sobrepostas"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "parti��es l�gicas aumentadas sobrepostas"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 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:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 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:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menu sem dire��o. Assumindo horizontal como padr�o."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Tecla ilegal"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Pressione uma tecla para continuar"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Prim�ria"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Cria uma nova parti��o prim�ria"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "L�gica"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Cria uma nova parti��o l�gica"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "N�o criar uma parti��o"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Erro interno !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Tamanho (em MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "In�cio"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Adicionar parti��o no in�cio do espa�o livre"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Fim"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Adicionar parti��o no final do espa�o livre"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Espa�o insuficiente para cria��o de parti��o estendida"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "nenhuma tabela de parti��es presente.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Mostrar tabela de parti��es na tela ou imprimir em um arquivo"
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Assinatura inv�lida na tabela de parti��es"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "nenhuma tabela de parti��es presente.\n"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 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:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "N�o foi poss�vel abrir a unidade de disco"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 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:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "N�o foi poss�vel obter o tamanho do disco"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Parti��o prim�ria inv�lida"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Parti��o l�gica inv�lida"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Aviso!! Isto pode destruir dados existentes no disco!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 #, fuzzy
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
@@ -1854,31 +1909,31 @@ msgstr ""
 "Tem certeza de que deseja gravar a tabela de parti��es no disco? (sim ou "
 "nao):"
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "nao"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "A tabela de parti��es N�O foi gravada no disco"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "sim"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Responda `sim' ou `nao'"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Gravando tabela de parti��es no disco..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "A tabela de parti��es foi gravada no disco"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1887,88 +1942,88 @@ msgstr ""
 "Tabela de parti��es gravada, mas a releitura da tabela falhou. Reinicialize "
 "para atualizar a tabela."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 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:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 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:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "N�o foi poss�vel abrir o arquivo '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidade de disco: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Setor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Setor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "  Nenhum  "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/l�g"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Prim�ria"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   L�gica"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Inicializar"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 #, fuzzy
 msgid "None"
 msgstr "Conclu�do"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabela de parti��es de %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "            Prim.    �lt.\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 #, fuzzy
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
@@ -1977,7 +2032,7 @@ msgstr ""
 " # Tipo     Setor    Setor    Desloc. Compr.   Tipo sist. arqs. (ID)  "
 "Op��es\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -1986,478 +2041,478 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         --- In�cio ---       ---- Fim ----       N�m. inicial de\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Brutos"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Mostrar a tabela usando formato de dados brutos"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Setores"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Mostrar a tabela ordenada por setores"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Mostrar somente a tabela de parti��es"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "N�o mostrar a tabela"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Tela de ajuda do cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 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:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "de disco r�gido."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Comando      Significado"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 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:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Exclui a parti��o atual."
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Altera par�metros de cilindros, cabe�as, setores por trilha"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 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:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             saibam exatamente o que est�o fazendo."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza o uso de disco da parti��o atual."
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Isto pode tornar a parti��o incompat�vel com"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Cria uma nova parti��o a partir do espa�o livre."
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Pode-se selecionar diversos formatos diferentes para"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             uma parti��o:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 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:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabela ordenada por setores."
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Tabela em formato bruto."
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sai do programa sem gravar a tabela de parti��es."
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Altera o tipo de sistema de arquivos."
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Altera unidades de exibi��o do tamanho das parti��es."
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, setores e cilindros."
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 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:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             confirmar ou cancelar a grava��o indicando `sim' ou"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             `n�o'"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Seta p/ cima  Move o cursor para a parti��o anterior."
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 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:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Redesenha a tela."
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "min�sculas (exceto W)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Alterar geometria dos cilindros"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Cabe�as"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Alterar geometria das cabe�as"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Alterar geometria dos setores"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Conclu�do"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "A altera��o da geometria foi conclu�da"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Digite o n�mero de cilindros: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros inv�lido"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Digite o n�mero de cabe�as: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Valor de cabe�as inv�lido"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Digite o n�mero de setores por trilha: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Valor de setores inv�lido"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Digite o tipo do sistema de arquivos: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 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:2534
+#: fdisk/cfdisk.c:2416
 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:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/l�g"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconhecido (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disco: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, 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:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Op��es"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Tipo Part."
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Tipo SA"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[R�tulo]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 #, fuzzy
 msgid "    Sectors"
 msgstr "  Setores"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 #, fuzzy
 msgid "  Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Tam. (Mb)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Tam. (Gb)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Iniciali."
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Alterna a op��o da parti��o atual como inicializ�vel"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Excluir"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Excluir a parti��o atual"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Alterar a geometria do disco (somente para usu�rios avan�ados)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Mostrar tela de ajuda"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maximize"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 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:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Criar nova parti��o a partir do espa�o livre"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Mostre"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Sair"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Sair do programa sem gravar a tabela de parti��es"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 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:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 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:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Gravar"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 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:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "N�o foi poss�vel tornar esta parti��o inicializ�vel."
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "N�o foi poss�vel excluir uma parti��o vazia"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "N�o foi poss�vel maximizar esta parti��o"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Esta parti��o � inutiliz�vel"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Esta parti��o j� est� sendo usada"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 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:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Sem mais parti��es"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Comando inv�lido"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, fuzzy, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2531,9 +2586,9 @@ msgstr ""
 "\n"
 "R�tulo BSD do dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Comando - a��o"
 
@@ -2553,9 +2608,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"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   mostra este menu"
 
@@ -2567,14 +2622,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:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   sai sem salvar as altera��es"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   voltar ao menu principal"
 
@@ -2617,13 +2672,13 @@ msgstr "N�o existe parti��o *BSD em %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Comando para r�tulo de disco BSD (tecle m para obter ajuda): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "�ltimo %s ou +tamanho ou +tamanho M ou  +tamanho K"
@@ -2768,7 +2823,7 @@ msgstr "setores/trilha"
 msgid "tracks/cylinder"
 msgstr "trilhas/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cilindros"
@@ -2826,7 +2881,7 @@ msgstr "Bootstrap (c�digo de inicializa��o) instalado em %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Parti��o (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "O n�mero m�ximo de parti��es foi criado\n"
@@ -2850,229 +2905,209 @@ msgstr ""
 "\n"
 "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:248
-#, fuzzy
-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 ""
-"Uso: fdisk [-b SSZ] [-u] DISCO     Altera a tabela de parti��es.\n"
-"       fdisk -l [-b SSZ] [-u] DISCO  Lista a(s) tabela(s) de parti��es.\n"
-"       fdisk -s PARTI��O           D� o tamanho da(s) parti��o(�es), em "
-"blocos.\n"
-"       fdisk -v                     D� a vers�o do fdisk.\n"
-"Aqui, DISCO � algo como /dev/hdb ou /dev/sda\n"
-"e PARTI��O � algo como /dev/hda7.\n"
-"-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:260
-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 ""
-"Uso: fdisk [-l] [-b SSZ] [-u] dispositivo\n"
-"Ex.: fdisk /dev/hda  (para o primeiro disco IDE);\n"
-" ou : fdisk /dev/sdc  (para o terceiro disco SCSI );\n"
-" ou : fdisk /dev/eda  (para a primeira unidade ESDI PS/2);\n"
-" ou : fdisk /dev/rd/c0d0  ou : fdisk /dev/ida/c0d0  (para dispositivos "
-"RAID)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "N�o foi poss�vel ler %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "N�o foi poss�vel realizar busca em %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "N�o foi poss�vel gravar em %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE  falhou em %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "N�o foi poss�vel alocar mais qualquer mem�ria\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Erro fatal\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   alterna uma op��o de somente leitura"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   edita r�tulo BSD no disco"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   alterna a op��o \"mont�vel\""
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   exclui uma parti��o"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   lista os tipos de parti��o conhecidos"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   cria uma nova parti��o"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   cria uma nova tabela de parti��es DOS vazia"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   mostra a tabela de parti��es"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   cria um novo r�tulo de disco Sun vazio"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   altera a identifica��o da parti��o para o sistema"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   altera as unidades das entradas mostradas"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   verifica a tabela de parti��es"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   grava a tabela no disco e sai"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   funcionalidade adicional (somente para usu�rios avan�ados)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   torna a parti��o inicializ�vel"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   edita uma entrada de arquivo de inicializa��o"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   seleciona uma parti��o de permuta (swap) sgi"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   alterna a op��o \"inicializ�vel\""
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   alterna a op��o \"compatibilidade\""
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   alterar n�mero de cilindros alternativos"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   alterar n�mero de cilindros"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 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:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   alterar n�mero de setores extras por cilindro"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   alterar n�mero de cabe�as"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   alterar fator de \"interleave\""
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   alterar velocidade de rota��o (RPM)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   alterar n�mero de setores/trilha"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   alterar n�mero de cilindros f�sicos"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   mover in�cio dos dados em uma parti��o"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   listar parti��es estendidas"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 #, fuzzy
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   criar uma tabela de parti��es IRIX"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   corrige ordem de parti��o"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u   altera as unidades das entradas mostradas"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Voc� precisa configurar"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "cabe�as"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "setores"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3081,31 +3116,11 @@ msgstr ""
 "%s%s.\n"
 "Voc� pode fazer isto a partir do menu de fun��es extras.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"O n�meor de cilindros para este disco est� configurado para %d.\n"
-"N�o existe nada de errado, mas isto � maior que 1024,\n"
-"e pode em certas configura��es causar problemas com:\n"
-"1) programas que executam em tempo de inicializa��o (vers�es velhas do "
-"LILO)\n"
-"2) inicializa��o e programas de particionamento de outros OSs\n"
-"   (p.ex., DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3116,70 +3131,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, 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:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, 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:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Aten��o: parti��o vazia\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3192,33 +3206,24 @@ msgstr ""
 "o conte�do anterior n�o poder� mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, 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:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, 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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3227,17 +3232,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:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Erro interno\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorando parti��o estendida extra %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3246,7 +3251,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:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3255,95 +3260,100 @@ msgstr ""
 "\n"
 "EOF (fim de arquivo) recebido tr�s vezes - saindo...\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "C�digo hexadecimal (digite L para listar os c�digos): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, fuzzy, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%d-%d, padr�o %d):"
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, fuzzy, c-format
 msgid "Using default value %u\n"
 msgstr "Usando valor padr�o %d\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Valor fora do intervalo.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "N�mero da parti��o"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Aviso: a parti��o %d possui tipo vazio\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, fuzzy, c-format
 msgid "Selected partition %d\n"
 msgstr "Ignorando parti��o estendida extra %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, fuzzy, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Nenhuma parti��o definida\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, fuzzy, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Dentre as parti��es prim�rias, pelo menos uma pode ser estendida\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "setor"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Mudando as unidades das entradas mostradas para %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Mudando as unidades das entradas mostradas para %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, 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:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "A op��o de compatibilidade DOS est� ativada\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, 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:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "A parti��o %d ainda n�o existe!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3356,7 +3366,7 @@ msgstr ""
 "tipo 0 n�o � recomend�vel. Voc� pode excluir\n"
 "uma parti��o usando o comando `d'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3365,7 +3375,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:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3376,7 +3386,7 @@ msgstr ""
 "uma vez que o SunOS/Solaris espera isto e at� mesmo o Linux gosta disto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3387,69 +3397,69 @@ msgstr ""
 "e a parti��o 11 como um volume inteiro (6), uma vez que o IRIX espera isto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "O tipo da parti��o %d foi alterado para %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     f�s. = (%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "l�gico = (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, 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:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "deveria ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "A parti��o %i n�o inicia em um limite de cilindro:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3459,7 +3469,7 @@ msgstr ""
 "Disco %s: %d cabe�as, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr ""
@@ -3467,12 +3477,12 @@ msgstr ""
 "Disco %s: %d cabe�as, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
@@ -3480,17 +3490,22 @@ msgstr ""
 "Disco %s: %d cabe�as, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "tamanho de inode inv�lido"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3499,14 +3514,14 @@ msgstr ""
 "Nada a fazer. Ordem j� est� correta\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Conclu�do\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3514,16 +3529,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, 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:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3532,7 +3547,7 @@ msgstr ""
 "\n"
 "Parti��es l�gicas fora da ordem do disco\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3543,90 +3558,90 @@ msgstr ""
 "Disco %s: %d cabe�as, %d setores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, 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:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Parti��o %d: o setor %d � maior do que o m�ximo: %d\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, 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:2175
+#: fdisk/fdisk.c:2247
 #, 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:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Aviso: a parti��o %d est� vazia\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "O total de setores alocados, %d, � maior do que o m�ximo: %d\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%d setores n�o alocados\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "N�o h� setores livres dispon�veis\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3635,7 +3650,7 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3644,24 +3659,24 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "parti��es l�gicas fora da ordem do disco"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Parti��o prim�ria inv�lida"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3672,20 +3687,20 @@ msgstr ""
 "   %s\n"
 "   p   parti��o prim�ria (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   l�gica (5 ou superior)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   estendida"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, 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:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3694,12 +3709,12 @@ msgstr ""
 "A tabela de parti��es foi alterada!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chamando ioctl() para reler tabela de parti��es.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3708,7 +3723,7 @@ msgid ""
 "the next reboot or after you run partprobe(8) or kpartx(8)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3721,50 +3736,50 @@ msgstr ""
 "parti��o DOS 6.x, consulte a p�gina de manual\n"
 "do fdisk para obter informa��es adicionais.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr "Erro no fechamento de %s\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, 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:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Novo in�cio dos dados"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Comando avan�ado (m para ajuda): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "N�mero de cilindros"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "N�mero de cabe�as"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "N�mero de setores"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, 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:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3773,34 +3788,34 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "n�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando desconhecido:\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3809,18 +3824,18 @@ msgstr ""
 "Aviso: a op��o -b (configurar tamanho de setor) deve ser usada com um "
 "dispositivo especificado\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Comando (m para ajuda): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3829,16 +3844,16 @@ msgstr ""
 "\n"
 "O arquivo de boot atual �: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Informe o nome do novo arquivo de boot: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Arquivo de boot inalterado\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3932,15 +3947,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4077,7 +4092,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:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Nenhuma parti��o definida\n"
@@ -4183,7 +4198,7 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja etiquetar esta parti��o de modo "
 "diferente.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr ""
 
@@ -4239,7 +4254,7 @@ msgstr ""
 "o conte�do anterior n�o poder� mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4257,58 +4272,58 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "root SunOS"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "permuta SunOS"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "usr SunOS"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Disco inteiro"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "stand SunOS"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "var SunOS"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "home SunOS"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%d setores n�o alocados\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "home SunOS"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "usr SunOS"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Detec��o autom�tica de RAID Linux"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4321,22 +4336,22 @@ msgstr ""
 "setores e\n"
 "parti��es ou for�ar um r�tulo novo (comando s no menu principal).\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Detectado r�tulo de disco SGI com soma de verifica��o incorreta.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Detectado r�tulo de disco SGI com soma de verifica��o incorreta.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Detectado r�tulo de disco SGI com soma de verifica��o incorreta.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4344,7 +4359,7 @@ msgstr ""
 "Aviso: a op��o inv�lida 0x%04x da tabela de parti��es %d ser� corrigida por "
 "grava��o (w)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4357,31 +4372,31 @@ msgstr ""
 "o conte�do anterior n�o poder� mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Setores/trilha"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervalo n�o utilizado - setores 0 - %d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervalo n�o utilizado - setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4390,7 +4405,7 @@ msgstr ""
 "Outras parti��es j� cobrem o disco inteiro.\n"
 "Exclua ou reduza algumas antes de tentar novamente.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4399,12 +4414,12 @@ msgstr ""
 "Recomenda-se fortemente que a parti��o 11\n"
 "cubra todo o disco e seja do tipo `volume SGI'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4415,7 +4430,7 @@ msgstr ""
 "%d %s cobre alguma outra parti��o. Sua entrada foi alterada\n"
 "para %d %s\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4424,7 +4439,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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4439,12 +4454,12 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja rotular esta parti��o como 82 "
 "(permuta do Linux): "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4459,11 +4474,11 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4472,28 +4487,28 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, 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:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "N�mero de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Setores extras por cilindro: "
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Fator de \"Interleave\""
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Velocidade de rota��o (RPM)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "N�mero de cilindros f�sicos"
 
@@ -4710,6 +4725,10 @@ msgstr "Linux antigo/Minix"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Unidade C: OS/2 oculta"
@@ -5348,93 +5367,93 @@ msgstr "a op��o -n foi fornecida: nada foi alterado\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "N�o foi poss�vel salvar os setores antigos - abortando\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, 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:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "linha de entrada longa demais ou incompleta - encerrando\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erro de entrada: `=' esperado ap�s o campo %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, 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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrada n�o reconhecida: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "n�mero grande demais\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "lixo ap�s o n�mero\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "sem espa�o para o descritor da parti��o\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "n�o foi poss�vel criar a parti��o estendida envolt�ria\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "n�mero excessivo de campos de entrada\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "N�o h� espa�o para mais\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Tipo inv�lido\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, 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:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Aten��o: parti��o vazia\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, 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:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "op��o de inicializa��o n�o reconhecida: selecione - ou *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "especifica��o cil,cab,set parcial?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Parti��o estendida n�o est� no lugar esperado\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "entrada inv�lida\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "N�mero excessivo de parti��es\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5446,43 +5465,43 @@ msgstr ""
 "Normalmente s� � necess�rio especificar <in�cio> e <tamanho> (e, talvez, "
 "<tipo>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: algo como /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "op��es �teis:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 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:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ou --id]:        mostra ou altera a ID da parti��o"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lista as parti��es de cada dispositivo"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 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:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5490,56 +5509,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  aceita/informa em unidades de setores/blocos/"
 "cilindros/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 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:2299
+#: fdisk/sfdisk.c:2304
 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:2300
+#: fdisk/sfdisk.c:2305
 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:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                altera somente a parti��o de n�mero #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 n�o grava no disco, realmente"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I arquivo :         restaura os setores gravados em arquivo"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   mostra a vers�o"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      mostra esta mensagem"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "op��es perigosas:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 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:2309
+#: fdisk/sfdisk.c:2314
 #, fuzzy
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
@@ -5547,7 +5566,7 @@ msgid ""
 msgstr ""
 "    -g [ou --show-geometry]: mostra a suposi��o do kernel sobre a geometria"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5555,64 +5574,64 @@ 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:2312
+#: fdisk/sfdisk.c:2317
 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:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      suprime mensagens de aviso"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Voc� pode anular a geometria detectada usando:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 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:2316
+#: fdisk/sfdisk.c:2321
 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:2317
+#: fdisk/sfdisk.c:2322
 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:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Voc� pode desativar todas as verifica��es de consist�ncia com:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5621,67 +5640,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Use a op��o --force para cancelar todas as verifica��es.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "nenhum comando?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %d blocos\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id dispositivo n�mero-parti��o\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 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:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id dispositivo n�mero-parti��o [ID]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "n�o foi poss�vel abrir %s\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "n�o foi poss�vel abrir %s para leitura"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5689,7 +5708,7 @@ msgstr ""
 "Conclu�do\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5698,35 +5717,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:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ID inv�lida: %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Este disco est� atualmente sendo usado.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erro fatal: n�o foi poss�vel encontrar %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Aviso: %s n�o � um dispositivo de blocos\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 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:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5739,30 +5758,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:3033
+#: fdisk/sfdisk.c:3038
 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:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Situa��o antiga:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, 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:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Situa��o nova:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5770,21 +5789,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:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Voc� est� satisfeito com isto? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Deseja gravar isto no disco? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5793,16 +5812,16 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada prematuro\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Saindo - nada foi alterado\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda y, n ou q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5811,7 +5830,7 @@ msgstr ""
 "Nova tabela de parti��es gravada com sucesso\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5823,17 +5842,17 @@ msgstr ""
 "count=1\n"
 "(consulte fdisk(8)).\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: n�o foi poss�vel abrir %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5841,117 +5860,117 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: n�o encontrado"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr ""
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: voc� precisa especificar o tipo do sistema de arquivos"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s n�o � um dispositivo lp.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "For�ando verifica��o do sistema de arquivos em %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "Uso: mkfs [-V] [-t tipoSistArq] [op��es-sistArq] dispositivo [tamanho]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s n�o � um dispositivo lp.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "N�o foi poss�vel abrir %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s desmontado\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Desmontando quaisquer sistemas de arquivos remanescentes..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: sinal desconhecido %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s de %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "N�o foi poss�vel alocar buffer para inodes"
@@ -6465,7 +6484,13 @@ msgstr "N�o foi encontrada uma interface de rel�gio utiliz�vel.\n"
 msgid "Unable to set system clock.\n"
 msgstr "N�o � poss�vel ajustar o rel�gio do sistema.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6479,17 +6504,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:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6498,22 +6523,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:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6532,6 +6557,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6584,7 +6610,7 @@ msgstr ""
 "  --epoch=ano  Especifica o ano inicial do valor \n"
 "                de epoch do rel�gio de hardware.\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6595,17 +6621,17 @@ msgstr ""
 "                informa a hwclock o tipo de Alpha que voc� tem (consulte "
 "hwclock(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "N�o � poss�vel ajustar o rel�gio do sistema.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, fuzzy, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6614,7 +6640,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:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6623,7 +6649,7 @@ msgstr ""
 "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6632,7 +6658,7 @@ msgstr ""
 "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6641,28 +6667,28 @@ msgstr ""
 "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, 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:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6671,13 +6697,13 @@ msgstr ""
 "Somente o superusu�rio pode alterar o epoch do rel�gio de hardware no "
 "kernel.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6969,12 +6995,12 @@ msgstr ""
 msgid "Changing finger information for %s.\n"
 msgstr "Alterando informa��es de finger de %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: falha de PAM; abortando: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7201,35 +7227,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "mount: n�o foi poss�vel abrir %s: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s n�o � um dispositivo de blocos especial"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, 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:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Uso: login [-fp] [nome_usu�rio]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "N�o foi poss�vel inicializar o PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, 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:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7238,18 +7269,18 @@ msgstr ""
 "Login incorreto\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, 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:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7258,128 +7289,128 @@ msgstr ""
 "\n"
 "Login incorreto\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, fuzzy, c-format
 msgid "login: Out of memory\n"
 msgstr "%s: mem�ria insuficiente!\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Nome de usu�rio inv�lido"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s: login recusado neste terminal.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, 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:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s: LOGIN RECUSADO NO TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Login incorreto\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DISCAGEM EM %s POR %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN COMO ROOT EM %s A PARTIR DE %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN COMO ROOT EM %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN EM %s POR %s A PARTIR DE %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN EM %s POR %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, fuzzy, c-format
 msgid "You have new mail.\n"
 msgstr "Voc� tem mensagens %s na caixa de correio.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, fuzzy, c-format
 msgid "You have mail.\n"
 msgstr "Voc� tem mensagens %s na caixa de correio.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: falha em fork: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() falhou"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "O diret�rio %s n�o existe!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Fazendo login com home = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, 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:1269
+#: login-utils/login.c:1273
 #, 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:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: n�o existe interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7388,65 +7419,65 @@ msgstr ""
 "\n"
 "%s usu�rio: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "nome de login longo demais.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NOME longo demais"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "nomes de login n�o podem iniciar com '-'.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "N�mero excessivo de saltos de linha.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "Saltos de linha EXCESSIVOS"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Tempo de login esgotado ap�s %d segundos\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ltimo login: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "a partir de %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "em: %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "FALHA DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "FALHA DE LOGIN EM %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALHAS DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALHAS DE LOGIN EM %s, %s"
@@ -7703,7 +7734,7 @@ msgstr "sem TERM ou n�o � poss�vel stat tty\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "erro ao gravar %s: %s"
 
 #: login-utils/simpleinit.c:950
@@ -7713,8 +7744,8 @@ msgstr "erro ao gravar %s: %s"
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "erro executando programa\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "erro ao gravar %s: %s"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7841,25 +7872,25 @@ msgstr "%s: n�o foi poss�vel stat arquivo tempor�rio.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: n�o foi poss�vel ler arquivo tempor�rio.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "valor de ano inv�lido: use 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "valor de m�s inv�lido: use 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "valor de ano inv�lido: use 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "Uso: cal [-mjyV] [[m�s] ano]\n"
@@ -7883,6 +7914,113 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "n�o foi poss�vel abrir %s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: comando desconhecido: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "N�o foi poss�vel alocar buffer.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "N�o foi poss�vel alocar buffer.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: n�o foi poss�vel ler %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "erro de grava��o em %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "As informa��es de finger foram alteradas.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "O diret�rio %s n�o existe!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "N�o foi poss�vel alocar buffer.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "N�o foi poss�vel alocar buffer.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "N�o foi poss�vel alocar buffer.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "N�o foi poss�vel alocar buffer.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8037,7 +8175,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:110
+#: misc-utils/script.c:115
 #, fuzzy, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8048,37 +8186,37 @@ msgstr ""
 "Use `%s [op��es] %s' se voc� realmente quer usar isto.\n"
 "Script n�o iniciado.\n"
 
-#: misc-utils/script.c:173
+#: misc-utils/script.c:182
 #, fuzzy, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "Uso: script [-a] [-f] [-q] [arquivo]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado, o arquivo � %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "erro de grava��o em %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado em %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "erro de grava��o em %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: n�o foi poss�vel localizar \"_stext\" em %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8087,17 +8225,17 @@ msgstr ""
 "\n"
 "Script conclu�do em %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script conclu�do, o arquivo � %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty falhou\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "ptys esgotados\n"
@@ -8442,6 +8580,16 @@ msgstr "read %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: n�o foi poss�vel abrir %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "n�o foi poss�vel stat %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8472,6 +8620,11 @@ msgstr "Erro ao ler %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "id inv�lido: %s\n"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8489,7 +8642,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8509,12 +8662,12 @@ msgstr "erro ao alterar o modo de %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8542,83 +8695,81 @@ msgstr "Uso: %s [op��es] dispositivo ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nome...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "malloc falhou"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "A abertura de %s falhou"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr ""
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "Erro no fechamento de %s\n"
+
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "O disco %s n�o cont�m uma tabela de parti��es v�lida\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "openpty falhou\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "bytes"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty falhou\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Valor definido inv�lido: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Uso: %s [op��es] dispositivo ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8868,7 +9019,7 @@ msgstr "loop: n�o foi poss�vel excluir o dispositivo %s: %s\n"
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Este mount foi compilado sem suporte a la�os. Recompile-o.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8890,7 +9041,7 @@ msgstr ""
 "  %s [ -e criptografia ] [ -o deslocamento ] dispositivo_la�o arquivo # "
 "configura��o\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8906,250 +9057,294 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Valor definido inv�lido: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Valor definido inv�lido: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: n�o foi poss�vel abrir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: o dispositivo est� ocupado"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "N�o havia suporte a la�o dispon�vel quando da compila��o. Recompile.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: n�o foi poss�vel localizar %s em %s ou %s"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: de acordo com mtab, %s j� est� montado em %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: de acordo com mtab, %s est� montado em %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: n�o foi poss�vel abrir %s para grava��o: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erro ao gravar %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: erro ao alterar modo de %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: n�o foi poss�vel realizar fork: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Experimentando %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: n�o foi especificado um tipo de sistema de arquivos para %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       experimentarei todos os tipos mencionados em %s ou %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       e parece ser um espa�o de permuta\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       experimentarei o tipo %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espa�o de permuta - n�o montado"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "mount falhou"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: somente o root pode montar %s em %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de la�o especificado duas vezes"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado duas vezes"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ignorando a configura��o de um dispositivo de la�o\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Valor definido inv�lido: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Valor definido inv�lido: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: de acordo com mtab, %s j� est� montado em %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: ser� usado o dispositivo de la�o %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: falha ao configurar dispositivo de la�o\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configura��o de dispositivo de la�o realizada com sucesso\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: n�o foi poss�vel abrir %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, fuzzy, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: n�o foi poss�vel abrir %s para configura��o da velocidade"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: de acordo com mtab, %s j� est� montado em %s"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s est� ocupado - remontado somente para leitura\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s est� ocupado - remontado somente para leitura\n"
+
+#: mount/mount.c:1482
 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:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: voc� precisa especificar o tipo do sistema de arquivos"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: a montagem falhou"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, 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:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: permiss�o negada"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: � necess�rio ser superusu�rio para montar"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est� ocupado"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc j� montado"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s j� montado ou %s ocupado"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: o ponto de montagem %s n�o existe"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: o dispositivo especial %s n�o existe"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9158,12 +9353,12 @@ msgstr ""
 "mount: o dispositivo especial %s n�o existe\n"
 "       (um prefixo de caminho n�o � um diret�rio)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, 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:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9173,135 +9368,130 @@ msgstr ""
 "inv�lido em %s,\n"
 "       ou n�mero excessivo de sistemas de arquivos montados"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "tabela de montagem cheia"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: n�o foi poss�vel ler o superbloco"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: dispositivo de blocos desconhecido"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "   l   lista os tipos de sistemas de arquivos conhecidos"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: provavelmente voc� queria dizer %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 #, fuzzy
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: talvez voc� quisesse dizer iso9660?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 #, fuzzy
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: talvez voc� quisesse dizer iso9660?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: o kernel n�o reconhece %s como dispositivo de blocos\n"
 "       (talvez `insmod driver'?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s n�o � um dispositivo de blocos"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s n�o � um dispositivo de blocos v�lido"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "dispositivo de blocos "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, 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:1569
+#: mount/mount.c:1647
 #, 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:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: n�o foi poss�vel montar %s%s somente para leitura"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, 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:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: nenhum %s encontrado - criando-o...\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s j� montado em %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9311,24 +9501,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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:1707
+#: mount/mount.c:1777
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s j� montado em %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9386,39 +9576,39 @@ msgstr ""
 "Outras op��es: [-nfFrsvw] [-o op��es].\n"
 "Para mais detalhes, consulte `man 8 mount'.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: opera��o exclusiva de root"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: opera��o exclusiva de root"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: tal parti��o n�o foi encontrada"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, 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"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: aviso: n�o h� nova linha final no final de %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: linha %d em %s tem %s inv�lido(a)\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; resto do arquivo ignorado"
 
@@ -9431,7 +9621,7 @@ msgstr "erro na chamada a xstrndup"
 msgid "not enough memory"
 msgstr "n�o h� mem�ria suficiente"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9442,7 +9632,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9455,7 +9645,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9467,127 +9657,132 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "o fork falhou\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "exec falhou\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() falhou"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "A abertura de %s falhou"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Nome"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "swapon: aviso: %s possui permiss�es inseguras %04o; sugere-se 0600\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "swapon: ignorando arquivo %s - ele parece ter buracos.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s em %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: n�o foi poss�vel localizar \"_stext\" em %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "N�o definido\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9597,37 +9792,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sem suporte a -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "mount: n�o foi poss�vel realizar fork: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de blocos inv�lido"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: n�o montado"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: n�o foi poss�vel gravar superbloco"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9635,54 +9830,54 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: n�o encontrado"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: precisa ser superusu�rio para desmontar"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, 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:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "n�o existe umount2, tentando umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est� ocupado - remontado somente para leitura\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, 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:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s desmontado\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 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:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9693,81 +9888,85 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t tipos_sist_arq_virt]\n"
 "       umount [-f] [-r] [-n] [-v] especial | n�...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: mount/umount.c:487
+#: mount/umount.c:493
 #, fuzzy
-msgid "Cannot umount \"\"\n"
+msgid "Cannot unmount \"\"\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Tentando desmontar %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "N�o foi poss�vel localizar %s em mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, 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:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s est� montado m�ltiplas vezes"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, 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:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: somente %s pode desmontar %s de %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: opera��o exclusiva de root"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9775,76 +9974,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "desconhecida"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS sobre TCP n�o � suportado.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr "atual"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "novas "
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() n�o conseguiu ler a hora de /dev/tty1"
@@ -9867,7 +10086,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9896,11 +10115,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "exec falhou\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Uso: %s programa [arg ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "As informa��es de finger foram alteradas.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "N�o foi poss�vel obter o tamanho de %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "malloc falhou"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: n�o foi poss�vel abrir %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "erro de busca"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "erro de busca"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " e "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10047,7 +10374,15 @@ msgstr "   %f int/s; %f recebidos (char/s)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n n�vel] [-s tamanho_buffer]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10056,38 +10391,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "N�mero excessivo de argumentos.\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valor definido inv�lido: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valor definido inv�lido: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "N�o. Op��o --date especificada\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "n�mero m�ximo de segmentos: %ld\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty falhou\n"
@@ -10134,6 +10474,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "o fork falhou\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "As informa��es de finger foram alteradas.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "N�o. Op��o --date especificada\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "N�o. Op��o --date especificada\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "busca falhou"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "inode raiz n�o � um diret�rio"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "openpty falhou\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "openpty falhou\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10225,480 +10618,455 @@ msgid ""
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, fuzzy, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "Tecla ilegal"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 #, fuzzy
 msgid "permission denied for key"
 msgstr "mount: permiss�o negada"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 #, fuzzy
 msgid "invalid key"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 #, fuzzy
 msgid "permission denied for id"
 msgstr "mount: permiss�o negada"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 #, fuzzy
 msgid "invalid id"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, fuzzy, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s em %s\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, fuzzy, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: sinal desconhecido %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "Uso : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
+#: sys-utils/ipcs.c:114
 #, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h para ajuda.\n"
-
-#: sys-utils/ipcs.c:124
-#, fuzzy, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s fornece informa��es sobre recursos do ipc para"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Especifica��o de recurso:\n"
-"\t-m : mem�ria compartilhada\n"
-"\t-q : mensagens\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
-msgstr ""
-"\t-s : sem�foros\n"
-"\t-a : tudo (padr�o)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
+msgstr "%s fornece informa��es sobre recursos do ipc para"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Formato de sa�da:\n"
-"\t-t : hor�rio\n"
-"\t-p : pid\n"
-"\t-c : criador\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : detalhes sobre o recurso identificado por id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : limites\n"
-"\t-u : resumo\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : detalhes sobre o recurso identificado por id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "o kernel n�o est� configurado para mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "- Limites da mem�ria compartilhada -\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, fuzzy, c-format
 msgid "max number of segments = %lu\n"
 msgstr "n�mero m�ximo de segmentos: %ld\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, fuzzy, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "tamanho m�ximo do segmento (Kb): %ld\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "mem�ria compartilhada total m�xima (Kb): %ld\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, fuzzy, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "tamanho m�nimo do segmento (bytes): %ld\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "- Status da mem�ria compartilhada -\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "segmentos alocados: %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "p�ginas alocadas %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "p�ginas residentes: %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "p�ginas permutadas: %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Desempenho de permuta: %ld tentativas\t %ld sucessos\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "Criadores/donos de segmentos de mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "Hor�rios de anexa��o/destacamento/altera��o da mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "propriet�rio"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "anexado"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "destacado"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "alterado"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "Criador/�ltima op da mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "- Segmentos da mem�ria compartilhada -\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "chave"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "bytes"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "status"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 #, fuzzy
 msgid "Not set"
 msgstr "N�o definido\n"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "bloqueado"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "o kernel n�o est� configurado para sem�foros\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Limites de sem�foro ------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "n�mero m�ximo de arrays: %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "m�ximo de sem�foros por array: %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "m�ximo geral de sem�foros do sistema: %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "m�ximo de ops por chamada semop: %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valor m�ximo de sem�foro: %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "----- Status de sem�foro -------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "arrays usados: %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "sem�foros alocados: %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "----- Criadores/donos de arrays de sem�foros -----\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "Hor�rios de opera��o/altera��o de mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "�ltima-op"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "�tima-altera��o"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Arrays de sem�foros ------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, fuzzy, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "o kernel n�o est� configurado para sem�foros\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "----- Mensagens: limites -------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "n�mero m�ximo geral de filas no sistema: %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "tamanho m�ximo da mensagem (bytes): %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "tamanho m�ximo padr�o da fila (bytes): %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "----- Mensagens: status -------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "filas alocadas: %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "cabe�alhos usados: %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "espa�o usado: %d bytes\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "---- Filas de mensagens: criadores/donos ----\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "Hor�rios de envio/recep��o/altera��o de filas de mensagens\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "envio"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "recebimento"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "altera��o"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "--- PIDs de filas de mensagens ---\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "----- Filas de mensagens ------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "bytes usados"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "mensagens"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync falhou"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10707,42 +11075,42 @@ msgstr ""
 "\n"
 "Mem�ria compartilhada: shmid de segmento = %d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, fuzzy, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, fuzzy, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%s"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, fuzzy, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%s"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, fuzzy, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%s"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync falhou"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10751,32 +11119,32 @@ msgstr ""
 "\n"
 "msqid da fila de mensagens: %d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, fuzzy, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%s"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, fuzzy, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%s"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "busca falhou"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10785,157 +11153,180 @@ msgstr ""
 "\n"
 "semid de array de sem�foros: %d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, fuzzy, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, fuzzy, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "valor"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "id inv�lido: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s n�o � um dispositivo de blocos especial"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "N�o foi poss�vel realizar busca na unidade de disco"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Conclu�do"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr ", erro"
+msgid "error: cannot open %s"
+msgstr "%s: n�o foi poss�vel abrir %s: %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "erro na leitura de %s\n"
+msgid "failed to read: %s"
+msgstr "n�o foi poss�vel stat %s"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "erro de busca"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "A abertura de %s falhou"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "N�o foi poss�vel alocar buffer.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: n�o foi poss�vel abrir %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr "Erro no fechamento de %s\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "malloc falhou"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10944,70 +11335,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Situa��o antiga:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11016,76 +11420,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "erro ao alterar o modo de %s: %s\n"
-
-#: sys-utils/rdev.c:77
-#, fuzzy
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"Uso: rdev [ -rsv ] [ -o DESLOCAMENTO ] [ IMAGEM [ VALOR [ DESLOCAMENTO] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (ou rdev /linux, etc.) exibe o dispositivo RAIZ atual"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         define a RAIZ como /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              define ROOTFLAGS (status de somente "
-"leitura)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
-"  rdev -r /dev/fd0 627            define o tamanho do RAMDISK (disco de RAM)"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-"  rdev -v /dev/fd0 1              define o VIDEOMODE (modo de v�deo) de "
-"inicializa��o"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   usa o deslocamento de bytes N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   o mesmo que rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     o mesmo que rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     o mesmo que rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Nota: os modos de v�deo s�o: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
-"2=key2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      use -R 1 para montar a raiz somente para leitura, -R 0 for leitura/"
-"grava��o."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr ""
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, fuzzy, c-format
 msgid "out of memory"
@@ -11193,11 +11527,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: prioridade antiga = %d; prioridade nova = %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11207,107 +11542,132 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 #, fuzzy
 msgid "read rtc time"
 msgstr "leitura/grava��o"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: parti��o n�o reconhecida\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "Tecla ilegal"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr "%s vers�o %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Usando %s.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Usando %s.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "malloc falhou"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s n�o � um dispositivo lp.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Mensagem de %s@%s em %s em %s ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "n�o foi poss�vel renomear %s para %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 #, fuzzy
 msgid "rtc read"
 msgstr ", pronto"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11403,6 +11763,11 @@ msgstr "%s: valor inv�lido\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s n�o � um dispositivo lp.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "erro LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11433,6 +11798,11 @@ msgstr ", on-line"
 msgid ", error"
 msgstr ", erro"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: a montagem falhou"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "erro LPGETIRQ"
@@ -11476,6 +11846,16 @@ msgid "unshare failed"
 msgstr "busca falhou"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "exec falhou\n"
@@ -11982,6 +12362,236 @@ 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 "segments allocated %d\n"
+#~ msgstr "segmentos alocados: %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "p�ginas alocadas %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "p�ginas residentes: %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "p�ginas permutadas: %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Desempenho de permuta: %ld tentativas\t %ld sucessos\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "erro executando programa\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Valor definido inv�lido: %s\n"
+
+#~ msgid "current"
+#~ msgstr "atual"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "novas "
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#, fuzzy
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext2"
+
+#, fuzzy
+#~ msgid "Linux XFS"
+#~ msgstr "Linux"
+
+#, fuzzy
+#~ msgid "Linux JFS"
+#~ msgstr "Linux"
+
+#, fuzzy
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux nativa"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "HPFS do OS/2"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "IFS do OS/2"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#, fuzzy
+#~ 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 ""
+#~ "Uso: fdisk [-b SSZ] [-u] DISCO     Altera a tabela de parti��es.\n"
+#~ "       fdisk -l [-b SSZ] [-u] DISCO  Lista a(s) tabela(s) de parti��es.\n"
+#~ "       fdisk -s PARTI��O           D� o tamanho da(s) parti��o(�es), em "
+#~ "blocos.\n"
+#~ "       fdisk -v                     D� a vers�o do fdisk.\n"
+#~ "Aqui, DISCO � algo como /dev/hdb ou /dev/sda\n"
+#~ "e PARTI��O � algo como /dev/hda7.\n"
+#~ "-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"
+
+#~ 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 ""
+#~ "Uso: fdisk [-l] [-b SSZ] [-u] dispositivo\n"
+#~ "Ex.: fdisk /dev/hda  (para o primeiro disco IDE);\n"
+#~ " ou : fdisk /dev/sdc  (para o terceiro disco SCSI );\n"
+#~ " ou : fdisk /dev/eda  (para a primeira unidade ESDI PS/2);\n"
+#~ " ou : fdisk /dev/rd/c0d0  ou : fdisk /dev/ida/c0d0  (para dispositivos "
+#~ "RAID)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "O n�meor de cilindros para este disco est� configurado para %d.\n"
+#~ "N�o existe nada de errado, mas isto � maior que 1024,\n"
+#~ "e pode em certas configura��es causar problemas com:\n"
+#~ "1) programas que executam em tempo de inicializa��o (vers�es velhas do "
+#~ "LILO)\n"
+#~ "2) inicializa��o e programas de particionamento de outros OSs\n"
+#~ "   (p.ex., DOS FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: nenhum %s encontrado - criando-o...\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "exec falhou\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "Uso : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h para ajuda.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Especifica��o de recurso:\n"
+#~ "\t-m : mem�ria compartilhada\n"
+#~ "\t-q : mensagens\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : sem�foros\n"
+#~ "\t-a : tudo (padr�o)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Formato de sa�da:\n"
+#~ "\t-t : hor�rio\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : criador\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : limites\n"
+#~ "\t-u : resumo\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr ", erro"
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "erro na leitura de %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "erro ao alterar o modo de %s: %s\n"
+
+#, fuzzy
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "Uso: rdev [ -rsv ] [ -o DESLOCAMENTO ] [ IMAGEM [ VALOR "
+#~ "[ DESLOCAMENTO] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (ou rdev /linux, etc.) exibe o dispositivo RAIZ atual"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         define a RAIZ como /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              define ROOTFLAGS (status de somente "
+#~ "leitura)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr ""
+#~ "  rdev -r /dev/fd0 627            define o tamanho do RAMDISK (disco de "
+#~ "RAM)"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr ""
+#~ "  rdev -v /dev/fd0 1              define o VIDEOMODE (modo de v�deo) de "
+#~ "inicializa��o"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   usa o deslocamento de bytes N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   o mesmo que rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     o mesmo que rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     o mesmo que rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Nota: os modos de v�deo s�o: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      use -R 1 para montar a raiz somente para leitura, -R 0 for leitura/"
+#~ "grava��o."
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "mem�ria insuficiente?\n"
diff --git a/po/ru.po b/po/ru.po
index 8ef07f07..4b73e2d7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2006-03-07 12:42+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -104,6 +104,11 @@ msgstr "���������� ������� ��������"
 msgid "Usage:\n"
 msgstr "�������������:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ ������ ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -124,6 +129,17 @@ msgstr "��������� �������:\n"
 msgid "get size in 512-byte sectors"
 msgstr "�������� ������ � ������"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -225,15 +241,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "�������������: %s [ -n ] ����������\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -336,7 +343,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc ���������� ��������"
 
@@ -952,7 +959,7 @@ msgstr "���������� ���������� ��������� ���������� %s"
 msgid "%s is not a block special device"
 msgstr "%s �� �������� ������ ������� �����������"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "���������� ������� %s"
@@ -976,7 +983,7 @@ msgstr "������� ����� inode'��, �������� - 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "�� ������� �����, ����� ��� ������� %lu ������"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "����������: %s\n"
@@ -1050,7 +1057,7 @@ msgstr "������ �������� %s"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "�������������: mkfs [-V] [-t ���_��] [�����_��] ���������� [������]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1291,7 +1298,7 @@ msgstr "����� �� ����� �������� ������ ���������� ��������"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "���������� �������� � do_check: �������� ����\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "����� � check_blocks ���������� ��������"
 
@@ -1375,176 +1382,182 @@ msgstr ""
 "������������ �������� ������������� ������ �������� %d, ������ ��������� "
 "�������� %d/%d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "�������� ��������� �������� ����������� ��������\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "�������� ������ swap-���������, ����� �� ��������.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "����� ���� ���������.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "��� �����, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "��� uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "�������������: %s [-c] [-v0|-v1] [-pPAGESZ] [-L �����] /dev/��� [�����]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "������� ����� ������ �������"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "�� ������� ������"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "���� ������ ��������\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu ������ �������\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "���������� ���������� ���������� ��� ��������"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "���������� �������� ������ ��� inodes"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "���������� �������� ������ ��� inodes"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "���������� �������� ����������� ������"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   ����� ������� �������� BSD"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   ����������� ������ ����� �����"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   ����������� ������ ����� �����"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: ������: ����������� ������ %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "������ �������� �����\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: ������: ����� �� ���������� ���� ��������?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: ������: ������ %lu ������, ��� ������ ���������� %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 "%s: ������: ������������ ��� �������� ������ ���� �� ������� ���� %ld��\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: ��������������: ������������ ��� �������� ����������� �� %ld��\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "������� ������� ���������� ��� �������� �� '%s' ��������� �� �����"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s �������������; �� ���������� ����� �������� �������!"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "���������� ���������� ������������ ��� ��������: ����������"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 "��������������� ������������ ��� �������� ������ %d, ������ = %llu ��\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "���������� �������� �������� � ����������"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync ���������� ��������"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "���������� ���������� ��������� %s"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "���������� �������� inode'�"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "���������� ������������� %s � %s: %s\n"
@@ -1607,63 +1620,109 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "������ ��������� �������: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "��������������"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "���������� ���������� ���������� ��� ��������"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "��������� ������������"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: ��� ������ �������\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: ������: ����������� ������ %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: ���������� ������� : %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: ���������� ������� : %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: ���������� ������� : %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: ���������� ������� : %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: ���������� ������� : %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "����� � write_tables ���������� ��������"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "�������������: %s [�����] ����������...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "���������� finger ��������.\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "��������������"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "��������� ������������"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "���� ��� �������.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "������������� �������, ����� ��������� � ���, ��� ������� �������� ��������� "
 "���������.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1677,231 +1736,231 @@ msgstr ""
 "����������� �������� ����������� cfdisk ���\n"
 "��������� �������������� ����������.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "������������ ������"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "������� ����� ������� ��� ������ �� cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "���������� ����� �� �������� ����������"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "���������� ��������� � ��������� ����������"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "���������� �������� �� �������� ����������"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "������� ����� ��������"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "������ ���������� �� ������� 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "������ ������������� �� ������� 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "������ ���������� ����� ����� �����"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "������ ������������� ����� ����� �����"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "������ ������������� �� ��������� �������� �������"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "���������� ������� ���� �� �� ������� ������"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "���������� ������� �������������"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "����������� ���������� ����� �������������"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! ���������� ������ ��� �������� ����������� ����� ��� ������������ "
 "������� !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "���������� ������� ����� ���������� ���� -- ���� �� ������� ��� ����������� "
 "�������"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "����� ���� ������� �������. ���� ����� ��������� �������."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "���� ��� �����������. �� ��������� ������������ ��������������."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "������������ ����"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "������� ������� ��� �����������"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "��������"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "������� ����� �������� ������"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "����������"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "������� ����� ���������� ������"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "������"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "�� ��������� ������"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! ���������� ������ !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "������ (� ��): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "������"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "�������� ������ � ������ ���������� ������������"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "�������� ������ � ����� ���������� ������������"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "��� ����� ��� �������� ������������ �������"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "��� ������� ��������.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "��� ������� ��������. �������� ������� � ����."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "�������� ��������� � ������� ��������"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "����������� ��� ������� ��������"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "������ ������ ������� � ���� [�/�] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "�� ������� ��������� ������, ��� ����� ���� �� �����"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "���������� ������� �������� ����������"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "���� ������ ������ ��� ������ - � ��� ��� ���������� �� ������"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "���������� �������� ������ �����"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "������ �������� ������"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "������ ���������� ������"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "��������������!!  ��� ����� ���������� ������ �� ����� �����!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "�� �������, ��� ������ �������� ������� �������� �� ����? (�� ��� ���): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "���"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "������� �������� �� �������� �� ����"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "��"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "����������, ������� `��' ��� `���'"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "������� �������� ������������ �� ����..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "������� �������� �������� �� ����"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1910,86 +1969,86 @@ msgstr ""
 "������� �������� ��������, �� ��������� ������ ������� ����������� "
 "��������.  ���������������, ����� �������� �������."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "��� �������� ��������, ���������� ��� �����������. DOS'������ MBR �� ����� "
 "��������� ��������."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "�����, ��� ���� �������� ������ ������� ��� �����������. DOS'������ MBR �� "
 "����� ��������� ��������."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "������� ��� ����� ��� ������� RETURN, ����� ������� �� �����: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "���������� ������� ���� '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "�������� ����������: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "������ 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "������ %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   ���   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   ���/���"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   ��������"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   ����������"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "�����������"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "�����������"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "���"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "������� �������� ��� %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "              ������   �������.\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1997,7 +2056,7 @@ msgstr ""
 " # ���        ������      ������   ����.     �����    ��� ����.����.  (ID) "
 "����\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2005,470 +2064,470 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ----������----      ----�����-----    ������    �����\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, fuzzy
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr " # ����� ���. ���� ���   ID  ���. ���� ���     ������    ��������\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "������� �������, ��������� ������ ����� ������"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "������� �������, ������������� �� ��������"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "������ ������� ������� ��������"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "�� �������� �������"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "����� ������� ��� cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "��� cfdisk - ��������� ��������� ��� �������� �����, �������"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "��������� ��� ���������, ������� � �������� ������� ��"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "����� ���������� �� ������� �����."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "�������      ��������"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      --------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          ������������ ������������ ����� �������� �������"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          �������� �������� �������"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          ����� ���������� ���������, �������, �������� �� �������"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             ��������������: ��� ����� ������ �������������� ������"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             ����, ��� �����, ��� �� ������."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          ����� ���� �������"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          ������� �� ��������� ������������� �������� �������"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             ����������: ��� ����� ������� ������ ������������� � "
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          �������� ������ ������� �� ��������� ������������"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          ����� ������� �������� �� ����� ��� � ����"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             ���������� ��������� ��������� ��������"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             ��� ��������, �� ������� �� ������ �������:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - ����� ������ (���������������, ��� ����� �������� �� "
 "����)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - �������, ������������� �� ��������"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - ������� � ������� ����� ������"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          ����� �� ��������� ��� ������ ������� ��������"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          ����� ���� �������� �������"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          ��������� ������� ��������� ������������� ������� �������"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             ���������� ����� ��, ������� � ��������"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          ������ ������� �������� �� ���� (��������� ������ ��������� W)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             �.�. ��� ����� ��������� ������ �� �����, �� ������"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             ����������� ��� �������� ������, ������ `��' ���"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             `���'"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "������� ����� ����������� ������� �� ���������� ������"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "������� ���� ����������� ������� �� ��������� ������"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       ��������������� ������"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          ����� ���� �������"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "����������: ��� ������� ����� ���� ������� � �������"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "��� ������ �������� (�� ����������� ������)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "��������"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "�������� ��������� ��������"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "�������� ��������� �������"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "�������� ��������� �������"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "������ � ���������� ���������"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "������� ���������� ���������:"
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "�������� �������� ���������"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "������� ���������� �������:"
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "�������� �������� �������"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "������� ���������� �������� �� �������:"
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "�������� �������� ��������"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "������� ��� �������� �������:"
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "���������� �������� ��� �� �� ������"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "���������� �������� ��� �� �� �����������"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "���/���"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "����������� (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "�������� ����������: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "������: %lld ����, %lld ��"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "������: %lld ����, %lld.%lld ��"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "�������: %d   �������� �� �������: %d   ���������: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "���"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "��� �������"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "��� ��"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[�����]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    �������"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  ��������"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  ������ (��)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  ������ (��)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "������."
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "����������� ����������� ���� �������� �������"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "������� ������� ������"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "���������"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "�������� ��������� ����� (������ ��� ���������)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "������� ����� �������"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "����."
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "������� �� ��������� ������������� �������� ������� (������ ��� ���������)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "������� ����� ������ �� ��������� ������������"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "�������"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "������� ������� �������� �� ����� ��� � ����"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "�����"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "����� �� ��������� ��� ������ ������� ��������"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "���"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "�������� ��� �������� ������� (DOS, Linux, OS/2 � �.�.)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "��. ���."
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "�������� ������� ��������� ������������� ������� ������� (��, ����., ���.)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "�������� ������� �������� �� ���� (��� ����� ��������� ������)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "���������� ������� ���� ������ �����������"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "���������� ������� ������ ������"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "���������� ��������������� ���� ������"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "���� ������ ��������������"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "���� ������ ��� ������������"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "���������� �������� ��� ������� �������"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "�������� ������ ���"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "�������� �������"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2543,9 +2602,9 @@ msgstr ""
 "\n"
 "����� BSD ��� ����������: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "�������� �������"
 
@@ -2565,9 +2624,9 @@ msgstr "   i   ��������� bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   ������ ����� ��������� �������� ������"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   ����� ����� ����"
 
@@ -2579,14 +2638,14 @@ msgstr "   n   ���������� ������ ������� BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   ����� ������� �������� BSD"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   ����� ��� ���������� ���������"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   ������� � ������� ����"
 
@@ -2629,13 +2688,13 @@ msgstr "�� %s ��� ������� *BSD.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "������� ����� ����� BSD (m ��� �������): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "������ %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "��������� %s ��� +size ��� +sizeM ��� +sizeK"
@@ -2780,7 +2839,7 @@ msgstr "�������/�������"
 msgid "tracks/cylinder"
 msgstr "�������/�������"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "��������"
@@ -2838,7 +2897,7 @@ msgstr "Bootstrap ���������� �� %s.\n"
 msgid "Partition (a-%c): "
 msgstr "������ (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "���� ������� ����������� ��������� ���������� ��������\n"
@@ -2862,225 +2921,208 @@ msgstr ""
 "\n"
 "���������������� �����.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"�������������: fdisk [-b SSZ] [-u] ����  ��������� ������� ��������\n"
-"       fdisk -l [-b SSZ] [-u] ����       ������ ������(�) ��������\n"
-"       fdisk -s ������                   ����� �������(��) ������� � ������\n"
-"       fdisk -v                          ����� ������ fdisk\n"
-"����� ���� - ���-�� ����� /dev/hdb ��� /dev/sda,\n"
-"� ������   - ���-�� ����� /dev/hda7\n"
-"-u: ���������� ������ � ����� � �������� ������� (������ ��������)\n"
-"-b 2048: (��� ��������� MO-������) ������������� 2048-�������� ��������\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"�������������: fdisk [-l] [-b SSZ] [-u] ����������\n"
-"����.: fdisk /dev/hda  (��� ������� IDE-�����)\n"
-"  ���: fdisk /dev/sdc  (��� �������� SCSI-�����)\n"
-"  ���: fdisk /dev/eda  (��� ������� PS/2 ESDI-�����)\n"
-"  ���: fdisk /dev/rd/c0d0  ���: fdisk /dev/ida/c0d0  (��� RAID-���������)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "���������� ������� %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "���������� ��������� %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "���������� ����� �� %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "���������� �������� %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl ���������� �������� �� %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "���������� �������� ��� ������\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "������������ ������\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   ������������ ����� ��������"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   �������������� ����� ����� bsd"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   ������������ ����� ������������"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   �������� �������"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   ������ ��������� ����� �������� ������"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   ���������� ������ �������"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   �������� ����� ������ ������� �������� DOS"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   ����� ������� ��������"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   �������� ����� ������ ����� ����� Sun"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   ��������� id ������� �������"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   ��������� ������ ��������� ������/�����������"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   �������� ������� ��������"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   ������ ������� �������� �� ���� � �����"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   �������������� ���������������� (������ ��� ���������)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   ����� ������������ �������"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   �������������� ����������� ������������ �����"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   ����� ������� ��� �������� sgi"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   ������������ ����� ��������"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   ������������ ����� dos-�������������"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ��������� ���������� �������������� ���������"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   ��������� ���������� ���������"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   ����� ����� ������ � ������� ��������"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ��������� ���������� �������������� �������� �� �������"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   ��������� ���������� �������"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   ��������� ������������ �����������"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ��������� �������� �������� (��/���)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   ��������� ���������� �������� �� �������"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ��������� ���������� ���������� ���������"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   ����������� ������ ������ �������"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   ������ ����������� ��������"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   �������� ������� �������� IRIX (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   ����������� ������� ��������"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u   ��������� ������ ��������� ������/�����������"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "�� ������ ����������"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "�������"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "�������"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3089,30 +3131,11 @@ msgstr ""
 "%s%s.\n"
 "�� ������ ������� ��� �� ���� �������������� �������.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " � "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"���������� ��������� ��� ����� ����� ����������� � %d.\n"
-"� ���� ��� � �������, �� �������� ������, ��� 1024,\n"
-"� � ��������� ���������� ����� ���������� �������� �:\n"
-"1) �����������, ����������� ��� �������� (����., ������ ������ LILO)\n"
-"2) ��������� � ����������� �������� �� ������ ��\n"
-"   (����., DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3123,38 +3146,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "�������� �������� � �������� ����������� �������\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3163,34 +3185,34 @@ msgstr ""
 "��������������: ������������ ������� ����� #%d.\n"
 "��� ����� �������, ���� �� ��������� ��� ������� ��������.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 "��������������: ��������� �� �������������� ������ � ������� �������� %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "��������������: ������������ �������������� ������ � ������� �������� %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "��������������: ������ ������\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3204,26 +3226,17 @@ msgstr ""
 "������������.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "����������: ������ ������� - %d (�� %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "�� ������ �� � ��������� �������� ������� ��������.\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3232,7 +3245,7 @@ msgstr ""
 "�� ���� ����� ������� ������� DOS � BSD.\n"
 "������� �������  'b' ��� �������� � ����� BSD.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3241,17 +3254,17 @@ msgstr ""
 "���������� �� �������� �� ������ ������� �������� DOS, �� ����� ����� Sun, "
 "SGI ��� OSF\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "���������� ������\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "������������ �������������� ����������� ������ %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3260,7 +3273,7 @@ msgstr ""
 "��������������: �������� ���� 0x%04x ������� �������� %d ����� ��������� "
 "�������\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3269,95 +3282,100 @@ msgstr ""
 "\n"
 "������ ������� EOF - ���������� ������...\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "����������������� ��� (������� L ��� ��������� ������ �����): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, �� ��������� %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "������������ �������� �� ��������� %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "�������� �� ��������� ���������.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "����� �������"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "��������������: ������ %d ����� ������ ���\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "��������� ������ %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "������� ��� �� ����������!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "��� �������� ������� ��� ���� ����������!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "�������"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "������"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "��������� ������ ��������� ������/����������� �� %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "��������� ������ ��������� ������/����������� �� %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "��������������: ������ %d �� �������� ����������� ��������\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "���� DOS-������������� ����������\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "���� DOS-������������� �� ����������\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "������ %d ��� �� ����������!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3371,7 +3389,7 @@ msgstr ""
 "���������. �� ������ ������� ������,\n"
 "��������� ������� `d'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3380,7 +3398,7 @@ msgstr ""
 "�� �� ������ �������� ������ �� ����������� ��� ��������\n"
 "������� ������� ���.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3391,7 +3409,7 @@ msgstr ""
 "��� ���� ������� SunOS/Solaris, � ������� ������� ���� ��� Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3402,62 +3420,62 @@ msgstr ""
 "� ������ 11 � ���� ������ ���� (6), ��� ���� ������� IRIX.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "��������� ��� ������� %d ������� �� %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "��������� ��� ������� %d ������� �� %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "������ %d ����� ��������� ����������/���������� ������ (��-Linux?):\n"
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     ���=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "�����=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "������ %d ����� ��������� ����������/���������� ���������:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "������ %i ���������� �� �� ������� ��������:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "������ ���� (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "������ %i �� ������������� �� ������� ��������.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "������ ���� (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "������ %i ���������� �� �� ������� ��������:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3466,7 +3484,7 @@ msgstr ""
 "\n"
 "���� %s: %ld ��, %lld ����\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3475,34 +3493,39 @@ msgstr ""
 "\n"
 "���� %s: %ld.%ld ��, %lld ����\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d �������, %d ��������/�������, %d ���������"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", ����� %llu ��������"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 "������� = %s �� %d * %d = %d ����\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "�������� ������ inode"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3511,14 +3534,14 @@ msgstr ""
 "������ ���������. ����������� ��� � �������.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "������\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3529,16 +3552,16 @@ msgstr ""
 "��������, �� ������� �������� ����������.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s ����     ������       �����       �����   Id  �������\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "����-��"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3547,7 +3570,7 @@ msgstr ""
 "\n"
 "������ ������� �������� ����������� �� � �������� �������\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3558,89 +3581,89 @@ msgstr ""
 "���� %s: %d �������, %d ��������, %d ���������\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "#  AF ��� ���  ��� ��� ���  ���    ������      ���� ID\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "��������������: ������ %d �������� ������� ������\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "������ %d: ������� %d ������, ��� �������� %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "������ %d: ������ %d ������, ��� �������� %d\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "������ %d: ������� %d ������, ��� �������� %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "������ %d: ���������� ������� %d ������������ ���������� �������� %d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "��������������: �������� ������ ������ � ������� %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "��������������: ������ %d ����������� ������ %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "��������������: ������ %d ����\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "���������� ������ %d �� ��������� ������� � ������� %d\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 "��������� ���������� ���������� �������� %d ������, ��� �������� %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld ��������� ��������\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "������ %d ��� ���������.  ������� ��� ����� ���, ��� ����� �������� ���.\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "������ %d ��� �������\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "����������� ��������� ��������� �������\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3655,7 +3678,7 @@ msgstr ""
 "\t��������������: ��� ���� ���������� ��\n"
 "\t������ ����� ����� ���������.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3670,23 +3693,23 @@ msgstr ""
 "\t��������������: ��� ���� ���������� ��\n"
 "\t������ ����� ����� ���������.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "������� �� ������ ������� ��������� ������� � �������� ����������� ������\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "������������� ��� ���������� �������\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "����������� �������� ������\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3697,20 +3720,20 @@ msgstr ""
 "   %s\n"
 "   p   �������� ������ (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   ���������� (5 ��� �����)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   �����������"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "�������� ����� ������� ��� ���� `%c'\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3719,12 +3742,12 @@ msgstr ""
 "������� �������� ���� ��������!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "���������� ioctl() ��� ������������� ������� ��������.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3738,7 +3761,7 @@ msgstr ""
 "���� ��� ��� ���������� ������ �������.\n"
 "����� ������� ����� ������������ ��� ��������� ������������.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3752,7 +3775,7 @@ msgstr ""
 "�������� ����������� fdisk ��� ���������\n"
 "�������������� ����������.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3761,43 +3784,43 @@ msgstr ""
 "\n"
 "������ �������� �����\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "���������������� �����.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "������ %d �� ����� ������� � �������\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "����� ������ ������"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "������� �������� (m ��� �������): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "���������� ���������"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "���������� �������"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "���������� ��������"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "��������������: ��������������� �������� ������� ��� ������������� � DOS\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3806,32 +3829,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "�� ����� %s ����������� ������ ������� ��������\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "���������� ������� %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "���������� ������� %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ����������� �������\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "��� ���� ���� ������� ������ ������� - ����� -b ���������������\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3840,18 +3863,18 @@ msgstr ""
 "��������������: ����� -b (��������� ������� �������) ������ ���� "
 "������������ � ����� ��������� �����������\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "���������� ����� ����� OSF/1 �� %s, ����������� ������� � ����� ����� "
 "�����.\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "������� (m ��� �������): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3860,16 +3883,16 @@ msgstr ""
 "\n"
 "������� boot-����: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "����������, ������� ��� ������ boot-�����: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot-���� �� �������\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3965,15 +3988,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux ����"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux ��������."
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4108,7 +4131,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "������������ ����� ������ ������ ��� ����� �����.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "������� �� ����������\n"
@@ -4213,7 +4236,7 @@ msgstr ""
 "������ ������ ����� ����� \"SGI volume\" ����� �������� ���.\n"
 "������� ��, ���� �� �������, ��� ��������� ���� ������ ��������.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "��\n"
 
@@ -4270,7 +4293,7 @@ msgstr ""
 "������������.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4291,58 +4314,58 @@ msgstr "����������� ������� ��������� ��������� ������� %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\t������=%d\t�����=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Whole disk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%lld ��������� ��������\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "��������������� Linux raid"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4357,22 +4380,22 @@ msgstr ""
 "��� ������������� �������� ����� (�������\n"
 "s � ������� ����)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "���������� ����� ����� sgi � �������� ����������� ������.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "���������� ����� ����� sgi � �������� ����������� ������.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "���������� ����� ����� sgi � �������� ����������� ������.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4380,7 +4403,7 @@ msgstr ""
 "��������������: �������� ���� 0x%04x ������� �������� %d ����� ��������� "
 "�������\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4394,31 +4417,31 @@ msgstr ""
 "������������.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "�������/�������"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "������ %d �� ������������� �� ������� ��������\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "������ %d ������������� � ������� � �������� %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "�������������� ���������� - ������� 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "�������������� ���������� - ������� %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4427,7 +4450,7 @@ msgstr ""
 "������ ������� ��� ���������� ���� ����.\n"
 "������� ��������� ��� ��������� �� ����� ��������� ��������.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4436,12 +4459,12 @@ msgstr ""
 "������������ �������������, ����� ������������\n"
 "������ ��������� ���� ���� � ���� ��� `SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "������ %d ��� �������\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4452,7 +4475,7 @@ msgstr ""
 "%d %s ��������� ������ ������. ��� ����� ��� �������\n"
 "�� %d %s\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4461,7 +4484,7 @@ msgstr ""
 "���� �� ������ ������������ ������������� � SunOS/Solaris, ������������\n"
 "�������� ���� ������ ��� ���� disk (5), ������� � 0, � %u ���������\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4477,12 +4500,12 @@ msgstr ""
 "�������, ��� ������ �������� ���� ������ ��� 82\n"
 "82 (Linux ����): "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4497,11 +4520,11 @@ msgstr ""
 "������� = %s �� %d * 512 ����\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4510,28 +4533,28 @@ msgstr ""
 "������� = %s �� %d * 512 ����\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s ����   ������     �����     �����   Id  �������\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "���������� �������������� ���������"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "�������������� ������� �� �������"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "����������� �����������"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "�������� �������� (��/���)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "���������� ���������� ���������"
 
@@ -4740,6 +4763,10 @@ msgstr "Minix / ������ Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux ���� / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 ������� ���� C:"
@@ -5374,95 +5401,95 @@ msgstr "��� ������ ���� -n: ������ �� ��������\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "������ ���������� ������ �������� - ����������� ����������\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "������ ������ ������� �� %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "������� ��� ������������� ������ ����� - ����������� �����\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "������ �����: `=' �������� ����� ���� %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "������ �����: ����������� ������ %c ����� ���� %s\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "�������������� ����: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "����� ������� �������\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "����� ����� �����\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "��� ����� ��� ����������� �������\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "���������� ������� ���������� ����������� ������\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "������� ����� ����� �����\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "����� ������ ���\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "�������� ���\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "��������������: ��������� ������ (%lu) ��������� ����������� ���������� "
 "������ (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "��������������: ������ ������\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "��������������: �������� ������ ������� (����� %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "������������� ����������� ���� - �������� - ��� *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "��������� ������������ c,h,s?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "����������� ������ �� ���, ��� ��������\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "�������� ����\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "������� ����� ��������\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5474,97 +5501,97 @@ msgstr ""
 "������ ��� ���������� ������ ������� <������> � <������> (� �������� "
 "<���>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "����������: ���-�� ����� /dev/hda ��� /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "�������� �����:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [��� --show-size]: ������ �������� ��������"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [��� --id]:        ����� ��� ��������� Id �������"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [��� --list]:      ������ �������� ������� ����������"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [��� --dump]:      ����, �� � �������, ���������� ��� ����������� "
 "�����"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [��� --increment]: ����� ��������� � �.�. � 1, � �� � 0"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:   �����/����� � �������� �������/�����/��������/��"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [��� --list-types]:������ ��������� ����� ��������"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [��� --DOS]:       ��� DOS-�������������: ����������� ������� �����"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [��� --re-read]:   ������������� ����� ������� ��������"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                 ��������� ������ ������� � ������� #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                  �� ����� ���� �� ���������� �� ����"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O ���� :             ���������� � ���� ��������, ������� ����� "
 "������������"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I ���� :             �������������� ���� ��������"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [��� --version]:   ����� ������ ������"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [��� --help]:      ����� ����� ���������"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "������� �����:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [��� --show-geometry]: ����� ���������, ���������� �����"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5572,7 +5599,7 @@ msgstr ""
 "    -G [��� --show-pt-geometry]: ����� ���������, ���������� �� ������� "
 "��������"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5581,61 +5608,61 @@ msgstr ""
 "������\n"
 "                              ��� ��������� ����������� ��� ��� �� �����"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [��� --Linux]:      ������������� �����, ���������� ��� Linux"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [��� --quiet]:      ���������� ��������������� ���������"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "�� ������ ��������� ������������ ���������, ���������:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [��� --cylinders #]:��������� ����� ������������ ���������"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [��� --heads #]:    ��������� ����� ������������ �������"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [��� --sectors #]:  ��������� ����� ������������ ��������"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "�� ������ ��������� �������� ���� ������������:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [��� --force]:      ��������� ��, ��� � �����, ���� ���� ��� ��������"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "�������������:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s ����������\t\t ������� ������ �������� �������� ����������\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s ���������� n1 n2 ... ���������� ������� n1 ... � ������������� ���������\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -���������� \t ���������� ������ n, ������������� ������ �������\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5644,67 +5671,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "����������� ���� --force ��� ���������� ���� ��������.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "��� �������?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "�����: %llu ������\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "�������������: sfdisk --print-id ���������� �����_�������\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "�������������: sfdisk --change-id ���������� �����_������� Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "�������������: sfdisk --id ���������� �����_������� [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "����� ������� ������ ���� ���������� (����� ���, ��� �  -l ��� -s)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "���������� ������� %s ��� ������-������\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "���������� ������� %s ��� ������\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: ��\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "���������� �������� ������ %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "�������� active-����: 0x%x ������ 0x80\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5712,7 +5739,7 @@ msgstr ""
 "������\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5721,35 +5748,35 @@ msgstr ""
 "� ��� ������� %d �������� �������� �������. ��� �� ����� �������� ��� LILO,\n"
 "�� DOS'������ MBR �������� ������ ���� � ����� �������� ��������.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "������ %s ����� id %x � �� �������� �������\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "�������� Id %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "���� ���� ������ ������������.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "������������ ������: ���������� ����� %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "��������������: %s �� �������� ������� �����������\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "�����������, ����� ������ ����� �� ����������� ���� ����...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5762,30 +5789,30 @@ msgstr ""
 "�����.\n"
 "����������� ���� --no-reread ��� ������ ���� ��������.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "����������� ���� --force ��� ���������� ���� ��������.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "��\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "������ ��������:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "������ %d �� ����������, ���������� �������� ���\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "����� ��������:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5793,21 +5820,21 @@ msgstr ""
 "�� �������� ��� ��� ������� - ������ �� ��������.\n"
 "(���� �� ������������� ������ �����, ����������� ����� --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "�� �������� ��� ��� - ��������, ��� ������� �������� ���\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "��� ���������� ����� �������? [���] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "�� ������ �������� ��� �� ����? [���] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5816,16 +5843,16 @@ msgstr ""
 "\n"
 "sfdisk: ��������������� ��������� �����\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "���������� ������ - ������ �� ��������\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "����������, �������� �, � ��� �\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5834,7 +5861,7 @@ msgstr ""
 "����� ������� �������� ������� ��������\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5846,17 +5873,17 @@ msgstr ""
 "count=1\n"
 "(��. fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: ���������� ������� %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5864,116 +5891,116 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: �� ������"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: ������ %d ��� ����������! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: �� ������ ������� ��� �������� �������"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s �� lp-����������.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "����������� �������� �������� ������� �� %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr "�������������: mkfs [-V] [-t ���_��] [�����_��] ���������� [������]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s �� lp-����������.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s �������������\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "�������������� ��� ���������� �������� �������..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: ����������� ��������: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s �� %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "���������� ���������� ����� ��� inode'��"
@@ -6485,7 +6512,13 @@ msgstr "�� ������ ��������� ������� ���������.\n"
 msgid "Unable to set system clock.\n"
 msgstr "���������� ���������� ��������� ����.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6498,17 +6531,17 @@ msgstr ""
 "(�, ����� �������, ������, ��-��������, �� Alpha �� ��������).  �������� "
 "���������.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "���������� �������� �������� ���� �� ����.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "���� �������������, ��� �������� ���� %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6517,22 +6550,22 @@ msgstr ""
 "����� ���������� �������� ����, �� ������ ������������ ����� 'epoch' ��� "
 "�������� ������� ��������.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "��� �� ��������������� � %d - ������ ������������.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "���������� ���������� � ���� �������� ����.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s �� %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6551,6 +6584,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6604,7 +6638,7 @@ msgstr ""
 "  --noadjfile   ��� ������������� /etc/adjtime. ������� �������������\n"
 "                ���� --utc, ���� --localtime\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6614,17 +6648,17 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                �������� hwclock'� ��� ����� alpha (��. hwclock(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "���������� ���������� ��������� ����.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ��������� �������������� ���������.  ��� ������������� %d.\n"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6633,7 +6667,7 @@ msgstr ""
 "�� ������� ��������� �������.\n"
 "�� ������ ��������� ������ ���� ������� �� ���.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6642,7 +6676,7 @@ msgstr ""
 "%s: ����� --utc � --localtime �������� ������� ������������. � �� ������� "
 "���.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6651,7 +6685,7 @@ msgstr ""
 "%s: ����� --adjust � --noadjfile �������� ������� ������������. � �� ������� "
 "���.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6660,28 +6694,28 @@ msgstr ""
 "%s: ����� --adjust � --noadjfile �������� ������� ������������. � �� ������� "
 "���.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: � --noadjfile �� ������ ������� ���� --utc, ���� --localtime\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "����������� ��������� ��� ��������� �����. ���������� ���������� ����.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "� ��������� ������ ����������������� ����� �������� ���������� ����.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "� ��������� ������ ����������������� ����� �������� ��������� ����.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6690,14 +6724,14 @@ msgstr ""
 "� ��������� ������ ����������������� ����� �������� � ���� ��� ���������� "
 "�����.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "���������� �������� ������ � ���������� ����� ����� �� �� �� ���� ��������� "
 "��������.\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6991,12 +7025,12 @@ msgstr "%s: ���������� ���������� �������� �� ��������� ��� /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "��������� ���������� finger ��� %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: ���� PAM, ����������� ����������: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7224,35 +7258,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "�������: ���������� �������� ������� tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s �� �������� ������ ������� �����������"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "�������: ������ tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h ������ ��� �����������������.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "�������������: login [-fp] [���_������������]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "���������� ���������������� PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "�����: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "���� ����� %d �� %s ��� %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7261,17 +7300,17 @@ msgstr ""
 "�������� �����\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "������� ����� ������� ����� (%d) �� %s ��� %s, %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "���� ������ ����� �� %s ��� %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7280,7 +7319,7 @@ msgstr ""
 "\n"
 "�������� �����\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7289,120 +7328,120 @@ msgstr ""
 "\n"
 "�������� ��������� ������, ����������.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "������ ��� ������������ � %s:%d. ����������."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "�������� ��� ������������ \"%s\" � %s:%d. ����������."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: �������� ������\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "����������� ��� ������������"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s ���� �� ���� �������� ���������.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "���� %s ��������� �� %s �� TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "���� %s ��������� �� TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "�������� �����\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DIALUP �� %s ����� %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "���� ROOT � %s � %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "���� ROOT � %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "���� � %s ����� %s �� %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "���� � %s ����� %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "��� ����� ������.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "��� ������.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: ���� �������� ��������� ��������: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ���������� ��������: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() ���������� ��������"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "��� �������� %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "���� � ������� � �������� ��������� = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ��� ������ ��� ����-�������.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: ���������� ��������� ����-������: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ��� �����: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7411,65 +7450,65 @@ msgstr ""
 "\n"
 "%s �����: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "��� ������������ ������� �������.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "��� ������� �������"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "����� ������������� ����� �� ���������� � '-'.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "������� ����� ������ ��������� �����.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "���������� �������� �����"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "���� � ������� �������� ������ �������� � %d ������\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "��������� ���� � �������: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "�� %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "� %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "���� ����� � ������� �� %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "���� ����� � ������� �� %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ���� ����� �� %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ���� ����� � %s, %s"
@@ -7728,7 +7767,7 @@ msgstr "��� TERM ��� ���������� ���������� ��������� tty\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "������ ��������� �������: \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7738,8 +7777,8 @@ msgstr "������ ��������� �������: \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "������ ������� finalprog\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "������ ��������� �������: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7865,25 +7904,25 @@ msgstr "%s: ���������� ���������� ��������� ���������� �����.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ���������� ��������� ��������� ����.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "����������� �������� ����: ����������� 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "����������� �������� ������: ����������� 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "����������� �������� ����: ����������� 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "�������������: cal [-13smjyV] [[�����] ���]\n"
@@ -7907,6 +7946,113 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "���������� �������%s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: ����������� �������: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "���������� �������� �����.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "���������� �������� �����.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: ���������� ��������� %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "������ ������ �� %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "���������� finger ��������.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "��� �������� %s!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "���������� �������� �����.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "���������� �������� �����.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "���������� �������� �����.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "���������� �������� �����.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8061,7 +8207,7 @@ msgstr "%s: �������������� %s � %s ����������� ��������: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s �� � �����...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8072,37 +8218,37 @@ msgstr ""
 "����������� `%s [�����] %s', ���� �� ������������� ������ ��� ������������.\n"
 "������ �� �������.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "�������������: script [-a] [-f] [-q] [-t] [����]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "������ �������, ���� - %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "������ ������ �� %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "������ ������� %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "������ ������ �� %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: ���������� ����� ���������� ��� %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8111,17 +8257,17 @@ msgstr ""
 "\n"
 "������ �������� %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "������ ��������, ���� - %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ���������� ��������\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "�� ������� pty\n"
@@ -8468,6 +8614,16 @@ msgstr "������ %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: ���������� ������� : %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "���������� ���������� ��������� %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8498,6 +8654,11 @@ msgstr "������ ������ %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "�������� id"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8515,7 +8676,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8535,12 +8696,12 @@ msgstr "������ ����� ������ %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8568,83 +8729,83 @@ msgstr "�������������: %s [�����] ����������...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM ������� ... -f ] ���...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "malloc ���������� ��������"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "�������� %s ����������� ��������"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
+"\n"
+"������ �������� �����\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "�� ����� %s ����������� ������ ������� ��������\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "openpty ���������� ��������\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "�����"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty ���������� ��������\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "�������� �������� ���������: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "�������������: %s [�����] ����������...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "���������� finger ��������.\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8895,7 +9056,7 @@ msgstr ""
 "��� ������ mount ���� ��������������� ��� ��������� loop. ����������, "
 "��������� �������������.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8917,7 +9078,7 @@ msgstr ""
 "��������������\n"
 "  %s [ -e ���������� ] [ -o �������� ] loop_���������� ���� # ���������\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8933,252 +9094,296 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "�������� �������� ���������: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "�������� �������� ���������: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: ���������� ������� ���������� %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: ���������� ������"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "��������� loop ���� ���������� �� ����� ����������. ����������, ��������� "
 "�������������.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: ���������� ����� %s � %s ��� %s"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: �������� mtab, %s ��� ������������� �� %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: �������� mtab, %s ������������� �� %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: ���������� ������� %s ��� ������: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: ������ ������ %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: ������ ����� ������ %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ���������� ������� �������� �������: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "����������� ������� %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: �� �� ������� ��� �������� ������� ��� %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       � �������� ��� ����, ������������� � %s ��� %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       � �� �������� ��� ������������ ��� ��������\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       � �������� ��� %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s �������� ��� ������������ ��� �������� - �� �������������"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "mount ���������� ��������"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: ������ root ����� ����������� %s �� %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: ���������� �������� ����� ������� ������"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: ��� ������ ������"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: ������������ ��������� ���������� �������� �����\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "�������� �������� ���������: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "�������� �������� ���������: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: �������� mtab, %s ��� ������������� �� %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: ���������� � ������������� ���������� �������� ����� %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: ��������� ���������� �������� ����� ����������� ��������\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: ��������� ���������� �������� ����� ������� �����������\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s �� ������ - ���������...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: ���������� ������� %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: �������� ��� -p ��� --pass-fd ������ ���� ������"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: ���������� ������� %s ��� ��������� ��������"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: �������� mtab, %s ��� ������������� �� %s"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s ����� - �������������� ������ ��� ������\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s ����� - �������������� ������ ��� ������\n"
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: ���������� ���������� ��� �������� �������, � �� ���� �� ���� �������"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: �� ������ ������� ��� �������� �������"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: ������������ ����������� ��������"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: ����� ������������ %s �� �������� ���������"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: ������ ��������"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr ""
 "mount: ���������� ����� ����� ����������������� ��� ������������� mount"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s �����"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc ��� �������������"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ��� ������������� ��� %s �����"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: ����� ������������ %s �� ����������"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: ����� ������������ %s �������� ������������� ������� � ������"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: ����������� ���������� %s �� ����������"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9187,12 +9392,12 @@ msgstr ""
 "mount: ����������� ���������� %s �� ����������\n"
 "       (������� ���� �� �������� ���������)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ��� �� ������������� ��� �������� �����"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9201,13 +9406,13 @@ msgstr ""
 "mount: �������� ��� ��, �������� �����, �������� ���������\n"
 "       �� %s, ����������� ������� �������� ��� ������ ������"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9216,7 +9421,7 @@ msgstr ""
 "       ����������� ide-scsi, � ������� ����� sr0, sda ���\n"
 "       ���-������ ��������?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9224,7 +9429,7 @@ msgstr ""
 "       (�� ��������� �� �� �������������� ����������� ������\n"
 "       ������ ������ �� ���������� �������� ������ ����?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9233,111 +9438,106 @@ msgstr ""
 "       ������� � syslog - ���������� dmesg | tail ��� ���-��\n"
 "       � ���� ����\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "������� ������������ ���������"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: ���������� ��������� ���������"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: ����������� ����������"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: ����������� ��� �������� ������� '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: �������� �� ����� � ���� %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: ����� ���� �� ����� � ���� 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: ����� ���� �� ����� � ���� 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s ����� �������� ����� ���������� ��� ��� �� %s �� ��������������"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 "mount: %s �� �������� ������� �����������, � ����������� ��������� "
 "����������?"
 
-#: mount/mount.c:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: ���� �� ���������� %s ��� ������� ����������\n"
 "       (����� ���� `insmod driver'?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s �� �������� ������� ����������� (����� ����������� `-o loop'?)"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s �� �������� ������� �����������"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s �� �������� ������ ������� �����������"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "������� ���������� "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: ���������� �������������� %s%s ������ ��� ������"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s ������� �� ������, �� ���� ������ ���� `-w'"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: ���������� �������������� %s%s ������ ��� ������"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s ������� �� ������, ����������� ������ ��� ������"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: %s �� ������ - ���������...\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s ��� ������������� �� %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9347,23 +9547,23 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: �� ��� ������ ��� - ����� ��������������� nfs ��-�� ���������\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: �� ��� ������ ��� - ����� ��������������� cifs ��-�� �������� //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ��� ������������� �� %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9423,39 +9623,39 @@ msgstr ""
 "������ �����: [-nfFrsvw] [-o �����] [-p passwdfd].\n"
 "��� ��������� ����� ���������� �������� ��������  man 8 mount .\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: ������ root ����� ������� ���"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: ������ root ����� ������� ���"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "������ �� ���� ��������������"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: ����� ������ �� ������"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ���������� ����� %s � %s ��� %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: ��������������: no final newline at the end of %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: ������ %d � %s ������ %s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; ��������� ����� ����� ���������������"
 
@@ -9468,7 +9668,7 @@ msgstr "������ � ������ xstrndup"
 msgid "not enough memory"
 msgstr "�������� ������"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9479,7 +9679,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9492,7 +9692,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9504,129 +9704,134 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: ����������� ����� ����� � ����� %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "�������� ��������� �������� ����������� ��������\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "���������� ����������� ��������\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() ���������� ��������"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "�������� %s ����������� ��������"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "���"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: ��������������: %s ����� ������������ ���������� %04o, ������������� %"
 "04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: ������������ ���� %s - ������ � � ������� ����.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s �� %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: ���������� ����� ���������� ��� %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "�� �����������������.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9636,37 +9841,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: �������������� ��� ��������� -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ���������� ������� �������� �������: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: �������� ������� ����������"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: �� �������������"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: ���������� �������� ���������"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9674,52 +9879,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: �� ������"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 "umount: %s: ���������� ����� ����� ����������������� ��� ���������������"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: ������� ���������� �� fs ���������"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "��� umount2, ����������� ������� umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ����� - �������������� ������ ��� ������\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ���������� ��������������� %s ������ ��� ������\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s �������������\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ���������� ����� ������ �������� ������ ��� ���������������"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9730,80 +9935,85 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t ����_��] [-O �����]\n"
 "       umount [-f] [-r] [-n] [-v] ����������� | ����...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "������ %d ��� �������\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "������ %d ��� �������\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "���������� �������������� \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "����������� ������� �������������� %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "���������� ����� %s � mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s �� ������������� (�������� mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: ������, ��� %s ������������� ��������� ���"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s �� � fstab (� �� �� root)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: ������������ %s ������������ fstab'�"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: ������ %s ����� �������������� %s �� %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: ������ root ����� ������� ���"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9811,77 +10021,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "������ ������ ������� �� %s\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "�����������"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS ����� TCP �� ��������������.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "ncount"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "������ ������ ������� �� %s\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "������ ������ ������� �� %s\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "�����"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() ���������� �������� ��� ������ ������� �� %s"
@@ -9904,7 +10133,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9933,11 +10162,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "���������� ����������� ��������\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "�������������: %s ��������� [�������� ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "���������� finger ��������.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "���������� �������� ������ %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "malloc ���������� ��������"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "������ ������ ������� �� %s\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: ���������� ������� : %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "������ ������ ������� �� %s\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "������ ������"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "������ ������"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " � "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10082,7 +10419,15 @@ msgstr "   %f ������/���; %f ��� (����/���)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "�������������: %s [-c] [-n �������] [-s ����_������]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "�������������: %s [�����] ����������...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10091,38 +10436,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "�������� ������"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "�������� �������� ���������: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "�������� �������� ���������: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "�� ������� ����� --date.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "������������ ���������� ��������� = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty ���������� ��������\n"
@@ -10169,6 +10519,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "�������� ��������� �������� ����������� ��������\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "�������������: %s [�����] ����������...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "���������� finger ��������.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "�� ������� ����� --date.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "�� ������� ����� --date.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "����� ���������� ��������"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "�������� inode �� �������� ���������"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "openpty ���������� ��������\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "openpty ���������� ��������\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10262,479 +10665,454 @@ msgstr ""
 "�������������: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q ����_msg] [-M ����_shm] [-S ����_sem] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: �������� ����� -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: �������� ���� (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "��� ����� ������ ��������"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "���� ��� ������"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "�������� ����"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "����������� ������ � �����"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "��� id ������ ��������"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "�������� id"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "id ��� ������"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "����������� ������ � id"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: ����������� ��������: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "�������������: %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h ��� �������.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s ������������� ���������� � ��������� ipc, � ������� �� ������ ������ �� "
-"������.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"������������ �������:\n"
-"\t-m : ����_���_������\n"
-"\t-q : ���������\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : ��������\n"
-"\t-a : ��� (�� ���������)\n"
+"%s ������������� ���������� � ��������� ipc, � ������� �� ������ ������ �� "
+"������.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"������ �������� ������:\n"
-"\t-t : �����\n"
-"\t-p : pid\n"
-"\t-c : ���������\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : ����������� � �������, ������������������ �� id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : �������\n"
-"\t-u : ������\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : ����������� � �������, ������������������ �� id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "���� �� ��������� ��� ������������� ��������� ������������ ������\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ ������� ����. ���. ������ --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "������������ ���������� ��������� = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "������������ ������ �������� (�����) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "�������� ��������� ����. ���. ������ (�����) = %lu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "����������� ������ �������� (����) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ ��������� ����. ���. ������ --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "�������� ��������� %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "�������� ������� %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "����������� ������� %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "������� ����� %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "������������������ �����: %ld ������� \t %ld �������\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ ���������/��������� �������� ����. ���. ������ --------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "�����"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 "------ ����� �����������/����������/��������� ����. ���. ������ --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "��������"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "����������"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "���������"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "��������"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ ���������/��������� �������� ����. ���. ������ --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ �������� ����. ���. ������ --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "����"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "�����"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "���������"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "�� ����������"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "����������"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "������������"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "���� �� ��������� �� ������������� ���������\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ ������� ��������� --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "������������ ���������� �������� = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "�������� ��������� �� ������ = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "�������� ��������� �� ��� ������� = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "�������� �������� �� ����� �������� = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "������������ �������� �������� = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ ��������� �������� --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "������������ �������� = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "�������� ��������� = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ ���������/��������� �������� ��������� --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ ���������� ��������/��������� ����. ���. ������ --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "��������� ��������"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "��������� ���������"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ ������� ��������� --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "���� �� ��������� �� ������������� ������� ���������\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ ���������: ������� --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "�������� �������� ��� ���� ������� = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "������������ ������ ��������� (����) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "������������ �� ��������� ������ ��������� (����) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ ���������: ���������--------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "�������� �������� = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "������������ ���������� = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "������������ ������������ = %d ����\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ ������� ���������: ���������/���������--------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 "------ ���������� �����������/������/��������� ������� ��������� --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "����������"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "�������"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "��������"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID'� ������� ��������� --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ ������� ��������� --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "���. �����"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "���������"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync ���������� ��������"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10743,42 +11121,42 @@ msgstr ""
 "\n"
 "������� ����. ���. ������ shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "�����=%#o\t�����_�������=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "�����=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "�����_�����=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "�����_����=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "�����_�����=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync ���������� ��������"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10787,32 +11165,32 @@ msgstr ""
 "\n"
 "������� ��������� msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\t�����=%#o\n"
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr "c-�����=%ld\tq-�����=%ld\tq-�����=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "�����_��������=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "�����_���������=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "����� ���������� ��������"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10821,159 +11199,182 @@ msgstr ""
 "\n"
 "������ ��������� semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "�����=%#o, �����_�������=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "�-��_��� = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "�����_���� = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "�����_���= %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "����� ���������"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "��������"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "�������� id: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "�������� id: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s �� %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "�������� id"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "�������� id: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s �� �������� ������ ������� �����������"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "���������� �������� ������ %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "���������� �������� ������ %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "���������� ����� �� �������� ����������"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "���������� �������� ������ %s"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "���"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "������ RE: "
+msgid "error: cannot open %s"
+msgstr "%s: ���������� ������� %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "������ ������ %s\n"
+msgid "failed to read: %s"
+msgstr "���������� ���������� ��������� %s"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "������ ������"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "�������� %s ����������� ��������"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "���������� �������� �����.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: ���������� ������� : %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr ""
 "\n"
 "������ �������� �����\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "malloc ���������� ��������"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10982,70 +11383,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "������ ��������:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11054,74 +11468,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "������ ����� ������ %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"�������������: rdev [ -rv ] [ -o �������� ] [ ����� [ �������� "
-"[ �������� ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (��� rdev /linux � �.�.) ���������� ������� ���������� ROOT"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         ������������� ROOT � /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              ��������� ROOTFLAGS (������ ������ ��� "
-"������)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            ��������� ������� RAMDISK"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              ��������� VIDEOMODE �������"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   ������������� �������� ������ N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   �� ��, ��� � rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     �� ��, ��� � rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     �� ��, ��� � rdev -v"
-
-#: sys-utils/rdev.c:87
-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:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      ����������� -R 1 ��� ������������ ��������� �������� ������ ��� "
-"������, -R 0 ��� ������/������."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "����������� �������"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11233,11 +11579,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: ������ ��������� %d, ����� ��������� %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11247,106 +11594,131 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: �������������� ��� ������� ��������\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: �������� ���� (%s)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: �������� ����� -- %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr "%s �� %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "������������ %s.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "������������ %s.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "malloc ���������� ��������"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s �� lp-����������.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "��������� �� %s@%s �� %s � %s ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "���������� ������������� %s � %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 #, fuzzy
 msgid "rtc read"
 msgstr ", �����"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11443,6 +11815,11 @@ msgstr "%s: �������� ��������\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s �� lp-����������.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "������ LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11473,6 +11850,11 @@ msgstr ", ������"
 msgid ", error"
 msgstr ", ������"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: ������������ ����������� ��������"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "������ LPGETIRQ"
@@ -11516,6 +11898,16 @@ msgid "unshare failed"
 msgstr "����� ���������� ��������"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: ���������� ���������� ��������: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: ���������� ���������� ��������: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "���������� ����������� ��������\n"
@@ -12040,6 +12432,233 @@ msgstr "������ ������� ������ ������� �������.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "�� ������� ������ ��� ���������� ������.\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: �������� ����� -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "�������� ��������� %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "�������� ������� %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "����������� ������� %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "������� ����� %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "������������������ �����: %ld ������� \t %ld �������\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "������ ������� finalprog\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "�������� �������� ���������: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "ncount"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "�����"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "�������������: fdisk [-b SSZ] [-u] ����  ��������� ������� ��������\n"
+#~ "       fdisk -l [-b SSZ] [-u] ����       ������ ������(�) ��������\n"
+#~ "       fdisk -s ������                   ����� �������(��) ������� � "
+#~ "������\n"
+#~ "       fdisk -v                          ����� ������ fdisk\n"
+#~ "����� ���� - ���-�� ����� /dev/hdb ��� /dev/sda,\n"
+#~ "� ������   - ���-�� ����� /dev/hda7\n"
+#~ "-u: ���������� ������ � ����� � �������� ������� (������ ��������)\n"
+#~ "-b 2048: (��� ��������� MO-������) ������������� 2048-�������� ��������\n"
+
+#~ 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 ""
+#~ "�������������: fdisk [-l] [-b SSZ] [-u] ����������\n"
+#~ "����.: fdisk /dev/hda  (��� ������� IDE-�����)\n"
+#~ "  ���: fdisk /dev/sdc  (��� �������� SCSI-�����)\n"
+#~ "  ���: fdisk /dev/eda  (��� ������� PS/2 ESDI-�����)\n"
+#~ "  ���: fdisk /dev/rd/c0d0  ���: fdisk /dev/ida/c0d0  (��� RAID-"
+#~ "���������)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "���������� ��������� ��� ����� ����� ����������� � %d.\n"
+#~ "� ���� ��� � �������, �� �������� ������, ��� 1024,\n"
+#~ "� � ��������� ���������� ����� ���������� �������� �:\n"
+#~ "1) �����������, ����������� ��� �������� (����., ������ ������ LILO)\n"
+#~ "2) ��������� � ����������� �������� �� ������ ��\n"
+#~ "   (����., DOS FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: %s �� ������ - ���������...\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "���������� ����������� ��������\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "�������������: %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h ��� �������.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "������������ �������:\n"
+#~ "\t-m : ����_���_������\n"
+#~ "\t-q : ���������\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : ��������\n"
+#~ "\t-a : ��� (�� ���������)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "������ �������� ������:\n"
+#~ "\t-t : �����\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : ���������\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : �������\n"
+#~ "\t-u : ������\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "������ RE: "
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "������ ������ %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "������ ����� ������ %s: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "�������������: rdev [ -rv ] [ -o �������� ] [ ����� [ �������� "
+#~ "[ �������� ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (��� rdev /linux � �.�.) ���������� ������� ���������� "
+#~ "ROOT"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         ������������� ROOT � /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              ��������� ROOTFLAGS (������ ������ ��� "
+#~ "������)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            ��������� ������� RAMDISK"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              ��������� VIDEOMODE �������"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   ������������� �������� ������ N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   �� ��, ��� � rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     �� ��, ��� � rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     �� ��, ��� � rdev -v"
+
+#~ 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 "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      ����������� -R 1 ��� ������������ ��������� �������� ������ ��� "
+#~ "������, -R 0 ��� ������/������."
+
+#~ msgid "missing comma"
+#~ msgstr "����������� �������"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "�������� ������"
diff --git a/po/sl.po b/po/sl.po
index ddcffa1b..498c7e14 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre6\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2006-03-05 12:29+0200\n"
 "Last-Translator: Simon Mihevc <simonmihevc@email.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -109,6 +109,11 @@ msgstr "ponovno preberi tabelo razdelkov"
 msgid "Usage:\n"
 msgstr "Uporaba:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "\t%s -l [signal ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -129,6 +134,17 @@ msgstr "Razpolo�ljivi ukazi:\n"
 msgid "get size in 512-byte sectors"
 msgstr "preberi velikost(v bajtih)"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, fuzzy, c-format
+msgid "%s (%s)\n"
+msgstr "%s: %s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -232,15 +248,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "uporaba: %s [ -n ] naprava\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, fuzzy, c-format
-msgid "%s (%s)\n"
-msgstr "%s: %s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -343,7 +350,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc ni uspel"
 
@@ -960,7 +967,7 @@ msgstr "stanja naprave %s ni mogo�e dobiti"
 msgid "%s is not a block special device"
 msgstr "%s ni posebna blo�na naprava"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "ni mogo�e odpreti %s"
@@ -984,7 +991,7 @@ msgstr "preve� inodov - najve� 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "ni zadosti prostora, najmanj %lu blokov"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Naprava %s\n"
@@ -1060,7 +1067,7 @@ msgstr ""
 "Uporaba: mkfs [-V] [-t tip dat. sistema] [izbire dat. sist.] naprava "
 "[velikost]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1297,7 +1304,7 @@ msgstr "iskanje med testiranjem blokov ni uspelo"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nenavadne vrednosti v do_check: verjetno programska napaka\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "iskanje v check_blocks ni uspelo"
 
@@ -1381,173 +1388,179 @@ msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Uporabljamo podano velikost strani %d namesto sistemske vrednosti %d/%d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "vejitev ni uspela\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Po�kodovana velikost glava izmenjalnega prostora, oznaka ni zapisana\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Oznaka je bila skraj�ana\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, fuzzy, c-format
 msgid "no label, "
 msgstr "ni oznake"
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "ni uuid-a\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr "Uporaba: %s [-c] [-v0|-v1] [-p vel. strani] /dev/ime [bloki]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "preve� po�kodovanih strani"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "ena po�kodovana stran\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, fuzzy, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu po�kodovanih strani\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "izmenjalne naprave ni mogo�e previti"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "dodelitev medpomnilnika za inode ni uspela"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "dodelitev medpomnilnika za inode ni uspela"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "zagonskega sektorja ni mogo�e po�istiti"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   izpi�i BSD-jevo tabelo razdelkov"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   prika�i celostno oznako diska"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   prika�i celostno oznako diska"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: napaka: neznana razli�ica %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Napaka pri zapiranju datoteke\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: napaka: izmenjalnega prostora ni mo�no nikamor namestiti?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: napaka: velikost %lu je ve�ja od velikosti naprave %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: napaka: velikost izmenjalnega prostora mora biti vsaj %ld KB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: opozorilo: meja izmenjalnega prostora postavljena na %ldKB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "Naprava izmenjalnega prostora ne bo ustvarjena na ,%s`"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s je priklopljen; dat. sistema zato ne bo narejen!"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Izmenjalnega prostora ni mogo�e nastaviti: neberljiv"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Pripravljamo izmenjalni prostor razli�ice %d, velikost = %llu kB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "strani s podpisom ni mogo�e zapisati"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync ni uspel"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "stanja %s ni mogo�e dobiti"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "zapis inodov ni uspel"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "ni mogo�e preimenovati %s v %s: %s\n"
@@ -1610,63 +1623,108 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "napaka pri zaustavljanju storitve: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Neuporabno"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "izmenjalne naprave ni mogo�e previti"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Neuporabljen prostor"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: tak razdelek ne obstaja\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: napaka: neznana razli�ica %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: fdisk/cfdisk.c:389
-#, fuzzy
-msgid "Linux JFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "iskanje ni uspelo v write_tables"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "Finger informacija spremenjena.\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Neuporabno"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Neuporabljen prostor"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disk je bil spremenjen.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1679,236 +1737,236 @@ msgstr ""
 "DOS 6.x razdelke, si prosim oglejte\n"
 "priro�nik cfdiska za dodatne informacije.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "USODNA NAPAKA"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Pritisnike katerokoli tipko za izhod iz cfdisk-a"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Iskanje na disku ni mogo�e"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Diskovnega pogona ni mogo�e prebrati"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Na diskovni pogon ni mogo�e pisati"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Preve� razdelkov"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Razdelek se za�ne pred sektorjem 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Razdelek se kon�a pred sektorjem 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Razdelek se za�ne po koncu diska"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Razdelek se kon�a po koncu diska"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Razdelek se kon�a v zadnji delni stezi"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "logi�ni razdelki niso v pravem diskovnem redu"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "logi�ni razdelki se prekrivajo"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "pove�ani logi�ni razdelki se prekrivajo"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Interna napaka pri ustvarjanje logi�nega pogona brez raz�irjenega "
 "razdelka !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Logi�nega pogona na tem mestu ni mogo�e ustvariti - ustvarili bi dva "
 "raz�irjena razdelka"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menujski vnos predolg. Menu lahko izgleda nenavadno."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menu brez smeri. Privzeta je vodoravno."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Nedovoljena tipka"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Pritisnite katerokoli tipko za nadaljevanje"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primaren"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Ustvari nov primaren razdelek"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logi�en"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Ustvari nov logi�en razdelek"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Prekli�i"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Ne ustvari razdelka"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Interna napaka !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Velikost (v MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Za�etek"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Dodaj razdelek na za�etek nezasedenega prostora"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Dodaj razdelek na konec nezasedenega prostora"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Ni prostora za ustvarjanje raz�irjenega razdelka"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 #, fuzzy
 msgid "No partition table.\n"
 msgstr "Ni tabele razdelkov.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 #, fuzzy
 msgid "No partition table. Starting with zero table."
 msgstr "Ni tabele razdelkov. Uporaba prazne tabele."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Po�kodovan podpis na tabeli razdelkov"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 #, fuzzy
 msgid "Unknown partition table type"
 msgstr "Neznan tip tabele razdelkov"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Ali �elite za�eti s prazno tabelo [y/N] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Navedli ste ve� stez, kot jih je na disku"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Diskovne enote ni mogo�e odpreti"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disk odprt samo za branje - nimate dovoljenja za pisanje"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Velikosti diskovne steze ni mogo�e prebrati"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Po�kodovan primarni razdelek"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Po�kodovan logi�ni razdelek"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Opozorilo!! To lahko uni�i podatke na va�em disku!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 #, fuzzy
 msgid ""
 "Are you sure you want to 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:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Tabela razdelkov ni bila zapisana na disk"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "da"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Prosim vpi�ite ,da` ali ,ne`"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Tabela razdelkov se zapisuje na disk..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Tabela razdelkov je bila zapisana na disk"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1917,87 +1975,87 @@ msgstr ""
 "Tabela razdelkov zapisana, ampak ponovno branje tabele ni uspelo. Ponovno "
 "za�enite sistem, da posodobite tabelo."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 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:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Vnesite ime datoteke ali pritisnite ENTER za prikaz na zaslonu: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Datoteke ,%s` ni mogo�e odpreti"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Diskovna enota: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Brez   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "  Primaren"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logi�en"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Neznano"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Zagon"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, fuzzy, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 #, fuzzy
 msgid "None"
 msgstr "Brez"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabela razdelkov za %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 #, fuzzy
 msgid "               First       Last\n"
 msgstr "               Prvi        Zadnji\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -2005,7 +2063,7 @@ msgstr ""
 " # Tip        Sektor      Sektor   Odmik     Dol�ina  Tip dat. sistema (ID) "
 "Zastavice\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 #, fuzzy
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
@@ -2014,472 +2072,472 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ----Za�etni---      ----Kon�ni----  Za�etek     �tevilo\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Surov"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Izpis tabele v surovi obliki"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektorji"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Izpis tabele, urejene po sektorjih"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Samo izpis tabele razdelkov"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Brez izpisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Osnovna navodila za cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Cfdisk je tekstovni program za urejanje diskovnih razdelkov,"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "na va�em disku."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "  Ukaz        Pomen"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Preklop med zagonskim/nezagonskim razdelkom"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Izbri�i trenutni razdelek"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Spremeni parametre (�t. stez, �t. glav, sektorjev/stezo)"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             OPOZORILO: Izbiro naj izberejo le tisti,"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             ki razumejo, kaj po�nejo."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          prika�i to pomo�"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Porabi najve� prostora za trenutni razdelek"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Opomba: To lahko napravi razdelek nezdru�ljiv z"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Ustvari nov razdelek na nezasedenega prostora"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Prepi�i tabelo razdelkov na zaslon ali v datoteko"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Obstaja ve� razli�nih zapisov za particijo"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             med katerimi lahko izbirate:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - neobdelani podatki (nata�no to, kar bi bilo zapisano na "
 "disk)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabela, urejena po sektorjih"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - tabela v obliki neobdelanih podatkov"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Zapusti program, ne da bi zapisal tabelo razdelkov"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Spremeni vrsto datote�nega sistema"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Spremeni enote izpisa velikosti razdelkov"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Kro�i med MB, sektorji in stezami"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Zapi�i tabelo razdelkov na disk (mora biti veliki W!)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Ker lahko ta izbira uni�i podatke na disku, morate,"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             izbiro potrditi ali preklicati z vnosom ,da` ali"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             `ne'"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Pu��ica gor  Premakni kazalec na prej�nji razdelek"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Pu��ica dol  Premakni kazalec na naslednji razdelek"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Osve�i izpis"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Izpi�i to okno"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Opomba: Vse ukaze lahko vpi�ete z velikimi ali malimi"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "tiskanimi �rkami (z izjemo W)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Stez"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Spremeni �tevilo stez"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Glav"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Spremeni �tevilo glav"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Spremeni �tevilo sektorjev"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Opravljeno"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Sprememba geometrije je kon�ana"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Vnesite �tevilo stez: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Nedovoljena vrednost stez"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Vnesite �tevilo glav: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Nedovoljeno �tevilo glav"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Vnesite �tevilo sektorjev na stezo: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Nedovoljeno �tevilo sektorjev"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Vnesite vrsto datote�nega sistema: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Vrste datote�nega sistema ni mo� spremeniti na prazno"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Vrste datote�nega sistema ni mo� spremeniti na raz�irjeno"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unk(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Neznano (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Diskovni Pogon: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Velikost: %lld bajtov, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, fuzzy, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Velikost: %lld bajtov, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, fuzzy, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Glav:  %d   Sektorjev/stezo:   %d   Stez:      %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Ime"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Oznake"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Tip Razd."
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Dat. sistem"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Oznaka]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 #, fuzzy
 msgid "    Sectors"
 msgstr "Sektorjev"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 #, fuzzy
 msgid "  Cylinders"
 msgstr "Stez"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 #, fuzzy
 msgid "  Size (MB)"
 msgstr "Vel. (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 #, fuzzy
 msgid "  Size (GB)"
 msgstr "Vel. (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Zagonski"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Preklopi zagonsko zastavico trenutnega razdelka"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Izbri�i"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Izbri�i ta razdelek"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometr."
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Nastavi geometrijo diska (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Pomo�"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Izpi�i stran z navodili"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Razpri"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Razpri trenutni razdelek �ez celotno nezasedeno obmo�je (samo poznavalci)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Ustvari nov razdelek iz nezasedenega prostora"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Natisni"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Izhod"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Izhod iz programa brez zapisa tabele razdelkov"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Tip"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Spremeni tip datote�nega sistema (DOS, Linux, OS/2 itn.)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Enote"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Spremeni enote prikaza velikosti razdelkov (MB, sekt, cil)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Zapi�i"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Zapi�i tabelo razdelkov na disk (to lahko uni�i podatke)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Te particije se ne more nastaviti kot zagonske"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Praznega razdelka se ne more zbrisati"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Tega razdelka se ne more razpreti"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Ta razdelek ni uporaben"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Ta razdelek se �e uporablja"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Tipa praznega razdelka se ne more spremeniti"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Ni ve� razdelkov"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Napa�en ukaz"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2550,9 +2608,9 @@ msgstr ""
 "\n"
 "BSD oznaka za napravo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "  Ukaz  dejanje"
 
@@ -2572,9 +2630,9 @@ msgstr "   i   namesti za�etni nalagalnik"
 msgid "   l   list known filesystem types"
 msgstr "   l   izpi�i znane datote�ne sisteme"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   izpi�i ta meni"
 
@@ -2586,14 +2644,14 @@ msgstr "   n   dodaj novo particijo tipa BSD"
 msgid "   p   print BSD partition table"
 msgstr "   p   izpi�i BSD-jevo tabelo razdelkov"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   kon�aj, ne da bi shranil spremembe"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   vrni se v glavni meni"
 
@@ -2636,13 +2694,13 @@ msgstr "Na %s ni razdelka tipa *BSD.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Ukaz BSD oznaka diska (m za pomo�): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Prvi %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Zadnji %s ali +size ali +sizeM ali +sizeK"
@@ -2788,7 +2846,7 @@ msgstr "sektorji/sled"
 msgid "tracks/cylinder"
 msgstr "sledi/stezo"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "steze"
@@ -2846,7 +2904,7 @@ msgstr "Za�etni nalagalnik je name��en na %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Razdelek (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Najve�je mo�no �tevilo razdelkov je bilo ustvarjeno\n"
@@ -2870,227 +2928,208 @@ msgstr ""
 "\n"
 "Sinhronizacija diskov.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Uporaba: fdisk [-b velsekt] -[u] DISK     Spremeni tabelo razdelkov\n"
-"         fdisk -l [-b velsekt] -[u] DISK  Izpi�i tabelo/e razdelkov\n"
-"         fdisk -s RAZDELEK                Vrni velikost/i razdelkov v "
-"blokih\n"
-"         fdisk -v                         Vrni razli�ico fdisk-a\n"
-"DISK je lahko /dev/hdb ali /dev/sda\n"
-"RAZDELEK je lahko /dev/hda7\n"
-" velsekt - velikost sektorja\n"
-"-u: vrni Za�etek in Konec v sektorskih (namesto v steznih) enotah\n"
-"-b 2048: (za nekatere MO diske) uporabi sektorje velikosti 2048-bajtov\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Uporaba: fdisk [l] [-b velsekt] [-u] naprava\n"
-"Npr.: fdisk /dev/hda (za prv IDE disk)\n"
-" ali: fdisk /dev/sdc (za prvi SCSI disk)\n"
-" ali: fdisk /dev/eda (za prvi PS/2 ESDI disk)\n"
-" ali: fdisk /dev/rd/c0d0 ali fdisk /dev/ida/c0d0 (za RAID naprave)\n"
-" ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s ni mogo�e odpreti\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s ni mogo�e prebrati\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Na %s iskanje ni mo�no\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Na %s ni mogo�e pisati\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE od ioctl ni uspel na %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Dodeljevanje pomnilnika ni ve� mogo�e\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Usodna napaka\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   preklopi samo za branje"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   spremeni oznako diska tipa BSD"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   preklopi zastavico priklopljivo"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   zbri�i razdelek"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   izpi�i znane vrste razdelkov"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   dodaj nov razdelek"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   ustvari novo prazno tabelo razdelkov tipa MS-DOS"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   izpi�i tabelo razdelkov"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ustvari novo prazno oznako diska tipa Sun"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   spremeni sistemski ID razdelka"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   spremeni prikazne/vnosne enote"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   preveri tabelo razdelkov"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   zapi�i tabelo razdelkov na disk in kon�aj"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   dodatne mo�nosti (samo za poznavalce)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   izberi zagonski razdelek"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   uredi zagonskodatote�ni vnos"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   izberi izmenjalni razdelek tipa sgi"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   preklopi zagonsko zastavico"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   preklopi zdru�ljivo z DOS zastavico"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   spremeni �tevilo izmeni�nih stez"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   spremeni �tevilo stez"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   izpi�i surove podatke iz tabele razdelkov"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   spremeni �tevilo dodatkih sektorjev na stezo"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   spremeni �tevilo glav"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   spremeni koeficient prepletenosti"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   spremeni hitrost vrtenja (obrati/min)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   spremeni �tevilo sektorjev/sled"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   spremeni �tevilo fizi�nih stez"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   premakni za�etek podatkov v razdelku"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   izpi�i raz�irjene razdelke"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   ustvari tabelo razdelkvo tipa IRIX (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   popravi vrstni red razdelkov"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u   spremeni prikazne/vnosne enote"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Nastaviti morate"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "glave"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektorji"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3099,30 +3138,11 @@ msgstr ""
 "%s%s.\n"
 "To lahko storite v meniju z dodatnimi mo�nostmi.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " in "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"�tevilo stez na tem disku je nastavljeno na %d.\n"
-"S tem ni ni� narobe, ampak to je ve�je kot 1024,\n"
-"in bi lahko v dolo�enih primerih povzro�ilo te�ave z:\n"
-"1) programjem, ki deluje med zaganjanjem (npr. stare razli�ice LILO)\n"
-"2) zagonskim in razdeljevalnim programjem drugih\n"
-"operacijskih sistemov(npr. DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3133,38 +3153,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Po�kodovan odmik v primarnem raz�irjenem razdelku\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3173,32 +3192,32 @@ msgstr ""
 "Opozorilo: omejujem razdelke po #%d.\n"
 "�e shranite ta razdelek bodo izbrisani.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Opozorilo: dodatni povezovalni kazalec v tabeli razdelkov %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Opozorilo: dodatni podatki v tabeli razdelkov %d ne bodo upo�tevani\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Opozorilo: prazen razdelek\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3210,26 +3229,17 @@ msgstr ""
 "dokler se ne odlo�ite, da jih boste zapisali. Po tem prej�nja vsebina\n"
 "ne bo ve� obnovljiva.\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Opomba: velikost sektorja je %d (ne %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Ne boste mogli zapisati tabele razdelkov.\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3238,7 +3248,7 @@ msgstr ""
 "Ta disk je ozna�ek kot tipa DOS in tipa BSD.\n"
 "Uporabite 'b' ukaz, da preidete v BSD na�in.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3247,17 +3257,17 @@ msgstr ""
 "Naprava ne vsebuje veljavne tabele razdelkov tipa DOS, niti oznake diska "
 "tipa Sun, SGI ali OSF\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Notranja napaka\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Dodatni raz�irjen razdelek %d ne bo upo�tevan\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3266,7 +3276,7 @@ msgstr ""
 "Opozorilo: neveljavna zastavica 0x%04x tabele razdelkov %d bo popravljena z w"
 "(rite)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3275,95 +3285,100 @@ msgstr ""
 "\n"
 "3x dobljen EOF - Kon�ujem..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "�estnajsti�ka koda (pritisni L za izbor kod): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, privzeto %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Uporbljena bo privzeta vrednost %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Vrednost izven dosega.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "�tevilka razdelka"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Opozorilo: razdelek %d nima tipa\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Izbran razdelek %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Noben razdelek �e ni dolo�en!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Vsi primarni razdelki so �e dolo�eni!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "steza"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Spreminjam enote prikaza/vnosa na %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Spreminjam enote prikaza/vnosa na %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "OPOZORILO: Razdelek %d je raz�irjeni razdelek\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "Zdru�ljivost z DOS je nastavljena.\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Zdru�ljivost z DOS ni nastavljena.\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Razdelek %d �e ne obstaja!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3375,7 +3390,7 @@ msgstr ""
 "v Linuxu pa ne. Razdelkov tipa 0 ni pametno imeti\n"
 "Razdelek lahko zbri�ete z ukazom `d'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3384,7 +3399,7 @@ msgstr ""
 "Razdelka ne morete pretvoriti v raz�irjenega ali obratno.\n"
 "Najprej ga zbri�ite.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3395,7 +3410,7 @@ msgstr ""
 "Tak je dogovor v SunOS/Solaris, Linux pa ga spo�tuje.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3406,62 +3421,62 @@ msgstr ""
 "razdelek 11 pa kot celotni del (6), kot pri�akuje IRIX.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Tip razdelka %d je spremenjen v %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Tip razdelka %d je spremenjen v %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "  fizi�ni=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logi�ni=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Fizi�na/logi�na konca razdelka %d se ne ujemata:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "moral bi biti (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "moral bi biti (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "Razdelek %i se ne za�ne na meji stez:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3470,7 +3485,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld bajtov\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3479,34 +3494,39 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bajtov\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d glav, %d sektorjev/stezo, %d stez"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, fuzzy, c-format
 msgid ", total %llu sectors"
 msgstr ", skupno %lu sektorjev"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 "Enote = %s od %d x %d = %d bajtov\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "slaba velikost inoda"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3515,14 +3535,14 @@ msgstr ""
 "Ni� ni treba spremeniti. Red je �e pravilen.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Opravljeno\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3533,16 +3553,16 @@ msgstr ""
 "Verjetno ste izbrali napa�no napravo.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Zagon    Za�etek       Konec     Bloki    Id  Sistem\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Naprava"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3551,7 +3571,7 @@ msgstr ""
 "\n"
 "Vnosi tabele razdelkov niso v diskovnem vrstnem redu\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3562,87 +3582,87 @@ msgstr ""
 "Disk %s: %d glav, %d sektorjev, %d stez\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, fuzzy, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr " �t AF Glav Sekt Stz  Glav Sekt Stz   Za�etek  Vel  ID\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Opozorilo: razdelek %d vsebuje sektor 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Razdelek %d: glava %d je ve�ja od najve�je %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Razdelek %d: sektor %d je ve�ji od najve�jega %d\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Razdelki %d: steza %d je ve�ja od najve�je %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Razdelek %d: prej�nji sektorji %d se ne ujemajo s celoto %d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Opozorilo: po�kodovan za�etek podatkov v razdelku %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Opozorilo: razdelek %d prekriva razdelek %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Opozorilo: razdelek %d je prazen\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Logi�ni razdelek %d ni v celoti v razdelku %d\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Vsota dodeljenih sektorjev %d je ve�ja od najve�je %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld nedodeljenih sektorjev\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Razdelek %d je �e dolo�en. Zbri�ite ga preden ga ponovno dodate.\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektor %d je �e dodeljen\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Ni ve� prostih sektorjev\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3655,7 +3675,7 @@ msgstr ""
 "\t novo prazno tabelo razdelkov tipa DOS. (Uporabite o.)\n"
 "\tOPOZORILO: To bo uni�ilo trenutno vsebuno diska.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3668,22 +3688,22 @@ msgstr ""
 "\t novo prazno tabelo razdelkov tipa DOS. (Uporabite o.)\n"
 "\tOPOZORILO: To bo uni�ilo trenutno vsebuno diska.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Izbrisati morate nek razdelek in najprej dodati raz�irjen razdelek\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, fuzzy, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Vsi logi�ni razdelki so v uporabi\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, fuzzy, c-format
 msgid "Adding a primary partition\n"
 msgstr "Dodaja se primarni razdelek\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3694,20 +3714,20 @@ msgstr ""
 "  %s\n"
 "  p   primarni razdelek (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   logi�ni (5 ali ve�)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   raz�irjen"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Neveljavna �tevilka razdelka za tip `%c'\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3716,12 +3736,12 @@ msgstr ""
 "Tabela razdelkov je bila spremenjena!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kli�em ioctl() za ponovno branje tabele razdelkov.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3734,7 +3754,7 @@ msgstr ""
 "Jedro �e vedno uporablja staro tabelo.\n"
 "Nova tabelo bo v uporabi �ele po naslednjem zagonu.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3747,7 +3767,7 @@ msgstr ""
 " tipa DOS 6.x, si poglejte priro�nik za fdisk za dodatne\n"
 "informacije.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3756,42 +3776,42 @@ msgstr ""
 "\n"
 "Napaka pri zapiranju datoteke\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Sinhroniziram diske.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Razdelek %d nima podatkovnega obmo�ja\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Nov za�etek podatkov"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Strokovni ukaz (m za pomo�): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "�tevilo stez"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "�tevilo glav"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "�tevilo sektorjev"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Opozorilo: odmik sektorja bo nastavljen tako, da bo zdru�ljiv z DOS\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3800,33 +3820,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s ne vsebuje veljavne tabele razdelkov\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s ne morem odpreti\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s ne morem odpreti\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: neznan ukaz\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "To jedro najde velikost sektorja samostojno - -b izbire ni upo�tevana\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3835,18 +3855,18 @@ msgstr ""
 "Opozorilo: izbira -b (nastavi velikost sektorja) se naj uporablja s podano "
 "napravo\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Na %s je bila zaznana oznaka diska tipa OSF/1, vstopa v na�in ozna�evanja "
 "diska.\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Ukaz (m za pomo�): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3855,16 +3875,16 @@ msgstr ""
 "\n"
 "Trenutna zagonska datoteka je: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Prosimo vpi�ite ime nove zagonske datoteke: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Zagonska datoteka ni bila spremenjena\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3958,15 +3978,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux izmenjalni prostor"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux doma�a"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4101,7 +4121,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Prisoten je ve� kot en vnos celotnega diska.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Noben razdelek ni dolo�en\n"
@@ -4204,7 +4224,7 @@ msgstr ""
 "sash in fx z njega. Samo \"SGI obseg\" celoten del diska lahko\n"
 "kr�i to. Vtipkajte DA, �e resni�no �elite ozna�iti to particijo druga�e.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "DA\n"
 
@@ -4260,7 +4280,7 @@ msgstr ""
 "vsebina nepovrnljiva.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4281,58 +4301,58 @@ msgstr "Poskus ohranjanja parametrov razdelka %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tZA�ETEK=%d\tDOL�INA=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS korenska"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS izmenjalna"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Celoten disk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%lld nedodeljenih sektorjev\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid samozaznava"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4345,22 +4365,22 @@ msgstr ""
 "(npr. glave, sektorji, steze, razdelki) ali prisiliti\n"
 "sve�o oznako (ukaz s v glavnem meniju)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Zaznana je bila diskovna oznaka tipa SGI z napa�no kontrolno vsoto.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Zaznana je bila diskovna oznaka tipa SGI z napa�no kontrolno vsoto.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Zaznana je bila diskovna oznaka tipa SGI z napa�no kontrolno vsoto.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4368,7 +4388,7 @@ msgstr ""
 "Opozorilo: neveljavna zastavica 0x%04x tabele razdelkov %d bo popravljena z w"
 "(rite)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4381,31 +4401,31 @@ msgstr ""
 "bo prej�nja vsebina nepovrnljiva.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektorji/sled"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Razdelek %d se ne kon�a na meji s stezo\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Razdelek %d se prekriva z drugimi v sektorjih %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Neporabljen prostor - sektorji 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Neporabljen prostor - sektorji %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4414,7 +4434,7 @@ msgstr ""
 "Drugi razdelki �e prekrivajo ves disk.\n"
 "Izbri�ite/pomanj�ajte nekatere preden ponovno poskusite.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4423,12 +4443,12 @@ msgstr ""
 "Priporo�ljivo je, da enajsti razdelek\n"
 "prekriva celoten disk in je tipa `SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je �e dodeljen\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4439,7 +4459,7 @@ msgstr ""
 "%d %s prekriva nekatere druge razdelke. Va� vnos je bil spremenjen\n"
 "na %d %s\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4448,7 +4468,7 @@ msgstr ""
 "�e �elite ohraniti zdru�ljivost s SunOS/Solaris, potem pustite\n"
 "ta razdelek kot Celoten disk (5), z za�etkom na 0 in %u sektorji\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4462,12 +4482,12 @@ msgstr ""
 "razdelkov in zagonski blok. Vnesite DA, �e res �elite\n"
 "da se ta razdelek ozna�i kot 82 (Linux izmenjalni): "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4482,11 +4502,11 @@ msgstr ""
 "Enote = %s od %d * 512 bajtov\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4495,28 +4515,28 @@ msgstr ""
 "Enote =%s od %d * 512 bajtov\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Zastava Za�etek    Konec   Bloki    Id  Sistem\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "�tevilo drugih stez"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Dodatni sektorji na stezo"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Faktor prepletenosti"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Hitrost vrtenja (obrati/min)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "�tevilo fizi�nih stez"
 
@@ -4725,6 +4745,10 @@ msgstr "Minix / stari Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux izmenjalni / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 skriti C: pogon"
@@ -5351,93 +5375,93 @@ msgstr "-n zastavica je bil podana: Brez sprememb\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Neuspe�no shranjevanje starih sektorjev - prekinjam\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "dolga ali nepopolna vnosna vrstica - kon�ujem\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "vhodna napaka: `=' pri�akovano po polju %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "vhodna napaka: nepri�akovan znak %c po polju %s\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "neprepoznan vhod: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "prevelika �tevilka\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "�tevilki sledijo �udni podatki\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "za opisnik razdelka ni prostora\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "ustvarjanje raz�irjenega razdelka okoli obstoje�ega ni uspelo\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "preve� vhodnih polj\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Ni ve� prostora\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Nepravilen tip\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Opozorilo: podana velikost (%lu) presega najve�jo dovoljeno (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Opozorilo: prazen razdelek\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Opozorilo: po�kodovan za�etek razdelka (najprej %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "neprepoznana zagonska zastavica - izverite - ali *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "delna stz,g,skt specifikacija?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Raz�irjen razdelek na nepri�akovanem mestu\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "slab vnos\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "preve� razdelkov\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5447,97 +5471,97 @@ msgstr ""
 "<start> <size> <type> [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Ponavadi je potrebno zapisati samo <start> in <size> (v�asih tudi <type>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "naprava: npr. /dev/hda ali /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "uporabne izbire:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ali --show-size]: izpi�i velikost razdelka"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ali --id]:       izpi�i ali spremeni Id razdelka"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ali --list]:     izpi�i razdelke za vsako napravo"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [ali --dump]:     podobno kot prej, ampak v obliki, uporabni za "
 "kasnej�i vnos"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [ali --increment]: �tevilo stez, npr. od 1 namesto od 0"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  sprejmi/poro�aj v enotah sektorjev/blokov/stez/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ali --list-types]:izpi�i znane tipe razdelkov"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [ali --DOS]:      za zdru�ljivost z DOS-om: porabi malo prostora"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [ali --re-read]:  prisili jedro v ponovno branje tabele razdelkov"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                spremeni samo razdelke s �tevilko #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ne zapi�i sprememb na disk"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O datoteka :        shrani sektorje, ki bodo prepisani v datoteki"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I datoteka:         ponovno obnovi te sektorje"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ali --version]:  izpi�i razli�ico"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ali --help]:     izpi�i to sporo�ilo"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "nevarne izbire:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [ali --show-geometry]: izpi�i geometrijo tako, kot ga razume jedro"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5545,7 +5569,7 @@ msgstr ""
 "    -G [ali --show-pt-geometry]: izpi�i uganjeno gometrijo iz tabele "
 "razdelkov"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5553,61 +5577,61 @@ msgstr ""
 "    -x [ali --show-extended]: izpi�i tudi raz�irjene razdelke ali\n"
 "                              pri�akuj opisnike na vhodu"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L [ali --Linux]:      ne prito�uj se nad stvarmi, ki niso pomembne za "
 "Linux"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ali --quiet]:     ne prika�i opozoril"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Zaznano geometrijo lahko obidete tako da uporabite:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [ali --cylinders #]:nastavi �tevilo stez"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ali --heads #]:   nastavi �tevilo glav"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [ali --sectors #]: nastavi �tevilo sektorjev"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Vsa doslednostna preverjanja lahko onemogo�ite z:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f [ali --force]:      naredi kar re�em brez ugovorov"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s naprava\t\t izpi�i dejavne razdelke na napravi\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s naprava �t1 �t2 ... aktiviraj razdelek n1 ..., deaktiviraj ostale\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s - Naprava\t aktivira razdelek n, deaktivira ostale\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5616,67 +5640,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Uporabite --force izbiro da obidete vsa preverjanja.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "ni ukaza?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "skupno: %llu blokov\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uporaba: sfdisk --print-id naprava �t. razdelka\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "uporaba: sfdisk --change-id naprava �t. razdelka Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uporaba: sfdisk --id naprava �t. razdelka [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "navedete lahko samo eno napravo (razen z -l ali -s)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s ni mogo�e odpreti za branje in pisanje\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s ni mogo�e odpreti za branje\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Vredu\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld stez, %ld glav, %ld sektorjev/sled\n"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Velikosti %s ni mogo�e ugotoviti\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "slab dejavni bajt: 0x%x namesto 0x80\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5684,7 +5708,7 @@ msgstr ""
 "Opravljeno\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5693,35 +5717,35 @@ msgstr ""
 "Imate %d dejavnih primarnih razdelkov. Za LILO to ni te�ava,\n"
 "ampak DOS MBR se bo nalo�il samo z diskov, ki imajo 1 dejaven razdelek.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "razdelek %s ima id %x in ni skrit\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Slab Id %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Ta disk je trenutno v rabi.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Usodna napaka: %s ni mogo�e najti\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Opozorilo: %s ni blokovna naprava\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Preverjam, da nih�e ne uporablja tega diska ...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5734,30 +5758,30 @@ msgstr ""
 "disku.\n"
 "Uporabite --no-reread zastavico da izklju�ite to preverjanje.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Uporabite --force izbiro da obidete vsa preverjanja.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "VREDU\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Staro stanje:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Razdelek %d ne obstaja in ne more biti spremenjen\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Novo stanje:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5765,21 +5789,21 @@ msgstr ""
 "Te razdelki mi ne ustrezajo - ni sprememb.\n"
 "(�e res �elite to, uporabite izbiro --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "To mi ne ustreza - verjetno bi morali odgovoriti Ne\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Ali ste zadovoljni s tem? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Ali �elite zapisati to na disk? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5788,16 +5812,16 @@ msgstr ""
 "\n"
 "sfdisk: prezgoden konec vnosa\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Kon�ujem - brez sprememb\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Prosim, da odgovorizo z y,n,q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5806,7 +5830,7 @@ msgstr ""
 "Tabela razdelkov je uspe�no zapisana\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5818,17 +5842,17 @@ msgstr ""
 "bs=512 count=1\n"
 "(glej fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: %s ni mogo�e odpreti: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5836,75 +5860,75 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: neuspe�no iskanje"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: napaka %d pri raz�irjanju! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: tip dat. sistema mora biti podan"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s ni lp naprava.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Prisilni pregled datote�nega sistema na %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
@@ -5912,42 +5936,42 @@ msgstr ""
 "Uporaba: mkfs [-V] [-t tip dat. sistema] [izbire dat. sist.] naprava "
 "[velikost]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s ni lp naprava.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "%s ni mogo�e odpreti: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s je odklopljen\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Odklapljam preostale datote�ne sisteme..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: neznan argument: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s iz %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Dodelitev medpomnilnika za inode ni mo�na"
@@ -6442,7 +6466,13 @@ msgstr "Iskanje uporabnega urinega vmesnika ni bilo uspe�no.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Sistemske ure se ne da nastaviti.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6454,39 +6484,39 @@ msgstr ""
 "Ta kopija strojne ure je bila zgrajena za drugega\n"
 "(in zdaj verjetno ne te�e na Alpha stroju). Brez ukrepov.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Vrednosti epoch ni mogo�e dobiti od jedra.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Jedro predpostavlja, da je vrednost epoch %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr "�e ho�ete nastaviti vrednost epoch, morate uporabiti izbiro 'epoch'\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Epoch ne bo nastavljen na %d - samo preizku�am.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Vrednosti epoch ni bilo mo�no nastaviti.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s iz %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6505,6 +6535,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6552,7 +6583,7 @@ msgstr ""
 "  --noadjfile   ne dostopaj do /etc/adjtime. Zahteva uporabo --utc ali\n"
 "                --localtime\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6562,17 +6593,17 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                povej hwclocku tip alpha, ki ga imap (glej hwclock(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "Sistemske ure se ne da nastaviti.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ne sprejema argumentov brez izbir. Podali ste: %d.\n"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6581,7 +6612,7 @@ msgstr ""
 "Podali ste ve� funkcij.\n"
 "Izvedete lahko samo eno funkcijo naenkrat.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6589,7 +6620,7 @@ msgid ""
 msgstr ""
 "%s: --utc in --localtime izbiri se medsebojno izklju�ujeta. Podali ste obe.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6598,7 +6629,7 @@ msgstr ""
 "%s: --adjust in --noadjfile izbiri se medsebojno izklju�ujeta. Podali ste "
 "obe.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6607,27 +6638,27 @@ msgstr ""
 "%s: --adjust in --noadjfile izbiri se medsebojno izklju�ujeta. Podali ste "
 "obe.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr "%s: --noadjfile morate podati skupaj z --utc ali --localtime\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Ni uporabnega nastavitvenega �asa. Ura ne bo nastavljena.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "�al lahko samo sistemski skrbnik spreminja strojno uro.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "�al lahko samo sistemski skrbnik spreminj sistemsko uro.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6635,12 +6666,12 @@ msgid ""
 msgstr ""
 "�al lahko samo sistemski skrbnik spreminja razdobje strojne ure v jedru.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Do strojne ure ni mogo�e dostopati po znanih metodah.\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6931,12 +6962,12 @@ msgstr "%s: Ne more se nastaviti privzete zveze[context] za /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "Spreminjam finger informacijo za %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM ni uspel, prekinjam: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7163,35 +7194,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "USODNA NAPAKA: tty ni mogo�e znova odpreti: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s ni posebna blo�na naprava"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "USODNA NAPAKA: po�kodovan tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h je na voljo samo za sistemskega skrbnika.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "uporaba: login [-fp] [uporabnik]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM ni mo� inicializirati: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "prijava: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "NEUSPE�NA PRIJAVA %d IZ %s ZA UPORABNIKA %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7200,17 +7236,17 @@ msgstr ""
 "Nepravilna prijava\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "PREVE� POSKUSOV PRIJAVE (%d) IZ %s ZA %s, %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "NEUSPE�NA PRIJAVNA SEJA IZ %s za %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7219,7 +7255,7 @@ msgstr ""
 "\n"
 "Neuspe�na prijava\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7228,120 +7264,120 @@ msgstr ""
 "\n"
 "Napaka pri nastavljanju seje, prekinjam.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "ni�elno uporabni�ko ime v %s:%d. Prekinjam."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Nepravilno uporabni�ko ime \"%s\" v %s:%d. Prekinjam."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Zmanjkalo je prostega pomnilnika\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Neveljavno uporabni�ko ime"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s na tem terminalu je vpis zanikan.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "VPIS %s ZANIKAN OD %s NA TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s ZANIKAN NA TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Prijava ni uspela\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "TELEFONSKA PRIJAVA Z LINIJE %s, UPORABNIK %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "SKRBNI�KA PRIJAVA Z RA�UNALNIKA %s, UPORABNIK %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "SKRBNI�KA PRIJAVA NA LINIJI %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, 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:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PRIJAVA NA LINIJI %s UPORABNIKA %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "�aka vas nova po�ta.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "�aka vas po�ta.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: vejitev ni uspela: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY ni uspel: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "klic setuid() ni uspel"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Imenik %s ne obstaja!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Vpisujem se s doma�im imenikom = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: ni prostega pomnilnika za lupinski skript.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, 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:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ni ukazne lupine: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7350,65 +7386,65 @@ msgstr ""
 "\n"
 "%s prijava: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Prijavno ime je predolgo.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "IME je predolgo"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, 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:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "preve� pomikov v novo vrsto\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "PREKOMERNI pomiki v novo vrsto"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Prijava je potekla po %d sekundah.\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Zadnja prijava: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "z ra�unalnika %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "z linije %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "NEUSPE�NA PRIJAVA Z %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "NEUSPE�NA PRIJAVA NA %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d NEUSPE�NIH PRIJAV Z %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d NEUSPE�NIH PRIJAV NA %s, %s"
@@ -7666,7 +7702,7 @@ msgstr "ni terminala ali ni mogo�e dostopati do tty\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "napaka pri zaustavljanju storitve: \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7676,8 +7712,8 @@ msgstr "napaka pri zaustavljanju storitve: \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "napaka med izvajanjem poslednjega programa\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "napaka pri zaustavljanju storitve: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7803,25 +7839,25 @@ msgstr "%s ni mogo�e dobiti stanja za�asne datoteke.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ni mogo�e brati iz za�asne datoteke.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "neveljavna vrednost leta: uporabite 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "neveljavna vrednost meseca: uporabite 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "neveljavna vrednost leta: uporabite 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "uporaba: cal [-13smjyV] [[mesec] leto]\n"
@@ -7845,6 +7881,113 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "ni mogo�e odpreti %s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Neznan ukaz: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s %s ni mogo�e brati.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "napaka pri pisanju na %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "Finger informacija spremenjena.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Imenik %s ne obstaja!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7999,7 +8142,7 @@ msgstr "%s: preimenovanje %s na %s ni uspelo: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "klic: %s iz na datoteke...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8010,37 +8153,37 @@ msgstr ""
 "Uporabite `%s [izbire] %s' �e jo �elite uporabiti.\n"
 "Skript ni bil izvr�en.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "uporaba: script [-a] [-f] [-q] [-t] [datoteka]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script se je za�el, dat. je %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "napaka pri pisanju na %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Script se je za�el na %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "napaka pri pisanju na %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: za %s ni mogo�e najti naprave\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8049,17 +8192,17 @@ msgstr ""
 "\n"
 "Script kon�an na %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script kon�an, dat. je %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty ni uspel\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Zmanjkalo pty-jev\n"
@@ -8405,6 +8548,16 @@ msgstr "beri %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: odpiranje ni uspelo: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "stanja %s ni mogo�e dobiti"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8435,6 +8588,11 @@ msgstr "Napaka pri branju %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "neveljaven id"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8452,7 +8610,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8472,12 +8630,12 @@ msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8505,83 +8663,83 @@ msgstr "Uporaba: %s [izbire] naprava ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM imenik ... -f ] ime...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "malloc ni uspel"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "Odpiranje %s ni uspelo"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
+"\n"
+"Napaka pri zapiranju datoteke\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Disk %s ne vsebuje veljavne tabele razdelkov\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "openpty ni uspel\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "bajtov"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty ni uspel\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Neveljavna vrednost nastavljanja: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Uporaba: %s [izbire] naprava ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8827,7 +8985,7 @@ msgstr ""
 "Program mount je bil preveden brez podpore za loop. Poskusite ponovno "
 "prevesti mount.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8847,7 +9005,7 @@ msgstr ""
 "  %s -f\t\t\t\t\t\t# najdi neuporabljene\n"
 "  %s [-e �ifriranje] [-o odmik] {-f|loop_naprava} dat. # nastavitev\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8863,250 +9021,294 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Neveljavna vrednost nastavljanja: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Neveljavna vrednost nastavljanja: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: ni mogo�e odpreti naprave %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: naprava je zaposlena"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Med prevajanjem ni bilo podpore za loop napravo. Poskusite ponovno "
 "prevesti.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: %s ni mogo�e najti v %s ali %s"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: po evidenci mtab je %s �e priklopljeno na %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: po evidenci mtab je %s priklopljeno na %s<"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: enote %s ni mo� odpreti za pisanje: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: napaka pri pisanju na %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: napaka pri spreminjanju na�ina %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ni mogo�e vejiti: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Posku�am z %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: za %s niste podali vrste dat. sistema\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "\tUporabili se bodo vsi tipi omenjeni v %s ali %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "\tin izgleda kot da je izmenjalni prostor\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "\tUporabljen bo tip %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s je podoben izmenjalnemu prostoru, zato ne bo priklopljen"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "priklop ni uspel"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: loop naprava je podana dvakrat"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: tip je podan dvakrat"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: nastavitev loop naprave bo presko�ena\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Neveljavna vrednost nastavljanja: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Neveljavna vrednost nastavljanja: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: po evidenci mtab je %s �e priklopljeno na %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: loop naprava %s bo uporabljena\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: nastavitev loop naprave ni uspela\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: nastavitev loop naprave je uspela\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s bo ustvarjen, ker ga nisem na�el\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s ni mogo�e odpreti: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument pri -p ali --pass-fd mora biti �tevilka"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: %s ni mogo�e odpreti za nastavitev hitrosti"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: po evidenci mtab je %s �e priklopljeno na %s"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s je zaposlena - ponovno priklapljam samo za branje\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s je zaposlena - ponovno priklapljam samo za branje\n"
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: Tipa dat. sistema ni bilo mogo�e ugotoviti in ni bil podan"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: tip dat. sistema mora biti podan"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: priklop ni uspel"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: priklopna to�ka %s ni imenik"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: dostop zavrnjen"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: ukaz mount lahko uporablja samo sistemski skrbnik"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je v rabi"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc je �e priklopljen"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s je �e priklopljen ali %s zaposlen"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: priklopna to�ka %s ne obstaja"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: priklopna to�ka %s je simbolna povezava do ni�esar"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: posebna naprava %s ne obstaja"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9115,12 +9317,12 @@ msgstr ""
 "mount: posebna naprava %s ne obstaja\n"
 "\t(pot ni imenik)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s �e ni priklopljen ali nepravilna izbira"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9130,13 +9332,13 @@ msgstr ""
 "s,\n"
 "\tmanjkajo�a kodna stran ali druge napake"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9144,7 +9346,7 @@ msgstr ""
 "\t(to bi lahko bila IDE naprava pri kateri uporabljate\n"
 "\tide-scsi tako, da je potrebno imeti sr0 ali sda)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9152,7 +9354,7 @@ msgstr ""
 "\t(ali posku�ate priklopiti raz�irjen razdelek,\n"
 "\tnamesto notranjega logi�nega razdelka?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9160,109 +9362,104 @@ msgstr ""
 "\tV nekaterih primerih dobite uporabne informacije v sist. dnevniku\n"
 "\tposkusite z dmesg | tail\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "priklopna tabela je polna"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superbloka ni mogo�e prebrati"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: neznana naprava"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, fuzzy, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: neznan tip dat. sistema '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: verjetno je bilo mi�ljeno %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: mogo�e je bil mi�ljen 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: mogo�e je bil mi�ljen 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s ima napa�no �tevilko naprave ali pa datote�nosistemski tip %s ni "
 "podprt"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s ni blo�na naprava in stat ne uspe?"
 
-#: mount/mount.c:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: jedro ne prepozna %s kot blo�ne naprave\n"
 "\t(mogo�e `insmod gonilnik'?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s ni blo�na naprava (poskusite `-o loop'?)"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ni blo�na naprava"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ni veljavna blo�na naprava"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "blo�na naprava"
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s ni mo� priklopiti samo za branje"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s je za��itena pred pisanjem ampak podana je `-w' zastavica"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: %s%s ni mo� priklopiti samo za branje"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s je za��itena pred pisanjem, priklapljam samo za branje"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: %s bo ustvarjen, ker ga nisem na�el\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s je �e priklopljen v %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9272,22 +9469,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: tip ni bil podan - predpostavlja se nfs zaradi dvopi�ja\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, fuzzy, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: tip ni bil podan - predpostavlja se smbfs zaradi predpone // \n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je �e priklopljen v %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9352,40 +9549,40 @@ msgstr ""
 "Druge izbire: [-nfFrsvw] [-o izbire].\n"
 "Podrobnosti lahko poi��ete v priro�niku z ukazom: man 8 mount\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: to lahko izvede samo sistemski skrbnik"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: to lahko izvede samo sistemski skrbnik"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "ni� ni bilo priklopljeno"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: takega razdelka nisem na�el"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s ni mogo�e najti v %s ali %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 "[mntent]: opozorilo: na koncu datoteke %s manjka prehod na za�etek vrstice\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: vrstici %d in %s sta po�kodovani%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; preostanek datoteke bo ignoriran"
 
@@ -9398,7 +9595,7 @@ msgstr "hro�� v klicu xstrndup"
 msgid "not enough memory"
 msgstr "premalo pomnilnika"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9409,7 +9606,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9422,7 +9619,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9434,127 +9631,132 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Nepri�akovan konec datoteke v %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "vejitev ni uspela\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "zagon ni uspel\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "klic setuid() ni uspel"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Odpiranje %s ni uspelo"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Ime"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: opozorilo: %s ima nevarna dovoljenja %04o, svetujem %04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: dat. %s ne bo upo�tevana zaradi lukenj.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: za %s ni mogo�e najti naprave\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "Niste sistemski skrbnik.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9564,37 +9766,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: prevajanje je potekalo brez podpore za -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, fuzzy, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: vejitev ni mogo�a: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: neveljavna blo�na naprava"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: ni priklopljena"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superbloka ni mogo�e zapisati"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9602,51 +9804,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: neuspe�no iskanje"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: samo sistemski skrbnik lahko odklaplja"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: na dat. sist. blo�ne naprave niso dovoljene"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ni umount2, posku�am z umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s je zaposlena - ponovno priklapljam samo za branje\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: ponovni priklop %s samo za branje ni mogo�\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s je odklopljen\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznama dat. sist. za odklop ni mogo�e najti"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9657,81 +9859,85 @@ msgstr ""
 "\t  umount -a [-f] [-r] [-n] [-v] [-t tip nav. dat. sist.] [-O izbire]\n"
 "\t  umount [-f] [-r] [-n] [-v] posebno | vozli��e...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Sektor %d je �e dodeljen\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Sektor %d je �e dodeljen\n"
 
-#: mount/umount.c:487
+#: mount/umount.c:493
 #, fuzzy
-msgid "Cannot umount \"\"\n"
+msgid "Cannot unmount \"\"\n"
 msgstr "ni mogo�e odklopiti \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "%s posku�am odklopiti\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s ni mogo�e najti v mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ni priklopljen (glede na mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: izgleda kot da je %s ve�krat priklopljen"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s ni v fstab (in vi niste sistemski skrbnik)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: priklop %s je v nasprotju z fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, fuzzy, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "mount: samo sistemski skrbnik lahko odklopi %s na %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: samo sistemski skrbnik naredi to"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9739,77 +9945,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "neznanem"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS �ez TCP ni podprt.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "ncount"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Nova"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "klic ioctl() ni uspel prebrati �asa iz %s"
@@ -9832,7 +10057,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9861,11 +10086,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "zagon ni uspel\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "uporaba: %s program [izbira ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "Finger informacija spremenjena.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "ni mogo�e dobiti velikosti %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "malloc ni uspel"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "Neuspe�no zapisovanje razdelka na %s\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: odpiranje ni uspelo: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "Neuspe�no zapisovanje razdelka na %s\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "napaka pri iskanju"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "napaka pri iskanju"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " in "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10010,7 +10343,15 @@ msgstr "   %f �t./sek; %f sprejetih (znak/sek)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Uporaba: %s [-c] [-n stopnja] [-s vel_medpom]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10019,38 +10360,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Preve� argumentov.\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Neveljavna vrednost nastavljanja: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Neveljavna vrednost nastavljanja: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Izbira --date ni bila podana.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "naj. �t. odsekov = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty ni uspel\n"
@@ -10097,6 +10443,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "vejitev ni uspela\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "Finger informacija spremenjena.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Izbira --date ni bila podana.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Izbira --date ni bila podana.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "iskanje je bilo neuspe�no"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "korenski inod ni imenik"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "openpty ni uspel\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "openpty ni uspel\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10188,475 +10587,450 @@ msgid ""
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nedovoljena izbira -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: nedovoljen klju� (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "za klju� dostop zanikan"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "klju� je �e bil odstranjen"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "neveljaven klju�"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "v klju�u je neznana napaka "
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "za id je dostop zavrnjen"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "neveljaven id"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "id je �e odstranjen"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "v id je neznana napaka"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: neznan argument: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "uporaba : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h za pomo�.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s ponuja informacije o ipc poslopjih za katere imate bralni dostop\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Specifikacija vira:\n"
-"\t-m : deljen_pom\n"
-"\t-q : sporo�ila\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
-msgstr ""
-"\t-s : semaforji\n"
-"\t-a : vse (privzeto)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
+msgstr "%s ponuja informacije o ipc poslopjih za katere imate bralni dostop\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Oblika Izhoda:\n"
-"\t-t : �as\n"
-"\t-p : pid\n"
-"\t-c : stvarnik\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : podrobnosti o viru prepoznanem po id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : omejitve\n"
-"\t-u : povzetek\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : podrobnosti o viru prepoznanem po id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "za deljen pomnilnik jedro ni nastavljeno\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- Omejitve deljenega pomnilnika ----\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "naj. �t. odsekov = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "naj. velikost odseka (kB) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "naj. skupno deljenega pom. (strani) = %lu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "najmanj. vel. odseka (B) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "---- Stanje deljenega pomnilnika ----\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "%d dodeljenih odsekov\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "%ld dodeljenih strani\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "%ld prisotnih strani\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "%ld izmenjanih strani\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "U�inkovitost izmenjalnega prostora: %ld poskusov\t %ld uspe�nih\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "---- stvarniki/lastniki deljenega pomnilni�kega odseka ----\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "dovoljenja"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "---- Deljeno pomnilni�ki pripeti/odpeti/spremenjeni �asi ----\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "lastnik"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "pripeto"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "odpeto"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "spremenjeno"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "---- Stvaritelj deljenega pomnilnika ----\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "---- Segmenti deljenega pomnilnika ----\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "klju�"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "bajtov"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "stanje"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Nenastavljeno"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "ponor"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "zaklenjen"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "za semaforje jedro ni pravilno nastavljeno\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "---- Omejitve semaforjev ----\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "naj. �t. polj = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "naj. �t. semaforjev na polje = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "naj. sistemskih semaforjev = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "naj. �t. operacij na klic semop = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "naj. vrednost semaforja = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "---- Stanje semaforja ----\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "uporabljena polja = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "dodeljeni semaforji = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "---- stvarniki/lastniki polj semaforjev ----\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "---- �asi operacij/sprememb deljenega pomnilnika ----\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "zadnja-op"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "zadnja sprememba"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "---- Semaforna polja ----\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "�tsem"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "za sporo�ilne vrste jedro ni pravilno nastavljeno\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "---- Sporo�ila: Omejitve ----\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "naj. sistemskih vrst = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "naj. velikost sporo�ila (B) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "naj. privzeta velikost vrste (B) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "---- Sporo�ila: Stanje ----\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "dodeljene vrste = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "uporabljene glave = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "porabljen prostor = %d bajtov\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "---- Sporo�ilna vrsta: stvarniki/lastniki ----\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "idsporvrst"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "---- �asi oddaje/sprejema/spremembe sporo�ilnih vrst ----\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "po�lji"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "sprejmi"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "spremeni"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "---- PID-i sporo�ilnih vrst ----\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "---- Sporo�ilne vrste ----\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "porabljeni-bajti"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "sporo�ila"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync ni uspel"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10665,42 +11039,42 @@ msgstr ""
 "\n"
 "Segment deljenega pomnilnika shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "na�in=%#o\tdostop_dovoljenja=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bajti=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_�as=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_�as=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "�as_spremembe=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync ni uspel"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10709,32 +11083,32 @@ msgstr ""
 "\n"
 "msqid sporo�ilne vrste = %d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "oddajni_�as=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "sprejemni_�as=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10743,159 +11117,182 @@ msgstr ""
 "\n"
 "semid Polj semaforjev=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "na�in=%#o, dostop_dovoljenja=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "�tsem = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "�tsem"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "vrednost"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "neveljavni id: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s iz %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "neveljaven id"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ni posebna blo�na naprava"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Iskanje na disku ni mogo�e"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Brez"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "napaka RE: "
+msgid "error: cannot open %s"
+msgstr "%s: ni mogo�e odpreti %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "napaka pri branju %s\n"
+msgid "failed to read: %s"
+msgstr "stanja %s ni mogo�e dobiti"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "napaka pri iskanju"
+
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "Odpiranje %s ni uspelo"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: odpiranje ni uspelo: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr ""
 "\n"
 "Napaka pri zapiranju datoteke\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "malloc ni uspel"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10904,70 +11301,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Staro stanje:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10976,72 +11386,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "uporaba: rdev [ -rv ] [ -o ODMIK ] [ SLIKA [ VREDNOST [ ODMIK ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0 (ali rdev /linux, itn.) prika�e trenutno korensko napravo"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
-"  rdev /dev/fd0 /dev/hda2         nastavi korensko napravo na /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              nastavi kor. zastavice (samo za branje)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            nastavi velikost pom. diska"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/df0 1              nastavi zagonski grafi�ni na�in"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N. ...                 uporabi bajtni odmik N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   enako kot rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     enako kot rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     enako kot rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Opomba: grafi�ni na�ini so: -3=Vpra�aj, -2=Raz�irjen, -1=NavadniVGA, "
-"1=klju�1, 2=klju�2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"     uporabi -R 1 za priklop korenske naprave v na�inu samo za branje, -R 0 "
-"pa za branje/pisanje"
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "vejica manjka"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11153,11 +11497,12 @@ msgstr "nastaviprioriteto"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: stara prioriteta %d, nova prioriteta %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11167,106 +11512,131 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: neprepoznan tip tabele razdelkov"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: nedovoljen klju� (%s)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: nedovoljena izbira -- %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr "%s razli�ica %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Uporabljam %s.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Uporabljam %s.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "malloc ni uspel"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s ni lp naprava.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Sporo�ilo iz %s@%s na %s pri %s ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "ni mogo�e preimenovati %s v %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 #, fuzzy
 msgid "rtc read"
 msgstr ", pripravljen"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11362,6 +11732,11 @@ msgstr "%s: slaba vrednost\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s ni lp naprava.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "napaka pri LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11392,6 +11767,11 @@ msgstr ", povezano"
 msgid ", error"
 msgstr ", napaka"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: priklop ni uspel"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "napaka pri LPGETIRQ"
@@ -11435,6 +11815,16 @@ msgid "unshare failed"
 msgstr "iskanje je bilo neuspe�no"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "zagon ni uspel\n"
@@ -11955,6 +12345,231 @@ msgstr "Vhodna vrstica je predolga.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Pri pove�evanju medpomnilnika je zmanjkalo pomnilnika.\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: nedovoljena izbira -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "%d dodeljenih odsekov\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "%ld dodeljenih strani\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "%ld prisotnih strani\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "%ld izmenjanih strani\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "U�inkovitost izmenjalnega prostora: %ld poskusov\t %ld uspe�nih\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "napaka med izvajanjem poslednjega programa\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Neveljavna vrednost nastavljanja: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "ncount"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Nova"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#, fuzzy
+#~ msgid "Linux JFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Uporaba: fdisk [-b velsekt] -[u] DISK     Spremeni tabelo razdelkov\n"
+#~ "         fdisk -l [-b velsekt] -[u] DISK  Izpi�i tabelo/e razdelkov\n"
+#~ "         fdisk -s RAZDELEK                Vrni velikost/i razdelkov v "
+#~ "blokih\n"
+#~ "         fdisk -v                         Vrni razli�ico fdisk-a\n"
+#~ "DISK je lahko /dev/hdb ali /dev/sda\n"
+#~ "RAZDELEK je lahko /dev/hda7\n"
+#~ " velsekt - velikost sektorja\n"
+#~ "-u: vrni Za�etek in Konec v sektorskih (namesto v steznih) enotah\n"
+#~ "-b 2048: (za nekatere MO diske) uporabi sektorje velikosti 2048-bajtov\n"
+
+#~ 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 ""
+#~ "Uporaba: fdisk [l] [-b velsekt] [-u] naprava\n"
+#~ "Npr.: fdisk /dev/hda (za prv IDE disk)\n"
+#~ " ali: fdisk /dev/sdc (za prvi SCSI disk)\n"
+#~ " ali: fdisk /dev/eda (za prvi PS/2 ESDI disk)\n"
+#~ " ali: fdisk /dev/rd/c0d0 ali fdisk /dev/ida/c0d0 (za RAID naprave)\n"
+#~ " ...\n"
+
+#~ 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"
+#~ "�tevilo stez na tem disku je nastavljeno na %d.\n"
+#~ "S tem ni ni� narobe, ampak to je ve�je kot 1024,\n"
+#~ "in bi lahko v dolo�enih primerih povzro�ilo te�ave z:\n"
+#~ "1) programjem, ki deluje med zaganjanjem (npr. stare razli�ice LILO)\n"
+#~ "2) zagonskim in razdeljevalnim programjem drugih\n"
+#~ "operacijskih sistemov(npr. DOS FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: %s bo ustvarjen, ker ga nisem na�el\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "zagon ni uspel\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "uporaba : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h za pomo�.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Specifikacija vira:\n"
+#~ "\t-m : deljen_pom\n"
+#~ "\t-q : sporo�ila\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semaforji\n"
+#~ "\t-a : vse (privzeto)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Oblika Izhoda:\n"
+#~ "\t-t : �as\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : stvarnik\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : omejitve\n"
+#~ "\t-u : povzetek\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "napaka RE: "
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "napaka pri branju %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr "uporaba: rdev [ -rv ] [ -o ODMIK ] [ SLIKA [ VREDNOST [ ODMIK ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0 (ali rdev /linux, itn.) prika�e trenutno korensko napravo"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr ""
+#~ "  rdev /dev/fd0 /dev/hda2         nastavi korensko napravo na /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              nastavi kor. zastavice (samo za branje)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            nastavi velikost pom. diska"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/df0 1              nastavi zagonski grafi�ni na�in"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N. ...                 uporabi bajtni odmik N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   enako kot rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     enako kot rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     enako kot rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Opomba: grafi�ni na�ini so: -3=Vpra�aj, -2=Raz�irjen, -1=NavadniVGA, "
+#~ "1=klju�1, 2=klju�2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "     uporabi -R 1 za priklop korenske naprave v na�inu samo za branje, -R "
+#~ "0 pa za branje/pisanje"
+
+#~ msgid "missing comma"
+#~ msgstr "vejica manjka"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "zmanjkalo je pomnilnika"
diff --git a/po/sv.po b/po/sv.po
index 7b831c74..620c2c45 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2007-11-14 09:20+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -105,6 +105,11 @@ msgstr "läs om partitionstabellen"
 msgid "Usage:\n"
 msgstr "Användning:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ signal ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -124,6 +129,17 @@ msgstr "Tillgängliga kommandon:\n"
 msgid "get size in 512-byte sectors"
 msgstr "hämta storlek i 512-byte sektorer"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -225,15 +241,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "användning: %s [ -n ] enhet\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -336,7 +343,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "minnesallokering misslyckades"
 
@@ -950,7 +957,7 @@ msgstr "kan inte ta status på enheten %s"
 msgid "%s is not a block special device"
 msgstr "%s är ingen blockspecialenhet"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
@@ -974,7 +981,7 @@ msgstr "för många inoder - max är 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "inte tillräckligt med utrymme, behöver minst %lu block"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhet: %s\n"
@@ -1050,7 +1057,7 @@ msgstr ""
 "Användning: mkfs [-V] [-t filsystemstyp] [filsystemsflaggor] enhet "
 "[storlek]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1287,7 +1294,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "sökning misslyckades i \"check_blocks\""
 
@@ -1370,170 +1377,176 @@ msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Använder användardefinierade sidstorleken %d istället för systemvärdet %d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "grening misslyckades\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Felaktig storlek på växlingshuvud, ingen etikett skrevs.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Etiketten var avkapad.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "ingen etikett, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "inget uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Användning: %s [-c] [-v0|-v1] [-pSIDSTORLEK] [-L etikett] /dev/namn [block]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "för många felaktiga sidor"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "en felaktig sida\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu felaktiga sidor\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "kan inte spola tillbaka växlingsenheten"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "kan inte allokera buffert för inoder"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "kan inte allokera buffert för inoder"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "kan inte tömma startsektor"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   skriv ut BSD-partitionstabell"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   visa fullständig disketikett"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   visa fullständig disketikett"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: fel: version %d är okänd\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr "Fel vid stängning av fil\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: fel: storleken %lu är större än enhetsstorleken %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: fel: växlingsutrymmet måste vara minst %ld kB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: varning: avkortar växlingsutrymmet till %ld kB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: fel: kommer inte att försöka skapa växlingsenhet på \"%s\"\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: fel: %s är monterad; kommer inte att skapa växlingsutrymme.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Kan inte ställa in växlingsutrymme: oläsbart"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Ställer in växlingsutrymme version %d, storlek = %llu kB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "kan inte skriva signatursida"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync misslyckades"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: kunde inte få selinux-filetikett: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "kunde inte matchpathcon()"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "kunde inte skapa nytt selinux-sammanhang"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "kunde inte beräkna selinux-sammanhang"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: kan inte byta etikett på %s till %s: %s\n"
@@ -1596,63 +1609,111 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "fel vid stoppande av tjänst: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Oanvändbar"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "kan inte spola tillbaka växlingsenheten"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Ledigt utrymme"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: det finns ingen sådan partition\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: fel: version %d är okänd\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "sökning misslyckades i \"write_tables\""
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"För mer information, se setarch(8).\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Oanvändbar"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Ledigt utrymme"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disken har ändrats.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1665,232 +1726,232 @@ msgstr ""
 "partitioner bör du titta i manualen för cfdisk\n"
 "för ytterligare information.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ÖDESDIGERT FEL"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Tryck valfri tangent för att avsluta cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Kan inte söka på diskenhet"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Kan inte inte läsa diskenhet"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Kan inte skriva diskenhet"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "För många partitioner"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Partitionen börjar före sektor 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Partitionen slutar före sektor 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Partitonen börjar efter slutet på disken"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Partitionen slutar efter slutet på disken"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Partitionen slutar i den slutliga partiella cylindern"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "logiska partitioner är inte i diskordning"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "logiska partitioner överlappar varandra"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "förstorade logiska partitioner överlappar varandra"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 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:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menyposten är för lång. Menyn kan se konstig ut."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Meny utan riktning. Använder standardvärdet vågrät."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Ogiltig tangent"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Tryck en tangent för att fortsätta"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Primär"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Skapa en ny primär partition"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Logisk"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Skapa en ny logisk partition"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Skapa inte någon partition"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Internt fel !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Storlek (i MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Början"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Lägg till partition i början av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Slutet"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Lägg till partition i slutet av det lediga utrymmet"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Ingen plats att skapa den utökade partitionen"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Ingen partitionstabell.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Ingen partitionstabell. Startar med tom tabell."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Felaktig signatur på partitionstabell"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Okänd typ av partitionstabell"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 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:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Du angav fler cylindrar än som ryms på disken"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Kan inte öppna diskenhet"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Öppnade disken skrivskyddat - du har ingen behörighet att skriva"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "Varning!!  GPT (GUID Partition Table) upptäcktes men stöds inte. Använd GNU "
 "Parted."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Kan inte hämta diskstorlek"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Felaktig primär partition"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Felaktig logisk partition"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varning!! Detta kan förstöra data på din disk!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to 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:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "nej"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Skrev inte partitionstabellen till disk"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "ja"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Ange \"ja\" eller \"nej\""
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Skriver partitionstabell till disk..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Skrev partitionstabell till disk"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1899,87 +1960,87 @@ msgstr ""
 "Skrev partitionstabellen, men omläsning av tabellen misslyckades. Starta om "
 "för att uppdatera tabellen."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 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:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 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:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan inte öppna filen \"%s\""
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Diskenhet: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Ingen  "
 
 # Primär/Logisk antar jag
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Primär "
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Logisk "
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Okänd"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Ingen"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabell för %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Första      Sista\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1987,7 +2048,7 @@ msgstr ""
 " # Typ        Sektor      Sektor   Avstånd   Längd    Filsystemstyp (ID)   "
 "Flagga\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2007,472 +2068,472 @@ msgstr ""
 # source you realize that "Start" belongs to "Sector" in another message
 # (the one from the line below in the source).
 #
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ----Start-----      -----Slut-----   Start-    Antal\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, fuzzy
 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Rått"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Visa tabellen i rått dataformat"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektorer"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Visa tabellen sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tabell"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Visa bara partitionstabellen"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Visa inte tabellen"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Hjälpskärm för cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 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:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "hårddisk."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright © 1994-1999 Kevin E. Martin och aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Kommando     Betydelse"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "--------     ---------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Slå på/av startbarhetsflaggan på aktuell partition"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Ändra parametrarna för cylindrar, huvuden, sektorer-per-spår"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 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:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             vet vad de gör."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Visa denna hjälpskärm"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximera diskanvändandet på aktuell partition"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 "             Obs: Detta kan komma att göra partitionen inkompatibel med"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Skapa en ny partition från ledigt utrymme"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Det finns flera olika format på partitionen"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             som du kan välja mellan:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 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:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabell sorterad efter sektorer"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Tabell i rått format"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Byt filsystemstypen"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Byt enheter på visningen av partitionsstorlek"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Byter mellan MB, sektorer och cylindrar"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 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:2319
+#: fdisk/cfdisk.c:2201
 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:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             eller \"nej\""
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Uppil        Flytta markören till föregående partition"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Nerpil       Flytta markören till nästa partition"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL+L       Rita om skärmen"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Visa denna skärm"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "(utom för skrivningar med W)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Cylindrar"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Ändra cylindergeometri"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Huvuden"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Ändra huvudgeometri"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Ändra sektorgeometri"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Klar"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Färdig med geometriändring"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Ange antalet cylindrar: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Ogiltigt antal cylindrar"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Ange antalet huvuden: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Ogiltigt antal huvuden"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Ange antalet sektorer per spår: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Ogiltigt antal sektorer"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Ange typen av filsystem: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Kan inte ändra filsystemstypen till ett tomt värde"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Kan inte ändra filsystemstypen till utökad"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Okänd(%02X)"
 
 # Vad är detta?
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Okänd (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Diskenhet: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Storlek: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Storlek: %lld byte, %lld,%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Huvuden: %d   Sektorer per spår: %d   Cylindrar: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Namn"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Flaggor"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Part.-typ"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "FS-typ"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Etikett]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Sektorer"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Cylindrar"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Storlek (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Storlek (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Startbar"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Slå på/av startbarhetsflaggan på aktuell partition"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Ta bort"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Ta bort aktuell partition"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Ändra diskgeometri (endast experter)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Hjälp"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Visa hjälpskärm"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Maximera"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximera diskanvändningen för aktuell partition (endast experter)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Ny"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Skapa ny partition från ledigt utrymme"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Visa"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Avsluta"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Avsluta programmet utan att skriva partitionstabellen"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 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:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Enheter"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 "Byt enheter på visningen av partitionsstorleken (MB, sektorer, cylindrar)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Skriv"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Skriv partitionstabellen till disk (detta kan förstöra data)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Kan inte göra denna partition startbar"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Kan inte ta bort en tom partition"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Kan inte maximera denna partition"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Denna partition är oanvändbar"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Denna partition används redan"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "Kan inte ändra typen på en tom partition"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Inge fler partitioner"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Ogiltigt kommando"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Copyright © 1994-2002 Kevin E. Martin och aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2544,9 +2605,9 @@ msgstr ""
 "\n"
 "BSD-etikett för enhet: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Kommandoåtgärd"
 
@@ -2566,9 +2627,9 @@ msgstr "   i   installera förstartare (bootstrap)"
 msgid "   l   list known filesystem types"
 msgstr "   l   visa kända filsystemstyper"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   visa denna meny"
 
@@ -2580,14 +2641,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:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   avsluta utan att spara ändringar"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   återgå till huvudmenyn"
 
@@ -2630,13 +2691,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Första %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sista %s eller +storlek eller +storlekM eller +storlekK"
@@ -2781,7 +2842,7 @@ msgstr "sektorer/spår"
 msgid "tracks/cylinder"
 msgstr "spår/cylinder"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "cylindrar"
@@ -2842,7 +2903,7 @@ msgstr "Förstartare (bootstrap) installerad på %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Det maximala antalet partitioner har skapats\n"
@@ -2866,225 +2927,207 @@ msgstr ""
 "\n"
 "Synkroniserar hårddiskar.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Användning: fdisk [-b SSZ] [-u] DISK     Ändra partitionstabell\n"
-"            fdisk -l [-b SSZ] [-u] DISK  Lista partitionstabell(er)\n"
-"            fdisk -s PARTITION           Visa partitionsstorlek(ar) i block\n"
-"            fdisk -v                     Visa fdisks versionsnummer\n"
-"DISK är någonting liknande /dev/hdb eller /dev/sda\n"
-"och PARTITION är någonting liknande /dev/hda7\n"
-"-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:260
-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 ""
-"Användning: fdisk [-l] [-b SSZ] [-u] enhet\n"
-"Exempelvis: fdisk /dev/hda  (för den första IDE-disken)\n"
-"     eller: fdisk /dev/sdc  (för den tredje SCSI-disken)\n"
-"     eller: fdisk /dev/eda  (för den första PS/2-ESDI-enheten)\n"
-"     eller: fdisk /dev/rd/c0d0 eller: fdisk /dev/ida/c0d0 (för RAID-"
-"enheter)\n"
-"     ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan inte läsa %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan inte söka på %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan inte skriva %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE-ioctl:en misslyckades på %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan inte allokera mer minne\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Ödesdigert fel\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   slå på/av en flagga för skrivskydd"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   redigera bsd-disketikett"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   slå på/av monterbarhetsflaggan"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   ta bort en partition"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   lista kända partitionstyper"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   lägg till en ny partition"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   skapa en ny tom DOS-partitionstabell"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   visa partitionstabellen"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   skapa en ny tom Sun-disketikett"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   ändra en partitions system-id"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   ändra visnings-/postenheter"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   verifiera partitionstabellen"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   skriv tabellen till disk och avsluta"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   extra funktionalitet (endast experter)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   välj startbar partition"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   redigera startfilspost"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   välj sgi-växlingspartition"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   slå på/av en startbarhetsflagga"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   slå på/av dos-kompatibilitetsflaggan"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ändra antalet alternativa cylindrar"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   ändra antalet cylindrar"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   skriv ut den råa datan i partitionstabellen"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ändra antalet extra sektorer per cylinder"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   ändra antalet huvuden"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   ändra mellanrumsfaktor"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ändra rotationshastighet (varv per minut)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   ändra antalet sektorer/spår"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ändra antalet fysiska cylindrar"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   flytta början på data i en partition"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   lista utökade partitioner"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   skapa en IRIX-partitionstabell (SGI)"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   fixa partitionsordningen"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i   ändra diskidentifieraren"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Du måste ställa in"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "huvuden"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektorer"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3093,31 +3136,11 @@ msgstr ""
 "%s%s.\n"
 "Du kan göra detta från menyn extra funktionalitet.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " och "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Antalet cylindrar för denna disk är satt till %d.\n"
-"Det är inget fel med det, men det är större än 1024, och kan i\n"
-"vissa konfigurationer orsaka problem med:\n"
-"1) programvara som kör under uppstart (exempelvis gamla versioner\n"
-"   av LILO)\n"
-"2) start- och partitioneringsprogramvara från andra operativsystem\n"
-"   (exemeplvis DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3128,38 +3151,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Felaktigt avstånd i primär utökad partition\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3168,32 +3190,32 @@ msgstr ""
 "Varning: utelämnar partitioner efter nr %d.\n"
 "De kommer att tas bort om du sparar denna partitionstabell.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Varning: extra länkpekare i partitionstabell %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Varning: ignorerar extra data i partitionstabell %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Varning: tom partition\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Diskidentifierare: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Ny diskidentifierare (nuvarande 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3207,26 +3229,17 @@ msgstr ""
 "tidigare innehållet att kunna återställas.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Observera: sektorstorleken är %d (inte %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3235,7 +3248,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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3244,17 +3257,17 @@ msgstr ""
 "Enheten innehåller varken en giltig DOS-partitionstabell eller en Sun-, SGI- "
 "eller OSF-disketikett\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Internt fel\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerar extra utökad partition %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3263,7 +3276,7 @@ msgstr ""
 "Varning: ogiltiga flaggan 0x%04x i partitionstabell %d kommer ett korrigeras "
 "vid skrivning med w\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3272,95 +3285,100 @@ msgstr ""
 "\n"
 "mottog EOF tre gånger - avslutar...\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Hexadecimal kod (tryck L för att se koder): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, standardvärde %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Använder standardvärdet %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Värdet är utanför intervallet.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Varning: partition %d har tom typ\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Valde partition %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ingen partition är definierad än!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Alla primära partitioner har redan definierats!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Ändrar visnings-/inmatningsenheter till %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Ändrar visnings-/inmatningsenheter till %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "VARNING: Partition %d är en utökad partition\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "DOS-kompatibilitetsflagga är satt\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatibilitetsflagga är inte satt\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d finns inte än!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3374,7 +3392,7 @@ msgstr ""
 "oklokt. Du kan ta bort en partition\n"
 "genom att använda kommandot \"d\".\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3383,7 +3401,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:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3395,7 +3413,7 @@ msgstr ""
 "gillar det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3407,62 +3425,62 @@ msgstr ""
 "förväntar sig det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Systemtyp för partition %d är oförändrad %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har olika fysiska/logiska slut:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "borde vara (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Partition %i slutar inte på cylindergräns.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "borde vara (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "Partition %i börjar inte på cylindergräns:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3471,7 +3489,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3480,12 +3498,12 @@ msgstr ""
 "\n"
 "Disk %s: %ld,%ld GB, %lld byte\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d huvuden, %llu sektorer/spår, %d cylindrar"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", totalt %llu sektorer"
@@ -3493,22 +3511,27 @@ msgstr ", totalt %llu sektorer"
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Enheter = %s av %d · %d = %d byte\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "felaktig storlek på inod"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3517,14 +3540,14 @@ msgstr ""
 "Ingenting att göra. Ordningen är redan korrekt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Färdig\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3535,16 +3558,16 @@ msgstr ""
 "Du valde nog fel enhet.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Start     Början        Slut     Block    Id  System\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Enhet"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3553,7 +3576,7 @@ msgstr ""
 "\n"
 "Posterna i partitionstabellen är inte i diskordning\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3564,90 +3587,90 @@ msgstr ""
 "Disk %s: %d huvuden, %llu sektorer, %d cylindrar\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varning: partition %d innehåller sektor 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Partition %d: sektor %d är större än maximala %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Varning: felaktig databörjan på partition %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Varning: partition %d överlappar med partition %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varning: partition %d är tom\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Totala antalet allokerade sektorer %ld är större än maximala %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld oallokerade sektorer\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektor %llu är redan allokerad\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Inga lediga sektorer är tillgängliga\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3661,7 +3684,7 @@ msgstr ""
 "\tVARNING: Detta kommer att förstöra det nuvarande innehållet\n"
 "\tpå disken.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3675,23 +3698,23 @@ msgstr ""
 "\tVARNING: Detta kommer att förstöra det nuvarande innehållet\n"
 "\tpå disken.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Alla logiska partitioner används\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Lägger till en primär partition\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3702,20 +3725,20 @@ msgstr ""
 "   %s\n"
 "   p   primär partition (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   logisk (5 eller högre)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   utökad"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ogiltigt partitionsnummer för typen \"%c\"\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3724,12 +3747,12 @@ msgstr ""
 "Partitionstabellen har ändrats!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, 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:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3742,7 +3765,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:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3754,7 +3777,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:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3763,42 +3786,42 @@ msgstr ""
 "\n"
 "Fel vid stängning av fil\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Synkroniserar hårddiskar.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har inget dataområde\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Ny början utav data"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Expertkommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Antal cylindrar"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Antal huvuden"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, 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:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3811,32 +3834,32 @@ msgstr ""
 "saknar stöd för GPT. Använd GNU Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: okänt kommando\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3845,16 +3868,16 @@ msgstr ""
 "Varning: flaggan -b (ställ in sektorstorlek) måste användas med en angiven "
 "enhet\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Kommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3863,16 +3886,16 @@ msgstr ""
 "\n"
 "Aktuell startfil är: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Ange namnet på den nya startfilen: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Startfilen oförändrad\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3964,15 +3987,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux växling"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux egen"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4114,7 +4137,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Det finns fler än en diskpost.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Inga partitioner är angivna\n"
@@ -4219,7 +4242,7 @@ 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:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -4277,7 +4300,7 @@ msgstr ""
 "naturligtvis det tidigare innehållet att vara spårlöst borta.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4298,55 +4321,55 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "Otilldelad"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS rot"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS växling"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Hela disken"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "SunOS alt sektorer"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "SunOS cachefs"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "SunOS reserverad"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetekterad"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4360,22 +4383,22 @@ msgstr ""
 "och partitioner, eller tvinga en ny etikett\n"
 "(kommandot s i huvudmenyn)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Hittade sun-disketikett med felaktig version [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Hittade sun-disketikett med felaktig kontrollsumma [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Hittade sun-disketikett med felaktig num_partitions [%u].\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4383,7 +4406,7 @@ msgstr ""
 "Varning: Felaktiga värden behöver rättas till och kommer att korrigeras av w"
 "(skriv)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4396,31 +4419,31 @@ msgstr ""
 "kommer naturligtvis det tidigare innehållet inte att vara\n"
 "återställningsbart.\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektorer/spår"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Oanvänt mellanrum - sektorerna 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Oanvänt mellanrum - sektorerna %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4429,7 +4452,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:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4438,12 +4461,12 @@ msgstr ""
 "Det rekommenderas varmt att den elfte partitionen\n"
 "täcker hela hårddisken och är av typen \"SGI-volym\"\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4453,7 +4476,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:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4462,7 +4485,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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4480,12 +4503,12 @@ msgstr ""
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#: fdisk/fdisksunlabel.c:581
-#, c-format
+#: fdisk/fdisksunlabel.c:576
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4505,11 +4528,11 @@ msgstr ""
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4518,28 +4541,28 @@ msgstr ""
 "Enheter = %s av %d · 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flagga  Början      Slut   Block    Id  System\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Antal alternerande cylindrar"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Mellanrumsfaktor"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighet (varv per minut)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Antal fysiska cylindrar"
 
@@ -4748,6 +4771,10 @@ msgstr "Minix / gammal Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux växling / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 dold C:-enhet"
@@ -5378,94 +5405,94 @@ msgstr "Flaggan -n angavs: Inget ändrades\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Misslyckades med att spara de gamla sektorerna - avbryter\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Misslyckades med att skriva partitionen på %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "lång eller ofullständig indatarad - avslutar\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "indatafel: \"=\" förväntas efter %s-fält\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, 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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "okänd indata: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "talet är för stort\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "eftersläpande skräp efter tal\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "ingen plats för partitionshandtag\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan inte bygga omgivande utökad partition\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "för många indatafield\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Inte plats för mer\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Ogiltig typ\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, 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:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Varning: tom partition\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varning: felaktig början på partition (första %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "okänd startbarhetsflagga - välj - eller *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s-specifikation ofullständig?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Utökad partition finns inte där den förväntades\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "felaktig indata\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "för många partitioner\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5475,42 +5502,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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "enhet: någonting liknande /dev/hda eller /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "användbara flaggor:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [eller --show-size]: visa storlek på en partition"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [eller --id]:     visa eller ändra partitionsid"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [eller --list]:   visa partitioner på varje enhet"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 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:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5518,55 +5545,55 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  acceptera/rapportera i enheter om sektorer/block/"
 "cylindrar/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [eller --list-types]:visa de kända partitionstyperna"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 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:2300
+#: fdisk/sfdisk.c:2305
 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:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N<nummer>:          ändra endast partitionen med numret <nummer>"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 skriv inte till hårddisken"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I fil :             återställ dessa sektorer igen"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [eller --version]: visa versionsinformation"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [eller --help]:   visa detta meddelande"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "farliga flaggor:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 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:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5574,7 +5601,7 @@ msgstr ""
 "    -G [eller --show-pt-geometry]: skriv ut gissad geometri från "
 "partitionstabellen"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5582,62 +5609,62 @@ 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:2312
+#: fdisk/sfdisk.c:2317
 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:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [eller --quiet]:   undertryck varningsmeddelanden"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Du kan åsidosätta den detekterade geometrin genom att använda:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 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:2316
+#: fdisk/sfdisk.c:2321
 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:2317
+#: fdisk/sfdisk.c:2322
 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:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Du kan stänga av all konsekvenskontroll med:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Användning:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5650,67 +5677,67 @@ msgstr ""
 "saknar stöd för GPT. Använd GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Använd flaggan --force för att undertrycka denna kontroll.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "inget kommando?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totalt: %llu block\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "användning: sfdisk --print-id enhet partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "användning: sfdisk --change-id enhet partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "användning: sfdisk --id enhet partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan inte öppna %s för läsning och skrivning\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan inte öppna %s för läsning\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan inte hämta storleken på %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, 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:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5718,7 +5745,7 @@ msgstr ""
 "Färdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5728,35 +5755,35 @@ msgstr ""
 "DOS huvudstartpost (MBR) kan endast starta en hårddisk med 1 aktiv\n"
 "partition.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Felaktigt Id %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Denna hårddisk används för tillfället.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ödesdigert fel: kan inte hitta %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varning: %s är ingen blockenhet\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 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:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5769,30 +5796,30 @@ msgstr ""
 "på denna disk är utväxlade. Använd flaggan --no-reread för att\n"
 "undertrycka denna kontroll.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 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:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Tidigare situation:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, 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:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5800,21 +5827,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:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Är du nöjd med detta? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vill du skriva detta till disk? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5823,16 +5850,16 @@ msgstr ""
 "\n"
 "sfdisk: för tidigt slut på indata\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Avslutar - ingenting ändrades\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Svara med ett av y, n eller q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5841,7 +5868,7 @@ msgstr ""
 "Lyckades skapa den nya partitionstabellen\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5852,17 +5879,17 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Se fdisk(8)).\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: kan inte öppna %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5870,75 +5897,75 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s hittades inte"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: fel %d vid uppackning! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: du måste ange filsystemstypen"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s är ingen lp-enhet.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Tvingar filsystemskontroll på %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
@@ -5946,42 +5973,42 @@ msgstr ""
 "Användning: mkfs [-V] [-t filsystemstyp] [filsystemsflaggor] enhet "
 "[storlek]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s är ingen lp-enhet.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s avmonterad\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Avmonterar alla återstående filsystem..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: okänt argument: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s från %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Kan inte allokera buffert för inoder"
@@ -6485,7 +6512,13 @@ msgstr "Inget användbart klockgränssnitt hittades.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Kunde inte ställa systemklockan.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6497,17 +6530,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:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6516,22 +6549,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:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s från %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6550,6 +6583,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6598,7 +6632,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:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6610,17 +6644,17 @@ msgstr ""
 "(8))\n"
 
 # audit är inget svenskt ord men hittar inte passande. revision? granskning?
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "%s: Kunde inte ansluta till auditsystem\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6629,7 +6663,7 @@ msgstr ""
 "Du har angivit flera funktioner\n"
 "Du kan bara utföra en funktion åt gången.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6638,7 +6672,7 @@ msgstr ""
 "%s: Flaggorna --utc och --localtime är ömsesidigt uteslutande. Du angav "
 "båda.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6647,7 +6681,7 @@ msgstr ""
 "%s: Flaggorna --adjust och --noadjfile är ömsesidigt uteslutande. Du angav "
 "båda.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6656,27 +6690,27 @@ msgstr ""
 "%s: Flaggorna --adjust och --noadjfile är ömsesidigt uteslutande. Du angav "
 "båda.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, 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:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6684,12 +6718,12 @@ msgid ""
 msgstr ""
 "Tyvärr, endast superanvändaren kan ändra hårdvaruklockans epok i kärnan.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6979,12 +7013,12 @@ msgstr "%s: Kan inte ställa in standardsammanhanget för /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "Ändrar fingerinformation för %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "chsh: PAM-fel, avbryter: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7211,35 +7245,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ÖDESDIGERT: kan inte återöppna tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s är ingen blockspecialenhet"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "ÖDESDIGERT: felaktig tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h endast för superanvändaren.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "användning: login [-fp] [användarnamn]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Kunde inte initiera PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "användarnamn: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, 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:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7248,17 +7287,17 @@ msgstr ""
 "Felaktig inloggning\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, 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:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7267,7 +7306,7 @@ msgstr ""
 "\n"
 "Felaktig inloggning\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7276,121 +7315,121 @@ msgstr ""
 "\n"
 "Problem med upprättandet av sessionen, avbryter.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Användarnamnet är NULL i %s:%d. Avbryter."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Ogiltigt användarnamn \"%s\" i %s:%d. Avbryter."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Slut på minne\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 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:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s-inloggning nekas på denna terminal.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, 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:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "INLOGGNING AV %s NEKAS PÅ TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Felaktig inloggning\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "UPPRINGNING PÅ %s AV %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT-INLOGGNING PÅ %s FRÅN %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT-INLOGGNING PÅ %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "INLOGGNING PÅ %s AV %s FRÅN %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "INLOGGNING PÅ %s AV %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Du har ny post.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Du har post.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: grenande misslyckades: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY misslyckades: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() misslyckades"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Katalogen %s finns inte!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Loggar in med hemkatalog = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: inget minne för skalskript.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: kunde inte köra skalskript: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: inget skal: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7399,65 +7438,65 @@ msgstr ""
 "\n"
 "%s användarnamn: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "användarnamnet är alldeles för långt.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "NAMNET är för långt"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "användarnamn får inte börja med \"-\".\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "för många tomma nyrader.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "FÖR MÅNGA nyrader"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Inloggning gjorde time-out efter %d sekunder\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Senaste inloggning: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "från %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "MISSLYCKAD INLOGGNING FRÅN %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "MISSLYCKAD INLOGGNING PÅ %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR FRÅN %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR PÅ %s, %s"
@@ -7716,7 +7755,7 @@ msgstr "ingen TERM eller kan inte ta status på tty\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "fel vid stoppande av tjänst: \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7726,8 +7765,8 @@ msgstr "fel vid stoppande av tjänst: \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "fel vid körning av finalprog\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "fel vid stoppande av tjänst: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7864,25 +7903,25 @@ msgstr "%s: kan inte ta status på temporär fil.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: kan inte läsa temporär fil.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "ogiltigt årsvärde: använd 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "ogiltigt månadsvärde: använd 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "ogiltigt årsvärde: använd 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "användning: cal [-13smjyV] [[månad] år]\n"
@@ -7906,6 +7945,115 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "kan inte öppna %s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Okänt kommando: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "Kan inte allokera buffert.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "Kan inte allokera buffert.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: kan inte läsa %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "skrivfel på %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"För mer information, se setarch(8).\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Katalogen %s finns inte!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "Kan inte allokera buffert.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "Kan inte allokera buffert.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "Kan inte allokera buffert.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "Kan inte allokera buffert.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8062,7 +8210,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:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8073,37 +8221,37 @@ msgstr ""
 "Använd \"%s [flaggor] %s\" om du verkligen vill använda den.\n"
 "Skriptet startades inte.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "användning: script [-a] [-f] [-q] [-t] [fil]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skriptet startades, filen är %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "skrivfel på %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Skriptet startades %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "skrivfel på %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: kan inte hitta enheten för %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8112,17 +8260,17 @@ msgstr ""
 "\n"
 "Skriptet färdigt %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skriptet färdigt, filen är %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty misslyckades\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Slut på pty:er\n"
@@ -8468,6 +8616,16 @@ msgstr "läste %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: misslyckades med att öppna: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "kan inte ta status på %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8498,6 +8656,11 @@ msgstr "Fel vid läsning av %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "ogiltigt id"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8515,7 +8678,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8535,12 +8698,12 @@ msgstr "fel vid byte av rättigheter på %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8568,76 +8731,74 @@ msgstr "Användning: %s [flaggor] enhet ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM kat ... -f ] namn...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "minnesallokering misslyckades"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "Öppning av %s misslyckades"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
-msgstr ""
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
+msgstr "Fel vid stängning av fil\n"
+
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Disk %s innehåller inte en giltig partitionstabell\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "openpty misslyckades\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "byte"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty misslyckades\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Ogiltigt inställt värde: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Användning: %s [flaggor] enhet ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8646,7 +8807,7 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8889,7 +9050,7 @@ msgstr "loop: kan inte ta bort enheten %s: %s\n"
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Denna mount kompilerades utan stöd för slingor. Du bör kompilera om.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8909,7 +9070,7 @@ msgstr ""
 "  %s -f                                                # hitta ledig\n"
 "  %s [-e kryptering] [-o avstånd] {-f|slingenhet} fil  # konfiguration\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8942,250 +9103,294 @@ msgstr ""
 " -v | --verbose           informativt läge\n"
 "\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Ogiltigt inställt värde: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Ogiltigt inställt värde: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "mount: stulen loop=%s ...försöker igen\n"
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: enheten är upptagen"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Inget stöd för slingor fanns tillgängligt vid kompileringen. Du bör\n"
 "kompilera om.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr "mount: felaktigt citerad flaggsträng \"%s\""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: översatte %s \"%s\" till \"%s\"\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: enligt mtab är %s redan monterat på %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: enligt mtab är %s monterat på %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: kan inte öppna %s för skrivning: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: fel vid skrivning av %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: fel vid byte av rättigheter på %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: kan inte ställa in grupp-id: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: kan inte ställa in användar-id: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: kan inte grena: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Försöker med %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: du angav ingen filsystemstyp för %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Jag kommer att försöka med alla typer nämnda i %s eller %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       och det verkar som om detta är växlingsutrymme\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Jag kommer att försöka med typen %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s ser ut som växlingsutrymme - monteras inte"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "montering misslyckades"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: endast root kan montera %s på %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: slingenheten angiven två gånger"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: typen angiven två gånger"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: hoppar över konfigurationen av en slingenhet\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Ogiltigt inställt värde: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Ogiltigt inställt värde: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: enligt mtab är %s redan monterat på %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: kommer att använda slingenheten %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: stulen loop=%s ...försöker igen\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: stulen loop=%s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: misslyckades konfigurera slingenheten\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: lyckades konfigurera slingenheten\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: ingen %s hittades - skapar den...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: kan inte öppna %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: argument till -p eller --pass-fd måste vara ett tal"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: kan inte öppna %s för inställning av hastighet"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: kan inte ställa in hastighet: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: enligt mtab är %s redan monterat på %s\n"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s är upptagen - monterade om som endast läsbar\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s är upptagen - monterade om som endast läsbar\n"
+
+#: mount/mount.c:1482
 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:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: du måste ange filsystemstypen"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: montering misslyckades"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: monteringspunkten %s är inte en katalog"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: åtkomst nekas"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: måste vara superanvändaren för att använda mount"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s är upptagen"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc är redan monterad"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s är redan monterad eller %s är upptagen"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: monteringspunkten %s finns inte"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: specialenheten %s finns inte"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9194,12 +9399,12 @@ msgstr ""
 "mount: specialenheten %s finns inte\n"
 "       (ett sökvägsprefix är inte en katalog)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s är inte redan monterad, eller felaktig flagga"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9208,13 +9413,13 @@ msgstr ""
 "mount: fel filsystemstyp, felaktig flagga, felaktigt superblock\n"
 "       på %s, codepage eller hjälpprogram saknas, eller annat fel"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9223,7 +9428,7 @@ msgstr ""
 "       använder ide-scsi så att sr0 eller sda eller något\n"
 "       liknande behövs?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9231,7 +9436,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:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9239,107 +9444,102 @@ msgstr ""
 "       I en del fall kan användbar information hittas i syslog\n"
 "       - prova dmesg | tail eller något liknande\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "monteringstabellen full"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: kan inte läsa superblock"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: okänd enhet"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: okänd filsystemstyp \"%s\""
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: du menade troligtvis %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: du menade kanske \"iso9660\"?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: du menade kanske \"vfat\"?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: kärnan känner inte igen %s som en blockenhet\n"
 "       (kanske \"insmod drivrutin\"?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s är ingen blockenhet"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s är ingen giltig blockenhet"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "blockenhet "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: kan inte montera %s%s som endast läsbar"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, 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:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: kan inte montera %s%s som endast läsbar"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, 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:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: stulen loop=%s ...försöker igen\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s är redan monterad på %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9349,24 +9549,24 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: ingen typ angavs - jag kommer att anta cifs på grund //-prefixet\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s är redan monterad på %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9436,39 +9636,39 @@ msgstr ""
 "Andra flaggor: [-nfFrsvw] [-o flaggor] [-p lösenordfd].\n"
 "Ange  man 8 mount  för ytterligare detaljer.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: endast root kan göra det"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: endast root kan göra det"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "ingenting monterades"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: ingen sådan partition hittades"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: kan inte hitta %s i %s eller %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: varning: ingen avslutande nyrad på slutet av %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: rad %d i %s är felaktig%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; resten av filen ignoreras"
 
@@ -9481,7 +9681,7 @@ msgstr "programfel i xstrndup-anrop"
 msgid "not enough memory"
 msgstr "inte tillräckligt med minne"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9492,7 +9692,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9505,7 +9705,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9517,127 +9717,132 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Oväntat filslut i %s-fil\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "grening misslyckades\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "körning misslyckades\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() misslyckades"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "sökning misslyckades"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Öppning av %s misslyckades"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Namn"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s misslyckades.\n"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: varning: %s har osäkra rättigheter %04o, föreslår %04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: Hoppar över filen %s - den verkar innehålla hål.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "sökning misslyckades"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s på %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s misslyckades.\n"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: kan inte hitta enheten för %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "Inte superanvändare.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s misslyckades.\n"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9647,37 +9852,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: kompilerad utan stöd för -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: kan inte ställa in grupp-id: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: kan inte ställa in användar-id: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: kan inte grena: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: ogiltig blockenhet"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: inte monterad"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: kan inte skriva superblock"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9685,51 +9890,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s hittades inte"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, 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:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: blockenheter är inte tillåtna på filsystem"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "ingen umount2, försöker med umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, 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:263
+#: mount/umount.c:269
 #, 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:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s avmonterad\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: kan inte hitta lista med filsystem att avmontera"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9740,80 +9945,85 @@ msgstr ""
 "            umount -a [-f] [-r] [-n] [-v] [-t vfs-typer] [-O alternativ]\n"
 "            umount [-f] [-r] [-n] [-v] special | nod...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Kan inte avmontera \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Försöker avmontera %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Kunde inte hitta %s i mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s är inte monterad (enligt mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, 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:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montering av %s stämmer inte överens med fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: endast %s kan avmontera %s från %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: endast root kan göra det"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9821,77 +10031,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "okänd"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS över TCP stöds inte.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "nräkn"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Ny"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() misslyckades med att läsa tid från %s"
@@ -9914,7 +10143,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9943,11 +10172,121 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "körning misslyckades\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "användning: %s program [argument ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"För mer information, se setarch(8).\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "kan inte hämta storleken på %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "minnesallokering misslyckades"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "Misslyckades med att ställa in personlighet till %s"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: misslyckades med att öppna: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "Misslyckades med att ställa in personlighet till %s"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "sökfel"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "sökfel"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " och "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10092,7 +10431,15 @@ msgstr "   %f avbrott/sek; %f mott. (tecken/s)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Användning: %s [-c] [-n nivå] [-s buffertstorlek]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10101,7 +10448,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10110,31 +10457,36 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Inte tillräckligt många argument"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Ogiltigt inställt värde: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Ogiltigt inställt värde: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Ingen --date-flagga angavs.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "maximalt antal segment = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty misslyckades\n"
@@ -10181,6 +10533,61 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "grening misslyckades\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"För mer information, se setarch(8).\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Ingen --date-flagga angavs.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Ingen --date-flagga angavs.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s misslyckades.\n"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "rotinoden är inte en katalog"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "openpty misslyckades\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "openpty misslyckades\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10276,478 +10683,453 @@ msgstr ""
 "användning: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "               [-Q msgnyckel] [-M shmnyckel] [-S semnyckel] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: otillåten nyckel (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "åtkomst nekas för nyckel"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "redan borttagen nyckel"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "ogiltig nyckel"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "okänt fel i nyckel"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "åtkomst nekas för id"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "ogiltigt id"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "redan borttaget id"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "okänt fel i id"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: okänt argument: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "användning: %s -asmq -tclup\n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h för hjälp.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s tillhandahåller information om ipc-faciliteter för vilka du har\n"
-"läsrättighet.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Resursspecifikation:\n"
-"\t-m : delat minne\n"
-"\t-q : meddelanden\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : semaforer\n"
-"\t-a : alla (standard)\n"
+"%s tillhandahåller information om ipc-faciliteter för vilka du har\n"
+"läsrättighet.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Utdataformat:\n"
-"\t-t : tid\n"
-"\t-p : pid\n"
-"\t-c : skapare\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : detaljer om resursen som identifieras av id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : gränser\n"
-"\t-u : sammanfattning\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : detaljer om resursen som identifieras av id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "kärnan är inte konfigurerad för delat minne\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Gränser för delat minne --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "maximalt antal segment = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "maximal segmentstorlek (kilobyte) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "maximalt totalt delat minne (kbyte) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "minimal segmentstorlek (byte) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Status för delat minne --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "allokerade segment %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "allokerade sidor %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "residenta sidor  %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "utväxlade sidor  %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Växlingsprestanda: %ld försök\t  %ld lyckade försök\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Skapare/Ägare av delade minnessegment --------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "rättigh"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "vuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Tilläggs-/Lösgörnings-/Ändringstider för delat minne --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "ägare"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "tillagd"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "lösgjord"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "ändrad"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ Skapare/Senaste operation på delat minne --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Delade minnessegment --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "nyckel"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "byte"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "anttill"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "status"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Inte inställd"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "mål"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "låst"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "kärnan är inte konfigurerad för semaforer\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Semaforgränser --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "maximalt antal vektorer = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "maximalt antal semaforer per vektor = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "maximalt antal semaforer på systemet = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "maximalt antal operationer per semaforopsanrop = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "maxvärde på semafor = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Semaforstatus --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "använda vektorer = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "allokerade semaforer = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Skapare/Ägare av semaforvektorer --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ Semaforoperation/Ändringstider --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "senaste-op"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "senast-ändrad"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Semaforvektorer --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "antsem"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "kärnan är inte konfigurerad för meddelandeköer\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Meddelanden: Gränser --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "maximalt antal köer på hela systemet = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "maximal storlek på meddelande (byte) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "standardmaxstorlek på kö (byte) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Meddelande: Status --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "allokerade köer = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "använda huvuden = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "använt utrymme = %d byte\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ Meddelandeköer: Skapare/Ägare --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "meddköid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 "------ Meddelandeköernas sändnings-/mottagnings-/ändringstider --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "sänt"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "mottaget"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "ändring"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID för meddelandeköer --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Meddelandeköer --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "använda-byte"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "meddelanden"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync misslyckades"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10756,42 +11138,42 @@ msgstr ""
 "\n"
 "Delat minnessegment shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "rättighet=%#o\tåtkomsträttigheter=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, 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:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "attid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "dettid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "ändringstid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync misslyckades"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10800,32 +11182,32 @@ msgstr ""
 "\n"
 "Meddelandekö meddköid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\trättighet=%#o\n"
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr "cbyte=%ld\tqbyte=%ld\tkönum=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "sändningstid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "mottagningstid=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "sökning misslyckades"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10834,157 +11216,180 @@ msgstr ""
 "\n"
 "Semaforvektor semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "rättighet=%#o, åtkomsträttigheter=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "antsem = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otid = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctid = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "värde"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "nräkn"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zräkn"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "ogiltigt id: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s från %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "ogiltigt id"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s är ingen blockspecialenhet"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Kan inte söka på diskenhet"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Ingen"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "RE-fel: "
+msgid "error: cannot open %s"
+msgstr "%s: kan inte öppna %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "fel vid läsning av %s\n"
+msgid "failed to read: %s"
+msgstr "kan inte ta status på %s"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "sökfel"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "Öppning av %s misslyckades"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "Kan inte allokera buffert.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: misslyckades med att öppna: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr "Fel vid stängning av fil\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "minnesallokering misslyckades"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10993,70 +11398,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Tidigare situation:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11065,70 +11483,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "fel vid byte av rättigheter på %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "användning: rdev [ -rv ] [ -o AVSTÅND ] [ BILD [ VÄRDE [ AVSTÅND ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (eller rdev /linux, osv.) visar den aktuella ROT-enheten"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         ställer in ROT till /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              ställer in ROTFLAGGORNA (endast läsbar)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            ställer in RAMDISK-storleken"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              ställer in GRAFIKLÄGET vid uppstart"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   använd byteavstånd N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   samma som rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     samma som rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     samma som rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Obs: grafiklägen är: -3=Fråga, -2=Utökat, -1=NormalVga, 1=nyckel1, "
-"2=nyckel2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      använd -R 1 för att montera roten endast läsbar, -R 0 för läs/skriv."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "komma saknas"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11242,11 +11596,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: gammal prioritet %d, ny prioritet %d\n"
 
-#: sys-utils/rtcwake.c:83
-#, c-format
+#: sys-utils/rtcwake.c:85
+#, fuzzy, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11265,104 +11620,129 @@ msgstr ""
 "    -v | --verbose            informativa meddelanden\n"
 "    -V | --version            visa version\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "läs rtc-tid"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "läs systemtid"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "konvertera rtc-tid"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "ställ in rtc-alarm"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr "aktivera rtc-alarm"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr "ställ in rtc-uppvakningsalarm"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr "%s: okänt väntelägestillstånd \"%s\"\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: otillåtet intervall %s sekunder\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: otillåtet värde för time_t, %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: version %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: antar att RTC använder UTC ...\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Använder %s-tid\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Använder %s-tid\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: måste tillhandahålla uppvakningstid\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "malloc() misslyckades"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s är inte aktiverad för uppvakningshändelser\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "alarm %ld, sys_time %ld, rtc_time %ld, sekunder %u\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr "%s: tiden går inte baklänges till %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s: uppvakning från \"%s\" med %s klockan %s\n"
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s: kan inte byta etikett på %s till %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "rtc läs"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr "inaktivera rtc-alarmavbrott"
 
@@ -11464,6 +11844,11 @@ msgstr "%s: felaktigt värde\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s är ingen lp-enhet.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "LPGETIRQ-fel"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11494,6 +11879,11 @@ msgstr ", inkopplad"
 msgid ", error"
 msgstr ", fel"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: montering misslyckades"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ-fel"
@@ -11539,6 +11929,16 @@ msgid "unshare failed"
 msgstr "sökning misslyckades"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: kan inte ställa in grupp-id: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: kan inte ställa in användar-id: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "körning misslyckades\n"
@@ -12060,6 +12460,231 @@ 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 "%s: illegal option -- %c\n"
+#~ msgstr "%s: otillåten flagga -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "allokerade segment %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "allokerade sidor %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "residenta sidor  %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "utväxlade sidor  %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Växlingsprestanda: %ld försök\t  %ld lyckade försök\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "fel vid körning av finalprog\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Ogiltigt inställt värde: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "nräkn"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Ny"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Användning: fdisk [-b SSZ] [-u] DISK     Ändra partitionstabell\n"
+#~ "            fdisk -l [-b SSZ] [-u] DISK  Lista partitionstabell(er)\n"
+#~ "            fdisk -s PARTITION           Visa partitionsstorlek(ar) i "
+#~ "block\n"
+#~ "            fdisk -v                     Visa fdisks versionsnummer\n"
+#~ "DISK är någonting liknande /dev/hdb eller /dev/sda\n"
+#~ "och PARTITION är någonting liknande /dev/hda7\n"
+#~ "-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"
+
+#~ 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 ""
+#~ "Användning: fdisk [-l] [-b SSZ] [-u] enhet\n"
+#~ "Exempelvis: fdisk /dev/hda  (för den första IDE-disken)\n"
+#~ "     eller: fdisk /dev/sdc  (för den tredje SCSI-disken)\n"
+#~ "     eller: fdisk /dev/eda  (för den första PS/2-ESDI-enheten)\n"
+#~ "     eller: fdisk /dev/rd/c0d0 eller: fdisk /dev/ida/c0d0 (för RAID-"
+#~ "enheter)\n"
+#~ "     ...\n"
+
+#~ 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"
+#~ "Antalet cylindrar för denna disk är satt till %d.\n"
+#~ "Det är inget fel med det, men det är större än 1024, och kan i\n"
+#~ "vissa konfigurationer orsaka problem med:\n"
+#~ "1) programvara som kör under uppstart (exempelvis gamla versioner\n"
+#~ "   av LILO)\n"
+#~ "2) start- och partitioneringsprogramvara från andra operativsystem\n"
+#~ "   (exemeplvis DOS FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: stulen loop=%s ...försöker igen\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "körning misslyckades\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "användning: %s -asmq -tclup\n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h för hjälp.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Resursspecifikation:\n"
+#~ "\t-m : delat minne\n"
+#~ "\t-q : meddelanden\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semaforer\n"
+#~ "\t-a : alla (standard)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Utdataformat:\n"
+#~ "\t-t : tid\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : skapare\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : gränser\n"
+#~ "\t-u : sammanfattning\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "RE-fel: "
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "fel vid läsning av %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "fel vid byte av rättigheter på %s: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "användning: rdev [ -rv ] [ -o AVSTÅND ] [ BILD [ VÄRDE [ AVSTÅND ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (eller rdev /linux, osv.) visar den aktuella ROT-enheten"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         ställer in ROT till /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              ställer in ROTFLAGGORNA (endast läsbar)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            ställer in RAMDISK-storleken"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr ""
+#~ "  rdev -v /dev/fd0 1              ställer in GRAFIKLÄGET vid uppstart"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   använd byteavstånd N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   samma som rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     samma som rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     samma som rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Obs: grafiklägen är: -3=Fråga, -2=Utökat, -1=NormalVga, 1=nyckel1, "
+#~ "2=nyckel2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      använd -R 1 för att montera roten endast läsbar, -R 0 för läs/skriv."
+
+#~ msgid "missing comma"
+#~ msgstr "komma saknas"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "slut på minne"
diff --git a/po/tr.po b/po/tr.po
index 0ebb0eef..88e7a481 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2006-03-06 15:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -108,6 +108,11 @@ msgstr "bölümleme tablosu yeniden okunur"
 msgid "Usage:\n"
 msgstr "Kullanımı:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ sinyal ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -128,6 +133,17 @@ msgstr "Mümkün komutlar:\n"
 msgid "get size in 512-byte sectors"
 msgstr "boyutları bayt cinsinden verir"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s: (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -229,15 +245,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "kullanımı: %s [ -n ] AYGIT\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s: (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -340,7 +347,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "bellek ayrılamadı"
 
@@ -956,7 +963,7 @@ msgstr "%s aygıtının durum bilgisi alınamıyor"
 msgid "%s is not a block special device"
 msgstr "%s bir blok-özel aygıt değil"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "%s açılamıyor"
@@ -980,7 +987,7 @@ msgstr "düğüm sayısı çok fazla - en çok 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "yer yetersiz, en az %lu blok gerekiyor"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Aygıt: %s\n"
@@ -1055,7 +1062,7 @@ 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:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1293,7 +1300,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:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "check_blocks işleminde erişim başarısız"
 
@@ -1377,175 +1384,181 @@ 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:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "ast süreç oluşturulamadı\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Takas başlığı uzunluğu hatalı, bir etiket yazılmamış.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Etiket kısaltıldı.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "bir etiket yok, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "UUID yok\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Kullanımı: %s [-c] [-v0|-v1] [-pSayfaUzunluğu] [-L etiket]\n"
 "                /dev/isim [blokSayısı]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "çok fazla bozuk sayfa var"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Bellek yetersiz"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "1 bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu bozuk sayfa\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "takas alanında başa gidilemiyor"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "düğümler için tampon bellek ayrılamıyor"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "düğümler için tampon bellek ayrılamıyor"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "başlatma sektörü temizlenemiyor"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   BSD disk bölümleme tablosunu gösterir"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   disk etiketinin tamamını gösterir"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   disk etiketinin tamamını gösterir"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: hata: sürüm %d bilinmiyor\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Dosya kapatılırken hata\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, 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:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: hata: %lu aygıtın boyutundan büyük (%lu)\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: hata: takas alanı için en az %ldkB gerekiyor\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: uyarı: takas alanı %ldkB ile sınırlanıyor\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "'%s' üzerinde takas aygıtı oluşturulmayacak"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s bağlı; burada bir dosya sistemi yapılmayacak!"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Takas alanı oluşturulamıyor: okunabilir değil"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Takas alanı sürüm %d, uzunluk = %llu kB olarak ayarlanıyor\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "imza sayfası yazılamıyor"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync hata verdi"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "%s durum bilgileri alınamıyor"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "düğümler yazılamıyor"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s %s olarak değiştirilemiyor: %s\n"
@@ -1608,63 +1621,109 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "servis durdurulurken hata: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Kullanışsız"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "takas alanında başa gidilemiyor"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Boş Alan"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: böyle bir disk bölümü yok\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: hata: sürüm %d bilinmiyor\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: açılamıyor: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: açılamıyor: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: açılamıyor: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: açılamıyor: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: açılamıyor: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "write_tables içinde erişim başarısız"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "Kullanıcı bilgileri değiştirildi.\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Kullanışsız"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Boş Alan"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Disk değiştirildi.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1677,229 +1736,229 @@ msgstr ""
 "değişiklik yaptıysanız, lütfen cfdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ÖLÜMCÜL HATA"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "cfdisk'ten çıkmak için herhangi bir tuşa basınız"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Disk sürücü üzerinde arama yapılamıyor"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Disk sürücüsü okunamıyor"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Disk sürücüsüne yazılamıyor"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Disk bölümü sayısı çok fazla"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Disk bölümü sıfırıncı sektörden önce başlıyor"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Disk bölümü sıfırıncı sektörden önce bitiyor"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Disk bölümü disk sonundan sonra başlıyor"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Disk bölümü disk sonundan sonra bitiyor"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Disk bölümü son kısmî silindir içinde bitiyor"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "mantıksal bölümler sıralamaya uygun değil"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "mantıksal bölümler içiçe geçmiş"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "büyütülen mantıksal bölümler içiçe geçiyor"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 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:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menü öğesi çok uzun. Menü tuhaf görünebilir."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Menü yönsüz. Yatay olarak öntanımlanıyor."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Kuraldışı tuş"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Devam etmek için bir tuşa basınız"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Birincil"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Yeni birincil disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Mantıksal"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Yeni mantıksal disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Bir disk bölümü oluşturulmaz"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! İç hata !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Alan (MB):"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Başlangıç"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 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:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Son"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Disk bölümnü boş alanın sonuna ekler"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Ek disk bölümünü oluşturacak yer yok"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Disk bölümleme tablosu yok.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Disk bölümleme tablosu yok. Boş tablo ile başlanacak."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Disk bölümleme tablosundaki imza kötü"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Disk bölümleme tablosu türü bilinmiyor"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 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:1642
+#: fdisk/cfdisk.c:1524
 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:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Disk açılamıyor"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Açılan disk salt-okunur - yazma izniniz yok"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Diskin toplam alanı hesaplanamıyor"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Birincil disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Mantıksal disk bölümü bozuk"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Uyarı!! Bu işlem disk üzerindeki veriyi yokedebilir!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "Disk bölümleme tablosunun diske yazılmasını gerçekten istiyor musunuz?\n"
 "(evet/hayır ya da yes/no): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "hayır"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazılmadı"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "evet"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Lütfen ya `evet´ ya da `hayır´ yazınız"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Disk bölümleme tablosu diske yazılıyor..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Disk bölümleme tablosu diske yazıldı"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1908,86 +1967,86 @@ msgstr ""
 "Bölümleme tablosu yazıldı ama tablo yeniden okunamadı. Sistemi yeniden "
 "başlatın."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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:1938
+#: fdisk/cfdisk.c:1820
 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:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Dosya ismini girin ya da ENTER tuşuna basın: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "'%s' dosyası açılamıyor"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Sabit Disk: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Sektör 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektör %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Yok    "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Bir/Man"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "  Birincil "
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr " Mantıksal "
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Hiçbiri"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s için Disk Bölümleme Tablosu\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr " Bölüm         İlk          Son              Sektör    Dosya\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1995,7 +2054,7 @@ msgstr ""
 " # Türü       Sektör      Sektör    Başl     Sayısı    Sistemi   Türü    "
 "Flama\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -2003,472 +2062,472 @@ msgstr ""
 "-- -------   --------    --------- ------  ---------  ---------  -----  "
 "------\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         --Başlangıç---      ----Bitiş-----   Başlangıç  Sektör\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, fuzzy
 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:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ----  --------- ---------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Ham"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Tablo temel veri biçemi olarak yazılır"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Sektör"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Tabloyu sektörlere dağılımına göre yazar"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Tablo"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Disk bölümleme tablosunu yazar"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Tablo yazılamıyor"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk Yardım Ekranı"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 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:2290
+#: fdisk/cfdisk.c:2172
 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:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr " "
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Telif Hakkı (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr " Komut       Anlamı"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr " -----       ------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 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:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Seçilen disk bölümünü siler"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Silindir, kafa, sektör/İz parametrelerini değiştirir"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 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:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             kullanılabilir."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 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:2304
+#: fdisk/cfdisk.c:2186
 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:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             uyumsuzluk oluşturabilir."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Boş alanda yeni bir disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr ""
 "             Disk bölümleme tablosunu farklı biçemlerde elde edebilirsiniz."
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             Bu biçemler:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Temel veri (verinin diske yazılan biçemi)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Disk bölümlerinin sektörlere dağılımını gösterir"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Geleneksel disk bölümleme tablosu"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 "  q          Disk bölümleme tablosu diskteki yerine kaydedilmeden çıkılır"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Dosya sistemi türünü değiştirir"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Disk bölümü boyunun birimini değiştirir"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, sektör, silindir birimleri sırayla yer değiştirir"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Diskteki veriyi yanlışlıkla kaybetmemek için "
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 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:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             yazdırmayacağınıza kesin karar verebilirsiniz"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 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:2322
+#: fdisk/cfdisk.c:2204
 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:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Ekranı tazeler"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Bu yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "olarak kullanabilirsiniz."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Silindir"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Silindir geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Kafa"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Kafa geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Sektör geometrisini değiştirir"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Tamam"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Geometri değişikliği yapıldı"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Silindir sayısını verin: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Silindir sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Kafa sayısını verin: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Kafa sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "sektör/iz sayısını verin: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "sektör sayısı kuraldışı"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Dosya sistemi türünü verin: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Dosya sistemi türü boş olarak değiştirilemez"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Dosya sistemi türü ek olarak değiştirilemez"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Ne?(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Bir/Man"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Bilinmeyen (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Sabit Disk: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Boyut: %lld bayt, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Boyut: %lld bayt, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Kafa: %d        Sektör/İz: %d       Silindir: %lld  "
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "İsim"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Flama"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Bölüm Türü"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "DS Türü"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Etiket]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "   Sektör  "
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Silindir"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Boy (MB) "
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Boy (GB) "
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Açılış"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 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:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Sil"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Seçilen disk bölümünü kaldırır"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Geometri"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Disk geometrisini değiştirir (uzmanlar için)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Yardım"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Yardım ekranını gösterir"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Sığdır"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 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:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Yeni"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Boş alanda yeni bir disk bölümü oluşturur"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Yaz"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 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:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Çık"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Disk bölümleme tablosunu diske kaydetmeden çıkar"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Türü"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 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:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Birim"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 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:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Kaydet"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 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:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "Bu disk bölümüne açılış kaydı yapılamaz"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Bir boş disk bölümü silinemez"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Bu disk bölümü sığdırılamıyor"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Bu disk bölümü kullanışsız"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Bu disk bölümü zaten kullanımda"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 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:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Başka disk bölümü yok"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Kuraldışı komut"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Telif Hakkı © 1994-2002 Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2540,9 +2599,9 @@ msgstr ""
 "\n"
 "Aygıt için BSD disk etiketi: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr " Komut  yaptığı iş "
 
@@ -2562,9 +2621,9 @@ msgstr "   i   önyükleyici kurar"
 msgid "   l   list known filesystem types"
 msgstr "   l   bilinen dosya sistemi türlerini listeler"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   bu menüyü gösterir"
 
@@ -2576,14 +2635,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:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   değişiklikleri kaydetmeden çıkar"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   ana menüye döner"
 
@@ -2626,13 +2685,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:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "İlk %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Son %s, +size, +sizeM veya +sizeK"
@@ -2777,7 +2836,7 @@ msgstr "sektör/iz"
 msgid "tracks/cylinder"
 msgstr "iz/silindir"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "silindir"
@@ -2835,7 +2894,7 @@ msgstr "%s üzerine önyükleyici kuruldu.\n"
 msgid "Partition (a-%c): "
 msgstr "Disk bölümü (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Oluşturulabilecek disk bölümlerinin tümü oluşturuldu\n"
@@ -2859,229 +2918,208 @@ msgstr ""
 "\n"
 "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:257
 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"
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
 msgstr ""
-"Kullanımı:\n"
-"    fdisk [-b SktUz] [-u] DiSK    Disk bölümleme tablosunu değiştirir\n"
-"    fdisk -l [-b SktUz] [-u] DiSK Disk bölümleme tablosunu listeler\n"
-"    fdisk -s BÖLÜM                Bölüm uzunluklarını blok cinsinden verir\n"
-"    fdisk -v                      fdisk sürüm bilgilerini gösterir\n"
-"Burada:\n"
-"DiSK /dev/hdb veya /dev/sda gibi ve\n"
-"BÖLÜM /dev/hdb7 gibi verilir.\n"
-"-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:260
-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 ""
-"Kullanımı: fdisk [-l] [-b Skt] [-u] aygıt\n"
-"  Örneğin:\n"
-"   fdisk /dev/hda  (ilk IDE disk)\n"
-"   fdisk /dev/sdc  (üçüncü SCSI disk)\n"
-"   fdisk /dev/eda  (ilk PS/2 ESDI aygıtı)\n"
-"   fdisk /dev/rd/c0d0  veya\n"
-"   fdisk /dev/ida/c0d0  (RAID aygıtları)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s okunamıyor\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s üzerinde erişim olanaksız\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s yazılamıyor\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s üzerinde BLKGETSIZE ioctl hata verdi\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Daha fazla bellek ayrılamıyor\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Ölümcül Hata\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   salt-okunur flamasını kaldırır/indirir"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd disk etiketini düzenler"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   bağlanabilir flamasını kaldırır/indirir"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   bir disk bölümünü siler"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   bilinen disk bölümü türlerini listeler"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   yeni bir disk bölümü ekler"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   yeni bir DOS disk bölümü oluşturur"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   disk bölümleme tablosunu gösterir"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   yeni bir Sun disk etiketi oluşturur"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 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:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   gösterme/girdi birimini değiştirir"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   disk bölümleme tablosunu doğrular"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   tabloyu diskteki yerine yazar ve çıkar"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   fazladan işlevsellik (uzmanlar için)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   açılış disk bölümünü seçer"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   açılış dosyası girdilerini düzenler"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi takas bölümü seçilir"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   açılış flamasını indirir/kaldırır"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos uyumluluk flamasını indirir/kaldırır"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   almaşık silindirlerin sayısını değiştirir"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   silindir sayısını değiştirir"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   disk bölümleme tablosunun temel verisini gösterir"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   silindir başına fazladan sektör sayısını değiştirir"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   kafa sayısını değiştirir"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   serpiştirme etkenini değiştirir"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   devir sayısını değiştirir (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   sektör/iz sayısını değiştirir"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   fiziksel silindir sayısını değiştirir"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 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:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   ek disk bölümlerini listeler"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   IRIX (SGI) disk bölümleme tablosu oluşturur"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   disk bölümleme sırasını düzeltir"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u   gösterme/girdi birimini değiştirir"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Belirtilmeli"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "kafa"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3090,30 +3128,11 @@ msgstr ""
 "%s%s.\n"
 "Bunu fazladan işlevler menüsünden yapabilirsiniz.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " ve "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Bu disk için silindir sayısı %d olarak belirlendi.\n"
-"Yanlış bir şey yok fakat 1024 silindirden büyük değerlerle\n"
-"bazı yazılımlar sorun çıkabilir:\n"
-"1) önyükleme sırasında çalışan yazılımlar (örn. LILO'nun eski sürümleri)\n"
-"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:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3124,38 +3143,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Birincil ek disk bölümünde hizalama hatalı\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3164,32 +3182,32 @@ msgstr ""
 "Uyarı: %d. bölümden sonrakiler atlanıyor.\n"
 "Bu bölümleme tablosunu kaydederseniz, bunlar silinmiş olacak.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, 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:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Uyarı: boş disk bölümü\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3201,26 +3219,17 @@ msgstr ""
 "değişiklikler\n"
 "bellekte bekleyecek. Aksi takdirde, önceki içerik kurtarılamayacak.\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, 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:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3229,7 +3238,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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3238,17 +3247,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:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "İç hata\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Fazladan ek disk bölümü %d yoksayılıyor\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3257,7 +3266,7 @@ msgstr ""
 "Uyarı: geçersiz bayrak 0x%04x %d. disk bölümleme tablosunda w(yaz) ile "
 "düzeltilmiş olacak\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3266,95 +3275,100 @@ msgstr ""
 "\n"
 "Dosya sonuna rastlandı - çıkılıyor..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Onaltılık kod (kod listesi için L tuşlayın):"
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, öntanımlı %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Öntanımlı değer %u kullanılıyor\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Değer kapsamdışı.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Disk bölümü numarası"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, 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:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Seçilen disk bölümü %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Tanımlı bir disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, 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:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "silindir"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "sektör"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "gösterme/girdi birimi %s olarak değiştiriliyor\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "gösterme/girdi birimi %s olarak değiştiriliyor\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, 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:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "DOS uyumluluk flaması etkin\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS uyumluluk flaması etkin değil\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "%d disk bölümü henüz yok!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3367,7 +3381,7 @@ msgstr ""
 "muhtemelen pek uygun olmayacaktır. 'd' komutunu\n"
 "kullanarak bir disk bölümünü silebilirsiniz.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3376,7 +3390,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:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3386,7 +3400,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:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3396,64 +3410,64 @@ 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:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "%d disk bölümünün sistem türü %x (%s) olarak değiştirildi\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " fiziksel=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "mantıksal=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, 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:1790
+#: fdisk/fdisk.c:1860
 #, 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:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) olmalıydı\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) olmalıydı\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "%i disk bölümünün başlangıcı silindir sınırları dışında:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3462,7 +3476,7 @@ msgstr ""
 "\n"
 "Disk %s: %ld MB %lld bayt\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3471,34 +3485,39 @@ msgstr ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bayt\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d kafa, %d sektör/iz, %d silindir"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", toplam %llu sektör"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 "Birimler = %s / %d * %d = %d bayt\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "düğüm sayısı hatalı"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3507,14 +3526,14 @@ msgstr ""
 "Hiçbir şey yapılmadı. Sıralama zaten doğru.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Bitti\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3525,16 +3544,16 @@ msgstr ""
 "Galiba yanlış aygıt seçtiniz.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, 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:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Aygıt"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3543,7 +3562,7 @@ msgstr ""
 "\n"
 "Disk bölümleme tablosu girdileri diskteki sırasında değil\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3554,92 +3573,92 @@ msgstr ""
 "Disk %s: %d kafa, %d sektör, %d silindir\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, 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:2120
+#: fdisk/fdisk.c:2192
 #, 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:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\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:2129
+#: fdisk/fdisk.c:2201
 #, 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:2133
+#: fdisk/fdisk.c:2205
 #, 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:2167
+#: fdisk/fdisk.c:2239
 #, 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:2175
+#: fdisk/fdisk.c:2247
 #, 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:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Uyarı: %d disk bölümü boş\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 "Tahsis edilen sektör sayısı %d en fazla olması gereken %lld değerinden "
 "büyük\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld sektör kullanılmamış\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Boşta sektör yok\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3652,7 +3671,7 @@ 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:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3665,23 +3684,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:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Tüm mantıksal bölümler kullanımda\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Bir birincil disk bölümü ekleniyor\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3692,20 +3711,20 @@ msgstr ""
 "   %s\n"
 "   p   birincil disk bölümü (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   mantıksal (5 veya üzeri)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   ek"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, 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:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3714,12 +3733,12 @@ msgstr ""
 "Disk bölümleme tablosu zaten değişmişti!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, 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:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3732,7 +3751,7 @@ msgstr ""
 "Çekirdek hala eski tabloyu kullanıyor.\n"
 "Yeni tablo makinayı yeniden başlattığınızda geçerli olacak.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3745,7 +3764,7 @@ msgstr ""
 "değişiklik yaptıysanız, lütfen fdisk man sayfalarındaki\n"
 "ek bilgileri okuyun.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3754,42 +3773,42 @@ msgstr ""
 "\n"
 "Dosya kapatılırken hata\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, 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:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Yeni veri başlangıcı"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Uzman komutları (yardım için m): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Silindir sayısı"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Kafa sayısı"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Sektör sayısı"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, 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:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3798,33 +3817,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: komut bilinmiyor\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, 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:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3833,17 +3852,17 @@ msgstr ""
 "Uyarı: -b (sektör uzunluğu ayarı) seçeneği tek aygıt ile kullanılmış "
 "olmalıydı\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Komut (yardım için m): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3852,16 +3871,16 @@ msgstr ""
 "\n"
 "Şu anki önyükleme dosyası: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Lütfen yeni açılış dosyasının ismini giriniz:"
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Açılış dosyası değiştirilmedi\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3954,15 +3973,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux takas"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux doğal"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4097,7 +4116,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Birden fazla tüm disk girdisi var.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Atanmış disk bölümü yok\n"
@@ -4201,7 +4220,7 @@ 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:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "EVET\n"
 
@@ -4263,7 +4282,7 @@ msgstr ""
 "diskte bulunan tüm bilgiyi bir daha geri alamamak üzere\n"
 "kaybedeceksiniz.\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4284,58 +4303,58 @@ 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:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS takas"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Tüm disk"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%lld sektör kullanılmamış\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid otosaptama"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4348,22 +4367,22 @@ msgstr ""
 "belirlemeniz ya da baştan bir temiz etiket (ana menüden s komutu ile)\n"
 "oluşturmanız gerekebilecek.\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Yanlış sağlama toplamı veren sgi disk etiketi saptandı.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Yanlış sağlama toplamı veren sgi disk etiketi saptandı.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Yanlış sağlama toplamı veren sgi disk etiketi saptandı.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4371,7 +4390,7 @@ msgstr ""
 "Uyarı: geçersiz bayrak 0x%04x %d. disk bölümleme tablosunda w(yaz) ile "
 "düzeltilmiş olacak\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4384,31 +4403,31 @@ msgstr ""
 "diskte bulunan tüm bilgiyi bir daha geri alamamak üzere\n"
 "kaybedeceksiniz.\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Sektör/iz"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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:371
+#: fdisk/fdisksunlabel.c:366
 #, 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:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Kullanılmamış boşluk - 0-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kullanılmamış boşluk - %d-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4418,7 +4437,7 @@ msgstr ""
 "Tekrar denemeden önce bazılarını silmeniz ya da\n"
 "küçültmeniz gerek.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4427,12 +4446,12 @@ msgstr ""
 "Onbirinci disk bölümünün tüm diski kapsaması ve `SGI volume'\n"
 "türünde olması tavsiye edilir.\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4443,7 +4462,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:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4452,7 +4471,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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4466,12 +4485,12 @@ msgstr ""
 "82 etiketli (Linux takas) olmasını istediğinizden eminseniz lütfen\n"
 "EVET yazınız: "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4486,11 +4505,11 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4499,28 +4518,28 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flama Başlangıç    Bitiş   Blok#   Kiml Sistem\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Almaşık silindirlerin sayısı"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Silindir başına fazladan sektörler"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Serpiştirme etkeni"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Devir sayısı (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Fiziksel silindirlerin sayısı"
 
@@ -4729,6 +4748,10 @@ msgstr "Minix / eski Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux takas / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 gizli C: aygıtı"
@@ -5370,93 +5393,93 @@ msgstr "-n flaması verilmiş: Hiçbir şey değişmedi\n"
 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:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, 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:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "uzun ve eksik girdi satırı - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "girdi hatası: %s alanından sonra bir `=' gerekli\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, 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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "anlaşılmayan girdi: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "sayı çok büyük\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "sayıdan sonrasında süprüntü\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "disk bölümü betimleyici için yer yok\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "kuşatan ek disk bölümü kurgulanamıyor\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "girdi alanları çok fazla\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Daha fazla yer yok\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Kuraldışı tür\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, 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:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Uyarı: boş disk bölümü\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, 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:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "anlaşılmayan önyükleme flaması; - ya da * seçiniz\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "kısmi sld,kafa,sekt özellikleri?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Ek disk bölümü gereken yerde değil\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "girdi hatalı\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "çok fazla disk bölümü var\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5469,42 +5492,42 @@ msgstr ""
 "Genellikle <başlangıç> ve <uzunluk> değerleri (ve tabii ki <türü>)\n"
 "belirtmek yeterlidir.\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "aygıt: /dev/hda veya /dev/sda gibi"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "kullanışlı seçenekler:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s  --show-size     disk bölümü uzunlukları listelenir"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 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:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l  --list          aygıtların disk bölümlerini listeler"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 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:2296
+#: fdisk/sfdisk.c:2301
 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:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
@@ -5512,53 +5535,53 @@ msgstr ""
 "    -uS, -uB, -uC, -uM  sektör/blok/silindir/MB birimleriyle değer alır/"
 "gösterir"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 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:2299
+#: fdisk/sfdisk.c:2304
 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:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R  --re-read       çekirdek yeniden okuma tablosu yapar"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N#                 sadece # numaralı disk alanı değiştirilir"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n                  gerçekte diske yazılmaz"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 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:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I dosya            sektörleri bu dosyadan tekrar oluşturur"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v  --version       sürüm bilgilerini gösterir"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -?  --help          bu yardım iletisini gösterir ve çıkar"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "tehlikeli seçenekler:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 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:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5566,7 +5589,7 @@ msgstr ""
 "    -G [veya --show-pt-geometry]: bölümleme tablosundan alınan geometriyi "
 "basar"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5574,64 +5597,64 @@ msgstr ""
 "    -x  --show-extended ek disk bölümlerini gösterir ve\n"
 "                        betimleyicileri için girdi bekler"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 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:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  --quiet         uyarıları engeller"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "Saptanan geometriyi aşmak için seçenekler:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C#  --cylinders #  kullanılacak silindir sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H#  --heads #      kulanılacak kafa sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S#  --sectors #    kullanılacak sektör sayısı belirtilir"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Kararlılık denetimlerini etkisizleştirme seçenekleri:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Kullanımı:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5640,67 +5663,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Tüm denetimleri kaldırmak için --force seçeneğini kullanın.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "Komut?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "toplam: %llu blok\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 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:2667
+#: fdisk/sfdisk.c:2672
 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:2669
+#: fdisk/sfdisk.c:2674
 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:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s oku-yaz açılamıyor\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s okumak için açılamıyor\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: TAMAM\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "%s gibi bir boyut alınamıyor\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "hatalı etkin bayt: 0x80 yerine 0x%x\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5708,7 +5731,7 @@ msgstr ""
 "Bitti\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5717,35 +5740,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:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Kimlik %lx hatalı\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Bu disk şu an kullanılıyor.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ölümcül hata: %s bulunamıyor\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Uyarı: %s bir blok aygıtı değil\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Diskin kullanımda olup olmadığı denetleniyor...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5758,30 +5781,30 @@ msgstr ""
 "alanlarını swapoff ile kapatın. --no-reread bayrağını kullanarak\n"
 "yeniden okuma işlemini engelleyin.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 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:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "TAMAM\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Eski durum:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, 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:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Yeni durum:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5789,21 +5812,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:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bundan memnun musunuz? [ehs] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bunu diske yazmak ister misiniz? [ehs] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5812,16 +5835,16 @@ msgstr ""
 "\n"
 "sfdisk: girdi sonu eksik\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Çıkılıyor - Değişiklik yok\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, 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:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5830,7 +5853,7 @@ msgstr ""
 "Yeni disk bölümleme tablosu başarıyla yazıldı\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5842,17 +5865,17 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(daha fazla bilgi için: fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: %s açılamıyor: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5860,117 +5883,117 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: yok"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: sıkıştırma açılırken hata %d! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: dosya sistemi türünü belirtmelisiniz"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s bir lp aygıtı değil.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "%s için dosya sistemi denetimi şart.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "Kullanımı: mkfs [-V] [-t dsySistTürü] [dsySist-seçenekleri] aygıt [uzunluk]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s bir lp aygıtı değil.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "%s açılamıyor: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s sistemden ayrıldı\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Kalan dosya istemleri ayrılıyor..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: bilinmeyen argüman: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%2$s deki %1$s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Düğümler için tampon bellek ayrılamıyor"
@@ -6471,7 +6494,13 @@ msgstr "Kullanılabilir bir saat arayüzü yok.\n"
 msgid "Unable to set system clock.\n"
 msgstr "Sistem saati ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6483,17 +6512,17 @@ msgstr ""
 "değeri saklar.\n"
 "hwclock'un bu kopyası bir Alpha için derlenmemiş. Bir şey yapılmadı.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6502,22 +6531,22 @@ msgstr ""
 "Dönemsellik değerinin ayarlanabilmesi için, ayarlanacak değeri 'epoch' "
 "seçeneği ile vermelisiniz.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%2$s deki %1$s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6536,6 +6565,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6584,7 +6614,7 @@ msgstr ""
 "  --noadjfile   /etc/adjtime okunmaz. Ya --utc ya da --localtime kullanmak\n"
 "                gerekir.\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6595,17 +6625,17 @@ msgstr ""
 "                Alpha'nızın hwclock türü belirtilir\n"
 "               (hwclock(8) man sayfasına bakınız)\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "Sistem saati ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6614,7 +6644,7 @@ msgstr ""
 "Çok sayıda işlev belirttiniz.\n"
 "Bir defada sadece bir işlev uygulanabilir.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6623,7 +6653,7 @@ msgstr ""
 "%s: --utc ve --localtime seçenekleri birbiriyle çelişiyor.  İkisi de "
 "belirtilmiş.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6632,7 +6662,7 @@ msgstr ""
 "%s:  --adjust ve --noadjfile seçenekleri birbiriyle çelişir.\n"
 "Siz ikisini de belirtmişsiniz.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6641,27 +6671,27 @@ msgstr ""
 "%s:  --adjust ve --noadjfile seçenekleri birbiriyle çelişir.\n"
 "Siz ikisini de belirtmişsiniz.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Zaman ayarlama kullanımdışı.  Saat ayarlanamaz.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6670,12 +6700,12 @@ msgstr ""
 "Çekirdekteki Donanım Saati dönemsellik değeri sadece root tarafından "
 "değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6968,12 +6998,12 @@ msgstr "%s: /etc/passwd için öntanımlı bağlam belirtilemiyor"
 msgid "Changing finger information for %s.\n"
 msgstr "%s için kullanıcı bilgileri değiştiriliyor.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: PAM hatası, çıkılıyor: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7200,35 +7230,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ÖLÜMCÜL: tty tekrar açılamıyor: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s bir blok-özel aygıt değil"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "ÖLÜMCÜL: tty hatalı"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h sadece root tarafından kullanılabilir.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "Kullanımı: login [-fp] [kullanıcı]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM başlatılamadı: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "Kullanıcı ismi: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, 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:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7237,17 +7272,17 @@ msgstr ""
 "Giriş başarısız\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, 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:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7256,7 +7291,7 @@ msgstr ""
 "\n"
 "Giriş başarısız\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7265,121 +7300,121 @@ msgstr ""
 "\n"
 "Oturum ayarları sorunu, çıkılıyor.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, 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:694
+#: login-utils/login.c:698
 #, 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:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Bellek yetersiz\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Kullanıcı ismi kuraldışı"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s için bu terminalden giriş reddedildi.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, 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:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s İÇİN %s TERMİNALİNE GİRİŞ REDDEDİLDİ"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Giriş başarısız\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "%s ÜZERİNDEN %s İSMİYLE DIALUP"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s ÜZERİNDEN %s MAKİNASINA ROOT GİRİŞİ"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s ÜZERİNDE ROOT GİRİŞİ"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s ÜZERİNDEN %s, %s MAKİNASINA GİRDİ"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s ÜZERİNDEN %s SİSTEME GİRDİ"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Yeni e-postanız var.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "E-postanız var.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: ast süreç oluşturma başarısız: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY başarısız: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() başarısız"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "%s dizini yok!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Ev dizini \"/\" ile giriş.\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: kabuk betiği için bellek yetersiz.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, 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:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: kabuk yok: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7388,65 +7423,65 @@ msgstr ""
 "\n"
 "%s kullanıcı ismi: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "Kullanıcı adınız çok uzun.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "İSİM çok uzun"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "kullanıcı isimleri bir '-' ile başlayamaz.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "çok fazla boş geçildi.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "HADDİNDEN FAZLA boş giriş"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, 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:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Son giriş: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "sularında %.*s makinasına yapıldı\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "sularında %.*s konsoluna yapıldı\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s MAKİNASINDAN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ÜZERİNDEN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, 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:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%3$s %2$s ÜZERİNDEN %1$d KERE GİREMEDİ"
@@ -7703,7 +7738,7 @@ msgstr "Ya TERM boş ya da tty durum bilgileri alınamıyor\n"
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "servis durdurulurken hata: \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7713,8 +7748,8 @@ msgstr "servis durdurulurken hata: \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "uç uygulama çalıştırılırken hata\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "servis durdurulurken hata: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7841,25 +7876,25 @@ msgstr "%s: geçici dosya durum bilgileri alınamıyor.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: geçici dosya okunamıyor.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "yıl değeri kuraldışı: 1-9999 arasında olmalı"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "ay numarası kuraldışı: 1..12 arasında olmalı"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "yıl değeri kuraldışı: 1-9999 arasında olmalı"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "kullanımı: cal [-13smjyV] [[ay] yıl]\n"
@@ -7883,6 +7918,113 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "%s açılamıyor"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Bilinmeyen komut: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "Tampon ayrılamadı.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "Tampon ayrılamadı.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: %s okunamıyor.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s üzerinde yazma hatası\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "Kullanıcı bilgileri değiştirildi.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "%s dizini yok!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "Tampon ayrılamadı.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "Tampon ayrılamadı.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "Tampon ayrılamadı.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "Tampon ayrılamadı.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8037,7 +8179,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:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8048,37 +8190,37 @@ msgstr ""
 "Gerçekten kullanmak istiyorsanız `%s [seçenekler] %s' ile kullanın.\n"
 "Betik başlatılmadı.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "kullanımı: script [-a] [-f] [-q] [-t] [dosya]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Betik başlatıldı, dosyası %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s üzerinde yazma hatası\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "%s de betik başlatıldı"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s üzerinde yazma hatası\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: %s için aygıt ismi bulunamıyor\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8087,17 +8229,17 @@ msgstr ""
 "\n"
 "%s üzerinde betik tamamlandı"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Betik tamamlandı, dosyası %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty başarısız\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "pty sayısı yetersiz\n"
@@ -8443,6 +8585,16 @@ msgstr "%c okundu\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: açılamıyor: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "%s durum bilgileri alınamıyor"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8473,6 +8625,11 @@ msgstr "%s okunurken hata\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "kimlik geçersiz"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8490,7 +8647,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8510,12 +8667,12 @@ msgstr "%s için kip değiştirilirken hata: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8543,83 +8700,83 @@ msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dizin ... -f ] isim...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "bellek ayrılamadı"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "%s açılamadı"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
+"\n"
+"Dosya kapatılırken hata\n"
+
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "%s diski geçerli bir disk bölümleme tablosu içermiyor\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: açılamıyor: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "openpty başarısız\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "bayt"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty başarısız\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Ayar değeri geçersiz: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8865,7 +9022,7 @@ msgstr "loop: %s aygıtı silinemiyor: %s\n"
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Bu mount loop desteği olmaksızın derlenmiş. Lütfen yeniden derleyin.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8886,7 +9043,7 @@ msgstr ""
 "kullanılmamışlar\n"
 "  %s [ -e şifreleme ] [ -o konum ] {-f|loop_aygıtı} dosya # ayarlama\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8902,248 +9059,292 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Ayar değeri geçersiz: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Ayar değeri geçersiz: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: aygıt meşgul"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Derleme sırasında loop desteği verilmemiş. Lütfen yeniden derleyin.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: %s  %s ya da %s içinde bulunamıyor"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: mtab'a göre, %s %s üzerinde bağlı"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s yazmak için açılamıyor: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s yazılırken hata: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: %s kipi değiştirilirken hata: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: ast süreç oluşturulamıyor: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "%s deneniyor\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: %s için bir dosya sistemi türü belirtilmemiş\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       %s ya da %s içindeki anılan tüm türler denenecek\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       ve bu takas alanı gibi görünüyor\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       %s türü denenecek\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s takas alanı gibi görünüyor - bağlanmadı"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "mount başarısız"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: %s %s üzerinde sadece root tarafından bağlanabilir"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: loop aygıtı iki kere belirtilmiş"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: türü iki defa belirtilmiş"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: loop aygıtı ayarları atlanıyor\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Ayar değeri geçersiz: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Ayar değeri geçersiz: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: %s loop aygıtının kullanımına gidiliyor\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop aygıtı ayarları yapılamadı\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop aygıtı ayarları tamamlandı\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s yok - oluşturuluyor...\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s açılamıyor: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: -p ve --pass-fd seçeneklerinin argümanı bir sayı olmalıdır"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: hızı ayarlamak için %s açılamıyor"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: mtab'a göre, %s zaten %s üzerinde bağlı"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s meşgul- salt-okunur olarak yeniden bağlandı\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s meşgul- salt-okunur olarak yeniden bağlandı\n"
+
+#: mount/mount.c:1482
 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:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: dosya sistemi türünü belirtmelisiniz"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: bağlanamadı"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: bağlama noktası %s bir dizin değil"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: erişim engellendi"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: root tarafından kullanılmalı"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s meşgul"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc zaten bağlı"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, 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:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: bağlama noktası %s yok"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: özel aygıt %s yok"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9152,12 +9353,12 @@ msgstr ""
 "mount: özel aygıt %s yok\n"
 "       (dosya yolu öneki bir dizin değil)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, 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:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9166,13 +9367,13 @@ 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:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9180,7 +9381,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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9188,7 +9389,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:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9196,112 +9397,107 @@ msgstr ""
 "       Bazı durumlarda syslog'da bulunan bilgiler yararlıdır.\n"
 "       dmesg | tail  gibi birşeyler deneyin\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "bağ tablosu dolu"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok okunamıyor"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: aygıt bilinmiyor"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: dosya sistemi türü '%s' bilinmiyor"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: herhalde %s kastettiniz"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: 'iso9660' kastetmiş olabilir misiniz?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: 'vfat' kastetmiş olabilir misiniz?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, 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"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: çekirdek %s aygıtını bir blok aygıtı olarak tanımıyor\n"
 "       (`insmod sürücü' denenebilir?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s bir blok aygıtı değil"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s geçerli bir blok aygıtı değil"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "blok aygıtı "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: %s%s salt-okunur bağlanamıyor"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, 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:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: %s%s salt-okunur bağlanamıyor"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, 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:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: %s yok - oluşturuluyor...\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s zaten %s üzerinde bağlı\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9311,22 +9507,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, 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:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: tür belirtilmemiş - '//' öneki içerdiğinden cifs varsayılıyor\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s zaten %s üzerinde bağlı\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9389,39 +9585,39 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 "Daha fazla bilgi edinmek için 'man 8 mount' yazabilirsiniz.\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: bunu sadece root yapabilir"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: bunu sadece root yapabilir"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "hiçbir şey bağlanmadı"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: böyle bir disk bölümü yok"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s  %s ya da %s içinde bulunamıyor"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: uyarı: %s dosyasının sonunda son bir satırsonu gerekli\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: %d satırı %s dosyasında hatalı%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; dosyanın kalanı yoksayıldı"
 
@@ -9434,7 +9630,7 @@ msgstr "xstrndup çağrısında yazılım hatası"
 msgid "not enough memory"
 msgstr "yeterli bellek yok"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9445,7 +9641,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9458,7 +9654,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9470,127 +9666,132 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: %s doyasında beklenmedik dosya sonu\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "ast süreç oluşturulamadı\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "çalıştırma başarısız\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() başarısız"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "%s açılamadı"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "İsim"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: %s atlanıyor - bazı delikler içeriyor gibi görünüyor.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s %s üzerinde\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: %s için aygıt ismi bulunamıyor\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "root değil.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9600,37 +9801,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: -f için destek içermeksizin derlenmiş\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: ast süreç oluşturulamıyor: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: blok aygıtı geçersiz"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: bağlanmadı"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: superblok yazılamıyor"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9638,51 +9839,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: yok"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: bağı kaldırmak için root gerekli"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dosya sisteminde blok aygıtlara izin yok"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "umount2 yok, umount deneniyor...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, 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:263
+#: mount/umount.c:269
 #, 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:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s sistemden ayrıldı\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ayrılacak dosya sistemlerinin listesi bulunamıyor"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9708,80 +9909,85 @@ msgstr ""
 "Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz\n"
 "Daha fazla bilgi edinmek için 'man 8 umount' yazınız.\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "\"\" ayrılamaz\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "%s sistemden ayrılmaya çalışılıyor\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab içinde %s bulunamadı\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, 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:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s defalarca bağlanmış görünüyor"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s bağı fstab ile çelişiyor"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, 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:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: bu sadece root tarafından yapılabilir"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9789,77 +9995,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's new scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:106
+#, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "bilinmeyen"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "TCP üzerinden NFS desteklenmiyor.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: açılamıyor: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "nsayısı"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Yeni"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() %s den zamanı okuyamadı"
@@ -9882,7 +10107,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9911,11 +10136,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "çalıştırma başarısız\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "kullanımı: %s program [arg ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "Kullanıcı bilgileri değiştirildi.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "%s uzunluğu alınamıyor"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "bellek ayrılamadı"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "%s disk bölümüne yazarken hata oluştu\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: açılamıyor: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "%s disk bölümüne yazarken hata oluştu\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "erişim hatası"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "erişim hatası"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " ve "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10061,7 +10394,15 @@ msgstr "   %f kesme/sec; %f kayıt (karkt/s)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Kullanımı: %s [-c] [-n seviye] [-s tamponBoyu]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10070,38 +10411,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Çok fazla argüman belirtildi.\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Ayar değeri geçersiz: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Ayar değeri geçersiz: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "--date seçeneği belirtilmemiş.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "azami bölüt sayısı = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty başarısız\n"
@@ -10148,6 +10494,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "ast süreç oluşturulamadı\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "Kullanıcı bilgileri değiştirildi.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "--date seçeneği belirtilmemiş.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "--date seçeneği belirtilmemiş.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "erişim başarısız"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "kök düğümü bir dizin değil"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "openpty başarısız\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "openpty başarısız\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10243,476 +10642,451 @@ msgstr ""
 "kullanımı: %s [ [-q msqkiml] [-m shmkiml] [-s semkiml]\n"
 "              [-Q msganh] [-M shmanh] [-S semanh] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: kuraldışı seçenek -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: kuraldışı tuş (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "anahtar için erişim engellendi"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "anahtar zaten silinmiş"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "anahtar geçersiz"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "anahtarda bilinmeyen hata"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "kimlik için izinler yetersiz"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "kimlik geçersiz"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "kimlik zaten silinmiş"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "kimlikte bilinmeyen hata"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: bilinmeyen argüman: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "kullanımı: %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "           %s [-s -m -q] -i kimlik\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "           %s -h yardım almak için.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
-msgstr "%s okuma erişiminiz olan ipc yetenekleri hakkında bilgi sağlar.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Özkaynak özellikleri:\n"
-"\t-m : paylaşımlı bellek\n"
-"\t-q : iletiler\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
-msgstr ""
-"\t-s : semaforlar\n"
-"\t-a : tümü (öntanımlı)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
+msgstr "%s okuma erişiminiz olan ipc yetenekleri hakkında bilgi sağlar.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
-"Çıktı biçemi:\n"
-"\t-t : zaman\n"
-"\t-p : pid\n"
-"\t-c : oluşturan\n"
+"-i kimlik [-s -q -m] : kimlik ile belirtilen özkaynak hakkında bilgi verir\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : sınırlar\n"
-"\t-u : özet\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
-"-i kimlik [-s -q -m] : kimlik ile belirtilen özkaynak hakkında bilgi verir\n"
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "çekirdek paylaşımlı bellek için yapılandırılmamış\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- Paylaşımlı Bellek Sınırları ----\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "azami bölüt sayısı = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "azami bölüt boyu (kb) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "azami toplam paylaşımlı bellek (sayfa) = %lu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "asgari bölüt boyu (bayt) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "----- Paylaşımlı Bellek Durumu -----\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "ayrılmış bölüt sayısı %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "ayrılmış sayfa sayısı  %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "bulunan sayfa sayısı   %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "takaslı sayfa sayısı   %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Takas verimi: %ld deneme\t %ld başarı\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "--- Paylaşımlı Bellek Bölüt Oluşturucuları/Kendileri ---\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "izinler"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "ckullkiml"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgkiml"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "kullkim"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gkiml"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "---- Paylaşımlı Bellek Ekleme/Ayırma/Değişiklik Zamanları ----\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "sahibi"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "ekleme"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "ayırma"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "değişiklik"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "---- Paylaşımlı Bellek Oluşturucu/Son işlem ----\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "----- Paylaşımlı Bellek Bölütleri -----\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "anahtar"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "bayt"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "ekSayısı"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "durum"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Belirlenmedi"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "hedef"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "kilitli"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "çekirdek semaforlar için yapılandırılmamış\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Semafor Sınırları --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "azami dizi sayısı = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "dizi başına azami semafor sayısı = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "tüm sistemdeki azami semafor sayısı = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "semop çağrısı başına azami işlem sayısı = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "semafor azami değeri = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Semafor Durumu --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "kullanılan dizi sayısı = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "ayrılmış semafor sayısı = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Semafor Dizileri Oluşturucu/Kendi --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semkiml"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "---- Paylaşımlı Bellek İşlem/Değişiklik Zamanları ----\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "son-işl"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "son-değş"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Semafor Dizileri ------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "semSayısı"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "çekirdek ileti kuyrukları için yapılandırılmamış\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ İletiler: Sınırlar --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "tüm sistemdeki azami kuyruk sayısı = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "azami ileti uzunluğu (bayt) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "öntanımlı azami kuyruk boyu (bayt) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ İletiler: Durum --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "ayrılmış kuyruk sayısı = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "kullanılmış başlık sayısı = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "kullanılmış alan = %d bayt\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ İleti Kuyrukları: Oluşturucu/Kendi --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "iltkiml"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ İleti Kuyrukları Gönd/Alım/Değiş. Zamanları --------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "gönderim"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "alım"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "değişim"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ İleti Kuyrukları PID'leri --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ İleti Kuyrukları --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "kull-bayt"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "ileti-sayısı"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "fsync hata verdi"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10721,42 +11095,42 @@ msgstr ""
 "\n"
 "Paylaşımlı bellek Bölüt shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr "kullkiml=%d\tgkiml=%d\tckullkiml=%d\tcgkiml=%d\n"
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "kip=%#o\terişim_izni=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bayt=%ld\tlpid=%d\tcpid=%d\tekSayısı=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "fsync hata verdi"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10765,32 +11139,32 @@ msgstr ""
 "\n"
 "İleti Kuyruğu iltkiml=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr "kullkiml=%d\tgkiml=%d\tckullkiml=%d\tcgkiml=%d\tkip=%#o\n"
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr "cbayt=%ld\tqbayt=%ld\tqSayısı=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "gönderim_zamanı=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "alış_zamanı=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "erişim başarısız"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10799,159 +11173,182 @@ msgstr ""
 "\n"
 "Semafor Dizisi semkiml=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 msgstr "kullkiml=%d\t gkiml=%d\t ckullkiml=%d\t cgkiml=%d\n"
 
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "kip=%#o, erişim_izni=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "semSayısı = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "değer"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "nsayısı"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zsayısı"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "kimlik geçersiz: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%2$s deki %1$s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "kimlik geçersiz"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s bir blok-özel aygıt değil"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Disk sürücü üzerinde arama yapılamıyor"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Hiçbiri"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "RE hatası:"
+msgid "error: cannot open %s"
+msgstr "%s: %s açılamıyor\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "%s okunurken hata\n"
+msgid "failed to read: %s"
+msgstr "%s durum bilgileri alınamıyor"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "erişim hatası"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "%s açılamadı"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "Tampon ayrılamadı.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: açılamıyor: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr ""
 "\n"
 "Dosya kapatılırken hata\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "bellek ayrılamadı"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10960,70 +11357,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Eski durum:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11032,68 +11442,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "%s için kip değiştirilirken hata: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "kullanımı: rdev [ -rv ] [ -o KONUM ] [ YANSI [ DEĞER [ KONUM ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr "  rdev /dev/fd0  (veya rdev /linux, vb.) KÖK aygıtı gösterir"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         KÖKü /dev/hda2 'ye ayarlar"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              KÖK Bayrakları belirlenir (salt-okunur)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            RAMDISK boyu belirlenir"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              önyükleme VIDEOMODE belirlenir"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr ""
-"  rdev -o N ...                   bayt göreli konumu N olarak belirlenir"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   rdev -R ile aynı"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     rdev -r ile aynı"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     rdev -v ile aynı"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Bilgi: video kipleri: -3=Sor, -2=Gelişmiş, -1=NormalVga, 1=tuş1, 2=tuş2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      kökü salt-okunur bağlamak için -R 1, oku-yaz için -R 0 kullanın."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "virgül eksik"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11205,11 +11553,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: eski öncelik %d, yeni öncelik %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11219,108 +11568,133 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: disk bölümleme tablosu türü tanınmıyor\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: kuraldışı tuş (%s)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: kuraldışı seçenek -- %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr ""
 "%s sürüm %s\n"
 "Çeviri hatalarını <gnu-tr-u12a@listssourceforge.net> adresine bildiriniz\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "%s kullanarak.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "%s kullanarak.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "bellek ayrılamadı"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s bir lp aygıtı değil.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s@%s den ileti var (%s üzerinden, şu an %s) ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "%s %s olarak değiştirilemiyor: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 #, fuzzy
 msgid "rtc read"
 msgstr ", hazır"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11417,6 +11791,11 @@ msgstr "%s: değer hatalı\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s bir lp aygıtı değil.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "LPGETIRQ hatası"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11447,6 +11826,11 @@ msgstr ", çalışıyor"
 msgid ", error"
 msgstr ", hata"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: bağlanamadı"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ hatası"
@@ -11490,6 +11874,16 @@ msgid "unshare failed"
 msgstr "erişim başarısız"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: hız ayarlanamıyor: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: hız ayarlanamıyor: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "çalıştırma başarısız\n"
@@ -12012,6 +12406,231 @@ 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 "%s: illegal option -- %c\n"
+#~ msgstr "%s: kuraldışı seçenek -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "ayrılmış bölüt sayısı %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "ayrılmış sayfa sayısı  %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "bulunan sayfa sayısı   %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "takaslı sayfa sayısı   %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Takas verimi: %ld deneme\t %ld başarı\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "uç uygulama çalıştırılırken hata\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Ayar değeri geçersiz: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "nsayısı"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Yeni"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Kullanımı:\n"
+#~ "    fdisk [-b SktUz] [-u] DiSK    Disk bölümleme tablosunu değiştirir\n"
+#~ "    fdisk -l [-b SktUz] [-u] DiSK Disk bölümleme tablosunu listeler\n"
+#~ "    fdisk -s BÖLÜM                Bölüm uzunluklarını blok cinsinden "
+#~ "verir\n"
+#~ "    fdisk -v                      fdisk sürüm bilgilerini gösterir\n"
+#~ "Burada:\n"
+#~ "DiSK /dev/hdb veya /dev/sda gibi ve\n"
+#~ "BÖLÜM /dev/hdb7 gibi verilir.\n"
+#~ "-u: Başlangıç ve bitiş sektörlerini (silindir değil) verir\n"
+#~ "-b 2048: 2048 baytlık sektörler kullanılır\n"
+
+#~ 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 ""
+#~ "Kullanımı: fdisk [-l] [-b Skt] [-u] aygıt\n"
+#~ "  Örneğin:\n"
+#~ "   fdisk /dev/hda  (ilk IDE disk)\n"
+#~ "   fdisk /dev/sdc  (üçüncü SCSI disk)\n"
+#~ "   fdisk /dev/eda  (ilk PS/2 ESDI aygıtı)\n"
+#~ "   fdisk /dev/rd/c0d0  veya\n"
+#~ "   fdisk /dev/ida/c0d0  (RAID aygıtları)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "Bu disk için silindir sayısı %d olarak belirlendi.\n"
+#~ "Yanlış bir şey yok fakat 1024 silindirden büyük değerlerle\n"
+#~ "bazı yazılımlar sorun çıkabilir:\n"
+#~ "1) önyükleme sırasında çalışan yazılımlar (örn. LILO'nun eski sürümleri)\n"
+#~ "2) diğer işletim sistemlerinin önyükleme ve disk bölümleme yazılımları\n"
+#~ "   (örn. DOS FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: %s yok - oluşturuluyor...\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "çalıştırma başarısız\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "kullanımı: %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "           %s [-s -m -q] -i kimlik\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "           %s -h yardım almak için.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Özkaynak özellikleri:\n"
+#~ "\t-m : paylaşımlı bellek\n"
+#~ "\t-q : iletiler\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : semaforlar\n"
+#~ "\t-a : tümü (öntanımlı)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Çıktı biçemi:\n"
+#~ "\t-t : zaman\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : oluşturan\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : sınırlar\n"
+#~ "\t-u : özet\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "RE hatası:"
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "%s okunurken hata\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "%s için kip değiştirilirken hata: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr "kullanımı: rdev [ -rv ] [ -o KONUM ] [ YANSI [ DEĞER [ KONUM ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr "  rdev /dev/fd0  (veya rdev /linux, vb.) KÖK aygıtı gösterir"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         KÖKü /dev/hda2 'ye ayarlar"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              KÖK Bayrakları belirlenir (salt-okunur)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            RAMDISK boyu belirlenir"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr "  rdev -v /dev/fd0 1              önyükleme VIDEOMODE belirlenir"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr ""
+#~ "  rdev -o N ...                   bayt göreli konumu N olarak belirlenir"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   rdev -R ile aynı"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     rdev -r ile aynı"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     rdev -v ile aynı"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Bilgi: video kipleri: -3=Sor, -2=Gelişmiş, -1=NormalVga, 1=tuş1, "
+#~ "2=tuş2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      kökü salt-okunur bağlamak için -R 1, oku-yaz için -R 0 kullanın."
+
+#~ msgid "missing comma"
+#~ msgstr "virgül eksik"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "bellek yetersiz"
diff --git a/po/uk.po b/po/uk.po
index 86d32b20..9a794ae7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2006-04-06 10:45+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -102,6 +102,11 @@ msgstr "перечитати таблицю розділів"
 msgid "Usage:\n"
 msgstr "Використання:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -l [ сигнал ]\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -122,6 +127,17 @@ msgstr "Доступні команди:\n"
 msgid "get size in 512-byte sectors"
 msgstr "отримати розмір у байтах"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -223,15 +239,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "використання: %s [ -n ] пристрій\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -334,7 +341,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "помилка виділення пам'яті"
 
@@ -952,7 +959,7 @@ msgstr "не вдається отримати інформацію про %s"
 msgid "%s is not a block special device"
 msgstr "%s не є спеціальним файлом блочного пристрою"
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "не вдається відкрити %s"
@@ -976,7 +983,7 @@ msgstr "надто багато вузлів - максимум 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "не вистачає простору, потрібно принаймні %lu блоків"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Пристрій: %s\n"
@@ -1050,7 +1057,7 @@ msgstr "помилка закривання %s"
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Використання: mkfs [-V] [-t типФС] [параметри-ФС] пристрій [розмір]\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1283,7 +1290,7 @@ msgstr "помилка позиціювання при перевірці бло
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Незрозуміле значення у функції do_check: можливо помилка\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "помилка позиціювання у функції check_blocks"
 
@@ -1367,175 +1374,181 @@ msgstr ""
 "Використовується вказаний користувачем розмір сторінки %d, замість системних "
 "значень %d/%d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "помилка створення процесу\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 "Неправильний розмір заголовку розділу підкачки, етикетку не записано.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Етикетку обрізано.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "немає етикетки, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "немає uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, fuzzy, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Використання: %s [-c] [-v0|-v1] [-pPAGESZ] [-L етикетка] /dev/назва [блоки]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "надто багато пошкоджених сторінок"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Недостатньо пам'яті"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "одна пошкоджена сторінка\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu пошкоджених сторінок\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "помилка встановлення позиції на початок пристрою підкачки"
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "не вдається виділити буфер для вузлів"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "не вдається виділити буфер для вузлів"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "не вдається очистити завантажувальний сектор"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, fuzzy, c-format
 msgid "        (%s partition table detected). "
 msgstr "   p   вивести таблицю розділів BSD"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, fuzzy, c-format
 msgid "        on whole disk. "
 msgstr "   s   показати всю етикетку диску"
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, fuzzy, c-format
 msgid "        (compiled without libblkid). "
 msgstr "   s   показати всю етикетку диску"
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, fuzzy, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: помилка: невідома версія %d\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 #, fuzzy
 msgid "error: UUID parsing failed"
 msgstr ""
 "\n"
 "Помилка закривання файлу\n"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: помилка: Не вказано де створити область підкачки?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, fuzzy, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: помилка: розмір %lu більший ніж розмір пристрою %lu\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, fuzzy, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: помилка: область підкачки повинна бути принаймні %ldкб\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, fuzzy, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: попередження: область підкачки відсікається до %ldкб\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, fuzzy, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "Не буде створено пристрій підкачки на '%s'"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, fuzzy, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s підключений; тут не можна створювати файлову систему!"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "не вдається встановити простір підкачки: не вдається прочитати"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, fuzzy, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Встановлюється область підкачки версії %d, розмір = %llu кб\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, fuzzy, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "не вдається записати сторінку підпису"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "помилка виконання fsync"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 #, fuzzy
 msgid "unable to matchpathcon()"
 msgstr "не вдається запустити %s"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 #, fuzzy
 msgid "unable to create new selinux context"
 msgstr "не вдається записати вузли"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, fuzzy, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "не вдається перейменувати %s у %s: %s\n"
@@ -1598,63 +1611,109 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr "помилка зупинення служби: \"%s\""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Не використано"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "помилка встановлення позиції на початок пристрою підкачки"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Вільний простір"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: немає такого розділу\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: помилка: невідома версія %d\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: не вдається відкрити: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "%s: не вдається відкрити: %s\n"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: не вдається відкрити: %s\n"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: не вдається відкрити: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: не вдається відкрити: %s\n"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "помилка позиціювання у функції write_tables"
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr "Finger інформацію змінено.\n"
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Не використано"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Вільний простір"
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Диск було змінено.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Перезавантажте систему щоб впевнитись, що таблиця розділів коректно "
 "оновлена.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1667,231 +1726,231 @@ msgstr ""
 "DOS 6.x розділи, перегляньте man сторінку з cfdisk\n"
 "щоб отримати докладнішу інформацію.\n"
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "ФАТАЛЬНА ПОМИЛКА"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr "Натисніть будь-яку клавішу для завершення cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Помилка позиціювання на дисковому пристрої"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "не вдається прочитати дисковий пристрій"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "не вдається записати на дисковий пристрій"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Надто багато розділів"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Розділ починається перед сектором 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Розділ закінчується перед сектором 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr "Розділ починається після кінця диску"
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr "Розділ закінчується після кінця диску"
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Розділ закінчується у останньому неповному циліндрі"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "логічні розділи не у тому порядку як на диску"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "логічні розділи перекриваються"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "збільшені логічні розділи перекриваються"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Внутрішня помилка створення логічного пристрою без розширеного "
 "розділу !!!!"
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "не вдається створити тут логічний пристрій -- буде створено два розширених "
 "розділи"
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Пункт меню надто довгий. Меню виглядатиме дивно."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 #, fuzzy
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr "Меню без орієнтації. Типова орієнтація - горизонтальна."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Неправильний ключ"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Натисніть будь-яку клавішу для продовження"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Первинний"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Створити новий розділ"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Логічний"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Створити новий логічний пристрій"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Не створювати розділ"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Внутрішня помилка !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Розмір (у MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Початок"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr "Додати розділ на початку вільного простору"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Кінець"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr "Додати розділ наприкінці вільного простору"
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr "Недостатньо простору для створення розширеного розділу"
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Відсутня таблиця розділів.\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr "Відсутня таблиця розділів або невідома сигнатура таблиці розділів."
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Неправильна сигнатура таблиці розділів"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Таблиця розділів невідомого типу"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr "Бажаєте почати з нульової таблиці [y/N] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Ви вказали більше циліндрів ніж є на диску"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "не вдається відкрити пристрій диску"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Відкритий диск лише для читання - у вас немає прав для запису"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "не вдається отримати розмір диску"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Неправильний первинний розділ"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Неправильний логічний розділ"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Увага!! Це може знищити дані на диску!"
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 "Ви впевнені, що бажаєте записати таблицю розділів на диск? (yes або no): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr "Не записувати таблицю розділів на диск"
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Введіть `yes'(так) або `no'(ні)"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Записується таблиця розділів на диск..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Таблиця розділів записана на диск"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 #, fuzzy
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
@@ -1900,93 +1959,93 @@ msgstr ""
 "Таблиця розділів записана, але виникла помилка при її перечитуванні. "
 "Перезавантажтесь для оновлення таблиці."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Немає первинних розділів позначених як завантажувальні. DOS MBR не зможе "
 "завантажуватись."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Більш ніж один розділ позначений як завантажувальний. DOS MBR не зможе "
 "завантажуватись."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Введіть назву файлу або натисніть Enter, щоб відобразити екран: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "не вдається відкрити файл '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Дисковий пристій: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Сектор 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Сектор %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Немає    "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Перв/Лог "
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Первинний"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Логічний "
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Заван."
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Немає"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Таблиця розділів для %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "            Перший    Останній\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 " # Тип      Сектор   Сектор   Зсув    Довжина  Тип файл. системи(ID) Ознаки\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1994,469 +2053,469 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 #, fuzzy
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ---Початок---       ----Кінець----   Початк.   Кільк.\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 #, fuzzy
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr " # Ознак Гол  Сект Цил   ID  Гол  Сект Цил    Сектор  Секторів\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 #, fuzzy
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Неформатов."
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr "Вивести таблицю у 'неформатованому' вигляді"
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Сектори"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "Вивести таблицю сортовану за секторами"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Таблиця"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Просто вивести таблицю розділів"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Не виводити таблицю"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Екран з довідкою для cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Це cfdisk - консольна програма роботи з розділами на базі curses, яка"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "дозволяє створювати, видаляти та змінювати розділи вашого"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "жорсткого диску."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Команда      Призначення"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -----------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Перемикнути ознаку завантаження поточного розділу"
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Видалити поточний розділ"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Змінити параметри: циліндри, головки, сектори-на-доріжку"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             УВАГА: Цей параметр повинен використовуватись лише людьми"
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             які знають, що вони роблять."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Вивести цю довідку"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Максимізувати використання диску поточним розділом"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Зауважте: це може зробити розділ несумісним з"
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr "  n          Створити новий розділ у вільному просторі"
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Вивести таблицю розділів на екран або у файл"
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr "             Є декілька форматів виводу розділів:"
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr " "
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - не форматовані дані (у вигляді, в якому вони запишуться "
 "на диск)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Таблиця сортована по секторам"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - таблиця не форматованих даних"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Вийти з програми без запису таблиці розділів"
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Змінити тип файлової системи"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Змінити одиниці вимірювання розміру розділів"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Перемикає між Мб, секторами та циліндрами"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 "  W          Записати таблицю розділів на диск ( W повинен бути в верхньому "
 "регістрі)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Це може зруйнувати дані на диску, тому необхідно або"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             підтвердити або відмовитись від запису набравши `yes' чи "
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "СтрілкаВгору Перемістити курсор на попередню позицію"
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "СтрілкаВниз  Перемістити курсор у наступну позицію"
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Оновлює вміст екрану"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Виводить цю довідку"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Зауважте: Всі команди вводяться або у нижньому або у верхньому"
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "регістрах (за винятком (W)запису)."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Циліндрів"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Змінити геометрію циліндру"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Головки"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Змінити геометрію головки"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Змінити геометрію сектору"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Виконано"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Завершити зміну геометрії"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Введіть кількість циліндрів: "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Недопустиме значення циліндрів"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Введіть геометрію головок: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Недопустиме значення головок"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Введіть кількість секторів на доріжку: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Недопустиме значення секторів"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Введіть тип файлової системи: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Тип ФС не може бути порожнім"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Не можна змінювати тип ФС на розширений"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Невід(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", НК"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "НК"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Перв/Лог"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Невідомий (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Пристій диску: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Розмір: %lld байт, %lld Мб"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Розмір: %lld байт, %lld.%lld Гб"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Головок: %d   Секторів на доріжку: %d   Циліндрів: %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Назва"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Ознаки"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Тип розд."
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Тип ФС"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Позначка]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "   Секторів"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Циліндрів"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "Розмір (Мб)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "Розмір (Гб)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Завантаж."
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr "Перемикнути ознаку завантаження поточного розділу"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Видалити"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Видалити поточний розділ"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Геометрія"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr "Змінити геометрію диску (лише для фахівців)"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Довідка"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Вивести вікно з довідкою"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Максимум"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Максимізувати використання диску поточним розділом (для фахівців)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Новий"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr "Створити новий розділ у вільному просторі"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "Вивести"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "Вивести таблицю розділів на екран або у файл"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Вихід"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr "Вийти з програми без запису таблиці розділів"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Тип"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Змінити тип файлової системи (DOS, Linux, OS/2 та ін.)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Одиниці"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Змінити одиниці вимірювання розмірів розділу (МБ. сект, цил)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Записати"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Записати таблицю розділів на диск (може зіпсувати дані)"
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr "не вдається зробити розділ завантажувальним"
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "не вдається видалити порожній розділ"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "не вдається максимізувати цей розділ"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Цей розділ не використовується"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Цей розділ вже використовується"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr "не вдається змінити тип порожнього розділу"
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Немає більше розділів"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Неправильна команда"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, 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:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2527,9 +2586,9 @@ msgstr ""
 "\n"
 "BSD етикетка пристрою: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Команда дія"
 
@@ -2549,9 +2608,9 @@ msgstr "   i   встановити bootstrap"
 msgid "   l   list known filesystem types"
 msgstr "   l   перелік відомих типів файлових систем"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   вивести це меню"
 
@@ -2563,14 +2622,14 @@ msgstr "   n   додати новий BSD розділ"
 msgid "   p   print BSD partition table"
 msgstr "   p   вивести таблицю розділів BSD"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   вийти без збереження змін"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   повернутись до головного меню"
 
@@ -2613,13 +2672,13 @@ msgstr "Немає *BSD розділів на %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Команда режиму BSD етикетки диску (m - довідка): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "Перший %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Останній %s або +size або +sizeM або +sizeK"
@@ -2764,7 +2823,7 @@ msgstr "секторів/доріжку"
 msgid "tracks/cylinder"
 msgstr "доріжок/циліндр"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "циліндри"
@@ -2822,7 +2881,7 @@ msgstr "Встановлено у %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Розділ (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr "Вже створено максимальну кількість розділів\n"
@@ -2846,225 +2905,208 @@ msgstr ""
 "\n"
 "Синхронізуються диски.\n"
 
-#: fdisk/fdisk.c:248
-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 ""
-"Використання: fdisk [-b SSZ] [-u] ДИСК  Змінити таблицю розділів\n"
-"       fdisk -l [-b SSZ] [-u] ДИСК      Вивести таблицю розділів\n"
-"       fdisk -s РОЗДІЛ                  Вивести розмір розділів у блоках\n"
-"       fdisk -v                         Вивести версію fdisk\n"
-"Де ДИСК - щось на зразок /dev/hdb чи /dev/sda,\n"
-"а РОЗДІЛ - щось на зразок /dev/hda7\n"
-"-u: виводити початковий та кінцевий сектори (замість циліндрів)\n"
-"-b 2048: (для деяких MO дисків) використовуються 2048-байтові сектори\n"
-
-#: fdisk/fdisk.c:260
-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 ""
-"Використання: fdisk [-l] [-b SSZ] [-u] пристрій\n"
-"Напр.: fdisk /dev/hda  (перший IDE диск)\n"
-"  або: fdisk /dev/sdc  (третій SCSI диск)\n"
-"  або: fdisk /dev/eda  (перший PS/2 ESDI диск)\n"
-"  або: fdisk /dev/rd/c0d0  або: fdisk /dev/ida/c0d0  (RAID пристрої)\n"
-"  ...\n"
-
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:257
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "не вдається відкрити %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "не вдається прочитати %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "не вдається перейти на %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "не вдається записати %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "помилка BLKGETSIZE ioctl на %s\n"
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "не вдається виділити додаткову пам'ять\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Фатальна помилка\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   перемикнути ознаку лише-для-читання"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   редагувати bsd етикетку диску"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   перемикнути ознаку монтування"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   видалити розділ"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   перелік відомих типів розділів"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   додати новий пристрій"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   створити нову порожню DOS таблицю розділів"
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   вивести таблицю розділів"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   створити нову порожню Sun етикетку диску"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   змінити системний ідентифікатор розділу"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   змінити одиниці відображення/вводу"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   перевірити таблицю розділів"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr "   w   записати таблицю на диск та вийти"
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   додаткова функціональність (для фахівців)"
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   вибрати завантажувальний розділ"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   редагувати елемент завантажувального файлу"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   вибрати sgi розділ підкачки"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   перемикнути ознаку завантаження"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   перемикнути ознаку сумісності з dos"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   змінити кількість запасних циліндрів"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   змінити кількість циліндрів"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   вивести таблицю розділів у не форматованому вигляді"
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e  змінити кількість додаткових секторів на циліндр"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   змінити кількість головок"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   змінити фактор чергування"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   змінити швидкість обертання (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   змінити кількість секторів/доріжку"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   змінити кількість фізичних циліндрів"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   перемістити початок даних розділу"
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   вивести список розширених розділів"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr "   g   створити IRIX (SGI) таблицю розділів"
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   виправити порядок розділів"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 #, fuzzy
 msgid "   i   change the disk identifier"
 msgstr "   u   змінити одиниці відображення/вводу"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Необхідно встановити"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "головки"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "сектори"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3073,30 +3115,11 @@ msgstr ""
 "%s%s.\n"
 "Ви можете зробити це з меню додаткових функцій.\n"
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " та "
 
-#: fdisk/fdisk.c:747
-#, 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"
-"Кількість циліндрів на диску встановлено у %d.\n"
-"У цьому немає нічого страшного, але це більше ніж 1024,\n"
-"та у деяких випадках може спричинити проблеми з:\n"
-"1) ПЗ яке виконується при завантаженні (наприклад, старі версії LILO)\n"
-"2) завантаженням та зміною розділів з інших операційних систем\n"
-"   (наприклад, DOS FDISK, OS/2 FDISK)\n"
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3107,38 +3130,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Неправильний зсув у головному розширеному розділі\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3147,32 +3169,32 @@ msgstr ""
 "Попередження: розділи після #%d пропускаються.\n"
 "Вони будуть видалені, якщо ви збережете цю таблицю розділів.\n"
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Попередження: додатковий вказівник у таблиці розділів %d\n"
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "Попередження: додаткові дані у таблиці розділів проігноровано %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, fuzzy, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "Попередження: порожній розділ\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, fuzzy, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3185,26 +3207,17 @@ msgstr ""
 "буде втрачено.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Примітка: розмір сектору %d (не %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr "Ви не зможете записати таблицю розділів.\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3213,7 +3226,7 @@ msgstr ""
 "Цей диск має як DOS сигнатуру, так і BSD.\n"
 "Дайте команду 'b', щоб перейти у BSD режим.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
@@ -3222,17 +3235,17 @@ msgstr ""
 "Пристрій не містить ані правильної DOS таблиці розділів, ані Sun, SGI чи OSF "
 "етикетки диску\n"
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Внутрішня помилка\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Додаткові розширені розділи ігноруються %d\n"
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3241,7 +3254,7 @@ msgstr ""
 "Попередження: неправильна ознака 0x%04x таблиці розділів %d буде виправлена "
 "при w(запису)\n"
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3250,95 +3263,100 @@ msgstr ""
 "\n"
 "тричі отримано EOF - завершення..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Шістнадцятковий код (наберіть L щоб переглянути перелік кодів)"
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, типово %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Використовується типове значення %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Значення за межами діапазону.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Номер розділу"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Попередження: розділ %d має порожнє поле типу\n"
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Вибраний розділ %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr "Ще не визначено жодного розділу!\n"
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr "Всі первинні розділи вже були визначені!\n"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "циліндр"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "сектор"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
+msgstr "Змінюються одиниці відображення/вводу на %s\n"
+
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
 msgstr "Змінюються одиниці відображення/вводу на %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "УВАГА: Розділ %d є розширеним розділом\n"
 
-#: fdisk/fdisk.c:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "Ознаку сумісності з DOS встановлено\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Ознаку сумісності з DOS не встановлено\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Розділ %d ще не існує!\n"
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3351,7 +3369,7 @@ msgstr ""
 "можливо, нерозсудливо. Ви можете видалити\n"
 "розділ використовуючи команду `d'.\n"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3360,7 +3378,7 @@ msgstr ""
 "Не можна перетворювати первинний розділ у розширений, або навпаки\n"
 "Спочатку видаліть його.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3371,7 +3389,7 @@ msgstr ""
 "тому що на це покладаються SunOS/Solaris, та Linux також це сприймає.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, fuzzy, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3382,62 +3400,62 @@ msgstr ""
 "та розділу 11 на весь том (6), тому що IRIX на це покладається.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Змінено тип системи розділу %d на %x (%s)\n"
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, fuzzy, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Змінено тип системи розділу %d на %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "У розділу %d відрізняються фізичний та логічний початок (не-Linux?):\n"
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     фіз=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "логічний=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "У розділу %d відрізняються фізичний та логічний кінці:\n"
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Розділ %i не починається на межі циліндру:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "повинно бути (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr "Розділ %i не закінчується на межі циліндру.\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "повинно бути (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr "Розділ %i не починається на межі циліндру:\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3446,7 +3464,7 @@ msgstr ""
 "\n"
 "Диск %s: %ld Мб, %lld байт\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3455,34 +3473,39 @@ msgstr ""
 "\n"
 "Диск %s: %ld.%ld Гб, %lld байт\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, fuzzy, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d головок, %d секторів/доріжку, %d циліндрів"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", загалом %llu секторів"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, fuzzy, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 "Одиниці виміру = %s з %d * %d = %d байт\n"
 "\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, fuzzy, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr "неправильний розмір вузла"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3491,14 +3514,14 @@ msgstr ""
 "Немає що робити. Порядок вже коректний.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr ""
 "Виконано\n"
 "\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3509,16 +3532,16 @@ msgstr ""
 "Можливо ви вибрали неправильний пристрій.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Завант  Початок     Кінець     Блоків  Ід  Система\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Пристрій"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3527,7 +3550,7 @@ msgstr ""
 "\n"
 "Елементи таблиці розділів не у тому порядку, як на диску\n"
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3538,88 +3561,88 @@ msgstr ""
 "Диск %s: %d головок, %d секторів, %d циліндрів\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "№ Акт Гол Сек Цил Гол Сек  Цил  Початок   Розмір Ід\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Попередження: розділ %d містить нульовий сектор\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Розділ %d: головка %d перевищує максимум %d\n"
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, fuzzy, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Розділ %d: сектор %d перевищує максимум %d\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Розділ %d: циліндр %d перевищує максимум %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Розділ %d: кількість попередніх секторів %d відрізняється від загальної %d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Попередження: неправильна область початку даних у розділі %d\n"
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Попередження: розділ %d перекривається з розділом %d.\n"
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Попередження: розділ %d порожній\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "Логічний розділ %d не вміщується цілком у розділ %d\n"
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, fuzzy, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Загальна кількість розподілених секторів %d перевищує максимум %lld\n"
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, fuzzy, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld нерозподілених секторів\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Розділ %d вже визначений.  Видаліть його перед повторним додаванням.\n"
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, fuzzy, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Немає наявних вільних секторів\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3632,7 +3655,7 @@ msgstr ""
 "\tDOS таблицю розділів. (Використовуйте команду o.)\n"
 "\tЗАСТЕРЕЖЕННЯ: Це призведе до знищення поточного вмісту диску.\n"
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, fuzzy, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3645,23 +3668,23 @@ msgstr ""
 "\tDOS таблицю розділів. (Використовуйте команду o.)\n"
 "\tЗАСТЕРЕЖЕННЯ: Це призведе до знищення поточного вмісту диску.\n"
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Спочатку необхідно видалити деякий розділ та додати розширений розділ\n"
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr "Усі логічні розділи зайняті\n"
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Додається первинний розділ\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3672,20 +3695,20 @@ msgstr ""
 "   %s\n"
 "   p   первинний розділ (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   логічний (5 або більше)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   розширений"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Неправильний номер розділу для типу `%c'\n"
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3694,12 +3717,12 @@ msgstr ""
 "Таблиця розділів була змінена!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Викликається ioctl(), щоб перечитати таблицю розділів.\n"
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3712,7 +3735,7 @@ msgstr ""
 "Ядро досі використовує стару таблицю розділів.\n"
 "Нова таблиця розділів використовуватиметься після перезавантаження.\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3725,7 +3748,7 @@ msgstr ""
 "розділи, перегляньте man-сторінку з fdisk для отримання додаткової\n"
 "інформації.\n"
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3734,42 +3757,42 @@ msgstr ""
 "\n"
 "Помилка закривання файлу\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Синхронізація дисків.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Розділ %d не має області даних\n"
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Новий початок даних"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Команди експертного режиму(m - довідка): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Кількість циліндрів"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Кількість головок"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Кількість секторів"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Попередження: встановлюється зсув сектору для сумісності з DOS\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3778,33 +3801,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Диск %s не містить правильної таблиці розділів\n"
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "не вдається відкрити %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "не вдається відкрити %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: невідома команда\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Це ядро визначає розмір сектору саме, тому -b параметри проігноровано\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3813,16 +3836,16 @@ msgstr ""
 "Попередження: з вказаним пристроєм повинен використовуватись параметр -b "
 "(встановити розмір сектора)\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Знайдено OSF/1 етикетку диску на %s, перехід у режим етикетки диску.\n"
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Команда (m - довідка): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3831,16 +3854,16 @@ msgstr ""
 "\n"
 "Поточний файл завантаження: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr "Введіть назву нового файлу завантаження: "
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Файл завантаження не змінено\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3932,15 +3955,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4075,7 +4098,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Присутній більш ніж один елемент диску.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Не визначено розділів\n"
@@ -4179,7 +4202,7 @@ msgstr ""
 "Не дотримуватись цього можуть лише \"SGI volume\" на весь диск.\n"
 "Введіть YES, якщо ви впевнені, що хочете позначити цей розділ по-іншому.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4235,7 +4258,7 @@ msgstr ""
 "буде втрачено.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4256,58 +4279,58 @@ msgstr "Спроба зберегти параметри розділу %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ІД=%02x\tПОЧАТОК=%d\tДОВЖИНА=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "SunOS root"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "SunOS swap"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Весь диск"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 #, fuzzy
 msgid "SunOS alt sectors"
 msgstr "%lld нерозподілених секторів\n"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 #, fuzzy
 msgid "SunOS cachefs"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 #, fuzzy
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4320,22 +4343,22 @@ msgstr ""
 "такі як головки, сектори, циліндри та розділи\n"
 "або примусово очистити етикетку (команда s у головному меню)\n"
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Знайдено sgi етикетку диска з неправильною контрольною сумою.\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Знайдено sgi етикетку диска з неправильною контрольною сумою.\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, fuzzy, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Знайдено sgi етикетку диска з неправильною контрольною сумою.\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, fuzzy, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4343,7 +4366,7 @@ msgstr ""
 "Попередження: неправильна ознака 0x%04x таблиці розділів %d буде виправлена "
 "при w(запису)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4356,31 +4379,31 @@ msgstr ""
 "буде втрачено.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Секторів/доріжку"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Розділ %d не закінчується на межі циліндру\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Розділ %d перекривається з іншим у секторах %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Невикористаний простір - сектори 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Невикористаний простір - сектори %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4389,7 +4412,7 @@ msgstr ""
 "Інші розділи вже займають весь диск.\n"
 "Видаліть частину/зменшіть їх розмір перед спробою.\n"
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4398,12 +4421,12 @@ msgstr ""
 "Наполегливо рекомендується, щоб одинадцятий розділ\n"
 "займав увесь диск та мав тип `SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4414,7 +4437,7 @@ msgstr ""
 "%d %s перекриває деякий інший розділ. Ваш елемент було змінено\n"
 "на %d %s\n"
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4424,7 +4447,7 @@ msgstr ""
 "як\n"
 "весь диск(5), починаючи з 0, розміром %u секторів\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4438,12 +4461,12 @@ msgstr ""
 "Введіть YES, якщо ви справді впевнені, що бажаєте позначити розділ\n"
 "типом 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4458,11 +4481,11 @@ msgstr ""
 "Одиниці виміру = %s з %d * 512 байт\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4471,28 +4494,28 @@ msgstr ""
 "Одиниці виміру = %s з %d * 512 байт\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Ознака Початок    Кінець     Блоки   Ід  Система\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Кількість запасних циліндрів"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Додаткових секторів у циліндрі"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Фактор чергування"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Швидкість обертання (об/хв)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Кількість фізичних циліндрів"
 
@@ -4701,6 +4724,10 @@ msgstr "Minix / old Linux"
 msgid "Linux swap / Solaris"
 msgstr "Linux swap / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 hidden C: drive"
@@ -5334,94 +5361,94 @@ msgstr "вказано параметр -n: Нічого не змінено\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "не вдається зберегти старі сектори - виконання перервано\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "не вдається записати розділ на %s\n"
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr "довгий або незавершений вхідний рядок - завершення\n"
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "помилка вводу: очікувався символ `=' після поля %s\n"
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "помилка вводу: очікувався символ %c після поля %s\n"
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "нерозпізнаний ввід: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "число занадто велике\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "не цифри після числа\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "немає місця для дескриптору розділу\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr "не вдається створити оточуючий розширений розділ\n"
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "надто багато вхідних полів\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Немає більше місця\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Недопустимий тип\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Попередження: вказаний розмір (%lu) перевищує допустимий розмір (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Попередження: порожній розділ\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Попередження: неправильний початок розділу (раніше %lu)\n"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "не розпізнана завантажувальна ознака - виберіть - або *\n"
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "часткова специфікація цил,гол,сект?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Розширений розділ не там де має бути розширений\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "неправильний ввід\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "надто багато розділів\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5433,97 +5460,97 @@ msgstr ""
 "Зазвичай, вам необхідно лише вказати <початок> та <розмір> (та можливо "
 "<тип>).\n"
 
-#: fdisk/sfdisk.c:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "пристрій: щось на зразок /dev/hda чи /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "корисні параметри:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [або --show-size]: вивести розмір розділу"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [або --id]:        вивести або змінити ідентифікатор розділу"
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [або --list]:      вивести розділи кожного пристрою"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [або --dump]:      те ж саме, але у форматі прийнятному для "
 "подальшого вводу"
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [або --increment]: кількість циліндрів починається з 1, а не з 0"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:   ввід/вивід у одиницях сектори/блоки/циліндри/Мб"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [або --list-types]:вивести всі відомі типи розділів"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [або --DOS]:       для DOS-сумісності: втрачається трохи простору"
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [або --re-read]:   змусити ядро перечитати таблицю розділів"
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                 змінити лише розділ з номером #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                  не записувати нічого на диск"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O file :             зберегти у файл сектори, які будуть перезаписані"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :             відновити ці сектори знову"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [або --version]:   вивести версію"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [або --help]:      вивести це повідомлення"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "небезпечні параметри:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [або --show-geometry]: вивести видану ядром геометрію"
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
@@ -5531,7 +5558,7 @@ msgstr ""
 "    -G [or --show-pt-geometry]: вивести видану, яку визначено з таблиці "
 "розділів"
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5539,60 +5566,60 @@ msgstr ""
 "    -x [або --show-extended]: також вивести перелік розширених розділів\n"
 "                              або очікувати їх дескриптори при вводі"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [або --Linux]:      не скаржитись на несуттєві для Linux речі"
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [або --quiet]:      не виводити попередження"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr "    Ви можете перевизначити виявлену геометрію використовуючи:"
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [або --cylinders #]:встановити кількість циліндрів"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [або --heads #]:    встановити кількість головок"
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [або --sectors #]:  встановити кількість секторів"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr "Ви можете вимкнути перевірку логічності за допомогою:"
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [або --force]:      виконувати команди примусово, навіть безглузді"
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Використання:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s пристрій\t\t вивести активні розділи пристрою\n"
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s пристрій n1 n2 ... активувати розділ n1 ..., де-активувати решту\n"
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An пристрій\t активувати розділ n, де-активувати решту розділів\n"
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5601,67 +5628,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Використовуйте параметр --force, щоб відхилити всі перевірки.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "немає команди?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "загалом: %llu блоків\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "використання: sfdisk --print-id пристрій номер_розділу\n"
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "використання: sfdisk --change-id пристрій номер_розділу ідентиф.\n"
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "використання: sfdisk --id пристрій номер_пристрою [ідентиф.]\n"
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "можна вказувати лише один пристрій (за винятком -l чи -s)\n"
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "неможливі відкрити %s для читання-запису\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "неможливі відкрити %s для читання\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Гаразд\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 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:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Не вдається отримати розмір %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "неправильний 'активний' байт 0x%x замість 0x80\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5669,7 +5696,7 @@ msgstr ""
 "Виконано\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5678,35 +5705,35 @@ msgstr ""
 "Позначено активними %d розділів. Це немає значення для LILO,\n"
 "Але DOS MBR може завантажуватись лише з дисків, у яких 1 активний розділ.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "розділ %s має ідентиф. %x та він не прихований\n"
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Неправильний Ідент. %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Цей диск наразі використовується.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Фатальна помилка: не вдається знайти %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Попередження: %s не є блочним пристроєм\n"
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Перевіряється, що ніхто наразі не використовує диск ...\n"
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5719,30 +5746,30 @@ msgstr ""
 "диску.\n"
 "Використовуйте параметр --no-reread щоб обминути цю перевірку.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Використовуйте параметр --force, щоб відхилити всі перевірки.\n"
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "Гаразд\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Старий стан:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Розділ %d не існує, не вдається його змінити\n"
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Новий стан:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5750,21 +5777,21 @@ msgstr ""
 "Ці розділи виглядають неправильно - нічого не змінено.\n"
 "(Якщо ви дійсно цього бажаєте, використовуйте параметр --force.)\n"
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Ці розділи виглядають неправильно - можливо слід відповісти No\n"
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Ви цим задоволені? [ynq] "
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Бажаєте записати на диск? [ynq] "
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5773,16 +5800,16 @@ msgstr ""
 "\n"
 "sfdisk: передчасне закінчення вводу\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Завершення - нічого не змінено\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Відповідайте одне з y,n,q\n"
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5791,7 +5818,7 @@ msgstr ""
 "Успішно записано нову таблицю розділів\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5803,17 +5830,17 @@ msgstr ""
 "count=1\n"
 "(Дивіться fdisk(8).)\n"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "%s: не вдається відкрити %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5821,116 +5848,116 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, fuzzy, c-format
 msgid "fsck: %s: not found\n"
 msgstr "umount: %s: не існує"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, fuzzy, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: помилка %d при декомпресії! %p(%d)\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 #, fuzzy
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "mount: необхідно вказати тип файлової системи"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s не є lp пристроєм.\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Примусова перевірка файлової системи на %s.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 #, fuzzy
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr "Використання: mkfs [-V] [-t типФС] [параметри-ФС] пристрій [розмір]\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: %s не є lp пристроєм.\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, fuzzy, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "не вдається відкрити %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, fuzzy, c-format
 msgid "Is /proc mounted?\n"
 msgstr "%s відключено\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, fuzzy, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Відключення решти файлових систем..."
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: невідомий аргумент: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "fsck from %s\n"
 msgstr "%s з %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "Не вдається виділити буфер для вузлів"
@@ -6447,7 +6474,13 @@ msgstr "Не знайдено підтримуваного інтерфейсу
 msgid "Unable to set system clock.\n"
 msgstr "не вдається встановити системний час.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6459,17 +6492,17 @@ msgstr ""
 "Ця копія hwclock скомпільована для іншої архітектури, ніж Alpha\n"
 "(тож, напевно, ця система не є системою Alpha). Ніяких дій не виконано.\n"
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "не вдається отримати значення епохи від ядра.\n"
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Ядро вважає, що значення епохи - %lu\n"
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6478,22 +6511,22 @@ msgstr ""
 "Щоб встановити значення епохи, необхідно використовувати параметр 'epoch' із "
 "зазначенням встановлюваного значення.\n"
 
-#: hwclock/hwclock.c:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Епоха не встановлюється у %d - лише тестування.\n"
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "не вдається встановити значення епохи у ядрі.\n"
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s з %s\n"
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6512,6 +6545,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6561,7 +6595,7 @@ msgstr ""
 "  --noadjfile   не обробляти /etc/adjtime. Вимагає використання або --utc,\n"
 "                або --localtime\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, fuzzy, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6572,17 +6606,17 @@ msgstr ""
 "                вказати hwclock тип вашої системи alpha (дивіться hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, fuzzy, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "не вдається встановити системний час.\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s не очікує параметрів без ключів. Ви вказали %d.\n"
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6591,7 +6625,7 @@ msgstr ""
 "Ви вказали декілька функцій.\n"
 "Можна виконувати лише одну функцію одночасно.\n"
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6600,7 +6634,7 @@ msgstr ""
 "%s: Параметри --utc та --localtime виключають одне одного. А ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6609,7 +6643,7 @@ msgstr ""
 "%s: Параметри --adjust та --noadjfile виключають одне одного. А ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, fuzzy, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6618,28 +6652,28 @@ msgstr ""
 "%s: Параметри --adjust та --noadjfile виключають одне одного. А ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 "%s: Разом з --noadjfile, необхідно вказувати або --utc, або --localtime\n"
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Вказано неправильне значення часу. не вдається встановити годинник.\n"
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Змінювати значення апаратного годинника може лише адміністратор.\n"
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Змінювати системний час може лише адміністратор.\n"
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6648,14 +6682,14 @@ msgstr ""
 "Змінювати значення епохи апаратного годинника у ядрі може лише "
 "адміністратор.\n"
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 "не вдається отримати доступ до апаратного годинника використовуючи будь-який "
 "відомий метод.\n"
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6944,12 +6978,12 @@ msgstr "%s: Не вдається встановити типовий конте
 msgid "Changing finger information for %s.\n"
 msgstr "Зміна finger інформації для %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, fuzzy, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "login: помилка PAM, перервано: %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7177,35 +7211,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "ФАТАЛЬНА ПОМИЛКА: не вдається відкрити tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, fuzzy, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "%s не є спеціальним файлом блочного пристрою"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "ФАТАЛЬНА ПОМИЛКА: неправильний tty"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: параметр -h може використовувати лише адміністратор.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr "використання: login [-fp] [ім'я_користувача]\n"
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "не вдається ініціалізувати PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "Ім'я:"
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "ПОМИЛОК ВХОДУ %d З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7214,17 +7253,17 @@ msgstr ""
 "Некоректний вхід\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "НАДТО БАГАТО ПОМИЛОК ВХОДУ (%d) З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "НЕВДАЛИЙ СЕАНС ВХОДУ З %s ДЛЯ %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7233,7 +7272,7 @@ msgstr ""
 "\n"
 "Некоректний вхід\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7242,120 +7281,120 @@ msgstr ""
 "\n"
 "Помилка встановлення сеансу, перервано.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "NULL ім'я користувача у %s:%d. Вихід."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Неправильне ім'я користувача \"%s\" у %s:%d. Вихід."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Недостатньо пам'яті\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Недопустиме ім'я користувача"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s заборонено входити на цьому терміналі.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "%s ЗАБОРОНЕНО ВХОДИТИ З %s НА TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "ВХІД %s ЗАБОРОНЕНИЙ НА TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Некоректний вхід\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "ВХІД НА %s ВІД %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ВХІД ROOT НА %s З %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ВХІД ROOT НА %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "ВХІД НА %s КОРИСТУВАЧ %s З %s"
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "ВХІД НА %s КОРИСТУВАЧ %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Для вас є нова пошта.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Для вас є пошта.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: помилка розгалуження: %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "помилка TIOCSCTTY: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "помилка setuid()"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Немає каталогу %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "Вхід з домашнім каталогом = \"/\".\n"
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: недостатньо пам'яті для сценарію оболонки.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: не вдається виконати сценарій оболонки: %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: немає оболонки: %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7364,65 +7403,65 @@ msgstr ""
 "\n"
 "%s ім'я: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "реєстраційне ім'я надто довге.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "Ім'я надто довге"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr "реєстраційне ім'я не може починатись з '-'.\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr "надто багато надмірних нових рядків.\n"
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "НАДМІРНІ символи нового рядка"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Вийшов час очікування входу після %d секунд\n"
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Останній вхід: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "з %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "на %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ПОМИЛКА ВХОДУ З %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ПОМИЛКА ВХОДУ НА %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ПОМИЛОК ВХОДУ З %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ПОМИЛОК ВХОДУ НА %s, %s"
@@ -7679,7 +7718,7 @@ msgstr "немає TERM або не вдається виконати stat дл�
 
 #: login-utils/simpleinit.c:938
 #, fuzzy, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr "помилка зупинення служби: \"%s\""
 
 #: login-utils/simpleinit.c:950
@@ -7689,8 +7728,8 @@ msgstr "помилка зупинення служби: \"%s\""
 
 #: login-utils/simpleinit.c:1070
 #, fuzzy, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "помилка запуску final_prog\n"
+msgid "error at starting service \"%s\"\n"
+msgstr "помилка зупинення служби: \"%s\""
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7816,25 +7855,25 @@ msgstr "%s: не вдається отримати інформацію про �
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: не вдається прочитати тимчасовий файл.\n"
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, fuzzy, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "неправильне значення року: використовуйте 1-9999"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "неправильне значення місяця: використовуйте 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "неправильне значення року: використовуйте 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, fuzzy, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "використання: cal [-13smjyV] [[місяць] рік]\n"
@@ -7858,6 +7897,113 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "не вдається відкрити %s"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Невідома команда: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "не вдається виділити буфер.\n"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "не вдається виділити буфер.\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: не вдається прочитати %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "помилка запису на %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr "Finger інформацію змінено.\n"
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Немає каталогу %s!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "не вдається виділити буфер.\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "не вдається виділити буфер.\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "не вдається виділити буфер.\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "не вдається виділити буфер.\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8012,7 +8158,7 @@ msgstr "%s: помилка перейменування %s на %s: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "виклик: %s звідки куди файли...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8024,37 +8170,37 @@ msgstr ""
 "використовувати.\n"
 "Сценарій не запущено.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "використання: script [-a] [-f] [-q] [-t] [файл]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Сценарій запущено, файл - %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, fuzzy, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "помилка запису на %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Сценарій запущено на %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, fuzzy, c-format
 msgid "%s: write error: %s\n"
 msgstr "помилка запису на %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, fuzzy, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: не вдається знайти пристрій для %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8063,17 +8209,17 @@ msgstr ""
 "\n"
 "Сценарій завершено на %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Сценарій завершено, файл %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "помилка openpty\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Скінчились pty-пристрої\n"
@@ -8420,6 +8566,16 @@ msgstr "прочитано %c\n"
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "%s: не вдається відкрити: %s\n"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "не вдається запустити %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8450,6 +8606,11 @@ msgstr "Помилка читання %s\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "неправильний ідентифікатор"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8467,7 +8628,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -8487,12 +8648,12 @@ msgstr "помилка зімни режиму доступу до %s: %s\n"
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -8520,83 +8681,83 @@ msgstr "Використання: %s [параметри] пристрій ...\n
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM каталог ... -f ] назва...\n"
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 #, fuzzy
 msgid "calloc failed"
 msgstr "помилка виділення пам'яті"
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "Помилка відкривання %s"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, fuzzy, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
+"\n"
+"Помилка закривання файлу\n"
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
+#, fuzzy, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "Диск %s не містить правильної таблиці розділів\n"
+
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, fuzzy, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "помилка openpty\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, fuzzy, c-format
 msgid "%zd bytes ["
 msgstr "байт"
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "помилка openpty\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr "Неправильне встановлене значення: %s\n"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr "Використання: %s [параметри] пристрій ...\n"
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8847,7 +9008,7 @@ msgstr ""
 "Програма mount була скомпільована без підтримки loop-пристроїв. "
 "Перекомпілюйте її \n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8867,7 +9028,7 @@ msgstr ""
 "  %s -f                                               # знайти вільний\n"
 "  %s [ -e шифрування ] [ -o зсув ] loop_пристрій файл # встановити\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8883,250 +9044,294 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "Неправильне встановлене значення: %s\n"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "Неправильне встановлене значення: %s\n"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: не вдається відкрити пристрій %s: %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: пристрій зайнятий"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "При компіляції не було ввімкнено підтримку loop-пристроїв. Перекомпілюйте.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, fuzzy, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: не вдається знайти %s у %s або %s"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: згідно mtab, %s вже підключений у %s"
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: згідно mtab, %s підключений у %s"
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: не вдається відкрити %s для запису: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: помилка запису %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: помилка зміни прав доступу до %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, fuzzy, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, fuzzy, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: помилка створення процесу: %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Випробовується %s\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: ви не вказали тип файлової системи для %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       будуть випробувані всі типи вказані у %s або %s\n"
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       та він схожий розділ підкачки\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       буде випробувано тип %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s схожий на розділ підкачки - не підключатиметься"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "помилка підключення"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: лише адміністратор(root) може підключати %s у %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: loop-пристрій вказано двічі"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: тип вказано двічі"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: пропускається встановлення loop-пристрою\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "Неправильне встановлене значення: %s\n"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "Неправильне встановлене значення: %s\n"
+
+#: mount/mount.c:1160
 #, fuzzy, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: згідно mtab, %s вже підключений у %s"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: буде використовуватись loop-пристрій %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, fuzzy, c-format
 msgid "mount: stolen loop=%s"
 msgstr "umount: %s: %s"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: помилка встановлення loop-пристрою\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: встановлення loop-пристрою успішно завершено\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: не знайдено %s - створюється..\n"
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: не вдається відкрити %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr "mount: аргумент для -p або --pass-fd повинен бути числом"
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: помилка відкривання %s для встановлення швидкості"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, fuzzy, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: згідно mtab, %s вже підключений у %s"
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, fuzzy, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr "umount: %s зайнятий - перепідключено у режим лише-для-читання\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "umount: %s зайнятий - перепідключено у режим лише-для-читання\n"
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: не вдається визначити тип файлової системи, та тип явно не вказаний"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: необхідно вказати тип файлової системи"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: помилка підключення"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: точка монтування %s не є каталогом"
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: доступ заборонено"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: для використання mount необхідно мати права адміністратора"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s зайнятий"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: proc вже підключено"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s вже підключено або %s зайнятий"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: точка монтування %s не існує"
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: точка монтування %s є символічним посиланням, яке вказує нікуди"
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: спеціальний пристрій %s не існує"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9135,12 +9340,12 @@ msgstr ""
 "mount: спеціальний пристрій %s не існує\n"
 "       (префікс шляху не є каталогом)\n"
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s ще не підключений, або неправильний параметр"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, fuzzy, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9150,13 +9355,13 @@ msgstr ""
 "неправильний суперблок на %s,\n"
 "       відсутня кодова сторінка або інша помилка"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9164,7 +9369,7 @@ msgstr ""
 "       (може це пристрій IDE, для якого ви фактично використовуєте\n"
 "       ide-scsi, тому потрібні sr0, або sda чи щось подібне?)"
 
-#: mount/mount.c:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9173,7 +9378,7 @@ msgstr ""
 "partition,\n"
 "       instead of some logical partition inside?)"
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9182,109 +9387,104 @@ msgstr ""
 "журналі\n"
 "       спробуйте - dmesg | tail  чи щось подібне\n"
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "таблиця монтування переповнена"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: не вдається прочитати суперблок"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: невідомий пристрій"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: невідомий тип файлової системи '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: можливо ви мали на увазі %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: можливо ви мали на увазі 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: можливо ви мали на увазі iso9660 ?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s має неправильний номер пристрою або файлова система типу %s не "
 "підтримується"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s не є блочним пристроєм, та stat зазнав невдачі?"
 
-#: mount/mount.c:1549
-#, c-format
+#: mount/mount.c:1627
+#, fuzzy, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 "mount: ядро не розпізнало %s як блочний пристрій\n"
 "       (можливо треба виконати `insmod драйвер'?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s не є блочним пристроєм (можливо, спробуйте `-o loop'?)"
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s не є блочним пристроєм"
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s не є правильним блочним пристроєм"
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "блочний пристрій "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: не вдається підключити %s%s лише для читання"
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s захищений від запису, але було вказано ключ `-w'"
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, fuzzy, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr "mount: не вдається підключити %s%s лише для читання"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s захищений від запису, монтується лише для читання"
 
-#: mount/mount.c:1598
-#, fuzzy, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: не знайдено %s - створюється..\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, fuzzy, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: %s вже підключений у %s\n"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9294,22 +9494,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: не вказано тип - вважається nfs, через наявність двокрапки\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr "mount: не вказано тип - вважається cifs, через наявність префіксу //\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s вже підключений у %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, fuzzy, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9369,39 +9569,39 @@ msgstr ""
 "Інші параметри: [-nfFrsvw] [-o параметри] [-p пароль].\n"
 "Додаткову інформацію дивіться у man 8 mount .\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr "mount: це може робити лише адміністратор(root)"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: це може робити лише адміністратор(root)"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "нічого не було підключено"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: не знайдено такого розділу"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: не вдається знайти %s у %s або %s"
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr "[mntent]: Попередження: відсутній символ нового рядка наприкінці %s\n"
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: рядок %d у %s неправильний%s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; залишок файлу ігнорується"
 
@@ -9414,7 +9614,7 @@ msgstr "помилка при виклику xstrndup"
 msgid "not enough memory"
 msgstr "недостатньо пам'яті"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9425,7 +9625,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9438,7 +9638,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9450,127 +9650,132 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Неочікуваний кінець файла у файлі %s\n"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "помилка створення процесу\n"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "помилка запуску\n"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 #, fuzzy
 msgid "waitpid failed"
 msgstr "помилка setuid()"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Помилка відкривання %s"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 #, fuzzy
 msgid "same"
 msgstr "Назва"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: попередження: %s має небезпечні права %04o, пропонується %04o\n"
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: пропускається файл %s - схоже, що він містить дірки.\n"
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s на %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: не вдається знайти пристрій для %s\n"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 #, fuzzy
 msgid "Not superuser."
 msgstr "Не адміністратор.\n"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9580,37 +9785,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: зібрано без підтримки -f\n"
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, fuzzy, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, fuzzy, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: не вдається запустити дочірній процес: %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: неправильний блочний пристрій"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: не підключений"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: не вдається записати суперблок"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9618,52 +9823,52 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: не існує"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 "umount: %s: для використання umount необхідно мати права адміністратора"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: блочні пристрої не дозволено на файловій системі"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "немає umount2, пробується umount...\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s зайнятий - перепідключено у режим лише-для-читання\n"
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: не вдається перепідключити %s у режим лише-для-читання\n"
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s відключено\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: не вдається знайти перелік файлових систем для відключення"
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, fuzzy, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9674,80 +9879,85 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t тип_фс] [-O параметри]\n"
 "       umount [-f] [-r] [-n] [-v] спец_файл | каталог...\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, fuzzy, c-format
 msgid "device %s is associated with %s\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, fuzzy, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Не вдається відключити \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Спроба відключити %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "не вдається знайти %s у mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s не є підключеним (згідно mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: здається %s підключений декілька разів"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s відсутній у fstab (та ви не адміністратор)"
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: підключений %s відрізняється від fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: лише %s може відключити %s від %s"
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: це може робити лише адміністратор(root)"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9755,77 +9965,96 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, fuzzy, c-format
 msgid "failed to get pid %d's policy"
 msgstr "не вдається записати розділ на %s\n"
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, fuzzy, c-format
 msgid "unknown\n"
 msgstr "невідомий"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
+#, c-format
+msgid "pid %d's new scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:149
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's current scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, fuzzy, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "NFS через TCP не підтримується.\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: schedutils/chrt.c:225
-#, fuzzy
-msgid "current"
-msgstr "ncount"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 #, fuzzy
 msgid "failed to parse priority"
 msgstr "не вдається записати розділ на %s\n"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, fuzzy, c-format
 msgid "failed to set pid %d's policy"
 msgstr "не вдається записати розділ на %s\n"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Новий"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "помилка зчитування часу у ioctl() з %s"
@@ -9848,7 +10077,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9877,11 +10106,119 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-#, fuzzy
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
 msgstr "помилка запуску\n"
 
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "використання: %s програма [аргументи ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr "Finger інформацію змінено.\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "не вдається отримати розмір %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "помилка виділення пам'яті"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "не вдається записати розділ на %s\n"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "%s: не вдається відкрити: %s\n"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "не вдається записати розділ на %s\n"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "помилка позиціювання"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "помилка позиціювання"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " та "
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -10028,7 +10365,15 @@ msgstr "   %f перерв/сек; %f отрим (симв/сек)\n"
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr "Використання: %s [-c] [-n рівень] [-s розмір_буферу]\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10037,38 +10382,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Надто багато параметрів.\n"
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Неправильне встановлене значення: %s\n"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Неправильне встановлене значення: %s\n"
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no filename specified."
 msgstr "Не було вказано параметр --date.\n"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "максимальна кількість сегментів = %lu\n"
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "помилка openpty\n"
@@ -10115,6 +10465,59 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "помилка створення процесу\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr "Finger інформацію змінено.\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "Не було вказано параметр --date.\n"
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "Не було вказано параметр --date.\n"
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "помилка при встановленні позиції"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "кореневий вузол не є каталогом"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "помилка openpty\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "помилка openpty\n"
+
 #: sys-utils/ipcmk.c:84
 #, fuzzy, c-format
 msgid ""
@@ -10208,476 +10611,451 @@ msgstr ""
 "Використання: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: неправильний параметр -- %c\n"
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: неправильний ключ (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "доступ заборонено для ключа"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "ключ вже видалено"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "неправильний ключ"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "невідома помилка у ключі"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "доступ заборонено для ідентифікатора"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "неправильний ідентифікатор"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "ідентифікатор вже видалений"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "невідома помилка у ідентифікаторі"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: невідомий аргумент: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "використання : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i ідентифікатор\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h виводить довідку.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
-"%s надає інформацію про ipc ресурси, для яких у вас є доступ для читання.\n"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Специфікація ресурсу:\n"
-"\t-m : спільна_пам'ять\n"
-"\t-q : повідомлення\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : семафори\n"
-"\t-a : усе (типово)\n"
+"%s надає інформацію про ipc ресурси, для яких у вас є доступ для читання.\n"
 
-#: sys-utils/ipcs.c:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
-msgstr ""
-"Формат виводу:\n"
-"\t-t : час\n"
-"\t-p : pid\n"
-"\t-c : власник\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : подробиці про ресурс з ідентифікатором id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : обмеження\n"
-"\t-u : зведення\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
-msgstr "-i id [-s -q -m] : подробиці про ресурс з ідентифікатором id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr "підтримку спільної пам'яті не налаштовано у ядрі\n"
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Обмеження спільної пам'яті --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "максимальна кількість сегментів = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "максимальний розмір сегмента (кілобайт) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, fuzzy, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "максимум загалом спільної пам'яті (кілобайт) = %lu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "мінімальний розмір сегменту (байт) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Стан спільної пам'яті --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "виділених сегментів %d\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "виділених сторінок %ld\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "резидентних сторінок %ld\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "вивантажених сторінок %ld\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Швидкодія підкачки: %ld спроб\t %ld вдалих\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Автори/Власники сегментів спільної пам'яті --------\n"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "права"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Час приєднання/від'єднання/зміни спільної пам'яті --------\n"
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "власник"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "приєднано"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "від'єднано"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "змінено"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ Автор/останній-оп спільної пам'яті --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Сегменти спільної пам'яті --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "ключ"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "байт"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "кільк.підкл"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "стан"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Не встан."
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "зруйн"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "блоковано"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr "підтримку семафорів не налаштовано у ядрі\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Обмеження семафорів --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "максимальна кількість масивів = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "максимум семафорів на масив = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "максимум семафорів у системі = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "максимум операцій за semop виклик = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "максимальне значення семафору = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Стан семафору --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "використано масивів = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "виділено семафорів = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Автори/Власники масивів семафорів --------\n"
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, fuzzy, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ Час операції/зміни спільної пам'яті --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "остан-оп"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "остан-змін"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Масиви семафорів --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "кільк.сем"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr "підтримку черг повідомлень не налаштовано у ядрі\n"
 
-#: sys-utils/ipcs.c:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Повідомлення: обмеження --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "максимум черг у системі = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "максимальний розмір повідомлення (байт) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "типовий максимальний розмір черги (байт) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Повідомлення: стан --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "виділено черг = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "використано заголовків = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "використано простору = %d байт\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, c-format
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr "------ Черги повідомлень: Автори/Власники --------\n"
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Час відправлення/отримання/зміни черг повідомлень--------\n"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "відправлено"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "отримано"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "змінено"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID черг повідомлень --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Черги повідомлень --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "використано-байт"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "повідомлень"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "помилка виконання fsync"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10686,42 +11064,42 @@ msgstr ""
 "\n"
 "Сегмент спільної пам'яті shmid=%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "режим=%#o\tправа_доступу=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "байт=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "час_приєдн=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "час_від'єдн=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "час_змін=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "помилка виконання fsync"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10730,32 +11108,32 @@ msgstr ""
 "\n"
 "Черга повідомлень msqid=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "час_надсил=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "час_отрим=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "помилка при встановленні позиції"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10764,159 +11142,182 @@ msgstr ""
 "\n"
 "Масив семафорів semid=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "режим=%#o, права_дост=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "кільк.сем = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "ном.сем"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "значення"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "неправильний ідентифікатор: %s\n"
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s з %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 #, fuzzy
 msgid "invalid option"
 msgstr "неправильний ідентифікатор"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s не є спеціальним файлом блочного пристрою"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Помилка позиціювання на дисковому пристрої"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "Немає"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
 #, fuzzy, c-format
-msgid "error: %s"
-msgstr "Помилка РВ: "
+msgid "error: cannot open %s"
+msgstr "%s: не вдається відкрити %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, fuzzy, c-format
-msgid "error parse: %s"
-msgstr "помилка читання %s\n"
+msgid "failed to read: %s"
+msgstr "не вдається запустити %s"
+
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "помилка позиціювання"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 #, fuzzy
 msgid "error: strdup failed"
 msgstr "Помилка відкривання %s"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "не вдається виділити буфер.\n"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "%s: не вдається відкрити: %s\n"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr ""
 "\n"
 "Помилка закривання файлу\n"
 
-#: sys-utils/lscpu.c:506
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
 #, fuzzy
-msgid "error: malloc failed"
+msgid "error: calloc failed"
 msgstr "помилка виділення пам'яті"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10925,70 +11326,83 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 #, fuzzy
 msgid "Virtualization:"
 msgstr "Старий стан:\n"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10997,74 +11411,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, fuzzy, c-format
-msgid "error: change working directory to %s."
-msgstr "помилка зімни режиму доступу до %s: %s\n"
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"використання: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-"  rdev /dev/fd0  (або rdev /linux, тощо.) відображає поточний ROOT пристрій"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         встановлює ROOT у /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              встановлює ROOTFLAGS (стан лише-для-"
-"читання)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            встановлює розмір RAMDISK"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-"  rdev -v /dev/fd0 1              встановлює VIDEOMODE при завантаженні"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   зсув у байтах N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   те ж саме, що rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     те ж саме, що rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     те ж саме, що rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Зауваження: відео режими: -3=Питати, -2=РозширенийVGA, -1=ЗвичайнийVga, "
-"1=key1, 2=key2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-"      використовуйте -R 1 для підключення лише-для-читання, -R 0 для читання/"
-"запису."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "відсутня кома"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11177,11 +11523,12 @@ msgstr "setpriority"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: старий пріоритет %d, новий пріоритет %d\n"
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11191,106 +11538,131 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, fuzzy, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr " %s: невідомий тип таблиці розділів\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, fuzzy, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: неправильний ключ (%s)\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, fuzzy, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: неправильний параметр -- %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, fuzzy, c-format
 msgid "%s: version %s\n"
 msgstr "%s версія %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Використовується %s.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Використовується %s.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 #, fuzzy
 msgid "malloc() failed"
 msgstr "помилка виділення пам'яті"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, fuzzy, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s не є lp пристроєм.\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "Повідомлення від %s@%s до %s у %s ..."
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, fuzzy, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr "не вдається перейменувати %s у %s: %s\n"
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 #, fuzzy
 msgid "rtc read"
 msgstr ", готовий"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -11387,6 +11759,11 @@ msgstr "%s: неправильне значення\n"
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s не є lp пристроєм.\n"
 
+#: sys-utils/tunelp.c:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "помилка LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11417,6 +11794,11 @@ msgstr ", on-line"
 msgid ", error"
 msgstr ", помилка"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: помилка підключення"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "помилка LPGETIRQ"
@@ -11460,6 +11842,16 @@ msgid "unshare failed"
 msgstr "помилка при встановленні позиції"
 
 #: sys-utils/unshare.c:118
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: помилка встановлення швидкості: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: помилка встановлення швидкості: %s"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "помилка запуску\n"
@@ -11983,6 +12375,231 @@ msgstr "Вхідний рядок надто довгий.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Недостатньо пам'яті для збільшення буфера.\n"
 
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: неправильний параметр -- %c\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "виділених сегментів %d\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "виділених сторінок %ld\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "резидентних сторінок %ld\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "вивантажених сторінок %ld\n"
+
+#~ msgid "Swap performance: %ld attempts\t %ld successes\n"
+#~ msgstr "Швидкодія підкачки: %ld спроб\t %ld вдалих\n"
+
+#, fuzzy
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "помилка запуску final_prog\n"
+
+#, fuzzy
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "Неправильне встановлене значення: %s\n"
+
+#, fuzzy
+#~ msgid "current"
+#~ msgstr "ncount"
+
+#, fuzzy
+#~ msgid "new"
+#~ msgstr "Новий"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ 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 ""
+#~ "Використання: fdisk [-b SSZ] [-u] ДИСК  Змінити таблицю розділів\n"
+#~ "       fdisk -l [-b SSZ] [-u] ДИСК      Вивести таблицю розділів\n"
+#~ "       fdisk -s РОЗДІЛ                  Вивести розмір розділів у блоках\n"
+#~ "       fdisk -v                         Вивести версію fdisk\n"
+#~ "Де ДИСК - щось на зразок /dev/hdb чи /dev/sda,\n"
+#~ "а РОЗДІЛ - щось на зразок /dev/hda7\n"
+#~ "-u: виводити початковий та кінцевий сектори (замість циліндрів)\n"
+#~ "-b 2048: (для деяких MO дисків) використовуються 2048-байтові сектори\n"
+
+#~ 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 ""
+#~ "Використання: fdisk [-l] [-b SSZ] [-u] пристрій\n"
+#~ "Напр.: fdisk /dev/hda  (перший IDE диск)\n"
+#~ "  або: fdisk /dev/sdc  (третій SCSI диск)\n"
+#~ "  або: fdisk /dev/eda  (перший PS/2 ESDI диск)\n"
+#~ "  або: fdisk /dev/rd/c0d0  або: fdisk /dev/ida/c0d0  (RAID пристрої)\n"
+#~ "  ...\n"
+
+#~ 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"
+#~ "Кількість циліндрів на диску встановлено у %d.\n"
+#~ "У цьому немає нічого страшного, але це більше ніж 1024,\n"
+#~ "та у деяких випадках може спричинити проблеми з:\n"
+#~ "1) ПЗ яке виконується при завантаженні (наприклад, старі версії LILO)\n"
+#~ "2) завантаженням та зміною розділів з інших операційних систем\n"
+#~ "   (наприклад, DOS FDISK, OS/2 FDISK)\n"
+
+#, fuzzy
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: не знайдено %s - створюється..\n"
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "помилка запуску\n"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "використання : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i ідентифікатор\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h виводить довідку.\n"
+
+#~ msgid ""
+#~ "Resource Specification:\n"
+#~ "\t-m : shared_mem\n"
+#~ "\t-q : messages\n"
+#~ msgstr ""
+#~ "Специфікація ресурсу:\n"
+#~ "\t-m : спільна_пам'ять\n"
+#~ "\t-q : повідомлення\n"
+
+#~ msgid ""
+#~ "\t-s : semaphores\n"
+#~ "\t-a : all (default)\n"
+#~ msgstr ""
+#~ "\t-s : семафори\n"
+#~ "\t-a : усе (типово)\n"
+
+#~ msgid ""
+#~ "Output Format:\n"
+#~ "\t-t : time\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : creator\n"
+#~ msgstr ""
+#~ "Формат виводу:\n"
+#~ "\t-t : час\n"
+#~ "\t-p : pid\n"
+#~ "\t-c : власник\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : обмеження\n"
+#~ "\t-u : зведення\n"
+
+#, fuzzy
+#~ msgid "error: %s"
+#~ msgstr "Помилка РВ: "
+
+#, fuzzy
+#~ msgid "error parse: %s"
+#~ msgstr "помилка читання %s\n"
+
+#, fuzzy
+#~ msgid "error: change working directory to %s."
+#~ msgstr "помилка зімни режиму доступу до %s: %s\n"
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr ""
+#~ "використання: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+
+#~ msgid ""
+#~ "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#~ msgstr ""
+#~ "  rdev /dev/fd0  (або rdev /linux, тощо.) відображає поточний ROOT "
+#~ "пристрій"
+
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         встановлює ROOT у /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              встановлює ROOTFLAGS (стан лише-для-"
+#~ "читання)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            встановлює розмір RAMDISK"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr ""
+#~ "  rdev -v /dev/fd0 1              встановлює VIDEOMODE при завантаженні"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  rdev -o N ...                   зсув у байтах N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   те ж саме, що rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     те ж саме, що rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     те ж саме, що rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Зауваження: відео режими: -3=Питати, -2=РозширенийVGA, -1=ЗвичайнийVga, "
+#~ "1=key1, 2=key2,..."
+
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr ""
+#~ "      використовуйте -R 1 для підключення лише-для-читання, -R 0 для "
+#~ "читання/запису."
+
+#~ msgid "missing comma"
+#~ msgstr "відсутня кома"
+
 #, fuzzy
 #~ msgid "out if memory"
 #~ msgstr "недостатньо пам'яті"
diff --git a/po/util-linux-ng.pot b/po/util-linux-ng.pot
index 0ce9757b..ed052a5d 100644
--- a/po/util-linux-ng.pot
+++ b/po/util-linux-ng.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+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"
@@ -97,6 +97,11 @@ msgstr ""
 msgid "Usage:\n"
 msgstr ""
 
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid "  %s -V\n"
+msgstr ""
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -116,6 +121,17 @@ msgstr ""
 msgid "get size in 512-byte sectors"
 msgstr ""
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr ""
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -215,15 +231,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr ""
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr ""
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -319,7 +326,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr ""
 
@@ -905,7 +912,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -929,7 +936,7 @@ msgstr ""
 msgid "not enough space, need at least %llu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
@@ -1003,7 +1010,7 @@ msgstr ""
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1211,7 +1218,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1291,166 +1298,171 @@ msgstr ""
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr ""
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr ""
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 msgid "unable to alloc new libblkid probe"
 msgstr ""
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
+#: disk-utils/mkswap.c:400
+msgid "unable to assign device to libblkid probe"
 msgstr ""
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 msgid "unable to erase bootbits sectors"
 msgstr ""
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr ""
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "        on whole disk. "
 msgstr ""
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, c-format
 msgid "        (compiled without libblkid). "
 msgstr ""
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr ""
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr ""
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr ""
@@ -1513,61 +1525,107 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, c-format
+msgid "%s: unable to probe device"
 msgstr ""
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
+
+#: disk-utils/swaplabel.c:71
+#, c-format
+msgid "%s: not a valid swap partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
+#: disk-utils/swaplabel.c:77
+#, c-format
+msgid "%s: unsupported swap version '%s'"
 msgstr ""
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
+#: disk-utils/swaplabel.c:108
+#, c-format
+msgid "%s: failed to open"
 msgstr ""
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
+#: disk-utils/swaplabel.c:117
+#, c-format
+msgid "failed to parse UUID: %s"
 msgstr ""
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
+#: disk-utils/swaplabel.c:121
+#, c-format
+msgid "%s: failed to seek to swap UUID"
 msgstr ""
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
+#: disk-utils/swaplabel.c:125
+#, c-format
+msgid "%s: failed to write UUID"
 msgstr ""
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
+#: disk-utils/swaplabel.c:136
+#, c-format
+msgid "%s: failed to seek to swap label "
 msgstr ""
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
 msgstr ""
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
+#: disk-utils/swaplabel.c:146
+#, c-format
+msgid "%s: failed to write label"
 msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:415
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr ""
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr ""
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr ""
+
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1576,773 +1634,773 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr ""
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr ""
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr ""
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr ""
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr ""
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr ""
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr ""
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr ""
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr ""
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr ""
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr ""
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr ""
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr ""
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr ""
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr ""
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr ""
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr ""
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr ""
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr ""
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr ""
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr ""
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr ""
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr ""
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr ""
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr ""
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr ""
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr ""
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr ""
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr ""
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr ""
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr ""
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr ""
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr ""
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr ""
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr ""
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr ""
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr ""
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr ""
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr ""
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr ""
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr ""
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr ""
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr ""
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr ""
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr ""
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr ""
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr ""
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr ""
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr ""
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr ""
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr ""
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr ""
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr ""
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr ""
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2385,9 +2443,9 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr ""
 
@@ -2407,9 +2465,9 @@ msgstr ""
 msgid "   l   list known filesystem types"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr ""
 
@@ -2421,14 +2479,14 @@ msgstr ""
 msgid "   p   print BSD partition table"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr ""
 
@@ -2471,13 +2529,13 @@ msgstr ""
 msgid "BSD disklabel command (m for help): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2620,7 +2678,7 @@ msgstr ""
 msgid "tracks/cylinder"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr ""
@@ -2678,7 +2736,7 @@ msgstr ""
 msgid "Partition (a-%c): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr ""
@@ -2700,233 +2758,218 @@ msgid ""
 "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:257
 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 ""
-
-#: fdisk/fdisk.c:260
-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"
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
 msgstr ""
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr ""
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr ""
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr ""
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr ""
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr ""
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr ""
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr ""
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr ""
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr ""
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr ""
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr ""
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr ""
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr ""
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr ""
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr ""
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr ""
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr ""
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr ""
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr ""
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr ""
 
-#: fdisk/fdisk.c:747
-#, 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 ""
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -2937,70 +2980,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3009,152 +3051,148 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, 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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr ""
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr ""
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr ""
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr ""
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr ""
 
-#: fdisk/fdisk.c:1548
+#: fdisk/fdisk.c:1614
 #, c-format
-msgid "Changing display/entry units to %s\n"
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1616
+#, c-format
+msgid "Changing display/entry units to sectors\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1569
+#: fdisk/fdisk.c:1636
 #, c-format
-msgid "DOS Compatibility flag is set\n"
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3163,14 +3201,14 @@ msgid ""
 "a partition using the `d' command.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3178,7 +3216,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3186,113 +3224,118 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr ""
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3300,23 +3343,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr ""
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3324,87 +3367,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3413,7 +3456,7 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3422,22 +3465,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3445,32 +3488,32 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr ""
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr ""
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3479,7 +3522,7 @@ msgid ""
 "the next reboot or after you run partprobe(8) or kpartx(8)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3488,49 +3531,49 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3539,64 +3582,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3673,15 +3716,15 @@ msgstr ""
 msgid "SGI xvm"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr ""
 
@@ -3785,7 +3828,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr ""
@@ -3874,7 +3917,7 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr ""
 
@@ -3924,7 +3967,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -3942,55 +3985,55 @@ msgstr ""
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -3999,28 +4042,28 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4029,50 +4072,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
 "and is of type `Whole disk'\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4080,14 +4123,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, 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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4096,12 +4139,12 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4109,37 +4152,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -4348,6 +4391,10 @@ msgstr ""
 msgid "Linux swap / Solaris"
 msgstr ""
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr ""
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr ""
@@ -4926,248 +4973,248 @@ msgstr ""
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5176,108 +5223,108 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, 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:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5285,90 +5332,90 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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 ""
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5376,113 +5423,113 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr ""
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr ""
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr ""
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr ""
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr ""
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr ""
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr ""
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, c-format
 msgid "fsck from %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr ""
@@ -5943,7 +5990,13 @@ msgstr ""
 msgid "Unable to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5952,39 +6005,39 @@ msgid ""
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, 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:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6003,6 +6056,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6024,7 +6078,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6032,77 +6086,77 @@ msgid ""
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6382,12 +6436,12 @@ msgstr ""
 msgid "Changing finger information for %s.\n"
 msgstr ""
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr ""
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -6601,244 +6655,249 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr ""
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr ""
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr ""
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr ""
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr ""
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr ""
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr ""
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr ""
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr ""
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr ""
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr ""
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr ""
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr ""
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr ""
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr ""
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr ""
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr ""
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr ""
@@ -7089,7 +7148,7 @@ msgstr ""
 
 #: login-utils/simpleinit.c:938
 #, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr ""
 
 #: login-utils/simpleinit.c:950
@@ -7099,7 +7158,7 @@ msgstr ""
 
 #: login-utils/simpleinit.c:1070
 #, c-format
-msgid "error running programme: \"%s\"\n"
+msgid "error at starting service \"%s\"\n"
 msgstr ""
 
 #: login-utils/ttymsg.c:75
@@ -7226,25 +7285,25 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr ""
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr ""
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr ""
@@ -7268,6 +7327,107 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr ""
 
+#: misc-utils/findmnt.c:192
+#, c-format
+msgid "unknown column: %s"
+msgstr ""
+
+#: misc-utils/findmnt.c:308
+msgid "failed to add line to output"
+msgstr ""
+
+#: misc-utils/findmnt.c:359
+msgid "failed to initialize libmount tab"
+msgstr ""
+
+#: misc-utils/findmnt.c:364
+#, c-format
+msgid "can't read: %s"
+msgstr ""
+
+#: misc-utils/findmnt.c:370
+#, c-format
+msgid "%s: parse error: %s"
+msgstr ""
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, c-format
+msgid "unknown direction '%s'"
+msgstr ""
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+msgid "failed to initialize libmount iterator"
+msgstr ""
+
+#: misc-utils/findmnt.c:685
+msgid "failed to initialize libmount cache"
+msgstr ""
+
+#: misc-utils/findmnt.c:695
+msgid "failed to initialize output table"
+msgstr ""
+
+#: misc-utils/findmnt.c:707
+msgid "failed to initialize output column"
+msgstr ""
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7417,7 +7577,7 @@ msgstr ""
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7425,54 +7585,54 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:173
+#: misc-utils/script.c:182
 #, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr ""
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr ""
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr ""
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr ""
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
@@ -7811,6 +7971,16 @@ msgstr ""
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:261
+#, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr ""
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -7841,6 +8011,11 @@ msgstr ""
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, c-format
+msgid "operation %d\n"
+msgstr ""
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -7858,7 +8033,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -7878,12 +8053,12 @@ msgstr ""
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -7911,81 +8086,79 @@ msgstr ""
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
 msgstr ""
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
 msgstr ""
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, c-format
+msgid "error: %s: probing initialization failed"
 msgstr ""
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:213
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "WARNING: %s: appears to contain '%s' partition table"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:259
+#, c-format
+msgid "no magic string found at offset 0x%jx -- ignored"
+msgstr ""
+
+#: misc-utils/wipefs.c:266
 #, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr ""
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, c-format
 msgid "%s: write failed"
 msgstr ""
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, c-format
 msgid "%zd bytes ["
 msgstr ""
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, c-format
 msgid "%s: open failed"
 msgstr ""
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
-#, c-format
-msgid "invalid offset '%s' value specified"
-msgstr ""
-
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
+#: misc-utils/wipefs.c:329
 #, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid "invalid offset value '%s' specified"
 msgstr ""
 
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8222,7 +8395,7 @@ msgstr ""
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8237,7 +8410,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8253,389 +8426,428 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1023
+#, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr ""
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr ""
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr ""
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr ""
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr ""
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1155
+#, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr ""
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr ""
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or helper program, or other error"
 msgstr ""
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr ""
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr ""
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr ""
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr ""
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8645,22 +8857,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8697,39 +8909,39 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr ""
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr ""
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr ""
 
@@ -8742,7 +8954,7 @@ msgstr ""
 msgid "not enough memory"
 msgstr ""
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -8753,7 +8965,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -8766,7 +8978,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -8778,122 +8990,127 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 msgid "fork failed"
 msgstr ""
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 msgid "execv failed"
 msgstr ""
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
 msgstr ""
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, c-format
 msgid "%s: write signature failed"
 msgstr ""
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "same"
 msgstr ""
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, c-format
 msgid "%s: stat failed"
 msgstr ""
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, c-format
 msgid "%s: get size failed"
 msgstr ""
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, c-format
 msgid "%s: swapon failed"
 msgstr ""
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, c-format
 msgid "cannot find the device for %s"
 msgstr ""
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr ""
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, c-format
 msgid "%s: swapoff failed"
 msgstr ""
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -8903,37 +9120,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8941,51 +9158,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:272
+#: mount/umount.c:278
 #, c-format
-msgid "%s umounted\n"
+msgid "%s has been unmounted\n"
 msgstr ""
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -8993,80 +9210,84 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
 msgstr ""
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
 msgstr ""
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+msgid "Cannot unmount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:493
+#: mount/umount.c:499
 #, c-format
-msgid "Trying to umount %s\n"
+msgid "Trying to unmount %s\n"
 msgstr ""
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9074,73 +9295,94 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's new scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:106
+#, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:139
 #, c-format
 msgid "unknown\n"
 msgstr ""
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 msgid "failed to parse pid"
 msgstr ""
 
-#: schedutils/chrt.c:225
-msgid "current"
+#: schedutils/chrt.c:273
+msgid "failed to parse priority"
 msgstr ""
 
-#: schedutils/chrt.c:233
-msgid "failed to parse priority"
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
 msgstr ""
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:242
-msgid "new"
-msgstr ""
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, c-format
 msgid "failed to execute %s"
 msgstr ""
@@ -9161,7 +9403,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9190,8 +9432,113 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
-msgid "execvp failed"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, c-format
+msgid "executing %s failed"
+msgstr ""
+
+#: schedutils/taskset.c:38
+#, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+
+#: schedutils/taskset.c:113
+msgid "cannot determine NR_CPUS; aborting"
+msgstr ""
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+msgid "cpuset_alloc failed"
+msgstr ""
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, c-format
+msgid "failed to get pid %d's affinity"
+msgstr ""
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, c-format
+msgid "failed to parse %s %s"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, c-format
+msgid "failed to set pid %d's affinity"
+msgstr ""
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+msgid "parse error at lines: "
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:503
+msgid "parse error at line: "
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:523
+#, c-format
+msgid " and %d."
 msgstr ""
 
 #: sys-utils/ctrlaltdel.c:27
@@ -9327,7 +9674,15 @@ msgstr ""
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -9336,34 +9691,38 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 msgid "no length argument specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 msgid "no filename specified."
 msgstr ""
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+msgid "unexpected number of arguments"
+msgstr ""
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, c-format
 msgid "%s: fallocate failed"
 msgstr ""
@@ -9410,6 +9769,57 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr ""
 
+#: sys-utils/fsfreeze.c:41
+#, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:90
+msgid "no action specified"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:92
+msgid "no filename specified"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:105
+#, c-format
+msgid "%s: fstat failed"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:110
+#, c-format
+msgid "%s: is not a directory"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:116
+#, c-format
+msgid "%s: freeze failed"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:121
+#, c-format
+msgid "%s: unfreeze failed"
+msgstr ""
+
 #: sys-utils/ipcmk.c:84
 #, c-format
 msgid ""
@@ -9494,685 +9904,693 @@ msgid ""
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr ""
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:127
 #, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
 #, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr ""
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr ""
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr ""
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr ""
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr ""
 
-#: sys-utils/ipcs.c:299
+#: sys-utils/ipcs.c:327
 #, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr ""
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr ""
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr ""
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr ""
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr ""
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr ""
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr ""
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr ""
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr ""
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr ""
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr ""
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:490
+#: sys-utils/ipcs.c:518
 #, c-format
-msgid "------ Messages: Limits --------\n"
+msgid "------ Messages Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:497
+#: sys-utils/ipcs.c:525
 #, c-format
-msgid "------ Messages: Status --------\n"
+msgid "------ Messages Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:532
 #, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr ""
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr ""
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr ""
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr ""
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr ""
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
 msgstr ""
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
 msgstr ""
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
 msgstr ""
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, c-format
+msgid "invalid iflag: %s"
+msgstr ""
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
 msgstr ""
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 msgid "none"
 msgstr ""
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
+#: sys-utils/lscpu.c:158
+#, c-format
+msgid "error: cannot open %s"
+msgstr ""
+
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
 #, c-format
-msgid "error: %s"
+msgid "failed to read: %s"
 msgstr ""
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:209
 #, c-format
-msgid "error parse: %s"
+msgid "parse error: %s"
 msgstr ""
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:267
-msgid "error: uname failed"
+#: sys-utils/lscpu.c:260
+msgid "failed to callocate cpu set"
 msgstr ""
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
+#: sys-utils/lscpu.c:263
+#, c-format
+msgid "failed to parse CPU mask %s"
+msgstr ""
+
+#: sys-utils/lscpu.c:318
+msgid "error: uname failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+msgid "error: calloc failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10181,69 +10599,82 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr ""
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10252,65 +10683,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr ""
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr ""
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr ""
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr ""
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr ""
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr ""
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -10409,11 +10781,12 @@ msgstr ""
 msgid "%d: old priority %d, new priority %d\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -10423,104 +10796,129 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr ""
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -10612,6 +11010,10 @@ msgstr ""
 msgid "%s: %s not an lp device.\n"
 msgstr ""
 
+#: sys-utils/tunelp.c:259
+msgid "LPGETSTATUS error"
+msgstr ""
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -10642,6 +11044,10 @@ msgstr ""
 msgid ", error"
 msgstr ""
 
+#: sys-utils/tunelp.c:274
+msgid "tunelp: ioctl failed"
+msgstr ""
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr ""
@@ -10684,6 +11090,14 @@ msgid "unshare failed"
 msgstr ""
 
 #: sys-utils/unshare.c:118
+msgid "cannot set group id"
+msgstr ""
+
+#: sys-utils/unshare.c:121
+msgid "cannot set user id"
+msgstr ""
+
+#: sys-utils/unshare.c:125
 #, c-format
 msgid "exec %s failed"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index caea1638..b6c158f9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,15 +1,15 @@
 # Vietnamese translation for Util-Linux-NG.
-# Copyright © 2009 Free Software Foundation, Inc.
+# Copyright © 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the util-linux-ng package.
 # Phan Vinh Thinh <teppi82@gmail.com>, 2005-2007
-# Clytie Siddall <clytie@riverland.net.au>, 2007-2009.
+# Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-ng 2.16-rc2\n"
+"Project-Id-Version: util-linux-ng 2.17.1-rc1\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
-"PO-Revision-Date: 2009-09-19 18:16+0930\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
+"PO-Revision-Date: 2010-03-06 22:07+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -31,32 +31,28 @@ msgid "get read-only"
 msgstr "lấy chỉ đọc"
 
 #: disk-utils/blockdev.c:82
-#, fuzzy
 msgid "get logical block (sector) size"
-msgstr "lấy kích cỡ rãnh ghi"
+msgstr "lấy kích cỡ khối hợp lý (rãnh ghi)"
 
 #: disk-utils/blockdev.c:88
-#, fuzzy
 msgid "get physical block (sector) size"
-msgstr "lấy kích cỡ rãnh ghi"
+msgstr "lấy kích cỡ khối vật lý (rãnh ghi)"
 
 #: disk-utils/blockdev.c:94
 msgid "get minimum I/O size"
-msgstr ""
+msgstr "lấy kích cỡ V/R tối thiểu"
 
 #: disk-utils/blockdev.c:100
 msgid "get optimal I/O size"
-msgstr ""
+msgstr "lấy kích cỡ V/R tối ưu"
 
 #: disk-utils/blockdev.c:106
-#, fuzzy
 msgid "get alignment offset"
-msgstr "hiệu inode sai"
+msgstr "lấy khoảng chênh sắp hàng"
 
 #: disk-utils/blockdev.c:112
-#, fuzzy
 msgid "get max sectors per request"
-msgstr "Số rãnh ghi dự phòng mỗi trụ"
+msgstr "lấy số tối đa các rãnh ghi cho mỗi yêu cầu"
 
 #: disk-utils/blockdev.c:118
 msgid "get blocksize"
@@ -103,6 +99,11 @@ msgstr "đọc lại bảng phân vùng"
 msgid "Usage:\n"
 msgstr "Sử dụng:\n"
 
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "  %s -V\n"
+msgstr "       %s -k\n"
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -122,6 +123,17 @@ msgstr "Những câu lệnh có :\n"
 msgid "get size in 512-byte sectors"
 msgstr "lấy kích cỡ theo phần 512 byte"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -227,15 +239,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "sử dụng: %s [ -n ] thiết bị\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -336,7 +339,7 @@ msgstr "không thể thử CRC: định dạng cramfs cũ"
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr "malloc không thành công"
 
@@ -583,9 +586,8 @@ msgid "seek failed"
 msgstr "tìm nơi bị lỗi"
 
 #: disk-utils/fsck.minix.c:591 disk-utils/mkfs.minix.c:399
-#, fuzzy
 msgid "unable to alloc buffer for superblock"
-msgstr "không thể phân phối các bộ đệm cho sơ đồ"
+msgstr "không thể cấp phát vùng đệm cho siêu khối"
 
 #: disk-utils/fsck.minix.c:594
 msgid "unable to read super block"
@@ -943,7 +945,7 @@ msgstr "không thể lấy trạng thái về thiết bị %s"
 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:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được %s"
@@ -967,7 +969,7 @@ msgstr "quá nhiều inode - tối đa 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "không đủ chỗ trống, cần ít nhất %llu khối"
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr "Thiết bị: %s\n"
@@ -1044,7 +1046,7 @@ msgstr ""
 "\n"
 "FS: hệ thống tập tin\n"
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1285,7 +1287,7 @@ msgstr "tìm tới không thành công trong khi thử các khối"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Giá trị kỳ lạ trong do_check (làm kiểm tra): có thể là lỗi\n"
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr "tìm tới không thành công trong check_blocks (kiểm tra khối)"
 
@@ -1366,168 +1368,173 @@ msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 "Sử dụng kích cỡ trang do người dùng chỉ ra %d, thay cho giá trị hệ thống %d\n"
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s: lỗi phân nhánh: %s\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr "Kích cỡ phần đầu xấu cho bộ nhớ trao đổi, không ghi nhãn nào.\n"
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr "Nhãn bị cắt ngắn.\n"
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr "không nhãn, "
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr "không uuid\n"
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 "Sử dụng: %s [-c] [-pKÍCH_CỠ_TRANG] [-L nhãn] [-U UUID] /dev/tên [các_khối]\n"
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr "quá nhiều trang xấu"
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr "Không đủ bộ nhớ"
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr "một trang xấu\n"
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr "%lu trang xấu\n"
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr "không thể « tua lại » thiết bị trao đổi"
 
-#: disk-utils/mkswap.c:413
-#, fuzzy
+#: disk-utils/mkswap.c:398
 msgid "unable to alloc new libblkid probe"
-msgstr "không thể phân phối các bộ đệm cho inode"
+msgstr "không thể cấp phát đoạn dò libblklid mới"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "không thể gán thiết bị cho đoạn dò liblkid"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 msgid "unable to erase bootbits sectors"
 msgstr "không xoá được rãnh ghi bit khởi động"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr "%s: %s: cảnh báo : đừng xoá rãnh ghi bit khởi động\n"
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr "        (%s phát hiện được bảng phân vùng). "
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "        on whole disk. "
 msgstr "        trên toàn đĩa. "
 
-#: disk-utils/mkswap.c:454
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:439
+#, c-format
 msgid "        (compiled without libblkid). "
-msgstr "        trên toàn đĩa. "
+msgstr "        (biên dịch mà không có libblkid). "
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr "%1$s: cảnh báo : bỏ qua « -U » (UUID không phải được %1$s hỗ trợ)\n"
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr "%s: không hỗ trợ vùng trao đổi phiên bản %d.\n"
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr "lỗi: không phân tích được cú pháp của UUID"
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: lỗi: không có chỗ nào để thiết lập bộ nhớ trao đổi ?\n"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr "%s: lỗi: kích cỡ %llu KiB lớn hơn kích cỡ thiết bị %llu KiB\n"
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr "%s: lỗi: vùng trao đổi cần ít nhất %ld KiB\n"
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr "%s: cảnh báo : đang cắt ngắn vùng trao đổi thành %llu KiB\n"
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr "%s: lỗi: sẽ không thử tạo thiết bị trao đổi trên '%s'\n"
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr "%s: lỗi: %s đã được gắn; sẽ không tạo vùng trao đổi.\n"
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Không thể thiết lập vùng trao đổi: không thể đọc"
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr "Đang thiết lập vùng trao đổi phiên bản 1, kích cỡ = %llu KiB\n"
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr "%s: %s: không thể ghi nhớ trang chữ ký: %s"
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr "fsync bị lỗi"
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr "%s: %s: không thể lấy nhãn tập tin SELinux: %s\n"
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr "không thể matchpathcon()"
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr "không thể tạo ngữ cảnh SELinux mới"
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr "không thể tính ngữ cảnh SELinux"
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr "%s: không thể đổi nhãn của %s thành %s: %s\n"
@@ -1594,62 +1601,114 @@ msgstr "thô%d:\tđóng kết với chính %d, phụ %d\n"
 msgid "Error setting raw device (%s)\n"
 msgstr "Lỗi đặt thiết bị thô (%s)\n"
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
-msgstr "Không dùng được"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "không thể « tua lại » thiết bị trao đổi"
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
-msgstr "Chỗ trống"
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
+msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
-msgstr "Linux ext2"
+#: disk-utils/swaplabel.c:71
+#, fuzzy, c-format
+msgid "%s: not a valid swap partition"
+msgstr "%s: không có phân vùng như vậy\n"
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
-msgstr "Linux ext3"
+#: disk-utils/swaplabel.c:77
+#, fuzzy, c-format
+msgid "%s: unsupported swap version '%s'"
+msgstr "%s: không hỗ trợ vùng trao đổi phiên bản %d.\n"
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
-msgstr "Linux XFS"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "%s: không mở được: %s\n"
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
-msgstr "Linux JFS"
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "lỗi phân tích PID"
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
-msgstr "Linux ReiserFS"
+#: disk-utils/swaplabel.c:121
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap UUID"
+msgstr "%s: lỗi tìm nơi tới khoảng chênh 0x%jx"
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
-msgstr "Linux"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "%s: không mở được: %s\n"
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
-msgstr "OS/2 HPFS"
+#: disk-utils/swaplabel.c:136
+#, fuzzy, c-format
+msgid "%s: failed to seek to swap label "
+msgstr "%s: lỗi tìm nơi tới khoảng chênh 0x%jx"
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
-msgstr "OS/2 IFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
+msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
-msgstr "NTFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "tìm tới không thành công trong write_tables (ghi các bảng)"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sử dụng: %s [tùy_chọn ...] <tên_tập_tin>\n"
+"\n"
+"Tuỳ chọn:\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
+msgstr ""
+
+#: disk-utils/swaplabel.c:169
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
+msgstr ""
+"\n"
+"Để tìm thêm thông tin, xem wipefs(8).\n"
+
+#: disk-utils/swaplabel.c:203
+#, fuzzy
+msgid "ignore -U (UUIDs are unsupported)"
+msgstr "%1$s: cảnh báo : bỏ qua « -U » (UUID không phải được %1$s hỗ trợ)\n"
+
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
+msgstr "Không dùng được"
+
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
+msgstr "Chỗ trống"
 
-#: fdisk/cfdisk.c:415
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr "Đĩa đã được thay đổi.\n"
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, 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:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1662,228 +1721,228 @@ msgstr ""
 "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:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr "LỖI NGHIÊM TRỌNG"
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 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:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr "Không thể tìm nơi trên ổ đĩa"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr "Không thể đọc ổ đĩa"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr "Không thể ghi vào ổ đĩa"
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr "Quá nhiều phân vùng"
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr "Phân vùng bắt đầu trước rãnh ghi 0"
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr "Phân vùng kết thúc trước rãnh ghi 0"
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 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:937
+#: fdisk/cfdisk.c:821
 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:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr "Phân vùng kết thúc trong hình trụ bán phần cuối cùng"
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr "Phân vùng lôgíc không theo thứ tự đĩa"
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr "phân vùng lôgíc chồng lên nhau"
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr "phân vùng lôgíc mở rộng chồng lên nhau"
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 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:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 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:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr "Mục trình đơn quá dài. Trình đơn có thể trông lạc lõng."
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr ""
 "Trình đơn không có phương hướng nên dùng thiết lập mặc định (nằm ngang)."
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr "Phím cấm"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr "Nhấn một phím để tiếp tục"
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr "Chính"
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr "Tạo một phân vùng chính mới"
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr "Lôgíc"
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr "Tạo một phân vùng lôgíc mới"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr "Đừng tạo một phân vùng"
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr "!!! Lỗi nội bộ !!!"
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr "Kích cỡ (theo MB): "
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr "Đầu"
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 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:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr "Cuối"
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 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:1500
+#: fdisk/cfdisk.c:1382
 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:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr "Không có bảng phân vùng\n"
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 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:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr "Chữ ký xấu trong bảng phân vùng"
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr "Loại bảng phân vùng không xác định"
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 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 [c/K] ?"
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr "Bạn đã đưa ra số hình trụ lớn hơn số có trên đĩa"
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr "Không thể mở ổ đĩa"
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Mở đĩa chỉ đọc - bạn không có quyền ghi"
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 "Cảnh báo :  phát hiện GPT (bảng phân vùng GUID) không được hỗ trợ. Hãy dùng "
 "chương trình GNU Parted."
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr "Không thể lấy kích cỡ đĩa"
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr "Phân vùng chính xấu"
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr "Phân vùng lôgíc xấu"
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 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:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to 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 không? (có hoặc không): "
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr "không"
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 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:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr "có"
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr "Xin hãy nhập « có » hay « không »"
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr "Đang ghi bảng phân vùng lên đĩa..."
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr "Đã ghi bảng phân vùng lên đĩa"
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
@@ -1891,86 +1950,86 @@ msgstr ""
 "Đã ghi bảng phân vùng, nhưng không đọc lại được bảng.  Hãy chạy công cụ "
 "partprobe(8) hay kpartx(8), hoặc khởi động lại để cập nhật bảng."
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 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 (mục ghi "
 "khởi động chủ) của DOS không thể khởi động trong trường hợp này."
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 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 (mục ghi khởi "
 "động chủ) của DOS không thể khởi động trong trường hợp này."
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Nhập tên tập tin hoặc nhấn phím RETURN để hiển thị trên màn hình: "
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Không thể mở tập tin '%s'"
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Ổ đĩa: %s\n"
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr "Rãnh ghi 0:\n"
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Rãnh ghi %d:\n"
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr "   Không   "
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr "   Chính/Lôgíc"
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr "   Chính"
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr "   Lôgíc"
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr "Khởi động"
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr "(%02X)"
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr "Không"
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Bảng Phân Vùng cho %s\n"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr "               Đầu         Cuối\n"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
@@ -1978,7 +2037,7 @@ msgstr ""
 " # Loại       Rãnh ghi      Rãnh ghi   Hiệu    Độ dài    Kiểu hệ thống tập "
 "tin (ID) Cờ\n"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
@@ -1986,468 +2045,468 @@ msgstr ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr "         ---Bắt đầu---      ----Kết thúc----    Đầu     Số\n"
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr " #Cờ Rãnh Đầu  Trụ   ID  Rãnh Đầu  Trụ     Rãnh ghi    Rãnh ghi\n"
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr "Thô sơ"
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 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:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr "Rãnh ghi"
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr "In bảng theo thứ tự rãnh ghi"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr "Bảng"
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr "Chỉ in bảng phân vùng"
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr "Đừng in bảng phân vùng"
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr "Trợ giúp của cfdisk"
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 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 curses,"
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 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 trên"
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr "ổ đĩa cứng."
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Tác quyền © năm 1994-1999 của Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr "Câu lệnh      Ý nghĩa"
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 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:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr "  d          Xóa phân vùng hiện thời"
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "   g          Thay đổi các tham số : cylinders (hình trụ), heads (đầu đọc), "
 "sectors-per-track (số rãnh ghi trên mỗi rãnh)"
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 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:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr "             đã có kinh nghiệm."
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr "  h          Hiển thị trợ giúp này"
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Đặt phân vùng hiện thời dùng vùng đĩa lớn nhất có thể"
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 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:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2, ..."
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 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:2307
+#: fdisk/cfdisk.c:2189
 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:2308
+#: fdisk/cfdisk.c:2190
 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:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr "             mà bạn có thể chọn:"
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 "                r - Dữ liệu thô (là những gì chính xác sẽ được ghi lên đĩa)"
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Bảng theo thứ tự rãnh ghi"
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr "                t - Bảng theo định dạng thô"
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 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:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr "  t          Thay đổi loại hệ thống tập tin"
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Thay đổi đơn vị hiển thị kích cỡ phân vùng"
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Luân phiên MB, các rãnh ghi và hình trụ"
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 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ữ W hoa)"
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Vì câu lệnh có thể hủy dữ liệu trên đĩa, bạn cần"
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 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 « có » hoặc"
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr "             « không »"
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 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:2322
+#: fdisk/cfdisk.c:2204
 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:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Cập nhật màn hình"
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr "  ?          Hiển thị trợ giúp này"
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 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:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr "(ngoại trừ lệnh Write [ghi])."
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr "Hình trụ"
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr "Thay đổi cấu trúc hình trụ"
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr "Đầu đọc"
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr "Thay đổi cấu trúc đầu đọc"
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr "Thay đổi cấu trúc rãnh ghi"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr "Hoàn tất"
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr "Hoàn thành việc thay đổi cấu trúc"
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr "Nhập số hình trụ : "
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr "Giá trị hình trụ cấm"
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr "Nhập số đầu đọc: "
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr "Giá trị số đầu đọc cấm"
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr "Nhập số rãnh ghi trên mỗi rãnh: "
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr "Giá trị số rãnh ghi cấm"
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr "Nhập loại hệ thống tập tin: "
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr "Không thể thay đổi loại hệ thống tập tin thành rỗng"
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr "Không thể thay đổi loại hệ thống tập tin thành mở rộng"
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Không_rõ(%02X)"
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr "Chính/Lôgíc"
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Không rõ (%02X)"
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Ổ đĩa: %s"
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr "Kích cỡ: %lld byte, %lld MB"
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr "Kích cỡ: %lld byte, %lld.%lld GB"
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr "Đầu đọc: %d Rãnh ghi mỗi rãnh: %d Hình trụ : %lld"
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr "Tên"
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr "Cờ"
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr "Loại phân vùng"
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr "Loại hệ thống"
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr "[Nhãn]"
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr "    Rãnh ghi"
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr "  Hình trụ"
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr "  Kích cỡ (MB)"
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr "  Kích cỡ (GB)"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr "Có thể khởi động"
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 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 hiện thời"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr "Xoá"
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr "Xoá phân vùng hiện thời"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr "Cấu trúc"
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 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:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr "Hiển thị màn hình trợ giúp"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr "Lớn nhất"
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Đặt phân vùng hiện thời dùng vùng lớn nhất có thể trên đĩa (chỉ dành cho "
 "người có kinh nghiệm)"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr "Mới"
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 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:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr "In"
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr "In bảng phân vùng ra màn hình hay ghi vào tập tin"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr "Thoát"
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 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:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr "Loại"
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Thay đổi kiểu hệ thống tập tin (DOS, Linux, OS/2 v.v...)"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr "Đơn vị"
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Thay đổi đơn vị hiện thị kích cỡ phân vùng (MB, rãnh ghi, trụ)"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr "Ghi"
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 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:2803
+#: fdisk/cfdisk.c:2687
 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:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr "Không thể xóa một phân vùng rỗng"
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr "Không thể tăng kích cỡ lên lớn nhất phân vùng này"
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr "Phân vùng này không thể sử dụng"
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr "Phân vùng này đã được sử dụng"
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 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:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr "Không có thêm phân vùng nào nữa"
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr "Lệnh cấm"
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr "Tác quyền © năm 1994-2002 của Kevin E. Martin & aeb\n"
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2520,9 +2579,9 @@ msgstr ""
 "\n"
 "Nhãn BSD cho thiết bị: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr "Tác dụng của câu lệnh"
 
@@ -2542,9 +2601,9 @@ msgstr "   i   cài đặt trình khởi động tự mồi"
 msgid "   l   list known filesystem types"
 msgstr "   l   liệt kê loại hệ thống tập tin đã biết"
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr "   m   hiển thị trình đơn này"
 
@@ -2556,14 +2615,14 @@ msgstr "   n   thêm một phân vùng BSD mới"
 msgid "   p   print BSD partition table"
 msgstr "   p   in ra bảng phân vùng BSD"
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr "   q   thoát và không ghi nhớ các thay đổi"
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr "   r   trở lại trình đơn chính"
 
@@ -2606,13 +2665,13 @@ msgstr "Không có phân vùng *BSD trên %s.\n"
 msgid "BSD disklabel command (m for help): "
 msgstr "Câu lệnh nhãn đĩa BSD (m để xem trợ giúp): "
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr "%s đầu tiên"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "%s cuối hay +size hay +sizeM hay +sizeK"
@@ -2758,7 +2817,7 @@ msgstr "rãnh ghi/rãnh"
 msgid "tracks/cylinder"
 msgstr "rãnh/trụ"
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr "trụ"
@@ -2816,7 +2875,7 @@ msgstr "Trình mồi được cài trên %s.\n"
 msgid "Partition (a-%c): "
 msgstr "Phân vùng (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, 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"
@@ -2840,225 +2899,223 @@ msgstr ""
 "\n"
 "Đồng bộ các đĩa.\n"
 
-#: fdisk/fdisk.c:248
-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 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ị rãnh ghi (thay vì trụ)\n"
-"-b 2048: (cho các đĩa MO) sử dụng các rãnh ghi 2048 byte\n"
-
-#: fdisk/fdisk.c:260
-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:269
+#: fdisk/fdisk.c:257
+#, fuzzy
+msgid ""
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
+msgstr ""
+"Sử dụng:\n"
+" fdisk [tuỳ_chọn] <đĩa>    thay đổi bảng phân vùng\n"
+" fdisk [tuỳ_chọn] -l <đĩa> liệt kê (các) bảng phân vùng\n"
+" fdisk -s <phân_vùng>      đưa ra (các) kích cỡ phân vùng theo khối\n"
+"\n"
+"Tuỳ chọn:\n"
+" -b <kích_cỡ>                 kích cỡ rãnh ghi (512, 1024, 2048 hay 4096)\n"
+" -c                        tắt chế độ tương thích với DOS\n"
+" -h                        hiển thị trợ giúp\n"
+" -u <kích_cỡ>                 đưa ra kích cỡ theo rãnh ghi thay cho trụ\n"
+" -v                        hiển thị số thứ tự phiên bản\n"
+" -C <số>               ghi rõ số các trụ\n"
+" -H <số>               ghi rõ số các đầu\n"
+" -S <số>               ghi rõ số các rãnh ghi trên mỗi rãnh\n"
+"\n"
+
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Không thể mở %s\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Không thể đọc %s\n"
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Không thể tìm nơi trên %s\n"
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Không thể ghi %s\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, 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:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr "Không thể phân phối thêm bộ nhớ\n"
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr "Lỗi nặng\n"
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr "   a   bật/tắt cờ chỉ đọc"
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr "   b   sửa nhãn đĩa bsd"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr "   c   bật cờ có thể gắn"
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr "   d   xóa một phân vùng"
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr "   l   hiển thị loại phân vùng đã biết"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr "   n   thêm một phân vùng mới"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 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:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr "   p   in ra bảng phân vùng"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   tạo một nhãn đĩa Sun rỗng"
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr "   t   thay đổi id của phân vùng"
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr "   u   thay đổi đơn vị hiển thị"
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr "   v   kiểm tra bảng phân vùng"
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 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:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 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:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr "   a   chọn phân vùng có thể khởi động"
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr "   b   soạn thảo tập tin khởi động"
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr "   c   chọn phân vùng trao đổi sgi"
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr "   a   bật/tắt cờ có thể khởi động"
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   bật/tắt cờ tương thích với dos"
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   thay đổi số trụ xen kẽ"
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr "   c   thay đổi số trụ"
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 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:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   thay đổi số rãnh ghi dự phòng trong mỗi trụ"
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr "   h   thay đổi số đầu đọc"
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr "   i   thay đổi hệ số xen kẽ"
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   thay đổi tốc độ quay (rpm)"
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr "   s   thay đổi số rãnh ghi/rãnh"
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr "   y   thay đổi số trụ vật lý"
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 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:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr "   e   liệt kê các phân vùng mở rộng"
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 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:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr "   f   sửa thứ tự phân vùng"
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr "   i   thay đổi đồ nhận diện đĩa"
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr "Bạn phải đặt"
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr "đầu đọc"
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr "rãnh ghi"
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -3067,30 +3124,11 @@ 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:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr " và "
 
-#: fdisk/fdisk.c:747
-#, 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ố trụ 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:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -3107,38 +3145,49 @@ msgstr ""
 "Hãy dùng công cụ parted(1) và định dạng bảng phân vùng GUID (GPT).\n"
 "\n"
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
+"\n"
+"Thiết bị đưa ra một kích cỡ rãnh ghi hợp lý\n"
+"vẫn nhỏ hơn kích cỡ rãnh ghi vật lý.\n"
+"Để tránh hiệu suất bị giảm, có nên sắp hàng\n"
+"với một biên giới kích cỡ rãnh ghi vật lý (hay V/R tối ưu).\n"
+"\n"
 
-#: fdisk/fdisk.c:792
-#, c-format
+#: fdisk/fdisk.c:800
+#, fuzzy, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
+"\n"
+"CẢNH BÁO : chế độ tương thích với DOS giờ bị phản đối.\n"
+"\tRất khuyên bạn tắt chế độ này (lệnh « c »)."
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
+"\n"
+"CẢNH BÁO : hiển thị đơn vị trụ giờ bị phản đối.\n"
+"\tHãy dùng lệnh « u » để chuyển đổi đơn vị sang rãnh ghi.\n"
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr "Hiệu sai trong phân vùng mở rộng chính\n"
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
@@ -3147,32 +3196,32 @@ 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:848
+#: fdisk/fdisk.c:857
 #, 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:856
+#: fdisk/fdisk.c:865
 #, 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:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr "đang bỏ quên phân vùng rỗng (%d)\n"
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr "Đồ nhận diện đĩa: 0x%08x\n"
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr "Đồ nhận diện đĩa mới (hiện thời 0x%08x): "
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3186,26 +3235,17 @@ msgstr ""
 "trước đó sẽ không thể được phục hồi.\n"
 "\n"
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Chú ý: kích cỡ rãnh ghi là %d (không %d)\n"
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, 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:1194
+#: fdisk/fdisk.c:1251
 #, c-format
 msgid ""
 "This disk has both DOS and BSD magic.\n"
@@ -3214,24 +3254,24 @@ msgstr ""
 "Đĩa này có magic kiểu cả DOS và BSD.\n"
 "Nhập lệnh 'b' để vào chế độ BSD.\n"
 
-#: fdisk/fdisk.c:1204
+#: fdisk/fdisk.c:1261
 #, 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:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr "Lỗi nội bộ\n"
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, 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:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
@@ -3240,7 +3280,7 @@ 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:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
@@ -3249,21 +3289,21 @@ msgstr ""
 "\n"
 "nhận được EOF ba lần - đang thoát..\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr "Mã Hex (gõ L để liệt kê mã): "
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr "%s (%u-%u, mặc định %u): "
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr "Hấu tố không được hỗ trợ : « %s ».\n"
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
@@ -3279,74 +3319,79 @@ msgstr ""
 "\tM\tmebi-byte\n"
 "\tG\tgibi-byte\n"
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr "Sử dụng giá trị mặc định %u\n"
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr "Giá trị vượt quá giới hạn.\n"
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr "Số thứ tự phân vùng"
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, 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:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr "Phân vùng được chọn %d\n"
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, 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:1529
+#: fdisk/fdisk.c:1593
 #, 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:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr "trụ"
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr "rãnh ghi"
 
-#: fdisk/fdisk.c:1548
-#, c-format
-msgid "Changing display/entry units to %s\n"
+#: fdisk/fdisk.c:1614
+#, fuzzy, c-format
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
 msgstr "Thay đổi đơn vị hiển thị thành %s\n"
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1616
+#, fuzzy, c-format
+msgid "Changing display/entry units to sectors\n"
+msgstr "Thay đổi đơn vị hiển thị thành %s\n"
+
+#: fdisk/fdisk.c:1626
 #, 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:1569
-#, c-format
-msgid "DOS Compatibility flag is set\n"
+#: fdisk/fdisk.c:1636
+#, fuzzy, c-format
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr "Cờ tương thích với DOS được đặt\n"
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, 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:1672
+#: fdisk/fdisk.c:1739
 #, 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:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3359,7 +3404,7 @@ msgstr ""
 "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:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
@@ -3368,7 +3413,7 @@ msgstr ""
 "Bạn không thể thay đổi một phân vùng thành đồ mở rộng hoặc ngược lại.\n"
 "Xóa nó trước.\n"
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3379,7 +3424,7 @@ msgstr ""
 "vì SunOS/Solaris đòi hỏi điều này và thậm chí Linux thích.\n"
 "\n"
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3391,63 +3436,63 @@ msgstr ""
 "theo yêu cầu của IRIX.\n"
 "\n"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, 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:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr "Kiểu hệ thống của phân vùng %d chưa thay đổi: %x (%s)\n"
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, 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:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     vật lý=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lôgíc=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, 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:1790
+#: fdisk/fdisk.c:1860
 #, 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 trụ:\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "phải là (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, 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 trụ:\n"
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "phải là (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1813
-#, fuzzy, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
-msgstr "Phân vùng %i không bắt đầu trên ranh giới trụ:\n"
+#: fdisk/fdisk.c:1883
+#, c-format
+msgid "Partition %i does not start on physical sector boundary.\n"
+msgstr "Phân vùng %i không bắt đầu ở biên giới rãnh ghi vật lý.\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
@@ -3456,7 +3501,7 @@ msgstr ""
 "\n"
 "Đĩa %s: %ld MB, %lld byte\n"
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
@@ -3465,32 +3510,37 @@ msgstr ""
 "\n"
 "Đĩa %s: %ld.%ld GB, %lld byte\n"
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr "%d đầu đọc, %llu rãnh ghi/rãnh, %d trụ"
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ", tổng số %llu rãnh ghi"
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr "Đơn vị = %s của %d * %d = %d byte\n"
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
-msgstr ""
+msgstr "Kích cỡ rãnh ghi (hợp lý/vật lý): %u byte / %lu byte\n"
 
-#: fdisk/fdisk.c:1843
-#, fuzzy, c-format
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr "Kích cỡ V/R (tối thiểu / tối ưu): %lu byte / %lu byte\n"
+
+#: fdisk/fdisk.c:1915
+#, c-format
 msgid "Alignment offset: %lu bytes\n"
-msgstr "hiệu inode sai"
+msgstr "Khoảng chênh sắp hàng: %lu byte\n"
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
@@ -3499,12 +3549,12 @@ msgstr ""
 "Không cần làm gì. Thứ tự đã đúng sẵn.\n"
 "\n"
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, c-format
 msgid "Done.\n"
 msgstr "Hoàn tất.\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3515,16 +3565,16 @@ msgstr ""
 "Có thể bạn đã chọn nhầm thiết bị.\n"
 "\n"
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, 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\n"
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr "Thiết bị"
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
@@ -3533,7 +3583,7 @@ 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:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3544,88 +3594,88 @@ msgstr ""
 "Đĩa %s: %d đầu đọc, %llu rãnh ghi, %d trụ\n"
 "\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr "Nr AF  Đầu Rãnh Trụ  Đầu Rãnh Trụ     Bắt_đầu      Cỡ ID\n"
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Cảnh báo: phân vùng %d chứa rãnh ghi 0\n"
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, 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:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr "Phân vùng %d: rãnh ghi %d lớn hơn tối đa %llu\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Phân vùng %d: trụ %d lớn hơn max %d\n"
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Phân vùng %d: các rãnh ghi phía trước %d không hợp với tổng số %d\n"
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, 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:2175
+#: fdisk/fdisk.c:2247
 #, 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:2195
+#: fdisk/fdisk.c:2267
 #, 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:2200
+#: fdisk/fdisk.c:2272
 #, 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:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr "Tổng số rãnh ghi phân phối %llu lớn hơn tối đa %llu\n"
 
-#: fdisk/fdisk.c:2209
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2281
+#, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
-msgstr "%lld rãnh ghi %d-byte không được phân phối\n"
+msgstr "%lld rãnh ghi %d-byte không được cấp phát còn lại\n"
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, 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:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr "Rãnh ghi %llu đã được phân phối\n"
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr "Không còn rãnh ghi nào trống\n"
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr "Cuối %1$s, +%2$s hay +kích_cỡ{K,M,G}"
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3638,7 +3688,7 @@ msgstr ""
 "\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:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3651,22 +3701,22 @@ msgstr ""
 "\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:2444
+#: fdisk/fdisk.c:2515
 #, 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:2447
+#: fdisk/fdisk.c:2518
 #, 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:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr "Thêm phân vùng chính\n"
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3677,20 +3727,20 @@ msgstr ""
 "   %s\n"
 "   p   phân vùng chính (1-4)\n"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr "l   lôgíc (5 hoặc hơn)"
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr "e   mở rộng"
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, 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:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
@@ -3699,12 +3749,12 @@ msgstr ""
 "Bảng phân vùng đã được ghi!\n"
 "\n"
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, 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:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3718,7 +3768,7 @@ msgstr ""
 "Bảng mới sẽ được dùng lần kế tiếp khởi động,\n"
 "hoặc sau khi bạn chạy công cụ partprobe(8) hay kpartx(8).\n"
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3731,7 +3781,7 @@ msgstr ""
 "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:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -3740,42 +3790,42 @@ msgstr ""
 "\n"
 "Lỗi đóng tập tin\n"
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr "Đang đồng bộ hoá các đĩa.\n"
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, 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:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr "Điểm bắt đầu dữ liệu mới"
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr "Câu lệnh nâng cao (m để xem trợ giúp): "
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr "Số trụ"
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr "Số đầu đọc"
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr "Số rãnh ghi"
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Cảnh báo : thiết lập hiệu số rãnh ghi cho tương thích DOS\n"
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3788,32 +3838,32 @@ msgstr ""
 "không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, 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:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Không thể mở %s\n"
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr "không thể mở %s\n"
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: câu lệnh không biết\n"
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Nhân này tự tìm kích cỡ rãnh ghi - tùy chọn -b bị bỏ qua\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3822,16 +3872,16 @@ msgstr ""
 "Cảnh báo: tùy chọn -b (đặt kích cỡ rãnh ghi) cần sử dụng với một thiết bị "
 "xác định\n"
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, 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:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr "Câu lệnh (m để xem trợ giúp): "
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -3840,16 +3890,16 @@ msgstr ""
 "\n"
 "Tập tin khởi động hiện thời là: %s\n"
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 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:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Tập tin khởi động không thay đổi\n"
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3940,15 +3990,15 @@ msgstr "SGI xlv"
 msgid "SGI xvm"
 msgstr "SGI xvm"
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr "Trao đổi Linux"
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr "Linux sở hữu"
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4083,7 +4133,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Có nhiều hơn một mục đĩa.\n"
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr "Không có phân vùng nào được định nghĩa\n"
@@ -4187,7 +4237,7 @@ msgstr ""
 "chứa cả một đĩa mới nằm ngoại lệ. Gõ CÓ nếu bạn chắc chắn muốn đặt\n"
 "thẻ khác cho phân vùng này.\n"
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4242,7 +4292,7 @@ msgstr ""
 "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:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -4261,55 +4311,55 @@ msgstr "Đang cố giữ lại các tham số của phân vùng %d.\n"
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tĐẦU=%d\tĐỘ DÀI=%d\n"
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr "Chưa gán"
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr "Gốc SunOS"
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr "Trao đổi SunOS"
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr "Cả đĩa"
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr "SunOS stand"
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr "SunOS var"
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr "Rãnh ghi thay thế SunOS"
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr "Hệ thống tập tin nhớ tạm SunOS"
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr "Dành riêng SunOS"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr "Tự động nhận ra Linux raid"
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4322,22 +4372,22 @@ msgstr ""
 "v.d. đầu đọc, rãnh ghi, trụ 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:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr "Tìm thấy nhãn đĩa Sun có phiên bản sai [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr "Tìm thấy nhãn đĩa Sun với sự đúng mực sai [0x%08x].\n"
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr "Tìm thấy nhãn đĩa Sun với số phân vùng (num_partitions) sai [%u].\n"
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
@@ -4345,7 +4395,7 @@ msgstr ""
 "Cảnh báo : các giá trị không đúng cần phải được sửa chữa nên sẽ được sửa bởi "
 "w(rite) (ghi nhớ)\n"
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4357,31 +4407,31 @@ msgstr ""
 "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:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr "Rãnh ghi/rãnh"
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, 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 trụ\n"
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, 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 rãnh ghi %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Khoảng trống không sử dụng - rãnh ghi 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Khoảng trống không sử dụng - rãnh ghi %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4390,7 +4440,7 @@ 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:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4399,12 +4449,12 @@ msgstr ""
 "Rất khuyên đặt phân vùng thứ ba chiếm toàn bộ đĩa\n"
 "và có kiểu « Toàn đĩa » (Whole disk).\n"
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Rãnh ghi %d đã được phân phối\n"
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4414,7 +4464,7 @@ 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:534
+#: fdisk/fdisksunlabel.c:529
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4423,7 +4473,7 @@ 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ới %u rãnh ghi\n"
 
-#: fdisk/fdisksunlabel.c:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4437,12 +4487,12 @@ msgstr ""
 "Gõ CÓ nếu bạn chắc chắn muốn đặt phân vùng đó có thẻ\n"
 "82 (vùng trao đổi của Linux): "
 
-#: fdisk/fdisksunlabel.c:581
-#, c-format
+#: fdisk/fdisksunlabel.c:576
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4458,11 +4508,11 @@ msgstr ""
 "Đơn vị = %s trên %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:597
-#, c-format
+#: fdisk/fdisksunlabel.c:592
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
@@ -4471,28 +4521,28 @@ msgstr ""
 "Đơn vị = %s trên %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, 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:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr "Số trụ xen kẽ"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr "Số rãnh ghi dự phòng mỗi trụ"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr "Hệ số xen kẽ"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr "Tốc độ quay (rpm)"
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr "Số trụ vật lý"
 
@@ -4701,6 +4751,10 @@ msgstr "Minux / Linux cũ"
 msgid "Linux swap / Solaris"
 msgstr "Trao đổi Linux / Solaris"
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 ổ đĩa C: ẩn"
@@ -5328,93 +5382,93 @@ msgstr "đã đưa ra cờ -n: Không có gì thay đổi\n"
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Lỗi ghi rãnh ghi cũ - đang dừng lại\n"
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, 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:1714
+#: fdisk/sfdisk.c:1719
 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:1750
+#: fdisk/sfdisk.c:1755
 #, 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:1757
+#: fdisk/sfdisk.c:1762
 #, 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:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "dữ liệu vào không nhận ra: %s\n"
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr "số quá lớn\n"
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr "đuôi bỏ đi sau một số\n"
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr "không có chỗ cho mô tả phân vùng\n"
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 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:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr "quá nhiều vùng nhập vào\n"
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr "Không còn chỗ trống\n"
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr "Loại không cho phép\n"
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Cảnh báo: kích cỡ đưa ra (%lu) vượt quá kích cỡ max cho phép (%lu)\n"
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr "Cảnh báo: phân vùng rỗng\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, 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:2135
+#: fdisk/sfdisk.c:2140
 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:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr "Đặc điểm phân vùng c,h,s?\n"
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr "Phân vùng mở rộng không ở chỗ mong đợi\n"
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr "dữ liệu vào xấu\n"
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr "quá nhiều phân vùng\n"
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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"
@@ -5424,104 +5478,104 @@ msgstr ""
 "<đầ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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "thiết bị: có dạng /dev/hda hay /dev/sda"
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr "tùy chọn có ích:"
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [hay --show-size]: liệt kê kích cỡ phân vùng"
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 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:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [hay --list]:      liệt kê các phân vùng của mỗi thiết bị"
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 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:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [hay --increment]: số trụ v.v... từ 1 thay vì từ 0"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 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ị rãnh ghi/khối/trụ/MB"
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [hay --list-types]:\t\tliệt kê các kiểu phân vùng đã biết"
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 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:2300
+#: fdisk/sfdisk.c:2305
 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:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                chỉ thay đổi phân vùng với số #"
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 không thực sự viết lên đĩa"
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O tập tin :            ghi các rãnh ghi sẽ bị ghi chèn vào tập tin"
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I tập tin :            phục hồi lại những rãnh ghi này"
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [hay --version]:   in ra số hiệu phiên bản"
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [hay --help]:      in trợ giúp này"
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr "tùy chọn nguy hiểm:"
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 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:2309
+#: fdisk/sfdisk.c:2314
 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:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -5530,62 +5584,62 @@ msgstr ""
 "                             trong đầu ra hay các mô tả mong đợi cho chúng\n"
 "                             trong đầu vào"
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 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:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [hay --quiet]:      bỏ các cảnh báo"
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 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:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [hay --trụs #]:đặt số trụ sử dụng"
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 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:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [or --rãnh ghis #]:  đặt số rãnh ghi sử dụng"
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 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:2319
+#: fdisk/sfdisk.c:2324
 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:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr "Sử dụng:"
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, 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:2327
+#: fdisk/sfdisk.c:2332
 #, 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:2328
+#: fdisk/sfdisk.c:2333
 #, 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:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5598,67 +5652,67 @@ msgstr ""
 "không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Sử dụng cờ « --force » (bắt buộc) để bãi bỏ sự kiểm tra này.\n"
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr "không lệnh?\n"
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "tổng sô: %llu khối\n"
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 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:2667
+#: fdisk/sfdisk.c:2672
 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:2669
+#: fdisk/sfdisk.c:2674
 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:2676
+#: fdisk/sfdisk.c:2681
 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:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "không thể mở %s đọc-viết\n"
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "không mở được %s để đọc\n"
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld trụ, %ld đầu đọc, %ld rãnh ghi/trac\n"
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Không thể lấy kích cỡ của %s\n"
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte kích hoạt sai: 0x%x thay cho 0x80\n"
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
@@ -5666,7 +5720,7 @@ msgstr ""
 "Hoàn thành\n"
 "\n"
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5675,35 +5729,35 @@ 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 đĩa có 1 phân vùng kích hoạt.\n"
 
-#: fdisk/sfdisk.c:2923
+#: fdisk/sfdisk.c:2928
 #, 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:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id xấu %lx\n"
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr "Đĩa này hiện đang được sử dụng.\n"
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Lỗi nặng: không thể tìm %s\n"
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, 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:3027
+#: fdisk/sfdisk.c:3032
 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:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5716,30 +5770,30 @@ msgstr ""
 "đổi\n"
 "trên đĩa này. Sử dụng « --no-reread » để bỏ kiểm tra này.\n"
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 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:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr "Tình huống cũ:\n"
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, 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:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr "Tình huống mới:\n"
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5747,21 +5801,21 @@ 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:3066
+#: fdisk/sfdisk.c:3071
 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:3071
+#: fdisk/sfdisk.c:3076
 #, 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:3073
+#: fdisk/sfdisk.c:3078
 #, 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:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
@@ -5770,16 +5824,16 @@ msgstr ""
 "\n"
 "sfdisk: dữ liệu vào kết thúc sớm\n"
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr "Đang thoát - không có gì thay đổi\n"
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, 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:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5788,7 +5842,7 @@ msgstr ""
 "Viết thành công bảng phân vùng mới\n"
 "\n"
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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"
@@ -5798,17 +5852,17 @@ msgstr ""
 "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"
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr "CẢNH BÁO : không mở được %s: %s\n"
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr "CẢNH BÁO : gặp định dạng sai trên dòng %d của %s\n"
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5820,37 +5874,37 @@ msgstr ""
 "\ttập tin /etc/fstab càng sớm càng có thể.\n"
 "\n"
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr "fsck: %s: không tìm thấy\n"
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr "%s: đợi: không có tiến trình con nào nữa ?!?\n"
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr "Cảnh báo... %s cho thiết bị %s đã thoát với tín hiệu %d.\n"
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr "%s: %s: trạng thái là %x, không bao giờ nên xảy ra.\n"
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Đã kết thúc với %s (trạng thái thoát %d)\n"
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr "%s: Lỗi %d trong khi thực hiện fsck.%s cho %s\n"
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
@@ -5858,11 +5912,11 @@ msgstr ""
 "Hoặc tất cả hoặc không có kiểu hệ thống tập tin được gửi cho « -t »\n"
 "phải có tiền tố « no » hay « ! ».\n"
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr "Không thể phân cấp bộ nhớ cho kiểu hệ thống tập tin\n"
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
@@ -5871,26 +5925,26 @@ msgstr ""
 "%s: đang bỏ qua dòng sai trong tập tin « /etc/fstab »:\n"
 "điểm lắp đóng kết có số thứ tự lần chạy fsck khác số không\n"
 
-#: fsck/fsck.c:893
-#, fuzzy, c-format
+#: fsck/fsck.c:892
+#, c-format
 msgid "%s: skipping nonexistent device\n"
-msgstr "%s: %s không phải là thiết bị lp.\n"
+msgstr "%s: đang bỏ qua thiết bị không tồn tại\n"
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr "fsck: không thể kiểm tra %s: fsck.%s không tìm thấy\n"
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr "Đang kiểm tra tất cả các hệ thống tập tin.\n"
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--đang đợi-- (lần chạy %d)\n"
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
@@ -5899,42 +5953,42 @@ msgstr ""
 "\n"
 "HTTT: hệ thống tập tin\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s: quá nhiều thiết bị\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Không mở được %s: %s\n"
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "/proc được gắn kết không?\n"
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr "Phải là người chủ (root) để quét tìm hệ thống tập tin tương ứng: %s\n"
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Không tìm thấy hệ thống tập tin tương ứng: %s\n"
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s: quá nhiều đối số\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, c-format
 msgid "fsck from %s\n"
 msgstr "fsck từ %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "%s: Không thể phân phối bộ nhớ cho fsck_path\n"
@@ -6434,7 +6488,13 @@ msgstr "Không tìm thấy giao diện đồng hồ có thể sử dụng nào.\
 msgid "Unable to set system clock.\n"
 msgstr "Không đặt được đồng hồ hệ thống.\n"
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -6446,17 +6506,17 @@ msgstr ""
 "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:1266
+#: hwclock/hwclock.c:1280
 #, 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:1268
+#: hwclock/hwclock.c:1282
 #, 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:1271
+#: hwclock/hwclock.c:1285
 #, c-format
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
@@ -6465,23 +6525,23 @@ 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:1274
+#: hwclock/hwclock.c:1288
 #, 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:1277
+#: hwclock/hwclock.c:1291
 #, 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:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s từ %s\n"
 
-#: hwclock/hwclock.c:1311
-#, c-format
+#: hwclock/hwclock.c:1325
+#, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -6499,6 +6559,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6558,7 +6619,7 @@ msgstr ""
 "  -D | --debug        chế độ gỡ lỗi\n"
 "\n"
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6569,17 +6630,17 @@ msgstr ""
 "       báo hwclock biết kiểu alpha bạn có (xem hwclock(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr "%s: không thể kết nối để kiểm tra chặt chẽ hệ thống\n"
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, 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:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
@@ -6588,7 +6649,7 @@ 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:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6597,7 +6658,7 @@ 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:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
@@ -6606,7 +6667,7 @@ msgstr ""
 "%s: Các tùy chọn « --adjust » và « --noadjust » loại trừ lẫn nhau.  Bạn lại "
 "đưa ra cả hai.\n"
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
@@ -6615,29 +6676,29 @@ msgstr ""
 "%s: Các tùy chọn « --adjfile » và « --noadjfile » loại trừ lẫn nhau.  Bạn lại "
 "đưa ra cả hai.\n"
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, 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:1602
+#: hwclock/hwclock.c:1621
 #, 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:1619
+#: hwclock/hwclock.c:1638
 #, 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:1624
+#: hwclock/hwclock.c:1643
 #, 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:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
@@ -6646,13 +6707,13 @@ 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:1650
+#: hwclock/hwclock.c:1669
 #, 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:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6948,12 +7009,12 @@ msgstr "%s: Không đặt được văn cảnh cho /etc/passwd"
 msgid "Changing finger information for %s.\n"
 msgstr "Thay đổi thông tin finger cho %s.\n"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr "%s: PAM thất bại nên hủy bỏ : %s\n"
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -7182,35 +7243,40 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr "LỖI NẶNG: không thể mở lại tty: %s"
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr "NGHIÊM TRỌNG: %s không phải là một thiết bị cuối"
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr "LỖI NẶNG: tty xấu"
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr "login: « -h » chỉ dành cho siêu người dùng.\n"
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, 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:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Không thể khởi tạo PAM: %s"
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr "đăng nhập: "
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "LỖI ĐĂNG NHẬP %d TỪ %s CHO %s, %s"
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
@@ -7219,17 +7285,17 @@ msgstr ""
 "Sai tên người dùng hoặc mật khẩu\n"
 "\n"
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, 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:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "PHIÊN CHẠY ĐĂNG NHẬP BỊ LỖI TỪ %s CHO %s, %s"
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
@@ -7238,7 +7304,7 @@ msgstr ""
 "\n"
 "Sai tên người dùng hoặc mật khẩu\n"
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
@@ -7247,120 +7313,120 @@ msgstr ""
 "\n"
 "Có vấn đề cấu hình phiên chạy nên hủy bỏ.\n"
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "Tên người dùng bằng VÔ GIÁ TRỊ (NULL) trong %s:%d. Thoát."
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "Tên người dùng sai « %s » trong %s:%d. Hủy bỏ."
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr "login: Không đủ bộ nhớ\n"
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr "Tên người dùng không hợp pháp"
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s đăng nhập bị từ chối trên thiết bị cuối này.\n"
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "ĐĂNG NHẬP %s BỊ TỪ CHỐI TỪ %s TRÊN TTY %s"
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "ĐĂNG NHẬP %s BỊ TỪ CHỐI TRÊN TTY %s"
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr "Sai tên người dùng hoặc mật khẩu\n"
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "QUAY SỐ TẠI %s BỞI %s"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ĐĂNG NHẬP NGƯỜI CHỦ TRÊN %s TỪ %s"
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ĐĂNG NHẬP NGƯỜI CHỦ TRÊN %s"
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, 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:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "ĐĂNG NHẬP TRÊN %s BỞI %s"
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr "Bạn có thư mới.\n"
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr "Bạn có thư.\n"
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: lỗi phân nhánh (fork): %s"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY bị lỗi: %m"
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr "setuid() bị lỗi"
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Không có thư mục %s!\n"
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, 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:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr "login: không có bộ nhớ cho văn lệnh trình bao.\n"
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: không thực hiện được văn lệnh trình bao : %s.\n"
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: không có trình bao : %s.\n"
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -7369,65 +7435,65 @@ msgstr ""
 "\n"
 "%s đăng nhập: "
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr "tên đăng nhập quá dài.\n"
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr "TÊN quá dài"
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, 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:1316
+#: login-utils/login.c:1320
 #, 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:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr "dòng nhập vào THỪA"
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, 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:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Đăng nhập lần cuối: %.*s "
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr "từ %.*s\n"
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr "trên %.*s\n"
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LỖI ĐĂNG NHẬP TỪ %s, %s"
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LỖI ĐĂNG NHẬP TRÊN %s, %s"
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LẦN KHÔNG ĐĂNG NHẬP ĐƯỢC TỪ %s, %s"
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LẦN KHÔNG ĐĂNG NHẬP ĐƯỢC TRÊN %s, %s"
@@ -7683,8 +7749,8 @@ 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 về) tty\n"
 
 #: login-utils/simpleinit.c:938
-#, c-format
-msgid "error stopping service: \"%s\"\n"
+#, fuzzy, c-format
+msgid "error at stopping service \"%s\"\n"
 msgstr "lỗi dừng dịch vụ: « %s »\n"
 
 #: login-utils/simpleinit.c:950
@@ -7693,9 +7759,9 @@ msgid "Stopped service: %s\n"
 msgstr "Dịch vụ bị dừng: %s\n"
 
 #: login-utils/simpleinit.c:1070
-#, c-format
-msgid "error running programme: \"%s\"\n"
-msgstr "lỗi chạy chương trình: « %s »\n"
+#, fuzzy, c-format
+msgid "error at starting service \"%s\"\n"
+msgstr "lỗi dừng dịch vụ: « %s »\n"
 
 #: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
@@ -7821,25 +7887,25 @@ msgstr "%s: không lấy được trạng thái (stat) tập tin tạm thời.\n
 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:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "giá trị ngày bị sai: hãy dùng 1-%d"
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr "giá trị tháng bị sai: hãy dùng 1-12"
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr "giá trị năm bị sai: hãy dùng 1-9999"
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr "sử dụng: cal [-13smjyV] [[[ngày] tháng] năm]\n"
@@ -7863,6 +7929,116 @@ msgstr "Sử dụng: %s LABEL=<nhãn>|UUID=<uuid>\n"
 msgid "unable to resolve '%s'"
 msgstr "không giải quyết được « %s »"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: Câu lệnh không rõ : %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "lỗi phân cấp vùng đệm ra"
+
+#: misc-utils/findmnt.c:359
+#, fuzzy
+msgid "failed to initialize libmount tab"
+msgstr "lỗi sơ khởi vùng đệm dòng\n"
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s: không đọc được %s.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: lỗi ghi: %s\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+"\n"
+"Để tìm thêm thông tin, xem namei(1).\n"
+
+#: misc-utils/findmnt.c:491
+#, fuzzy
+msgid "options are mutually exclusive"
+msgstr "« --offset » và « --all » loại từ lẫn nhau"
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "Không có thư mục %s!\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+#, fuzzy
+msgid "failed to initialize libmount iterator"
+msgstr "lỗi sơ khởi vùng đệm dòng\n"
+
+#: misc-utils/findmnt.c:685
+#, fuzzy
+msgid "failed to initialize libmount cache"
+msgstr "lỗi sơ khởi vùng đệm dòng\n"
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "lỗi sơ khởi vùng đệm dòng\n"
+
+#: misc-utils/findmnt.c:707
+#, fuzzy
+msgid "failed to initialize output column"
+msgstr "lỗi sơ khởi vùng đệm dòng\n"
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -8027,7 +8203,7 @@ msgstr "%s: thay đổi tên %s thành %s không thành công: %s\n"
 msgid "call: %s from to files...\n"
 msgstr "call: %s sang các tập tin...\n"
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -8038,37 +8214,37 @@ msgstr ""
 "Hãy dùng `%s [tùy chọn] %s' nếu thực sự muốn sử dụng nó.\n"
 "Văn lệnh chưa chạy.\n"
 
-#: misc-utils/script.c:173
-#, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+#: misc-utils/script.c:182
+#, fuzzy, c-format
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr "sử dụng: script [-a] [-f] [-q] [-t] [tập tin]\n"
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Văn lệnh đã chạy, tập tin là %s\n"
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr "%s: lỗi ghi %d: %s\n"
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr "Văn lệnh đã chạy trên %s"
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr "%s: lỗi ghi: %s\n"
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr "%s: không thể ghi tập tin văn lệnh, lỗi: %s\n"
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
@@ -8077,17 +8253,17 @@ msgstr ""
 "\n"
 "Văn lệnh đã chạy xong trên %s"
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Văn lệnh đã chạy xong, tập tin là %s\n"
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr "openpty không thành công\n"
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr "Ngoài pty\n"
@@ -8137,9 +8313,9 @@ msgid "failed to read timing file %s"
 msgstr "lỗi đọc tập tin đếm thời gian %s"
 
 #: misc-utils/scriptreplay.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "timings file %s: %lu: unexpected format"
-msgstr "tập tin đếm thời gian %s: %lu: định dạng mong đợi"
+msgstr "tập tin đếm thời gian %s: %lu: định dạng bất thường"
 
 #: misc-utils/setterm.c:759
 #, c-format
@@ -8450,6 +8626,16 @@ msgstr "đếm số lần đọc"
 msgid "bad response length"
 msgstr "chiều dài đáp ứng sai"
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "lỗi phân tích PID"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "lỗi lấy trạng thái: %s"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -8480,6 +8666,11 @@ msgstr "Gặp lỗi khi đọc từ ứng dụng khách, dài = %d\n"
 msgid "operation %d, incoming num = %d\n"
 msgstr "thao tác %d, số gửi đến = %d\n"
 
+#: misc-utils/uuidd.c:362
+#, fuzzy, c-format
+msgid "operation %d\n"
+msgstr "Thao tác không hợp lệ %d\n"
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -8496,8 +8687,8 @@ msgid "Generated time UUID %s and %d following\n"
 msgstr "UUID thời gian đã tạo ra %s và %d theo sau\n"
 
 #: misc-utils/uuidd.c:415
-#, c-format
-msgid "Generated %d UUID's:\n"
+#, fuzzy, c-format
+msgid "Generated %d UUIDs:\n"
 msgstr "%d UUID đã tạo ra:\n"
 
 #: misc-utils/uuidd.c:427
@@ -8516,13 +8707,13 @@ msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Gặp lỗi khi gọi trình nền uuidd (%s): %s\n"
 
 #: misc-utils/uuidd.c:534
-#, c-format
-msgid "%s and subsequent %d UUID's\n"
+#, fuzzy, c-format
+msgid "%s and subsequent %d UUIDs\n"
 msgstr "%s và %d UUID xảy ra sau\n"
 
 #: misc-utils/uuidd.c:536
-#, c-format
-msgid "List of UUID's:\n"
+#, fuzzy, c-format
+msgid "List of UUIDs:\n"
 msgstr "Danh sách các UUID:\n"
 
 #: misc-utils/uuidd.c:557
@@ -8550,91 +8741,89 @@ msgstr "Sử dụng: %s [-r] [-t]\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM thư_mục ... -f ] tên...\n"
 
-#: misc-utils/wipefs.c:128
-#, fuzzy
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
-msgstr "malloc không thành công"
+msgstr "lỗi calloc"
 
-#: misc-utils/wipefs.c:150
-#, fuzzy
+#: misc-utils/wipefs.c:152
 msgid "strdup failed"
-msgstr "lỗi: strdup không thành công"
+msgstr "strdup bị lỗi"
 
-#: misc-utils/wipefs.c:199
-#, fuzzy
-msgid "probing initialization failed"
-msgstr "...lỗi đồng bộ hoá\n"
-
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:202
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
-msgstr ""
+msgid "error: %s: probing initialization failed"
+msgstr "lỗi: %s: lỗi sơ khởi hàm dò"
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:213
 #, fuzzy, c-format
-msgid "%s: failed to seek to offset 0x%jx"
-msgstr "%s: không mở được: %s\n"
+msgid "WARNING: %s: appears to contain '%s' partition table"
+msgstr "lỗi: %s: hình như chứa bảng phân vùng « %s »"
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:259
 #, fuzzy, c-format
+msgid "no magic string found at offset 0x%jx -- ignored"
+msgstr "không tìm thấy chuỗi ma thuật ở khoảng chênh 0x%jx nên bỏ qua."
+
+#: misc-utils/wipefs.c:266
+#, c-format
+msgid "%s: failed to seek to offset 0x%jx"
+msgstr "%s: lỗi tìm nơi tới khoảng chênh 0x%jx"
+
+#: misc-utils/wipefs.c:273
+#, c-format
 msgid "%s: write failed"
-msgstr "%s: lỗi mở"
+msgstr "%s: lỗi ghi"
 
-#: misc-utils/wipefs.c:259
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:275
+#, c-format
 msgid "%zd bytes ["
-msgstr "byte"
+msgstr "%zd byte ["
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
-msgstr ""
+msgstr "] bị xoá ở khoảng chênh 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: lỗi mở"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, fuzzy, c-format
-msgid "invalid offset '%s' value specified"
-msgstr "Giá trị đặt không đúng: %s\n"
+msgid "invalid offset value '%s' specified"
+msgstr "sai xác định giá trị chênh"
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
+#: misc-utils/wipefs.c:341
 #, fuzzy, c-format
 msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Sử dụng: %s [các_tùy_chọn]\n"
-"\n"
-
-#: misc-utils/wipefs.c:316
-#, c-format
-msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
+" -a, --all           xoá mọi chuỗi ma thuật (CẨN THẬN !!)\n"
+" -h, --help          trợ giúp này\n"
+" -n, --no-act        mọi việc cần làm, trừ cuộc gọi ghi write()\n"
+" -o, --offset <SỐ>  khoảng chênh cần xoá, theo byte\n"
+" -p, --parsable      in ra theo định dạng có thể phân tích, thay cho định "
+"dạng có thể in ấn\n"
 
-#: misc-utils/wipefs.c:322
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:347
+#, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 "\n"
-"Để tìm thêm thông tin, xem ipcmk(1).\n"
+"Để tìm thêm thông tin, xem wipefs(8).\n"
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
-msgstr ""
+msgstr "« --offset » và « --all » loại từ lẫn nhau"
 
 #: misc-utils/write.c:101
 #, c-format
@@ -8876,7 +9065,7 @@ msgstr ""
 "Phiên bản mount này được biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch "
 "lại.\n"
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8901,7 +9090,7 @@ msgstr ""
 "tập tin này\n"
 " %1$s [ tuỳ_chọn ... ] {-f|--find|TB_vòng_lặp} <tập_tin>        thiết lập\n"
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8929,250 +9118,300 @@ msgstr ""
 " -v | --verbose          \t\tchế độ chi tiết\n"
 "\n"
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, fuzzy, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr "xác định giá trị chênh sai « %s »"
+
+#: mount/lomount.c:1023
+#, fuzzy, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr "xác định giá trị chênh sai « %s »"
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Thiết bị vòng lặp là %s\n"
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "vòng lặp bị ăn cắp=%s... nên thử lại\n"
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: thiết bị đang bận"
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch lại.\n"
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+"\n"
+"mount: cảnh báo: « /etc/mtab » không cho phép ghi (tức là hệ thống chỉ-đọc).\n"
+"       Có thể là mount(8) đã cung cấp thông tin quá cũ.\n"
+"       Để tìm thông tin thật về các điểm lắp hệ thống, xem tập tin « /proc/"
+"mounts ».\n"
+"\n"
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr "mount: chuỗi tùy chọn « %s » sai trích dẫn"
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr "mount: đã dịch %s « %s » sang « %s »\n"
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, 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:531
+#: mount/mount.c:541
 #, 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:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: không mở được %s để ghi nhớ: %s"
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: lỗi ghi nhớ %s: %s"
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: lỗi thay đổi chế độ của %s: %s"
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr "mount: không đặt được ID nhóm: %s"
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr "mount: không đặt được ID người dùng: %s"
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: không thể phân nhánh %s"
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr "Đang thử %s.\n"
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: bạn chưa chỉ ra kiểu hệ thống tập tin cho %s\n"
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, 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.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr "       và đây có vẻ là vùng trao đổi\n"
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Sẽ thử loại %s\n"
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s có vẻ là vùng trao đổi - không gắn"
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr "mount (gắn) không thành công"
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: chỉ người chủ có quyền gắn %s vào %s"
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr "mount: chỉ ra hai lần thiết bị vòng lặp"
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr "mount: chỉ ra hai lần kiểu hệ thống tập tin"
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, 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ị vòng lặp\n"
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, fuzzy, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr "xác định giá trị chênh sai « %s »"
+
+#: mount/mount.c:1155
+#, fuzzy, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr "xác định giá trị chênh sai « %s »"
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr "mount: theo như mtab thì %s đã gắn vào %s làm vòng lặp"
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: sẽ sử dụng thiết bị vòng lặp %s\n"
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr "mount: stolen loop=%s (vòng lặp bị ăn cắp) nên thử lại\n"
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr "mount: stolen loop=%s (vòng lặp bị ăn cắp)"
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: thiết lập thiết bị vòng lặp không thành công\n"
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: thiết lập thiết bị vòng lặp thành công\n"
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, 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:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: không mở được %s: %s"
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 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:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr "mount: không mở được %s để đặt tốc độ"
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: không đặt được tốc độ: %s"
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr "mount: theo như mtab thì %s đã gắn vào %s\n"
 
-#: mount/mount.c:1371
-#, fuzzy, c-format
+#: mount/mount.c:1435
+#, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
-msgstr "umount: %s bận - gắn lại chỉ đọc\n"
+msgstr "mount: cảnh báo : có vẻ là %s được lắp đọc-ghi.\n"
+
+#: mount/mount.c:1447
+#, fuzzy, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr "mount: cảnh báo : có vẻ là %s được lắp đọc-ghi.\n"
 
-#: mount/mount.c:1404
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: không thể nhận ra kiểu hệ thống tập tin, và người dùng không chỉ ra "
 "kiểu nào"
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: cần chỉ rõ kiểu hệ thống tập tin"
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr "mount: gắn không thành công"
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, 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:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr "mount: không đủ quyền hạn"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr "mount: cần phải là siêu người dùng (root) để sử dụng hàm mount"
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s đang bận"
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr "mount: đã gắn proc"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: đã gắn %s hoặc %s đang bận"
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, 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:1440
+#: mount/mount.c:1518
 #, 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:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: thiết bị đặc biệt %s không tồn tại"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -9181,12 +9420,12 @@ msgstr ""
 "mount: thiết bị đặc biệt %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:1469
+#: mount/mount.c:1547
 #, 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:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -9195,7 +9434,7 @@ msgstr ""
 "mount: sai kiểu hệ thống tập tin, tùy chọn xấu, siêu khối xấu trên %s,\n"
 "       thiếu trang mã hay chương trình bổ trợ, hoặc lỗi khác"
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
@@ -9203,7 +9442,7 @@ msgstr ""
 "       (đối với vài hệ thống tập tin, v.d. nfs, cifs, có lẽ\n"
 "       bạn cần dùng trình bổ trợ « /sbin/mount.<kiểu> »)"
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 msgid ""
 "       (could this be the IDE device where you in fact use\n"
 "       ide-scsi so that sr0 or sda or so is needed?)"
@@ -9211,7 +9450,7 @@ 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
@@ -9219,7 +9458,7 @@ 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:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
@@ -9227,110 +9466,105 @@ 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:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr "đầy bảng gắn"
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s không đọc được siêu khối"
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: không rõ thiết bị"
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr "mount: không rõ kiểu hệ thống tập tin '%s'"
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: có thể muốn đặt %s"
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr "mount: có thể muốn đặt 'iso9660'?"
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr "mount: có thể muốn đặt 'vfat'?"
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s có số hiệu thiết bị sai hoặc chưa hỗ trợ kiểu hệ thống tập tin %s"
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, 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 (lấy trạng thái) không "
 "thành công?"
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
-"mount: nhân không nhận ra %s như là thiết bị khối\n"
-"       (có thể thử `insmod driver'?)"
+"mount: hạt nhân không nhận ra %s như là thiết bị khối\n"
+"       (có thể thử « modprobe driver » ?)"
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, 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:1555
+#: mount/mount.c:1633
 #, 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:1560
+#: mount/mount.c:1638
 #, 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:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr "thiết bị khối "
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, 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:1569
+#: mount/mount.c:1647
 #, 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:1573
-#, fuzzy, c-format
+#: mount/mount.c:1651
+#, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
-msgstr "mount: không gắn được %s%s với chế độ chỉ đọc"
+msgstr "mount: không thể lắp lại %s%s đọc-ghi vì nó cấm ghi"
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, 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:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr "mount: không tìm thấy vật chứa trên %s... nên thử lại\n"
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr "mount: không tìm thấy vật chứa trên %s"
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -9346,26 +9580,26 @@ msgstr ""
 "\tvà không có quyền truy cập đến hệ thống tập tin này.\n"
 "\tĐể tìm chi tiết, xem trang hướng dẫn (man) restorecon(8) và mount(8).\n"
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: không đưa ra kiểu hệ thống tập tin nên coi như nfs vì có dấu hai "
 "chấm\n"
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 "mount: không đưa ra kiểu hệ thống tập tin nên giả sử smbfs vì có // đằng "
 "trước\n"
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: đã gắn %s trên %s\n"
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9443,39 +9677,39 @@ msgstr ""
 "Tùy chọn khác: [-nfFrsvw] [-o tùy_chọn] [-p thư_mục_chứa_tập_tin_mật_khẩu].\n"
 "Để xem rất nhiều chi tiết, dùng lệnh « man 8 mount ».\n"
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, fuzzy, c-format
-msgid "mount: only root can do that (effective UID is %d)"
-msgstr "mount: chỉ người chủ (root) có quyền thực hiện"
+msgid "mount: only root can do that (effective UID is %u)"
+msgstr "mount: chỉ người chủ (root) có quyền làm đó (UID có kết quả là %d)"
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr "mount: chỉ người chủ (root) có quyền thực hiện"
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr "không gắn gì cả"
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr "mount: không tìm thấy phân vùng như vậy"
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, 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_mntent.c:165
+#: mount/mount_mntent.c:114
 #, 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/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr "[mntent]: dòng %d trong %s xấu %s\n"
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr "; bỏ qua phần còn lại của tập tin"
 
@@ -9488,7 +9722,7 @@ msgstr "lỗi (bug) trong lời gọi xstrndup"
 msgid "not enough memory"
 msgstr "không đủ bộ nhớ"
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -9505,7 +9739,7 @@ msgstr ""
 " <tập_tin>                               \ttên của tập tin cần dùng\n"
 "\n"
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -9527,7 +9761,7 @@ msgstr ""
 " %1$s -V                            hiển thị phiên bản\n"
 "\n"
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -9546,88 +9780,93 @@ msgstr ""
 " %1$s -V                           \thiển thị phiên bản\n"
 "\n"
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: gặp định dạng tập tin bất thường"
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: đang sơ khởi lại vùng trao đổi."
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 msgid "fork failed"
 msgstr "lỗi phân nhánh"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 msgid "execv failed"
 msgstr "execv bị lỗi"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
 msgstr "waitpid bị lỗi"
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek bị lỗi"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: lỗi ghi chữ ký"
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
+"%s: tìm thấy chữ ký trao đổi: phiên bản %d, kích cỡ trang %d, thứ tự byte %s"
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
-msgstr ""
+msgstr "khác"
 
-#: mount/swapon.c:355
-#, fuzzy
+#: mount/swapon.c:367
 msgid "same"
-msgstr "Tên"
+msgstr "giống nhau"
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: lỗi lấy trạng thái"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: có quyền không bảo mật %04o, đề nghị dùng %04o."
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: đang bỏ qua — có vẻ là nó bị lỗ."
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: lỗi lấy kích cỡ"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: lỗi đọc phần đầu vùng trao đổi"
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr "%s: last_page 0x%08llx lớn hơn kích cỡ thật của vùng trao đổi"
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: kích cỡ trang định dạng trao đổi không tương ứng."
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9635,76 +9874,78 @@ msgstr ""
 "%s: kích cỡ trang định dạng trao đổi không tương ứng. (Dùng --fixpgsz để sơ "
 "khởi lại nó.)"
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr "%s: phát hiện dữ liệu ngưng phần mềm. Đang ghi lại chữ ký trao đổi."
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s trên %s\n"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s swapon bị lỗi"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "không tìm thấy thiết bị cho %s"
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr "Không phải siêu người dùng.s"
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s swapoff bị lỗi"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
+"« %s » là một tên chương trình không được hỗ trợ (phải là « swapon » hay « "
+"swapoff »)."
 
 #: mount/umount.c:41
 #, 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:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr "umount: không đặt được ID nhóm: %s"
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr "umount: không đặt được ID người dùng: %s"
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr "umount: không thể phân nhánh %s"
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: thiết bị khối không hợp lệ"
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: chưa gắn"
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: không thể ghi siêu khối"
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -9716,51 +9957,51 @@ msgstr ""
 "\thàm lsof(8) hoặc fuser(1) có thể tìm\n"
 "\tthông tin có ích về các tiến trình đang dùng thiết bị."
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: không tìm thấy"
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: phải là siêu người dùng (root) để bỏ gắn"
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, 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 hệ thống tập tin"
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr "không có umount2, đang thử umount..\n"
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, 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:263
+#: mount/umount.c:269
 #, 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:272
-#, c-format
-msgid "%s umounted\n"
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
 msgstr "%s đã bỏ gắn\n"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 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:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9775,82 +10016,87 @@ msgstr ""
 "special\tđặc biệt\n"
 "node\tnút\n"
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
 msgstr "thiết bị %s tương ứng với %s\n"
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
 msgstr "thiết bị %s không tương ứng với %s\n"
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+#, fuzzy
+msgid "Cannot unmount \"\"\n"
 msgstr "Không bỏ gắn được \"\"\n"
 
-#: mount/umount.c:493
-#, c-format
-msgid "Trying to umount %s\n"
+#: mount/umount.c:499
+#, fuzzy, c-format
+msgid "Trying to unmount %s\n"
 msgstr "Đang thử bỏ gắn %s\n"
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr "umount: bị lẫn lộn khi phân tích mtab"
 
-#: mount/umount.c:511
-#, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+#: mount/umount.c:517
+#, fuzzy, c-format
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 "umount: không thể tháo gắn kết %s — %s được gắn kết ở trên nó ở cùng một "
 "điểm."
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Không tìm thấy %s trong mtab\n"
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s chưa gắn (theo mtab)"
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: có vẻ là %s được gắn nhiều lần"
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, 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:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: gắn %s không tương ứng fstab"
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, 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:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr "umount: chỉ người chủ (root) có quyền thực hiện"
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9858,99 +10104,94 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
-"\n"
-"chrt — thao tác các thuộc tính thời gian thật của một tiến trình.\n"
-"\n"
-"Đặt chính sách:\n"
-"  chrt [các_tùy_chọn] <chính_sách> <ưu_tiên> {<pid> | <lệnh> "
-"[<đối_số> ...]}\n"
-"\n"
-"Lấy chính sách:\n"
-"  chrt [các_tùy_chọn] {<pid> | <lệnh> [<đối_số> ...]}\n"
-"\n"
-"\n"
-"Chính sách định thời:\n"
-"  -b | --batch         đặt chính sách thành SCHED_BATCH\n"
-"  -f | --fifo          đặt chính sách thành SCHED_FIFO\n"
-"  -i | --idle          đặt chính sách thành SCHED_IDLE\n"
-"  -o | --other         đặt chính sách thành SCHED_OTHER\n"
-"  -r | --rr            đặt chính sách thành SCHED_RR (mặc định)\n"
-"\n"
-"Tuỳ chọn:\n"
-"  -h | --help          hiển thị trợ giúp này\n"
-"  -p | --pid           thao tác trên mã số tiến trình (PID) đã đưa ra\n"
-"  -m | --max           hiển thị mức ưu tiên hợp lệ tối đa và tối thiểu\n"
-"  -v | --verbose       hiển thị thông tin trạng thái\n"
-"  -V | --version       xuất thông tin phiên bản\n"
-"\n"
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr "lỗi lấy chính sách của PID %d"
 
-#: schedutils/chrt.c:87
-#, c-format
-msgid "pid %d's %s scheduling policy: "
+#: schedutils/chrt.c:104
+#, fuzzy, c-format
+msgid "pid %d's new scheduling policy: "
 msgstr "chính sách định thời %2$s của PID %1$d: "
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:106
+#, fuzzy, c-format
+msgid "pid %d's current scheduling policy: "
+msgstr "chính sách định thời %2$s của PID %1$d: "
+
+#: schedutils/chrt.c:139
 #, c-format
 msgid "unknown\n"
 msgstr "không rõ\n"
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "lỗi lấy các thuộc tính về PID %d"
 
-#: schedutils/chrt.c:115
-#, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+#: schedutils/chrt.c:146
+#, fuzzy, c-format
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr "mức ưu tiên định thời %2$s của PID %1$d: %3$d\n"
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, fuzzy, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr "mức ưu tiên định thời %2$s của PID %1$d: %3$d\n"
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr "SCHED_%s ưu tiên tiểu/đa\t: %d/%d\n"
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr "SCHED_%s không được hỗ trợ ?\n"
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 msgid "failed to parse pid"
 msgstr "lỗi phân tích PID"
 
-#: schedutils/chrt.c:225
-msgid "current"
-msgstr "hiện thời"
-
-#: schedutils/chrt.c:233
+#: schedutils/chrt.c:273
 msgid "failed to parse priority"
 msgstr "lỗi phân tích mức ưu tiên"
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
+msgstr ""
+
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "lỗi đặt chính sách của PID %d"
 
-#: schedutils/chrt.c:242
-#, fuzzy
-msgid "new"
-msgstr "Mới"
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, c-format
 msgid "failed to execute %s"
 msgstr "lỗi thực hiện %s"
@@ -9964,14 +10205,14 @@ msgid "ioprio_set failed"
 msgstr "ioprio_set bị lỗi"
 
 #: schedutils/ionice.c:81
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "ionice - sets or gets process io scheduling class and priority.\n"
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -10018,9 +10259,120 @@ msgstr "đang lờ đi dữ liệu hạng đưa ra cho hạng nghỉ"
 msgid "bad prio class %d"
 msgstr "hạng ưu tiên sai %d"
 
-#: schedutils/ionice.c:187
-msgid "execvp failed"
-msgstr "execvp bị lỗi"
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
+msgstr "exec %s bị lỗi"
+
+#: schedutils/taskset.c:38
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr "Sử dụng: %s [tuỳ_chọn ...] <chương_trình> [đối_số ...]\n"
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+"\n"
+"Để tìm thêm thông tin, xem namei(1).\n"
+
+#: schedutils/taskset.c:113
+#, fuzzy
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "không thể quyết định kích cỡ của %s"
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
+#, fuzzy
+msgid "cpuset_alloc failed"
+msgstr "lỗi calloc"
+
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "lỗi lấy chính sách của PID %d"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "lỗi phân tích PID"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "lỗi đặt chính sách của PID %d"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+#, fuzzy
+msgid "parse error at lines: "
+msgstr "lỗi phân tích cú pháp\n"
+
+#: shlibs/mount/src/tab_parse.c:503
+#, fuzzy
+msgid "parse error at line: "
+msgstr "lỗi phân tích cú pháp\n"
+
+#: shlibs/mount/src/tab_parse.c:523
+#, fuzzy, c-format
+msgid " and %d."
+msgstr " và "
 
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
@@ -10162,11 +10514,22 @@ 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:45
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
-msgstr "Sử dụng: %s [-c] [-n bậc] [ -s kíchthước_bộđệm]\n"
+msgstr "Sử dụng: %s [-c] [-n bậc] [-r] [ -s cỡ_bộ_đệm]\n"
+
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sử dụng: %s [tùy_chọn ...] <tên_tập_tin>\n"
+"\n"
+"Tuỳ chọn:\n"
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -10174,44 +10537,49 @@ msgid ""
 " -o, --offset <num>  offset of the allocation, in bytes\n"
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
+" -h, --help          trợ giúp này\n"
+" -n, --keep-size     đừng sửa đổi chiều dài của tập tin\n"
+" -o, --offset <SỐ>  khoảng chênh cấp phát, theo byte\n"
+" -l, --length <SỐ>  chiều dài cấp phát, theo byte\n"
 
-#: sys-utils/fallocate.c:56
-#, fuzzy, c-format
+#: sys-utils/fallocate.c:57
+#, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 "\n"
-"Để tìm thêm thông tin, xem namei(1).\n"
+"Để tìm thêm thông tin, xem fallocate(1).\n"
 
-#: sys-utils/fallocate.c:147
-#, fuzzy
+#: sys-utils/fallocate.c:115
 msgid "no length argument specified"
-msgstr "Không đủ đối số"
+msgstr "chưa xác định đối số chiều dài"
 
-#: sys-utils/fallocate.c:149
-#, fuzzy
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
-msgstr "Giá trị đặt không đúng: %s\n"
+msgstr "sai xác định giá trị chiều dài"
 
-#: sys-utils/fallocate.c:151
-#, fuzzy
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
-msgstr "Giá trị đặt không đúng: %s\n"
+msgstr "sai xác định giá trị chênh"
 
-#: sys-utils/fallocate.c:153
-#, fuzzy
+#: sys-utils/fallocate.c:121
 msgid "no filename specified."
-msgstr "Không chỉ ra tùy chọn --date.\n"
+msgstr "chưa xác định tên tập tin."
+
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+#, fuzzy
+msgid "unexpected number of arguments"
+msgstr "mong đợi con số, còn nhận « %s »"
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
-msgstr ""
+msgstr "chế độ giữ kích cỡ (tuỳ chọn « -n ») không được hỗ trợ"
 
-#: sys-utils/fallocate.c:174
-#, fuzzy, c-format
+#: sys-utils/fallocate.c:147
+#, c-format
 msgid "%s: fallocate failed"
-msgstr "%s: lỗi mở"
+msgstr "%s: fallocate bị lỗi"
 
 #: sys-utils/flock.c:65
 #, c-format
@@ -10268,6 +10636,64 @@ msgstr "%s: yêu cầu bộ mô tả tập tin, tập tin hay thư mục\n"
 msgid "%s: fork failed: %s\n"
 msgstr "%s: lỗi phân nhánh: %s\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr ""
+"Sử dụng: %s [tùy_chọn ...] <tên_tập_tin>\n"
+"\n"
+"Tuỳ chọn:\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, fuzzy, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+"\n"
+"Để tìm thêm thông tin, xem wipefs(8).\n"
+
+#: sys-utils/fsfreeze.c:90
+#, fuzzy
+msgid "no action specified"
+msgstr "chưa xác định tên tập tin."
+
+#: sys-utils/fsfreeze.c:92
+#, fuzzy
+msgid "no filename specified"
+msgstr "chưa xác định tên tập tin."
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s: lỗi lấy trạng thái"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "inode gốc không phải thư mục"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "%s: lỗi ghi"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s: lỗi ghi"
+
 #: sys-utils/ipcmk.c:84
 #, c-format
 msgid ""
@@ -10363,476 +10789,451 @@ msgstr ""
 "sử dụng: %s [ [-q msqid] [-m shmid] [-s semid]\n"
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 
-#: sys-utils/ipcrm.c:179
-#, 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:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr "%s: phím không cho phép (%s)\n"
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr "không đủ quyền hạn cho chìa khóa"
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr "đã xóa chìa khoá"
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr "chìa khóa không đúng"
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr "lỗi không rõ trong chìa khóa"
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr "không đủ quyền hạn cho id"
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr "id sai"
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr "đã xóa id"
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr "lỗi không rõ trong id"
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr "%s: đối số không rõ: %s\n"
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr "sử dụng : %s -asmq -tclup \n"
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr "\t%s [-s -m -q] -i id\n"
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr "\t%s -h để xem trợ giúp.\n"
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\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:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
-"Đặc điểm nguồn:\n"
-"\t-m : nguồn_chiasẻ\n"
-"\t-q : tinnhắn\n"
 
 #: sys-utils/ipcs.c:127
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
-"\t-s : cột đèn hiệu\n"
-"\t-a : tất cả (mặc định)\n"
+"%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:128
-#, c-format
+#: sys-utils/ipcs.c:131
+#, fuzzy, 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 : người tạo\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
+msgstr "-i id [-s -q -m] : chi tiết về nguồn có tên id\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
-"\t-l : giới hạn\n"
-"\t-u : tổng kết\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, 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"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, 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:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Giới hạn bộ nhớ chia sẻ --------\n"
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr "số đoạn lớn nhất = %lu\n"
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr "kích cỡ đoạn lớn nhất (kbyte) = %lu\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr "tổng số bộ nhớ chia sẻ lớn nhất (theo kilô-byte) = %llu\n"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr "kích cỡ đoạn nhỏ nhất (byte) = %lu\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Trạng thái bộ nhớ chia sẻ --------\n"
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr "%d đoạn đã phân phối\n"
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr "%ld trang đã phân phối\n"
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr "%ld trang nội trú\n"
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr "%ld trang đã đưa vào swap\n"
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, 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"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, 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:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr "quyền hạn"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, 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:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr "chủ sở hữu"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr "đã gắn"
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr "đã bỏ gắn"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr "đã thay đổi"
 
-#: sys-utils/ipcs.c:299
-#, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+#: sys-utils/ipcs.c:327
+#, fuzzy, c-format
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr "------ Bộ nhớ chia sẻ Người tạo/Thao tác cuối --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Các đoạn bộ nhớ chia sẻ --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr "chìa khóa"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr "byte"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr "trạng thái"
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr "Chưa đặt"
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr "đích"
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr "đã khóa"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, 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:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Giới hạn đèn tín hiệu --------\n"
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "số dãy lớn nhất = %d\n"
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, 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:394
+#: sys-utils/ipcs.c:422
 #, 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:395
+#: sys-utils/ipcs.c:423
 #, 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:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "giá trị đèn hiệu lớn nhất = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Trạng thái đèn tín hiệu --------\n"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "dãy đã sử dụng = %d\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "đèn tín hiệu đã phân phối = %d\n"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, 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:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr "mã số cờ hiệu"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr "------ Thời gian thay đổi / thao tác Semaphore --------\n"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr "thao tác cuối cùng"
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr "thay đổi cuối cùng"
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Dãy cờ hiệu --------\n"
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr "số đoạn"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, 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:490
-#, c-format
-msgid "------ Messages: Limits --------\n"
+#: sys-utils/ipcs.c:518
+#, fuzzy, c-format
+msgid "------ Messages Limits --------\n"
 msgstr "------ Tin nhắn: Giới hạn --------\n"
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, 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:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "kích cỡ lớn nhất của tin nhắn (theo byte) = %d\n"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "kích cỡ mặc định lớn nhất của hàng đợi (byte) = %d\n"
 
-#: sys-utils/ipcs.c:497
-#, c-format
-msgid "------ Messages: Status --------\n"
+#: sys-utils/ipcs.c:525
+#, fuzzy, c-format
+msgid "------ Messages Status --------\n"
 msgstr "------ Tin nhắn: Trạng thái --------\n"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "hàng đợi đã phân phối = %d\n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr "phần đầu đã sử dụng = %d\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "không gian đã sử dụng = %d byte\n"
 
-#: sys-utils/ipcs.c:504
-#, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+#: sys-utils/ipcs.c:532
+#, fuzzy, 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:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, 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:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr "gửi"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr "nhận"
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr "thay đổi"
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID của hàng đợi tin nhắn --------\n"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr "------ Hàng đợi tin nhắn --------\n"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr "byte đã dùng"
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr "tin nhắn"
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 msgid "shmctl failed"
 msgstr "shmctl bị lỗi"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
@@ -10841,41 +11242,41 @@ msgstr ""
 "\n"
 "shmid của một đoạn bộ nhớ chia sẻ =%d\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, 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:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "chế_độ=%#o\tquyền_truy_cập=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, 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:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr "att_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr "det_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr "change_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 msgid "msgctl failed"
 msgstr "msgctl bị lỗi"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
@@ -10884,31 +11285,31 @@ msgstr ""
 "\n"
 "msqid của hàng đợi tin nhắn=%d\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, 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:620
+#: sys-utils/ipcs.c:648
 #, 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:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr "send_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr "rcv_time=%-26.24s\n"
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 msgid "semctl failed"
 msgstr "semctl bị lỗi"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
@@ -10917,61 +11318,66 @@ msgstr ""
 "\n"
 "semid của dãy cờ hiệu=%d\n"
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, 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:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "chế_độ=%#o, quyền_truy_cập=%#o\n"
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr "otime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr "ctime = %-26.24s\n"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr "sốđèn"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr "giátrị"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/ldattach.c:89
-#, c-format
+#: sys-utils/ldattach.c:133
+#, fuzzy, c-format
+msgid "invalid iflag: %s"
+msgstr "id sai: %s\n"
+
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Sử dụng: %s [ -dhV78neo12 ] [ -s <tốc_độ> ] <lđĩa> <thiết_bị>\n"
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -10979,92 +11385,114 @@ msgstr ""
 "\n"
 "Các tên <lđĩa> đã biết đến:\n"
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+#, fuzzy
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+"\n"
+"Các tên <lđĩa> đã biết đến:\n"
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr "tốc độ sai: %s"
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach từ %s\n"
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr "tùy chọn sai"
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "kỷ luật dòng sai: %s"
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s không phải là dòng nối tiếp"
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "không thể lấy thuộc tính thiết bị về %s"
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr "tốc độ %d không được hỗ trợ"
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "không thể đặt các thuộc tính thiết bị cho %s"
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr "không thể đặt kỷ luật dòng"
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
 msgstr "không thể chạy trong nền"
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 msgid "none"
 msgstr "không"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr "phần"
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr "đầy"
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, c-format
-msgid "error: %s"
-msgstr "lỗi: %s"
+#: sys-utils/lscpu.c:158
+#, fuzzy, c-format
+msgid "error: cannot open %s"
+msgstr "%s: không thể mở %s\n"
 
-#: sys-utils/lscpu.c:162
-#, c-format
-msgid "error parse: %s"
-msgstr "phân tích lỗi: %s"
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
+#, fuzzy, c-format
+msgid "failed to read: %s"
+msgstr "lỗi lấy trạng thái: %s"
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:209
+#, fuzzy, c-format
+msgid "parse error: %s"
+msgstr "lỗi phân tích cú pháp\n"
+
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
 msgstr "lỗi: strdup không thành công"
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "lỗi phân cấp vùng đệm ra"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "lỗi phân tích PID"
+
+#: sys-utils/lscpu.c:318
 msgid "error: uname failed"
 msgstr "lỗi: uname không thành công"
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+#, fuzzy
+msgid "error: calloc failed"
 msgstr "lỗi: malloc không thành công"
 
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr "lỗi: hệ thống tập tin « /sys » không thể truy cập được"
-
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -11078,70 +11506,83 @@ msgstr ""
 "# bắt đầu từ số không.\n"
 "# CPU,Lõi,Ổ_cắm,Nút"
 
-#: sys-utils/lscpu.c:619
-#, fuzzy
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
+msgstr "Chế độ thao tác CPU:"
+
+#: sys-utils/lscpu.c:759
+#, fuzzy
+msgid "CPU(s):"
 msgstr "Ổ cắm CPU:"
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr "Mạch mỗi lõi:"
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr "Lõi mỗi ổ cắm:"
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr "Ổ cắm CPU:"
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr "Nút NUMA:"
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr "Mã số nhà sản xuất:"
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr "Nhóm CPU:"
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr "Mô hình:"
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr "Làm bước:"
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr "CPU MHz:"
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr "Mô phỏng:"
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr "Nhà sản xuất bộ mô phòng đồng thời:"
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr "Kiểu mô phỏng:"
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr "Vùng nhớ tạm %s:"
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, fuzzy, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "Nút NUMA:"
+
+#: sys-utils/lscpu.c:816
 #, c-format
 msgid "Usage: %s [option]\n"
 msgstr "Sử dụng: %s [tùy_chọn]\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -11156,73 +11597,6 @@ msgstr ""
 "được\n"
 "  -s, --sysroot  dùng thư mục làm gốc hệ thống mới\n"
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr "lỗi: chuyển đổi thư mục làm việc sang %s."
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "sử dụng: rdev [ -rv ] [ -o BÙ ] [ ẢNH [ GIÁ_TRỊ [ BÙ ] ] ]"
-
-#: sys-utils/rdev.c:78
-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 (gốc) "
-"hiện thời"
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         đặt ROOT (gốc) thành /dev/hda2"
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              đặt ROOTFLAGS [các cờ gốc] (trạng thái chỉ "
-"đọc)"
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            đặt kích cỡ RAMDISK (đĩa RAM)"
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-"  rdev -v /dev/fd0 1              đặt chế độ VIDEOMODE (chế độ ảnh động) "
-"khởi động"
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  -u, --unqote                  sử dụng bộ byte N"
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   giống như rdev -R"
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     giống như rdev -r"
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     giống như rdev -v"
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-"Chú ý: chế độ ảnh động là: -3=Hỏi, -2=Mở rộng, -1=VGA chuẩn, 1=phím1, "
-"2=phím2,..."
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr "      hãy dùng « -R 1 » để gắn gốc chỉ đọc, « -R 0 » để đọc/ghi."
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr "thiếu dấu phẩy"
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -11348,11 +11722,12 @@ msgstr "đặt_ưu_tiên"
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: mức độ ưu tiên cũ %d, mới %d\n"
 
-#: sys-utils/rtcwake.c:83
-#, c-format
+#: sys-utils/rtcwake.c:85
+#, fuzzy, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -11371,104 +11746,129 @@ msgstr ""
 "    -v | --verbose            in ra chi tiết\n"
 "    -V | --version            hiển thị số thứ tự phiên bản\n"
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr "đọc thời gian RTC"
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr "đọc thời gian hệ thống"
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr "chuyển đổi thời gian RTC"
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr "để đồng hồ báo thức RTC"
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr "bật đồng hồ báo thức RTC"
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr "để đồng hồ báo thức RTC kích hoạt lại"
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr "%s: tình trạng ngưng không nhận ra: %s\n"
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr "%s: khoảng cấm %s giây\n"
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr "%s: giá trị « time_t » cấm %s\n"
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr "%s: phiên bản %s\n"
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: giả sử RTC dùng UTC ...\n"
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Sử dụng thời gian UTC.\n"
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr "Sử dụng thời gian địa phương.\n"
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr "%s: phải cung cấp thời gian kích hoạt lại\n"
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr "malloc() bị lỗi"
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr "%s: %s không có hiệu lực cho dữ kiện kích hoạt lại\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "báo thức %ld, giờ_hệ_thống %ld, giờ_RTC %ld, giây %u\n"
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr "%s: thời gian không chạy ngược về %s\n"
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr "%s: kích hoạt lại sau « %s » dùng %s ở %s\n"
 
-#: sys-utils/rtcwake.c:487
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
+#, c-format
 msgid "%s: unable to execute %s: %s\n"
-msgstr "%s: không thể đổi nhãn của %s thành %s: %s\n"
+msgstr "%s: không thể thực hiện %s: %s\n"
+
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr "đọc RTC"
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr "tắt khả năng gián đoạn của đồng hồ báo thức RTC"
 
@@ -11585,6 +11985,11 @@ msgstr "%s: giá trị xấu\n"
 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:259
+#, fuzzy
+msgid "LPGETSTATUS error"
+msgstr "lỗi LPGETIRQ"
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -11615,6 +12020,11 @@ msgstr ", trực tuyến"
 msgid ", error"
 msgstr ", lỗi"
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "mount: gắn không thành công"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "lỗi LPGETIRQ"
@@ -11630,9 +12040,9 @@ msgid "%s using polling\n"
 msgstr "%s đang dùng khả năng trưng cầu\n"
 
 #: sys-utils/unshare.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [options] <program> [args...]\n"
-msgstr "sử dụng: %s chương trình [đối_số ...]\n"
+msgstr "Sử dụng: %s [tuỳ_chọn ...] <chương_trình> [đối_số ...]\n"
 
 #: sys-utils/unshare.c:60
 msgid ""
@@ -11644,25 +12054,41 @@ msgid ""
 "  -i, --ipc         unshare System V IPC namespace\n"
 "  -n, --net         unshare network namespace\n"
 msgstr ""
+"Chạy chương trình có một số miền tên không chia sẻ từ cha\n"
+"\n"
+"  -h, --help        trợ giúp này\n"
+"  -m, --mount       bỏ chia sẻ miền tên mounts\n"
+"  -u, --uts         bỏ chia sẻ miền tên UTS (tên máy v.v.)\n"
+"  -i, --ipc         bỏ chia sẻ miền tên System V IPC\n"
+"  -n, --net         bỏ chia sẻ miền tên network\n"
 
 #: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
 "\n"
-"Để tìm thêm thông tin, xem namei(1).\n"
+"Để tìm thêm thông tin, xem unshare(1).\n"
 
 #: sys-utils/unshare.c:114
-#, fuzzy
 msgid "unshare failed"
-msgstr "tìm nơi bị lỗi"
+msgstr "unshare bị lỗi"
 
 #: sys-utils/unshare.c:118
-#, fuzzy, c-format
+#, fuzzy
+msgid "cannot set group id"
+msgstr "mount: không đặt được ID nhóm: %s"
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "mount: không đặt được ID người dùng: %s"
+
+#: sys-utils/unshare.c:125
+#, c-format
 msgid "exec %s failed"
-msgstr "thực hiện (exec) không thành công\n"
+msgstr "exec %s bị lỗi"
 
 #: text-utils/col.c:154
 #, c-format
@@ -11730,9 +12156,9 @@ 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:290
-#, fuzzy, c-format
+#, c-format
 msgid "failed to initialize line buffer\n"
-msgstr "lỗi phân cấp vùng đệm ra"
+msgstr "lỗi sơ khởi vùng đệm dòng\n"
 
 #: text-utils/more.c:485
 #, c-format
@@ -12146,24 +12572,26 @@ msgid "cannot stat \"%s\""
 msgstr "không thể lấy trạng thái về « %s »"
 
 #: text-utils/tailf.c:109
-#, fuzzy, c-format
+#, c-format
 msgid "incomplete write to \"%s\" (written %zd, expected %zd)\n"
-msgstr "ghi không hoàn toàn vào « %s » (đã ghi %ld, mong đợi %ld)\n"
+msgstr "ghi không hoàn toàn vào « %s » (đã ghi %zd, mong đợi %zd)\n"
 
 #: text-utils/tailf.c:147
 #, c-format
 msgid "%s: cannot add inotify watch (limit of inotify watches was reached)."
 msgstr ""
+"%s: không thể thêm sự theo dõi inotify (đã tới giới hạn các sự giới hạn "
+"inotify)."
 
 #: text-utils/tailf.c:151
 #, c-format
 msgid "%s: cannot add inotify watch."
-msgstr ""
+msgstr "%s: không thể thêm sự theo dõi inotify."
 
 #: text-utils/tailf.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot read inotify events"
-msgstr "%s: không thể mở %s\n"
+msgstr "%s: không thể đọc sự kiện inotify"
 
 #: text-utils/tailf.c:199 text-utils/tailf.c:203
 msgid "invalid number of lines"
@@ -12203,32 +12631,231 @@ msgstr "Dòng nhập vào quá dài.\n"
 msgid "Out of memory when growing buffer.\n"
 msgstr "Không đủ bộ nhớ khi tăng vùng đệm.\n"
 
-#~ msgid "%s: found %sswap v%d signature string for %d KiB PAGE_SIZE\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: tùy chọn không cho phép « -- %c »\n"
+
+#~ msgid "segments allocated %d\n"
+#~ msgstr "%d đoạn đã phân phối\n"
+
+#~ msgid "pages allocated %ld\n"
+#~ msgstr "%ld trang đã phân phối\n"
+
+#~ msgid "pages resident  %ld\n"
+#~ msgstr "%ld trang nội trú\n"
+
+#~ msgid "pages swapped   %ld\n"
+#~ msgstr "%ld trang đã đưa vào swap\n"
+
+#~ 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"
+
+#~ msgid ""
+#~ " and change display units to\n"
+#~ "         sectors (command 'u').\n"
 #~ msgstr ""
-#~ "%s: tìm thấy chuỗi chữ ký vùng trao đổi %s v%d cho %d KiB KÍCH_CỠ_TRANG\n"
+#~ " và thay đổi đơn vị hiển thị\n"
+#~ "\tsang rãnh ghi (lệnh « u »).\n"
 
-#, fuzzy
-#~ msgid "out if memory"
-#~ msgstr "không đủ bộ nhớ"
+#~ msgid "error running programme: \"%s\"\n"
+#~ msgstr "lỗi chạy chương trình: « %s »\n"
 
-#~ msgid "# partition table of %s\n"
-#~ msgstr "# bảng phân vùng của %s\n"
+#~ msgid "invalid offset '%s' value specified"
+#~ msgstr "xác định giá trị chênh sai « %s »"
 
+#, fuzzy
 #~ msgid ""
-#~ "unit: sectors\n"
+#~ "\n"
+#~ "chrt - manipulate real-time attributes of a process.\n"
+#~ "\n"
+#~ "Set policy:\n"
+#~ "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
+#~ "\n"
+#~ "Get policy:\n"
+#~ "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
+#~ "\n"
+#~ "\n"
+#~ "Scheduling policies:\n"
+#~ "  -b | --batch         set policy to SCHED_BATCH\n"
+#~ "  -f | --fifo          set policy to SCHED_FIFO\n"
+#~ "  -i | --idle          set policy to SCHED_IDLE\n"
+#~ "  -o | --other         set policy to SCHED_OTHER\n"
+#~ "  -r | --rr            set policy to SCHED_RR (default)\n"
+#~ "\n"
+#~ "Scheduling flags:\n"
+#~ "  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h | --help          display this help\n"
+#~ "  -p | --pid           operate on existing given pid\n"
+#~ "  -m | --max           show min and max valid priorities\n"
+#~ "  -v | --verbose       display status information\n"
+#~ "  -V | --version       output version information\n"
 #~ "\n"
 #~ msgstr ""
-#~ "đơn vị: rãnh ghi\n"
 #~ "\n"
+#~ "chrt — thao tác các thuộc tính thời gian thật của một tiến trình.\n"
+#~ "\n"
+#~ "Đặt chính sách:\n"
+#~ "  chrt [các_tùy_chọn] <chính_sách> <ưu_tiên> {<pid> | <lệnh> "
+#~ "[<đối_số> ...]}\n"
+#~ "\n"
+#~ "Lấy chính sách:\n"
+#~ "  chrt [các_tùy_chọn] {<pid> | <lệnh> [<đối_số> ...]}\n"
+#~ "\n"
+#~ "\n"
+#~ "Chính sách định thời:\n"
+#~ "  -b | --batch         đặt chính sách thành SCHED_BATCH\n"
+#~ "  -f | --fifo          đặt chính sách thành SCHED_FIFO\n"
+#~ "  -i | --idle          đặt chính sách thành SCHED_IDLE\n"
+#~ "  -o | --other         đặt chính sách thành SCHED_OTHER\n"
+#~ "  -r | --rr            đặt chính sách thành SCHED_RR (mặc định)\n"
+#~ "\n"
+#~ "Tuỳ chọn:\n"
+#~ "  -h | --help          hiển thị trợ giúp này\n"
+#~ "  -p | --pid           thao tác trên mã số tiến trình (PID) đã đưa ra\n"
+#~ "  -m | --max           hiển thị mức ưu tiên hợp lệ tối đa và tối thiểu\n"
+#~ "  -v | --verbose       hiển thị thông tin trạng thái\n"
+#~ "  -V | --version       xuất thông tin phiên bản\n"
+#~ "\n"
+
+#~ msgid "current"
+#~ msgstr "hiện thời"
+
+#~ msgid "new"
+#~ msgstr "mới"
+
+#~ msgid "Linux ext2"
+#~ msgstr "Linux ext2"
+
+#~ msgid "Linux ext3"
+#~ msgstr "Linux ext3"
+
+#~ msgid "Linux XFS"
+#~ msgstr "Linux XFS"
+
+#~ msgid "Linux JFS"
+#~ msgstr "Linux JFS"
+
+#~ msgid "Linux ReiserFS"
+#~ msgstr "Linux ReiserFS"
+
+#~ msgid "OS/2 HPFS"
+#~ msgstr "OS/2 HPFS"
+
+#~ msgid "OS/2 IFS"
+#~ msgstr "OS/2 IFS"
+
+#~ msgid "NTFS"
+#~ msgstr "NTFS"
+
+#~ msgid "mount: no medium found on %s ...trying again\n"
+#~ msgstr "mount: không tìm thấy vật chứa trên %s... nên thử lại\n"
+
+#~ msgid "execvp failed"
+#~ msgstr "execvp bị lỗi"
+
+#~ msgid "usage : %s -asmq -tclup \n"
+#~ msgstr "sử dụng : %s -asmq -tclup \n"
+
+#~ msgid "\t%s [-s -m -q] -i id\n"
+#~ msgstr "\t%s [-s -m -q] -i id\n"
+
+#~ msgid "\t%s -h for help.\n"
+#~ msgstr "\t%s -h để xem trợ giúp.\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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 : người tạo\n"
+
+#~ msgid ""
+#~ "\t-l : limits\n"
+#~ "\t-u : summary\n"
+#~ msgstr ""
+#~ "\t-l : giới hạn\n"
+#~ "\t-u : tổng kết\n"
 
-#~ msgid " start=%9lu"
-#~ msgstr " đầu=%9lu"
+#~ msgid "error: %s"
+#~ msgstr "lỗi: %s"
+
+#~ msgid "error parse: %s"
+#~ msgstr "phân tích lỗi: %s"
+
+#~ msgid "error: /sys filesystem is not accessable."
+#~ msgstr "lỗi: hệ thống tập tin « /sys » không thể truy cập được"
+
+#~ msgid "error: change working directory to %s."
+#~ msgstr "lỗi: chuyển đổi thư mục làm việc sang %s."
+
+#~ msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+#~ msgstr "sử dụng: rdev [ -rv ] [ -o BÙ ] [ ẢNH [ GIÁ_TRỊ [ BÙ ] ] ]"
+
+#~ 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 (gốc) "
+#~ "hiện thời"
 
-#~ msgid ", size=%9lu"
-#~ msgstr ", cỡ=%9lu"
+#~ msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+#~ msgstr "  rdev /dev/fd0 /dev/hda2         đặt ROOT (gốc) thành /dev/hda2"
+
+#~ msgid ""
+#~ "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
+#~ msgstr ""
+#~ "  rdev -R /dev/fd0 1              đặt ROOTFLAGS [các cờ gốc] (trạng thái "
+#~ "chỉ đọc)"
+
+#~ msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+#~ msgstr "  rdev -r /dev/fd0 627            đặt kích cỡ RAMDISK (đĩa RAM)"
+
+#~ msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+#~ msgstr ""
+#~ "  rdev -v /dev/fd0 1              đặt chế độ VIDEOMODE (chế độ ảnh động) "
+#~ "khởi động"
+
+#~ msgid "  rdev -o N ...                   use the byte offset N"
+#~ msgstr "  -u, --unqote                  sử dụng bộ byte N"
+
+#~ msgid "  rootflags ...                   same as rdev -R"
+#~ msgstr "  rootflags ...                   giống như rdev -R"
+
+#~ msgid "  ramsize ...                     same as rdev -r"
+#~ msgstr "  ramsize ...                     giống như rdev -r"
+
+#~ msgid "  vidmode ...                     same as rdev -v"
+#~ msgstr "  vidmode ...                     giống như rdev -v"
+
+#~ msgid ""
+#~ "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
+#~ "2=key2,..."
+#~ msgstr ""
+#~ "Chú ý: chế độ ảnh động là: -3=Hỏi, -2=Mở rộng, -1=VGA chuẩn, 1=phím1, "
+#~ "2=phím2,..."
 
-#~ msgid ", bootable"
-#~ msgstr ", khởi động được"
+#~ msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
+#~ msgstr "      hãy dùng « -R 1 » để gắn gốc chỉ đọc, « -R 0 » để đọc/ghi."
 
-#~ msgid "Clock in UTC, not changed.\n"
-#~ msgstr "Đồng hồ theo UTC nên không thay đổi gì.\n"
+#~ msgid "missing comma"
+#~ msgstr "thiếu dấu phẩy"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6838d617..116be111 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng-2.14.1-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2010-01-07 21:55+0100\n"
+"POT-Creation-Date: 2010-06-30 14:44+0200\n"
 "PO-Revision-Date: 2008-08-23 23:20+0800\n"
 "Last-Translator: Ray Wang <wanglei1123@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -103,6 +103,11 @@ msgstr "重新读取分区表"
 msgid "Usage:\n"
 msgstr "用法:\n"
 
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid "  %s -V\n"
+msgstr ""
+
 #: disk-utils/blockdev.c:181
 #, c-format
 msgid "  %s --report [devices]\n"
@@ -122,6 +127,17 @@ msgstr "可用的命令:\n"
 msgid "get size in 512-byte sectors"
 msgstr "获得512字节的段大小"
 
+#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118
+#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181
+#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812
+#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572
+#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79
+#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718
+#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84
+#, c-format
+msgid "%s (%s)\n"
+msgstr "%s (%s)\n"
+
 #: disk-utils/blockdev.c:321
 #, c-format
 msgid "%s: Unknown command: %s\n"
@@ -223,15 +239,6 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: disk-utils/fdformat.c:118 disk-utils/fsck.minix.c:1284
-#: disk-utils/isosize.c:181 disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52
-#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:572
-#: disk-utils/mkswap.c:487 misc-utils/ddate.c:179 misc-utils/rename.c:79
-#: misc-utils/script.c:147 sys-utils/readprofile.c:197
-#, c-format
-msgid "%s (%s)\n"
-msgstr "%s (%s)\n"
-
 #: disk-utils/fdformat.c:132
 #, c-format
 msgid "%s: not a block device\n"
@@ -334,7 +341,7 @@ msgstr ""
 
 #: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339
 #: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439
-#: misc-utils/wipefs.c:141 sys-utils/cytune.c:321
+#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321
 msgid "malloc failed"
 msgstr ""
 
@@ -929,7 +936,7 @@ msgstr ""
 msgid "%s is not a block special device"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:202
+#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -953,7 +960,7 @@ msgstr ""
 msgid "not enough space, need at least %llu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2580
+#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
@@ -1027,7 +1034,7 @@ msgstr ""
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:353
+#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358
 #: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246
 #, c-format
 msgid "%s: Out of memory!\n"
@@ -1235,7 +1242,7 @@ msgstr ""
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:315
+#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320
 msgid "seek failed in check_blocks"
 msgstr ""
 
@@ -1315,168 +1322,174 @@ msgstr ""
 msgid "Using user-specified page size %d, instead of the system value %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:171
+#, fuzzy, c-format
+msgid "%s: calloc() failed: %s\n"
+msgstr "%s 失败.\n"
+
+#: disk-utils/mkswap.c:197
 #, c-format
 msgid "Bad swap header size, no label written.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:207
 #, c-format
 msgid "Label was truncated.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:210
+#: disk-utils/mkswap.c:213
 #, c-format
 msgid "no label, "
 msgstr ""
 
-#: disk-utils/mkswap.c:218
+#: disk-utils/mkswap.c:221
 #, c-format
 msgid "no uuid\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:283
+#: disk-utils/mkswap.c:286
 #, c-format
 msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:297
+#: disk-utils/mkswap.c:302
 msgid "too many bad pages"
 msgstr ""
 
-#: disk-utils/mkswap.c:310 misc-utils/look.c:182 misc-utils/setterm.c:1179
+#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179
 #: text-utils/more.c:2016 text-utils/more.c:2027
 msgid "Out of memory"
 msgstr ""
 
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:326
 #, c-format
 msgid "one bad page\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:323
+#: disk-utils/mkswap.c:328
 #, c-format
 msgid "%lu bad pages\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:402 disk-utils/mkswap.c:439 disk-utils/mkswap.c:659
+#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652
 msgid "unable to rewind swap-device"
 msgstr ""
 
-#: disk-utils/mkswap.c:413
+#: disk-utils/mkswap.c:398
 #, fuzzy
 msgid "unable to alloc new libblkid probe"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: disk-utils/mkswap.c:415
-msgid "unable to assign device to liblkid probe"
-msgstr ""
+#: disk-utils/mkswap.c:400
+#, fuzzy
+msgid "unable to assign device to libblkid probe"
+msgstr "不能为 inodes 分配缓冲区"
 
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:428
 #, fuzzy
 msgid "unable to erase bootbits sectors"
 msgstr "不能读超级块"
 
-#: disk-utils/mkswap.c:447
+#: disk-utils/mkswap.c:432
 #, c-format
 msgid "%s: %s: warning: don't erase bootbits sectors\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:435
 #, c-format
 msgid "        (%s partition table detected). "
 msgstr ""
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:437
 #, c-format
 msgid "        on whole disk. "
 msgstr ""
 
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:439
 #, c-format
 msgid "        (compiled without libblkid). "
 msgstr ""
 
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:510
 #, c-format
 msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:526
 #, c-format
 msgid "%s: does not support swapspace version %d.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:534
 msgid "error: UUID parsing failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:559
+#: disk-utils/mkswap.c:545
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:569
 #, c-format
 msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:586
+#: disk-utils/mkswap.c:578
 #, c-format
 msgid "%s: error: swap area needs to be at least %ld KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:595
 #, c-format
 msgid "%s: warning: truncating swap area to %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:618
 #, c-format
 msgid "%s: error: will not try to make swapdevice on '%s'\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:632
+#: disk-utils/mkswap.c:624
 #, c-format
 msgid "%s: error: %s is mounted; will not make swapspace.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:641
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:644
 #, c-format
 msgid "Setting up swapspace version 1, size = %llu KiB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:662
+#: disk-utils/mkswap.c:655
 #, c-format
 msgid "%s: %s: unable to write signature page: %s"
 msgstr ""
 
-#: disk-utils/mkswap.c:673
+#: disk-utils/mkswap.c:666
 msgid "fsync failed"
 msgstr ""
 
-#: disk-utils/mkswap.c:684
+#: disk-utils/mkswap.c:677
 #, c-format
 msgid "%s: %s: unable to obtain selinux file label: %s\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:690
+#: disk-utils/mkswap.c:683
 msgid "unable to matchpathcon()"
 msgstr ""
 
-#: disk-utils/mkswap.c:693
+#: disk-utils/mkswap.c:686
 msgid "unable to create new selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:695
+#: disk-utils/mkswap.c:688
 msgid "couldn't compute selinux context"
 msgstr ""
 
-#: disk-utils/mkswap.c:701
+#: disk-utils/mkswap.c:694
 #, c-format
 msgid "%s: unable to relabel %s to %s: %s\n"
 msgstr ""
@@ -1539,61 +1552,107 @@ msgstr ""
 msgid "Error setting raw device (%s)\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:378 fdisk/cfdisk.c:2083
-msgid "Unusable"
+#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67
+#, fuzzy, c-format
+msgid "%s: unable to probe device"
+msgstr "%s:不是一个块设备\n"
+
+#: disk-utils/swaplabel.c:69
+#, c-format
+msgid "%s: ambivalent probing result, use wipefs(8)"
 msgstr ""
 
-#: fdisk/cfdisk.c:380 fdisk/cfdisk.c:2085
-msgid "Free Space"
+#: disk-utils/swaplabel.c:71
+#, c-format
+msgid "%s: not a valid swap partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:383
-msgid "Linux ext2"
+#: disk-utils/swaplabel.c:77
+#, c-format
+msgid "%s: unsupported swap version '%s'"
 msgstr ""
 
-#: fdisk/cfdisk.c:385
-msgid "Linux ext3"
+#: disk-utils/swaplabel.c:108
+#, fuzzy, c-format
+msgid "%s: failed to open"
+msgstr "不能读 inodes"
+
+#: disk-utils/swaplabel.c:117
+#, fuzzy, c-format
+msgid "failed to parse UUID: %s"
+msgstr "不能读 inodes"
+
+#: disk-utils/swaplabel.c:121
+#, c-format
+msgid "%s: failed to seek to swap UUID"
 msgstr ""
 
-#: fdisk/cfdisk.c:387
-msgid "Linux XFS"
+#: disk-utils/swaplabel.c:125
+#, fuzzy, c-format
+msgid "%s: failed to write UUID"
+msgstr "不能读 inodes"
+
+#: disk-utils/swaplabel.c:136
+#, c-format
+msgid "%s: failed to seek to swap label "
 msgstr ""
 
-#: fdisk/cfdisk.c:389
-msgid "Linux JFS"
+#: disk-utils/swaplabel.c:143
+#, c-format
+msgid "label is too long. Truncating it to '%s'"
 msgstr ""
 
-#: fdisk/cfdisk.c:391
-msgid "Linux ReiserFS"
+#: disk-utils/swaplabel.c:146
+#, fuzzy, c-format
+msgid "%s: failed to write label"
+msgstr "在 write_block 中查找失败"
+
+#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <device>\n"
+"\n"
+"Options:\n"
+msgstr "用法: %s [ -n ] device\n"
+
+#: disk-utils/swaplabel.c:165
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -L, --label <label> specify a new label\n"
+" -U, --uuid <uuid>   specify a new uuid\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:393 fdisk/i386_sys_types.c:57
-msgid "Linux"
+#: disk-utils/swaplabel.c:169
+#, c-format
+msgid ""
+"\n"
+"For more information see swaplabel(8).\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:396
-msgid "OS/2 HPFS"
+#: disk-utils/swaplabel.c:203
+msgid "ignore -U (UUIDs are unsupported)"
 msgstr ""
 
-#: fdisk/cfdisk.c:398
-msgid "OS/2 IFS"
+#: fdisk/cfdisk.c:383 fdisk/cfdisk.c:1965
+msgid "Unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:402
-msgid "NTFS"
+#: fdisk/cfdisk.c:385 fdisk/cfdisk.c:1967
+msgid "Free Space"
 msgstr ""
 
-#: fdisk/cfdisk.c:415
+#: fdisk/cfdisk.c:400
 #, c-format
 msgid "Disk has been changed.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:417
+#: fdisk/cfdisk.c:402
 #, c-format
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:406
 #, c-format
 msgid ""
 "\n"
@@ -1602,773 +1661,773 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:516
+#: fdisk/cfdisk.c:535
 msgid "FATAL ERROR"
 msgstr ""
 
-#: fdisk/cfdisk.c:517
+#: fdisk/cfdisk.c:536
 msgid "Press any key to exit cfdisk"
 msgstr ""
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:583 fdisk/cfdisk.c:591
 msgid "Cannot seek on disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:585
 msgid "Cannot read disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:593
 msgid "Cannot write disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:801
 msgid "Too many partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:922
+#: fdisk/cfdisk.c:806
 msgid "Partition begins before sector 0"
 msgstr ""
 
-#: fdisk/cfdisk.c:927
+#: fdisk/cfdisk.c:811
 msgid "Partition ends before sector 0"
 msgstr ""
 
-#: fdisk/cfdisk.c:932
+#: fdisk/cfdisk.c:816
 msgid "Partition begins after end-of-disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:937
+#: fdisk/cfdisk.c:821
 msgid "Partition ends after end-of-disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:942
+#: fdisk/cfdisk.c:826
 msgid "Partition ends in the final partial cylinder"
 msgstr ""
 
-#: fdisk/cfdisk.c:966
+#: fdisk/cfdisk.c:850
 msgid "logical partitions not in disk order"
 msgstr ""
 
-#: fdisk/cfdisk.c:969
+#: fdisk/cfdisk.c:853
 msgid "logical partitions overlap"
 msgstr ""
 
-#: fdisk/cfdisk.c:973
+#: fdisk/cfdisk.c:857
 msgid "enlarged logical partitions overlap"
 msgstr ""
 
-#: fdisk/cfdisk.c:1003
+#: fdisk/cfdisk.c:887
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1014 fdisk/cfdisk.c:1026
+#: fdisk/cfdisk.c:898 fdisk/cfdisk.c:910
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:1168
+#: fdisk/cfdisk.c:1050
 msgid "Menu item too long. Menu may look odd."
 msgstr ""
 
-#: fdisk/cfdisk.c:1224
+#: fdisk/cfdisk.c:1106
 msgid "Menu without direction. Defaulting to horizontal."
 msgstr ""
 
-#: fdisk/cfdisk.c:1356
+#: fdisk/cfdisk.c:1238
 msgid "Illegal key"
 msgstr ""
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1261
 msgid "Press a key to continue"
 msgstr ""
 
-#: fdisk/cfdisk.c:1426 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2586
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1308 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2468
+#: fdisk/cfdisk.c:2470
 msgid "Primary"
 msgstr ""
 
-#: fdisk/cfdisk.c:1426
+#: fdisk/cfdisk.c:1308
 msgid "Create a new primary partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1427 fdisk/cfdisk.c:2054 fdisk/cfdisk.c:2585
-#: fdisk/cfdisk.c:2588
+#: fdisk/cfdisk.c:1309 fdisk/cfdisk.c:1936 fdisk/cfdisk.c:2467
+#: fdisk/cfdisk.c:2470
 msgid "Logical"
 msgstr ""
 
-#: fdisk/cfdisk.c:1427
+#: fdisk/cfdisk.c:1309
 msgid "Create a new logical partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483 fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365 fdisk/cfdisk.c:2141
 msgid "Cancel"
 msgstr ""
 
-#: fdisk/cfdisk.c:1428 fdisk/cfdisk.c:1483
+#: fdisk/cfdisk.c:1310 fdisk/cfdisk.c:1365
 msgid "Don't create a partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1444
+#: fdisk/cfdisk.c:1326
 msgid "!!! Internal error !!!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1447
+#: fdisk/cfdisk.c:1329
 msgid "Size (in MB): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Beginning"
 msgstr ""
 
-#: fdisk/cfdisk.c:1481
+#: fdisk/cfdisk.c:1363
 msgid "Add partition at beginning of free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "End"
 msgstr ""
 
-#: fdisk/cfdisk.c:1482
+#: fdisk/cfdisk.c:1364
 msgid "Add partition at end of free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:1500
+#: fdisk/cfdisk.c:1382
 msgid "No room to create the extended partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1574
+#: fdisk/cfdisk.c:1456
 msgid "No partition table.\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:1578
+#: fdisk/cfdisk.c:1460
 msgid "No partition table. Starting with zero table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1588
+#: fdisk/cfdisk.c:1470
 msgid "Bad signature on partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:1592
+#: fdisk/cfdisk.c:1474
 msgid "Unknown partition table type"
 msgstr ""
 
-#: fdisk/cfdisk.c:1594
+#: fdisk/cfdisk.c:1476
 msgid "Do you wish to start with a zero table [y/N] ?"
 msgstr ""
 
-#: fdisk/cfdisk.c:1642
+#: fdisk/cfdisk.c:1524
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1674
+#: fdisk/cfdisk.c:1556
 msgid "Cannot open disk drive"
 msgstr ""
 
-#: fdisk/cfdisk.c:1676 fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1558 fdisk/cfdisk.c:1747
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
 
-#: fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1569
 msgid ""
 "Warning!!  Unsupported GPT (GUID Partition Table) detected. Use GNU Parted."
 msgstr ""
 
-#: fdisk/cfdisk.c:1706
+#: fdisk/cfdisk.c:1588
 msgid "Cannot get disk size"
 msgstr ""
 
-#: fdisk/cfdisk.c:1732
+#: fdisk/cfdisk.c:1614
 msgid "Bad primary partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1762
+#: fdisk/cfdisk.c:1644
 msgid "Bad logical partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:1877
+#: fdisk/cfdisk.c:1759
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr ""
 
-#: fdisk/cfdisk.c:1881
+#: fdisk/cfdisk.c:1763
 msgid ""
 "Are you sure you want to write the partition table to disk? (yes or no): "
 msgstr ""
 
-#: fdisk/cfdisk.c:1887
+#: fdisk/cfdisk.c:1769
 msgid "no"
 msgstr ""
 
-#: fdisk/cfdisk.c:1889
+#: fdisk/cfdisk.c:1771
 msgid "Did not write partition table to disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1891
+#: fdisk/cfdisk.c:1773
 msgid "yes"
 msgstr ""
 
-#: fdisk/cfdisk.c:1895
+#: fdisk/cfdisk.c:1777
 msgid "Please enter `yes' or `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:1781
 msgid "Writing partition table to disk..."
 msgstr ""
 
-#: fdisk/cfdisk.c:1924 fdisk/cfdisk.c:1928
+#: fdisk/cfdisk.c:1806 fdisk/cfdisk.c:1810
 msgid "Wrote partition table to disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1926
+#: fdisk/cfdisk.c:1808
 msgid ""
 "Wrote partition table, but re-read table failed.  Run partprobe(8), kpartx"
 "(8) or reboot to update table."
 msgstr ""
 
-#: fdisk/cfdisk.c:1936
+#: fdisk/cfdisk.c:1818
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1938
+#: fdisk/cfdisk.c:1820
 msgid ""
 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 
-#: fdisk/cfdisk.c:1996 fdisk/cfdisk.c:2115 fdisk/cfdisk.c:2199
+#: fdisk/cfdisk.c:1878 fdisk/cfdisk.c:1997 fdisk/cfdisk.c:2081
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2123 fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:1887 fdisk/cfdisk.c:2005 fdisk/cfdisk.c:2089
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr ""
 
-#: fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1898
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2018
+#: fdisk/cfdisk.c:1900
 msgid "Sector 0:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2025
+#: fdisk/cfdisk.c:1907
 #, c-format
 msgid "Sector %d:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2045
+#: fdisk/cfdisk.c:1927
 msgid "   None   "
 msgstr ""
 
-#: fdisk/cfdisk.c:2047
+#: fdisk/cfdisk.c:1929
 msgid "   Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2049
+#: fdisk/cfdisk.c:1931
 msgid "   Primary"
 msgstr ""
 
-#: fdisk/cfdisk.c:2051
+#: fdisk/cfdisk.c:1933
 msgid "   Logical"
 msgstr ""
 
-#: fdisk/cfdisk.c:2089 fdisk/fdisk.c:1716 fdisk/fdisk.c:2050
-#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:621 fdisk/sfdisk.c:638
+#: fdisk/cfdisk.c:1971 fdisk/fdisk.c:1783 fdisk/fdisk.c:2122
+#: fdisk/fdisksgilabel.c:227 fdisk/fdisksunlabel.c:616 fdisk/sfdisk.c:638
 msgid "Unknown"
 msgstr ""
 
-#: fdisk/cfdisk.c:2095 fdisk/cfdisk.c:2563 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:1977 fdisk/cfdisk.c:2445 fdisk/fdisksunlabel.c:39
 msgid "Boot"
 msgstr ""
 
-#: fdisk/cfdisk.c:2097
+#: fdisk/cfdisk.c:1979
 #, c-format
 msgid "(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2099
+#: fdisk/cfdisk.c:1981
 msgid "None"
 msgstr ""
 
-#: fdisk/cfdisk.c:2134 fdisk/cfdisk.c:2218
+#: fdisk/cfdisk.c:2016 fdisk/cfdisk.c:2100
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2018
 msgid "               First       Last\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2019
 msgid ""
 " # Type       Sector      Sector   Offset    Length   Filesystem Type (ID) "
 "Flag\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2020
 msgid ""
 "-- ------- ----------- ----------- ------ ----------- -------------------- "
 "----\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2221
+#: fdisk/cfdisk.c:2103
 msgid "         ---Starting----      ----Ending-----    Start     Number of\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2222
+#: fdisk/cfdisk.c:2104
 msgid " # Flags Head Sect  Cyl   ID  Head Sect  Cyl     Sector    Sectors\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2223
+#: fdisk/cfdisk.c:2105
 msgid "-- ----- ---- ---- ----- ---- ---- ---- ----- ----------- -----------\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Raw"
 msgstr ""
 
-#: fdisk/cfdisk.c:2256
+#: fdisk/cfdisk.c:2138
 msgid "Print the table using raw data format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2257 fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2139 fdisk/cfdisk.c:2242
 msgid "Sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2257
+#: fdisk/cfdisk.c:2139
 msgid "Print the table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2258
+#: fdisk/cfdisk.c:2140
 msgid "Just print the partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2259
+#: fdisk/cfdisk.c:2141
 msgid "Don't print the table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2287
+#: fdisk/cfdisk.c:2169
 msgid "Help Screen for cfdisk"
 msgstr ""
 
-#: fdisk/cfdisk.c:2289
+#: fdisk/cfdisk.c:2171
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr ""
 
-#: fdisk/cfdisk.c:2290
+#: fdisk/cfdisk.c:2172
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr ""
 
-#: fdisk/cfdisk.c:2291
+#: fdisk/cfdisk.c:2173
 msgid "disk drive."
 msgstr ""
 
-#: fdisk/cfdisk.c:2293
+#: fdisk/cfdisk.c:2175
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr ""
 
-#: fdisk/cfdisk.c:2295
+#: fdisk/cfdisk.c:2177
 msgid "Command      Meaning"
 msgstr ""
 
-#: fdisk/cfdisk.c:2296
+#: fdisk/cfdisk.c:2178
 msgid "-------      -------"
 msgstr ""
 
-#: fdisk/cfdisk.c:2297
+#: fdisk/cfdisk.c:2179
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2298
+#: fdisk/cfdisk.c:2180
 msgid "  d          Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2299
+#: fdisk/cfdisk.c:2181
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 
-#: fdisk/cfdisk.c:2300
+#: fdisk/cfdisk.c:2182
 msgid "             WARNING: This option should only be used by people who"
 msgstr ""
 
-#: fdisk/cfdisk.c:2301
+#: fdisk/cfdisk.c:2183
 msgid "             know what they are doing."
 msgstr ""
 
-#: fdisk/cfdisk.c:2302
+#: fdisk/cfdisk.c:2184
 msgid "  h          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2303
+#: fdisk/cfdisk.c:2185
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2304
+#: fdisk/cfdisk.c:2186
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 
-#: fdisk/cfdisk.c:2305
+#: fdisk/cfdisk.c:2187
 msgid "             DOS, OS/2, ..."
 msgstr ""
 
-#: fdisk/cfdisk.c:2306
+#: fdisk/cfdisk.c:2188
 msgid "  n          Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2307
+#: fdisk/cfdisk.c:2189
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2308
+#: fdisk/cfdisk.c:2190
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2309
+#: fdisk/cfdisk.c:2191
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2310
+#: fdisk/cfdisk.c:2192
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2311
+#: fdisk/cfdisk.c:2193
 msgid "                s - Table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2312
+#: fdisk/cfdisk.c:2194
 msgid "                t - Table in raw format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2313
+#: fdisk/cfdisk.c:2195
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2314
+#: fdisk/cfdisk.c:2196
 msgid "  t          Change the filesystem type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2315
+#: fdisk/cfdisk.c:2197
 msgid "  u          Change units of the partition size display"
 msgstr ""
 
-#: fdisk/cfdisk.c:2316
+#: fdisk/cfdisk.c:2198
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2317
+#: fdisk/cfdisk.c:2199
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2318
+#: fdisk/cfdisk.c:2200
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 
-#: fdisk/cfdisk.c:2319
+#: fdisk/cfdisk.c:2201
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 
-#: fdisk/cfdisk.c:2320
+#: fdisk/cfdisk.c:2202
 msgid "             `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:2321
+#: fdisk/cfdisk.c:2203
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2322
+#: fdisk/cfdisk.c:2204
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2323
+#: fdisk/cfdisk.c:2205
 msgid "CTRL-L       Redraws the screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2324
+#: fdisk/cfdisk.c:2206
 msgid "  ?          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2326
+#: fdisk/cfdisk.c:2208
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 
-#: fdisk/cfdisk.c:2327
+#: fdisk/cfdisk.c:2209
 msgid "case letters (except for Writes)."
 msgstr ""
 
-#: fdisk/cfdisk.c:2358 fdisk/fdisksunlabel.c:237
+#: fdisk/cfdisk.c:2240 fdisk/fdisksunlabel.c:232
 msgid "Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2358
+#: fdisk/cfdisk.c:2240
 msgid "Change cylinder geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2359 fdisk/fdisksunlabel.c:235
+#: fdisk/cfdisk.c:2241 fdisk/fdisksunlabel.c:230
 msgid "Heads"
 msgstr ""
 
-#: fdisk/cfdisk.c:2359
+#: fdisk/cfdisk.c:2241
 msgid "Change head geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2360
+#: fdisk/cfdisk.c:2242
 msgid "Change sector geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done"
 msgstr ""
 
-#: fdisk/cfdisk.c:2361
+#: fdisk/cfdisk.c:2243
 msgid "Done with changing geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2374
+#: fdisk/cfdisk.c:2256
 msgid "Enter the number of cylinders: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2385 fdisk/cfdisk.c:2956
+#: fdisk/cfdisk.c:2267 fdisk/cfdisk.c:2840
 msgid "Illegal cylinders value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2391
+#: fdisk/cfdisk.c:2273
 msgid "Enter the number of heads: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2398 fdisk/cfdisk.c:2966
+#: fdisk/cfdisk.c:2280 fdisk/cfdisk.c:2850
 msgid "Illegal heads value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:2286
 msgid "Enter the number of sectors per track: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2411 fdisk/cfdisk.c:2973
+#: fdisk/cfdisk.c:2293 fdisk/cfdisk.c:2857
 msgid "Illegal sectors value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2514
+#: fdisk/cfdisk.c:2396
 msgid "Enter filesystem type: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2532
+#: fdisk/cfdisk.c:2414
 msgid "Cannot change FS Type to empty"
 msgstr ""
 
-#: fdisk/cfdisk.c:2534
+#: fdisk/cfdisk.c:2416
 msgid "Cannot change FS Type to extended"
 msgstr ""
 
-#: fdisk/cfdisk.c:2565
+#: fdisk/cfdisk.c:2447
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2568 fdisk/cfdisk.c:2571
+#: fdisk/cfdisk.c:2450 fdisk/cfdisk.c:2453
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2576 fdisk/cfdisk.c:2579
+#: fdisk/cfdisk.c:2458 fdisk/cfdisk.c:2461
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2587
+#: fdisk/cfdisk.c:2469
 msgid "Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2594
+#: fdisk/cfdisk.c:2476
 #, c-format
 msgid "Unknown (%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2663
+#: fdisk/cfdisk.c:2545
 #, c-format
 msgid "Disk Drive: %s"
 msgstr ""
 
-#: fdisk/cfdisk.c:2670
+#: fdisk/cfdisk.c:2552
 #, c-format
 msgid "Size: %lld bytes, %lld MB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2673
+#: fdisk/cfdisk.c:2555
 #, c-format
 msgid "Size: %lld bytes, %lld.%lld GB"
 msgstr ""
 
-#: fdisk/cfdisk.c:2677
+#: fdisk/cfdisk.c:2559
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %lld"
 msgstr ""
 
-#: fdisk/cfdisk.c:2681 login-utils/chfn.c:377
+#: fdisk/cfdisk.c:2563 login-utils/chfn.c:377
 msgid "Name"
 msgstr ""
 
-#: fdisk/cfdisk.c:2682
+#: fdisk/cfdisk.c:2564
 msgid "Flags"
 msgstr ""
 
-#: fdisk/cfdisk.c:2683
+#: fdisk/cfdisk.c:2565
 msgid "Part Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2684
+#: fdisk/cfdisk.c:2566
 msgid "FS Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2685
+#: fdisk/cfdisk.c:2567
 msgid "[Label]"
 msgstr ""
 
-#: fdisk/cfdisk.c:2687
+#: fdisk/cfdisk.c:2569
 msgid "    Sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2689
+#: fdisk/cfdisk.c:2571
 msgid "  Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2691
+#: fdisk/cfdisk.c:2573
 msgid "  Size (MB)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2693
+#: fdisk/cfdisk.c:2575
 msgid "  Size (GB)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2747
+#: fdisk/cfdisk.c:2630
 msgid "Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete"
 msgstr ""
 
-#: fdisk/cfdisk.c:2748
+#: fdisk/cfdisk.c:2631
 msgid "Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2749
+#: fdisk/cfdisk.c:2632
 msgid "Change disk geometry (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Help"
 msgstr ""
 
-#: fdisk/cfdisk.c:2750
+#: fdisk/cfdisk.c:2633
 msgid "Print help screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize"
 msgstr ""
 
-#: fdisk/cfdisk.c:2751
+#: fdisk/cfdisk.c:2634
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "New"
 msgstr ""
 
-#: fdisk/cfdisk.c:2752
+#: fdisk/cfdisk.c:2635
 msgid "Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print"
 msgstr ""
 
-#: fdisk/cfdisk.c:2753
+#: fdisk/cfdisk.c:2636
 msgid "Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit"
 msgstr ""
 
-#: fdisk/cfdisk.c:2754
+#: fdisk/cfdisk.c:2637
 msgid "Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2755
+#: fdisk/cfdisk.c:2638
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Units"
 msgstr ""
 
-#: fdisk/cfdisk.c:2756
+#: fdisk/cfdisk.c:2639
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write"
 msgstr ""
 
-#: fdisk/cfdisk.c:2757
+#: fdisk/cfdisk.c:2640
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2803
+#: fdisk/cfdisk.c:2687
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2813
+#: fdisk/cfdisk.c:2697
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2833 fdisk/cfdisk.c:2835
+#: fdisk/cfdisk.c:2717 fdisk/cfdisk.c:2719
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2843
+#: fdisk/cfdisk.c:2727
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2845
+#: fdisk/cfdisk.c:2729
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2862
+#: fdisk/cfdisk.c:2746
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2889 fdisk/cfdisk.c:2895
+#: fdisk/cfdisk.c:2773 fdisk/cfdisk.c:2779
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2902
+#: fdisk/cfdisk.c:2786
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2912
+#: fdisk/cfdisk.c:2796
 #, c-format
 msgid "Copyright (C) 1994-2002 Kevin E. Martin & aeb\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2919
+#: fdisk/cfdisk.c:2803
 #, c-format
 msgid ""
 "\n"
@@ -2411,9 +2470,9 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:390 fdisk/fdisk.c:409
-#: fdisk/fdisk.c:427 fdisk/fdisk.c:434 fdisk/fdisk.c:457 fdisk/fdisk.c:475
-#: fdisk/fdisk.c:491 fdisk/fdisk.c:507
+#: fdisk/fdiskbsdlabel.c:128 fdisk/fdisk.c:395 fdisk/fdisk.c:414
+#: fdisk/fdisk.c:432 fdisk/fdisk.c:439 fdisk/fdisk.c:462 fdisk/fdisk.c:480
+#: fdisk/fdisk.c:496 fdisk/fdisk.c:512
 msgid "Command action"
 msgstr ""
 
@@ -2433,9 +2492,9 @@ msgstr ""
 msgid "   l   list known filesystem types"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:396 fdisk/fdisk.c:415
-#: fdisk/fdisk.c:428 fdisk/fdisk.c:440 fdisk/fdisk.c:465 fdisk/fdisk.c:482
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:516
+#: fdisk/fdiskbsdlabel.c:133 fdisk/fdisk.c:401 fdisk/fdisk.c:420
+#: fdisk/fdisk.c:433 fdisk/fdisk.c:445 fdisk/fdisk.c:470 fdisk/fdisk.c:487
+#: fdisk/fdisk.c:503 fdisk/fdisk.c:521
 msgid "   m   print this menu"
 msgstr ""
 
@@ -2447,14 +2506,14 @@ msgstr ""
 msgid "   p   print BSD partition table"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:400 fdisk/fdisk.c:419
-#: fdisk/fdisk.c:430 fdisk/fdisk.c:444 fdisk/fdisk.c:467 fdisk/fdisk.c:484
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:518
+#: fdisk/fdiskbsdlabel.c:136 fdisk/fdisk.c:405 fdisk/fdisk.c:424
+#: fdisk/fdisk.c:435 fdisk/fdisk.c:449 fdisk/fdisk.c:472 fdisk/fdisk.c:489
+#: fdisk/fdisk.c:505 fdisk/fdisk.c:523
 msgid "   q   quit without saving changes"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:468 fdisk/fdisk.c:485
-#: fdisk/fdisk.c:501 fdisk/fdisk.c:519
+#: fdisk/fdiskbsdlabel.c:137 fdisk/fdisk.c:473 fdisk/fdisk.c:490
+#: fdisk/fdisk.c:506 fdisk/fdisk.c:524
 msgid "   r   return to main menu"
 msgstr ""
 
@@ -2497,13 +2556,13 @@ msgstr ""
 msgid "BSD disklabel command (m for help): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2272 fdisk/fdisksgilabel.c:638
-#: fdisk/fdisksunlabel.c:431
+#: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2344 fdisk/fdisksgilabel.c:638
+#: fdisk/fdisksunlabel.c:426
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:488
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2646,7 +2705,7 @@ msgstr ""
 msgid "tracks/cylinder"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:725 fdisk/fdisk.c:1541
+#: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:751 fdisk/fdisk.c:1605
 #: fdisk/sfdisk.c:930
 msgid "cylinders"
 msgstr ""
@@ -2704,7 +2763,7 @@ msgstr ""
 msgid "Partition (a-%c): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2436
+#: fdisk/fdiskbsdlabel.c:617 fdisk/fdisk.c:2507
 #, c-format
 msgid "The maximum number of partitions has been created\n"
 msgstr ""
@@ -2726,233 +2785,218 @@ msgid ""
 "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:248
+#: fdisk/fdisk.c:257
 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 ""
-
-#: fdisk/fdisk.c:260
-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"
+"Usage:\n"
+" fdisk [options] <disk>    change partition table\n"
+" fdisk [options] -l <disk> list partition table(s)\n"
+" fdisk -s <partition>      give partition size(s) in blocks\n"
+"\n"
+"Options:\n"
+" -b <size>             sector size (512, 1024, 2048 or 4096)\n"
+" -c[=<mode>]           compatible mode: 'dos' or 'nondos' (default)\n"
+" -h                    print this help text\n"
+" -u[=<unit>]           display units: 'cylinders' or 'sectors' (default)\n"
+" -v                    print program version\n"
+" -C <number>           specify the number of cylinders\n"
+" -H <number>           specify the number of heads\n"
+" -S <number>           specify the number of sectors per track\n"
+"\n"
 msgstr ""
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:274
 #, c-format
 msgid "Unable to open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:278
 #, c-format
 msgid "Unable to read %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:277
+#: fdisk/fdisk.c:282
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:281
+#: fdisk/fdisk.c:286
 #, c-format
 msgid "Unable to write %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:290
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:289
+#: fdisk/fdisk.c:294
 msgid "Unable to allocate any more memory\n"
 msgstr ""
 
-#: fdisk/fdisk.c:292
+#: fdisk/fdisk.c:297
 msgid "Fatal error\n"
 msgstr ""
 
-#: fdisk/fdisk.c:391
+#: fdisk/fdisk.c:396
 msgid "   a   toggle a read only flag"
 msgstr ""
 
-#: fdisk/fdisk.c:392 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:441
 msgid "   b   edit bsd disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:398
 msgid "   c   toggle the mountable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:394 fdisk/fdisk.c:413 fdisk/fdisk.c:438
+#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443
 msgid "   d   delete a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:414 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:419 fdisk/fdisk.c:444
 msgid "   l   list known partition types"
 msgstr ""
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:416 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
 msgid "   n   add a new partition"
 msgstr ""
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:417 fdisk/fdisk.c:429 fdisk/fdisk.c:442
+#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:434 fdisk/fdisk.c:447
 msgid "   o   create a new empty DOS partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:399 fdisk/fdisk.c:418 fdisk/fdisk.c:443 fdisk/fdisk.c:466
-#: fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:517
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:471
+#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
 msgid "   p   print the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:420 fdisk/fdisk.c:431 fdisk/fdisk.c:445
+#: fdisk/fdisk.c:406 fdisk/fdisk.c:425 fdisk/fdisk.c:436 fdisk/fdisk.c:450
 msgid "   s   create a new empty Sun disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:421 fdisk/fdisk.c:446
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:426 fdisk/fdisk.c:451
 msgid "   t   change a partition's system id"
 msgstr ""
 
-#: fdisk/fdisk.c:403 fdisk/fdisk.c:422 fdisk/fdisk.c:447
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:427 fdisk/fdisk.c:452
 msgid "   u   change display/entry units"
 msgstr ""
 
-#: fdisk/fdisk.c:404 fdisk/fdisk.c:423 fdisk/fdisk.c:448 fdisk/fdisk.c:470
-#: fdisk/fdisk.c:487 fdisk/fdisk.c:503 fdisk/fdisk.c:521
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:428 fdisk/fdisk.c:453 fdisk/fdisk.c:475
+#: fdisk/fdisk.c:492 fdisk/fdisk.c:508 fdisk/fdisk.c:526
 msgid "   v   verify the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:405 fdisk/fdisk.c:424 fdisk/fdisk.c:449 fdisk/fdisk.c:471
-#: fdisk/fdisk.c:488 fdisk/fdisk.c:504 fdisk/fdisk.c:522
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:429 fdisk/fdisk.c:454 fdisk/fdisk.c:476
+#: fdisk/fdisk.c:493 fdisk/fdisk.c:509 fdisk/fdisk.c:527
 msgid "   w   write table to disk and exit"
 msgstr ""
 
-#: fdisk/fdisk.c:406 fdisk/fdisk.c:450
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:455
 msgid "   x   extra functionality (experts only)"
 msgstr ""
 
-#: fdisk/fdisk.c:410
+#: fdisk/fdisk.c:415
 msgid "   a   select bootable partition"
 msgstr ""
 
-#: fdisk/fdisk.c:411
+#: fdisk/fdisk.c:416
 msgid "   b   edit bootfile entry"
 msgstr ""
 
-#: fdisk/fdisk.c:412
+#: fdisk/fdisk.c:417
 msgid "   c   select sgi swap partition"
 msgstr ""
 
-#: fdisk/fdisk.c:435
+#: fdisk/fdisk.c:440
 msgid "   a   toggle a bootable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:437
+#: fdisk/fdisk.c:442
 msgid "   c   toggle the dos compatibility flag"
 msgstr ""
 
-#: fdisk/fdisk.c:458
+#: fdisk/fdisk.c:463
 msgid "   a   change number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:459 fdisk/fdisk.c:477 fdisk/fdisk.c:493 fdisk/fdisk.c:509
+#: fdisk/fdisk.c:464 fdisk/fdisk.c:482 fdisk/fdisk.c:498 fdisk/fdisk.c:514
 msgid "   c   change number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:460 fdisk/fdisk.c:478 fdisk/fdisk.c:494 fdisk/fdisk.c:510
+#: fdisk/fdisk.c:465 fdisk/fdisk.c:483 fdisk/fdisk.c:499 fdisk/fdisk.c:515
 msgid "   d   print the raw data in the partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:461
+#: fdisk/fdisk.c:466
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisk.c:462 fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:514
+#: fdisk/fdisk.c:467 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:519
 msgid "   h   change number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:463
+#: fdisk/fdisk.c:468
 msgid "   i   change interleave factor"
 msgstr ""
 
-#: fdisk/fdisk.c:464
+#: fdisk/fdisk.c:469
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:469 fdisk/fdisk.c:486 fdisk/fdisk.c:502 fdisk/fdisk.c:520
+#: fdisk/fdisk.c:474 fdisk/fdisk.c:491 fdisk/fdisk.c:507 fdisk/fdisk.c:525
 msgid "   s   change number of sectors/track"
 msgstr ""
 
-#: fdisk/fdisk.c:472
+#: fdisk/fdisk.c:477
 msgid "   y   change number of physical cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:476 fdisk/fdisk.c:492 fdisk/fdisk.c:508
+#: fdisk/fdisk.c:481 fdisk/fdisk.c:497 fdisk/fdisk.c:513
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:479 fdisk/fdisk.c:495 fdisk/fdisk.c:511
+#: fdisk/fdisk.c:484 fdisk/fdisk.c:500 fdisk/fdisk.c:516
 msgid "   e   list extended partitions"
 msgstr ""
 
-#: fdisk/fdisk.c:480 fdisk/fdisk.c:496 fdisk/fdisk.c:513
+#: fdisk/fdisk.c:485 fdisk/fdisk.c:501 fdisk/fdisk.c:518
 msgid "   g   create an IRIX (SGI) partition table"
 msgstr ""
 
-#: fdisk/fdisk.c:512
+#: fdisk/fdisk.c:517
 msgid "   f   fix partition order"
 msgstr ""
 
-#: fdisk/fdisk.c:515
+#: fdisk/fdisk.c:520
 msgid "   i   change the disk identifier"
 msgstr ""
 
-#: fdisk/fdisk.c:631
+#: fdisk/fdisk.c:646
 #, c-format
 msgid "You must set"
 msgstr ""
 
-#: fdisk/fdisk.c:721
+#: fdisk/fdisk.c:747
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:723 fdisk/fdisk.c:1541 fdisk/sfdisk.c:930
+#: fdisk/fdisk.c:749 fdisk/fdisk.c:1605 fdisk/sfdisk.c:930
 msgid "sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:729
+#: fdisk/fdisk.c:755
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:730
+#: fdisk/fdisk.c:756
 msgid " and "
 msgstr ""
 
-#: fdisk/fdisk.c:747
-#, 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 ""
-
-#: fdisk/fdisk.c:763
+#: fdisk/fdisk.c:776
 #, c-format
 msgid ""
 "\n"
@@ -2963,70 +3007,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:780
+#: fdisk/fdisk.c:794
 #, c-format
 msgid ""
 "\n"
 "The device presents a logical sector size that is smaller than\n"
-"the physical sector size. Aligning to a physical sector boundary\n"
-"is recommended, or performance may be impacted.\n"
-"\n"
+"the physical sector size. Aligning to a physical sector (or optimal\n"
+"I/O) size boundary is recommended, or performance may be impacted.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:792
+#: fdisk/fdisk.c:800
 #, c-format
 msgid ""
-"WARNING: The device does not provide compensation (alignment_offset)\n"
-"for DOS-compatible partitioning, but DOS-compatible mode is enabled.\n"
-"Use command 'c' to switch-off DOS mode.\n"
 "\n"
+"WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
+"         switch off the mode (with command 'c')."
 msgstr ""
 
-#: fdisk/fdisk.c:798
+#: fdisk/fdisk.c:805
 #, c-format
 msgid ""
-"It's recommended to change display units to sectors (command 'u').\n"
 "\n"
+"WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
+"         change units to sectors.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:815
+#: fdisk/fdisk.c:824
 #, c-format
 msgid "Bad offset in primary extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:829
+#: fdisk/fdisk.c:838
 #, c-format
 msgid ""
 "Warning: omitting partitions after #%d.\n"
 "They will be deleted if you save this partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:848
+#: fdisk/fdisk.c:857
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:856
+#: fdisk/fdisk.c:865
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:898
 #, c-format
 msgid "omitting empty partition (%d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:908
+#: fdisk/fdisk.c:917
 #, c-format
 msgid "Disk identifier: 0x%08x\n"
 msgstr ""
 
-#: fdisk/fdisk.c:917
+#: fdisk/fdisk.c:926
 #, c-format
 msgid "New disk identifier (current 0x%08x): "
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:945
 #, c-format
 msgid ""
 "Building a new DOS disklabel with disk identifier 0x%08x.\n"
@@ -3035,152 +3078,148 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:987
+#: fdisk/fdisk.c:1021
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1051
-#, c-format
-msgid ""
-"\n"
-"WARNING: the device provides alignment_offset, but the offset does not\n"
-"match with device geometry.\n"
-"\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1162
+#: fdisk/fdisk.c:1219
 #, c-format
 msgid "You will not be able to write the partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1251
 #, 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:1204
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1221
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Internal error\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1231
+#: fdisk/fdisk.c:1288
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1243
+#: fdisk/fdisk.c:1300
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by w"
 "(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1270
+#: fdisk/fdisk.c:1326
 #, c-format
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1365
 msgid "Hex code (type L to list codes): "
 msgstr ""
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1398
 #, c-format
 msgid "%s (%u-%u, default %u): "
 msgstr ""
 
-#: fdisk/fdisk.c:1409
+#: fdisk/fdisk.c:1465
 #, c-format
 msgid "Unsupported suffix: '%s'.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1410
+#: fdisk/fdisk.c:1466
 #, c-format
 msgid ""
 "Supported: 10^N: KB (KiloByte), MB (MegaByte), GB (GigaByte)\n"
 "            2^N: K  (KibiByte), M  (MebiByte), G  (GibiByte)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1438
+#: fdisk/fdisk.c:1494
 #, c-format
 msgid "Using default value %u\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1442
+#: fdisk/fdisk.c:1498
 #, c-format
 msgid "Value out of range.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1467
+#: fdisk/fdisk.c:1523
 msgid "Partition number"
 msgstr ""
 
-#: fdisk/fdisk.c:1478
+#: fdisk/fdisk.c:1534
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1500 fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1561 fdisk/fdisk.c:1590
 #, c-format
 msgid "Selected partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1503
+#: fdisk/fdisk.c:1564
 #, c-format
 msgid "No partition is defined yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1529
+#: fdisk/fdisk.c:1593
 #, c-format
 msgid "All primary partitions have been defined already!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "cylinder"
 msgstr ""
 
-#: fdisk/fdisk.c:1539
+#: fdisk/fdisk.c:1603
 msgid "sector"
 msgstr ""
 
-#: fdisk/fdisk.c:1548
+#: fdisk/fdisk.c:1614
 #, c-format
-msgid "Changing display/entry units to %s\n"
+msgid "Changing display/entry units to cylinders (DEPRECATED!)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1559
+#: fdisk/fdisk.c:1616
+#, c-format
+msgid "Changing display/entry units to sectors\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1569
+#: fdisk/fdisk.c:1636
 #, c-format
-msgid "DOS Compatibility flag is set\n"
+msgid "DOS Compatibility flag is set (DEPRECATED!)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1571
+#: fdisk/fdisk.c:1638
 #, c-format
 msgid "DOS Compatibility flag is not set\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1739
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1677
+#: fdisk/fdisk.c:1744
 #, c-format
 msgid ""
 "Type 0 means free space to many systems\n"
@@ -3189,14 +3228,14 @@ msgid ""
 "a partition using the `d' command.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1695
+#: fdisk/fdisk.c:1762
 #, c-format
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
@@ -3204,7 +3243,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1701
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
@@ -3212,113 +3251,118 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1785
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1721
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "System type of partition %d is unchanged: %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1773
+#: fdisk/fdisk.c:1843
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1775 fdisk/fdisk.c:1783 fdisk/fdisk.c:1792 fdisk/fdisk.c:1802
+#: fdisk/fdisk.c:1845 fdisk/fdisk.c:1853 fdisk/fdisk.c:1862 fdisk/fdisk.c:1872
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr ""
 
-#: fdisk/fdisk.c:1776 fdisk/fdisk.c:1784
+#: fdisk/fdisk.c:1846 fdisk/fdisk.c:1854
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1781
+#: fdisk/fdisk.c:1851
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1790
+#: fdisk/fdisk.c:1860
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1863
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1799
+#: fdisk/fdisk.c:1869
 #, c-format
 msgid "Partition %i does not end on cylinder boundary.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1803
+#: fdisk/fdisk.c:1873
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1813
+#: fdisk/fdisk.c:1883
 #, c-format
-msgid "Partition %i does not start on physical block boundary.\n"
+msgid "Partition %i does not start on physical sector boundary.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1893
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld MB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1827
+#: fdisk/fdisk.c:1897
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %ld.%ld GB, %lld bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1830
+#: fdisk/fdisk.c:1900
 #, c-format
 msgid "%d heads, %llu sectors/track, %d cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:1833
+#: fdisk/fdisk.c:1903
 #, c-format
 msgid ", total %llu sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:1836
+#: fdisk/fdisk.c:1906
 #, c-format
 msgid "Units = %s of %d * %d = %d bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1840
+#: fdisk/fdisk.c:1910
 #, c-format
 msgid "Sector size (logical/physical): %u bytes / %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1843
+#: fdisk/fdisk.c:1912
+#, c-format
+msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1915
 #, c-format
 msgid "Alignment offset: %lu bytes\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1952
+#: fdisk/fdisk.c:2024
 #, c-format
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:2052
 #, fuzzy, c-format
 msgid "Done.\n"
 msgstr "完成\n"
 
-#: fdisk/fdisk.c:2008
+#: fdisk/fdisk.c:2080
 #, c-format
 msgid ""
 "This doesn't look like a partition table\n"
@@ -3326,23 +3370,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2021
+#: fdisk/fdisk.c:2093
 #, c-format
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2022 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:603
+#: fdisk/fdisk.c:2094 fdisk/fdisksgilabel.c:210 fdisk/fdisksunlabel.c:598
 msgid "Device"
 msgstr ""
 
-#: fdisk/fdisk.c:2060
+#: fdisk/fdisk.c:2132
 #, c-format
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2070
+#: fdisk/fdisk.c:2142
 #, c-format
 msgid ""
 "\n"
@@ -3350,87 +3394,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2144
 #, c-format
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl     Start      Size ID\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2120
+#: fdisk/fdisk.c:2192
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2123
+#: fdisk/fdisk.c:2195
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2126
+#: fdisk/fdisk.c:2198
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %llu\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2201
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2133
+#: fdisk/fdisk.c:2205
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2167
+#: fdisk/fdisk.c:2239
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2175
+#: fdisk/fdisk.c:2247
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2195
+#: fdisk/fdisk.c:2267
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2272
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2206
+#: fdisk/fdisk.c:2278
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2209
+#: fdisk/fdisk.c:2281
 #, c-format
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2245 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:416
+#: fdisk/fdisk.c:2317 fdisk/fdisksgilabel.c:620 fdisk/fdisksunlabel.c:411
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2291
+#: fdisk/fdisk.c:2362
 #, c-format
 msgid "Sector %llu is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2327
+#: fdisk/fdisk.c:2398
 #, c-format
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2338
+#: fdisk/fdisk.c:2409
 #, c-format
 msgid "Last %1$s, +%2$s or +size{K,M,G}"
 msgstr ""
 
-#: fdisk/fdisk.c:2415
+#: fdisk/fdisk.c:2486
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle AIX disk labels.\n"
@@ -3439,7 +3483,7 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2424
+#: fdisk/fdisk.c:2495
 #, c-format
 msgid ""
 "\tSorry - this fdisk cannot handle Mac disk labels.\n"
@@ -3448,22 +3492,22 @@ msgid ""
 "\tWARNING: This will destroy the present disk contents.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2444
+#: fdisk/fdisk.c:2515
 #, c-format
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2447
+#: fdisk/fdisk.c:2518
 #, c-format
 msgid "All logical partitions are in use\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2448
+#: fdisk/fdisk.c:2519
 #, c-format
 msgid "Adding a primary partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2453
+#: fdisk/fdisk.c:2524
 #, c-format
 msgid ""
 "Command action\n"
@@ -3471,32 +3515,32 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "l   logical (5 or over)"
 msgstr ""
 
-#: fdisk/fdisk.c:2455
+#: fdisk/fdisk.c:2526
 msgid "e   extended"
 msgstr ""
 
-#: fdisk/fdisk.c:2474
+#: fdisk/fdisk.c:2545
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2510
+#: fdisk/fdisk.c:2581
 #, c-format
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2523
+#: fdisk/fdisk.c:2594
 #, c-format
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2532
+#: fdisk/fdisk.c:2603
 #, c-format
 msgid ""
 "\n"
@@ -3505,7 +3549,7 @@ msgid ""
 "the next reboot or after you run partprobe(8) or kpartx(8)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2540
+#: fdisk/fdisk.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -3514,49 +3558,49 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2546
+#: fdisk/fdisk.c:2617
 #, c-format
 msgid ""
 "\n"
 "Error closing file\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2550
+#: fdisk/fdisk.c:2621
 #, c-format
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2596
+#: fdisk/fdisk.c:2668
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2601
+#: fdisk/fdisk.c:2697
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2617
+#: fdisk/fdisk.c:2713
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2630
+#: fdisk/fdisk.c:2726
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2657
+#: fdisk/fdisk.c:2751
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2684
+#: fdisk/fdisk.c:2778
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2686
+#: fdisk/fdisk.c:2780
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2745
+#: fdisk/fdisk.c:2839
 #, c-format
 msgid ""
 "\n"
@@ -3565,64 +3609,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2767
+#: fdisk/fdisk.c:2861
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2778
+#: fdisk/fdisk.c:2872
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2797 fdisk/sfdisk.c:2603
+#: fdisk/fdisk.c:2891 fdisk/sfdisk.c:2608
 #, c-format
 msgid "cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2817
+#: fdisk/fdisk.c:2911
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2887
+#: fdisk/fdisk.c:2986
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2990
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2953
+#: fdisk/fdisk.c:3050
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2963
+#: fdisk/fdisk.c:3060
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2979
+#: fdisk/fdisk.c:3076
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2981
+#: fdisk/fdisk.c:3078
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:2983
+#: fdisk/fdisk.c:3080
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3056
+#: fdisk/fdisk.c:3153
 #, c-format
 msgid ""
 "\n"
@@ -3699,15 +3743,15 @@ msgstr ""
 msgid "SGI xvm"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:55
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:50
 msgid "Linux swap"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:56
+#: fdisk/fdisksgilabel.c:96 fdisk/fdisksunlabel.c:51
 msgid "Linux native"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:57 fdisk/i386_sys_types.c:63
+#: fdisk/fdisksgilabel.c:97 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:63
 msgid "Linux LVM"
 msgstr ""
 
@@ -3811,7 +3855,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:388
+#: fdisk/fdisksgilabel.c:433 fdisk/fdisksunlabel.c:383
 #, c-format
 msgid "No partitions defined\n"
 msgstr ""
@@ -3900,7 +3944,7 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:554
+#: fdisk/fdisksgilabel.c:543 fdisk/fdisksunlabel.c:549
 msgid "YES\n"
 msgstr ""
 
@@ -3950,7 +3994,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:227
+#: fdisk/fdisksgilabel.c:718 fdisk/fdisksunlabel.c:222
 #, c-format
 msgid ""
 "Warning:  BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %"
@@ -3968,55 +4012,55 @@ msgstr ""
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:43
+#: fdisk/fdisksunlabel.c:38
 msgid "Unassigned"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:45
+#: fdisk/fdisksunlabel.c:40
 msgid "SunOS root"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:46
+#: fdisk/fdisksunlabel.c:41
 msgid "SunOS swap"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:47
+#: fdisk/fdisksunlabel.c:42
 msgid "SunOS usr"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:48
+#: fdisk/fdisksunlabel.c:43
 msgid "Whole disk"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:49
+#: fdisk/fdisksunlabel.c:44
 msgid "SunOS stand"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:50
+#: fdisk/fdisksunlabel.c:45
 msgid "SunOS var"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:51
+#: fdisk/fdisksunlabel.c:46
 msgid "SunOS home"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:52
+#: fdisk/fdisksunlabel.c:47
 msgid "SunOS alt sectors"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksunlabel.c:48
 msgid "SunOS cachefs"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:54
+#: fdisk/fdisksunlabel.c:49
 msgid "SunOS reserved"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:103
+#: fdisk/fdisksunlabel.c:53 fdisk/i386_sys_types.c:103
 msgid "Linux raid autodetect"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:141
+#: fdisk/fdisksunlabel.c:136
 #, c-format
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
@@ -4025,28 +4069,28 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:153
+#: fdisk/fdisksunlabel.c:148
 #, c-format
 msgid "Detected sun disklabel with wrong version [0x%08x].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:158
+#: fdisk/fdisksunlabel.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong sanity [0x%08x].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:163
+#: fdisk/fdisksunlabel.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong num_partitions [%u].\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:168
+#: fdisk/fdisksunlabel.c:163
 #, c-format
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:198
+#: fdisk/fdisksunlabel.c:193
 #, c-format
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
@@ -4055,50 +4099,50 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:236
+#: fdisk/fdisksunlabel.c:231
 msgid "Sectors/track"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:351
+#: fdisk/fdisksunlabel.c:346
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:371
+#: fdisk/fdisksunlabel.c:366
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:393
+#: fdisk/fdisksunlabel.c:388
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:395 fdisk/fdisksunlabel.c:401
+#: fdisk/fdisksunlabel.c:390 fdisk/fdisksunlabel.c:396
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:426
+#: fdisk/fdisksunlabel.c:421
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:449
+#: fdisk/fdisksunlabel.c:444
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
 "and is of type `Whole disk'\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:477
+#: fdisk/fdisksunlabel.c:472
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:507
+#: fdisk/fdisksunlabel.c:502
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4106,14 +4150,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:534
+#: fdisk/fdisksunlabel.c:529
 #, 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:549
+#: fdisk/fdisksunlabel.c:544
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4122,12 +4166,12 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:581
+#: fdisk/fdisksunlabel.c:576
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n"
-"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %d rpm\n"
+"%u cylinders, %d alternate cylinders, %d physical cylinders\n"
 "%d extra sects/cyl, interleave %d:1\n"
 "Label ID: %s\n"
 "Volume ID: %s\n"
@@ -4135,37 +4179,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:597
+#: fdisk/fdisksunlabel.c:592
 #, c-format
 msgid ""
 "\n"
-"Disk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n"
+"Disk %s (Sun disk label): %u heads, %llu sectors, %u cylinders\n"
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:602
+#: fdisk/fdisksunlabel.c:597
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:625
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:637
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:644
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:651
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:663
+#: fdisk/fdisksunlabel.c:658
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -4374,6 +4418,10 @@ msgstr ""
 msgid "Linux swap / Solaris"
 msgstr ""
 
+#: fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr ""
+
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr ""
@@ -4952,248 +5000,248 @@ msgstr ""
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1637
+#: fdisk/sfdisk.c:1637 fdisk/sfdisk.c:1642
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1714
+#: fdisk/sfdisk.c:1719
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1750
+#: fdisk/sfdisk.c:1755
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1757
+#: fdisk/sfdisk.c:1762
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1763
+#: fdisk/sfdisk.c:1768
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1805
+#: fdisk/sfdisk.c:1810
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1809
+#: fdisk/sfdisk.c:1814
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1933
+#: fdisk/sfdisk.c:1938
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1966
+#: fdisk/sfdisk.c:1971
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2017
+#: fdisk/sfdisk.c:2022
 msgid "too many input fields\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2051
+#: fdisk/sfdisk.c:2056
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2070
+#: fdisk/sfdisk.c:2075
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2102
+#: fdisk/sfdisk.c:2107
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2108
+#: fdisk/sfdisk.c:2113
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2127
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2140
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2152 fdisk/sfdisk.c:2165
+#: fdisk/sfdisk.c:2157 fdisk/sfdisk.c:2170
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2176
+#: fdisk/sfdisk.c:2181
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2208
+#: fdisk/sfdisk.c:2213
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2230
+#: fdisk/sfdisk.c:2235
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2263
+#: fdisk/sfdisk.c:2268
 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:2289
+#: fdisk/sfdisk.c:2294
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2290
+#: fdisk/sfdisk.c:2295
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2291
+#: fdisk/sfdisk.c:2296
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2292
+#: fdisk/sfdisk.c:2297
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2293
+#: fdisk/sfdisk.c:2298
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2294
+#: fdisk/sfdisk.c:2299
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2295
+#: fdisk/sfdisk.c:2300
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2296
+#: fdisk/sfdisk.c:2301
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2302
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/"
 "MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2298
+#: fdisk/sfdisk.c:2303
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2299
+#: fdisk/sfdisk.c:2304
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2300
+#: fdisk/sfdisk.c:2305
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2301
+#: fdisk/sfdisk.c:2306
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2302
+#: fdisk/sfdisk.c:2307
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2303
+#: fdisk/sfdisk.c:2308
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2304
+#: fdisk/sfdisk.c:2309
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2305
+#: fdisk/sfdisk.c:2310
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2306
+#: fdisk/sfdisk.c:2311
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2307
+#: fdisk/sfdisk.c:2312
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2308
+#: fdisk/sfdisk.c:2313
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2309
+#: fdisk/sfdisk.c:2314
 msgid ""
 "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
 "table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2310
+#: fdisk/sfdisk.c:2315
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2312
+#: fdisk/sfdisk.c:2317
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2313
+#: fdisk/sfdisk.c:2318
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2314
+#: fdisk/sfdisk.c:2319
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2315
+#: fdisk/sfdisk.c:2320
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2316
+#: fdisk/sfdisk.c:2321
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2317
+#: fdisk/sfdisk.c:2322
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2318
+#: fdisk/sfdisk.c:2323
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2319
+#: fdisk/sfdisk.c:2324
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2325
+#: fdisk/sfdisk.c:2330
 msgid "Usage:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2326
+#: fdisk/sfdisk.c:2331
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2327
+#: fdisk/sfdisk.c:2332
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2328
+#: fdisk/sfdisk.c:2333
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2448
+#: fdisk/sfdisk.c:2453
 #, c-format
 msgid ""
 "\n"
@@ -5202,108 +5250,108 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2451
+#: fdisk/sfdisk.c:2456
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2490
+#: fdisk/sfdisk.c:2495
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2622
+#: fdisk/sfdisk.c:2627
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2665
+#: fdisk/sfdisk.c:2670
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2667
+#: fdisk/sfdisk.c:2672
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2669
+#: fdisk/sfdisk.c:2674
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2676
+#: fdisk/sfdisk.c:2681
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2702
+#: fdisk/sfdisk.c:2707
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2704
+#: fdisk/sfdisk.c:2709
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2729
+#: fdisk/sfdisk.c:2734
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2748 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2753 fdisk/sfdisk.c:2786
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2805
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2880
+#: fdisk/sfdisk.c:2885
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2898 fdisk/sfdisk.c:2953 fdisk/sfdisk.c:2986
+#: fdisk/sfdisk.c:2903 fdisk/sfdisk.c:2958 fdisk/sfdisk.c:2991
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2907
+#: fdisk/sfdisk.c:2912
 #, 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:2923
+#: fdisk/sfdisk.c:2928
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2982
+#: fdisk/sfdisk.c:2987
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2999
+#: fdisk/sfdisk.c:3004
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3018
+#: fdisk/sfdisk.c:3023
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3021
+#: fdisk/sfdisk.c:3026
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3027
+#: fdisk/sfdisk.c:3032
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3029
+#: fdisk/sfdisk.c:3034
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5311,90 +5359,90 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3033
+#: fdisk/sfdisk.c:3038
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3037
+#: fdisk/sfdisk.c:3042
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3046
+#: fdisk/sfdisk.c:3051
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3050
+#: fdisk/sfdisk.c:3055
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3058
+#: fdisk/sfdisk.c:3063
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3063
+#: fdisk/sfdisk.c:3068
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3066
+#: fdisk/sfdisk.c:3071
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3071
+#: fdisk/sfdisk.c:3076
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3073
+#: fdisk/sfdisk.c:3078
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3078
+#: fdisk/sfdisk.c:3083
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3080
+#: fdisk/sfdisk.c:3085
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3086
+#: fdisk/sfdisk.c:3091
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3094
+#: fdisk/sfdisk.c:3099
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3100
+#: fdisk/sfdisk.c:3105
 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 ""
 
-#: fsck/fsck.c:327
+#: fsck/fsck.c:326
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:337
+#: fsck/fsck.c:336
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: fsck/fsck.c:353
+#: fsck/fsck.c:352
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -5402,113 +5450,113 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fsck/fsck.c:461
+#: fsck/fsck.c:460
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr ""
 
-#: fsck/fsck.c:577
+#: fsck/fsck.c:576
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: fsck/fsck.c:599
+#: fsck/fsck.c:598
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: fsck/fsck.c:605
+#: fsck/fsck.c:604
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: fsck/fsck.c:644
+#: fsck/fsck.c:643
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:704
+#: fsck/fsck.c:703
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr ""
 
-#: fsck/fsck.c:725
+#: fsck/fsck.c:724
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: fsck/fsck.c:744
+#: fsck/fsck.c:743
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr ""
 
-#: fsck/fsck.c:883
+#: fsck/fsck.c:882
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: fsck/fsck.c:893
+#: fsck/fsck.c:892
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr ""
 
-#: fsck/fsck.c:919
+#: fsck/fsck.c:918
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: fsck/fsck.c:975
+#: fsck/fsck.c:974
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: fsck/fsck.c:1066
+#: fsck/fsck.c:1065
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1086
+#: fsck/fsck.c:1085
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1123
 #, fuzzy, c-format
 msgid "%s: too many devices\n"
 msgstr "%s:不是一个块设备\n"
 
-#: fsck/fsck.c:1135
+#: fsck/fsck.c:1134
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1137
+#: fsck/fsck.c:1136
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr ""
 
-#: fsck/fsck.c:1146
+#: fsck/fsck.c:1145
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1149
+#: fsck/fsck.c:1148
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1157 fsck/fsck.c:1243
+#: fsck/fsck.c:1156 fsck/fsck.c:1242
 #, fuzzy, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s 需要一个参数\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1276
 #, c-format
 msgid "fsck from %s\n"
 msgstr ""
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1288
 #, fuzzy, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "不能为 inodes 分配缓冲区"
@@ -5969,7 +6017,13 @@ msgstr ""
 msgid "Unable to set system clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1257
+#: hwclock/hwclock.c:1240
+#, c-format
+msgid ""
+"At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1271
 #, c-format
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
@@ -5978,39 +6032,39 @@ msgid ""
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1266
+#: hwclock/hwclock.c:1280
 #, c-format
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1268
+#: hwclock/hwclock.c:1282
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1271
+#: hwclock/hwclock.c:1285
 #, 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:1274
+#: hwclock/hwclock.c:1288
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1277
+#: hwclock/hwclock.c:1291
 #, c-format
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1290 misc-utils/cal.c:343 misc-utils/kill.c:189
+#: hwclock/hwclock.c:1304 misc-utils/cal.c:348 misc-utils/kill.c:189
 #, c-format
 msgid "%s from %s\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1311
+#: hwclock/hwclock.c:1325
 #, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
@@ -6029,6 +6083,7 @@ msgid ""
 "       --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"
+"       --predict      predict rtc reading at time given with --date\n"
 "  -v | --version      print out the version of hwclock to stdout\n"
 "\n"
 "Options: \n"
@@ -6050,7 +6105,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1346
+#: hwclock/hwclock.c:1361
 #, c-format
 msgid ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6058,77 +6113,77 @@ msgid ""
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1433
+#: hwclock/hwclock.c:1449
 #, c-format
 msgid "%s: Unable to connect to audit system\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1551
+#: hwclock/hwclock.c:1570
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1558
+#: hwclock/hwclock.c:1577
 #, c-format
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1565
+#: hwclock/hwclock.c:1584
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1572
+#: hwclock/hwclock.c:1591
 #, c-format
 msgid ""
 "%s: The --adjust and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1579
+#: hwclock/hwclock.c:1598
 #, c-format
 msgid ""
 "%s: The --adjfile and --noadjfile options are mutually exclusive.  You "
 "specified both.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1588
+#: hwclock/hwclock.c:1607
 #, c-format
 msgid "%s: With --noadjfile, you must specify either --utc or --localtime\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1602
+#: hwclock/hwclock.c:1621
 #, c-format
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1619
+#: hwclock/hwclock.c:1638
 #, c-format
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1624
+#: hwclock/hwclock.c:1643
 #, c-format
 msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1629
+#: hwclock/hwclock.c:1648
 #, c-format
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1650
+#: hwclock/hwclock.c:1669
 #, c-format
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1654
+#: hwclock/hwclock.c:1673
 #, c-format
 msgid ""
 "Use the --debug option to see the details of our search for an access "
@@ -6408,12 +6463,12 @@ msgstr ""
 msgid "Changing finger information for %s.\n"
 msgstr ""
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:572
+#: login-utils/chfn.c:189 login-utils/chsh.c:188 login-utils/login.c:576
 #, c-format
 msgid "%s: PAM failure, aborting: %s\n"
 msgstr ""
 
-#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:823
+#: login-utils/chfn.c:212 login-utils/chsh.c:211 login-utils/login.c:827
 #: login-utils/newgrp.c:79 login-utils/simpleinit.c:340 mount/lomount.c:742
 #: mount/lomount.c:745
 msgid "Password: "
@@ -6627,244 +6682,249 @@ msgstr ""
 msgid "FATAL: can't reopen tty: %s"
 msgstr ""
 
-#: login-utils/login.c:229
+#: login-utils/login.c:205
+#, c-format
+msgid "FATAL: %s is not a terminal"
+msgstr ""
+
+#: login-utils/login.c:238
 msgid "FATAL: bad tty"
 msgstr ""
 
-#: login-utils/login.c:436
+#: login-utils/login.c:445
 #, c-format
 msgid "login: -h for super-user only.\n"
 msgstr ""
 
-#: login-utils/login.c:479
+#: login-utils/login.c:488
 #, c-format
 msgid "usage: login [-fp] [username]\n"
 msgstr ""
 
-#: login-utils/login.c:574
+#: login-utils/login.c:578
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr ""
 
-#: login-utils/login.c:591
+#: login-utils/login.c:595
 msgid "login: "
 msgstr ""
 
-#: login-utils/login.c:635
+#: login-utils/login.c:639
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:640
+#: login-utils/login.c:644
 #, c-format
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
 
-#: login-utils/login.c:649
+#: login-utils/login.c:653
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:653
+#: login-utils/login.c:657
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:658
+#: login-utils/login.c:662
 #, c-format
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:686 login-utils/login.c:693 login-utils/login.c:727
+#: login-utils/login.c:690 login-utils/login.c:697 login-utils/login.c:731
 #, c-format
 msgid ""
 "\n"
 "Session setup problem, abort.\n"
 msgstr ""
 
-#: login-utils/login.c:687
+#: login-utils/login.c:691
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:694
+#: login-utils/login.c:698
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr ""
 
-#: login-utils/login.c:713
+#: login-utils/login.c:717
 #, c-format
 msgid "login: Out of memory\n"
 msgstr ""
 
-#: login-utils/login.c:757
+#: login-utils/login.c:761
 msgid "Illegal username"
 msgstr ""
 
-#: login-utils/login.c:800
+#: login-utils/login.c:804
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:805
+#: login-utils/login.c:809
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:809
+#: login-utils/login.c:813
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:863
+#: login-utils/login.c:867
 #, c-format
 msgid "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:1088
+#: login-utils/login.c:1092
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1099
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1098
+#: login-utils/login.c:1102
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr ""
 
-#: login-utils/login.c:1101
+#: login-utils/login.c:1105
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1104
+#: login-utils/login.c:1108
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1125
+#: login-utils/login.c:1129
 #, c-format
 msgid "You have new mail.\n"
 msgstr ""
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1131
 #, c-format
 msgid "You have mail.\n"
 msgstr ""
 
-#: login-utils/login.c:1171
+#: login-utils/login.c:1175
 #, c-format
 msgid "login: failure forking: %s"
 msgstr ""
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1222
 #, c-format
 msgid "TIOCSCTTY failed: %m"
 msgstr ""
 
-#: login-utils/login.c:1224
+#: login-utils/login.c:1228
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1230
+#: login-utils/login.c:1234
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1234
+#: login-utils/login.c:1238
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1242
+#: login-utils/login.c:1246
 #, c-format
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1269
+#: login-utils/login.c:1273
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1272
+#: login-utils/login.c:1276
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1287
+#: login-utils/login.c:1291
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: login-utils/login.c:1298
+#: login-utils/login.c:1302
 #, c-format
 msgid "login name much too long.\n"
 msgstr ""
 
-#: login-utils/login.c:1299
+#: login-utils/login.c:1303
 msgid "NAME too long"
 msgstr ""
 
-#: login-utils/login.c:1306
+#: login-utils/login.c:1310
 #, c-format
 msgid "login names may not start with '-'.\n"
 msgstr ""
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1320
 #, c-format
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1317
+#: login-utils/login.c:1321
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1349
+#: login-utils/login.c:1353
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr ""
 
-#: login-utils/login.c:1437
+#: login-utils/login.c:1441
 #, c-format
 msgid "Last login: %.*s "
 msgstr ""
 
-#: login-utils/login.c:1441
+#: login-utils/login.c:1445
 #, c-format
 msgid "from %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1444
+#: login-utils/login.c:1448
 #, c-format
 msgid "on %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1470
+#: login-utils/login.c:1474
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1473
+#: login-utils/login.c:1477
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1477
+#: login-utils/login.c:1481
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1480
+#: login-utils/login.c:1484
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr ""
@@ -7115,7 +7175,7 @@ msgstr ""
 
 #: login-utils/simpleinit.c:938
 #, c-format
-msgid "error stopping service: \"%s\"\n"
+msgid "error at stopping service \"%s\"\n"
 msgstr ""
 
 #: login-utils/simpleinit.c:950
@@ -7125,7 +7185,7 @@ msgstr ""
 
 #: login-utils/simpleinit.c:1070
 #, c-format
-msgid "error running programme: \"%s\"\n"
+msgid "error at starting service \"%s\"\n"
 msgstr ""
 
 #: login-utils/ttymsg.c:75
@@ -7252,25 +7312,25 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr ""
 
-#: misc-utils/cal.c:360 misc-utils/cal.c:372
+#: misc-utils/cal.c:365 misc-utils/cal.c:377
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr ""
 
-#: misc-utils/cal.c:364
+#: misc-utils/cal.c:369
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:368
+#: misc-utils/cal.c:373
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:462
+#: misc-utils/cal.c:467
 #, c-format
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:854
+#: misc-utils/cal.c:786
 #, c-format
 msgid "usage: cal [-13smjyV] [[[day] month] year]\n"
 msgstr ""
@@ -7294,6 +7354,109 @@ msgstr ""
 msgid "unable to resolve '%s'"
 msgstr "不能读 inodes"
 
+#: misc-utils/findmnt.c:192
+#, fuzzy, c-format
+msgid "unknown column: %s"
+msgstr "%s: 未知命令: %s\n"
+
+#: misc-utils/findmnt.c:308
+#, fuzzy
+msgid "failed to add line to output"
+msgstr "不能为 inodes 分配缓冲区"
+
+#: misc-utils/findmnt.c:359
+msgid "failed to initialize libmount tab"
+msgstr ""
+
+#: misc-utils/findmnt.c:364
+#, fuzzy, c-format
+msgid "can't read: %s"
+msgstr "%s 失败.\n"
+
+#: misc-utils/findmnt.c:370
+#, fuzzy, c-format
+msgid "%s: parse error: %s"
+msgstr "%s: %s ioctl 错误\n"
+
+#: misc-utils/findmnt.c:452
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %1$s [options]\n"
+" %1$s [options] <device> | <mountpoint>\n"
+" %1$s [options] <device> <mountpoint>\n"
+" %1$s [options] [--source <device>] [--target <mountpoint>]\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:460
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+" -s, --fstab            search in static table of filesystems\n"
+" -m, --mtab             search in table of mounted filesystems\n"
+" -k, --kernel           search in kernel table of mounted \n"
+"                        filesystems (default)\n"
+"\n"
+" -c, --canonicalize     canonicalize printed paths\n"
+" -d, --direction <word> search direction - 'forward' or 'backward'\n"
+" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -f, --first-only       print the first found filesystem only\n"
+" -h, --help             print this help\n"
+" -i, --invert           invert sense of matching\n"
+" -l, --list             use list format ouput\n"
+" -n, --noheadings       don't print headings\n"
+" -u, --notruncate       don't truncate text in columns\n"
+" -O, --options <list>   limit the set of filesystems by mount options\n"
+" -o, --output <list>    output columns\n"
+" -r, --raw              use raw format output\n"
+" -a, --ascii            use ascii chars for tree formatting\n"
+" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -S, --source <string>  device, LABEL= or UUID=device\n"
+" -T, --target <string>  mountpoint\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:483
+#, c-format
+msgid ""
+"\n"
+"For more information see findmnt(1).\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:491
+msgid "options are mutually exclusive"
+msgstr ""
+
+#: misc-utils/findmnt.c:564
+#, fuzzy, c-format
+msgid "unknown direction '%s'"
+msgstr "%s: 未知命令: %s\n"
+
+#: misc-utils/findmnt.c:645
+msgid ""
+"options --target and --source can't be used together with command line "
+"element that is not an option"
+msgstr ""
+
+#: misc-utils/findmnt.c:679
+msgid "failed to initialize libmount iterator"
+msgstr ""
+
+#: misc-utils/findmnt.c:685
+msgid "failed to initialize libmount cache"
+msgstr ""
+
+#: misc-utils/findmnt.c:695
+#, fuzzy
+msgid "failed to initialize output table"
+msgstr "不能为 inodes 分配缓冲区"
+
+#: misc-utils/findmnt.c:707
+msgid "failed to initialize output column"
+msgstr ""
+
 #: misc-utils/kill.c:207
 #, c-format
 msgid "%s: unknown signal %s\n"
@@ -7443,7 +7606,7 @@ msgstr ""
 msgid "call: %s from to files...\n"
 msgstr ""
 
-#: misc-utils/script.c:110
+#: misc-utils/script.c:115
 #, c-format
 msgid ""
 "Warning: `%s' is a link.\n"
@@ -7451,54 +7614,54 @@ msgid ""
 "Script not started.\n"
 msgstr ""
 
-#: misc-utils/script.c:173
+#: misc-utils/script.c:182
 #, c-format
-msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
+msgid "usage: script [-a] [-e] [-f] [-q] [-t] [file]\n"
 msgstr ""
 
-#: misc-utils/script.c:196
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:244
+#: misc-utils/script.c:264
 #, c-format
 msgid "%s: write error %d: %s\n"
 msgstr ""
 
-#: misc-utils/script.c:304
+#: misc-utils/script.c:326
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:347
+#: misc-utils/script.c:358
 #, c-format
 msgid "%s: write error: %s\n"
 msgstr ""
 
-#: misc-utils/script.c:354
+#: misc-utils/script.c:365
 #, c-format
 msgid "%s: cannot write script file, error: %s\n"
 msgstr ""
 
-#: misc-utils/script.c:430
+#: misc-utils/script.c:443
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:437
+#: misc-utils/script.c:452
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:448
+#: misc-utils/script.c:474
 #, c-format
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:482
+#: misc-utils/script.c:510
 #, c-format
 msgid "Out of pty's\n"
 msgstr ""
@@ -7837,6 +8000,16 @@ msgstr ""
 msgid "bad response length"
 msgstr ""
 
+#: misc-utils/uuidd.c:244
+#, fuzzy, c-format
+msgid "Failed to open/create %s: %s\n"
+msgstr "不能读 inodes"
+
+#: misc-utils/uuidd.c:261
+#, fuzzy, c-format
+msgid "Failed to lock %s: %s\n"
+msgstr "不能读 inodes"
+
 #: misc-utils/uuidd.c:268
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
@@ -7867,6 +8040,11 @@ msgstr ""
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
+#: misc-utils/uuidd.c:362
+#, c-format
+msgid "operation %d\n"
+msgstr ""
+
 #: misc-utils/uuidd.c:378
 #, c-format
 msgid "Generated time UUID: %s\n"
@@ -7884,7 +8062,7 @@ msgstr ""
 
 #: misc-utils/uuidd.c:415
 #, c-format
-msgid "Generated %d UUID's:\n"
+msgid "Generated %d UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:427
@@ -7904,12 +8082,12 @@ msgstr ""
 
 #: misc-utils/uuidd.c:534
 #, c-format
-msgid "%s and subsequent %d UUID's\n"
+msgid "%s and subsequent %d UUIDs\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:536
 #, c-format
-msgid "List of UUID's:\n"
+msgid "List of UUIDs:\n"
 msgstr ""
 
 #: misc-utils/uuidd.c:557
@@ -7937,82 +8115,80 @@ msgstr "用法: %s [ -n ] device\n"
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:128
+#: misc-utils/wipefs.c:130 sys-utils/lscpu.c:576
 msgid "calloc failed"
 msgstr ""
 
-#: misc-utils/wipefs.c:150
+#: misc-utils/wipefs.c:152
 #, fuzzy
 msgid "strdup failed"
 msgstr "%s 失败.\n"
 
-#: misc-utils/wipefs.c:199
-msgid "probing initialization failed"
+#: misc-utils/wipefs.c:202
+#, c-format
+msgid "error: %s: probing initialization failed"
+msgstr ""
+
+#: misc-utils/wipefs.c:213
+#, c-format
+msgid "WARNING: %s: appears to contain '%s' partition table"
 msgstr ""
 
-#: misc-utils/wipefs.c:243
+#: misc-utils/wipefs.c:259
 #, c-format
-msgid "can't found a magic string at offset 0x%jx - ignore."
+msgid "no magic string found at offset 0x%jx -- ignored"
 msgstr ""
 
-#: misc-utils/wipefs.c:250
+#: misc-utils/wipefs.c:266
 #, c-format
 msgid "%s: failed to seek to offset 0x%jx"
 msgstr ""
 
-#: misc-utils/wipefs.c:257
+#: misc-utils/wipefs.c:273
 #, fuzzy, c-format
 msgid "%s: write failed"
 msgstr "%s 失败.\n"
 
-#: misc-utils/wipefs.c:259
+#: misc-utils/wipefs.c:275
 #, c-format
 msgid "%zd bytes ["
 msgstr ""
 
-#: misc-utils/wipefs.c:267
+#: misc-utils/wipefs.c:283
 #, c-format
 msgid "] erased at offset 0x%jx (%s)\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:278 mount/swapon.c:184 mount/swapon.c:252
-#: mount/swapon.c:397 mount/swapon.c:556 mount/swapon.c:758
-#: sys-utils/fallocate.c:159
+#: misc-utils/wipefs.c:294 mount/swapon.c:196 mount/swapon.c:264
+#: mount/swapon.c:409 mount/swapon.c:568 mount/swapon.c:770
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:102
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "%s 失败.\n"
 
-#: misc-utils/wipefs.c:301 misc-utils/wipefs.c:304
+#: misc-utils/wipefs.c:329
 #, c-format
-msgid "invalid offset '%s' value specified"
+msgid "invalid offset value '%s' specified"
 msgstr ""
 
-#: misc-utils/wipefs.c:312 sys-utils/fallocate.c:47
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-
-#: misc-utils/wipefs.c:316
+#: misc-utils/wipefs.c:341
 #, c-format
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
-" -h, --help          this help\n"
-" -n, --no-act        everything to be done except for the write() call\n"
+" -h, --help          show this help text\n"
+" -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:322
+#: misc-utils/wipefs.c:347
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:373
+#: misc-utils/wipefs.c:398
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
@@ -8249,7 +8425,7 @@ msgstr ""
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:886
+#: mount/lomount.c:888
 #, c-format
 msgid ""
 "\n"
@@ -8264,7 +8440,7 @@ msgid ""
 " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
 msgstr ""
 
-#: mount/lomount.c:896
+#: mount/lomount.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8280,389 +8456,428 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1034 mount/lomount.c:1074
+#: mount/lomount.c:1019
+#, c-format
+msgid "%s: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1023
+#, c-format
+msgid "%s: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/lomount.c:1038 mount/lomount.c:1078
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1061
+#: mount/lomount.c:1065
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1071
+#: mount/lomount.c:1075
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1088
+#: mount/lomount.c:1092
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 
-#: mount/mount.c:329
+#: mount/mount.c:289
+#, c-format
+msgid ""
+"\n"
+"mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
+"       It's possible that information reported by mount(8) is not\n"
+"       up to date. For actual information about system mount points\n"
+"       check the /proc/mounts file.\n"
+"\n"
+msgstr ""
+
+#: mount/mount.c:339
 #, c-format
 msgid "mount: improperly quoted option string '%s'"
 msgstr ""
 
-#: mount/mount.c:362
+#: mount/mount.c:372
 #, c-format
 msgid "mount: translated %s '%s' to '%s'\n"
 msgstr ""
 
-#: mount/mount.c:526
+#: mount/mount.c:536
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr ""
 
-#: mount/mount.c:531
+#: mount/mount.c:541
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr ""
 
-#: mount/mount.c:555
+#: mount/mount.c:565
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:572 mount/mount.c:1190
+#: mount/mount.c:582 mount/mount.c:1256
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
 
-#: mount/mount.c:580
+#: mount/mount.c:590
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:663
+#: mount/mount.c:683
 #, c-format
 msgid "mount: cannot set group id: %s"
 msgstr ""
 
-#: mount/mount.c:666
+#: mount/mount.c:686
 #, c-format
 msgid "mount: cannot set user id: %s"
 msgstr ""
 
-#: mount/mount.c:705 mount/mount.c:1855
+#: mount/mount.c:729 mount/mount.c:1925
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr ""
 
-#: mount/mount.c:842
+#: mount/mount.c:865
 #, c-format
 msgid "Trying %s\n"
 msgstr ""
 
-#: mount/mount.c:870
+#: mount/mount.c:893
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount.c:873
+#: mount/mount.c:896
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 
-#: mount/mount.c:876
+#: mount/mount.c:899
 #, c-format
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount.c:878
+#: mount/mount.c:901
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount.c:902
+#: mount/mount.c:926
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:993
+#: mount/mount.c:934
+#, c-format
+msgid ""
+"mount: %s: more filesystems detected. This should not happen,\n"
+"       use -t <type> to explicitly specify the filesystem type or\n"
+"       use wipefs(8) to clean up the device.\n"
+msgstr ""
+
+#: mount/mount.c:1022
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:995
+#: mount/mount.c:1024
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:1065
+#: mount/mount.c:1109
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:1070
+#: mount/mount.c:1114
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:1082
+#: mount/mount.c:1142
 #, c-format
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:1094
+#: mount/mount.c:1151
+#, c-format
+msgid "mount: invalid offset '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1155
+#, c-format
+msgid "mount: invalid sizelimit '%s' specified"
+msgstr ""
+
+#: mount/mount.c:1160
 #, c-format
 msgid "mount: according to mtab %s is already mounted on %s as loop"
 msgstr ""
 
-#: mount/mount.c:1104
+#: mount/mount.c:1170
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:1113
+#: mount/mount.c:1179
 #, c-format
 msgid "mount: stolen loop=%s ...trying again\n"
 msgstr ""
 
-#: mount/mount.c:1118
+#: mount/mount.c:1184
 #, c-format
 msgid "mount: stolen loop=%s"
 msgstr ""
 
-#: mount/mount.c:1123
+#: mount/mount.c:1189
 #, c-format
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:1134
+#: mount/mount.c:1200
 #, c-format
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:1168
+#: mount/mount.c:1234
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1185
+#: mount/mount.c:1251
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:1206
+#: mount/mount.c:1272
 msgid "mount: argument to -p or --pass-fd must be a number"
 msgstr ""
 
-#: mount/mount.c:1219
+#: mount/mount.c:1285
 #, c-format
 msgid "mount: cannot open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:1222
+#: mount/mount.c:1288
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr ""
 
-#: mount/mount.c:1314
+#: mount/mount.c:1379
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1371
+#: mount/mount.c:1435
 #, c-format
 msgid "mount: warning: %s seems to be mounted read-write.\n"
 msgstr ""
 
-#: mount/mount.c:1404
+#: mount/mount.c:1447
+#, c-format
+msgid "mount: warning: %s seems to be mounted read-only.\n"
+msgstr ""
+
+#: mount/mount.c:1482
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 
-#: mount/mount.c:1407
+#: mount/mount.c:1485
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#: mount/mount.c:1410
+#: mount/mount.c:1488
 msgid "mount: mount failed"
 msgstr ""
 
-#: mount/mount.c:1416 mount/mount.c:1453
+#: mount/mount.c:1494 mount/mount.c:1531
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:1418
+#: mount/mount.c:1496
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:1420
+#: mount/mount.c:1498
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
-#: mount/mount.c:1424 mount/mount.c:1428
+#: mount/mount.c:1502 mount/mount.c:1506
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
-#: mount/mount.c:1430
+#: mount/mount.c:1508
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:1432
+#: mount/mount.c:1510
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:1438
+#: mount/mount.c:1516
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1440
+#: mount/mount.c:1518
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:1445
+#: mount/mount.c:1523
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:1457
+#: mount/mount.c:1535
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:1469
+#: mount/mount.c:1547
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:1471
+#: mount/mount.c:1549
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       missing codepage or helper program, or other error"
 msgstr ""
 
-#: mount/mount.c:1478
+#: mount/mount.c:1556
 msgid ""
 "       (for several filesystems (e.g. nfs, cifs) you might\n"
 "       need a /sbin/mount.<type> helper program)"
 msgstr ""
 
-#: mount/mount.c:1487
+#: mount/mount.c:1565
 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:1492
+#: mount/mount.c:1570
 msgid ""
 "       (aren't you trying to mount an extended partition,\n"
 "       instead of some logical partition inside?)"
 msgstr ""
 
-#: mount/mount.c:1499
+#: mount/mount.c:1577
 msgid ""
 "       In some cases useful info is found in syslog - try\n"
 "       dmesg | tail  or so\n"
 msgstr ""
 
-#: mount/mount.c:1505
+#: mount/mount.c:1583
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:1507
+#: mount/mount.c:1585
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:1513
+#: mount/mount.c:1591
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:1518
+#: mount/mount.c:1596
 #, c-format
 msgid "mount: unknown filesystem type '%s'"
 msgstr ""
 
-#: mount/mount.c:1530
+#: mount/mount.c:1608
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:1533
+#: mount/mount.c:1611
 msgid "mount: maybe you meant 'iso9660'?"
 msgstr ""
 
-#: mount/mount.c:1536
+#: mount/mount.c:1614
 msgid "mount: maybe you meant 'vfat'?"
 msgstr ""
 
-#: mount/mount.c:1539
+#: mount/mount.c:1617
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
-#: mount/mount.c:1547
+#: mount/mount.c:1625
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:1549
+#: mount/mount.c:1627
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
-"       (maybe `insmod driver'?)"
+"       (maybe `modprobe driver'?)"
 msgstr ""
 
-#: mount/mount.c:1552
+#: mount/mount.c:1630
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:1555
+#: mount/mount.c:1633
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:1560
+#: mount/mount.c:1638
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#: mount/mount.c:1563
+#: mount/mount.c:1641
 msgid "block device "
 msgstr ""
 
-#: mount/mount.c:1565
+#: mount/mount.c:1643
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:1569
+#: mount/mount.c:1647
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:1573
+#: mount/mount.c:1651
 #, c-format
 msgid "mount: cannot remount %s%s read-write, is write-protected"
 msgstr ""
 
-#: mount/mount.c:1588
+#: mount/mount.c:1666
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:1598
-#, c-format
-msgid "mount: no medium found on %s ...trying again\n"
-msgstr ""
-
-#: mount/mount.c:1604
+#: mount/mount.c:1674
 #, c-format
 msgid "mount: no medium found on %s"
 msgstr ""
 
-#: mount/mount.c:1622
+#: mount/mount.c:1692
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -8672,22 +8887,22 @@ msgid ""
 "       this file system.  For more details see restorecon(8) and mount(8).\n"
 msgstr ""
 
-#: mount/mount.c:1701
+#: mount/mount.c:1771
 #, c-format
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
-#: mount/mount.c:1707
+#: mount/mount.c:1777
 #, c-format
 msgid "mount: no type was given - I'll assume cifs because of the // prefix\n"
 msgstr ""
 
-#: mount/mount.c:1802
+#: mount/mount.c:1872
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1937
+#: mount/mount.c:2007
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -8724,39 +8939,39 @@ msgid ""
 "For many more details, say  man 8 mount .\n"
 msgstr ""
 
-#: mount/mount.c:2265
+#: mount/mount.c:2335
 #, c-format
-msgid "mount: only root can do that (effective UID is %d)"
+msgid "mount: only root can do that (effective UID is %u)"
 msgstr ""
 
-#: mount/mount.c:2268
+#: mount/mount.c:2338
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:2279
+#: mount/mount.c:2349
 msgid "nothing was mounted"
 msgstr ""
 
-#: mount/mount.c:2297 mount/mount.c:2323
+#: mount/mount.c:2367 mount/mount.c:2393
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:2300
+#: mount/mount.c:2370
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_mntent.c:165
+#: mount/mount_mntent.c:114
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
 
-#: mount/mount_mntent.c:216
+#: mount/mount_mntent.c:165
 #, c-format
 msgid "[mntent]: line %d in %s is bad%s\n"
 msgstr ""
 
-#: mount/mount_mntent.c:219
+#: mount/mount_mntent.c:168
 msgid "; rest of file ignored"
 msgstr ""
 
@@ -8769,7 +8984,7 @@ msgstr ""
 msgid "not enough memory"
 msgstr ""
 
-#: mount/swapon.c:84
+#: mount/swapon.c:85
 #, c-format
 msgid ""
 "The <special> parameter:\n"
@@ -8780,7 +8995,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:92
+#: mount/swapon.c:93
 #, c-format
 msgid ""
 "\n"
@@ -8793,7 +9008,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:106
+#: mount/swapon.c:107
 #, c-format
 msgid ""
 "\n"
@@ -8805,124 +9020,129 @@ msgid ""
 "\n"
 msgstr ""
 
-#: mount/swapon.c:140
+#: mount/swapon.c:142
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:205
+#: mount/swapon.c:217
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:209
+#: mount/swapon.c:221
 #, fuzzy
 msgid "fork failed"
 msgstr "查找失败"
 
-#: mount/swapon.c:225
+#: mount/swapon.c:237
 #, fuzzy
 msgid "execv failed"
 msgstr "查找失败"
 
-#: mount/swapon.c:233
+#: mount/swapon.c:245
 msgid "waitpid failed"
 msgstr ""
 
-#: mount/swapon.c:257
+#: mount/swapon.c:269
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "查找失败"
 
-#: mount/swapon.c:263
+#: mount/swapon.c:275
 #, c-format
 msgid "%s: write signature failed"
 msgstr ""
 
-#: mount/swapon.c:350
+#: mount/swapon.c:362
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:355
+#: mount/swapon.c:367
 msgid "same"
 msgstr ""
 
-#: mount/swapon.c:370
+#: mount/swapon.c:382
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s 失败.\n"
 
-#: mount/swapon.c:380
+#: mount/swapon.c:392
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:388
+#: mount/swapon.c:400
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:402
+#: mount/swapon.c:414
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "查找失败"
 
-#: mount/swapon.c:408
+#: mount/swapon.c:420
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:421
+#: mount/swapon.c:428
+#, c-format
+msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
+msgstr ""
+
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:426
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:431
+#: mount/swapon.c:443
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:440
+#: mount/swapon.c:452
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:464 mount/swapon.c:514
+#: mount/swapon.c:476 mount/swapon.c:526
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:498
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s 失败.\n"
 
-#: mount/swapon.c:493
+#: mount/swapon.c:505
 #, c-format
 msgid "cannot find the device for %s"
 msgstr ""
 
-#: mount/swapon.c:526
+#: mount/swapon.c:538
 msgid "Not superuser."
 msgstr ""
 
-#: mount/swapon.c:529
+#: mount/swapon.c:541
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s 失败.\n"
 
-#: mount/swapon.c:797
+#: mount/swapon.c:809
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -8932,37 +9152,37 @@ msgstr ""
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:111
+#: mount/umount.c:114
 #, c-format
 msgid "umount: cannot set group id: %s"
 msgstr ""
 
-#: mount/umount.c:114
+#: mount/umount.c:117
 #, c-format
 msgid "umount: cannot set user id: %s"
 msgstr ""
 
-#: mount/umount.c:139
+#: mount/umount.c:142
 #, c-format
 msgid "umount: cannot fork: %s"
 msgstr ""
 
-#: mount/umount.c:160
+#: mount/umount.c:163
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:162
+#: mount/umount.c:165
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:164
+#: mount/umount.c:167
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
-#: mount/umount.c:168
+#: mount/umount.c:171
 #, c-format
 msgid ""
 "umount: %s: device is busy.\n"
@@ -8970,51 +9190,51 @@ msgid ""
 "         the device is found by lsof(8) or fuser(1))"
 msgstr ""
 
-#: mount/umount.c:173
+#: mount/umount.c:176
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:175
+#: mount/umount.c:178
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:177
+#: mount/umount.c:180
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:179
+#: mount/umount.c:182
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 #, c-format
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:252
+#: mount/umount.c:258
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:263
+#: mount/umount.c:269
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:272
-#, c-format
-msgid "%s umounted\n"
-msgstr ""
+#: mount/umount.c:278
+#, fuzzy, c-format
+msgid "%s has been unmounted\n"
+msgstr "%s 已经挂载.\t"
 
-#: mount/umount.c:367
+#: mount/umount.c:373
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:399
+#: mount/umount.c:405
 #, c-format
 msgid ""
 "Usage: umount -h | -V\n"
@@ -9022,80 +9242,84 @@ msgid ""
 "       umount [-d] [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:468
+#: mount/umount.c:474
 #, c-format
 msgid "device %s is associated with %s\n"
 msgstr ""
 
-#: mount/umount.c:474
+#: mount/umount.c:480
 #, c-format
 msgid "device %s is not associated with %s\n"
 msgstr ""
 
-#: mount/umount.c:487
-msgid "Cannot umount \"\"\n"
+#: mount/umount.c:493
+msgid "Cannot unmount \"\"\n"
 msgstr ""
 
-#: mount/umount.c:493
+#: mount/umount.c:499
 #, c-format
-msgid "Trying to umount %s\n"
+msgid "Trying to unmount %s\n"
 msgstr ""
 
-#: mount/umount.c:506
+#: mount/umount.c:512
 msgid "umount: confused when analyzing mtab"
 msgstr ""
 
-#: mount/umount.c:511
+#: mount/umount.c:517
 #, c-format
-msgid "umount: cannot umount %s -- %s is mounted over it on the same point."
+msgid "umount: cannot unmount %s -- %s is mounted over it on the same point"
 msgstr ""
 
-#: mount/umount.c:518
+#: mount/umount.c:524
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:531
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:549
+#: mount/umount.c:555
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:563
+#: mount/umount.c:569
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:569
+#: mount/umount.c:575
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:610
+#: mount/umount.c:616
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:701
+#: mount/umount.c:711
 msgid "umount: only root can do that"
 msgstr ""
 
-#: schedutils/chrt.c:53
+#: schedutils/chrt.c:60
 #, c-format
 msgid ""
 "\n"
-"chrt - manipulate real-time attributes of a process.\n"
+"chrt - manipulate real-time attributes of a process\n"
 "\n"
 "Set policy:\n"
 "  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 "\n"
 "Get policy:\n"
 "  chrt [options] {<pid> | <command> [<arg> ...]}\n"
-"\n"
+msgstr ""
+
+#: schedutils/chrt.c:67
+#, c-format
+msgid ""
 "\n"
 "Scheduling policies:\n"
 "  -b | --batch         set policy to SCHED_BATCH\n"
@@ -9103,74 +9327,95 @@ msgid ""
 "  -i | --idle          set policy to SCHED_IDLE\n"
 "  -o | --other         set policy to SCHED_OTHER\n"
 "  -r | --rr            set policy to SCHED_RR (default)\n"
+msgstr ""
+
+#: schedutils/chrt.c:76
+#, c-format
+msgid ""
+"\n"
+"Scheduling flags:\n"
+"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+msgstr ""
+
+#: schedutils/chrt.c:80
+#, c-format
+msgid ""
 "\n"
 "Options:\n"
 "  -h | --help          display this help\n"
-"  -p | --pid           operate on existing given pid\n"
 "  -m | --max           show min and max valid priorities\n"
+"  -p | --pid           operate on existing given pid\n"
 "  -v | --verbose       display status information\n"
 "  -V | --version       output version information\n"
 "\n"
 msgstr ""
 
-#: schedutils/chrt.c:85
+#: schedutils/chrt.c:101
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:87
+#: schedutils/chrt.c:104
+#, c-format
+msgid "pid %d's new scheduling policy: "
+msgstr ""
+
+#: schedutils/chrt.c:106
 #, c-format
-msgid "pid %d's %s scheduling policy: "
+msgid "pid %d's current scheduling policy: "
 msgstr ""
 
-#: schedutils/chrt.c:109
+#: schedutils/chrt.c:139
 #, c-format
 msgid "unknown\n"
 msgstr ""
 
-#: schedutils/chrt.c:113
+#: schedutils/chrt.c:143
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr ""
 
-#: schedutils/chrt.c:115
+#: schedutils/chrt.c:146
 #, c-format
-msgid "pid %d's %s scheduling priority: %d\n"
+msgid "pid %d's new scheduling priority: %d\n"
 msgstr ""
 
-#: schedutils/chrt.c:144
+#: schedutils/chrt.c:149
+#, c-format
+msgid "pid %d's current scheduling priority: %d\n"
+msgstr ""
+
+#: schedutils/chrt.c:178
 #, c-format
 msgid "SCHED_%s min/max priority\t: %d/%d\n"
 msgstr ""
 
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:181
 #, c-format
 msgid "SCHED_%s not supported?\n"
 msgstr ""
 
-#: schedutils/chrt.c:203
+#: schedutils/chrt.c:243
 #, fuzzy
 msgid "failed to parse pid"
 msgstr "不能读 inodes"
 
-#: schedutils/chrt.c:225
-msgid "current"
+#: schedutils/chrt.c:273
+msgid "failed to parse priority"
 msgstr ""
 
-#: schedutils/chrt.c:233
-msgid "failed to parse priority"
+#: schedutils/chrt.c:279
+msgid ""
+"SCHED_RESET_ON_FORK flag is suppoted for SCHED_FIFO and SCHED_RR policies "
+"only"
 msgstr ""
 
-#: schedutils/chrt.c:239
+#: schedutils/chrt.c:289
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:242
-msgid "new"
-msgstr ""
-
-#: schedutils/chrt.c:248
+#: schedutils/chrt.c:298
 #, c-format
 msgid "failed to execute %s"
 msgstr ""
@@ -9192,7 +9437,7 @@ msgid ""
 "\n"
 "Usage:\n"
 "  ionice [ options ] -p <pid> [<pid> ...]\n"
-"  ionoce [ options ] <command> [<arg> ...]\n"
+"  ionice [ options ] <command> [<arg> ...]\n"
 "\n"
 "Options:\n"
 "  -n <classdata>      class data (0-7, lower being higher prio)\n"
@@ -9221,11 +9466,116 @@ msgstr ""
 msgid "bad prio class %d"
 msgstr ""
 
-#: schedutils/ionice.c:187
+#: schedutils/ionice.c:187 schedutils/taskset.c:183
+#, fuzzy, c-format
+msgid "executing %s failed"
+msgstr "%s 失败.\n"
+
+#: schedutils/taskset.c:38
+#, c-format
+msgid ""
+"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:42
+#, c-format
+msgid ""
+"Options:\n"
+" -p, --pid               operate on existing given pid\n"
+" -c, --cpu-list          display and specify cpus in list format\n"
+" -h, --help              display this help\n"
+" -V, --version           output version information\n"
+"\n"
+msgstr ""
+
+#: schedutils/taskset.c:49
+#, c-format
+msgid ""
+"The default behavior is to run a new command:\n"
+"    %1$s 03 sshd -b 1024\n"
+"You can retrieve the mask of an existing task:\n"
+"    %1$s -p 700\n"
+"Or set it:\n"
+"    %1$s -p 03 700\n"
+"List format uses a comma-separated list instead of a mask:\n"
+"    %1$s -pc 0,3,7-11 700\n"
+"Ranges in list format can take a stride argument:\n"
+"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"
+msgstr ""
+
+#: schedutils/taskset.c:61
+#, c-format
+msgid ""
+"\n"
+"For more information see taskset(1).\n"
+msgstr ""
+
+#: schedutils/taskset.c:113
+msgid "cannot determine NR_CPUS; aborting"
+msgstr ""
+
+#: schedutils/taskset.c:122 schedutils/taskset.c:136
 #, fuzzy
-msgid "execvp failed"
+msgid "cpuset_alloc failed"
 msgstr "查找失败"
 
+#: schedutils/taskset.c:140 schedutils/taskset.c:165
+#, fuzzy, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "不能读 inodes"
+
+#: schedutils/taskset.c:143
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:146
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:157
+#, fuzzy, c-format
+msgid "failed to parse %s %s"
+msgstr "不能读 inodes"
+
+#: schedutils/taskset.c:158
+msgid "CPU list"
+msgstr ""
+
+#: schedutils/taskset.c:158
+msgid "CPU mask"
+msgstr ""
+
+#: schedutils/taskset.c:162
+#, fuzzy, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "不能读 inodes"
+
+#: schedutils/taskset.c:169
+#, c-format
+msgid "pid %d's new affinity list: %s\n"
+msgstr ""
+
+#: schedutils/taskset.c:172
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:501
+msgid "parse error at lines: "
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:503
+msgid "parse error at line: "
+msgstr ""
+
+#: shlibs/mount/src/tab_parse.c:523
+#, c-format
+msgid " and %d."
+msgstr ""
+
 #: sys-utils/ctrlaltdel.c:27
 #, c-format
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
@@ -9359,7 +9709,15 @@ msgstr ""
 msgid "Usage: %s [-c] [-n level] [-r] [-s bufsize]\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:51
+#: sys-utils/fallocate.c:48
+#, c-format
+msgid ""
+"Usage: %s [options] <filename>\n"
+"\n"
+"Options:\n"
+msgstr ""
+
+#: sys-utils/fallocate.c:52
 #, c-format
 msgid ""
 " -h, --help          this help\n"
@@ -9368,34 +9726,38 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
+#: sys-utils/fallocate.c:57
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:147
+#: sys-utils/fallocate.c:115
 msgid "no length argument specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:149
+#: sys-utils/fallocate.c:117
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:119
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:153
+#: sys-utils/fallocate.c:121
 msgid "no filename specified."
 msgstr ""
 
-#: sys-utils/fallocate.c:173
+#: sys-utils/fallocate.c:126 sys-utils/fsfreeze.c:96
+msgid "unexpected number of arguments"
+msgstr ""
+
+#: sys-utils/fallocate.c:146
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:174
+#: sys-utils/fallocate.c:147
 #, c-format
 msgid "%s: fallocate failed"
 msgstr ""
@@ -9442,6 +9804,57 @@ msgstr ""
 msgid "%s: fork failed: %s\n"
 msgstr "%s 失败.\n"
 
+#: sys-utils/fsfreeze.c:41
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [options] <mount point>\n"
+"\n"
+"Options:\n"
+msgstr "用法: %s [ -n ] device\n"
+
+#: sys-utils/fsfreeze.c:45
+#, c-format
+msgid ""
+" -h, --help          this help\n"
+" -f, --freeze        freeze the filesystem\n"
+" -u, --unfreeze      unfreeze the filesystem\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:49
+#, c-format
+msgid ""
+"\n"
+"For more information see fsfreeze(8).\n"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:90
+msgid "no action specified"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:92
+msgid "no filename specified"
+msgstr ""
+
+#: sys-utils/fsfreeze.c:105
+#, fuzzy, c-format
+msgid "%s: fstat failed"
+msgstr "%s 失败.\n"
+
+#: sys-utils/fsfreeze.c:110
+#, fuzzy, c-format
+msgid "%s: is not a directory"
+msgstr "根 inode 不是一个目录"
+
+#: sys-utils/fsfreeze.c:116
+#, fuzzy, c-format
+msgid "%s: freeze failed"
+msgstr "%s 失败.\n"
+
+#: sys-utils/fsfreeze.c:121
+#, fuzzy, c-format
+msgid "%s: unfreeze failed"
+msgstr "%s 失败.\n"
+
 #: sys-utils/ipcmk.c:84
 #, c-format
 msgid ""
@@ -9526,690 +9939,700 @@ msgid ""
 "          [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:179
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: sys-utils/ipcrm.c:191
+#: sys-utils/ipcrm.c:189
 #, c-format
 msgid "%s: illegal key (%s)\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:206 sys-utils/ipcrm.c:238
+#: sys-utils/ipcrm.c:204 sys-utils/ipcrm.c:236
 msgid "permission denied for key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:209 sys-utils/ipcrm.c:248
+#: sys-utils/ipcrm.c:207 sys-utils/ipcrm.c:246
 msgid "already removed key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:212 sys-utils/ipcrm.c:243
+#: sys-utils/ipcrm.c:210 sys-utils/ipcrm.c:241
 msgid "invalid key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:215 sys-utils/ipcrm.c:253
+#: sys-utils/ipcrm.c:213 sys-utils/ipcrm.c:251
 msgid "unknown error in key"
 msgstr ""
 
-#: sys-utils/ipcrm.c:239
+#: sys-utils/ipcrm.c:237
 msgid "permission denied for id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:244
+#: sys-utils/ipcrm.c:242
 msgid "invalid id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:249
+#: sys-utils/ipcrm.c:247
 msgid "already removed id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:254
+#: sys-utils/ipcrm.c:252
 msgid "unknown error in id"
 msgstr ""
 
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:255
 #, c-format
 msgid "%s: %s (%s)\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:265
+#: sys-utils/ipcrm.c:263
 #, c-format
 msgid "%s: unknown argument: %s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:116
-#, c-format
-msgid "usage : %s -asmq -tclup \n"
-msgstr ""
-
-#: sys-utils/ipcs.c:117
-#, c-format
-msgid "\t%s [-s -m -q] -i id\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:118
-#, c-format
-msgid "\t%s -h for help.\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:114
 #, c-format
 msgid ""
-"%s provides information on ipc facilities for which you have read access.\n"
+"Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+"       %1$s [-s|-m|-q] -i id\n"
+"       %1$s -h for help\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid ""
-"Resource Specification:\n"
-"\t-m : shared_mem\n"
-"\t-q : messages\n"
+"Usage: %1$s [resource]... [output-format]\n"
+"       %1$s [resource] -i id\n"
+"\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:127
 #, c-format
 msgid ""
-"\t-s : semaphores\n"
-"\t-a : all (default)\n"
+"Provide information on IPC facilities for which you have read access.\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:131
 #, c-format
 msgid ""
-"Output Format:\n"
-"\t-t : time\n"
-"\t-p : pid\n"
-"\t-c : creator\n"
+"    -h      display this help\n"
+"    -i id   print details on resource identified by id\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 #, c-format
 msgid ""
-"\t-l : limits\n"
-"\t-u : summary\n"
+"Resource options:\n"
+"    -m      shared memory segments\n"
+"    -q      message queues\n"
+"    -s      semaphores\n"
+"    -a      all (default)\n"
+"\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:140
 #, c-format
-msgid "-i id [-s -q -m] : details on resource identified by id\n"
+msgid ""
+"Output format:\n"
+"    -t      time\n"
+"    -p      pid\n"
+"    -c      creator\n"
+"    -l      limits\n"
+"    -u      summary\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:268
 #, c-format
 msgid "kernel not configured for shared memory\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:260
+#: sys-utils/ipcs.c:274
 #, c-format
 msgid "------ Shared Memory Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:265
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max number of segments = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:267
+#: sys-utils/ipcs.c:281
 #, c-format
 msgid "max seg size (kbytes) = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:283
 #, c-format
 msgid "max total shared memory (kbytes) = %llu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "min seg size (bytes) = %lu\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:290
 #, c-format
 msgid "------ Shared Memory Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:277
-#, c-format
-msgid "segments allocated %d\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:278
-#, c-format
-msgid "pages allocated %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:279
-#, c-format
-msgid "pages resident  %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:280
-#, c-format
-msgid "pages swapped   %ld\n"
-msgstr ""
-
-#: sys-utils/ipcs.c:281
+#. TRANSLATORS: This output format is mantained for backward compatibility
+#. as ipcs is used in scripts. For consistency with the rest, the translated
+#. form can follow this model:
+#.
+#. "segments allocated = %d\n"
+#. "pages allocated = %ld\n"
+#. "pages resident = %ld\n"
+#. "pages swapped = %ld\n"
+#. "swap performance = %ld attempts, %ld successes\n"
+#.
+#: sys-utils/ipcs.c:301
 #, c-format
-msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgid ""
+"segments allocated %d\n"
+"pages allocated %ld\n"
+"pages resident  %ld\n"
+"pages swapped   %ld\n"
+"Swap performance: %ld attempts\t %ld successes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:314
 #, c-format
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:294 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:322 sys-utils/ipcs.c:329
+#: sys-utils/ipcs.c:335
 msgid "shmid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:307 sys-utils/ipcs.c:408
-#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:506 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:335 sys-utils/ipcs.c:436
+#: sys-utils/ipcs.c:451 sys-utils/ipcs.c:534 sys-utils/ipcs.c:552
 msgid "perms"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cuid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "cgid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "uid"
 msgstr ""
 
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:408 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:316 sys-utils/ipcs.c:436 sys-utils/ipcs.c:534
 msgid "gid"
 msgstr ""
 
-#: sys-utils/ipcs.c:292
+#: sys-utils/ipcs.c:320
 #, c-format
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:301 sys-utils/ipcs.c:307
-#: sys-utils/ipcs.c:414 sys-utils/ipcs.c:423 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:329 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:442 sys-utils/ipcs.c:451 sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:546 sys-utils/ipcs.c:552
 msgid "owner"
 msgstr ""
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "attached"
 msgstr ""
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:322
 msgid "detached"
 msgstr ""
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:323
 msgid "changed"
 msgstr ""
 
-#: sys-utils/ipcs.c:299
+#: sys-utils/ipcs.c:327
 #, c-format
-msgid "------ Shared Memory Creator/Last-op --------\n"
+msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "cpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:329
 msgid "lpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:305
+#: sys-utils/ipcs.c:333
 #, c-format
 msgid "------ Shared Memory Segments --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:423 sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:335 sys-utils/ipcs.c:451 sys-utils/ipcs.c:552
 msgid "key"
 msgstr ""
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:335
 msgid "bytes"
 msgstr ""
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "nattch"
 msgstr ""
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:336
 msgid "status"
 msgstr ""
 
-#: sys-utils/ipcs.c:329 sys-utils/ipcs.c:331 sys-utils/ipcs.c:333
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:545
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:630 sys-utils/ipcs.c:632
-#: sys-utils/ipcs.c:634 sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:357 sys-utils/ipcs.c:359 sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:472 sys-utils/ipcs.c:474 sys-utils/ipcs.c:573
+#: sys-utils/ipcs.c:575 sys-utils/ipcs.c:577 sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:630 sys-utils/ipcs.c:658 sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:662 sys-utils/ipcs.c:685
 msgid "Not set"
 msgstr ""
 
-#: sys-utils/ipcs.c:361
+#: sys-utils/ipcs.c:389
 msgid "dest"
 msgstr ""
 
-#: sys-utils/ipcs.c:362
+#: sys-utils/ipcs.c:390
 msgid "locked"
 msgstr ""
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "kernel not configured for semaphores\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "------ Semaphore Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:392
+#: sys-utils/ipcs.c:420
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:393
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:422
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:423
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:424
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:428
 #, c-format
 msgid "------ Semaphore Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:429
 #, c-format
 msgid "used arrays = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:434
 #, c-format
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:414 sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:442 sys-utils/ipcs.c:451
 msgid "semid"
 msgstr ""
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:440
 #, c-format
 msgid "------ Semaphore Operation/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-op"
 msgstr ""
 
-#: sys-utils/ipcs.c:414
+#: sys-utils/ipcs.c:442
 msgid "last-changed"
 msgstr ""
 
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:449
 #, c-format
 msgid "------ Semaphore Arrays --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:423
+#: sys-utils/ipcs.c:451
 msgid "nsems"
 msgstr ""
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "kernel not configured for message queues\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:490
+#: sys-utils/ipcs.c:518
 #, c-format
-msgid "------ Messages: Limits --------\n"
+msgid "------ Messages Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:519
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:521
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:497
+#: sys-utils/ipcs.c:525
 #, c-format
-msgid "------ Messages: Status --------\n"
+msgid "------ Messages Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:526
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:527
 #, c-format
 msgid "used headers = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:528
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:532
 #, c-format
-msgid "------ Message Queues: Creators/Owners --------\n"
+msgid "------ Message Queues Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:506 sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:534 sys-utils/ipcs.c:540 sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:552
 msgid "msqid"
 msgstr ""
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:538
 #, c-format
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "send"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "recv"
 msgstr ""
 
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:540
 msgid "change"
 msgstr ""
 
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:544
 #, c-format
 msgid "------ Message Queues PIDs --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lspid"
 msgstr ""
 
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:546
 msgid "lrpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:550
 #, c-format
 msgid "------ Message Queues --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "used-bytes"
 msgstr ""
 
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:553
 msgid "messages"
 msgstr ""
 
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:617
 #, fuzzy
 msgid "shmctl failed"
 msgstr "%s 失败.\n"
 
-#: sys-utils/ipcs.c:591
+#: sys-utils/ipcs.c:619
 #, c-format
 msgid ""
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:620
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:622
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "att_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:629
 #, c-format
 msgid "det_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:631 sys-utils/ipcs.c:661
 #, c-format
 msgid "change_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:643
 #, fuzzy
 msgid "msgctl failed"
 msgstr "%s 失败.\n"
 
-#: sys-utils/ipcs.c:617
+#: sys-utils/ipcs.c:645
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:646
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:620
+#: sys-utils/ipcs.c:648
 #, c-format
 msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:629
+#: sys-utils/ipcs.c:657
 #, c-format
 msgid "send_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:659
 #, c-format
 msgid "rcv_time=%-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:648 sys-utils/ipcs.c:670
+#: sys-utils/ipcs.c:676 sys-utils/ipcs.c:698
 #, fuzzy
 msgid "semctl failed"
 msgstr "查找失败"
 
-#: sys-utils/ipcs.c:650
+#: sys-utils/ipcs.c:678
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:679
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:653
+#: sys-utils/ipcs.c:681
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:655
+#: sys-utils/ipcs.c:683
 #, c-format
 msgid "nsems = %ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:656
+#: sys-utils/ipcs.c:684
 #, c-format
 msgid "otime = %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:686
 #, c-format
 msgid "ctime = %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "semnum"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "value"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "ncount"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "zcount"
 msgstr ""
 
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:689
 msgid "pid"
 msgstr ""
 
-#: sys-utils/ldattach.c:89
+#: sys-utils/ldattach.c:133
+#, c-format
+msgid "invalid iflag: %s"
+msgstr ""
+
+#: sys-utils/ldattach.c:151
 #, c-format
 msgid ""
 "\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] <ldisc> <device>\n"
+"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:91
+#: sys-utils/ldattach.c:153
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:176
+#: sys-utils/ldattach.c:155
+msgid ""
+"\n"
+"Known <iflag> names:\n"
+msgstr ""
+
+#: sys-utils/ldattach.c:240
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:179
+#: sys-utils/ldattach.c:246
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:184 text-utils/tailf.c:206
+#: sys-utils/ldattach.c:251 text-utils/tailf.c:206
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:264
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:272
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:278
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:244
+#: sys-utils/ldattach.c:316
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:251
+#: sys-utils/ldattach.c:323
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:257
+#: sys-utils/ldattach.c:329
 msgid "cannot daemonize"
 msgstr ""
 
-#: sys-utils/lscpu.c:64
+#: sys-utils/lscpu.c:54
 #, fuzzy
 msgid "none"
 msgstr "完成\n"
 
-#: sys-utils/lscpu.c:65
+#: sys-utils/lscpu.c:55
 msgid "para"
 msgstr ""
 
-#: sys-utils/lscpu.c:66
+#: sys-utils/lscpu.c:56
 msgid "full"
 msgstr ""
 
-#: sys-utils/lscpu.c:137 sys-utils/lscpu.c:160 sys-utils/lscpu.c:456
-#, c-format
-msgid "error: %s"
-msgstr ""
+#: sys-utils/lscpu.c:158
+#, fuzzy, c-format
+msgid "error: cannot open %s"
+msgstr "%s: 不能打开 %s\n"
 
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:186 sys-utils/lscpu.c:207 sys-utils/lscpu.c:251
+#, fuzzy, c-format
+msgid "failed to read: %s"
+msgstr "不能读 inodes"
+
+#: sys-utils/lscpu.c:209
 #, c-format
-msgid "error parse: %s"
+msgid "parse error: %s"
 msgstr ""
 
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:233
 msgid "error: strdup failed"
 msgstr ""
 
-#: sys-utils/lscpu.c:267
+#: sys-utils/lscpu.c:260
+#, fuzzy
+msgid "failed to callocate cpu set"
+msgstr "不能为 inodes 分配缓冲区"
+
+#: sys-utils/lscpu.c:263
+#, fuzzy, c-format
+msgid "failed to parse CPU mask %s"
+msgstr "不能读 inodes"
+
+#: sys-utils/lscpu.c:318
 #, fuzzy
 msgid "error: uname failed"
 msgstr "查找失败"
 
-#: sys-utils/lscpu.c:506
-msgid "error: malloc failed"
-msgstr ""
-
-#: sys-utils/lscpu.c:521
-msgid "error: /sys filesystem is not accessable."
-msgstr ""
+#: sys-utils/lscpu.c:541 sys-utils/lscpu.c:544 sys-utils/lscpu.c:620
+#: sys-utils/lscpu.c:641
+#, fuzzy
+msgid "error: calloc failed"
+msgstr "查找失败"
 
-#: sys-utils/lscpu.c:539
+#: sys-utils/lscpu.c:657
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -10218,69 +10641,82 @@ msgid ""
 "# CPU,Core,Socket,Node"
 msgstr ""
 
-#: sys-utils/lscpu.c:619
+#: sys-utils/lscpu.c:738
+msgid "Architecture:"
+msgstr ""
+
+#: sys-utils/lscpu.c:756
 msgid "CPU op-mode(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:625
+#: sys-utils/lscpu.c:759
+msgid "CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:762
 msgid "Thread(s) per core:"
 msgstr ""
 
-#: sys-utils/lscpu.c:626
+#: sys-utils/lscpu.c:763
 msgid "Core(s) per socket:"
 msgstr ""
 
-#: sys-utils/lscpu.c:627
+#: sys-utils/lscpu.c:764
 msgid "CPU socket(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:631
+#: sys-utils/lscpu.c:768
 msgid "NUMA node(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:633
+#: sys-utils/lscpu.c:770
 msgid "Vendor ID:"
 msgstr ""
 
-#: sys-utils/lscpu.c:635
+#: sys-utils/lscpu.c:772
 msgid "CPU family:"
 msgstr ""
 
-#: sys-utils/lscpu.c:637
+#: sys-utils/lscpu.c:774
 msgid "Model:"
 msgstr ""
 
-#: sys-utils/lscpu.c:639
+#: sys-utils/lscpu.c:776
 msgid "Stepping:"
 msgstr ""
 
-#: sys-utils/lscpu.c:641
+#: sys-utils/lscpu.c:778
 msgid "CPU MHz:"
 msgstr ""
 
-#: sys-utils/lscpu.c:644 sys-utils/lscpu.c:646
+#: sys-utils/lscpu.c:781 sys-utils/lscpu.c:783
 msgid "Virtualization:"
 msgstr ""
 
-#: sys-utils/lscpu.c:649
+#: sys-utils/lscpu.c:786
 msgid "Hypervisor vendor:"
 msgstr ""
 
-#: sys-utils/lscpu.c:650
+#: sys-utils/lscpu.c:787
 msgid "Virtualization type:"
 msgstr ""
 
-#: sys-utils/lscpu.c:658
+#: sys-utils/lscpu.c:795
 #, c-format
 msgid "%s cache:"
 msgstr ""
 
-#: sys-utils/lscpu.c:666
+#: sys-utils/lscpu.c:805
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr ""
+
+#: sys-utils/lscpu.c:816
 #, fuzzy, c-format
 msgid "Usage: %s [option]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: sys-utils/lscpu.c:669
+#: sys-utils/lscpu.c:819
 msgid ""
 "CPU architecture information helper\n"
 "\n"
@@ -10289,65 +10725,6 @@ msgid ""
 "  -s, --sysroot  use the directory as a new system root.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:718
-#, c-format
-msgid "error: change working directory to %s."
-msgstr ""
-
-#: sys-utils/rdev.c:77
-msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-
-#: sys-utils/rdev.c:78
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
-msgstr ""
-
-#: sys-utils/rdev.c:79
-msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr ""
-
-#: sys-utils/rdev.c:80
-msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-
-#: sys-utils/rdev.c:81
-msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
-
-#: sys-utils/rdev.c:82
-msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr ""
-
-#: sys-utils/rdev.c:83
-msgid "  rdev -o N ...                   use the byte offset N"
-msgstr ""
-
-#: sys-utils/rdev.c:84
-msgid "  rootflags ...                   same as rdev -R"
-msgstr ""
-
-#: sys-utils/rdev.c:85
-msgid "  ramsize ...                     same as rdev -r"
-msgstr ""
-
-#: sys-utils/rdev.c:86
-msgid "  vidmode ...                     same as rdev -v"
-msgstr ""
-
-#: sys-utils/rdev.c:87
-msgid ""
-"Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
-msgstr ""
-
-#: sys-utils/rdev.c:88
-msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
-msgstr ""
-
-#: sys-utils/rdev.c:245
-msgid "missing comma"
-msgstr ""
-
 #: sys-utils/readprofile.c:72 text-utils/more.c:798
 #, c-format
 msgid "out of memory"
@@ -10446,11 +10823,12 @@ msgstr ""
 msgid "%d: old priority %d, new priority %d\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:83
+#: sys-utils/rtcwake.c:85
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
+"    -n | --dry-run            does everything, but suspend\n"
 "    -l | --local              RTC uses local timezone\n"
 "    -m | --mode               standby|mem|... sleep mode\n"
 "    -s | --seconds <seconds>  seconds to sleep\n"
@@ -10460,104 +10838,129 @@ msgid ""
 "    -V | --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:142
+#: sys-utils/rtcwake.c:145
 msgid "read rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:147
+#: sys-utils/rtcwake.c:150
 msgid "read system time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:165
+#: sys-utils/rtcwake.c:168
 msgid "convert rtc time"
 msgstr ""
 
-#: sys-utils/rtcwake.c:224
+#: sys-utils/rtcwake.c:228
 msgid "set rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:228
+#: sys-utils/rtcwake.c:232
 msgid "enable rtc alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:232
+#: sys-utils/rtcwake.c:236
 msgid "set rtc wake alarm"
 msgstr ""
 
-#: sys-utils/rtcwake.c:346
+#: sys-utils/rtcwake.c:353
 #, c-format
 msgid "%s: unrecognized suspend state '%s'\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:355
+#: sys-utils/rtcwake.c:366
 #, c-format
 msgid "%s: illegal interval %s seconds\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:380
 #, c-format
 msgid "%s: illegal time_t value %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:385
+#: sys-utils/rtcwake.c:396
 #, c-format
 msgid "%s: version %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:409
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:403
+#: sys-utils/rtcwake.c:414
 #, c-format
 msgid "Using UTC time.\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:404
+#: sys-utils/rtcwake.c:415
 #, c-format
 msgid "Using local time.\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:407
+#: sys-utils/rtcwake.c:418
 #, c-format
 msgid "%s: must provide wake time\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:417
+#: sys-utils/rtcwake.c:428
 msgid "malloc() failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:429
+#: sys-utils/rtcwake.c:440
 #, c-format
 msgid "%s: %s not enabled for wakeup events\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:460
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:454
+#: sys-utils/rtcwake.c:465
 #, c-format
 msgid "%s: time doesn't go backward to %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:465
+#: sys-utils/rtcwake.c:476
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:487
+#: sys-utils/rtcwake.c:484
+#, c-format
+msgid "suspend mode: no; leaving\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:493
+#, c-format
+msgid "suspend mode: off; executing %s\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:503
 #, c-format
 msgid "%s: unable to execute %s: %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:496
+#: sys-utils/rtcwake.c:512
+#, c-format
+msgid "suspend mode: on; reading rtc\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:518
 msgid "rtc read"
 msgstr ""
 
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:529
+#, c-format
+msgid "suspend mode: disable; disabling alarm\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:532
+#, c-format
+msgid "suspend mode: %s; suspending system\n"
+msgstr ""
+
+#: sys-utils/rtcwake.c:538
 msgid "disable rtc alarm interrupt"
 msgstr ""
 
@@ -10649,6 +11052,10 @@ msgstr ""
 msgid "%s: %s not an lp device.\n"
 msgstr ""
 
+#: sys-utils/tunelp.c:259
+msgid "LPGETSTATUS error"
+msgstr ""
+
 #: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
@@ -10679,6 +11086,11 @@ msgstr ""
 msgid ", error"
 msgstr ""
 
+#: sys-utils/tunelp.c:274
+#, fuzzy
+msgid "tunelp: ioctl failed"
+msgstr "查找失败"
+
 #: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr ""
@@ -10722,6 +11134,15 @@ msgid "unshare failed"
 msgstr "查找失败"
 
 #: sys-utils/unshare.c:118
+msgid "cannot set group id"
+msgstr ""
+
+#: sys-utils/unshare.c:121
+#, fuzzy
+msgid "cannot set user id"
+msgstr "%s: 不能打开 %s\n"
+
+#: sys-utils/unshare.c:125
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "%s 失败.\n"
@@ -11195,3 +11616,7 @@ msgstr ""
 #, c-format
 msgid "Out of memory when growing buffer.\n"
 msgstr ""
+
+#, fuzzy
+#~ msgid "execvp failed"
+#~ msgstr "查找失败"
diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am
index 88439f2b..13d45c85 100644
--- a/schedutils/Makefile.am
+++ b/schedutils/Makefile.am
@@ -14,6 +14,7 @@ endif
 
 if HAVE_SCHED_GETAFFINITY
 usrbin_exec_PROGRAMS += taskset
+taskset_SOURCES = taskset.c $(top_srcdir)/lib/cpuset.c
 dist_man_MANS += taskset.1
 endif
 
diff --git a/schedutils/chrt.1 b/schedutils/chrt.1
index 9016cfef..d903df24 100644
--- a/schedutils/chrt.1
+++ b/schedutils/chrt.1
@@ -25,7 +25,7 @@
 .\" 2002-05-11 Robert Love <rml@tech9.net>
 .\" 	Initial version
 .\"
-.TH CHRT "1" "Apr 2003" "schedutils" "Linux User's Manual"
+.TH CHRT "1" "June 2010" "schedutils" "Linux User's Manual"
 .SH NAME
 chrt \- manipulate real-time attributes of a process
 .SH SYNOPSIS
@@ -40,7 +40,7 @@ chrt \- manipulate real-time attributes of a process
 .SH DESCRIPTION
 .PP
 .BR chrt (1)
-sets or retrieves the real-time scheduling attributes of an existing PID or
+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_OTHER ,
 .BR SCHED_FIFO ,
@@ -74,15 +74,6 @@ set scheduling policy to
 set scheduling policy to
 .BR SCHED_FIFO
 .TP
-.B -R, --reset-on-fork
-add
-.B SCHED_RESET_ON_FORK
-flag to the
-.B SCHED_FIFO
-or
-.B SCHED_RR
-scheduling policy (Linux specific)
-.TP
 .B -i, --idle
 set schedulng policy to
 .BR SCHED_IDLE
@@ -100,11 +91,23 @@ set scheduling policy to
 .BR SCHED_RR
 (the default)
 .TP
+.B -R, --reset-on-fork
+add
+.B SCHED_RESET_ON_FORK
+flag to the
+.B SCHED_FIFO
+or
+.B SCHED_RR
+scheduling policy (Linux specific)
+.TP
+.B -v, --verbose
+show status information
+.TP
 .B -h, --help
 display usage information and exit
 .TP
-.B -v, --version
-output version information and exit
+.B -V, --version
+display version information and exit
 .SH USAGE
 .TP
 The default behavior is to run a new command::
diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index 0ff9b9bb..2d0254fa 100644
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -54,31 +54,40 @@
 
 static void show_usage(int rc)
 {
-	fprintf(stdout, _(
-	"\nchrt - manipulate real-time attributes of a process.\n"
+	FILE *out = rc == EXIT_SUCCESS ? stdout : stderr;
+
+	fprintf(out, _(
+	"\nchrt - manipulate real-time attributes of a process\n"
 	"\nSet policy:\n"
 	"  chrt [options] <policy> <priority> {<pid> | <command> [<arg> ...]}\n"
 	"\nGet policy:\n"
-	"  chrt [options] {<pid> | <command> [<arg> ...]}\n\n"
+	"  chrt [options] {<pid> | <command> [<arg> ...]}\n"));
+
+	fprintf(out, _(
 	"\nScheduling policies:\n"
 	"  -b | --batch         set policy to SCHED_BATCH\n"
 	"  -f | --fifo          set policy to SCHED_FIFO\n"
 	"  -i | --idle          set policy to SCHED_IDLE\n"
 	"  -o | --other         set policy to SCHED_OTHER\n"
-	"  -r | --rr            set policy to SCHED_RR (default)\n"
+	"  -r | --rr            set policy to SCHED_RR (default)\n"));
+
+#ifdef SCHED_RESET_ON_FORK
+	fprintf(out, _(
 	"\nScheduling flags:\n"
-	"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+	"  -R | --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"));
+#endif
+	fprintf(out, _(
 	"\nOptions:\n"
 	"  -h | --help          display this help\n"
-	"  -p | --pid           operate on existing given pid\n"
 	"  -m | --max           show min and max valid priorities\n"
+	"  -p | --pid           operate on existing given pid\n"
 	"  -v | --verbose       display status information\n"
 	"  -V | --version       output version information\n\n"));
 
 	exit(rc);
 }
 
-static void show_rt_info(const char *what, pid_t pid)
+static void show_rt_info(pid_t pid, int isnew)
 {
 	struct sched_param sp;
 	int policy;
@@ -91,7 +100,11 @@ static void show_rt_info(const char *what, pid_t pid)
 	if (policy == -1)
 		err(EXIT_FAILURE, _("failed to get pid %d's policy"), pid);
 
-	printf(_("pid %d's %s scheduling policy: "), pid, what);
+	if (isnew)
+		printf(_("pid %d's new scheduling policy: "), pid);
+	else
+		printf(_("pid %d's current scheduling policy: "), pid);
+
 	switch (policy) {
 	case SCHED_OTHER:
 		printf("SCHED_OTHER\n");
@@ -99,9 +112,11 @@ static void show_rt_info(const char *what, pid_t pid)
 	case SCHED_FIFO:
 		printf("SCHED_FIFO\n");
 		break;
+#ifdef SCHED_RESET_ON_FORK
 	case SCHED_FIFO|SCHED_RESET_ON_FORK:
 		printf("SCHED_FIFO|SCHED_RESET_ON_FORK\n");
 		break;
+#endif
 #ifdef SCHED_IDLE
 	case SCHED_IDLE:
 		printf("SCHED_IDLE\n");
@@ -110,9 +125,11 @@ static void show_rt_info(const char *what, pid_t pid)
 	case SCHED_RR:
 		printf("SCHED_RR\n");
 		break;
+#ifdef SCHED_RESET_ON_FORK
 	case SCHED_RR|SCHED_RESET_ON_FORK:
 		printf("SCHED_RR|SCHED_RESET_ON_FORK\n");
 		break;
+#endif
 #ifdef SCHED_BATCH
 	case SCHED_BATCH:
 		printf("SCHED_BATCH\n");
@@ -125,8 +142,12 @@ static void show_rt_info(const char *what, pid_t pid)
 	if (sched_getparam(pid, &sp))
 		err(EXIT_FAILURE, _("failed to get pid %d's attributes"), pid);
 
-	printf(_("pid %d's %s scheduling priority: %d\n"),
-		pid, what, sp.sched_priority);
+	if (isnew)
+		printf(_("pid %d's new scheduling priority: %d\n"),
+		       pid, sp.sched_priority);
+	else
+		printf(_("pid %d's current scheduling priority: %d\n"),
+		       pid, sp.sched_priority);
 }
 
 static void show_min_max(void)
@@ -199,9 +220,11 @@ int main(int argc, char *argv[])
 		case 'f':
 			policy = SCHED_FIFO;
 			break;
+#ifdef SCHED_RESET_ON_FORK
 		case 'R':
 			policy_flag |= SCHED_RESET_ON_FORK;
 			break;
+#endif
 		case 'i':
 #ifdef SCHED_IDLE
 			policy = SCHED_IDLE;
@@ -239,7 +262,7 @@ int main(int argc, char *argv[])
 		show_usage(EXIT_FAILURE);
 
 	if ((pid > -1) && (verbose || argc - optind == 1)) {
-		show_rt_info(_("current"), pid);
+		show_rt_info(pid, FALSE);
 		if (argc - optind == 1)
 			return EXIT_SUCCESS;
 	}
@@ -249,11 +272,13 @@ int main(int argc, char *argv[])
 	if (errno)
 		err(EXIT_FAILURE, _("failed to parse priority"));
 
+#ifdef SCHED_RESET_ON_FORK
 	/* sanity check */
 	if ((policy_flag & SCHED_RESET_ON_FORK) &&
 	    !(policy == SCHED_FIFO || policy == SCHED_RR))
 		errx(EXIT_FAILURE, _("SCHED_RESET_ON_FORK flag is suppoted for "
 				"SCHED_FIFO and SCHED_RR policies only"));
+#endif
 
 	policy |= policy_flag;
 
@@ -264,7 +289,7 @@ int main(int argc, char *argv[])
 		err(EXIT_FAILURE, _("failed to set pid %d's policy"), pid);
 
 	if (verbose)
-		show_rt_info(_("new"), pid);
+		show_rt_info(pid, TRUE);
 
 	if (!pid) {
 		argv += optind + 1;
diff --git a/schedutils/taskset.c b/schedutils/taskset.c
index 7abb9cbb..2f1bc745 100644
--- a/schedutils/taskset.c
+++ b/schedutils/taskset.c
@@ -1,14 +1,6 @@
 /*
- * 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/
+ * taskset.c - command-line utility for setting and retrieving
+ *             a task's 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
@@ -24,6 +16,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * Copyright (C) 2004 Robert Love
+ * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
  */
 
 #include <stdio.h>
@@ -34,308 +27,50 @@
 #include <errno.h>
 #include <string.h>
 #include <ctype.h>
-#include <sys/syscall.h>
-
-struct bitmask {
-	unsigned int size;
-	unsigned long *maskp;
-};
-
-static void show_usage(const char *cmd)
-{
-	fprintf(stderr, "taskset (%s)\n", PACKAGE_STRING);
-	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;
-}
-
-/*
- * The following bitmask declarations, bitmask_*() routines, and associated
- * _setbit() and _getbit() routines are:
- * Copyright (c) 2004 Silicon Graphics, Inc. (SGI) All rights reserved.
- * SGI publishes it under the terms of the GNU General Public License, v2,
- * as published by the Free Software Foundation.
- */
-#define howmany(x,y) (((x)+((y)-1))/(y))
-#define bitsperlong (8 * sizeof(unsigned long))
-#define longsperbits(n) howmany(n, bitsperlong)
-#define bytesperbits(x) ((x+7)/8)
-
-static unsigned int _getbit(const struct bitmask *bmp, unsigned int n)
-{
-	if (n < bmp->size)
-		return (bmp->maskp[n/bitsperlong] >> (n % bitsperlong)) & 1;
-	else
-		return 0;
-}
-
-static void _setbit(struct bitmask *bmp, unsigned int n, unsigned int v)
-{
-	if (n < bmp->size) {
-		if (v)
-			bmp->maskp[n/bitsperlong] |= 1UL << (n % bitsperlong);
-		else
-			bmp->maskp[n/bitsperlong] &= ~(1UL << (n % bitsperlong));
-	}
-}
-
-int bitmask_isbitset(const struct bitmask *bmp, unsigned int i)
-{
-	return _getbit(bmp, i);
-}
-
-struct bitmask *bitmask_clearall(struct bitmask *bmp)
-{
-	unsigned int i;
-	for (i = 0; i < bmp->size; i++)
-		_setbit(bmp, i, 0);
-	return bmp;
-}
-
-struct bitmask *bitmask_setbit(struct bitmask *bmp, unsigned int i)
-{
-	_setbit(bmp, i, 1);
-	return bmp;
-}
-
-unsigned int bitmask_nbytes(struct bitmask *bmp)
-{
-	return longsperbits(bmp->size) * sizeof(unsigned long);
-}
-
-static char * cpuset_to_str(struct bitmask *mask, char *str)
-{
-	int base;
-	char *ptr = str;
-	char *ret = 0;
-
-	for (base = mask->size - 4; base >= 0; base -= 4) {
-		char val = 0;
-		if (bitmask_isbitset(mask, base))
-			val |= 1;
-		if (bitmask_isbitset(mask, base + 1))
-			val |= 2;
-		if (bitmask_isbitset(mask, base + 2))
-			val |= 4;
-		if (bitmask_isbitset(mask, base + 3))
-			val |= 8;
-		if (!ret && val)
-			ret = ptr;
-		*ptr++ = val_to_char(val);
-	}
-	*ptr = 0;
-	return ret ? ret : ptr - 1;
-}
-
-struct bitmask *bitmask_alloc(unsigned int n)
-{
-	struct bitmask *bmp;
-
-	bmp = malloc(sizeof(*bmp));
-	if (!bmp)
-		return 0;
-	bmp->size = n;
-	bmp->maskp = calloc(longsperbits(n), sizeof(unsigned long));
-	if (!bmp->maskp) {
-		free(bmp);
-		return 0;
-	}
-	return bmp;
-}
-
-static char * cpuset_to_cstr(struct bitmask *mask, char *str)
-{
-	int i;
-	char *ptr = str;
-	int entry_made = 0;
-
-	for (i = 0; i < mask->size; i++) {
-		if (bitmask_isbitset(mask, i)) {
-			int j;
-			int run = 0;
-			entry_made = 1;
-			for (j = i + 1; j < mask->size; j++) {
-				if (bitmask_isbitset(mask, j))
-					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(struct bitmask *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;
-
-	bitmask_clearall(mask);
-	while (ptr >= str) {
-		char val = char_to_val(*ptr);
-		if (val == (char) -1)
-			return -1;
-		if (val & 1)
-			bitmask_setbit(mask, base);
-		if (val & 2)
-			bitmask_setbit(mask, base + 1);
-		if (val & 4)
-			bitmask_setbit(mask, base + 2);
-		if (val & 8)
-			bitmask_setbit(mask, base + 3);
-		len--;
-		ptr--;
-		base += 4;
-	}
+#include <err.h>
 
-	return 0;
-}
-
-static const char *nexttoken(const char *q,  int sep)
-{
-	if (q)
-		q = strchr(q, sep);
-	if (q)
-		q++;
-	return q;
-}
+#include "cpuset.h"
+#include "nls.h"
 
-static int cstr_to_cpuset(struct bitmask *mask, const char* str)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
-	const char *p, *q;
-	q = str;
-	bitmask_clearall(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;
+	fprintf(out,
+		_("Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n\n"),
+		program_invocation_short_name);
 
-		if (sscanf(p, "%u", &a) < 1)
-			return 1;
-		b = a;
-		s = 1;
+	fprintf(out, _(
+		"Options:\n"
+		" -p, --pid               operate on existing given pid\n"
+		" -c, --cpu-list          display and specify cpus in list format\n"
+		" -h, --help              display this help\n"
+		" -V, --version           output version information\n\n"));
 
-		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;
-			}
-		}
+	fprintf(out, _(
+		"The default behavior is to run a new command:\n"
+		"    %1$s 03 sshd -b 1024\n"
+		"You can retrieve the mask of an existing task:\n"
+		"    %1$s -p 700\n"
+		"Or set it:\n"
+		"    %1$s -p 03 700\n"
+		"List format uses a comma-separated list instead of a mask:\n"
+		"    %1$s -pc 0,3,7-11 700\n"
+		"Ranges in list format can take a stride argument:\n"
+		"    e.g. 0-31:2 is equivalent to mask 0x55555555\n"),
+		program_invocation_short_name);
 
-		if (!(a <= b))
-			return 1;
-		while (a <= b) {
-			bitmask_setbit(mask, a);
-			a += s;
-		}
-	}
+	fprintf(out, _("\nFor more information see taskset(1).\n"));
 
-	return 0;
-}
-
-/*
- * Number of bits in a CPU bitmask on current system
- */
-static int
-max_number_of_cpus(void)
-{
-	int n;
-	int cpus = 2048;
-
-	for (;;) {
-		unsigned long buffer[longsperbits(cpus)];
-		memset(buffer, 0, sizeof(buffer));
-		/* the library version does not return size of cpumask_t */
-		n = syscall(SYS_sched_getaffinity, 0, bytesperbits(cpus),
-								&buffer);
-		if (n < 0 && errno == EINVAL && cpus < 1024*1024) {
-			cpus *= 2;
-			continue;
-		}
-		return n*8;
-	}
-	fprintf (stderr, "cannot determine NR_CPUS; aborting");
-	exit(1);
-	return 0;
+	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
 int main(int argc, char *argv[])
 {
-	struct bitmask *new_mask, *cur_mask;
+	cpu_set_t *new_set, *cur_set;
 	pid_t pid = 0;
-	int opt, err;
-	char *mstr;
-	char *cstr;
-	int c_opt = 0;
-        unsigned int cpus_configured;
-	int new_mask_byte_size, cur_mask_byte_size;
+	int opt, c_opt = 0, rc;
+	char *buf;
+        unsigned int ncpus;
+	size_t new_setsize, cur_setsize, cur_nbits, buflen;
 
 	struct option longopts[] = {
 		{ "pid",	0, NULL, 'p' },
@@ -345,9 +80,11 @@ int main(int argc, char *argv[])
 		{ NULL,		0, NULL, 0 }
 	};
 
-	while ((opt = getopt_long(argc, argv, "+pchV", longopts, NULL)) != -1) {
-		int ret = 1;
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
 
+	while ((opt = getopt_long(argc, argv, "+pchV", longopts, NULL)) != -1) {
 		switch (opt) {
 		case 'p':
 			pid = atoi(argv[argc - 1]);
@@ -357,111 +94,94 @@ int main(int argc, char *argv[])
 			break;
 		case 'V':
 			printf("taskset (%s)\n", PACKAGE_STRING);
-			return 0;
+			return EXIT_SUCCESS;
 		case 'h':
-			ret = 0;
+			usage(stdout);
+			break;
 		default:
-			show_usage(argv[0]);
-			return ret;
+			usage(stderr);
+			break;
 		}
 	}
 
 	if ((!pid && argc - optind < 2)
-			|| (pid && (argc - optind < 1 || argc - optind > 2))) {
-		show_usage(argv[0]);
-		return 1;
-	}
+			|| (pid && (argc - optind < 1 || argc - optind > 2)))
+		usage(stderr);
 
-	cpus_configured = max_number_of_cpus();
+	ncpus = get_max_number_of_cpus();
+	if (ncpus <= 0)
+		errx(EXIT_FAILURE, _("cannot determine NR_CPUS; aborting"));
 
 	/*
-	 * cur_mask is always used for the sched_getaffinity call
+	 * cur_set is always used for the sched_getaffinity call
 	 * On the sched_getaffinity the kernel demands a user mask of
 	 * at least the size of its own cpumask_t.
 	 */
-	cur_mask = bitmask_alloc(cpus_configured);
-	if (!cur_mask) {
-		fprintf (stderr, "bitmask_alloc failed\n");
-		exit(1);
-	}
-	cur_mask_byte_size = bitmask_nbytes(cur_mask);
-	mstr = malloc(1 + cur_mask->size / 4);
-	cstr = malloc(7 * cur_mask->size);
+	cur_set = cpuset_alloc(ncpus, &cur_setsize, &cur_nbits);
+	if (!cur_set)
+		err(EXIT_FAILURE, _("cpuset_alloc failed"));
+
+	buflen = 7 * cur_nbits;
+	buf = malloc(buflen);
+	if (!buf)
+		err(EXIT_FAILURE, _("malloc failed"));
 
 	/*
-	 * new_mask is always used for the sched_setaffinity call
+	 * new_set is always used for the sched_setaffinity call
 	 * On the sched_setaffinity the kernel will zero-fill its
 	 * cpumask_t if the user's mask is shorter.
 	 */
-	new_mask = bitmask_alloc(cpus_configured);
-	if (!new_mask) {
-		fprintf (stderr, "bitmask_alloc failed\n");
-		exit(1);
-	}
-	new_mask_byte_size = bitmask_nbytes(new_mask);
+	new_set = cpuset_alloc(ncpus, &new_setsize, NULL);
+	if (!new_set)
+		err(EXIT_FAILURE, _("cpuset_alloc failed"));
 
 	if (pid) {
-		if (sched_getaffinity(pid, cur_mask_byte_size,
-					(cpu_set_t *)cur_mask->maskp) < 0) {
-			perror("sched_getaffinity");
-			fprintf(stderr, "failed to get pid %d's affinity\n",
-				pid);
-			return 1;
-		}
+		if (sched_getaffinity(pid, cur_setsize, cur_set) < 0)
+			err(EXIT_FAILURE, _("failed to get pid %d's affinity"), pid);
+
 		if (c_opt)
-			printf("pid %d's current affinity list: %s\n", pid,
-				cpuset_to_cstr(cur_mask, cstr));
+			printf(_("pid %d's current affinity list: %s\n"), pid,
+				cpulist_create(buf, buflen, cur_set, cur_setsize));
 		else
-			printf("pid %d's current affinity mask: %s\n", pid,
-				cpuset_to_str(cur_mask, mstr));
+			printf(_("pid %d's current affinity mask: %s\n"), pid,
+				cpumask_create(buf, buflen, cur_set, cur_setsize));
 
 		if (argc - optind == 1)
-			return 0;
+			return EXIT_SUCCESS;
 	}
 
-	if (c_opt)
-		err = cstr_to_cpuset(new_mask, argv[optind]);
-	else
-		err = str_to_cpuset(new_mask, argv[optind]);
+	rc = c_opt ? cpulist_parse(argv[optind], new_set, new_setsize) :
+		     cpumask_parse(argv[optind], new_set, new_setsize);
 
-	if (err) {
-		if (c_opt)
-			fprintf(stderr, "failed to parse CPU list %s\n",
+	if (rc)
+		errx(EXIT_FAILURE, _("failed to parse %s %s"),
+				c_opt ? _("CPU list") : _("CPU mask"),
 				argv[optind]);
-		else
-			fprintf(stderr, "failed to parse CPU mask %s\n",
-				argv[optind]);
-		return 1;
-	}
 
-	if (sched_setaffinity(pid, new_mask_byte_size,
-					(cpu_set_t *) new_mask->maskp) < 0) {
-		perror("sched_setaffinity");
-		fprintf(stderr, "failed to set pid %d's affinity.\n", pid);
-		return 1;
-	}
+	if (sched_setaffinity(pid, new_setsize, new_set) < 0)
+		err(EXIT_FAILURE, _("failed to set pid %d's affinity"), pid);
 
-	if (sched_getaffinity(pid, cur_mask_byte_size,
-					(cpu_set_t *)cur_mask->maskp) < 0) {
-		perror("sched_getaffinity");
-		fprintf(stderr, "failed to get pid %d's affinity.\n", pid);
-		return 1;
-	}
+	if (sched_getaffinity(pid, cur_setsize, cur_set) < 0)
+		err(EXIT_FAILURE, _("failed to get pid %d's affinity"), pid);
 
 	if (pid) {
 		if (c_opt)
-			printf("pid %d's new affinity list: %s\n", pid, 
-		               cpuset_to_cstr(cur_mask, cstr));
+			printf(_("pid %d's new affinity list: %s\n"), pid,
+				cpulist_create(buf, buflen, cur_set, cur_setsize));
 		else
-			printf("pid %d's new affinity mask: %s\n", pid, 
-		               cpuset_to_str(cur_mask, mstr));
-	} else {
+			printf(_("pid %d's new affinity mask: %s\n"), pid,
+				cpumask_create(buf, buflen, cur_set, cur_setsize));
+	}
+
+	free(buf);
+	cpuset_free(cur_set);
+	cpuset_free(new_set);
+
+	if (!pid) {
 		argv += optind + 1;
 		execvp(argv[0], argv);
-		perror("execvp");
-		fprintf(stderr, "failed to execute %s\n", argv[0]);
-		return 1;
+		err(EXIT_FAILURE, _("executing %s failed"), argv[0]);
 	}
 
-	return 0;
+	return EXIT_SUCCESS;
 }
diff --git a/shlibs/Makefile.am b/shlibs/Makefile.am
deleted file mode 100644
index 3e757885..00000000
--- a/shlibs/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS =
-
-if BUILD_LIBUUID
-SUBDIRS += uuid
-endif
-
-if BUILD_LIBBLKID
-SUBDIRS += blkid
-endif
diff --git a/shlibs/blkid/Makefile.am b/shlibs/blkid/Makefile.am
index 041fa79b..59362cfe 100644
--- a/shlibs/blkid/Makefile.am
+++ b/shlibs/blkid/Makefile.am
@@ -12,5 +12,5 @@ pkgconfig_DATA = blkid.pc
 
 dist_man_MANS = libblkid.3
 
-EXTRA_DIST = README.blkid blkid.pc.in libblkid.3
+EXTRA_DIST = COPYING.libblkid README.blkid blkid.pc.in libblkid.3
 
diff --git a/shlibs/blkid/libblkid.3 b/shlibs/blkid/libblkid.3
index 46eb868b..ab4c5736 100644
--- a/shlibs/blkid/libblkid.3
+++ b/shlibs/blkid/libblkid.3
@@ -9,7 +9,7 @@
 .SH NAME
 libblkid \- block device identification library
 .SH SYNOPSIS
-.B #include <blkid/blkid.h>
+.B #include <blkid.h>
 .sp
 .B cc
 .I file.c
diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index 2d798b6a..bb395c71 100644
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -24,14 +24,15 @@ nodist_blkidinc_HEADERS = blkid.h
 usrlib_exec_LTLIBRARIES = libblkid.la
 libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c  \
 		     probe.c read.c resolve.c save.c tag.c version.c verify.c \
-		     encode.c list.h blkidP.h superblocks/superblocks.h \
+		     encode.c blkidP.h superblocks/superblocks.h \
 		     config.c evaluate.c fat.h \
 		     $(blkidinc_HEADERS) \
 		     $(top_srcdir)/lib/blkdev.c \
 		     $(top_srcdir)/lib/linux_version.c \
 		     $(top_srcdir)/lib/canonicalize.c \
 		     $(top_srcdir)/lib/md5.c \
-		     $(top_srcdir)/lib/crc32.c
+		     $(top_srcdir)/lib/crc32.c \
+		     $(top_srcdir)/include/list.h
 
 nodist_libblkid_la_SOURCES = blkid.h
 
@@ -45,7 +46,7 @@ libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym blkid.h.in
 libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
                       -version-info $(LIBBLKID_VERSION_INFO)
 
-tests = test_cache test_config test_dev test_devname test_devno test_getsize \
+tests = test_cache test_config test_dev test_devname test_devno \
 	test_read test_resolve test_save test_tag test_verify test_evaluate
 
 EXTRA_DIST = blkid.sym tst_types.c blkid.h.in
diff --git a/shlibs/blkid/src/partitions/partitions.c b/shlibs/blkid/src/partitions/partitions.c
index c670cc18..5597181a 100644
--- a/shlibs/blkid/src/partitions/partitions.c
+++ b/shlibs/blkid/src/partitions/partitions.c
@@ -829,6 +829,19 @@ int blkid_probe_is_covered_by_pt(blkid_probe pr,
 	end = (offset + size) >> 9;
 	start = offset >> 9;
 
+	/* check if the partition table fits into the device */
+	for (i = 0; i < nparts; i++) {
+		blkid_partition par = &ls->parts[i];
+
+		if (par->start + par->size > pr->size) {
+			DBG(DEBUG_LOWPROBE, printf("partition #%d overflows "
+					"device (off=%lu size=%lu)\n",
+					par->partno, par->start, par->size));
+			goto done;
+		}
+	}
+
+	/* check if the requested area is covered by PT */
 	for (i = 0; i < nparts; i++) {
 		blkid_partition par = &ls->parts[i];
 
diff --git a/shlibs/blkid/src/probe.c b/shlibs/blkid/src/probe.c
index 89c59504..200a52c5 100644
--- a/shlibs/blkid/src/probe.c
+++ b/shlibs/blkid/src/probe.c
@@ -103,6 +103,7 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
 
@@ -542,7 +543,7 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
 
 static void blkid_probe_reset_buffer(blkid_probe pr)
 {
-	ssize_t	read_ct = 0, len_ct = 0;
+	uint64_t read_ct = 0, len_ct = 0;
 
 	if (!pr || list_empty(&pr->buffers))
 		return;
@@ -560,7 +561,8 @@ static void blkid_probe_reset_buffer(blkid_probe pr)
 	}
 
 	DBG(DEBUG_LOWPROBE,
-		printf("buffers summary: %jd bytes by %jd read() call(s)\n",
+		printf("buffers summary: %"PRIu64" bytes "
+			"by %"PRIu64" read() call(s)\n",
 			len_ct, read_ct));
 
 	INIT_LIST_HEAD(&pr->buffers);
@@ -650,9 +652,6 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
 		pr->size -= pr->off;
 	}
 
-	DBG(DEBUG_LOWPROBE, printf("ready for low-probing, offset=%jd, size=%jd\n",
-				pr->off, pr->size));
-
 	if (pr->size <= 1440 * 1024 && !S_ISCHR(sb.st_mode))
 		pr->flags |= BLKID_TINY_DEV;
 
@@ -660,6 +659,13 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
 	if (S_ISBLK(sb.st_mode) && ioctl(fd, CDROM_GET_CAPABILITY, NULL) >= 0)
 		pr->flags |= BLKID_CDROM_DEV;
 #endif
+
+	DBG(DEBUG_LOWPROBE, printf("ready for low-probing, offset=%jd, size=%jd\n",
+				pr->off, pr->size));
+	DBG(DEBUG_LOWPROBE, printf("whole-disk: %s, regfile: %s\n",
+		blkid_probe_is_wholedisk(pr) ?"YES" : "NO",
+		S_ISREG(pr->mode) ? "YES" : "NO"));
+
 	return 0;
 err:
 	DBG(DEBUG_LOWPROBE,
diff --git a/shlibs/blkid/src/superblocks/Makefile.am b/shlibs/blkid/src/superblocks/Makefile.am
index f5b88b8e..1501fab1 100644
--- a/shlibs/blkid/src/superblocks/Makefile.am
+++ b/shlibs/blkid/src/superblocks/Makefile.am
@@ -46,4 +46,6 @@ libblkid_superblocks_la_SOURCES = \
 			bfs.c \
 			drbd.c \
 			vmfs.c \
-			befs.c
+			befs.c \
+			nilfs.c \
+			exfat.c
diff --git a/shlibs/blkid/src/superblocks/adaptec_raid.c b/shlibs/blkid/src/superblocks/adaptec_raid.c
index 73b146c6..570e75e9 100644
--- a/shlibs/blkid/src/superblocks/adaptec_raid.c
+++ b/shlibs/blkid/src/superblocks/adaptec_raid.c
@@ -81,6 +81,9 @@ static int probe_adraid(blkid_probe pr, const struct blkid_idmag *mag)
 	if (pr->size < 0x10000)
 		return -1;
 
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
+
 	off = ((pr->size / 0x200)-1) * 0x200;
 	ad = (struct adaptec_metadata *)
 			blkid_probe_get_buffer(pr,
diff --git a/shlibs/blkid/src/superblocks/ddf_raid.c b/shlibs/blkid/src/superblocks/ddf_raid.c
index a48735d2..c0ba3351 100644
--- a/shlibs/blkid/src/superblocks/ddf_raid.c
+++ b/shlibs/blkid/src/superblocks/ddf_raid.c
@@ -18,12 +18,57 @@
 /* http://www.snia.org/standards/home */
 #define DDF_GUID_LENGTH			24
 #define DDF_REV_LENGTH			8
+#define DDF_MAGIC			0xDE11DE11
+
 
 struct ddf_header {
-	uint8_t		signature[4];
+	uint32_t	signature;
 	uint32_t	crc;
 	uint8_t		guid[DDF_GUID_LENGTH];
-	uint8_t		ddf_rev[DDF_REV_LENGTH];
+	char		ddf_rev[8];	/* 01.02.00 */
+	uint32_t	seq;		/* starts at '1' */
+	uint32_t	timestamp;
+	uint8_t		openflag;
+	uint8_t		foreignflag;
+	uint8_t		enforcegroups;
+	uint8_t		pad0;		/* 0xff */
+	uint8_t		pad1[12];	/* 12 * 0xff */
+	/* 64 bytes so far */
+	uint8_t		header_ext[32];	/* reserved: fill with 0xff */
+	uint64_t	primary_lba;
+	uint64_t	secondary_lba;
+	uint8_t		type;
+	uint8_t		pad2[3];	/* 0xff */
+	uint32_t	workspace_len;	/* sectors for vendor space -
+					 * at least 32768(sectors) */
+	uint64_t	workspace_lba;
+	uint16_t	max_pd_entries;	/* one of 15, 63, 255, 1023, 4095 */
+	uint16_t	max_vd_entries; /* 2^(4,6,8,10,12)-1 : i.e. as above */
+	uint16_t	max_partitions; /* i.e. max num of configuration
+					   record entries per disk */
+	uint16_t	config_record_len; /* 1 +ROUNDUP(max_primary_element_entries
+				           *12/512) */
+	uint16_t	max_primary_element_entries; /* 16, 64, 256, 1024, or 4096 */
+	uint8_t		pad3[54];	/* 0xff */
+	/* 192 bytes so far */
+	uint32_t	controller_section_offset;
+	uint32_t	controller_section_length;
+	uint32_t	phys_section_offset;
+	uint32_t	phys_section_length;
+	uint32_t	virt_section_offset;
+	uint32_t	virt_section_length;
+	uint32_t	config_section_offset;
+	uint32_t	config_section_length;
+	uint32_t	data_section_offset;
+	uint32_t	data_section_length;
+	uint32_t	bbm_section_offset;
+	uint32_t	bbm_section_length;
+	uint32_t	diag_space_offset;
+	uint32_t	diag_space_length;
+	uint32_t	vendor_offset;
+	uint32_t	vendor_length;
+	/* 256 bytes so far */
+	uint8_t		pad4[256];	/* 0xff */
 } __attribute__((packed));
 
 static int probe_ddf(blkid_probe pr, const struct blkid_idmag *mag)
@@ -32,7 +77,7 @@ static int probe_ddf(blkid_probe pr, const struct blkid_idmag *mag)
 	int i;
 	struct ddf_header *ddf = NULL;
 	char version[DDF_REV_LENGTH + 1];
-	uint64_t off;
+	uint64_t off, lba;
 
 	if (pr->size < 0x30000)
 		return -1;
@@ -46,8 +91,8 @@ static int probe_ddf(blkid_probe pr, const struct blkid_idmag *mag)
 		if (!ddf)
 			return -1;
 
-		if (memcmp(ddf->signature, "\x11\xde\x11\xde", 4) == 0 ||
-	            memcmp(ddf->signature, "\xde\x11\xde\x11", 4) == 0)
+		if (ddf->signature == cpu_to_be32(DDF_MAGIC) ||
+		    ddf->signature == cpu_to_le32(DDF_MAGIC))
 			break;
 		ddf = NULL;
 	}
@@ -55,6 +100,20 @@ static int probe_ddf(blkid_probe pr, const struct blkid_idmag *mag)
 	if (!ddf)
 		return -1;
 
+	lba = ddf->signature == cpu_to_be32(DDF_MAGIC) ?
+			be64_to_cpu(ddf->primary_lba) :
+			le64_to_cpu(ddf->primary_lba);
+
+	if (lba > 0) {
+		/* check primary header */
+		unsigned char *buf;
+
+		buf = blkid_probe_get_buffer(pr,
+					lba << 9, sizeof(ddf->signature));
+		if (!buf || memcmp(buf, &ddf->signature, 4))
+			return -1;
+	}
+
 	blkid_probe_strncpy_uuid(pr, ddf->guid, sizeof(ddf->guid));
 
 	memcpy(version, ddf->ddf_rev, sizeof(ddf->ddf_rev));
@@ -64,7 +123,7 @@ static int probe_ddf(blkid_probe pr, const struct blkid_idmag *mag)
 		return -1;
 	if (blkid_probe_set_magic(pr, off,
 			sizeof(ddf->signature),
-			(unsigned char *) ddf->signature))
+			(unsigned char *) &ddf->signature))
 		return -1;
 	return 0;
 }
diff --git a/shlibs/blkid/src/superblocks/exfat.c b/shlibs/blkid/src/superblocks/exfat.c
new file mode 100644
index 00000000..bada3a83
--- /dev/null
+++ b/shlibs/blkid/src/superblocks/exfat.c
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2010 Andrew Nayenko <resver@gmail.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+#include "superblocks.h"
+
+struct exfat_super_block {
+	uint8_t jump[3];
+	uint8_t oem_name[8];
+	uint8_t	__unused1[53];
+	uint64_t block_start;
+	uint64_t block_count;
+	uint32_t fat_block_start;
+	uint32_t fat_block_count;
+	uint32_t cluster_block_start;
+	uint32_t cluster_count;
+	uint32_t rootdir_cluster;
+	uint8_t volume_serial[4];
+	struct {
+		uint8_t minor;
+		uint8_t major;
+	} version;
+	uint16_t volume_state;
+	uint8_t block_bits;
+	uint8_t bpc_bits;
+	uint8_t fat_count;
+	uint8_t drive_no;
+	uint8_t allocated_percent;
+} __attribute__((__packed__));
+
+struct exfat_entry_label {
+	uint8_t type;
+	uint8_t length;
+	uint8_t name[30];
+} __attribute__((__packed__));
+
+#define BLOCK_SIZE(sb) (1 << (sb)->block_bits)
+#define CLUSTER_SIZE(sb) (BLOCK_SIZE(sb) << (sb)->bpc_bits)
+#define EXFAT_FIRST_DATA_CLUSTER 2
+#define EXFAT_LAST_DATA_CLUSTER 0xffffff6
+#define EXFAT_ENTRY_SIZE 32
+
+#define EXFAT_ENTRY_EOD		0x00
+#define EXFAT_ENTRY_LABEL	0x83
+
+static blkid_loff_t block_to_offset(const struct exfat_super_block *sb,
+		blkid_loff_t block)
+{
+	return (blkid_loff_t) block << sb->block_bits;
+}
+
+static blkid_loff_t cluster_to_block(const struct exfat_super_block *sb,
+		uint32_t cluster)
+{
+	return le32_to_cpu(sb->cluster_block_start) +
+			((blkid_loff_t) (cluster - EXFAT_FIRST_DATA_CLUSTER)
+					<< sb->bpc_bits);
+}
+
+static blkid_loff_t cluster_to_offset(const struct exfat_super_block *sb,
+		uint32_t cluster)
+{
+	return block_to_offset(sb, cluster_to_block(sb, cluster));
+}
+
+static uint32_t next_cluster(blkid_probe pr,
+		const struct exfat_super_block *sb, uint32_t cluster)
+{
+	uint32_t *next;
+	blkid_loff_t fat_offset;
+
+	fat_offset = block_to_offset(sb, le32_to_cpu(sb->fat_block_start))
+		+ (blkid_loff_t) cluster * sizeof(cluster);
+	next = (uint32_t *) blkid_probe_get_buffer(pr, fat_offset,
+			sizeof(uint32_t));
+	if (!next)
+		return 0;
+	return le32_to_cpu(*next);
+}
+
+static struct exfat_entry_label *find_label(blkid_probe pr,
+		const struct exfat_super_block *sb)
+{
+	uint32_t cluster = le32_to_cpu(sb->rootdir_cluster);
+	blkid_loff_t offset = cluster_to_offset(sb, cluster);
+	uint8_t *entry;
+
+	for (;;) {
+		entry = (uint8_t *) blkid_probe_get_buffer(pr, offset,
+				EXFAT_ENTRY_SIZE);
+		if (!entry)
+			return NULL;
+		if (entry[0] == EXFAT_ENTRY_EOD)
+			return NULL;
+		if (entry[0] == EXFAT_ENTRY_LABEL)
+			return (struct exfat_entry_label *) entry;
+		offset += EXFAT_ENTRY_SIZE;
+		if (offset % CLUSTER_SIZE(sb) == 0) {
+			cluster = next_cluster(pr, sb, cluster);
+			if (cluster < EXFAT_FIRST_DATA_CLUSTER)
+				return NULL;
+			if (cluster > EXFAT_LAST_DATA_CLUSTER)
+				return NULL;
+			offset = cluster_to_offset(sb, cluster);
+		}
+	}
+}
+
+static int probe_exfat(blkid_probe pr, const struct blkid_idmag *mag)
+{
+	struct exfat_super_block *sb;
+	struct exfat_entry_label *label;
+
+	sb = blkid_probe_get_sb(pr, mag, struct exfat_super_block);
+	if (!sb)
+		return -1;
+
+	label = find_label(pr, sb);
+	if (label)
+		blkid_probe_set_utf8label(pr, label->name,
+				min(label->length * 2, 30), BLKID_ENC_UTF16LE);
+
+	blkid_probe_sprintf_uuid(pr, sb->volume_serial, 4,
+			"%02hhX%02hhX-%02hhX%02hhX",
+			sb->volume_serial[3], sb->volume_serial[2],
+			sb->volume_serial[1], sb->volume_serial[0]);
+
+	blkid_probe_sprintf_version(pr, "%hu.%hu",
+			sb->version.major, sb->version.minor);
+
+	return 0;
+}
+
+const struct blkid_idinfo exfat_idinfo =
+{
+	.name		= "exfat",
+	.usage		= BLKID_USAGE_FILESYSTEM,
+	.probefunc	= probe_exfat,
+	.magics		=
+	{
+		{ .magic = "EXFAT   ", .len = 8, .sboff = 3 },
+		{ NULL }
+	}
+};
diff --git a/shlibs/blkid/src/superblocks/hfs.c b/shlibs/blkid/src/superblocks/hfs.c
index 8ebff68d..033a65de 100644
--- a/shlibs/blkid/src/superblocks/hfs.c
+++ b/shlibs/blkid/src/superblocks/hfs.c
@@ -291,6 +291,7 @@ const struct blkid_idinfo hfs_idinfo =
 	.name		= "hfs",
 	.usage		= BLKID_USAGE_FILESYSTEM,
 	.probefunc	= probe_hfs,
+	.flags		= BLKID_IDINFO_TOLERANT,
 	.magics		=
 	{
 		{ .magic = "BD", .len = 2, .kboff = 1 },
diff --git a/shlibs/blkid/src/superblocks/highpoint_raid.c b/shlibs/blkid/src/superblocks/highpoint_raid.c
index 98343c41..25e3114b 100644
--- a/shlibs/blkid/src/superblocks/highpoint_raid.c
+++ b/shlibs/blkid/src/superblocks/highpoint_raid.c
@@ -30,6 +30,8 @@ static int probe_highpoint45x(blkid_probe pr, const struct blkid_idmag *mag)
 
 	if (pr->size < 0x10000)
 		return -1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
 
 	off = ((pr->size / 0x200) - 11) * 0x200;
 	hpt = (struct hpt45x_metadata *)
@@ -47,6 +49,14 @@ static int probe_highpoint45x(blkid_probe pr, const struct blkid_idmag *mag)
 	return 0;
 }
 
+static int probe_highpoint37x(blkid_probe pr, const struct blkid_idmag *mag)
+{
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
+	return 0;
+}
+
+
 const struct blkid_idinfo highpoint45x_idinfo = {
 	.name		= "hpt45x_raid_member",
 	.usage		= BLKID_USAGE_RAID,
@@ -57,6 +67,7 @@ const struct blkid_idinfo highpoint45x_idinfo = {
 const struct blkid_idinfo highpoint37x_idinfo = {
 	.name		= "hpt37x_raid_member",
 	.usage		= BLKID_USAGE_RAID,
+	.probefunc	= probe_highpoint37x,
 	.magics		= {
 		/*
 		 * Superblok offset:                      4608 bytes  (9 sectors)
diff --git a/shlibs/blkid/src/superblocks/isw_raid.c b/shlibs/blkid/src/superblocks/isw_raid.c
index 5149c38a..ac6251d7 100644
--- a/shlibs/blkid/src/superblocks/isw_raid.c
+++ b/shlibs/blkid/src/superblocks/isw_raid.c
@@ -33,6 +33,8 @@ static int probe_iswraid(blkid_probe pr, const struct blkid_idmag *mag)
 
 	if (pr->size < 0x10000)
 		return -1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
 
 	off = ((pr->size / 0x200) - 2) * 0x200;
 	isw = (struct isw_metadata *)
diff --git a/shlibs/blkid/src/superblocks/jmicron_raid.c b/shlibs/blkid/src/superblocks/jmicron_raid.c
index 24430bf9..d35b17f8 100644
--- a/shlibs/blkid/src/superblocks/jmicron_raid.c
+++ b/shlibs/blkid/src/superblocks/jmicron_raid.c
@@ -32,6 +32,8 @@ static int probe_jmraid(blkid_probe pr, const struct blkid_idmag *mag)
 
 	if (pr->size < 0x10000)
 		return -1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
 
 	off = ((pr->size / 0x200) - 1) * 0x200;
 	jm = (struct jm_metadata *)
diff --git a/shlibs/blkid/src/superblocks/linux_raid.c b/shlibs/blkid/src/superblocks/linux_raid.c
index 6f823f15..b73214a4 100644
--- a/shlibs/blkid/src/superblocks/linux_raid.c
+++ b/shlibs/blkid/src/superblocks/linux_raid.c
@@ -34,27 +34,82 @@ struct mdp0_super_block {
 	uint32_t	set_uuid3;
 };
 
+/*
+ * Version-1, little-endian.
+ */
 struct mdp1_super_block {
-	uint32_t	magic;
-	uint32_t	major_version;
-	uint32_t	feature_map;
-	uint32_t	pad0;
-	uint8_t		set_uuid[16];
-	uint8_t		set_name[32];
+	/* constant array information - 128 bytes */
+	uint32_t	magic;		/* MD_SB_MAGIC: 0xa92b4efc - little endian */
+	uint32_t	major_version;	/* 1 */
+	uint32_t	feature_map;	/* 0 for now */
+	uint32_t	pad0;		/* always set to 0 when writing */
+
+	uint8_t		set_uuid[16];	/* user-space generated. */
+	unsigned char	set_name[32];	/* set and interpreted by user-space */
+
+	uint64_t	ctime;		/* lo 40 bits are seconds, top 24 are microseconds or 0*/
+	uint32_t	level;		/* -4 (multipath), -1 (linear), 0,1,4,5 */
+	uint32_t	layout;		/* only for raid5 currently */
+	uint64_t	size;		/* used size of component devices, in 512byte sectors */
+
+	uint32_t	chunksize;	/* in 512byte sectors */
+	uint32_t	raid_disks;
+	uint32_t	bitmap_offset;	/* sectors after start of superblock that bitmap starts
+					 * NOTE: signed, so bitmap can be before superblock
+					 * only meaningful of feature_map[0] is set.
+					 */
+
+	/* These are only valid with feature bit '4' */
+	uint32_t	new_level;	/* new level we are reshaping to		*/
+	uint64_t	reshape_position;	/* next address in array-space for reshape */
+	uint32_t	delta_disks;	/* change in number of raid_disks		*/
+	uint32_t	new_layout;	/* new layout					*/
+	uint32_t	new_chunk;	/* new chunk size (bytes)			*/
+	uint8_t		pad1[128-124];	/* set to 0 when written */
+
+	/* constant this-device information - 64 bytes */
+	uint64_t	data_offset;	/* sector start of data, often 0 */
+	uint64_t	data_size;	/* sectors in this device that can be used for data */
+	uint64_t	super_offset;	/* sector start of this superblock */
+	uint64_t	recovery_offset;/* sectors before this offset (from data_offset) have been recovered */
+	uint32_t	dev_number;	/* permanent identifier of this  device - not role in raid */
+	uint32_t	cnt_corrected_read; /* number of read errors that were corrected by re-writing */
+	uint8_t		device_uuid[16]; /* user-space setable, ignored by kernel */
+        uint8_t		devflags;        /* per-device flags.  Only one defined...*/
+	uint8_t		pad2[64-57];	/* set to 0 when writing */
+
+	/* array state information - 64 bytes */
+	uint64_t	utime;		/* 40 bits second, 24 btes microseconds */
+	uint64_t	events;		/* incremented when superblock updated */
+	uint64_t	resync_offset;	/* data before this offset (from data_offset) known to be in sync */
+	uint32_t	sb_csum;	/* checksum upto dev_roles[max_dev] */
+	uint32_t	max_dev;	/* size of dev_roles[] array to consider */
+	uint8_t		pad3[64-32];	/* set to 0 when writing */
+
+	/* device state information. Indexed by dev_number.
+	 * 2 bytes per device
+	 * Note there are no per-device state flags. State information is rolled
+	 * into the 'roles' value.  If a device is spare or faulty, then it doesn't
+	 * have a meaningful role.
+	 */
+	uint16_t	dev_roles[0];	/* role in array, or 0xffff for a spare, or 0xfffe for faulty */
 };
 
+
 #define MD_RESERVED_BYTES		0x10000
 #define MD_SB_MAGIC			0xa92b4efc
 
-static int probe_raid0(blkid_probe pr, off_t off)
+static int probe_raid0(blkid_probe pr, blkid_loff_t off)
 {
 	struct mdp0_super_block *mdp0;
 	union {
 		uint32_t ints[4];
 		uint8_t bytes[16];
 	} uuid;
+	uint32_t ma, mi, pa;
+	uint64_t size;
 
-	if (pr->size < 0x10000)
+	if (pr->size < MD_RESERVED_BYTES)
 		return -1;
 	mdp0 = (struct mdp0_super_block *)
 			blkid_probe_get_buffer(pr,
@@ -72,11 +127,10 @@ static int probe_raid0(blkid_probe pr, off_t off)
 			uuid.ints[2] = swab32(mdp0->set_uuid2);
 			uuid.ints[3] = swab32(mdp0->set_uuid3);
 		}
-		if (blkid_probe_sprintf_version(pr, "%u.%u.%u",
-				le32_to_cpu(mdp0->major_version),
-				le32_to_cpu(mdp0->minor_version),
-				le32_to_cpu(mdp0->patch_version)) != 0)
-			return -1;
+		ma = le32_to_cpu(mdp0->major_version);
+		mi = le32_to_cpu(mdp0->minor_version);
+		pa = le32_to_cpu(mdp0->patch_version);
+		size = le32_to_cpu(mdp0->size);
 
 	} else if (be32_to_cpu(mdp0->md_magic) == MD_SB_MAGIC) {
 		uuid.ints[0] = mdp0->set_uuid0;
@@ -85,14 +139,41 @@ static int probe_raid0(blkid_probe pr, off_t off)
 			uuid.ints[2] = mdp0->set_uuid2;
 			uuid.ints[3] = mdp0->set_uuid3;
 		}
-		if (blkid_probe_sprintf_version(pr, "%u.%u.%u",
-				be32_to_cpu(mdp0->major_version),
-				be32_to_cpu(mdp0->minor_version),
-				be32_to_cpu(mdp0->patch_version)) != 0)
-			return -1;
+		ma = be32_to_cpu(mdp0->major_version);
+		mi = be32_to_cpu(mdp0->minor_version);
+		pa = be32_to_cpu(mdp0->patch_version);
+		size = be32_to_cpu(mdp0->size);
 	} else
-		return -1;
+		return 1;
+
+	size <<= 10;	/* convert KiB to bytes */
+
+	if (pr->size < size + MD_RESERVED_BYTES)
+		/* device is too small */
+		return 1;
+
+	if (off < size)
+		/* no space before superblock */
+		return 1;
+
+	/*
+	 * Check for collisions between RAID and partition table
+	 *
+	 * For example the superblock is at the end of the last partition, it's
+	 * the same possition as at the end of the disk...
+	 */
+	if ((S_ISREG(pr->mode) || blkid_probe_is_wholedisk(pr)) &&
+	    blkid_probe_is_covered_by_pt(pr,
+			off - size,				/* min. start  */
+			size + MD_RESERVED_BYTES)) {		/* min. length */
 
+		/* ignore this superblock, it's within any partition and
+		 * we are working with whole-disk now */
+		return 1;
+	}
+
+	if (blkid_probe_sprintf_version(pr, "%u.%u.%u", ma, mi, pa) != 0)
+		return -1;
 	if (blkid_probe_set_uuid(pr, (unsigned char *) uuid.bytes) != 0)
 		return -1;
 	if (blkid_probe_set_magic(pr, off, sizeof(mdp0->md_magic),
@@ -115,8 +196,13 @@ static int probe_raid1(blkid_probe pr, off_t off)
 		return -1;
 	if (le32_to_cpu(mdp1->major_version) != 1)
 		return -1;
+	if (le64_to_cpu(mdp1->super_offset) != off >> 9)
+		return -1;
 	if (blkid_probe_set_uuid(pr, (unsigned char *) mdp1->set_uuid) != 0)
 		return -1;
+	if (blkid_probe_set_uuid_as(pr,
+			(unsigned char *) mdp1->device_uuid, "UUID_SUB") != 0)
+		return -1;
 	if (blkid_probe_set_label(pr, mdp1->set_name,
 				sizeof(mdp1->set_name)) != 0)
 		return -1;
diff --git a/shlibs/blkid/src/superblocks/lsi_raid.c b/shlibs/blkid/src/superblocks/lsi_raid.c
index 3010eb6b..5217a009 100644
--- a/shlibs/blkid/src/superblocks/lsi_raid.c
+++ b/shlibs/blkid/src/superblocks/lsi_raid.c
@@ -30,6 +30,8 @@ static int probe_lsiraid(blkid_probe pr, const struct blkid_idmag *mag)
 
 	if (pr->size < 0x10000)
 		return -1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
 
 	off = ((pr->size / 0x200) - 1) * 0x200;
 	lsi = (struct lsi_metadata *)
diff --git a/shlibs/blkid/src/superblocks/nilfs.c b/shlibs/blkid/src/superblocks/nilfs.c
new file mode 100644
index 00000000..bf169182
--- /dev/null
+++ b/shlibs/blkid/src/superblocks/nilfs.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2010 by Jiro SEKIBA <jir@unicus.jp>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License
+ */
+#include <stddef.h>
+#include <string.h>
+
+#include "superblocks.h"
+#include "crc32.h"
+
+struct nilfs_super_block {
+	uint32_t	s_rev_level;
+	uint16_t	s_minor_rev_level;
+	uint16_t	s_magic;
+
+	uint16_t	s_bytes;
+
+	uint16_t	s_flags;
+	uint32_t	s_crc_seed;
+	uint32_t	s_sum;
+
+	uint32_t	s_log_block_size;
+
+	uint64_t	s_nsegments;
+	uint64_t	s_dev_size;
+	uint64_t	s_first_data_block;
+	uint32_t	s_blocks_per_segment;
+	uint32_t	s_r_segments_percentage;
+
+	uint64_t	s_last_cno;
+	uint64_t	s_last_pseg;
+	uint64_t	s_last_seq;
+	uint64_t	s_free_blocks_count;
+
+	uint64_t	s_ctime;
+
+	uint64_t	s_mtime;
+	uint64_t	s_wtime;
+	uint16_t	s_mnt_count;
+	uint16_t	s_max_mnt_count;
+	uint16_t	s_state;
+	uint16_t	s_errors;
+	uint64_t	s_lastcheck;
+
+	uint32_t	s_checkinterval;
+	uint32_t	s_creator_os;
+	uint16_t	s_def_resuid;
+	uint16_t	s_def_resgid;
+	uint32_t	s_first_ino;
+
+	uint16_t	s_inode_size;
+	uint16_t	s_dat_entry_size;
+	uint16_t	s_checkpoint_size;
+	uint16_t	s_segment_usage_size;
+
+	uint8_t		s_uuid[16];
+	char		s_volume_name[80];
+
+	uint32_t	s_c_interval;
+	uint32_t	s_c_block_max;
+	uint32_t	s_reserved[192];
+};
+
+/* nilfs2 magic string */
+#define NILFS_SB_MAGIC		"\x34\x34"
+/* nilfs2 super block offset */
+#define NILFS_SB_OFF		0x400
+/* nilfs2 super block offset in kB */
+#define NILFS_SB_KBOFF		(NILFS_SB_OFF >> 10)
+/* nilfs2 magic string offset within super block */
+#define NILFS_MAG_OFF		6
+
+static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag)
+{
+	struct nilfs_super_block *sb;
+	static unsigned char sum[4];
+	const int sumoff = offsetof(struct nilfs_super_block, s_sum);
+	size_t bytes;
+	uint32_t crc;
+
+	sb = blkid_probe_get_sb(pr, mag, struct nilfs_super_block);
+	if (!sb)
+		return -1;
+
+	bytes = le32_to_cpu(sb->s_bytes);
+	crc = crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff);
+	crc = crc32(crc, sum, 4);
+	crc = crc32(crc, (unsigned char *)sb + sumoff + 4, bytes - sumoff - 4);
+
+	if (crc != le32_to_cpu(sb->s_sum))
+		return -1;
+
+	if (strlen(sb->s_volume_name))
+		blkid_probe_set_label(pr, (unsigned char *) sb->s_volume_name,
+				      sizeof(sb->s_volume_name));
+
+	blkid_probe_set_uuid(pr, sb->s_uuid);
+	blkid_probe_sprintf_version(pr, "%u", le32_to_cpu(sb->s_rev_level));
+
+	return 0;
+}
+
+const struct blkid_idinfo nilfs2_idinfo =
+{
+	.name		= "nilfs2",
+	.usage		= BLKID_USAGE_FILESYSTEM,
+	.probefunc	= probe_nilfs2,
+	.magics		=
+	{
+		{
+			.magic = NILFS_SB_MAGIC,
+			.len = 2,
+			.kboff = NILFS_SB_KBOFF,
+			.sboff = NILFS_MAG_OFF
+		},
+		{ NULL }
+	}
+};
diff --git a/shlibs/blkid/src/superblocks/nvidia_raid.c b/shlibs/blkid/src/superblocks/nvidia_raid.c
index e75bec84..c3db949a 100644
--- a/shlibs/blkid/src/superblocks/nvidia_raid.c
+++ b/shlibs/blkid/src/superblocks/nvidia_raid.c
@@ -32,6 +32,8 @@ static int probe_nvraid(blkid_probe pr, const struct blkid_idmag *mag)
 
 	if (pr->size < 0x10000)
 		return -1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
 
 	off = ((pr->size / 0x200) - 2) * 0x200;
 	nv = (struct nv_metadata *)
diff --git a/shlibs/blkid/src/superblocks/promise_raid.c b/shlibs/blkid/src/superblocks/promise_raid.c
index 1cc70e65..0e91d3c2 100644
--- a/shlibs/blkid/src/superblocks/promise_raid.c
+++ b/shlibs/blkid/src/superblocks/promise_raid.c
@@ -33,6 +33,8 @@ static int probe_pdcraid(blkid_probe pr, const struct blkid_idmag *mag)
 
 	if (pr->size < 0x40000)
 		return -1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
 
 	for (i = 0; sectors[i] != 0; i++) {
 		uint64_t off;
diff --git a/shlibs/blkid/src/superblocks/silicon_raid.c b/shlibs/blkid/src/superblocks/silicon_raid.c
index 11277ad6..b72b7276 100644
--- a/shlibs/blkid/src/superblocks/silicon_raid.c
+++ b/shlibs/blkid/src/superblocks/silicon_raid.c
@@ -48,6 +48,8 @@ static int probe_silraid(blkid_probe pr, const struct blkid_idmag *mag)
 
 	if (pr->size < 0x10000)
 		return -1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
 
 	off = ((pr->size / 0x200) - 1) * 0x200;
 
diff --git a/shlibs/blkid/src/superblocks/superblocks.c b/shlibs/blkid/src/superblocks/superblocks.c
index 1d952737..3d66d98c 100644
--- a/shlibs/blkid/src/superblocks/superblocks.c
+++ b/shlibs/blkid/src/superblocks/superblocks.c
@@ -71,7 +71,6 @@
 
 static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn);
 static int superblocks_safeprobe(blkid_probe pr, struct blkid_chain *chn);
-static void superblocks_free(blkid_probe pr, void *data);
 
 static int blkid_probe_set_usage(blkid_probe pr, int usage);
 
@@ -140,7 +139,9 @@ static const struct blkid_idinfo *idinfos[] =
 	&ubifs_idinfo,
 	&bfs_idinfo,
 	&vmfs_fs_idinfo,
-	&befs_idinfo
+	&befs_idinfo,
+	&nilfs2_idinfo,
+	&exfat_idinfo
 };
 
 /*
@@ -156,23 +157,8 @@ const struct blkid_chaindrv superblocks_drv = {
 	.has_fltr     = TRUE,
 	.probe        = superblocks_probe,
 	.safeprobe    = superblocks_safeprobe,
-	.free_data    = superblocks_free
 };
 
-/*
- * Private chain data
- *
- * TODO: export this data by binary interface (see topology.c or partitions.c
- *       for more details) by blkid_probe_get_superblock() or so.
- */
-struct blkid_struct_superblock {
-	blkid_loff_t	magic_off;		/* offset of the magic string */
-	int		usage;
-};
-
-/* TODO: move to blkid.h */
-typedef struct blkid_struct_superblock *blkid_superblock;
-
 /**
  * blkid_probe_enable_superblocks:
  * @pr: probe
@@ -311,39 +297,6 @@ int blkid_known_fstype(const char *fstype)
 	return 0;
 }
 
-/* init and returns private data */
-static blkid_superblock superblocks_init_data(blkid_probe pr,
-					struct blkid_chain *chn)
-{
-	DBG(DEBUG_LOWPROBE, printf("initialize superblocks binary data\n"));
-
-	if (chn->data)
-		memset(chn->data, 0,
-			sizeof(struct blkid_struct_superblock));
-	else {
-		chn->data = calloc(1,
-				sizeof(struct blkid_struct_superblock));
-		if (!chn->data)
-			return NULL;
-	}
-	return chn->data;
-}
-
-static void superblocks_free(blkid_probe pr, void *data)
-{
-	free(data);
-}
-
-static blkid_superblock superblocks_copy_data(blkid_superblock dest,
-						blkid_superblock src)
-{
-	if (!src || !dest)
-		return NULL;
-
-	memcpy(dest, src, sizeof(struct blkid_struct_superblock));
-	return dest;
-}
-
 /*
  * The blkid_do_probe() backend.
  */
@@ -365,9 +318,6 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn)
 		 * is 1 byte */
 		goto nothing;
 
-	if (chn->binary)
-		superblocks_init_data(pr, chn);
-
 	i = chn->idx + 1;
 
 	for ( ; i < ARRAY_SIZE(idinfos); i++) {
@@ -472,44 +422,37 @@ nothing:
  */
 static int superblocks_safeprobe(blkid_probe pr, struct blkid_chain *chn)
 {
-	blkid_superblock sb = NULL;
-	struct blkid_struct_superblock sb_buff;
-
 	struct blkid_prval vals[BLKID_NVALS_SUBLKS];
 	int nvals = BLKID_NVALS_SUBLKS;
 	int idx = -1;
 	int count = 0;
 	int intol = 0;
-	int rc, bin_org = chn->binary;
-
-	chn->binary = TRUE;
+	int rc;
 
 	while ((rc = superblocks_probe(pr, chn)) == 0) {
 
-		if (blkid_probe_is_tiny(pr) && !count) {
+		if (blkid_probe_is_tiny(pr) && !count)
 			/* floppy or so -- returns the first result. */
-			chn->binary = bin_org;
 			return 0;
-		}
-		if (!count) {
-			/* save the first result */
-			nvals = blkid_probe_chain_copy_vals(pr, chn, vals, nvals);
-			idx = chn->idx;
-			if (chn->data)
-				sb = superblocks_copy_data(&sb_buff, chn->data);
-		}
+
 		count++;
 
 		if (idinfos[chn->idx]->usage & (BLKID_USAGE_RAID | BLKID_USAGE_CRYPTO))
 			break;
+
 		if (!(idinfos[chn->idx]->flags & BLKID_IDINFO_TOLERANT))
 			intol++;
-	}
 
-	chn->binary = bin_org;
+		if (count == 1) {
+			/* save the first result */
+			nvals = blkid_probe_chain_copy_vals(pr, chn, vals, nvals);
+			idx = chn->idx;
+		}
+	}
 
 	if (rc < 0)
 		return rc;		/* error */
+
 	if (count > 1 && intol) {
 		DBG(DEBUG_LOWPROBE,
 			printf("ERROR: superblocks chain: "
@@ -520,27 +463,11 @@ static int superblocks_safeprobe(blkid_probe pr, struct blkid_chain *chn)
 	if (!count)
 		return 1;		/* nothing detected */
 
-	/* restore the first result */
-	blkid_probe_chain_reset_vals(pr, chn);
-	blkid_probe_append_vals(pr, vals, nvals);
-	if (sb && chn->data)
-		superblocks_copy_data(chn->data, sb);
-	chn->idx = idx;
-
-	/*
-	 * Check for collisions between RAID and partition table
-	 */
-	if (sb && sb->usage == BLKID_USAGE_RAID &&
-	    sb->magic_off > pr->size / 2 &&
-	    (S_ISREG(pr->mode) || blkid_probe_is_wholedisk(pr)) &&
-	    blkid_probe_is_covered_by_pt(pr, sb->magic_off, 0x200)) {
-		/*
-		 * Ignore the result if the detected RAID superblock is
-		 * within some existing partition (for example RAID on
-		 * the last partition).
-		 */
+	if (idx != -1) {
+		/* restore the first result */
 		blkid_probe_chain_reset_vals(pr, chn);
-		return 1;
+		blkid_probe_append_vals(pr, vals, nvals);
+		chn->idx = idx;
 	}
 
 	/*
@@ -548,7 +475,7 @@ static int superblocks_safeprobe(blkid_probe pr, struct blkid_chain *chn)
 	 * where the partition table is visible from underlaying devices. We
 	 * have to ignore such partition tables.
 	 */
-	if (sb && sb->usage == BLKID_USAGE_RAID)
+	if (chn->idx >= 0 && idinfos[chn->idx]->usage & BLKID_USAGE_RAID)
 		pr->prob_flags |= BLKID_PARTS_IGNORE_PT;
 
 	return 0;
@@ -567,10 +494,6 @@ int blkid_probe_set_magic(blkid_probe pr, blkid_loff_t offset,
 			rc = blkid_probe_sprintf_value(pr, "SBMAGIC_OFFSET",
 					"%llu",	offset);
 	}
-	if (!rc && chn->data) {
-		blkid_superblock sb = (blkid_superblock) chn->data;
-		sb->magic_off = offset;
-	}
 	return rc;
 }
 
@@ -604,11 +527,6 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage)
 	struct blkid_chain *chn = blkid_probe_get_chain(pr);
 	char *u = NULL;
 
-	if (chn->data) {
-		blkid_superblock sb = (blkid_superblock) chn->data;
-		sb->usage = usage;
-	}
-
 	if (!(chn->flags & BLKID_SUBLKS_USAGE))
 		return 0;
 
diff --git a/shlibs/blkid/src/superblocks/superblocks.h b/shlibs/blkid/src/superblocks/superblocks.h
index b1fa49d5..a79d7cb6 100644
--- a/shlibs/blkid/src/superblocks/superblocks.h
+++ b/shlibs/blkid/src/superblocks/superblocks.h
@@ -65,6 +65,8 @@ extern const struct blkid_idinfo vmfs_volume_idinfo;
 extern const struct blkid_idinfo vmfs_fs_idinfo;
 extern const struct blkid_idinfo drbd_idinfo;
 extern const struct blkid_idinfo befs_idinfo;
+extern const struct blkid_idinfo nilfs2_idinfo;
+extern const struct blkid_idinfo exfat_idinfo;
 
 /*
  * superblock functions
diff --git a/shlibs/blkid/src/superblocks/udf.c b/shlibs/blkid/src/superblocks/udf.c
index 55c96adb..78ddda68 100644
--- a/shlibs/blkid/src/superblocks/udf.c
+++ b/shlibs/blkid/src/superblocks/udf.c
@@ -136,6 +136,9 @@ anchor:
 				blkid_probe_set_utf8label(pr,
 						vd->type.primary.ident.c,
 						31, BLKID_ENC_UTF16BE);
+
+			if (clen == 8 || clen == 16)
+				break;
 		}
 	}
 
diff --git a/shlibs/blkid/src/superblocks/via_raid.c b/shlibs/blkid/src/superblocks/via_raid.c
index 58650454..20131380 100644
--- a/shlibs/blkid/src/superblocks/via_raid.c
+++ b/shlibs/blkid/src/superblocks/via_raid.c
@@ -52,6 +52,8 @@ static int probe_viaraid(blkid_probe pr, const struct blkid_idmag *mag)
 
 	if (pr->size < 0x10000)
 		return -1;
+	if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr))
+		return -1;
 
 	off = ((pr->size / 0x200)-1) * 0x200;
 
diff --git a/shlibs/blkid/src/topology/evms.c b/shlibs/blkid/src/topology/evms.c
index baab16ed..574d9f55 100644
--- a/shlibs/blkid/src/topology/evms.c
+++ b/shlibs/blkid/src/topology/evms.c
@@ -23,6 +23,11 @@
 #include "topology.h"
 
 #define EVMS_MAJOR		117
+
+#ifndef _IOT__IOTBASE_u_int32_t
+#define _IOT__IOTBASE_u_int32_t IOT_SIMPLE(u_int32_t)
+#endif
+#define _IOT_evms_stripe_info _IOT (_IOTS(u_int32_t), 2, 0, 0, 0, 0)
 #define EVMS_GET_STRIPE_INFO	_IOR(EVMS_MAJOR, 0xF0, struct evms_stripe_info)
 
 struct evms_stripe_info {
diff --git a/shlibs/blkid/src/topology/md.c b/shlibs/blkid/src/topology/md.c
index a761e170..d7275edd 100644
--- a/shlibs/blkid/src/topology/md.c
+++ b/shlibs/blkid/src/topology/md.c
@@ -26,6 +26,10 @@
 #define MD_MAJOR	9
 #endif
 
+#ifndef _IOT__IOTBASE_uint32_t
+#define _IOT__IOTBASE_uint32_t IOT_SIMPLE(uint32_t)
+#endif
+#define _IOT_md_array_info _IOT (_IOTS(uint32_t), 18, 0, 0, 0, 0)
 #define GET_ARRAY_INFO          _IOR (MD_MAJOR, 0x11, struct md_array_info)
 
 struct md_array_info {
diff --git a/shlibs/mount/.gitignore b/shlibs/mount/.gitignore
new file mode 100644
index 00000000..1c7879de
--- /dev/null
+++ b/shlibs/mount/.gitignore
@@ -0,0 +1,2 @@
+test_*
+mount.h
diff --git a/shlibs/mount/COPYING.libmount b/shlibs/mount/COPYING.libmount
new file mode 100644
index 00000000..89d4489c
--- /dev/null
+++ b/shlibs/mount/COPYING.libmount
@@ -0,0 +1,508 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+^L
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+^L
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, 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 library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+  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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+^L
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+  If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+^L
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be 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.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+^L
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+  9. 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 Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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 with
+this License.
+^L
+  11. 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 Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+^L
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+^L
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+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 library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/shlibs/mount/Makefile.am b/shlibs/mount/Makefile.am
new file mode 100644
index 00000000..3fefce6e
--- /dev/null
+++ b/shlibs/mount/Makefile.am
@@ -0,0 +1,13 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+SUBDIRS = src
+
+if ENABLE_GTK_DOC
+SUBDIRS += docs
+endif
+
+# pkg-config stuff
+pkgconfigdir = $(usrlib_execdir)/pkgconfig
+pkgconfig_DATA = mount.pc
+
+EXTRA_DIST = COPYING.libmount mount.pc.in
diff --git a/shlibs/mount/docs/.gitignore b/shlibs/mount/docs/.gitignore
new file mode 100644
index 00000000..917c8481
--- /dev/null
+++ b/shlibs/mount/docs/.gitignore
@@ -0,0 +1,17 @@
+*.args
+*.bak
+*-decl-list.txt
+*-decl.txt
+*.hierarchy
+html/*
+*.interfaces
+*-overrides.txt
+*.prerequisites
+*.signals
+*.stamp
+tmpl/*
+*-undeclared.txt
+*-undocumented.txt
+*-unused.txt
+version.xml
+xml/*
diff --git a/shlibs/mount/docs/Makefile.am b/shlibs/mount/docs/Makefile.am
new file mode 100644
index 00000000..13e1c655
--- /dev/null
+++ b/shlibs/mount/docs/Makefile.am
@@ -0,0 +1,101 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+## Process this file with automake to produce Makefile.in
+
+# We require automake 1.10 at least.
+AUTOMAKE_OPTIONS = 1.10
+
+# This is a blank Makefile.am for using gtk-doc.
+# Copy this to your project's API docs directory and modify the variables to
+# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
+# of using the various options.
+
+# The name of the module, e.g. 'glib'.
+DOC_MODULE=libmount
+
+# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
+#DOC_MODULE_VERSION=2
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
+
+# The directory containing the source code. Relative to $(srcdir).
+# gtk-doc will search all .c & .h files beneath here for inline comments
+# documenting the functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk
+DOC_SOURCE_DIR=../src
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+SCANGOBJ_OPTIONS=
+
+# Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+SCAN_OPTIONS=
+
+# Extra options to supply to gtkdoc-mkdb.
+# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space mount
+
+# Extra options to supply to gtkdoc-mktmpl
+# e.g. MKTMPL_OPTIONS=--only-section-tmpl
+MKTMPL_OPTIONS=
+
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=
+
+# Extra options to supply to gtkdoc-fixref. Not normally needed.
+# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+FIXXREF_OPTIONS=
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+HFILE_GLOB=$(ul_libmount_incdir)/mount.h
+CFILE_GLOB=$(ul_libmount_srcdir)/*.c
+
+# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
+# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
+EXTRA_HFILES=
+
+# Header files to ignore when scanning. Use base file name, no paths
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+IGNORE_HFILES=mountP.h
+
+# Images to copy into HTML directory.
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES=
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+content_files = $(builddir)/version.xml
+
+# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+# These files must be listed here *and* in content_files
+# e.g. expand_content_files=running.sgml
+expand_content_files=
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+GTKDOC_CFLAGS=
+GTKDOC_LIBS=
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+include $(top_srcdir)/config/gtk-doc.make
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in
+
+# Files not to distribute
+# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
+# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
+#DISTCLEANFILES +=
+
+# Comment this out if you want your docs-status tested during 'make check'
+if ENABLE_GTK_DOC
+#TESTS_ENVIRONMENT = cd $(srcsrc)
+#TESTS = $(GTKDOC_CHECK)
+endif
diff --git a/shlibs/mount/docs/libmount-docs.xml b/shlibs/mount/docs/libmount-docs.xml
new file mode 100644
index 00000000..c1371d61
--- /dev/null
+++ b/shlibs/mount/docs/libmount-docs.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY version SYSTEM "version.xml">
+]>
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>libmount Reference Manual</title>
+    <releaseinfo>for libmount version &version;</releaseinfo>
+    <copyright>
+      <year>2010</year>
+      <holder>Karel Zak &lt;kzak@redhat.com&gt;</holder>
+    </copyright>
+  </bookinfo>
+
+  <part id="gtk">
+    <title>libmount Overview</title>
+    <partintro>
+    <para>
+The libmount library is used to parse /etc/fstab, /etc/mtab and
+/proc/self/mountinfo files, manage the mtab file, evaluate mount options, etc.
+    </para>
+    <para>
+The library is part of the util-linux-ng package since version 2.18 and is
+available from ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+    </para>
+  </partintro>
+ </part>
+
+  <part>
+    <title>Files parsing</title>
+    <xi:include href="xml/tab.xml"/>
+    <xi:include href="xml/fs.xml"/>
+  </part>
+  <part>
+    <title>Mount options</title>
+    <xi:include href="xml/optstr.xml"/>
+    <xi:include href="xml/optls.xml"/>
+    <xi:include href="xml/optent.xml"/>
+    <xi:include href="xml/optmap.xml"/>
+  </part>
+  <part>
+    <title>Mtab management</title>
+    <xi:include href="xml/lock.xml"/>
+  </part>
+  <part>
+    <title>Misc</title>
+    <xi:include href="xml/init.xml"/>
+    <xi:include href="xml/cache.xml"/>
+    <xi:include href="xml/iter.xml"/>
+    <xi:include href="xml/utils.xml"/>
+    <xi:include href="xml/version.xml"/>
+  </part>
+
+  <index id="api-index-full">
+    <title>API Index</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+</book>
diff --git a/shlibs/mount/docs/libmount-sections.txt b/shlibs/mount/docs/libmount-sections.txt
new file mode 100644
index 00000000..59cdf47d
--- /dev/null
+++ b/shlibs/mount/docs/libmount-sections.txt
@@ -0,0 +1,181 @@
+<SECTION>
+<FILE>init</FILE>
+mnt_init_debug
+</SECTION>
+
+<SECTION>
+<FILE>version</FILE>
+mnt_parse_version_string
+mnt_get_library_version
+</SECTION>
+
+<SECTION>
+<FILE>utils</FILE>
+mnt_fstype_is_netfs
+mnt_fstype_is_pseudofs
+mnt_match_fstype
+mnt_match_options
+</SECTION>
+
+<SECTION>
+<FILE>cache</FILE>
+mnt_cache
+mnt_new_cache
+mnt_free_cache
+mnt_cache_find_path
+mnt_cache_find_tag
+mnt_cache_read_tags
+mnt_cache_device_has_tag
+mnt_cache_find_tag_value
+mnt_resolve_path
+mnt_resolve_tag
+mnt_resolve_spec
+</SECTION>
+
+<SECTION>
+<FILE>optstr</FILE>
+mnt_optstr_next_option
+mnt_optstr_append_option
+mnt_optstr_get_option
+mnt_optstr_set_option
+mnt_optstr_remove_option
+</SECTION>
+
+<SECTION>
+<FILE>iter</FILE>
+mnt_iter
+mnt_new_iter
+mnt_free_iter
+mnt_reset_iter
+mnt_iter_get_direction
+</SECTION>
+
+<SECTION>
+<FILE>optmap</FILE>
+mnt_optmap
+mnt_get_builtin_optmap
+</SECTION>
+
+<SECTION>
+<FILE>optent</FILE>
+mnt_optent
+mnt_optent_get_map
+mnt_optent_get_mapent
+mnt_optent_get_type
+mnt_optent_set_value
+mnt_optent_has_value
+mnt_optent_require_value
+mnt_optent_is_inverted
+mnt_optent_strtoul_value
+mnt_optent_strtol_value
+mnt_optent_strtoull_value
+mnt_optent_get_value
+mnt_optent_strlen_value
+mnt_optent_snprintf_value
+mnt_optent_dup_value
+mnt_optent_get_name
+mnt_optent_get_mask
+mnt_optent_get_id
+mnt_optent_get_flag
+mnt_optent_is_unknown
+mnt_optent_print_debug
+</SECTION>
+
+<SECTION>
+<FILE>optls</FILE>
+mnt_optls
+mnt_new_optls
+mnt_free_optls
+mnt_optls_add_map
+mnt_optls_add_builtin_map
+mnt_optls_add_option
+mnt_optls_parse_optstr
+mnt_optls_remove_option
+mnt_optls_remove_option_by_flags
+mnt_optls_remove_option_by_iflags
+mnt_optls_next_option
+mnt_optls_get_option
+mnt_optls_get_ids
+mnt_optls_create_mountflags
+mnt_optls_create_mountdata
+mnt_optls_create_mtab_optstr
+mnt_optls_create_userspace_optstr
+mnt_optls_print_debug
+</SECTION>
+
+
+<SECTION>
+<FILE>lock</FILE>
+mnt_lock
+mnt_new_lock
+mnt_free_lock
+mnt_lock_get_lockfile
+mnt_lock_get_linkfile
+mnt_unlock_file
+mnt_lock_file
+</SECTION>
+
+
+<SECTION>
+<FILE>fs</FILE>
+mnt_fs
+mnt_new_fs
+mnt_free_fs
+mnt_fs_get_userdata
+mnt_fs_set_userdata
+mnt_fs_get_source
+mnt_fs_set_source
+mnt_fs_get_srcpath
+mnt_fs_get_tag
+mnt_fs_get_target
+mnt_fs_set_target
+mnt_fs_get_fstype
+mnt_fs_set_fstype
+mnt_fs_get_optstr
+mnt_fs_set_optstr
+mnt_fs_get_fs_optstr
+mnt_fs_get_vfs_optstr
+mnt_fs_get_freq
+mnt_fs_set_freq
+mnt_fs_get_passno
+mnt_fs_set_passno
+mnt_fs_get_id
+mnt_fs_get_parent_id
+mnt_fs_get_devno
+mnt_fs_get_option
+mnt_fs_match_target
+mnt_fs_match_source
+mnt_fs_match_fstype
+mnt_fs_match_options
+mnt_fprintf_line
+mnt_fs_fprintf
+mnt_fs_print_debug
+</SECTION>
+
+<SECTION>
+<FILE>tab</FILE>
+mnt_tab
+mnt_new_tab_from_file
+mnt_tab_parse_file
+mnt_tab_strerror
+mnt_tab_get_nerrs
+mnt_new_tab
+mnt_free_tab
+mnt_tab_get_nents
+mnt_tab_set_cache
+mnt_tab_get_cache
+mnt_tab_get_name
+mnt_tab_add_fs
+mnt_tab_remove_fs
+mnt_tab_next_fs
+mnt_tab_next_child_fs
+mnt_tab_get_root_fs
+mnt_tab_set_iter
+mnt_tab_find_target
+mnt_tab_find_srcpath
+mnt_tab_find_tag
+mnt_tab_find_source
+mnt_tab_find_next_fs
+mnt_tab_fprintf
+mnt_tab_update_file
+</SECTION>
diff --git a/shlibs/mount/docs/libmount.types b/shlibs/mount/docs/libmount.types
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/shlibs/mount/docs/libmount.types
diff --git a/shlibs/mount/docs/version.xml.in b/shlibs/mount/docs/version.xml.in
new file mode 100644
index 00000000..d78bda93
--- /dev/null
+++ b/shlibs/mount/docs/version.xml.in
@@ -0,0 +1 @@
+@VERSION@
diff --git a/shlibs/mount/mount.pc.in b/shlibs/mount/mount.pc.in
new file mode 100644
index 00000000..94051b8b
--- /dev/null
+++ b/shlibs/mount/mount.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@usrlib_execdir@
+includedir=@includedir@
+
+Name: mount
+Description: mount library
+Version: @LIBMOUNT_VERSION@
+Requires.private: blkid
+Cflags: -I${includedir}/mount
+Libs: -L${libdir} -lmount
diff --git a/shlibs/mount/src/Makefile.am b/shlibs/mount/src/Makefile.am
new file mode 100644
index 00000000..aebd3cc5
--- /dev/null
+++ b/shlibs/mount/src/Makefile.am
@@ -0,0 +1,56 @@
+include $(top_srcdir)/config/include-Makefile.am
+
+AM_CPPFLAGS += -I$(ul_libmount_incdir) \
+	       -I$(ul_libmount_srcdir) \
+	       -I$(ul_libblkid_incdir)
+
+# includes
+mountincdir = $(includedir)/mount
+nodist_mountinc_HEADERS = mount.h
+
+usrlib_exec_LTLIBRARIES = libmount.la
+libmount_la_SOURCES =	mountP.h version.c utils.c test.c init.c cache.c \
+			optstr.c optmap.c optent.c optls.c iter.c lock.c \
+		      	fs.c tab.c tab_parse.c \
+			$(mountinc_HEADERS) \
+			$(top_srcdir)/include/list.h \
+			$(top_srcdir)/lib/mangle.c \
+			$(top_srcdir)/lib/canonicalize.c
+
+nodist_libmount_la_SOURCES = mountP.h
+
+libmount_la_LIBADD = $(ul_libblkid_la)
+
+libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) mount.sym mount.h.in
+
+libmount_la_LDFLAGS = -Wl,--version-script=$(ul_libmount_srcdir)/mount.sym \
+                      -version-info $(LIBMOUNT_VERSION_INFO)
+
+EXTRA_DIST = mount.sym mount.h.in
+CLEANFILES = $(tests)
+
+# move lib from $(usrlib_execdir) to $(libdir) if needed
+install-exec-hook:
+	if test "$(usrlib_execdir)" != "$(libdir)"; then \
+		mkdir -p $(DESTDIR)$(libdir); \
+		mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* $(DESTDIR)$(libdir); \
+		so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libmount.so); \
+		so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
+		(cd $(DESTDIR)$(usrlib_execdir) && \
+			rm -f libmount.so && \
+			$(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libmount.so); \
+	fi
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(libdir)/libmount.so*
+
+
+tests = test_version test_cache test_optstr test_optls test_lock \
+		  test_tab test_utils
+
+tests: all $(tests)
+test_%: %.c
+	$(COMPILE) -DTEST_PROGRAM $< .libs/libmount.a \
+		$(ul_libblkid_builddir)/.libs/libblkid.a -o $@ \
+		$(UUID_LIBS)
+
diff --git a/shlibs/mount/src/cache.c b/shlibs/mount/src/cache.c
new file mode 100644
index 00000000..027fda44
--- /dev/null
+++ b/shlibs/mount/src/cache.c
@@ -0,0 +1,570 @@
+/*
+ * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: cache
+ * @title: Cache
+ * @short_description: paths and tags (UUID/LABEL) caching
+ *
+ * The cache is a very simple API for work with tags (LABEL, UUID, ...) and
+ * paths. The cache uses libblkid as a backend from TAGs resolution.
+ *
+ * All returned paths are always canonicalized.
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <blkid.h>
+
+#include "canonicalize.h"
+#include "mountP.h"
+
+/*
+ * Canonicalized (resolved) paths & tags cache
+ */
+#define MNT_CACHE_CHUNKSZ	128
+
+#define MNT_CACHE_ISTAG		(1 << 1) /* entry is TAG */
+#define MNT_CACHE_ISPATH	(1 << 2) /* entry is path */
+#define MNT_CACHE_TAGREAD	(1 << 3) /* tag read by mnt_cache_read_tags() */
+
+/* path cache entry */
+struct mnt_cache_entry {
+	char			*native;	/* the original path */
+	char			*real;		/* canonicalized path */
+	int			flag;
+};
+
+struct _mnt_cache {
+	struct mnt_cache_entry	*ents;
+	size_t			nents;
+	size_t			nallocs;
+
+	/* blkid_evaluate_tag() works in two ways:
+	 *
+	 * 1/ all tags are evaluated by udev /dev/disk/by-* symlinks,
+	 *    then the blkid_cache is NULL.
+	 *
+	 * 2/ all tags are read from /etc/blkid.tab and verified by /dev
+	 *    scanning, then the blkid_cache is not NULL and then it's
+	 *    better to reuse the blkid_cache.
+	 */
+	blkid_cache		bc;
+};
+
+/**
+ * mnt_new_cache:
+ *
+ * Returns: new mnt_cache instance or NULL in case of ENOMEM error.
+ */
+mnt_cache *mnt_new_cache(void)
+{
+	return calloc(1, sizeof(struct _mnt_cache));
+}
+
+/**
+ * mnt_free_cache:
+ * @cache: pointer to mnt_cache instance
+ *
+ * Deallocates the cache.
+ */
+void mnt_free_cache(mnt_cache *cache)
+{
+	int i;
+
+	if (!cache)
+		return;
+	for (i = 0; i < cache->nents; i++) {
+		struct mnt_cache_entry *e = &cache->ents[i];
+		if (e->real != e->native)
+			free(e->real);
+		free(e->native);
+	}
+	free(cache->ents);
+	if (cache->bc)
+		blkid_put_cache(cache->bc);
+	free(cache);
+}
+
+/* note that the @native could be tha same pointer as @real */
+static int mnt_cache_add_entry(mnt_cache *cache, char *native,
+					char *real, int flag)
+{
+	struct mnt_cache_entry *e;
+
+	assert(cache);
+	assert(real);
+	assert(native);
+
+	if (cache->nents == cache->nallocs) {
+		size_t sz = cache->nallocs + MNT_CACHE_CHUNKSZ;
+
+		e = realloc(cache->ents, sz * sizeof(struct mnt_cache_entry));
+		if (!e)
+			return -1;
+		cache->ents = e;
+		cache->nallocs = sz;
+	}
+
+	e = &cache->ents[cache->nents];
+	e->native = native;
+	e->real = real;
+	e->flag = flag;
+	cache->nents++;
+
+	DBG(DEBUG_CACHE,
+		printf("cache: add entry[%2zd] (%s): %s: %s\n",
+			cache->nents,
+			(flag & MNT_CACHE_ISPATH) ? "path" : "tag",
+			real, native));
+	return 0;
+}
+
+/* add tag to the cache, @real has to be allocated string */
+static int mnt_cache_add_tag(mnt_cache *cache, const char *token,
+				const char *value, char *real, int flag)
+{
+	size_t tksz, vlsz;
+	char *native;
+
+	assert(cache);
+	assert(real);
+	assert(token);
+	assert(value);
+
+	/* add into cache -- cache format for TAGs is
+	 *	native = "NAME\0VALUE\0"
+	 *	real   = "/dev/foo"
+	 */
+	tksz = strlen(token);
+	vlsz = strlen(value);
+
+	native = malloc(tksz + vlsz + 2);
+	if (!native)
+		goto error;
+
+	memcpy(native, token, tksz + 1);	   /* include '\0' */
+	memcpy(native + tksz + 1, value, vlsz + 1);
+
+	if (mnt_cache_add_entry(cache, native, real, flag | MNT_CACHE_ISTAG))
+		goto error;
+	return 0;
+error:
+	free(native);
+	return -1;
+}
+
+
+/**
+ * mnt_cache_find_path:
+ * @cache: pointer to mnt_cache instance
+ * @path: "native" (non-canonicalized) path
+ *
+ * Returns: cached canonicalized path or NULL.
+ */
+const char *mnt_cache_find_path(mnt_cache *cache, const char *path)
+{
+	int i;
+
+	assert(cache);
+	assert(path);
+
+	if (!cache || !path)
+		return NULL;
+
+	for (i = 0; i < cache->nents; i++) {
+		struct mnt_cache_entry *e = &cache->ents[i];
+		if (!(e->flag & MNT_CACHE_ISPATH))
+			continue;
+		if (strcmp(path, e->native) == 0)
+			return e->real;
+	}
+	return NULL;
+}
+
+/**
+ * mnt_cache_find_tag:
+ * @cache: pointer to mnt_cache instance
+ * @token: tag name
+ * @value: tag value
+ *
+ * Returns: cached path or NULL.
+ */
+const char *mnt_cache_find_tag(mnt_cache *cache,
+			const char *token, const char *value)
+{
+	int i;
+	size_t tksz;
+
+	assert(cache);
+	assert(token);
+	assert(value);
+
+	if (!cache || !token || !value)
+		return NULL;
+
+	tksz = strlen(token);
+
+	for (i = 0; i < cache->nents; i++) {
+		struct mnt_cache_entry *e = &cache->ents[i];
+		if (!(e->flag & MNT_CACHE_ISTAG))
+			continue;
+		if (strcmp(token, e->native) == 0 &&
+		    strcmp(value, e->native + tksz + 1) == 0)
+			return e->real;
+	}
+	return NULL;
+}
+
+/**
+ * mnt_cache_read_tags
+ * @cache: pointer to mnt_cache instance
+ * @devname: path device
+ *
+ * Reads @devname LABEL and UUID to the @cache.
+ *
+ * Returns: 0 if at least one tag was added, 1 if no tag was added or
+ *          -1 in case of error.
+ */
+int mnt_cache_read_tags(mnt_cache *cache, const char *devname)
+{
+	int i, ntags = 0;
+	static blkid_probe pr;
+	const char *tags[] = { "LABEL", "UUID" };
+
+	assert(cache);
+	assert(devname);
+
+	if (!cache || !devname)
+		return -1;
+
+	DBG(DEBUG_CACHE, printf("cache: tags for %s requested\n", devname));
+
+	/* check is device is already cached */
+	for (i = 0; i < cache->nents; i++) {
+		struct mnt_cache_entry *e = &cache->ents[i];
+		if (!(e->flag & MNT_CACHE_TAGREAD))
+			continue;
+		if (strcmp(e->real, devname) == 0)
+			/* tags has been already read */
+			return 0;
+	}
+
+	DBG(DEBUG_CACHE,
+		printf("cache: reading tags for: %s\n", devname));
+
+	pr = blkid_new_probe_from_filename(devname);
+	if (!pr)
+		return -1;
+
+	blkid_probe_enable_superblocks(pr, 1);
+
+	blkid_probe_set_superblocks_flags(pr,
+			BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID);
+
+	if (blkid_do_safeprobe(pr))
+		goto error;
+
+	for (i = 0; i < ARRAY_SIZE(tags); i++) {
+		const char *data;
+		char *dev;
+
+		if (blkid_probe_lookup_value(pr, tags[i], &data, NULL))
+			continue;
+		if (mnt_cache_find_tag(cache, tags[i], data))
+			continue; /* already cached */
+
+		dev = strdup(devname);
+		if (!dev)
+			goto error;
+		if (mnt_cache_add_tag(cache, tags[i], data, dev,
+					MNT_CACHE_TAGREAD)) {
+			free(dev);
+			goto error;
+		}
+		ntags++;
+	}
+
+	return ntags ? 0 : 1;
+error:
+	blkid_free_probe(pr);
+	return -1;
+}
+
+/**
+ * mnt_cache_device_has_tag:
+ * @cache: paths cache
+ * @devname: path to the device
+ * @token: tag name (e.g "LABEL")
+ * @value: tag value
+ *
+ * Look up @cache to check it @tag+@value are associated with @devname.
+ *
+ * Returns: 1 on success or 0.
+ */
+int mnt_cache_device_has_tag(mnt_cache *cache, const char *devname,
+				const char *token, const char *value)
+{
+	const char *path = mnt_cache_find_tag(cache, token, value);
+
+	if (path && strcmp(path, devname) == 0)
+		return 1;
+	return 0;
+}
+
+/**
+ * mnt_cache_find_tag_value:
+ * @cache: cache for results
+ * @devname: device name
+ * @token: tag name ("LABEL" or "UUID")
+ *
+ * Returns: LABEL or UUID for the @devname or NULL in case of error.
+ */
+char *mnt_cache_find_tag_value(mnt_cache *cache,
+		const char *devname, const char *token)
+{
+	int i;
+
+	if (!cache || !devname || !token)
+		return NULL;
+
+	if (mnt_cache_read_tags(cache, devname) != 0)
+		return NULL;
+
+	for (i = 0; i < cache->nents; i++) {
+		struct mnt_cache_entry *e = &cache->ents[i];
+		if (!(e->flag & MNT_CACHE_ISTAG))
+			continue;
+		if (strcmp(e->real, devname) == 0 &&	/* dev name */
+		    strcmp(token, e->native) == 0)	/* tag name */
+			return e->native + strlen(token) + 1;	/* tag value */
+	}
+
+	return NULL;
+}
+
+/**
+ * mnt_resolve_path:
+ * @path: "native" path
+ * @cache: cache for results or NULL
+ *
+ * Returns: absolute path or NULL in case of error. The result has to be
+ * deallocated by free() if @cache is NULL.
+ */
+char *mnt_resolve_path(const char *path, mnt_cache *cache)
+{
+	char *p = NULL;
+	char *native = NULL;
+	char *real = NULL;
+
+	assert(path);
+
+	if (!path)
+		return NULL;
+	if (cache)
+		p = (char *) mnt_cache_find_path(cache, path);
+
+	if (!p) {
+		p = canonicalize_path(path);
+
+		if (p && cache) {
+			native = strdup(path);
+			real = strcmp(path, p) == 0 ? native : p;
+
+			if (!native || !real)
+				goto error;
+
+			if (mnt_cache_add_entry(cache, native, real,
+							MNT_CACHE_ISPATH))
+				goto error;
+		}
+	}
+
+	return p;
+error:
+	if (real != native)
+		free(real);
+	free(native);
+	return NULL;
+}
+
+/**
+ * mnt_resolve_tag:
+ * @token: tag name
+ * @value: tag value
+ * @cache: for results or NULL
+ *
+ * Returns: device name or NULL in case of error. The result has to be
+ * deallocated by free() if @cache is NULL.
+ */
+char *mnt_resolve_tag(const char *token, const char *value, mnt_cache *cache)
+{
+	char *p = NULL;
+
+	assert(token);
+	assert(value);
+
+	if (!token || !value)
+		return NULL;
+
+	if (cache)
+		p = (char *) mnt_cache_find_tag(cache, token, value);
+
+	if (!p) {
+		/* returns newly allocated string */
+		p = blkid_evaluate_tag(token, value, cache ? &cache->bc : NULL);
+
+		if (p && cache &&
+		    mnt_cache_add_tag(cache, token, value, p, 0))
+				goto error;
+	}
+
+	return p;
+error:
+	free(p);
+	return NULL;
+}
+
+
+
+/**
+ * mnt_resolve_spec:
+ * @spec: path or tag
+ * @cache: paths cache
+ *
+ * Returns: canonicalized path or NULL. The result has to be
+ * deallocated by free() if @cache is NULL.
+ */
+char *mnt_resolve_spec(const char *spec, mnt_cache *cache)
+{
+	char *cn = NULL;
+
+	if (!spec)
+		return NULL;
+
+	if (strchr(spec, '=')) {
+		char *tag, *val;
+
+		if (!blkid_parse_tag_string(spec, &tag, &val)) {
+			cn = mnt_resolve_tag(tag, val, cache);
+
+			free(tag);
+			free(val);
+		}
+	} else
+		cn = mnt_resolve_path(spec, cache);
+
+	return cn;
+}
+
+
+#ifdef TEST_PROGRAM
+
+int test_resolve_path(struct mtest *ts, int argc, char *argv[])
+{
+	char line[BUFSIZ];
+	mnt_cache *cache;
+
+	cache = mnt_new_cache();
+	if (!cache)
+		return -1;
+
+	while(fgets(line, sizeof(line), stdin)) {
+		size_t sz = strlen(line);
+		char *p;
+
+		if (line[sz - 1] == '\n')
+			line[sz - 1] = '\0';
+
+		p = mnt_resolve_path(line, cache);
+		printf("%s : %s\n", line, p);
+	}
+	mnt_free_cache(cache);
+	return 0;
+}
+
+int test_resolve_spec(struct mtest *ts, int argc, char *argv[])
+{
+	char line[BUFSIZ];
+	mnt_cache *cache;
+
+	cache = mnt_new_cache();
+	if (!cache)
+		return -1;
+
+	while(fgets(line, sizeof(line), stdin)) {
+		size_t sz = strlen(line);
+		char *p;
+
+		if (line[sz - 1] == '\n')
+			line[sz - 1] = '\0';
+
+		p = mnt_resolve_spec(line, cache);
+		printf("%s : %s\n", line, p);
+	}
+	mnt_free_cache(cache);
+	return 0;
+}
+
+int test_read_tags(struct mtest *ts, int argc, char *argv[])
+{
+	char line[BUFSIZ];
+	mnt_cache *cache;
+
+	cache = mnt_new_cache();
+	if (!cache)
+		return -1;
+
+	while(fgets(line, sizeof(line), stdin)) {
+		size_t sz = strlen(line);
+
+		if (line[sz - 1] == '\n')
+			line[sz - 1] = '\0';
+
+		if (*line == '/') {
+			if (mnt_cache_read_tags(cache, line) < 0)
+				fprintf(stderr, "%s: read tags faild\n", line);
+
+		} else if (strchr(line, '=')) {
+			char *tag, *val;
+			const char *cn = NULL;
+
+			if (!blkid_parse_tag_string(line, &tag, &val)) {
+				cn = mnt_cache_find_tag(cache, tag, val);
+
+				free(tag);
+				free(val);
+			}
+			if (cn)
+				printf("%s: %s\n", line, cn);
+			else
+				printf("%s: not cached\n", line);
+		}
+	}
+	mnt_free_cache(cache);
+	return 0;
+
+}
+
+int main(int argc, char *argv[])
+{
+	struct mtest ts[] = {
+		{ "--resolve-path", test_resolve_path, "  resolve paths from stdin" },
+		{ "--resolve-spec", test_resolve_spec, "  evaluate specs from stdin" },
+		{ "--read-tags", test_read_tags,       "  read devname or TAG from stdin" },
+		{ NULL }
+	};
+
+	return mnt_run_test(ts, argc, argv);
+}
+#endif
diff --git a/shlibs/mount/src/fs.c b/shlibs/mount/src/fs.c
new file mode 100644
index 00000000..63da2f20
--- /dev/null
+++ b/shlibs/mount/src/fs.c
@@ -0,0 +1,787 @@
+/*
+ * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: fs
+ * @title: Filesystem
+ * @short_description: mnt_fs represents one entry in fstab/mtab/mountinfo
+ *
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+#include <blkid.h>
+
+#include "nls.h"
+#include "mountP.h"
+
+/**
+ * mnt_new_fs:
+ *
+ * Returns: newly allocated mnt_file fs.
+ */
+mnt_fs *mnt_new_fs(void)
+{
+	mnt_fs *fs = calloc(1, sizeof(struct _mnt_fs));
+	if (!fs)
+		return NULL;
+
+	INIT_LIST_HEAD(&fs->ents);
+	return fs;
+}
+
+/**
+ * mnt_free_fs:
+ * @fs: fs pointer
+ *
+ * Deallocates the fs.
+ */
+void mnt_free_fs(mnt_fs *fs)
+{
+	if (!fs)
+		return;
+	list_del(&fs->ents);
+
+	free(fs->source);
+	free(fs->tagname);
+	free(fs->tagval);
+	free(fs->mntroot);
+	free(fs->target);
+	free(fs->fstype);
+	free(fs->optstr);
+	free(fs->vfs_optstr);
+	free(fs->fs_optstr);
+
+	free(fs);
+}
+
+/**
+ * mnt_fs_get_userdata:
+ * @fs: mnt_file instance
+ *
+ * Returns: private data set by mnt_fs_set_userdata() or NULL.
+ */
+void *mnt_fs_get_userdata(mnt_fs *fs)
+{
+	return fs ? fs->userdata : NULL;
+}
+
+/**
+ * mnt_fs_set_userdata:
+ * @fs: mnt_file instance
+ *
+ * The "userdata" are library independent data.
+ *
+ * Returns: 0 or -1 in case of error (if @fs is NULL).
+ */
+int mnt_fs_set_userdata(mnt_fs *fs, void *data)
+{
+	if (!fs)
+		return -1;
+	fs->userdata = data;
+	return 0;
+}
+
+/**
+ * mnt_fs_get_srcpath:
+ * @fs: mnt_file (fstab/mtab/mountinfo) fs
+ *
+ * The mount "source path" is:
+ * - a directory for 'bind' mounts (in fstab or mtab only)
+ * - a device name for standard mounts
+ *
+ * See also mnt_fs_get_tag() and mnt_fs_get_source().
+ *
+ * Returns: mount source path or NULL in case of error or when the path
+ * is not defined.
+ */
+const char *mnt_fs_get_srcpath(mnt_fs *fs)
+{
+	assert(fs);
+	if (!fs)
+		return NULL;
+
+	/* fstab-like fs */
+	if (fs->tagname)
+		return NULL;	/* the source contains a "NAME=value" */
+	return fs->source;
+}
+
+/**
+ * mnt_fs_get_source:
+ * @fs: mnt_file (fstab/mtab/mountinfo) fs
+ *
+ * Returns: mount source. Note that the source could be unparsed TAG
+ * (LABEL/UUID). See also mnt_fs_get_srcpath() and mnt_fs_get_tag().
+ */
+const char *mnt_fs_get_source(mnt_fs *fs)
+{
+	return fs ? fs->source : NULL;
+}
+
+/* Used by parser mnt_file ONLY (@source has to be allocated) */
+int __mnt_fs_set_source(mnt_fs *fs, char *source)
+{
+	assert(fs);
+
+	if (!source)
+		return -1;
+
+	if (strchr(source, '=')) {
+		char *name, *val;
+
+		if (blkid_parse_tag_string(source, &name, &val) != 0)
+			return -1;
+
+		fs->tagval = val;
+		fs->tagname = name;
+	}
+
+	fs->source = source;
+	return 0;
+}
+
+/**
+ * mnt_fs_set_source:
+ * @fs: fstab/mtab/mountinfo entry
+ * @source: new source
+ *
+ * This function creates a private copy (strdup()) of @source.
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_fs_set_source(mnt_fs *fs, const char *source)
+{
+	char *p;
+
+	if (!fs && !source)
+		return -1;
+
+	p = strdup(source);
+	if (!p)
+		return -1;
+
+	free(fs->tagval);
+	free(fs->tagname);
+	free(fs->source);
+	fs->tagval = fs->tagname = fs->source = NULL;
+
+	return __mnt_fs_set_source(fs, p);
+}
+
+/**
+ * mnt_fs_get_tag:
+ * @fs: fs
+ * @name: returns pointer to NAME string
+ * @value: returns pointer to VALUE string
+ *
+ * "TAG" is NAME=VALUE (e.g. LABEL=foo)
+ *
+ * The TAG is the first column in the fstab file. The TAG or "srcpath" has to
+ * be always set for all entries.
+ *
+ * See also mnt_fs_get_source().
+ *
+ * <informalexample>
+ *   <programlisting>
+ *	char *src;
+ *	mnt_fs *fs = mnt_tab_find_target(tb, "/home", MNT_ITER_FORWARD);
+ *
+ *	if (!fs)
+ *		goto err;
+ *
+ *	src = mnt_fs_get_srcpath(fs);
+ *	if (!src) {
+ *		char *tag, *val;
+ *		if (mnt_fs_get_tag(fs, &tag, &val) == 0)
+ *			printf("%s: %s\n", tag, val);	// LABEL or UUID
+ *	} else
+ *		printf("device: %s\n", src);		// device or bind path
+ *   </programlisting>
+ * </informalexample>
+ *
+ * Returns: 0 on success or -1 in case that a TAG is not defined.
+ */
+int mnt_fs_get_tag(mnt_fs *fs, const char **name, const char **value)
+{
+	if (fs == NULL || !fs->tagname)
+		return -1;
+	if (name)
+		*name = fs->tagname;
+	if (value)
+		*value = fs->tagval;
+	return 0;
+}
+
+/**
+ * mnt_fs_get_target:
+ * @fs: fstab/mtab/mountinfo entry pointer
+ *
+ * Returns: pointer to mountpoint path or NULL
+ */
+const char *mnt_fs_get_target(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->target : NULL;
+}
+
+/**
+ * mnt_fs_set_target:
+ * @fs: fstab/mtab/mountinfo entry
+ * @target: mountpoint
+ *
+ * This function creates a private copy (strdup()) of @target.
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_fs_set_target(mnt_fs *fs, const char *target)
+{
+	char *p;
+
+	assert(fs);
+
+	if (!fs || !target)
+		return -1;
+
+	p = strdup(target);
+	if (!p)
+		return -1;
+	free(fs->target);
+	fs->target = p;
+
+	return 0;
+}
+
+/**
+ * mnt_fs_get_fstype:
+ * @fs: fstab/mtab/mountinfo entry pointer
+ *
+ * Returns: pointer to filesystem type.
+ */
+const char *mnt_fs_get_fstype(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->fstype : NULL;
+}
+
+/* Used by mnt_file parser only */
+int __mnt_fs_set_fstype(mnt_fs *fs, char *fstype)
+{
+	assert(fs);
+
+	if (!fstype)
+		return -1;
+
+	fs->fstype = fstype;
+	fs->flags &= ~MNT_FS_PSEUDO;
+	fs->flags &= ~MNT_FS_NET;
+
+	/* save info about pseudo filesystems */
+	if (mnt_fstype_is_pseudofs(fs->fstype))
+		fs->flags |= MNT_FS_PSEUDO;
+	else if (mnt_fstype_is_netfs(fs->fstype))
+		fs->flags |= MNT_FS_NET;
+
+	return 0;
+}
+
+/**
+ * mnt_fs_set_fstype:
+ * @fs: fstab/mtab/mountinfo entry
+ * @fstype: filesystem type
+ *
+ * This function creates a private copy (strdup()) of @fstype.
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_fs_set_fstype(mnt_fs *fs, const char *fstype)
+{
+	char *p;
+
+	if (!fs || !fstype)
+		return -1;
+
+	p = strdup(fstype);
+	if (!p)
+		return -1;
+	free(fs->fstype);
+
+	return __mnt_fs_set_fstype(fs, p);
+}
+
+/**
+ * mnt_fs_get_optstr:
+ * @fs: fstab/mtab/mountinfo entry pointer
+ *
+ * Returns: pointer to mount option string with all options (FS and VFS)
+ */
+const char *mnt_fs_get_optstr(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->optstr : NULL;
+}
+
+/**
+ * mnt_fs_set_optstr:
+ * @fs: fstab/mtab/mountinfo entry
+ * @optstr: options string
+ *
+ * This function creates a private copy (strdup()) of @optstr.
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_fs_set_optstr(mnt_fs *fs, const char *optstr)
+{
+	char *p;
+
+	assert(fs);
+
+	if (!fs || !optstr)
+		return -1;
+	p = strdup(optstr);
+	if (!p)
+		return -1;
+
+	free(fs->optstr);
+	free(fs->fs_optstr);
+	free(fs->vfs_optstr);
+	fs->fs_optstr = fs->vfs_optstr = NULL;
+
+	/* TODO: it would be possible to use built-in maps of options
+	 * and differentiate between VFS and FS options, then we can
+	 * set fs_optstr and vfs_optstr */
+
+	fs->optstr = p;
+
+	return 0;
+}
+
+/**
+ * mnt_fs_get_fs_optstr:
+ * @fs: fstab/mtab/mountinfo entry pointer
+ *
+ * This function works for "mountinfo" files only.
+ *
+ * Returns: pointer to superblock (fs-depend) mount option string or NULL.
+ */
+const char *mnt_fs_get_fs_optstr(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->fs_optstr : NULL;
+}
+
+/**
+ * mnt_fs_get_vfs_optstr:
+ * @fs: fstab/mtab entry pointer
+ *
+ * This function works for "mountinfo" files only.
+ *
+ * Returns: pointer to fs-independent (VFS) mount option string or NULL.
+ */
+const char *mnt_fs_get_vfs_optstr(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->vfs_optstr : NULL;
+}
+
+
+/**
+ * mnt_fs_get_freq:
+ * @fs: fstab/mtab/mountinfo entry pointer
+ *
+ * Returns: dump frequency in days.
+ */
+int mnt_fs_get_freq(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->freq : 0;
+}
+
+/**
+ * mnt_fs_set_freq:
+ * @fs: fstab/mtab entry pointer
+ * @freq: dump frequency in days
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_fs_set_freq(mnt_fs *fs, int freq)
+{
+	assert(fs);
+	if (!fs)
+		return -1;
+	fs->freq = freq;
+	return 0;
+}
+
+/**
+ * mnt_fs_get_passno:
+ * @fs: fstab/mtab entry pointer
+ *
+ * Returns: "pass number on parallel fsck".
+ */
+int mnt_fs_get_passno(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->passno: 0;
+}
+
+/**
+ * mnt_fs_set_passno:
+ * @fs: fstab/mtab entry pointer
+ * @passno: pass number
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_fs_set_passno(mnt_fs *fs, int passno)
+{
+	assert(fs);
+	if (!fs)
+		return -1;
+	fs->passno = passno;
+	return 0;
+}
+
+/**
+ * mnt_fs_get_id:
+ * @fs: /proc/self/mountinfo entry
+ *
+ * Returns: mount ID (unique identifier of the mount) or -1 if ID undefined
+ * (for example if @fs is not mountinfo entry).
+ */
+int mnt_fs_get_id(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->id : -1;
+}
+
+/**
+ * mnt_fs_get_parent_id:
+ * @fs: /proc/self/mountinfo entry
+ *
+ * Returns: parent mount ID or -1 if ID undefined (for example if @fs is not
+ * mountinfo entry).
+ */
+int mnt_fs_get_parent_id(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->parent : -1;
+}
+
+/**
+ * mnt_fs_get_devno:
+ * @fs: /proc/self/mountinfo
+ *
+ * Returns: value of st_dev for files on filesystem or 0 in case of error.
+ */
+dev_t mnt_fs_get_devno(mnt_fs *fs)
+{
+	assert(fs);
+	return fs ? fs->devno : 0;
+}
+
+/**
+ * mnt_fs_get_option:
+ * @fs: fstab/mtab/mountinfo entry pointer
+ * @name: option name
+ * @value: returns pointer to the begin of the value (e.g. name=VALUE) or NULL
+ * @valsz: returns size of options value or 0
+ *
+ * Returns: 0 on success, 1 when not found the @name or -1 in case of error.
+ */
+int mnt_fs_get_option(mnt_fs *fs, const char *name,
+		char **value, size_t *valsz)
+{
+	char *optstr = (char *) mnt_fs_get_optstr(fs);
+	return optstr ? mnt_optstr_get_option(optstr, name, value, valsz) : 1;
+}
+
+/**
+ * mnt_fs_match_target:
+ * @fs: filesystem
+ * @target: mountpoint path
+ * @cache: tags/paths cache or NULL
+ *
+ * Possible are three attempts:
+ *	1) compare @target with @fs->target
+ *	2) realpath(@target) with @fs->target
+ *	3) realpath(@target) with realpath(@fs->target).
+ *
+ * The 2nd and 3rd attempts are not performed when @cache is NULL.
+ *
+ * Returns: 1 if @fs target is equal to @target else 0.
+ */
+int mnt_fs_match_target(mnt_fs *fs, const char *target, mnt_cache *cache)
+{
+	int rc = 0;
+
+	if (!fs || !target || !fs->target)
+		return 0;
+
+	/* 1) native paths */
+	rc = !strcmp(target, fs->target);
+
+	if (!rc && cache) {
+		/* 2) - canonicalized and non-canonicalized */
+		char *cn = mnt_resolve_path(target, cache);
+		rc = (cn && strcmp(cn, fs->target) == 0);
+
+		/* 3) - canonicalized and canonicalized */
+		if (!rc && cn) {
+			char *tcn = mnt_resolve_path(fs->target, cache);
+			rc = (tcn && strcmp(cn, tcn) == 0);
+		}
+	}
+
+	return rc;
+}
+
+/**
+ * mnt_fs_match_source:
+ * @fs: filesystem
+ * @source: tag or path (device or so)
+ * @cache: tags/paths cache or NULL
+ *
+ * Possible are four attempts:
+ *	1) compare @source with @fs->source
+ *	2) compare realpath(@source) with @fs->source
+ *	3) compare realpath(@source) with realpath(@fs->source)
+ *	4) compare realpath(@source) with evaluated tag from @fs->source
+ *
+ * The 2nd, 3rd and 4th attempts are not performed when @cache is NULL. The
+ * 2nd and 3rd attempts are not performed if @fs->source is tag.
+ *
+ * Returns: 1 if @fs source is equal to @source else 0.
+ */
+int mnt_fs_match_source(mnt_fs *fs, const char *source, mnt_cache *cache)
+{
+	char *cn;
+	const char *src, *t, *v;
+
+	if (!fs || !source || !fs->source)
+		return 0;
+
+	/* 1) native paths/tags */
+	if (!strcmp(source, fs->source))
+		return 1;
+
+	if (!cache)
+		return 0;
+	if (fs->flags & (MNT_FS_NET | MNT_FS_PSEUDO))
+		return 0;
+
+	cn = mnt_resolve_spec(source, cache);
+	if (!cn)
+		return 0;
+
+	/* 2) canonicalized and native */
+	src = mnt_fs_get_srcpath(fs);
+	if (src && !strcmp(cn, src))
+		return 1;
+
+	/* 3) canonicalized and canonicalized */
+	if (src) {
+		src = mnt_resolve_path(src, cache);
+		if (src && !strcmp(cn, src))
+			return 1;
+	}
+	if (src || mnt_fs_get_tag(fs, &t, &v))
+		/* src path does not match and tag is not defined */
+		return 0;
+
+	/* read @source's tags to the cache */
+	if (mnt_cache_read_tags(cache, cn) < 0) {
+		if (errno == EACCES) {
+			/* we don't have permissions to read TAGs from
+			 * @source, but can translate @fs tag to devname.
+			 *
+			 * (because libblkid uses udev symlinks and this is
+			 * accessible for non-root uses)
+			 */
+			char *x = mnt_resolve_tag(t, v, cache);
+			if (x && !strcmp(x, cn))
+				return 1;
+		}
+		return 0;
+	}
+
+	/* 4) has the @source a tag that matches with tag from @fs ? */
+	if (mnt_cache_device_has_tag(cache, cn, t, v))
+		return 1;
+
+	return 0;
+}
+
+/**
+ * mnt_fs_match_fstype:
+ * @fs: filesystem
+ * @types: filesystem name or comma delimited list of filesystems
+ *
+ * For more details see mnt_match_fstype().
+ *
+ * Returns: 1 if @fs type is matching to @types else 0. The function returns
+ * 0 when types is NULL.
+ */
+int mnt_fs_match_fstype(mnt_fs *fs, const char *types)
+{
+	return mnt_match_fstype(fs->fstype, types);
+}
+
+/**
+ * mnt_fs_match_options:
+ * @fs: filesystem
+ * @options: comma delimited list of options (and nooptions)
+ *
+ * For more details see mnt_match_options().
+ *
+ * Returns: 1 if @fs type is matching to @options else 0. The function returns
+ * 0 when types is NULL.
+ */
+int mnt_fs_match_options(mnt_fs *fs, const char *options)
+{
+	return mnt_match_options(fs->optstr, options);
+}
+
+/* Unfortunately the classical Unix /etc/mtab and /etc/fstab
+   do not handle directory names containing spaces.
+   Here we mangle them, replacing a space by \040.
+   What do other Unices do? */
+
+static unsigned char need_escaping[] = { ' ', '\t', '\n', '\\' };
+
+static char *mangle(const char *s)
+{
+	char *ss, *sp;
+	int n;
+
+	n = strlen(s);
+	ss = sp = malloc(4*n+1);
+	if (!sp)
+		return NULL;
+	while(1) {
+		for (n = 0; n < sizeof(need_escaping); n++) {
+			if (*s == need_escaping[n]) {
+				*sp++ = '\\';
+				*sp++ = '0' + ((*s & 0300) >> 6);
+				*sp++ = '0' + ((*s & 070) >> 3);
+				*sp++ = '0' + (*s & 07);
+				goto next;
+			}
+		}
+		*sp++ = *s;
+		if (*s == 0)
+			break;
+	next:
+		s++;
+	}
+	return ss;
+}
+
+/**
+ * mnt_fprintf_line:
+ * @f: FILE
+ * @fmt: printf-like format string (see MNT_TAB_PRINTFMT)
+ * @source: (spec) device name or tag=value
+ * @target: mountpoint
+ * @fstype: filesystem type
+ * @options: mount options
+ * @freq: dump frequency in days
+ * @passno: pass number on parallel fsck
+ *
+ * It's recommended to use this function rather than directly call fprintf() to
+ * write an entry to mtab/fstab. All data in these files has to be properly
+ * formatted (for example space within paths/tags has to be escaped, see
+ * fstab(5) for more details).
+ *
+ * Returns: return value from fprintf().
+ */
+int mnt_fprintf_line(	FILE *f,
+			const char *fmt,
+			const char *source,
+			const char *target,
+			const char *fstype,
+			const char *options,
+			int freq,
+			int passno)
+{
+	char *m1 = NULL, *m2 = NULL, *m3 = NULL, *m4 = NULL;
+	int rc = -1;
+
+	if (!f || !fmt || !source || !target || !fstype || !options)
+		return -1;
+
+	m1 = mangle(source);
+	m2 = mangle(target);
+	m3 = mangle(fstype);
+	m4 = mangle(options);
+
+	if (!m1 || !m2 || !m3 || !m4)
+		goto done;
+
+	rc = fprintf(f, fmt, m1, m2, m3, m4, freq, passno);
+done:
+	free(m1);
+	free(m2);
+	free(m3);
+	free(m4);
+
+	return rc;
+}
+
+/**
+ * mnt_fs_fprintf:
+ * @fs: fstab/mtab/mountinfo entry
+ * @f: FILE
+ * @fmt: printf-like format string (see MNT_TAB_PRINTFMT)
+ *
+ * Returns: return value from fprintf().
+ */
+int mnt_fs_fprintf(mnt_fs *fs, FILE *f, const char *fmt)
+{
+	assert(fs);
+	assert(f);
+	assert(fmt);
+
+	if (!fs || !f)
+		return -1;
+
+	return mnt_fprintf_line(f, fmt,
+			mnt_fs_get_source(fs),
+			mnt_fs_get_target(fs),
+			mnt_fs_get_fstype(fs),
+			mnt_fs_get_optstr(fs),
+			mnt_fs_get_freq(fs),
+			mnt_fs_get_passno(fs));
+}
+
+/**
+ * mnt_fs_print_debug
+ * @fs: fstab/mtab/mountinfo entry
+ * @file: output
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_fs_print_debug(mnt_fs *fs, FILE *file)
+{
+	if (!fs)
+		return -1;
+	fprintf(file, "------ fs: %p\n", fs);
+	fprintf(file, "source: %s\n", mnt_fs_get_source(fs));
+	fprintf(file, "target: %s\n", mnt_fs_get_target(fs));
+	fprintf(file, "fstype: %s\n", mnt_fs_get_fstype(fs));
+	fprintf(file, "optstr: %s\n", mnt_fs_get_optstr(fs));
+	fprintf(file, "freq:   %d\n", mnt_fs_get_freq(fs));
+	fprintf(file, "pass:   %d\n", mnt_fs_get_passno(fs));
+	fprintf(file, "id:     %d\n", mnt_fs_get_id(fs));
+	fprintf(file, "parent: %d\n", mnt_fs_get_parent_id(fs));
+	fprintf(file, "devno:  %d:%d\n", major(mnt_fs_get_devno(fs)),
+					 minor(mnt_fs_get_devno(fs)));
+
+
+	return 0;
+}
diff --git a/shlibs/mount/src/init.c b/shlibs/mount/src/init.c
new file mode 100644
index 00000000..68c13f94
--- /dev/null
+++ b/shlibs/mount/src/init.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: init
+ * @title: Library initialization
+ * @short_description: initialize debuging
+ */
+
+#include <stdlib.h>
+
+#include "mountP.h"
+
+int libmount_debug_mask;
+
+/**
+ * mnt_init_debug:
+ * @mask: debug mask (0xffff to enable full debuging)
+ *
+ * If the @mask is not specified then this function reads
+ * LIBMOUNT_DEBUG environment variable to get the mask.
+ *
+ * Already initialized debugging stuff cannot be changed. It does not
+ * have effect to call this function twice.
+ */
+void mnt_init_debug(int mask)
+{
+	if (libmount_debug_mask & DEBUG_INIT)
+		return;
+	if (!mask) {
+		char *str = mnt_getenv_safe("LIBMOUNT_DEBUG");
+		if (str)
+			libmount_debug_mask = strtoul(str, 0, 0);
+	} else
+		libmount_debug_mask = mask;
+
+	if (libmount_debug_mask)
+		printf("libmount: debug mask set to 0x%04x.\n",
+				libmount_debug_mask);
+	libmount_debug_mask |= DEBUG_INIT;
+}
diff --git a/shlibs/mount/src/iter.c b/shlibs/mount/src/iter.c
new file mode 100644
index 00000000..5c02c2a7
--- /dev/null
+++ b/shlibs/mount/src/iter.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: iter
+ * @title: Iterator
+ * @short_description: unified iterator
+ *
+ * The iterator keeps direction and last position for access to the internal
+ * library tables/lists.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "mountP.h"
+
+/**
+ * mnt_new_iter:
+ * @direction: MNT_INTER_{FOR,BACK}WARD direction
+ *
+ * Returns: newly allocated generic libmount iterator.
+ */
+mnt_iter *mnt_new_iter(int direction)
+{
+	mnt_iter *itr = calloc(1, sizeof(struct _mnt_iter));
+	if (!itr)
+		return NULL;
+	itr->direction = direction;
+	return itr;
+}
+
+/**
+ * mnt_free_iter:
+ * @itr: iterator pointer
+ *
+ * Deallocates iterator.
+ */
+void mnt_free_iter(mnt_iter *itr)
+{
+	free(itr);
+}
+
+/**
+ * mnt_reset_iter:
+ * @itr: iterator pointer
+ * @direction: MNT_INTER_{FOR,BACK}WARD or -1 to keep the derection unchanged
+ *
+ * Resets iterator.
+ */
+void mnt_reset_iter(mnt_iter *itr, int direction)
+{
+	assert(itr);
+
+	if (direction == -1)
+		direction = itr->direction;
+
+	if (itr) {
+		memset(itr, 0, sizeof(struct _mnt_iter));
+		itr->direction = direction;
+	}
+}
+
+/**
+ * mnt_iter_get_direction:
+ * @itr: iterator pointer
+ *
+ * Returns: MNT_INTER_{FOR,BACK}WARD or -1 in case of error.
+ */
+int mnt_iter_get_direction(mnt_iter *itr)
+{
+	assert(itr);
+	return itr ? itr->direction : -1;
+}
diff --git a/shlibs/mount/src/lock.c b/shlibs/mount/src/lock.c
new file mode 100644
index 00000000..0f35aa3b
--- /dev/null
+++ b/shlibs/mount/src/lock.c
@@ -0,0 +1,528 @@
+/*
+ * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: lock
+ * @title: Mtab locking
+ * @short_description: locking methods for work with /etc/mtab
+ *
+ * The lock is backwardly compatible with the standard linux /etc/mtab locking.
+ * Note, it's necessary to use the same locking schema in all application that
+ * access the file.
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <time.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <limits.h>
+
+#include "pathnames.h"
+#include "nls.h"
+
+#include "mountP.h"
+
+/*
+ * lock handler
+ */
+struct _mnt_lock {
+	pid_t	id;		/* getpid() or so (see linkfile)... */
+	char	*lockfile;	/* path to lock file (e.g. /etc/mtab~) */
+	char	*linkfile;	/* path to link file (e.g. /etc/mtab~.<id>) */
+	int	lockfile_fd;	/* lock file descriptor */
+	int	locked;		/* do we own the lock? */
+};
+
+
+/**
+ * mnt_new_lock:
+ * @lockfile: path to lockfile or NULL (default is _PATH_MOUNTED_LOCK)
+ * @id: unique linkfile identifier or 0 (default is getpid())
+ *
+ * Returns: newly allocated lock handler or NULL on case of error.
+ */
+mnt_lock *mnt_new_lock(const char *lockfile, pid_t id)
+{
+	mnt_lock *ml = calloc(1, sizeof(struct _mnt_lock));
+
+	if (!ml)
+		return NULL;
+
+	ml->lockfile_fd = -1;
+	ml->id = id;
+	if (lockfile) {
+		ml->lockfile = strdup(lockfile);
+		if (!ml->lockfile) {
+			free(ml);
+			return NULL;
+		}
+	}
+	return ml;
+}
+
+/**
+ * mnt_free_lock:
+ * @ml: mnt_lock handler
+ *
+ * Deallocates mnt_lock.
+ */
+void mnt_free_lock(mnt_lock *ml)
+{
+	if (!ml)
+		return;
+	free(ml->lockfile);
+	free(ml->linkfile);
+	free(ml);
+}
+
+/**
+ * mnt_lock_get_lockfile:
+ * @ml: mnt_lock handler
+ *
+ * Returns: path to lockfile.
+ */
+const char *mnt_lock_get_lockfile(mnt_lock *ml)
+{
+	if (!ml)
+		return NULL;
+	if (ml->lockfile)
+		return ml->lockfile;
+	return _PATH_MOUNTED_LOCK;
+}
+
+/**
+ * mnt_lock_get_linkfile:
+ * @ml: mnt_lock handler
+ *
+ * Returns: unique (per process) path to linkfile.
+ */
+const char *mnt_lock_get_linkfile(mnt_lock *ml)
+{
+	if (!ml)
+		return NULL;
+
+	if (!ml->linkfile) {
+		const char *lf = mnt_lock_get_lockfile(ml);
+		size_t sz;
+
+		if (!lf)
+			return NULL;
+		sz = strlen(lf) + 32;
+
+		ml->linkfile = malloc(sz);
+		if (ml->linkfile)
+			snprintf(ml->linkfile, sz, "%s.%d",
+					lf, ml->id ? ml->id : getpid());
+	}
+	return ml->linkfile;
+}
+
+static void mnt_lockalrm_handler(int sig)
+{
+	/* do nothing, say nothing, be nothing */
+}
+
+/*
+ * Waits for F_SETLKW, unfortunately we have to use SIGALRM here to interrupt
+ * fcntl() to avoid never ending waiting.
+ *
+ * Returns: 0 on success, 1 on timeout, -errno on error.
+ */
+static int mnt_wait_lock(mnt_lock *ml, struct flock *fl, time_t maxtime)
+{
+	struct timeval now;
+	struct sigaction sa, osa;
+	int ret = 0;
+
+	gettimeofday(&now, NULL);
+
+	if (now.tv_sec >= maxtime)
+		return 1;		/* timeout */
+
+	/* setup ALARM handler -- we don't want to wait forever */
+	sa.sa_flags = 0;
+	sa.sa_handler = mnt_lockalrm_handler;
+	sigfillset (&sa.sa_mask);
+
+	sigaction(SIGALRM, &sa, &osa);
+
+	DBG(DEBUG_LOCKS, fprintf(stderr,
+		"LOCK: (%d) waiting for F_SETLKW.\n", getpid()));
+
+	alarm(maxtime - now.tv_sec);
+	if (fcntl(ml->lockfile_fd, F_SETLKW, fl) == -1)
+		ret = errno == EINTR ? 1 : -errno;
+	alarm(0);
+
+	/* restore old sigaction */
+	sigaction(SIGALRM, &osa, NULL);
+
+	DBG(DEBUG_LOCKS, fprintf(stderr,
+		"LOCK: (%d) leaving mnt_wait_setlkw(), rc=%d.\n", getpid(), ret));
+	return ret;
+}
+
+/*
+ * Create the lock file.
+ *
+ * The old code here used flock on a lock file /etc/mtab~ and deleted
+ * this lock file afterwards. However, as rgooch remarks, that has a
+ * race: a second mount may be waiting on the lock and proceed as
+ * soon as the lock file is deleted by the first mount, and immediately
+ * afterwards a third mount comes, creates a new /etc/mtab~, applies
+ * flock to that, and also proceeds, so that the second and third mount
+ * now both are scribbling in /etc/mtab.
+ *
+ * The new code uses a link() instead of a creat(), where we proceed
+ * only if it was us that created the lock, and hence we always have
+ * to delete the lock afterwards. Now the use of flock() is in principle
+ * superfluous, but avoids an arbitrary sleep().
+ *
+ * Where does the link point to? Obvious choices are mtab and mtab~~.
+ * HJLu points out that the latter leads to races. Right now we use
+ * mtab~.<pid> instead.
+ *
+ *
+ * The original mount locking code has used sleep(1) between attempts and
+ * maximal number of attempts has been 5.
+ *
+ * There was very small number of attempts and extremely long waiting (1s)
+ * that is useless on machines with large number of mount processes.
+ *
+ * Now we wait few thousand microseconds between attempts and we have a global
+ * time limit (30s) rather than limit for number of attempts. The advantage
+ * is that this method also counts time which we spend in fcntl(F_SETLKW) and
+ * number of attempts is not restricted.
+ * -- kzak@redhat.com [Mar-2007]
+ *
+ *
+ * This mtab locking code has been refactored and moved to libmount. The mtab
+ * locking is really not perfect (e.g. SIGALRM), but it's stable, reliable and
+ * backwardly compatible code. Don't forget that this code has to be compatible
+ * with 3rd party mounts (/sbin/mount.<foo>) and has to work with NFS.
+ * -- kzak@redhat.com [May-2009]
+ */
+
+/* maximum seconds between first and last attempt */
+#define MOUNTLOCK_MAXTIME		30
+
+/* sleep time (in microseconds, max=999999) between attempts */
+#define MOUNTLOCK_WAITTIME		5000
+
+/* Remove lock file.  */
+void mnt_unlock_file(mnt_lock *ml)
+{
+	if (!ml)
+		return;
+
+	DBG(DEBUG_LOCKS, fprintf(stderr, "LOCK: (%d) unlocking/cleaning.\n", getpid()));
+
+	if (ml->locked == 0 && ml->lockfile && ml->linkfile)
+	{
+		/* We have (probably) all files, but we don't own the lock,
+		 * Really? Check it! Maybe ml->locked wasn't set properly
+		 * because code was interrupted by signal. Paranoia? Yes.
+		 *
+		 * We own the lock when linkfile == lockfile.
+		 */
+		struct stat lo, li;
+
+		if (!stat(ml->lockfile, &lo) && !stat(ml->linkfile, &li) &&
+		    lo.st_dev == li.st_dev && lo.st_ino == li.st_ino)
+			ml->locked = 1;
+	}
+	if (ml->linkfile)
+		unlink(ml->linkfile);
+	if (ml->lockfile_fd >= 0)
+		close(ml->lockfile_fd);
+	if (ml->locked == 1 && ml->lockfile)
+		unlink(ml->lockfile);
+
+	ml->locked = 0;
+	ml->lockfile_fd = -1;
+}
+
+/**
+ * mnt_lock_file
+ * @ml: pointer to mnt_lock instance
+ *
+ * Creates lock file (e.g. /etc/mtab~). Note that this function uses
+ * alarm().
+ *
+ * Your application has to always call mnt_unlock_file() before exit.
+ *
+ * Locking scheme:
+ *
+ *   1. create linkfile (e.g. /etc/mtab~.$PID)
+ *   2. link linkfile --> lockfile (e.g. /etc/mtab~.$PID --> /etc/mtab~)
+ *
+ *   3. a) link() success: setups F_SETLK lock (see fcnlt(2))
+ *      b) link() failed:  wait (max 30s) on F_SETLKW lock, goto 2.
+ *
+ * Example:
+ *
+ * <informalexample>
+ *   <programlisting>
+ *	mnt_lock *ml;
+ *
+ *	void unlock_fallback(void)
+ *	{
+ *		if (!ml)
+ *			return;
+ *		mnt_unlock_file(ml);
+ *		mnt_free_lock(ml);
+ *	}
+ *
+ *	int update_mtab()
+ *	{
+ *		int sig = 0;
+ *
+ *		atexit(unlock_fallback);
+ *
+ *		ml = mnt_new_lock(NULL, 0);
+ *
+ *		if (mnt_lock_file(ml) != 0) {
+ *			printf(stderr, "cannot create %s lockfile\n",
+ *					mnt_lock_get_lockfile(ml));
+ *			return -1;
+ *		}
+ *
+ *		... modify mtab ...
+ *
+ *		mnt_unlock_file(ml);
+ *		mnt_free_lock(ml);
+ *		ml = NULL;
+ *		return 0;
+ *	}
+ *   </programlisting>
+ * </informalexample>
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_lock_file(mnt_lock *ml)
+{
+	int i;
+	struct timespec waittime;
+	struct timeval maxtime;
+	const char *lockfile, *linkfile;
+
+	if (!ml)
+		return -1;
+	if (ml->locked)
+		return 0;
+
+	lockfile = mnt_lock_get_lockfile(ml);
+	if (!lockfile)
+		return -1;
+	linkfile = mnt_lock_get_linkfile(ml);
+	if (!linkfile)
+		return -1;
+
+	i = open(linkfile, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR);
+	if (i < 0)
+		/* linkfile does not exist (as a file)
+		   and we cannot create it. Read-only filesystem?
+		   Too many files open in the system?
+		   Filesystem full? */
+		goto failed;
+
+	close(i);
+
+	gettimeofday(&maxtime, NULL);
+	maxtime.tv_sec += MOUNTLOCK_MAXTIME;
+
+	waittime.tv_sec = 0;
+	waittime.tv_nsec = (1000 * MOUNTLOCK_WAITTIME);
+
+	/* Repeat until it was us who made the link */
+	while (ml->locked == 0) {
+		struct timeval now;
+		struct flock flock;
+		int j;
+
+		j = link(linkfile, lockfile);
+		if (j == 0)
+			ml->locked = 1;
+
+		if (j < 0 && errno != EEXIST)
+			goto failed;
+
+		ml->lockfile_fd = open(lockfile, O_WRONLY);
+
+		if (ml->lockfile_fd < 0) {
+			/* Strange... Maybe the file was just deleted? */
+			int errsv = errno;
+			gettimeofday(&now, NULL);
+			if (errsv == ENOENT && now.tv_sec < maxtime.tv_sec) {
+				ml->locked = 0;
+				continue;
+			}
+			goto failed;
+		}
+
+		flock.l_type = F_WRLCK;
+		flock.l_whence = SEEK_SET;
+		flock.l_start = 0;
+		flock.l_len = 0;
+
+		if (ml->locked) {
+			/* We made the link. Now claim the lock. */
+			if (fcntl (ml->lockfile_fd, F_SETLK, &flock) == -1) {
+				DBG(DEBUG_LOCKS, fprintf(stderr,
+					"%s: can't F_SETLK lockfile, errno=%d\n",
+					lockfile, errno));
+				/* proceed, since it was us who created the lockfile anyway */
+			}
+			break;
+		} else {
+			/* Someone else made the link. Wait. */
+			int err = mnt_wait_lock(ml, &flock, maxtime.tv_sec);
+
+			if (err == 1) {
+				DBG(DEBUG_LOCKS, fprintf(stderr,
+					"%s: can't create link: time out (perhaps "
+					"there is a stale lock file?)", lockfile));
+				goto failed;
+
+			} else if (err < 0)
+				goto failed;
+
+			nanosleep(&waittime, NULL);
+			close(ml->lockfile_fd);
+			ml->lockfile_fd = -1;
+		}
+	}
+	DBG(DEBUG_LOCKS, fprintf(stderr,
+			"LOCK: %s: (%d) successfully locked\n",
+			ml->lockfile, getpid()));
+	unlink(linkfile);
+	return 0;
+
+failed:
+	mnt_unlock_file(ml);
+	return -1;
+}
+
+#ifdef TEST_PROGRAM
+#include <err.h>
+
+mnt_lock *lock;
+
+/*
+ * read number from @filename, increment the number and
+ * write the number back to the file
+ */
+void increment_data(const char *filename, int verbose, int loopno)
+{
+	long num;
+	FILE *f;
+	char buf[256];
+
+	if (!(f = fopen(filename, "r")))
+		err(EXIT_FAILURE, "%d: failed to open: %s", getpid(), filename);
+
+	if (!fgets(buf, sizeof(buf), f))
+		err(EXIT_FAILURE, "%d failed read: %s", getpid(), filename);
+
+	fclose(f);
+	num = atol(buf) + 1;
+
+	if (!(f = fopen(filename, "w")))
+		err(EXIT_FAILURE, "%d: failed to open: %s", getpid(), filename);
+
+	fprintf(f, "%ld", num);
+	fclose(f);
+
+	if (verbose)
+		fprintf(stderr, "%d: %s: %ld --> %ld (loop=%d)\n", getpid(),
+				filename, num - 1, num, loopno);
+}
+
+void clean_lock(void)
+{
+	fprintf(stderr, "%d: cleaning\n", getpid());
+	if (!lock)
+		return;
+	mnt_unlock_file(lock);
+	mnt_free_lock(lock);
+}
+
+void sig_handler(int sig)
+{
+	errx(EXIT_FAILURE, "\n%d: catch signal: %s\n", getpid(), strsignal(sig));
+}
+
+int test_lock(struct mtest *ts, int argc, char *argv[])
+{
+	const char *lockfile, *datafile;
+	int verbose = 0, loops, l;
+
+	if (argc < 4)
+		return -1;
+
+	lockfile = argv[1];
+	datafile = argv[2];
+	loops = atoi(argv[3]);
+
+	if (argc == 5 && strcmp(argv[4], "--verbose") == 0)
+		verbose = 1;
+
+	atexit(clean_lock);
+
+	/* be paranoid and call exit() (=clean_lock()) for all signals */
+	{
+		int sig = 0;
+		struct sigaction sa;
+
+		sa.sa_handler = sig_handler;
+		sa.sa_flags = 0;
+		sigfillset(&sa.sa_mask);
+
+		while (sigismember(&sa.sa_mask, ++sig) != -1 && sig != SIGCHLD)
+			sigaction (sig, &sa, (struct sigaction *) 0);
+	}
+
+	for (l = 0; l < loops; l++) {
+		lock = mnt_new_lock(lockfile, 0);
+
+		if (mnt_lock_file(lock) == -1) {
+			fprintf(stderr, "%d: failed to create lock file: %s\n",
+					getpid(), lockfile);
+			return -1;
+		}
+
+		increment_data(datafile, verbose, l);
+
+		mnt_unlock_file(lock);
+		mnt_free_lock(lock);
+		lock = NULL;
+	}
+
+	return 0;
+}
+
+/*
+ * Note that this test should be executed from a script that creates many
+ * parallel processes, otherwise this test does not make sense.
+ */
+int main(int argc, char *argv[])
+{
+	struct mtest tss[] = {
+	{ "--lock", test_lock,  "  <lockfile> <datafile> <loops> [--verbose]   increment number in datafile" },
+	{ NULL }
+	};
+
+	return mnt_run_test(tss, argc, argv);
+}
+
+#endif /* TEST_PROGRAM */
diff --git a/shlibs/mount/src/mount.h.in b/shlibs/mount/src/mount.h.in
new file mode 100644
index 00000000..cd9159cc
--- /dev/null
+++ b/shlibs/mount/src/mount.h.in
@@ -0,0 +1,407 @@
+/*
+ * mount.h - libmount API
+ *
+ * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ */
+
+#ifndef _LIBMOUNT_MOUNT_H
+#define _LIBMOUNT_MOUNT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef USE_UNSTABLE_LIBMOUNT_API
+# warning libmount API is not stable yet!
+#endif
+
+#include <stdio.h>
+
+
+#define LIBMOUNT_VERSION   "@LIBMOUNT_VERSION@"
+
+/**
+ * mnt_cache:
+ *
+ * Stores canonicalized paths and evaluated tags
+ */
+typedef struct _mnt_cache mnt_cache;
+
+/**
+ * mnt_lock:
+ *
+ * Stores information about locked file (e.g. /etc/mtab)
+ */
+typedef struct _mnt_lock mnt_lock;
+
+/**
+ * mnt_iter:
+ *
+ * Generic iterator (stores state about lists)
+ */
+typedef struct _mnt_iter mnt_iter;
+
+/**
+ * mnt_optls:
+ *
+ * Mount options list (stores parsed mount options)
+ */
+typedef struct _mnt_optls mnt_optls;
+
+/**
+ * mnt_optent:
+ *
+ * Parsed mount option - "mnt_optls" entry
+ */
+typedef struct _mnt_optent mnt_optent;
+
+/**
+ * mnt_optmap:
+ *
+ * Mount options description (map)
+ */
+struct mnt_optmap
+{
+	const char	*name;	 /* option name[=%<type>] (e.g. "loop[=%s]") */
+	int		id;	 /* option ID or MS_* flags (e.g MS_RDONLY) */
+	int		mask;	 /* MNT_{MFLAG,MDATA,INVMASK,...} mask */
+};
+
+/*
+ * mount options map masks
+ */
+#define MNT_MFLAG	(1 << 1) /* use the mask as mount(2) flag */
+#define MNT_MDATA	(1 << 2) /* use the option as mount(2) data */
+#define MNT_INVERT	(1 << 3) /* invert the mountflag */
+#define MNT_NOMTAB	(1 << 4) /* skip in the mtab option string */
+
+/**
+ * mnt_fs:
+ *
+ * Parsed fstab/mtab/mountinfo entry
+ */
+typedef struct _mnt_fs mnt_fs;
+
+/**
+ * mnt_tab:
+ *
+ * List of mnt_fs entries (parsed fstab/mtab/mountinfo)
+ */
+typedef struct _mnt_tab mnt_tab;
+
+/* init.c */
+extern void mnt_init_debug(int mask);
+
+/* version.c */
+extern int mnt_parse_version_string(const char *ver_string);
+extern int mnt_get_library_version(const char **ver_string);
+
+/* utils.c */
+extern int mnt_fstype_is_netfs(const char *type);
+extern int mnt_fstype_is_pseudofs(const char *type);
+extern int mnt_match_fstype(const char *type, const char *pattern);
+extern int mnt_match_options(const char *optstr, const char *pattern);
+
+/* cache.c */
+extern mnt_cache *mnt_new_cache(void);
+extern void mnt_free_cache(mnt_cache *cache);
+extern const char *mnt_cache_find_path(mnt_cache *cache, const char *path);
+extern const char *mnt_cache_find_tag(mnt_cache *cache,
+                        const char *token, const char *value);
+extern int mnt_cache_read_tags(mnt_cache *cache, const char *devname);
+extern int mnt_cache_device_has_tag(mnt_cache *cache, const char *devname,
+                                const char *token, const char *value);
+
+extern char *mnt_cache_find_tag_value(mnt_cache *cache,
+				const char *devname, const char *token);
+
+extern char *mnt_resolve_path(const char *path, mnt_cache *cache);
+extern char *mnt_resolve_tag(const char *token, const char *value, mnt_cache *cache);
+extern char *mnt_resolve_spec(const char *spec, mnt_cache *cache);
+
+/* optstr.c */
+extern int mnt_optstr_next_option(char **optstr, char **name, size_t *namesz,
+				char **value, size_t *valuesz);
+extern int mnt_optstr_append_option(char **optstr, const char *name,
+				const char *value);
+extern int mnt_optstr_get_option(char *optstr, const char *name,
+				char **value, size_t *valsz);
+extern int mnt_optstr_set_option(char **optstr, const char *name,
+				const char *value);
+extern int mnt_optstr_remove_option(char **optstr, const char *name);
+
+/* iter.c */
+enum {
+
+	MNT_ITER_FORWARD = 0,
+	MNT_ITER_BACKWARD
+};
+extern mnt_iter *mnt_new_iter(int direction);
+extern void mnt_free_iter(mnt_iter *mi);
+extern void mnt_reset_iter(mnt_iter *mi, int direction);
+extern int mnt_iter_get_direction(mnt_iter *itr);
+
+/* optmap.c */
+enum {
+	MNT_LINUX_MAP = 1,
+	MNT_USERSPACE_MAP
+};
+extern const struct mnt_optmap *mnt_get_builtin_optmap(int id);
+
+/* optent.c */
+extern const struct mnt_optmap *mnt_optent_get_map(mnt_optent *op);
+extern const struct mnt_optmap *mnt_optent_get_mapent(mnt_optent *op);
+extern const char *mnt_optent_get_type(mnt_optent *op);
+extern int mnt_optent_set_value(mnt_optent *op, const char *data);
+extern int mnt_optent_has_value(mnt_optent *op);
+extern int mnt_optent_require_value(mnt_optent *op);
+extern int mnt_optent_is_inverted(mnt_optent *op);
+extern int mnt_optent_strtoul_value(mnt_optent *op, unsigned long int *number);
+extern int mnt_optent_strtol_value(mnt_optent *op, long int *number);
+extern int mnt_optent_strtoull_value(mnt_optent *op, unsigned long long int *number);
+extern const char *mnt_optent_get_value(mnt_optent *op);
+extern int mnt_optent_strlen_value(mnt_optent *op);
+extern int mnt_optent_snprintf_value(mnt_optent *op, char *str, size_t size);
+extern char *mnt_optent_dup_value(mnt_optent *op);
+extern const char *mnt_optent_get_name(mnt_optent *op);
+extern int mnt_optent_get_mask(mnt_optent *op);
+extern int mnt_optent_get_id(mnt_optent *op);
+extern int mnt_optent_get_flag(mnt_optent *op, int *flags);
+extern int mnt_optent_is_unknown(mnt_optent *op);
+extern int mnt_optent_print_debug(mnt_optent *op, FILE *file);
+
+/* optls.c */
+extern mnt_optls *mnt_new_optls(void);
+extern void mnt_free_optls(mnt_optls *ls);
+extern int mnt_optls_add_map(mnt_optls *ls, const struct mnt_optmap *map);
+extern int mnt_optls_add_builtin_map(mnt_optls *ls, int id);
+extern mnt_optent *mnt_optls_add_option(mnt_optls *ls,
+                        const char *name, const char *value);
+extern int mnt_optls_parse_optstr(mnt_optls *ls, const char *optstr);
+extern int mnt_optls_remove_option(mnt_optls *ls, const char *name);
+extern int mnt_optls_remove_option_by_flags(mnt_optls *ls,
+                const struct mnt_optmap *map, const int flags);
+extern int mnt_optls_remove_option_by_iflags(mnt_optls *ls,
+                const struct mnt_optmap *map, const int flags);
+extern int mnt_optls_next_option(mnt_optls *ls, mnt_iter *itr,
+                const struct mnt_optmap *map, mnt_optent **option);
+extern mnt_optent *mnt_optls_get_option(mnt_optls *ls, const char *name);
+extern int mnt_optls_get_ids(mnt_optls *ls, const struct mnt_optmap *map);
+extern int mnt_optls_create_mountflags(mnt_optls *ls);
+extern char *mnt_optls_create_mountdata(mnt_optls *ls);
+extern char *mnt_optls_create_mtab_optstr(mnt_optls *ls);
+extern char *mnt_optls_create_userspace_optstr(mnt_optls *ls);
+extern int mnt_optls_print_debug(mnt_optls *ls, FILE *file);
+
+/* lock.c */
+extern mnt_lock *mnt_new_lock(const char *lockfile, pid_t id);
+extern void mnt_free_lock(mnt_lock *ml);
+extern const char *mnt_lock_get_lockfile(mnt_lock *ml);
+extern const char *mnt_lock_get_linkfile(mnt_lock *ml);
+extern void mnt_unlock_file(mnt_lock *ml);
+extern int mnt_lock_file(mnt_lock *ml);
+
+/* fs.c */
+extern mnt_fs *mnt_new_fs(void);
+extern void mnt_free_fs(mnt_fs *ent);
+extern void *mnt_fs_get_userdata(mnt_fs *fs);
+extern int mnt_fs_set_userdata(mnt_fs *fs, void *data);
+extern const char *mnt_fs_get_source(mnt_fs *ent);
+extern int mnt_fs_set_source(mnt_fs *ent, const char *source);
+extern const char *mnt_fs_get_srcpath(mnt_fs *ent);
+extern int mnt_fs_get_tag(mnt_fs *ent, const char **name, const char **value);
+extern const char *mnt_fs_get_target(mnt_fs *ent);
+extern int mnt_fs_set_target(mnt_fs *ent, const char *target);
+extern const char *mnt_fs_get_fstype(mnt_fs *ent);
+extern int mnt_fs_set_fstype(mnt_fs *ent, const char *fstype);
+extern const char *mnt_fs_get_optstr(mnt_fs *ent);
+extern int mnt_fs_set_optstr(mnt_fs *ent, const char *optstr);
+extern const char *mnt_fs_get_vfs_optstr(mnt_fs *ent);
+extern const char *mnt_fs_get_fs_optstr(mnt_fs *ent);
+extern int mnt_fs_get_freq(mnt_fs *ent);
+extern int mnt_fs_set_freq(mnt_fs *ent, int freq);
+extern int mnt_fs_get_passno(mnt_fs *ent);
+extern int mnt_fs_set_passno(mnt_fs *ent, int passno);
+extern int mnt_fs_get_id(mnt_fs *fs);
+extern int mnt_fs_get_parent_id(mnt_fs *fs);
+extern dev_t mnt_fs_get_devno(mnt_fs *fs);
+extern int mnt_fs_get_option(mnt_fs *ent, const char *name,
+				char **value, size_t *valsz);
+
+extern int mnt_fs_match_target(mnt_fs *fs, const char *target, mnt_cache *cache);
+extern int mnt_fs_match_source(mnt_fs *fs, const char *source, mnt_cache *cache);
+extern int mnt_fs_match_fstype(mnt_fs *fs, const char *types);
+extern int mnt_fs_match_options(mnt_fs *fs, const char *options);
+
+/* mtab/fstab line */
+#define MNT_TAB_PRINTFMT	"%s %s %s %s %d %d\n"
+
+extern int mnt_fprintf_line(
+                        FILE *f,
+                        const char *fmt,
+                        const char *source,
+                        const char *target,
+                        const char *fstype,
+                        const char *options,
+                        int freq,
+                        int passno);
+
+extern int mnt_fs_fprintf(mnt_fs *ent, FILE *f, const char *fmt);
+extern int mnt_fs_print_debug(mnt_fs *ent, FILE *file);
+
+/* tab-parse.c */
+extern mnt_tab *mnt_new_tab_from_file(const char *filename);
+extern int mnt_tab_parse_file(mnt_tab *tb);
+extern char *mnt_tab_strerror(mnt_tab *tb, char *buf, size_t buflen);
+extern int mnt_tab_get_nerrs(mnt_tab *tb);
+
+/* tab.c */
+extern mnt_tab *mnt_new_tab(const char *filename);
+extern void mnt_free_tab(mnt_tab *tb);
+extern int mnt_tab_get_nents(mnt_tab *tb);
+extern int mnt_tab_set_cache(mnt_tab *tb, mnt_cache *mpc);
+extern mnt_cache *mnt_tab_get_cache(mnt_tab *tb);
+extern const char *mnt_tab_get_name(mnt_tab *tb);
+extern int mnt_tab_add_fs(mnt_tab *tb, mnt_fs *fs);
+extern int mnt_tab_remove_fs(mnt_tab *tb, mnt_fs *fs);
+extern int mnt_tab_next_fs(mnt_tab *tb, mnt_iter *itr, mnt_fs **fs);
+extern int mnt_tab_next_child_fs(mnt_tab *tb, mnt_iter *itr,
+	                        mnt_fs *parent, mnt_fs **chld);
+extern int mnt_tab_get_root_fs(mnt_tab *tb, mnt_fs **root);
+extern int mnt_tab_set_iter(mnt_tab *tb, mnt_iter *itr, mnt_fs *fs);
+
+extern mnt_fs *mnt_tab_find_target(mnt_tab *tb, const char *path, int direction);
+extern mnt_fs *mnt_tab_find_srcpath(mnt_tab *tb, const char *path, int direction);
+extern mnt_fs *mnt_tab_find_tag(mnt_tab *tb, const char *tag,
+				const char *val, int direction);
+extern mnt_fs *mnt_tab_find_source(mnt_tab *tb, const char *source, int direction);
+
+extern int mnt_tab_find_next_fs(mnt_tab *tb, mnt_iter *itr,
+			int (*match_func)(mnt_fs *, void *), void *userdata,
+		        mnt_fs **fs);
+
+extern int mnt_tab_fprintf(mnt_tab *tb, FILE *f, const char *fmt);
+extern int mnt_tab_update_file(mnt_tab *tb);
+
+
+/*
+ * mount(8) userspace options masks (MNT_MAP_USERSPACE map)
+ */
+#define MNT_MS_DFLTS	(1 << 1)
+#define MNT_MS_NOAUTO	(1 << 2)
+#define MNT_MS_USER	(1 << 3)
+#define MNT_MS_USERS	(1 << 4)
+#define MNT_MS_OWNER	(1 << 5)
+#define MNT_MS_GROUP	(1 << 6)
+#define MNT_MS_NETDEV	(1 << 7)
+#define MNT_MS_COMMENT  (1 << 8)
+#define MNT_MS_LOOP     (1 << 9)
+#define MNT_MS_NOFAIL   (1 << 10)
+
+/*
+ * mount(2) MS_* masks (MNT_MAP_LINUX map)
+ */
+#ifndef MS_RDONLY
+#define MS_RDONLY	 1	/* Mount read-only */
+#endif
+#ifndef MS_NOSUID
+#define MS_NOSUID	 2	/* Ignore suid and sgid bits */
+#endif
+#ifndef MS_NODEV
+#define MS_NODEV	 4	/* Disallow access to device special files */
+#endif
+#ifndef MS_NOEXEC
+#define MS_NOEXEC	 8	/* Disallow program execution */
+#endif
+#ifndef MS_SYNCHRONOUS
+#define MS_SYNCHRONOUS	16	/* Writes are synced at once */
+#endif
+#ifndef MS_REMOUNT
+#define MS_REMOUNT	32	/* Alter flags of a mounted FS */
+#endif
+#ifndef MS_MANDLOCK
+#define MS_MANDLOCK	64	/* Allow mandatory locks on an FS */
+#endif
+#ifndef MS_DIRSYNC
+#define MS_DIRSYNC	128	/* Directory modifications are synchronous */
+#endif
+#ifndef MS_NOATIME
+#define MS_NOATIME	0x400	/* 1024: Do not update access times. */
+#endif
+#ifndef MS_NODIRATIME
+#define MS_NODIRATIME   0x800	/* 2048: Don't update directory access times */
+#endif
+#ifndef MS_BIND
+#define	MS_BIND		0x1000	/* 4096: Mount existing tree also elsewhere */
+#endif
+#ifndef MS_MOVE
+#define MS_MOVE		0x2000	/* 8192: Atomically move tree */
+#endif
+#ifndef MS_REC
+#define MS_REC		0x4000	/* 16384: Recursive loopback */
+#endif
+#ifndef MS_VERBOSE
+#define MS_VERBOSE	0x8000	/* 32768 */
+#endif
+#ifndef MS_RELATIME
+#define MS_RELATIME	0x200000 /* 200000: Update access times relative
+                                  to mtime/ctime */
+#endif
+#ifndef MS_UNBINDABLE
+#define MS_UNBINDABLE	(1<<17)	/* 131072 unbindable*/
+#endif
+#ifndef MS_PRIVATE
+#define MS_PRIVATE	(1<<18)	/* 262144 Private*/
+#endif
+#ifndef MS_SLAVE
+#define MS_SLAVE	(1<<19)	/* 524288 Slave*/
+#endif
+#ifndef MS_SHARED
+#define MS_SHARED	(1<<20)	/* 1048576 Shared*/
+#endif
+#ifndef MS_I_VERSION
+#define MS_I_VERSION	(1<<23)	/* update inode I_version field */
+#endif
+#ifndef MS_STRICTATIME
+#define MS_STRICTATIME	(1<<24) /* strict atime semantics */
+#endif
+
+/*
+ * Magic mount flag number. Had to be or-ed to the flag values.
+ */
+#ifndef MS_MGC_VAL
+#define MS_MGC_VAL 0xC0ED0000	/* magic flag number to indicate "new" flags */
+#endif
+#ifndef MS_MGC_MSK
+#define MS_MGC_MSK 0xffff0000	/* magic flag number mask */
+#endif
+
+
+/* Shared-subtree options */
+#define MS_PROPAGATION  (MS_SHARED|MS_SLAVE|MS_UNBINDABLE|MS_PRIVATE)
+
+/* Options that we make ordinary users have by default.  */
+#define MS_SECURE	(MS_NOEXEC|MS_NOSUID|MS_NODEV)
+
+/* Options that we make owner-mounted devices have by default */
+#define MS_OWNERSECURE	(MS_NOSUID|MS_NODEV)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _LIBMOUNT_MOUNT_H */
diff --git a/shlibs/mount/src/mount.sym b/shlibs/mount/src/mount.sym
new file mode 100644
index 00000000..819be0f1
--- /dev/null
+++ b/shlibs/mount/src/mount.sym
@@ -0,0 +1,134 @@
+/*
+ * The symbol versioning ensures that a new application requiring symbol foo;
+ * can't run with old libblkid.so not providing foo;
+ * version info can't enforce this since we never change the SONAME.
+ */
+MOUNT_2.18 {
+global:
+	mnt_cache_device_has_tag;
+	mnt_cache_find_path;
+	mnt_cache_find_tag;
+	mnt_cache_find_tag_value;
+	mnt_cache_read_tags;
+	mnt_fprintf_line;
+	mnt_free_cache;
+	mnt_free_fs;
+	mnt_free_iter;
+	mnt_free_lock;
+	mnt_free_optls;
+	mnt_free_tab;
+	mnt_fs_fprintf;
+	mnt_fs_get_devno;
+	mnt_fs_get_freq;
+	mnt_fs_get_fstype;
+	mnt_fs_get_id;
+	mnt_fs_get_fs_optstr;
+	mnt_fs_get_option;
+	mnt_fs_get_optstr;
+	mnt_fs_get_vfs_optstr;
+	mnt_fs_get_parent_id;
+	mnt_fs_get_passno;
+	mnt_fs_get_source;
+	mnt_fs_get_srcpath;
+	mnt_fs_get_tag;
+	mnt_fs_get_target;
+	mnt_fs_get_userdata;
+	mnt_fs_match_fstype;
+	mnt_fs_match_options;
+	mnt_fs_match_source;
+	mnt_fs_match_target;
+	mnt_fs_print_debug;
+	mnt_fs_set_freq;
+	mnt_fs_set_fstype;
+	mnt_fs_set_optstr;
+	mnt_fs_set_passno;
+	mnt_fs_set_source;
+	mnt_fs_set_target;
+	mnt_fs_set_userdata;
+	mnt_fstype_is_netfs;
+	mnt_fstype_is_pseudofs;
+	mnt_get_builtin_optmap;
+	mnt_get_library_version;
+	mnt_iter_get_direction;
+	mnt_lock_file;
+	mnt_lock_get_linkfile;
+	mnt_lock_get_lockfile;
+	mnt_match_fstype;
+	mnt_match_options;
+	mnt_new_cache;
+	mnt_new_fs;
+	mnt_new_iter;
+	mnt_new_lock;
+	mnt_new_optls;
+	mnt_new_tab;
+	mnt_new_tab_from_file;
+	mnt_optent_dup_value;
+	mnt_optent_get_flag;
+	mnt_optent_get_id;
+	mnt_optent_get_map;
+	mnt_optent_get_mapent;
+	mnt_optent_get_mask;
+	mnt_optent_get_name;
+	mnt_optent_get_type;
+	mnt_optent_get_value;
+	mnt_optent_has_value;
+	mnt_optent_is_inverted;
+	mnt_optent_is_unknown;
+	mnt_optent_print_debug;
+	mnt_optent_require_value;
+	mnt_optent_set_value;
+	mnt_optent_snprintf_value;
+	mnt_optent_strlen_value;
+	mnt_optent_strtol_value;
+	mnt_optent_strtoull_value;
+	mnt_optent_strtoul_value;
+	mnt_optls_add_builtin_map;
+	mnt_optls_add_map;
+	mnt_optls_add_option;
+	mnt_optls_create_mountdata;
+	mnt_optls_create_mountflags;
+	mnt_optls_create_mtab_optstr;
+	mnt_optls_create_userspace_optstr;
+	mnt_optls_get_ids;
+	mnt_optls_get_option;
+	mnt_optls_next_option;
+	mnt_optls_parse_optstr;
+	mnt_optls_print_debug;
+	mnt_optls_remove_option;
+	mnt_optls_remove_option_by_flags;
+	mnt_optls_remove_option_by_iflags;
+	mnt_optstr_append_option;
+	mnt_optstr_get_option;
+	mnt_optstr_next_option;
+	mnt_optstr_remove_option;
+	mnt_optstr_set_option;
+	mnt_parse_version_string;
+	mnt_reset_iter;
+	mnt_resolve_path;
+	mnt_resolve_spec;
+	mnt_resolve_tag;
+	mnt_tab_add_fs;
+	mnt_tab_find_next_fs;
+	mnt_tab_find_source;
+	mnt_tab_find_srcpath;
+	mnt_tab_find_tag;
+	mnt_tab_find_target;
+	mnt_tab_fprintf;
+	mnt_tab_get_cache;
+	mnt_tab_get_name;
+	mnt_tab_get_nents;
+	mnt_tab_get_nerrs;
+	mnt_tab_get_root_fs;
+	mnt_tab_next_child_fs;
+	mnt_tab_next_fs;
+	mnt_tab_parse_file;
+	mnt_tab_remove_fs;
+	mnt_tab_set_cache;
+	mnt_tab_set_iter;
+	mnt_tab_strerror;
+	mnt_tab_update_file;
+	mnt_unlock_file;
+	mnt_init_debug;
+local:
+	*;
+};
diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h
new file mode 100644
index 00000000..ddd86ea2
--- /dev/null
+++ b/shlibs/mount/src/mountP.h
@@ -0,0 +1,222 @@
+/*
+ * mountP.h - private library header file
+ *
+ * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+#ifndef _LIBMOUNT_PRIVATE_H
+#define _LIBMOUNT_PRIVATE_H
+
+#include <sys/types.h>
+
+#define USE_UNSTABLE_LIBMOUNT_API
+
+#include "mount.h"
+#include "list.h"
+
+/* features */
+#define CONFIG_LIBMOUNT_ASSERT
+#define CONFIG_LIBMOUNT_DEBUG
+
+#ifdef CONFIG_LIBMOUNT_ASSERT
+#include <assert.h>
+#endif
+
+/*
+ * Debug
+ */
+#if defined(TEST_PROGRAM) && !defined(LIBMOUNT_DEBUG)
+#define CONFIG_LIBMOUNT_DEBUG
+#endif
+
+#define DEBUG_INIT	(1 << 1)
+#define DEBUG_CACHE	(1 << 2)
+#define DEBUG_OPTIONS	(1 << 3)
+#define DEBUG_LOCKS	(1 << 4)
+#define DEBUG_TAB	(1 << 5)
+#define DEBUG_ALL	0xFFFF
+
+#ifdef CONFIG_LIBMOUNT_DEBUG
+#include <stdio.h>
+extern int libmount_debug_mask;
+#define DBG(m,x)	if ((m) & libmount_debug_mask) x
+#else
+#define DBG(m,x)
+#endif
+
+#ifdef TEST_PROGRAM
+struct mtest {
+	const char	*name;
+	int		(*body)(struct mtest *ts, int argc, char *argv[]);
+	const char	*usage;
+};
+
+/* utils.c */
+extern int mnt_run_test(struct mtest *tests, int argc, char *argv[]);
+#endif
+
+/* utils.c */
+extern char *mnt_getenv_safe(const char *arg);
+#ifndef HAVE_STRNLEN
+extern size_t strnlen(const char *s, size_t maxlen);
+#endif
+#ifndef HAVE_STRNDUP
+extern char *strndup(const char *s, size_t n);
+#endif
+#ifndef HAVE_STRNCHR
+extern char *strnchr(const char *s, size_t maxlen, int c);
+#endif
+extern char *mnt_get_username(const uid_t uid);
+extern char *mnt_strconcat3(char *s, const char *t, const char *u);
+
+
+/*
+ * Generic iterator
+ */
+struct _mnt_iter {
+        struct list_head        *p;		/* current position */
+        struct list_head        *head;		/* start position */
+	int			direction;	/* MNT_ITER_{FOR,BACK}WARD */
+};
+
+#define IS_ITER_FORWARD(_i)	((_i)->direction == MNT_ITER_FORWARD)
+#define IS_ITER_BACKWARD(_i)	((_i)->direction == MNT_ITER_BACKWARD)
+
+#define MNT_ITER_INIT(itr, list) \
+	do { \
+		(itr)->p = IS_ITER_FORWARD(itr) ? \
+				(list)->next : (list)->prev; \
+		(itr)->head = (list); \
+	} while(0)
+
+#define MNT_ITER_ITERATE(itr, res, restype, member) \
+	do { \
+		res = list_entry((itr)->p, restype, member); \
+		(itr)->p = IS_ITER_FORWARD(itr) ? \
+				(itr)->p->next : (itr)->p->prev; \
+	} while(0)
+
+
+/*
+ * mnt_optls entry
+ */
+struct _mnt_optent {
+	char			*name;	/* option name (allcocated when mapent is NULL) */
+	char			*value;	/* option argument value */
+
+	int			mask;	/* MNT_{INVMASK,MDATA,MFLAG,NOMTAB,NOSYS}
+					 * modifiable flags (initial value comes from map->mask)
+					 */
+	const struct mnt_optmap	*mapent;/* the option description (msp entry) */
+	const struct mnt_optmap	*map;   /* head of the map */
+
+	struct list_head	opts;	/* list of options */
+};
+
+/*
+ * Container (list) for mount options
+ */
+struct _mnt_optls {
+	struct mnt_optmap const	**maps;	/* array with option maps */
+	size_t			nmaps;	/* number of maps */
+
+	struct list_head	opts;	/* list of options */
+};
+
+/*
+ * This struct represents one entry in mtab/fstab/mountinfo file.
+ */
+struct _mnt_fs {
+	struct list_head ents;
+
+	int		id;		/* mountinfo[1]: ID */
+	int		parent;		/* moutninfo[2]: parent */
+	dev_t		devno;		/* moutninfo[3]: st_dev */
+
+	char		*source;	/* fstab[1]: mountinfo[10]:
+                                         * source dev, file, dir or TAG */
+	char		*tagname;	/* fstab[1]: tag name - "LABEL", "UUID", ..*/
+	char		*tagval;	/*           tag value */
+
+	char		*mntroot;	/* mountinfo[4]: root of the mount within the FS */
+	char		*target;	/* mountinfo[5], fstab[2]: mountpoint */
+	char		*fstype;	/* mountinfo[9], fstab[3]: filesystem type */
+
+	char		*optstr;	/* mountinfo[6,11], fstab[4]: option string */
+	char		*vfs_optstr;	/* mountinfo[6]: fs-independent (VFS) options */
+	char		*fs_optstr;	/* mountinfo[11]: fs-depend options */
+
+	int		freq;		/* fstab[5]:  dump frequency in days */
+	int		passno;		/* fstab[6]: pass number on parallel fsck */
+
+	int		flags;		/* MNT_FS_* flags */
+	int		lineno;		/* line number in the parental file */
+
+	void		*userdata;	/* library independent data */
+};
+
+/*
+ * fs flags
+ */
+#define MNT_FS_ERROR	(1 << 1) /* broken entry */
+#define MNT_FS_PSEUDO	(1 << 2) /* pseudo filesystem */
+#define MNT_FS_NET	(1 << 3) /* network filesystem */
+
+/*
+ * File format
+ */
+enum {
+       MNT_FMT_FSTAB = 1,              /* /etc/{fs,m}tab */
+       MNT_FMT_MOUNTINFO               /* /proc/#/mountinfo */
+};
+
+/*
+ * mtab/fstab/mountinfo file
+ */
+struct _mnt_tab {
+	char		*filename;	/* file name or NULL */
+	int		fmt;		/* MNT_FMT_* file format */
+
+	int		nlines;		/* number of lines in the file (include commentrys) */
+	int		nents;		/* number of valid entries */
+	int		nerrs;		/* number of broken entries (parse errors) */
+
+	mnt_cache	*cache;		/* canonicalized paths/tags cache */
+
+	struct list_head	ents;	/* list of entries (mentry) */
+};
+
+
+/* optmap.c */
+extern const struct mnt_optmap *mnt_optmap_get_entry(struct mnt_optmap const **maps,
+                             int nmaps, const char *name,
+                             size_t namelen, const struct mnt_optmap **mapent);
+extern int mnt_optmap_enum_to_number(const struct mnt_optmap *mapent,
+                        const char *rawdata, size_t len);
+extern const char *mnt_optmap_get_type(const struct mnt_optmap *mapent);
+extern int mnt_optmap_require_value(const struct mnt_optmap *mapent);
+
+/* optent.c */
+
+/* private option masks -- see mount.h.in for the publick masks */
+#define MNT_HASVAL	(1 << 10)
+
+extern mnt_optent *mnt_new_optent(const char *name, size_t namesz,
+				const char *value, size_t valsz,
+				struct mnt_optmap const **maps, int nmaps);
+extern void mnt_free_optent(mnt_optent *op);
+extern mnt_optent *mnt_new_optent_from_optstr(char **optstr,
+	                        struct mnt_optmap const **maps, int nmaps);
+extern int mnt_optent_assign_map(mnt_optent *op,
+	                        struct mnt_optmap const **maps, int nmaps);
+
+/* fs.c */
+extern int __mnt_fs_set_source(mnt_fs *fs, char *source);
+extern int __mnt_fs_set_fstype(mnt_fs *fs, char *fstype);
+
+
+
+#endif /* _LIBMOUNT_PRIVATE_H */
diff --git a/shlibs/mount/src/optent.c b/shlibs/mount/src/optent.c
new file mode 100644
index 00000000..4b35b2d5
--- /dev/null
+++ b/shlibs/mount/src/optent.c
@@ -0,0 +1,735 @@
+/*
+ * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: optent
+ * @title: Parsed option
+ * @short_description: the mnt_optent keeps one parsed mount option
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "nls.h"
+#include "mountP.h"
+
+static int mnt_init_optent(mnt_optent *op, const char *name, size_t namelen,
+	                        struct mnt_optmap const **maps, int nmaps);
+static int __mnt_optent_set_value(mnt_optent *op, const char *data, size_t len);
+
+
+/*
+ * Returns a new optent.
+ */
+mnt_optent *mnt_new_optent(	const char *name, size_t namesz,
+				const char *value, size_t valsz,
+				struct mnt_optmap const **maps, int nmaps)
+{
+	mnt_optent *op;
+
+	op = calloc(1, sizeof(struct _mnt_optent));
+	if (!op)
+		return NULL;
+
+	INIT_LIST_HEAD(&op->opts);
+
+	if (mnt_init_optent(op, name, namesz, maps, nmaps))
+		goto err;
+
+	if (value) {
+		if (__mnt_optent_set_value(op, value, valsz))
+			goto err;
+	} else if (mnt_optent_require_value(op))
+		goto err;
+
+	return op;
+err:
+	free(op);
+	return NULL;
+}
+
+/*
+ * Deallocates the optent.
+ */
+void mnt_free_optent(mnt_optent *op)
+{
+	if (!op)
+		return;
+
+	if (!op->mapent || op->mapent->name != op->name)
+		free(op->name);
+
+	free(op->value);
+
+	if (!list_empty(&op->opts))
+		list_del(&op->opts);
+
+	free(op);
+}
+
+/*
+ * initialize or reinitialize the option entry -- note that the option
+ * name is set to @name and the old name is not free()ed. If the @name
+ * is NULL the already existing option name is used.
+ */
+static int mnt_init_optent(mnt_optent *op, const char *name, size_t namelen,
+			struct mnt_optmap const **maps, int nmaps)
+{
+	const struct mnt_optmap *mapent = NULL, *map = NULL;
+
+	assert(op);
+
+	if (!op)
+		return -1;
+
+	if (!name && op->name) {
+		name = op->name;
+		namelen = strlen(name);
+	}
+	if (!name)
+		return -1;
+
+	if (nmaps && maps)
+		map = mnt_optmap_get_entry(maps, nmaps, name, namelen, &mapent);
+
+	if (mapent == NULL || mnt_optmap_get_type(mapent) != NULL) {
+		/* we allocate the name for uknown options of for options with
+		 * "=%<type>" argument. This is not perfect... */
+		if (op->name != name)
+			op->name = strndup(name, namelen);
+	} else
+		op->name = (char *) mapent->name;
+
+	op->mapent = mapent;
+	op->map = map;
+	op->mask = mapent ? mapent->mask : 0;
+	if (op->value)
+		op->mask |= MNT_HASVAL;
+
+	if (!op->name)
+		return -1;	/* strdup() failed */
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s: initialized\n", op->name));
+
+	return 0;
+}
+
+static int mnt_optent_check_value(mnt_optent *op, const char *data, size_t len)
+{
+	const char *type;
+	char *end = NULL;
+
+	assert(op);
+	if (!op)
+		return -1;
+
+	type = mnt_optent_get_type(op);
+	if (!type)
+		goto err;			/* value is unexpected */
+
+	if (!data) {
+		if (mnt_optent_require_value(op))
+			goto err;
+	} else if (!strncmp(type, "%s", 2)) {
+		/* string type */
+		;
+	} else if (*type == '{') {
+		/* enum type */
+		if (mnt_optmap_enum_to_number(op->mapent, data, len) < 0)
+			goto err;
+	} else {
+		/* numbers */
+		int n;		/* happy gcc */
+
+		errno = 0;
+		if (!strncmp(type, "%d", 2) || !strncmp(type, "%ld", 3))
+			n = strtol(data, &end, 10);
+		else if (!strncmp(type, "%u", 2) || !strncmp(type, "%lu", 3))
+			n = strtoul(data, &end, 10);
+		else if (!strncmp(type, "%lld", 4))
+			n = strtoll(data, &end, 10);
+		else if (!strncmp(type, "%llu", 4))
+			n = strtoull(data, &end, 10);
+		else if (!strncmp(type, "%o", 2))
+			n = strtoul(data, &end, 8);
+		else if (!strncmp(type, "%x", 2))
+			n = strtoul(data, &end, 16);
+
+		if (errno == EINVAL || errno == ERANGE || end != data + len)
+			goto err;
+	}
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s (type=%s): pass check\n",
+		op->name, type));
+	return 0;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s (type=%s): failed to check value %s\n",
+		op->name, type, data));
+	return -1;
+}
+
+/*
+ * Parses the first mount option from @optstr and move @optstr pointer
+ * to the next option.
+ *
+ * Returns new optent (parsed option) or NULL in case of error.
+ */
+mnt_optent *mnt_new_optent_from_optstr(char **optstr,
+			struct mnt_optmap const **maps, int nmaps)
+{
+	char *name, *value;
+	size_t nsz, vsz;
+
+	if (mnt_optstr_next_option(optstr, &name, &nsz, &value, &vsz) == 0)
+		return mnt_new_optent(name, nsz, value, vsz, maps, nmaps);
+
+	return NULL;
+}
+
+/*
+ * Lookups @maps and tries to found corresponding map entry for the @op option.
+ * If the map is found the option value is reverified.
+ *
+ * Returns 0 on success, 1 if map not found, -1 in case of error (revalidation
+ * failed or so).
+ */
+int mnt_optent_assign_map(mnt_optent *op,
+			struct mnt_optmap const **maps, int nmaps)
+{
+	char *oldval, *oldname = NULL;
+	const char *type;
+
+	assert(op);
+	assert(op->name);
+
+	if (!op || !op->name)
+		return -1;
+
+	if (op->mapent && op->name != op->mapent->name)
+		oldname = op->name;	/* old name is allocated */
+
+	op->map = op->mapent = NULL;
+	oldval = op->value;
+
+	if (mnt_init_optent(op, NULL, 0, maps, nmaps))
+		return -1;
+
+	if (op->name != oldname)
+		free(oldname);
+
+	if (!op->map)
+		return 1;	/* uknown option, it's not error */
+
+	/* the new type */
+	type = mnt_optent_get_type(op);
+
+	if (type == NULL && oldval)
+		goto err;		/* value is unexpected */
+	if (mnt_optent_require_value(op) && !oldval)
+		goto err;		/* value is required */
+	if (oldval && mnt_optent_check_value(op, oldval, strlen(oldval)) != 0)
+		goto err;		/* bad value */
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s: assigned to \n",	op->name));
+	return 0;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s: assign failed\n", op->name));
+	return -1;
+}
+
+/**
+ * mnt_optent_get_map:
+ * @op: pointer to mnt_optent instance
+ *
+ * Returns: pointer to the head of the map that is associated with the option or
+ * NULL (for "extra options").
+ */
+const struct mnt_optmap *mnt_optent_get_map(mnt_optent *op)
+{
+	assert(op);
+	return op ? op->map : NULL;
+}
+
+/**
+ * mnt_optent_get_map_entry:
+ * @op: pointer to mnt_optent instance
+ *
+ * Returns: pointer to the map entry that describes the option or NULL (for
+ * "extra options").
+ */
+const struct mnt_optmap *mnt_optent_get_mapent(mnt_optent *op)
+{
+	assert(op);
+	return op ? op->mapent : NULL;
+}
+
+/**
+ * mnt_optent_get_type:
+ * @op: mnt_optent instance
+ *
+ * Note that the @op has to be associated with any option map
+ * or the default "%s]" is returned.
+ *
+ * Returns: pointer to the begin of type format string or NULL. For example:
+ *
+ *  "%s"  --> string, required argument (definition in the map is: "foo=%s")
+ *  "%s]" --> string, optional argument (definition in the map is: "foo[=%s]")
+ */
+const char *mnt_optent_get_type(mnt_optent *op)
+{
+	assert(op);
+	if (!op)
+		return NULL;
+	return op->mapent ? mnt_optmap_get_type(op->mapent) : "%s]";
+}
+
+
+
+/**
+ * mnt_optent_set_value:
+ * @op: mnt_optent instance
+ * @data: option argument data or NULL
+ *
+ * The function unset (zeroize) the option value if the @data pointer is NULL.
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_optent_set_value(mnt_optent *op, const char *data)
+{
+	return __mnt_optent_set_value(op, data, data ? strlen(data) : 0);
+}
+
+static int __mnt_optent_set_value(mnt_optent *op, const char *data, size_t len)
+{
+	assert(op);
+	if (!op)
+		return -1;
+
+	free(op->value);
+	op->value = NULL;
+	op->mask &= ~MNT_HASVAL;
+
+	if (mnt_optent_check_value(op, data, len) != 0)
+		goto err;
+	if (data) {
+		op->value = strndup(data, len);
+		if (!op->value)
+			goto err;
+		op->mask |= MNT_HASVAL;
+	}
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s: set argument value: %s\n",
+		op->name, op->value));
+	return 0;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s: set argument value failed\n",
+		op->name));
+	return -1;
+
+}
+
+/**
+ * mnt_optent_has_value:
+ * @option: pointer to mnt_optent instance
+ *
+ * Returns: 1 if the option has actually set an argument value, or 0.
+ */
+int mnt_optent_has_value(mnt_optent *op)
+{
+	return op && (op->mask & MNT_HASVAL) ? 1 : 0;
+}
+
+/**
+ * mnt_optent_require_value:
+ * @op: pointer to mnt_optent instance
+ *
+ * Note that the @op has to be associated with any option map
+ * or 0 is returned.
+ *
+ * Returns: 1 if the option requires an argument (option=arg).
+ */
+int mnt_optent_require_value(mnt_optent *op)
+{
+	return op && op->mapent ? mnt_optmap_require_value(op->mapent) : 0;
+}
+
+/**
+ * mnt_optent_is_inverted:
+ * @op: pointer to mnt_optent instance
+ *
+ * Returns: 1 if the option has MNT_INVERT mask or 0.
+ */
+int mnt_optent_is_inverted(mnt_optent *op)
+{
+	return (op && (op->mask & MNT_INVERT));
+}
+
+static int get_number_base(const char *type)
+{
+	int base = 10;		/* default */
+
+	if (!strncmp(type, "%o", 2))
+		base = 8;
+	else if (!strncmp(type, "%x", 16))
+		base = 16;
+	return base;
+}
+
+/**
+ * mnt_optent_strtoul_value:
+ * @op: pointer to mnt_optent instance
+ * @number: resulting number
+ *
+ * Converts an option value to number. The strtoul() base (decimal, octan or
+ * hex) is determined from (%u, %o or %x) option format type -- default is
+ * decimal (for unknown options).
+ *
+ * The whole option value has to be possible to convert to the number
+ * (e.g "123ABC" returns -1).
+ *
+ * This function also converts {enum0,enumN} type to number 0..N. For more
+ * details see info about option maps.
+ *
+ * Returns: 0 on success, -1 in case of error.
+ */
+int mnt_optent_strtoul_value(mnt_optent *op, unsigned long int *number)
+{
+	const char *type = NULL;
+	char *end;
+	size_t len;
+
+	if (!mnt_optent_has_value(op) || !number)
+		goto err;;
+	type = mnt_optent_get_type(op);
+	if (!type)
+		goto err;
+
+	if (*type == '{') {
+		int n;
+
+		if (!op->mapent)
+			goto err;
+		n = mnt_optmap_enum_to_number(op->mapent, op->value,
+				strlen(op->value));
+		if (n < 0)
+			goto err;
+		*number = n;
+	} else {
+		errno = 0;
+		*number = strtoul(op->value, &end, get_number_base(type));
+
+		if (errno == EINVAL || errno == ERANGE)
+			goto err;
+		len = strlen(op->value);
+		if (end != op->value + len)
+			goto err;
+	}
+	return 0;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s (type=%s): strtoul failed\n",
+		op->name, type));
+	return -1;
+}
+
+/**
+ * mnt_optent_strtol_value:
+ * @op: pointer to mnt_optent instance
+ * @number: resulting number
+ *
+ * Converts an option value to number. The strtol() base (decimal, octan or
+ * hex) is determined from (%u, %o or %x) option format type -- default is
+ * decimal.
+ *
+ * The whole option value has to be possible to convert to the number
+ * (e.g "123ABC" returns -1).
+ *
+ * Returns: 0 on success, -1 in case of error.
+ */
+int mnt_optent_strtol_value(mnt_optent *op, long int *number)
+{
+	const char *type;
+	char *end;
+	size_t len;
+
+	if (!mnt_optent_has_value(op) || !number)
+		return -1;
+
+	type = mnt_optent_get_type(op);
+	if (!type)
+		goto err;
+
+	errno = 0;
+	*number = strtol(op->value, &end, get_number_base(type));
+
+	if (errno == EINVAL || errno == ERANGE)
+		goto err;
+	len = strlen(op->value);
+	if (end != op->value + len)
+		goto err;
+
+	return 0;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s (type=%s): strtol failed\n",
+		op->name, type));
+	return -1;
+}
+
+/**
+ * mnt_optent_strtoull_value:
+ * @op: pointer to mnt_optent instance
+ * @number: resulting number
+ *
+ * Converts an option value to number. The strtoull() base (decimal, octan or
+ * hex) is determined from (%u, %o or %x) option format type -- default is
+ * decimal.
+ *
+ * The whole option value has to be possible to convert to the number
+ * (e.g "123ABC" returns -1).
+ *
+ * Returns: 0 on success, -1 in case of error.
+ */
+int mnt_optent_strtoull_value(mnt_optent *op, unsigned long long int *number)
+{
+	const char *type;
+	char *end;
+	size_t len;
+
+	if (!mnt_optent_has_value(op) || !number)
+		return -1;
+
+	type = mnt_optent_get_type(op);
+	if (!type)
+		goto err;
+
+	errno = 0;
+	*number = strtoull(op->value, &end, get_number_base(type));
+
+	if (errno == EINVAL || errno == ERANGE)
+		goto err;
+	len = strlen(op->value);
+	if (end != op->value + len)
+		goto err;
+	return 0;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: option %s (type=%s): strtoull failed\n",
+		op->name, type));
+	return -1;
+
+}
+
+/**
+ * mnt_optent_get_value:
+ * @op: pointer to mnt_optent instance
+ *
+ * See also mnt_optent_has_value().
+ *
+ * Returns: pointer to value or NULL.
+ */
+const char *mnt_optent_get_value(mnt_optent *op)
+{
+	return op? op->value : NULL;
+}
+
+/**
+ * mnt_optent_strlen_value:
+ * @op: pointer to mnt_optent instance
+ *
+ * Returns: length of string that is necessary to print option value or -1 in
+ * case of error.
+ */
+int mnt_optent_strlen_value(mnt_optent *op)
+{
+	assert(op);
+
+	if (!op)
+		return -1;
+	if (!mnt_optent_has_value(op))
+		return 0;
+	return strlen(op->value);
+}
+
+/**
+ * mnt_optent_snprintf_value:
+ * @op: pointer to mnt_optent instance
+ * @str: resulting string
+ * @size: size of string
+ *
+ * Returns: number of printed characters or negative number in case of error.
+ */
+int mnt_optent_snprintf_value(mnt_optent *op, char *str, size_t size)
+{
+	assert(op);
+	assert(str);
+
+	if (!op || !str || !size)
+		return -1;
+	if (!mnt_optent_has_value(op))
+		return -1;
+
+	/* TODO: use extra quotes for SELinux contexts */
+	return snprintf(str, size, "%s", op->value);
+}
+
+/**
+ * mnt_optent_dup_value:
+ * @op: pointer to mnt_optent instance
+ *
+ * Returns: duplicate a option value.
+ */
+char *mnt_optent_dup_value(mnt_optent *op)
+{
+	assert(op);
+
+	if (mnt_optent_has_value(op))
+		return strdup(op->value);
+	return NULL;
+}
+
+/**
+ * mnt_optent_get_name:
+ * @op: pointer to mnt_optent instance
+ *
+ * Returns: option name or NULL in case of error.
+ */
+const char *mnt_optent_get_name(mnt_optent *op)
+{
+	assert(op);
+	return op ? op->name : NULL;
+}
+
+/**
+ * mnt_optent_get_mask:
+ * @op: pointer to mnt_optent instance
+ *
+ * The initial value of the option mask is a copy from map->mask.
+ * Note that the mask is NOT a mountflag/ID.
+ *
+ * Returns: option mask or 0.
+ */
+int mnt_optent_get_mask(mnt_optent *op)
+{
+	assert(op);
+	return op ? op->mask : 0;
+}
+
+/**
+ * mnt_optent_get_id:
+ * @op: pointer to mnt_optent instance
+ *
+ * Note that the ID is also mountflag for all options with MNT_MFLAG mask.
+ *
+ * WARNING: the ID is usually shared between "option" (e.g. exec) and
+ * "nooption" (e.g. noexec) -- you have to carefully check for MNT_INVERT in
+ * the option mask. See mnt_optent_get_flag().
+ *
+ * Returns: option ID/mountflag or 0 for extra options (options with undefined
+ * options map).
+ */
+int mnt_optent_get_id(mnt_optent *op)
+{
+	assert(op);
+	return op && op->mapent ? op->mapent->id : 0;
+}
+
+/**
+ * mnt_optent_get_flag:
+ * @op: pointer to mnt_optent instance
+ * @flags: resulting flags
+ *
+ * Adds option ID to @flags or removes the ID from @flags when the option
+ * is an inverted option (e.g. "norelatime")
+ *
+ * <informalexample>
+ *  <programlisting>
+ *	int flags = 0;
+ *
+ *	while(mnt_optls_next_option(&itr, opts, map, &op) == 0)
+ *		mnt_optent_get_flag(op, &flags);
+ *
+ *	if (flags & MS_RELATIME)
+ *		printf("relatime is set\n");
+ *  </programlisting>
+ * </informalexample>
+ *
+ * Returns: 0 on success, -1 in case of error.
+ */
+int mnt_optent_get_flag(mnt_optent *op, int *flags)
+{
+	int id;
+
+	assert(op);
+	if (!op || !flags)
+		return -1;
+
+	id = mnt_optent_get_id(op);
+	if (op->mask & MNT_INVERT)
+		*flags &= ~id;
+	else
+		*flags |= id;
+	return 0;
+}
+
+/**
+ * mnt_optent_is_unknown:
+ * @op: pointer to mnt_optent instance
+ *
+ * The "extra options" are unknown options (undefined in any option map)
+ *
+ * Returns: 1 or 0.
+ */
+int mnt_optent_is_unknown(mnt_optent *op)
+{
+	assert(op);
+	return op && op->mapent ? 0 : 1;
+}
+
+/**
+ * mnt_optent_print_debug:
+ * @file: output
+ * @op: pointer to mnt_optent instance
+ *
+ * Prints details about the option.
+ *
+ * Returns: 0 on success, -1 in case of error.
+ */
+int mnt_optent_print_debug(mnt_optent *op, FILE *file)
+{
+	const struct mnt_optmap *map;
+	const char *type;
+
+	if (!op)
+		return -1;
+
+	fprintf(file, "------ option %p (%s):\n", op, mnt_optent_get_name(op));
+
+	fprintf(file, "\tID=0x%x\n", mnt_optent_get_id(op));
+	fprintf(file, "\tMASK=%d\n", mnt_optent_get_mask(op));
+
+	map = mnt_optent_get_map(op);
+	fprintf(file, "\tMAP=%p\n", map ? map : NULL);
+
+	map = mnt_optent_get_mapent(op);
+	fprintf(file, "\tMAPENT=%s\n", map ? map->name : NULL);
+
+	fprintf(file, "\tHAS_VALUE=%s\n",
+			mnt_optent_has_value(op) ? "yes" : "not");
+
+	type = mnt_optent_get_type(op);
+	fprintf(file, "\tTYPE=%s\n", type ? : "<none>");
+	fprintf(file, "\tVALUE=%s\n", op->value);
+	return 0;
+}
diff --git a/shlibs/mount/src/optls.c b/shlibs/mount/src/optls.c
new file mode 100644
index 00000000..ff2b912b
--- /dev/null
+++ b/shlibs/mount/src/optls.c
@@ -0,0 +1,791 @@
+/*
+ * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: optls
+ * @title: Options container
+ * @short_description: high-level API for work with parsed mount options
+ *
+ * The optls container allows to work with parsed mount options and generate
+ * arguments for mount(2) syscall, output to mtab or analyze userspace specific
+ * options.
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "nls.h"
+#include "mountP.h"
+
+/**
+ * mnt_new_optls:
+ *
+ * Returns: newly allocated and initialized optls instance. The library
+ * uses this object as a container for mount options.
+ */
+mnt_optls *mnt_new_optls(void)
+{
+	mnt_optls *ls = calloc(1, sizeof(struct _mnt_optls));
+	if (!ls)
+		return NULL;
+	INIT_LIST_HEAD(&ls->opts);
+	return ls;
+}
+
+/**
+ * mnt_free_optls:
+ * @ls: pointer to mnt_optls instance.
+ *
+ * Deallocates mnt_optls and all stored options.
+ */
+void mnt_free_optls(mnt_optls *ls)
+{
+	if (!ls)
+		return;
+	while (!list_empty(&ls->opts)) {
+		mnt_optent *o = list_entry(ls->opts.next, mnt_optent, opts);
+		mnt_free_optent(o);
+	}
+
+	free(ls->maps);
+	free(ls);
+}
+
+/**
+ * mnt_optls_add_map:
+ * @ls: pointer to mnt_optls instance
+ * @map: pointer to the custom map
+ *
+ * Stores pointer to the custom options map (options description). The map has
+ * to be accessible all time when the libmount works with options. (The map is
+ * usually a static array.)
+ *
+ * All already stored unknown mount options are reverified against the new map.
+ * Note, it's recommented to add all maps to the @optls container before options
+ * parsing.
+ *
+ * Example (add new options "foo" and "bar=data"):
+ *
+ * <informalexample>
+ *   <programlisting>
+ *     #define MY_MS_FOO   (1 << 1)
+ *     #define MY_MS_BAR   (1 << 2)
+ *
+ *     mnt_optmap myoptions[] = {
+ *       { "foo",   MY_MS_FOO, MNT_MFLAG },
+ *       { "nofoo", MY_MS_FOO, MNT_MFLAG | MNT_INVERT },
+ *       { "bar=%s",MY_MS_BAR, MNT_MDATA },
+ *       { NULL }
+ *     };
+ *
+ *     mnt_optls_add_map(ls, myoptions);
+ *   </programlisting>
+ * </informalexample>
+ *
+ * Returns: 0 on success, 1 on failed verification, or -1 in case of error.
+ */
+int mnt_optls_add_map(mnt_optls *ls, const struct mnt_optmap *map)
+{
+	mnt_optent *op;
+	mnt_iter itr;
+
+	assert(ls);
+	assert(map || ls->maps == NULL);
+
+	ls->maps = realloc(ls->maps,
+			sizeof(struct mnt_optmap *) * (ls->nmaps + 1));
+	if (!ls->maps)
+		return -1;
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: optls %p: add map[%zd]", ls, ls->nmaps));
+	ls->maps[ls->nmaps] = map;
+	ls->nmaps++;
+
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+
+	while(mnt_optls_next_option(ls, &itr, NULL, &op) == 0) {
+		if (!mnt_optent_is_unknown(op))
+			continue;
+		if (mnt_optent_assign_map(op, &map, 1) == -1)
+			return 1;
+	}
+	return 0;
+}
+
+/**
+ * mnt_optls_add_builtin_map:
+ * @ls: pointer to mnt_optls instance
+ * @id: built-in map id (see mnt_get_builtin_map())
+ *
+ * Same as mnt_optls_add_map(), but works with libmount built in maps.
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_optls_add_builtin_map(mnt_optls *ls, int id)
+{
+	const struct mnt_optmap *m = mnt_get_builtin_optmap(id);
+
+	assert(ls);
+	assert(id);
+
+	return m ? mnt_optls_add_map(ls, m) : -1;
+}
+
+
+/*
+ * Append the option to "ls" container.
+ */
+static void mnt_optls_add_optent(mnt_optls *ls, mnt_optent *op)
+{
+	assert(ls);
+	assert(op);
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: opts %p: add option %s",
+		ls, mnt_optent_get_name(op)));
+
+	list_add_tail(&op->opts, &ls->opts);
+}
+
+/**
+ * mnt_optls_add_option:
+ * @ls: pointer to mnt_optls instance
+ * @name: option name
+ * @value: option value
+ *
+ * Returns: new option or NULL in case of error.
+ */
+mnt_optent *mnt_optls_add_option(mnt_optls *ls,
+			const char *name, const char *value)
+{
+	mnt_optent *op;
+
+	if (!ls || !name)
+		return NULL;
+
+	op = mnt_new_optent(name, strlen(name),
+				value, value ? strlen(value) : 0,
+                                ls->maps, ls->nmaps);
+	if (op)
+		mnt_optls_add_optent(ls, op);
+	return op;
+}
+
+/**
+ * mnt_optls_parse_optstr:
+ * @ls: pointer to mnt_optls instance.
+ * @optstr: zero terminated string with mount options (comma separaed list)
+ *
+ * Parses @optstr and all options from @optstr are added to the @optls. It's
+ * possible to call this function more than once. The new options from @optstr
+ * will be appended to the container.
+ *
+ * The options are accessible by mnt_optls_next_option().
+ *
+ * If the @optls container is associated with any options map(s), all new
+ * options are verified according to the descriptions from the map(s).
+ *
+ * For example:
+ *
+ *	mnt_optls_parse_optstr(ls, "user=snake,noexec");
+ *
+ * is same like:
+ *
+ *      mnt_optls_add_option(ls, "user", "snake");
+ *      mnt_optls_add_option(ls, "noexec", NULL);
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_optls_parse_optstr(mnt_optls *ls, const char *optstr)
+{
+	char *p = (char *) optstr;
+
+	assert(ls);
+	assert(optstr);
+
+	if (!ls || !optstr)
+		return -1;
+
+	while(p && *p) {
+		mnt_optent *op = mnt_new_optent_from_optstr(&p,
+					ls->maps, ls->nmaps);
+		if (!op)
+			return -1;
+		mnt_optls_add_optent(ls, op);
+	}
+	return 0;
+}
+
+/**
+ * mnt_optls_remove_option:
+ * @ls: pointer to mnt_optls instance
+ * @name: option name
+ *
+ * Returns: 0 on success, 1 if @name not found and -1 in case of error.
+ */
+int mnt_optls_remove_option(mnt_optls *ls, const char *name)
+{
+	struct list_head *p, *pnext;
+
+	if (!ls || !name)
+		return -1;
+
+	list_for_each_safe(p, pnext, &ls->opts) {
+		mnt_optent *op;
+		const char *n;
+
+		if (!p)
+			break;
+		op = list_entry(p, mnt_optent, opts);
+		n = mnt_optent_get_name(op);
+		if (n && strcmp(name, n) == 0) {
+			mnt_free_optent(op);
+			return 0;
+		}
+	}
+	return 1;
+}
+
+
+/**
+ * mnt_optls_remove_option_by_flags:
+ * @ls: pointer to mnt_optls instance
+ * @map: pointer to the map with wanted options or NULL for all options
+ * @flags: option flags
+ *
+ * Removes options which match with @flags. The set of options could
+ * be restricted by @map. For exmaple:
+ *
+ *	mnt_optls_remove_option_by_flags(ls, NULL, MS_NOEXEC);
+ *
+ * removes "noexec" option from "ls".
+ *
+ * Note that this function is useles for options with MNT_INVERT mask (e.g.
+ * "exec" is inverting MS_NOEXEC flag).
+ *
+ * See also mnt_optent_get_flag() and mnt_optls_remove_option_by_iflags().
+ *
+ * Returns: number of removed options or -1 in case of error.
+ */
+int mnt_optls_remove_option_by_flags(mnt_optls *ls,
+		const struct mnt_optmap *map, const int flags)
+{
+	struct list_head *p, *pnext;
+	int ct = 0;
+
+	if (!ls)
+		return -1;
+
+	list_for_each_safe(p, pnext, &ls->opts) {
+		mnt_optent *op;
+		int fl = 0;
+
+		if (!p)
+			break;
+		op = list_entry(p, mnt_optent, opts);
+
+		if (!map || mnt_optent_get_map(op) == map) {
+			mnt_optent_get_flag(op, &fl);
+			if (fl & flags) {
+				mnt_free_optent(op);
+				ct++;
+			}
+		}
+	}
+	return ct;
+}
+
+/**
+ * mnt_optls_remove_option_by_iflags:
+ * @ls: pointer to mnt_optls instance
+ * @map: pointer to the map with wanted options or NULL for all options
+ * @flags: option flags
+ *
+ * Removes options which inverting any id from @flags. The set of options could
+ * be restricted by @map. For exmaple:
+ *
+ *	mnt_optls_remove_option_by_iflags(ls, NULL, MS_NOEXEC);
+ *
+ * removes "exec" option from "ls".
+ *
+ * Note that this function is useles for options without MNT_INVERT mask (e.g.
+ * "noexec").
+ *
+ * See also mnt_optent_get_flag() and mnt_optls_remove_option_by_flags().
+ *
+ * Returns: number of removed options or -1 in case of error.
+ */
+int mnt_optls_remove_option_by_iflags(mnt_optls *ls,
+		const struct mnt_optmap *map, const int flags)
+{
+	struct list_head *p, *pnext;
+	int ct = 0;
+
+	if (!ls)
+		return -1;
+
+	list_for_each_safe(p, pnext, &ls->opts) {
+		mnt_optent *op;
+		int fl = flags;
+
+		if (!p)
+			break;
+		op = list_entry(p, mnt_optent, opts);
+
+		if (!map || mnt_optent_get_map(op) == map) {
+			int id = mnt_optent_get_id(op);
+
+			if (!(id & fl))
+				continue;
+
+			mnt_optent_get_flag(op, &fl);
+
+			if (!(id & fl)) {
+				mnt_free_optent(op);
+				ct++;
+			}
+		}
+	}
+	return ct;
+}
+
+/**
+ * mnt_optls_next_option:
+ * @ls: pointer to mnt_optls instance
+ * @itr: iterator
+ * @map: pointer to the map of wanted options or NULL for all options
+ * @option: returns pointer to the option object
+ *
+ * Example (print all options):
+ * <informalexample>
+ *   <programlisting>*
+ *     mnt_optent *option;
+ *     mnt_optls *ls = mnt_optls_new();
+ *
+ *     mnt_optls_parse_optstr(ls, "noexec,nodev");
+ *
+ *     while(mnt_optls_next_option(ls, itr, NULL, &option))
+ *         printf("%s\n", mnt_optent_get_name(option)));
+ *   </programlisting>
+ * </informalexample>
+ *
+ * Returns: 0 on succes, -1 in case of error or 1 at end of list.
+ */
+int mnt_optls_next_option(mnt_optls *ls, mnt_iter *itr,
+		const struct mnt_optmap *map, mnt_optent **option)
+{
+	assert(itr);
+	assert(ls);
+	assert(option);
+
+	if (!itr || !ls || !option)
+		return -1;
+	if (!itr->head)
+		MNT_ITER_INIT(itr, &ls->opts);
+	while (itr->p != itr->head) {
+		MNT_ITER_ITERATE(itr, *option, struct _mnt_optent, opts);
+		if (map == NULL || (*option)->map == map)
+			return 0;
+	}
+
+	return 1;
+}
+
+/**
+ * mnt_optls_get_option:
+ * @ls: pointer to mnt_optls instance
+ * @name: options name
+ *
+ * Returns: the option or NULL.
+ */
+mnt_optent *mnt_optls_get_option(mnt_optls *ls, const char *name)
+{
+	mnt_optent *op;
+	mnt_iter itr;
+
+	assert(ls);
+	assert(name);
+
+	if (!ls || !name)
+		return NULL;
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+
+	while(mnt_optls_next_option(ls, &itr, NULL, &op) == 0) {
+		const char *n = mnt_optent_get_name(op);
+
+		if (n && !strcmp(n, name))
+			return op;
+	}
+	return NULL;
+}
+
+/**
+ * mnt_optls_get_ids:
+ * @ls: pointer to mnt_optls instance
+ * @map: pointer to the map of wanted options or NULL for all options
+ *
+ * Note that ID has to be unique in all maps when the @map is NULL.
+ *
+ * Note also that this function works with ALL options -- see also
+ * mnt_optls_create_mountflags() that returns MNT_MFLAG options
+ * (mount(2) flags) only.
+ *
+ * Returns: IDs from all options.
+ */
+int mnt_optls_get_ids(mnt_optls *ls, const struct mnt_optmap *map)
+{
+	int flags = 0;
+	mnt_iter itr;
+	mnt_optent *op;
+
+	assert(ls);
+	if (!ls)
+		return 0;
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+
+	while(mnt_optls_next_option(ls, &itr, map, &op) == 0)
+		mnt_optent_get_flag(op, &flags);
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: opts %p: generated IDs 0x%08x", ls, flags));
+	return flags;
+}
+
+/**
+ * mnt_optls_create_mountflags:
+ * @ls: pointer to mnt_optls instance
+ *
+ * The mountflags are IDs from all MNT_MFLAG options. See "struct mnt_optmap".
+ * For more details about mountflags see mount(2) syscall.
+ *
+ * Returns: mount flags or 0.
+ */
+int mnt_optls_create_mountflags(mnt_optls *ls)
+{
+	int flags = 0;
+	mnt_iter itr;
+	mnt_optent *op;
+
+	assert(ls);
+	if (!ls)
+		return 0;
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+
+	while(mnt_optls_next_option(ls, &itr, NULL, &op) == 0) {
+		if (!(op->mask & MNT_MFLAG))
+			continue;
+		mnt_optent_get_flag(op, &flags);
+	}
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: opts %p: generated mountflags 0x%08x", ls, flags));
+	return flags;
+}
+
+/**
+ * mnt_optls_create_mountdata:
+ * @ls: pointer to mnt_optls instance
+ *
+ * For more details about mountdata see mount(2) syscall.
+ *
+ * Returns: newly allocated string with mount options or NULL in case of error.
+ */
+char *mnt_optls_create_mountdata(mnt_optls *ls)
+{
+	mnt_iter itr;
+	mnt_optent *op;
+	char *optstr = NULL;
+
+	assert(ls);
+	if (!ls)
+		return NULL;
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+
+	while(mnt_optls_next_option(ls, &itr, NULL, &op) == 0) {
+		if (!(op->mask & MNT_MDATA) && !mnt_optent_is_unknown(op))
+			continue;
+		if (mnt_optstr_append_option(&optstr,
+				mnt_optent_get_name(op),
+				mnt_optent_get_value(op)))
+			goto err;
+	}
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: opts %p: generated mountdata: %s", ls, optstr));
+	return optstr;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: ls %p: generate mountdata failed", ls));
+	free(optstr);
+	return NULL;
+}
+
+/**
+ * mnt_optls_create_mtab_optstr:
+ * @ls: pointer to mnt_optls instance
+ *
+ * Returns: newly allocated string with mount options for mtab.
+ */
+char *mnt_optls_create_mtab_optstr(mnt_optls *ls)
+{
+	mnt_iter itr;
+	mnt_optent *op;
+	char *optstr = NULL;
+
+	assert(ls);
+	if (!ls)
+		return NULL;
+
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+
+	while(mnt_optls_next_option(ls, &itr, NULL, &op) == 0) {
+		if (op->mask & MNT_NOMTAB)
+			continue;
+		if (mnt_optstr_append_option(&optstr,
+				mnt_optent_get_name(op),
+				mnt_optent_get_value(op)))
+			goto err;
+	}
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: opts %p: generated mtab options: %s", ls, optstr));
+	return optstr;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: opts %p: generate mtab optstr failed", ls));
+	free(optstr);
+	return NULL;
+}
+
+/**
+ * mnt_optls_create_userspace_optstr:
+ * @ls: pointer to mnt_optls instance
+ *
+ * Returns: newly allocated string with mount options that are
+ * userspace specific (e.g. uhelper=,loop=).
+ */
+char *mnt_optls_create_userspace_optstr(mnt_optls *ls)
+{
+	mnt_iter itr;
+	mnt_optent *op;
+	char *optstr = NULL;
+
+	assert(ls);
+	if (!ls)
+		return NULL;
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+
+	while(mnt_optls_next_option(ls, &itr, NULL, &op) == 0) {
+		if (mnt_optent_is_unknown(op))
+			continue;
+		if (op->mask & (MNT_MDATA | MNT_MFLAG | MNT_NOMTAB))
+			continue;
+		if (mnt_optstr_append_option(&optstr,
+				mnt_optent_get_name(op),
+				mnt_optent_get_value(op)))
+			goto err;
+	}
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: opts %p: generated userspace-only options: %s",
+		ls, optstr));
+	return optstr;
+err:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+		"libmount: opts %p: generate userspace optstr failed", ls));
+	free(optstr);
+	return NULL;
+}
+
+/**
+ * mnt_optls_print_debug:
+ * @file: output
+ * @ls: pointer to mnt_optls instance
+ *
+ * Prints details about options container.
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_optls_print_debug(mnt_optls *ls, FILE *file)
+{
+	mnt_iter itr;
+	mnt_optent *op;
+
+	if (!ls)
+		return -1;
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+
+	fprintf(file, "--- opts: %p\n", ls);
+	while(mnt_optls_next_option(ls, &itr, NULL, &op) == 0)
+		mnt_optent_print_debug(op, file);
+
+	return 0;
+}
+
+#ifdef TEST_PROGRAM
+mnt_optls *mk_optls(const char *optstr)
+{
+	mnt_optls *ls = mnt_new_optls();
+	if (!ls)
+		goto err;
+
+	mnt_optls_add_builtin_map(ls, MNT_LINUX_MAP);
+	mnt_optls_add_builtin_map(ls, MNT_USERSPACE_MAP);
+
+	if (mnt_optls_parse_optstr(ls, optstr) != 0) {
+		fprintf(stderr, "\tfailed to parse: %s\n", optstr);
+		goto err;
+	}
+	return ls;
+err:
+	mnt_free_optls(ls);
+	return NULL;
+}
+
+int test_parse(struct mtest *ts, int argc, char *argv[])
+{
+	mnt_optls *ls = NULL;
+	int rc = -1;
+
+	if (argc < 1)
+		goto done;
+	ls = mk_optls(argv[1]);
+	if (!ls)
+		goto done;
+
+	mnt_optls_print_debug(ls, stdout);
+	rc = 0;
+done:
+	mnt_free_optls(ls);
+	return rc;
+}
+
+int test_flags(struct mtest *ts, int argc, char *argv[])
+{
+	mnt_optls *ls = NULL;
+	int rc = -1;
+	int flags;
+	const struct mnt_optmap *map;
+
+	if (argc < 1)
+		goto done;
+	ls = mk_optls(argv[1]);
+	if (!ls)
+		goto done;
+
+	flags = mnt_optls_create_mountflags(ls);
+	printf("\tmount(2) flags:        0x%08x\n", flags);
+
+	map = mnt_get_builtin_optmap(MNT_LINUX_MAP);
+	flags = mnt_optls_get_ids(ls, map);
+	printf("\tMNT_MAP_LINUX IDs:     0x%08x  (map %p)\n", flags, map);
+
+	map = mnt_get_builtin_optmap(MNT_USERSPACE_MAP);
+	flags = mnt_optls_get_ids(ls, map);
+	printf("\tMNT_USERSPACE_MAP IDs: 0x%08x  (map %p)\n", flags, map);
+
+	rc = 0;
+done:
+	mnt_free_optls(ls);
+	return rc;
+}
+
+int test_data(struct mtest *ts, int argc, char *argv[])
+{
+	mnt_optls *ls = NULL;
+	char *optstr;
+	int rc = -1;
+
+	if (argc < 1)
+		goto done;
+	ls = mk_optls(argv[1]);
+	if (!ls)
+		goto done;
+
+	optstr = mnt_optls_create_mountdata(ls);
+	printf("\tmount(2) data: '%s'\n", optstr);
+	free(optstr);
+	rc = 0;
+done:
+	mnt_free_optls(ls);
+	return rc;
+}
+
+int test_mtabstr(struct mtest *ts, int argc, char *argv[])
+{
+	mnt_optls *ls = NULL;
+	char *optstr;
+	int rc = -1;
+
+	if (argc < 1)
+		goto done;
+	ls = mk_optls(argv[1]);
+	if (!ls)
+		goto done;
+
+	optstr = mnt_optls_create_mtab_optstr(ls);
+	printf("\tmtab options: '%s'\n", optstr);
+	free(optstr);
+	rc = 0;
+done:
+	mnt_free_optls(ls);
+	return rc;
+}
+
+int test_reparse(struct mtest *ts, int argc, char *argv[])
+{
+	const struct mnt_optmap *map;
+	mnt_optls *ls = NULL;
+	char *optstr;
+	int rc = -1;
+
+	if (argc < 1)
+		goto done;
+	optstr = argv[1];
+	ls = mnt_new_optls();
+	if (!ls)
+		goto done;
+
+	/* add description for kernel options */
+	mnt_optls_add_builtin_map(ls, MNT_LINUX_MAP);
+
+	if (mnt_optls_parse_optstr(ls, optstr) != 0) {
+		fprintf(stderr, "\tfailed to parse: %s\n", optstr);
+		goto done;
+	}
+
+	fprintf(stdout, "------ parse\n");
+	mnt_optls_print_debug(ls, stdout);
+
+	/* add description for userspace options */
+	map = mnt_get_builtin_optmap(MNT_USERSPACE_MAP);
+	mnt_optls_add_map(ls, map);
+
+	fprintf(stdout, "------ re-parse\n");
+	mnt_optls_print_debug(ls, stdout);
+
+	rc = 0;
+done:
+	mnt_free_optls(ls);
+	return rc;
+}
+
+int main(int argc, char *argv[])
+{
+	struct mtest tss[] = {
+		{ "--parse",    test_parse, "<optstr>  parse mount options string" },
+		{ "--ls-data",	test_data,  "<optstr>  parse and generate mountdata" },
+		{ "--ls-flags", test_flags, "<optstr>  parse and generate mountflags" },
+		{ "--ls-mtabstr",test_mtabstr,"<optstr>  parse and generate mtab options" },
+		{ "--reparse",  test_reparse, "<optstr>  test extra options reparsing" },
+		{ NULL }
+	};
+	return  mnt_run_test(tss, argc, argv);
+}
+#endif /* TEST_PROGRAM */
diff --git a/shlibs/mount/src/optmap.c b/shlibs/mount/src/optmap.c
new file mode 100644
index 00000000..6eef332c
--- /dev/null
+++ b/shlibs/mount/src/optmap.c
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: optmap
+ * @title: Option maps
+ * @short_description: description for mount options
+ *
+ * The mount(2) linux syscall uses two arguments for mount options:
+ *
+ *	@mountflags: (see MS_* macros in linux/fs.h)
+ *
+ *	@mountdata: (usully a comma separated string of options)
+ *
+ * The libmount uses options-map(s) to describe mount options. The number of
+ * maps is unlimited. The libmount options parser could be easily extended
+ * (e.g. by mnt_optls_add_map()) to work with new options.
+ *
+ * The option description (map entry) includes:
+ *
+ *	@name: and argument type (e.g. "loop[=%s]")
+ *
+ *	@id: (in the map unique identifier or a mountflags, e.g MS_RDONLY)
+ *
+ *	@mask: (MNT_INVERT, MNT_MDATA, MNT_MFLAG, MNT_NOMTAB)
+ *
+ * The option argument type is defined by:
+ *
+ *	"=type"   -- required argument
+ *
+ *	"[=type]" -- optional argument
+ *
+ * where the 'type' is sscanf() format string or
+ *
+ *     {item0,item1,...}  -- enum (mnt_option_get_number() converts the value
+ *                           to 0..N number)
+ *
+ * The options argument format is used for parsing only. The library internally
+ * stores the option argument as a string. The conversion to the data type is
+ * on-demant by mnt_option_get_value_*() functions.
+ *
+ * The library checks options argument according to 'type' format for simple
+ * formats only:
+ *
+ *	%s, %d, %ld, %lld, %u, %lu, %llu, %x, %o and {enum}
+ *
+ * Example:
+ *
+ * <informalexample>
+ *   <programlisting>
+ *     #define MY_MS_FOO   (1 << 1)
+ *     #define MY_MS_BAR   (1 << 2)
+ *
+ *     mnt_optmap myoptions[] = {
+ *       { "foo",   MY_MS_FOO, MNT_MFLAG },
+ *       { "nofoo", MY_MS_FOO, MNT_MFLAG | MNT_INVERT },
+ *       { "bar=%s",MY_MS_BAR, MNT_MDATA },
+ *       { NULL }
+ *     };
+ *   </programlisting>
+ * </informalexample>
+ *
+ * The libmount defines two basic built-in options maps:
+ *
+ *	@MNT_LINUX_MAP: fs-independent kernel mount options (usually MS_* flags)
+ *
+ *	@MNT_USERSPACE_MAP: userspace specific mount options (e.g. "user", "loop")
+ *
+ * For more details about option map struct see "struct mnt_optmap" in
+ * mount/mount.h.
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "nls.h"
+#include "mountP.h"
+
+/*
+ * fs-independent mount flags (built-in MNT_LINUX_MAP)
+ */
+static const struct mnt_optmap linux_flags_map[] =
+{
+   { "ro",       MS_RDONLY, MNT_MFLAG },               /* read-only */
+   { "rw",       MS_RDONLY, MNT_MFLAG | MNT_INVERT },  /* read-write */
+   { "exec",     MS_NOEXEC, MNT_MFLAG | MNT_INVERT },  /* permit execution of binaries */
+   { "noexec",   MS_NOEXEC, MNT_MFLAG },               /* don't execute binaries */
+   { "suid",     MS_NOSUID, MNT_MFLAG | MNT_INVERT },  /* honor suid executables */
+   { "nosuid",   MS_NOSUID, MNT_MFLAG },               /* don't honor suid executables */
+   { "dev",      MS_NODEV,  MNT_MFLAG | MNT_INVERT },  /* interpret device files  */
+   { "nodev",    MS_NODEV,  MNT_MFLAG },               /* don't interpret devices */
+
+   { "sync",     MS_SYNCHRONOUS, MNT_MFLAG },          /* synchronous I/O */
+   { "async",    MS_SYNCHRONOUS, MNT_MFLAG | MNT_INVERT }, /* asynchronous I/O */
+
+   { "dirsync",  MS_DIRSYNC, MNT_MFLAG },              /* synchronous directory modifications */
+   { "remount",  MS_REMOUNT, MNT_MFLAG },              /* Alter flags of mounted FS */
+   { "bind",     MS_BIND,    MNT_MFLAG },              /* Remount part of tree elsewhere */
+   { "rbind",    MS_BIND|MS_REC, MNT_MFLAG },          /* Idem, plus mounted subtrees */
+#ifdef MS_NOSUB
+   { "sub",      MS_NOSUB,  MNT_MFLAG | MNT_INVERT },  /* allow submounts */
+   { "nosub",    MS_NOSUB,  MNT_MFLAG },               /* don't allow submounts */
+#endif
+#ifdef MS_SILENT
+   { "quiet",	 MS_SILENT, MNT_MFLAG },               /* be quiet  */
+   { "loud",     MS_SILENT, MNT_MFLAG | MNT_INVERT },  /* print out messages. */
+#endif
+#ifdef MS_MANDLOCK
+   { "mand",     MS_MANDLOCK, MNT_MFLAG },             /* Allow mandatory locks on this FS */
+   { "nomand",   MS_MANDLOCK, MNT_MFLAG | MNT_INVERT },/* Forbid mandatory locks on this FS */
+#endif
+#ifdef MS_NOATIME
+   { "atime",    MS_NOATIME, MNT_MFLAG | MNT_INVERT }, /* Update access time */
+   { "noatime",	 MS_NOATIME, MNT_MFLAG },              /* Do not update access time */
+#endif
+#ifdef MS_I_VERSION
+   { "iversion", MS_I_VERSION,   MNT_MFLAG },          /* Update inode I_version time */
+   { "noiversion", MS_I_VERSION, MNT_MFLAG | MNT_INVERT}, /* Don't update inode I_version time */
+#endif
+#ifdef MS_NODIRATIME
+   { "diratime", MS_NODIRATIME,   MNT_MFLAG | MNT_INVERT }, /* Update dir access times */
+   { "nodiratime", MS_NODIRATIME, MNT_MFLAG },         /* Do not update dir access times */
+#endif
+#ifdef MS_RELATIME
+   { "relatime", MS_RELATIME,   MNT_MFLAG },           /* Update access times relative to mtime/ctime */
+   { "norelatime", MS_RELATIME, MNT_MFLAG | MNT_INVERT }, /* Update access time without regard to mtime/ctime */
+#endif
+#ifdef MS_STRICTATIME
+   { "strictatime", MS_STRICTATIME, MNT_MFLAG },       /* Strict atime semantics */
+   { "nostrictatime", MS_STRICTATIME, MNT_MFLAG | MNT_INVERT }, /* kernel default atime */
+#endif
+   { NULL, 0, 0 }
+};
+
+/*
+ * userspace mount option (built-in MNT_USERSPACE_MAP)
+ */
+static const struct mnt_optmap userspace_opts_map[] =
+{
+   { "defaults", MNT_MS_DFLTS, MNT_NOMTAB },               /* default options */
+
+   { "auto",    MNT_MS_NOAUTO, MNT_INVERT | MNT_NOMTAB },  /* Can be mounted using -a */
+   { "noauto",  MNT_MS_NOAUTO, MNT_NOMTAB },               /* Can  only be mounted explicitly */
+
+   { "user[=%s]", MNT_MS_USER },                           /* Allow ordinary user to mount (mtab) */
+   { "nouser",  MNT_MS_USER, MNT_INVERT | MNT_NOMTAB },    /* Forbid ordinary user to mount */
+
+   { "users",   MNT_MS_USERS, MNT_NOMTAB },                /* Allow ordinary users to mount */
+   { "nousers", MNT_MS_USERS, MNT_INVERT | MNT_NOMTAB },   /* Forbid ordinary users to mount */
+
+   { "owner",   MNT_MS_OWNER, MNT_NOMTAB },                /* Let the owner of the device mount */
+   { "noowner", MNT_MS_OWNER, MNT_INVERT | MNT_NOMTAB },   /* Device owner has no special privs */
+
+   { "group",   MNT_MS_GROUP, MNT_NOMTAB },                /* Let the group of the device mount */
+   { "nogroup", MNT_MS_GROUP, MNT_INVERT | MNT_NOMTAB },   /* Device group has no special privs */
+
+   { "_netdev", MNT_MS_NETDEV },                           /* Device requires network */
+
+   { "comment=%s", MNT_MS_COMMENT, MNT_NOMTAB },           /* fstab comment only */
+
+   { "loop[=%s]", MNT_MS_LOOP },                           /* use the loop device */
+
+   { "nofail",  MNT_MS_NOFAIL, MNT_NOMTAB },               /* Do not fail if ENOENT on dev */
+
+   { NULL, 0, 0 }
+};
+
+/**
+ * mnt_get_builtin_map:
+ * @id: map id -- MNT_LINUX_MAP or MNT_USERSPACE_MAP
+ *
+ * MNT_LINUX_MAP - Linux kernel fs-independent mount options
+ *                 (usually MS_* flags, see linux/fs.h)
+ *
+ * MNT_USERSPACE_MAP - userpace mount(8) specific mount options
+ *                     (e.g user=, _netdev, ...)
+ *
+ * Returns: static built-in libmount map.
+ */
+const struct mnt_optmap *mnt_get_builtin_optmap(int id)
+{
+	assert(id);
+
+	if (id == MNT_LINUX_MAP)
+		return linux_flags_map;
+	else if (id == MNT_USERSPACE_MAP)
+		return userspace_opts_map;
+	return NULL;
+}
+
+/*
+ * Lookups for the @name in @maps and returns a map and in @mapent
+ * returns the map entry
+ */
+const struct mnt_optmap *mnt_optmap_get_entry(
+				struct mnt_optmap const **maps,
+				int nmaps,
+				const char *name,
+				size_t namelen,
+				const struct mnt_optmap **mapent)
+{
+	int i;
+
+	assert(maps);
+	assert(nmaps);
+	assert(name);
+	assert(namelen);
+	assert(mapent);
+
+	*mapent = NULL;
+
+	for (i = 0; i < nmaps; i++) {
+		const struct mnt_optmap *map = maps[i];
+		const struct mnt_optmap *ent;
+		const char *p;
+
+		for (ent = map; ent && ent->name; ent++) {
+			if (strncmp(ent->name, name, namelen))
+				continue;
+			p = ent->name + namelen;
+			if (*p == '\0' || *p == '=' || *p == '[') {
+				*mapent = ent;
+				return map;
+			}
+		}
+	}
+	return NULL;
+}
+
+
+/*
+ * Converts @rawdata to number according to enum definition in the @mapent.
+ */
+int mnt_optmap_enum_to_number(const struct mnt_optmap *mapent,
+			const char *rawdata, size_t len)
+{
+	const char *p, *end = NULL, *begin = NULL;
+	int n = -1;
+
+	if (!rawdata || !*rawdata || !mapent || !len)
+		return -1;
+
+	p = strrchr(mapent->name, '=');
+	if (!p || *(p + 1) == '{')
+		return -1;	/* value unexpected or not "enum" */
+	p += 2;
+	if (!*p || *(p + 1) == '}')
+		return -1;	/* hmm... option <type> is "={" or "={}" */
+
+	/* we cannot use strstr(), @rawdata is not terminated */
+	for (; p && *p; p++) {
+		if (!begin)
+			begin = p;		/* begin of the item */
+		if (*p == ',')
+			end = p;		/* terminate the item */
+		if (*(p + 1) == '}')
+			end = p + 1;		/* end of enum definition */
+		if (!begin || !end)
+			continue;
+		if (end <= begin)
+			return -1;
+		n++;
+		if (len == end - begin && strncasecmp(begin, rawdata, len) == 0)
+			return n;
+		p = end;
+	}
+
+	return -1;
+}
+
+/*
+ * Returns data type defined in the @mapent.
+ */
+const char *mnt_optmap_get_type(const struct mnt_optmap *mapent)
+{
+	char *type;
+
+	assert(mapent);
+	assert(mapent->name);
+
+	type = strrchr(mapent->name, '=');
+	if (!type)
+		return NULL;			/* value is unexpected */
+	if (type == mapent->name)
+		return NULL;			/* wrong format of type definition */
+	type++;
+	if (*type != '%' && *type != '{')
+		return NULL;			/* wrong format of type definition */
+	return type ? : NULL;
+}
+
+/*
+ * Does the option (that is described by @mntent) require any value? (e.g.
+ * uid=<foo>)
+ */
+int mnt_optmap_require_value(const struct mnt_optmap *mapent)
+{
+	char *type;
+
+	assert(mapent);
+	assert(mapent->name);
+
+	type = strchr(mapent->name, '=');
+	if (!type)
+		return 0;			/* value is unexpected */
+	if (type == mapent->name)
+		return 0;			/* wrong format of type definition */
+	if (*(type - 1) == '[')
+		return 0;			/* optional */
+	return 1;
+}
diff --git a/shlibs/mount/src/optstr.c b/shlibs/mount/src/optstr.c
new file mode 100644
index 00000000..19efbf3f
--- /dev/null
+++ b/shlibs/mount/src/optstr.c
@@ -0,0 +1,426 @@
+/*
+ * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: optstr
+ * @title: Options string
+ * @short_description: low-level API for work with mount options
+ *
+ * This is simple and low-level API to work with mount options that are stored
+ * in string. This API is independent on the high-level options container and
+ * option maps.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "nls.h"
+#include "mountP.h"
+
+/*
+ * Parses the first option from @optstr. The @optstr pointer is set to begin of
+ * the next option.
+ *
+ * Returns -1 on parse error, 1 at the end of optstr and 0 on success.
+ */
+static int mnt_optstr_parse_next(char **optstr,	 char **name, size_t *namesz,
+					char **value, size_t *valsz)
+{
+	int open_quote = 0;
+	char *start = NULL, *stop = NULL, *p, *sep = NULL;
+	char *optstr0;
+
+	assert(optstr);
+	assert(*optstr);
+
+	optstr0 = *optstr;
+
+	if (name)
+		*name = NULL;
+	if (namesz)
+		*namesz = 0;
+	if (value)
+		*value = NULL;
+	if (valsz)
+		*valsz = 0;
+
+	for (p = optstr0; p && *p; p++) {
+		if (!start)
+			start = p;		/* begin of the option item */
+		if (*p == '"')
+			open_quote ^= 1;	/* reverse the status */
+		if (open_quote)
+			continue;		/* still in quoted block */
+		if (!sep && *p == '=')
+			sep = p;		/* name and value separator */
+		if (*p == ',')
+			stop = p;		/* terminate the option item */
+		else if (*(p + 1) == '\0')
+			stop = p + 1;		/* end of optstr */
+		if (!start || !stop)
+			continue;
+		if (stop <= start)
+			goto error;
+
+		if (name)
+			*name = start;
+		if (namesz)
+			*namesz = sep ? sep - start : stop - start;
+		*optstr = *stop ? stop + 1 : stop;
+
+		if (sep) {
+			if (value)
+				*value = sep + 1;
+			if (valsz)
+				*valsz = stop - sep - 1;
+		}
+		return 0;
+	}
+
+	return 1;				/* end of optstr */
+
+error:
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+			"libmount: parse error: \"%s\"\n", optstr0));
+	return -1;
+}
+
+/*
+ * Locates the first option that match with @name. The @end is set to
+ * char behind the option (it means ',' or \0).
+ *
+ * Returns -1 on parse error, 1 when not found and 0 on success.
+ */
+static int mnt_optstr_locate_option(char *optstr, const char *name, char **begin,
+					char **end, char **value, size_t *valsz)
+{
+	char *n;
+	size_t namesz, nsz;
+	int rc;
+
+	assert(name);
+	assert(optstr);
+
+	namesz = strlen(name);
+
+	do {
+		rc = mnt_optstr_parse_next(&optstr, &n, &nsz, value, valsz);
+		if (rc)
+			break;
+
+		if (namesz == nsz && strncmp(n, name, nsz) == 0) {
+			if (begin)
+				*begin = n;
+			if (end)
+				*end = *(optstr - 1) == ',' ?
+					optstr - 1 : optstr;
+			return 0;
+		}
+	} while(1);
+
+	DBG(DEBUG_OPTIONS, fprintf(stderr,
+			"libmount: can't found '%s' option\n", name));
+	return rc;
+}
+
+/**
+ * mnt_optstr_next_option:
+ * @optstr: option string, returns position to next option
+ * @name: returns option name
+ * @namesz: returns option name length
+ * @value: returns option value or NULL
+ * @valuesz: returns option value length or zero
+ *
+ * Parses the first option in @optstr  or -1 in case of error.
+ *
+ * Returns: 0 on success, 1 at the end of @optstr or -1 in case of error.
+ */
+int mnt_optstr_next_option(char **optstr, char **name, size_t *namesz,
+					char **value, size_t *valuesz)
+{
+	if (!optstr || !*optstr)
+		return -1;
+	return mnt_optstr_parse_next(optstr, name, namesz, value, valuesz);
+}
+
+/**
+ * mnt_optstr_append_option:
+ * @optstr: option string or NULL
+ * @name: value name
+ * @value: value
+ *
+ * Returns: reallocated (or newly allocated) @optstr with ,name=value
+ */
+int mnt_optstr_append_option(char **optstr, const char *name, const char *value)
+{
+	char *p;
+	size_t sz, vsz, osz, nsz;
+
+	if (!name)
+		return -1;
+
+	osz = *optstr ? strlen(*optstr) : 0;
+	nsz = strlen(name);
+	vsz = value ? strlen(value) : 0;
+
+	sz = osz + nsz + 1;		/* 1: '\0' */
+	if (osz)
+		sz++;			/* ',' options separator */
+	if (vsz)
+		sz += vsz + 1;		/* 1: '=' */
+
+	p = realloc(*optstr, sz);
+	if (!p)
+		return -1;
+	*optstr = p;
+
+	if (osz) {
+		p += osz;
+		*p++ = ',';
+	}
+
+	memcpy(p, name, nsz);
+	p += nsz;
+
+	if (vsz) {
+		*p++ = '=';
+		memcpy(p, value, vsz);
+		p += vsz;
+	}
+	*p = '\0';
+
+	return 0;
+}
+
+/**
+ * mnt_optstr_get_option:
+ * @optstr: string with comma separated list of options
+ * @name: requested option name
+ * @value: returns pointer to the begin of the value (e.g. name=VALUE) or NULL
+ * @valsz: returns size of the value or 0
+ *
+ * Returns: 0 on success, 1 when not found the @name or -1 in case of error.
+ */
+int mnt_optstr_get_option(char *optstr, const char *name,
+				char **value, size_t *valsz)
+{
+	return mnt_optstr_locate_option(optstr, name, NULL, NULL, value, valsz);
+}
+
+/* Removes substring located between @begin and @end from @str
+ * -- result never starts or ends with comma or contains two commas
+ *    (e.g. ",aaa,bbb" or "aaa,,bbb" or "aaa,")
+ */
+static void remove_substring(char *str, char *begin, char *end)
+{
+	size_t sz = strlen(end);
+
+	if ((begin == str || *(begin - 1) == ',') && *end == ',')
+		end++;
+
+	memmove(begin, end, sz + 1);
+	if (!*begin && *(begin - 1) == ',')
+		*(begin - 1) = '\0';
+}
+
+/* insert '=substr' to @str on position @pos */
+static int insert_substring(char **str, char *pos, const char *substr)
+{
+	char *p;
+	size_t ssz = strlen(substr);	/* substring size */
+
+	p = realloc(*str, strlen(*str) + 1 + ssz);
+	if (!p)
+		return -1;
+	*str = p;
+
+	memmove(pos + ssz + 1, pos, strlen(pos) + 1);
+	*pos++ = '=';
+	memcpy(pos, substr, ssz);
+	return 0;
+}
+
+/**
+ * mnt_optstr_set_option:
+ * @optstr: string with comma separated list of options
+ * @name: requested option
+ * @value: new value or NULL
+ *
+ * Set or unset option @value.
+ *
+ * Returns: 0 on success, 1 when not found the @name or -1 in case of error.
+ */
+int mnt_optstr_set_option(char **optstr, const char *name, const char *value)
+{
+	char *val = NULL, *begin, *end, *nameend;
+	size_t valsz;
+	int rc = 1;
+
+	if (!optstr)
+		return -1;
+	if (*optstr)
+		rc = mnt_optstr_locate_option(*optstr, name,
+					&begin, &end, &val, &valsz);
+	if (rc == -1)
+		/* parse error */
+		return -1;
+	if (rc == 1)
+		/* not found */
+		return mnt_optstr_append_option(optstr, name, value);
+
+	nameend = begin + strlen(name);
+
+	if (value == NULL && val && valsz)
+		/* remove unwanted "=value" */
+		remove_substring(*optstr, nameend, end);
+
+	else if (value && val == NULL)
+		/* insert "=value" */
+		rc = insert_substring(optstr, nameend, value);
+
+	else if (value && val && strlen(value) == valsz)
+		/* simply replace =value */
+		memcpy(val, value, valsz);
+
+	else if (value && val) {
+		remove_substring(*optstr, nameend, end);
+		rc = insert_substring(optstr, nameend, value);
+	}
+
+
+	return 0;
+}
+
+/**
+ * mnt_optstr_remove_option:
+ * @optstr: string with comma separated list of options
+ * @name: requested option name
+ *
+ * Returns: 0 on success, 1 when not found the @name or -1 in case of error.
+ */
+int mnt_optstr_remove_option(char **optstr, const char *name)
+{
+	char *begin, *end;
+	int rc;
+
+	rc = mnt_optstr_locate_option(*optstr, name,
+				&begin, &end, NULL, NULL);
+	if (rc != 0)
+		return rc;
+
+	remove_substring(*optstr, begin, end);
+	return 0;
+}
+
+#ifdef TEST_PROGRAM
+
+int test_append(struct mtest *ts, int argc, char *argv[])
+{
+	const char *value = NULL, *name;
+	char *optstr;
+
+	if (argc < 3)
+		goto done;
+	optstr = strdup(argv[1]);
+	name = argv[2];
+
+	if (argc == 4)
+		value = argv[3];
+
+	if (mnt_optstr_append_option(&optstr, name, value) == 0) {
+		printf("result: >%s<\n", optstr);
+		return 0;
+	}
+done:
+	return -1;
+}
+
+int test_set(struct mtest *ts, int argc, char *argv[])
+{
+	const char *value = NULL, *name;
+	char *optstr;
+
+	if (argc < 3)
+		goto done;
+	optstr = strdup(argv[1]);
+	name = argv[2];
+
+	if (argc == 4)
+		value = argv[3];
+
+	if (mnt_optstr_set_option(&optstr, name, value) == 0) {
+		printf("result: >%s<\n", optstr);
+		return 0;
+	}
+done:
+	return -1;
+}
+
+int test_get(struct mtest *ts, int argc, char *argv[])
+{
+	char *optstr;
+	const char *name;
+	char *val = NULL;
+	size_t sz = 0;
+	int rc;
+
+	if (argc < 2)
+		goto done;
+	optstr = argv[1];
+	name = argv[2];
+
+	rc = mnt_optstr_get_option(optstr, name, &val, &sz);
+	if (rc == 0) {
+		printf("found; name: %s", name);
+		if (sz) {
+			printf(", argument: size=%zd data=", sz);
+			if (fwrite(val, 1, sz, stdout) != sz)
+				goto done;
+		}
+		printf("\n");
+		return 0;
+	} else if (rc == 1)
+		printf("%s: not found\n", name);
+	else
+		printf("parse error: %s\n", optstr);
+done:
+	return -1;
+}
+
+int test_remove(struct mtest *ts, int argc, char *argv[])
+{
+	const char *name;
+	char *optstr;
+
+	if (argc < 3)
+		goto done;
+	optstr = strdup(argv[1]);
+	name = argv[2];
+
+	if (mnt_optstr_remove_option(&optstr, name) == 0) {
+		printf("result: >%s<\n", optstr);
+		return 0;
+	}
+done:
+	return -1;
+}
+
+
+int main(int argc, char *argv[])
+{
+	struct mtest tss[] = {
+		{ "--append", test_append, "<optstr> <name> [<value>]  append value to optstr" },
+		{ "--set",    test_set,    "<optstr> <name> [<value>]  (un)set value" },
+		{ "--get",    test_get,    "<optstr> <name>            search name in optstr" },
+		{ "--remove", test_remove, "<optstr> <name>            remove name in optstr" },
+		{ NULL }
+	};
+	return  mnt_run_test(tss, argc, argv);
+}
+#endif /* TEST_PROGRAM */
diff --git a/shlibs/mount/src/tab.c b/shlibs/mount/src/tab.c
new file mode 100644
index 00000000..cb6a91d3
--- /dev/null
+++ b/shlibs/mount/src/tab.c
@@ -0,0 +1,929 @@
+/*
+ * Copyright (C) 2008-2010 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: tab
+ * @title: FS container
+ * @short_description: container for entries from fstab/mtab/mountinfo
+ *
+ *
+ * Note that mnt_tab_find_* functions are mount(8) compatible. These functions
+ * try to found an entry in more iterations where the first attempt is always
+ * based on comparison with unmodified (non-canonicalized or un-evaluated)
+ * paths or tags. For example fstab with two entries:
+ * <informalexample>
+ *   <programlisting>
+ *	LABEL=foo	/foo	auto   rw
+ *	/dev/foo	/foo	auto   rw
+ *  </programlisting>
+ * </informalexample>
+ *
+ * where both lines are used for the *same* device, then
+ * <informalexample>
+ *  <programlisting>
+ *	mnt_tab_find_source(tb, "/dev/foo", &fs);
+ *  </programlisting>
+ * </informalexample>
+ * will returns the second line, and
+ * <informalexample>
+ *  <programlisting>
+ *	mnt_tab_find_source(tb, "LABEL=foo", &fs);
+ *  </programlisting>
+ * </informalexample>
+ * will returns the first entry, and
+ * <informalexample>
+ *  <programlisting>
+ *	mnt_tab_find_source(tb, "UUID=anyuuid", &fs);
+ *  </programlisting>
+ * </informalexample>
+ * will returns the first entry (if UUID matches with the device).
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <blkid.h>
+
+#include "nls.h"
+#include "mountP.h"
+#include "c.h"
+
+/**
+ * mnt_new_tab:
+ * @filename: file name or NULL
+ *
+ * The tab is a container for mnt_fs entries that usually represents a fstab,
+ * mtab or mountinfo file from your system.
+ *
+ * Note that this function does not parse the file. See also
+ * mnt_tab_parse_file().
+ *
+ * Returns: newly allocated tab struct.
+ */
+mnt_tab *mnt_new_tab(const char *filename)
+{
+	mnt_tab *tb = NULL;
+
+	tb = calloc(1, sizeof(struct _mnt_tab));
+	if (!tb)
+		goto err;
+
+	if (filename) {
+		tb->filename = strdup(filename);
+		if (!tb->filename)
+			goto err;
+	}
+	INIT_LIST_HEAD(&tb->ents);
+	return tb;
+err:
+	free(tb);
+	return NULL;
+}
+
+/**
+ * mnt_free_tab:
+ * @tb: tab pointer
+ *
+ * Deallocates tab struct and all entries.
+ */
+void mnt_free_tab(mnt_tab *tb)
+{
+	if (!tb)
+		return;
+	free(tb->filename);
+
+	while (!list_empty(&tb->ents)) {
+		mnt_fs *fs = list_entry(tb->ents.next, mnt_fs, ents);
+		mnt_free_fs(fs);
+	}
+
+	free(tb);
+}
+
+/**
+ * mnt_tab_get_nents:
+ * @tb: pointer to tab
+ *
+ * Returns: number of valid entries in tab.
+ */
+int mnt_tab_get_nents(mnt_tab *tb)
+{
+	assert(tb);
+	return tb ? tb->nents : 0;
+}
+
+/**
+ * mnt_tab_set_cache:
+ * @tb: pointer to tab
+ * @mpc: pointer to mnt_cache instance
+ *
+ * Setups a cache for canonicalized paths and evaluated tags (LABEL/UUID). The
+ * cache is recommended for mnt_tab_find_*() functions.
+ *
+ * The cache could be shared between more tabs. Be careful when you share the
+ * same cache between more threads -- currently the cache does not provide any
+ * locking method.
+ *
+ * See also mnt_new_cache().
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_tab_set_cache(mnt_tab *tb, mnt_cache *mpc)
+{
+	assert(tb);
+	if (!tb)
+		return -1;
+	tb->cache = mpc;
+	return 0;
+}
+
+/**
+ * mnt_tab_get_cache:
+ * @tb: pointer to tab
+ *
+ * Returns: pointer to mnt_cache instance or NULL.
+ */
+mnt_cache *mnt_tab_get_cache(mnt_tab *tb)
+{
+	assert(tb);
+	return tb ? tb->cache : NULL;
+}
+
+/**
+ * mnt_tab_get_name:
+ * @tb: tab pointer
+ *
+ * Returns: tab filename or NULL.
+ */
+const char *mnt_tab_get_name(mnt_tab *tb)
+{
+	assert(tb);
+	return tb ? tb->filename : NULL;
+}
+
+/**
+ * mnt_tab_add_fs:
+ * @tb: tab pointer
+ * @fs: new entry
+ *
+ * Adds a new entry to tab.
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_tab_add_fs(mnt_tab *tb, mnt_fs *fs)
+{
+	assert(tb);
+	assert(fs);
+
+	if (!tb || !fs)
+		return -1;
+
+	list_add_tail(&fs->ents, &tb->ents);
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: add entry: %s %s\n",
+		tb->filename, mnt_fs_get_source(fs),
+		mnt_fs_get_target(fs)));
+
+	if (fs->flags & MNT_FS_ERROR)
+		tb->nerrs++;
+	else
+		tb->nents++;
+	return 0;
+}
+
+/**
+ * mnt_tab_remove_fs:
+ * @tb: tab pointer
+ * @fs: new entry
+ *
+ * Returns: 0 on success or -1 in case of error.
+ */
+int mnt_tab_remove_fs(mnt_tab *tb, mnt_fs *fs)
+{
+	assert(tb);
+	assert(fs);
+
+	if (!tb || !fs)
+		return -1;
+
+	list_del(&fs->ents);
+
+	if (fs->flags & MNT_FS_ERROR)
+		tb->nerrs--;
+	else
+		tb->nents--;
+	return 0;
+}
+
+/**
+ * mnt_tab_get_root_fs:
+ * @tb: mountinfo file (/proc/self/mountinfo)
+ * @root: returns pointer to the root filesystem (/)
+ *
+ * Returns: 0 on success or -1 case of error.
+ */
+int mnt_tab_get_root_fs(mnt_tab *tb, mnt_fs **root)
+{
+	mnt_iter itr;
+	mnt_fs *fs;
+	int root_id = 0;
+
+	assert(tb);
+	assert(root);
+
+	if (!tb || !root)
+		return -1;
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: lookup root fs\n", tb->filename));
+
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+	while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+		int id = mnt_fs_get_parent_id(fs);
+		if (!id)
+			break;		/* @tab is not mountinfo file? */
+
+		if (!*root || id < root_id) {
+			*root = fs;
+			root_id = id;
+		}
+	}
+
+	return root_id ? 0 : -1;
+}
+
+/**
+ * mnt_tab_next_child_fs:
+ * @tb: mountinfo file (/proc/self/mountinfo)
+ * @itr: iterator
+ * @parent: parental FS
+ * @chld: returns the next child filesystem
+ *
+ * Note that filesystems are returned in the order how was mounted (according to
+ * IDs in /proc/self/mountinfo).
+ *
+ * Returns: 0 on success, -1 in case of error or 1 at end of list.
+ */
+int mnt_tab_next_child_fs(mnt_tab *tb, mnt_iter *itr,
+			mnt_fs *parent, mnt_fs **chld)
+{
+	mnt_fs *fs;
+	int parent_id, lastchld_id = 0, chld_id = 0;
+
+	if (!tb || !itr || !parent)
+		return -1;
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: lookup next child of %s\n",
+		tb->filename, mnt_fs_get_target(parent)));
+
+	parent_id = mnt_fs_get_id(parent);
+	if (!parent_id)
+		return -1;
+
+	/* get ID of the previously returned child */
+	if (itr->head && itr->p != itr->head) {
+		MNT_ITER_ITERATE(itr, fs, struct _mnt_fs, ents);
+		lastchld_id = mnt_fs_get_id(fs);
+	}
+
+	*chld = NULL;
+
+	mnt_reset_iter(itr, MNT_ITER_FORWARD);
+	while(mnt_tab_next_fs(tb, itr, &fs) == 0) {
+		int id;
+
+		if (mnt_fs_get_parent_id(fs) != parent_id)
+			continue;
+
+		id = mnt_fs_get_id(fs);
+
+		if ((!lastchld_id || id > lastchld_id) &&
+		    (!*chld || id < chld_id)) {
+			*chld = fs;
+			chld_id = id;
+		}
+	}
+
+	if (!chld_id)
+		return 1;	/* end of iterator */
+
+	/* set the iterator to the @chld for the next call */
+	mnt_tab_set_iter(tb, itr, *chld);
+
+	return 0;
+}
+
+/**
+ * mnt_tab_next_fs:
+ * @tb: tab pointer
+ * @itr: iterator
+ * @fs: returns the next tab entry
+ *
+ * Returns: 0 on success, -1 in case of error or 1 at end of list.
+ *
+ * Example (list all mountpoints from fstab in backward order):
+ * <informalexample>
+ *   <programlisting>
+ *	mnt_fs *fs;
+ *	mnt_tab *tb = mnt_new_tab("/etc/fstab");
+ *	mnt_iter *itr = mnt_new_iter(MNT_ITER_BACKWARD);
+ *
+ *	mnt_tab_parse_file(tb);
+ *
+ *	while(mnt_tab_next_fs(tb, itr, &fs) == 0) {
+ *		const char *dir = mnt_fs_get_target(fs);
+ *		printf("mount point: %s\n", dir);
+ *	}
+ *	mnt_free_tab(fi);
+ *   </programlisting>
+ * </informalexample>
+ */
+int mnt_tab_next_fs(mnt_tab *tb, mnt_iter *itr, mnt_fs **fs)
+{
+	int rc;
+
+	assert(tb);
+	assert(itr);
+	assert(fs);
+
+	if (!tb || !itr || !fs)
+		return -1;
+again:
+	rc = 1;
+	if (!itr->head)
+		MNT_ITER_INIT(itr, &tb->ents);
+	if (itr->p != itr->head) {
+		MNT_ITER_ITERATE(itr, *fs, struct _mnt_fs, ents);
+		rc = 0;
+	}
+
+	/* ignore broken entries */
+	if (*fs && ((*fs)->flags & MNT_FS_ERROR))
+		goto again;
+
+	return rc;
+}
+
+/**
+ * mnt_tab_find_next_fs:
+ * @tb: table
+ * @itr: iterator
+ * @match_func: function returns 1 or 0
+ * @userdata: extra data for match_func
+ * @fs: returns pointer to the next matching table entry
+ *
+ * This function allows search in @tb.
+ *
+ * Returns: -1 in case of error, 1 at end of table or 0 o success.
+ */
+int mnt_tab_find_next_fs(mnt_tab *tb, mnt_iter *itr,
+		int (*match_func)(mnt_fs *, void *), void *userdata,
+		mnt_fs **fs)
+{
+	if (!tb || !itr || !fs || !match_func)
+		return -1;
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: lookup next fs\n", tb->filename));
+
+	if (!itr->head)
+		MNT_ITER_INIT(itr, &tb->ents);
+
+	do {
+		if (itr->p != itr->head)
+			MNT_ITER_ITERATE(itr, *fs, struct _mnt_fs, ents);
+		else
+			break;			/* end */
+
+		if ((*fs)->flags & MNT_FS_ERROR)
+			continue;
+		if (match_func(*fs, userdata))
+			return 0;
+	} while(1);
+
+	*fs = NULL;
+	return 1;
+}
+
+/**
+ * mnt_tab_set_iter:
+ * @tb: tab pointer
+ * @itr: iterator
+ * @fs: tab entry
+ *
+ * Sets @iter to the position of @fs in the file @tb.
+ *
+ * Returns: 0 on success, -1 in case of error.
+ */
+int mnt_tab_set_iter(mnt_tab *tb, mnt_iter *itr, mnt_fs *fs)
+{
+	assert(tb);
+	assert(itr);
+	assert(fs);
+
+	if (!tb || !itr || !fs)
+		return -1;
+
+	MNT_ITER_INIT(itr, &tb->ents);
+	itr->p = &fs->ents;
+
+	return 0;
+}
+
+/**
+ * mnt_tab_find_target:
+ * @tb: tab pointer
+ * @path: mountpoint directory
+ * @direction: MNT_ITER_{FORWARD,BACKWARD}
+ *
+ * Try to lookup an entry in given tab, possible are three iterations, first
+ * with @path, second with realpath(@path) and third with realpath(@path)
+ * against realpath(fs->target). The 2nd and 3rd iterations are not performed
+ * when @tb cache is not set (see mnt_tab_set_cache()).
+ *
+ * Returns: a tab entry or NULL.
+ */
+mnt_fs *mnt_tab_find_target(mnt_tab *tb, const char *path, int direction)
+{
+	mnt_iter itr;
+	mnt_fs *fs = NULL;
+	char *cn;
+
+	assert(tb);
+	assert(path);
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: lookup target: %s\n", tb->filename, path));
+
+	/* native @target */
+	mnt_reset_iter(&itr, direction);
+	while(mnt_tab_next_fs(tb, &itr, &fs) == 0)
+		if (fs->target && strcmp(fs->target, path) == 0)
+			return fs;
+
+	if (!tb->cache || !(cn = mnt_resolve_path(path, tb->cache)))
+		return NULL;
+
+	/* canonicalized paths in mnt_tab */
+	mnt_reset_iter(&itr, direction);
+	while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+		if (fs->target && strcmp(fs->target, cn) == 0)
+			return fs;
+	}
+
+	/* non-canonicaled path in mnt_tab */
+	mnt_reset_iter(&itr, direction);
+	while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+		char *p;
+		if (!fs->target)
+		       continue;
+		p = mnt_resolve_path(fs->target, tb->cache);
+		if (strcmp(cn, p) == 0)
+			return fs;
+	}
+	return NULL;
+}
+
+/**
+ * mnt_tab_find_srcpath:
+ * @tb: tab pointer
+ * @path: source path (devname or dirname)
+ * @direction: MNT_ITER_{FORWARD,BACKWARD}
+ *
+ * Try to lookup an entry in given tab, possible are four iterations, first
+ * with @path, second with realpath(@path), third with tags (LABEL, UUID, ..)
+ * from @path and fourth with realpath(@path) against realpath(entry->srcpath).
+ *
+ * The 2nd, 3rd and 4th iterations are not performed when @tb cache is not
+ * set (see mnt_tab_set_cache()).
+ *
+ * Returns: a tab entry or NULL.
+ */
+mnt_fs *mnt_tab_find_srcpath(mnt_tab *tb, const char *path, int direction)
+{
+	mnt_iter itr;
+	mnt_fs *fs = NULL;
+	int ntags = 0;
+	char *cn;
+	const char *p;
+
+	assert(tb);
+	assert(path);
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: lookup srcpath: %s\n", tb->filename, path));
+
+	/* native paths */
+	mnt_reset_iter(&itr, direction);
+	while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+		p = mnt_fs_get_srcpath(fs);
+		if (p && strcmp(p, path) == 0)
+			return fs;
+		if (!p)
+			/* mnt_fs_get_srcpath() returs nothing, it's TAG */
+			ntags++;
+	}
+
+	if (!tb->cache || !(cn = mnt_resolve_path(path, tb->cache)))
+		return NULL;
+
+	/* canonicalized paths in mnt_tab */
+	if (ntags < mnt_tab_get_nents(tb)) {
+		mnt_reset_iter(&itr, direction);
+		while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+			p = mnt_fs_get_srcpath(fs);
+			if (p && strcmp(p, cn) == 0)
+				return fs;
+		}
+	}
+
+	/* evaluated tag */
+	if (ntags) {
+		int rc = mnt_cache_read_tags(tb->cache, cn);
+
+		mnt_reset_iter(&itr, direction);
+
+		if (rc == 0) {
+			/* @path's TAGs are in the cache */
+			while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+				const char *t, *v;
+
+				if (mnt_fs_get_tag(fs, &t, &v))
+					continue;
+
+				if (mnt_cache_device_has_tag(tb->cache, cn, t, v))
+					return fs;
+			}
+		} else if (rc < 0 && errno == EACCES) {
+			/* @path is unaccessible, try evaluate all TAGs in @tb
+			 * by udev symlinks -- this could be expensive on systems
+			 * with huge fstab/mtab */
+			 while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+				 const char *t, *v, *x;
+				 if (mnt_fs_get_tag(fs, &t, &v))
+					 continue;
+				 x = mnt_resolve_tag(t, v, tb->cache);
+				 if (x && !strcmp(x, cn))
+					 return fs;
+			 }
+		}
+	}
+
+	/* non-canonicalized paths in mnt_tab */
+	if (ntags <= mnt_tab_get_nents(tb)) {
+		mnt_reset_iter(&itr, direction);
+		while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+			p = mnt_fs_get_srcpath(fs);
+			if (p)
+				p = mnt_resolve_path(p, tb->cache);
+			if (p && strcmp(cn, p) == 0)
+				return fs;
+		}
+	}
+
+	return NULL;
+}
+
+
+/**
+ * mnt_tab_find_tag:
+ * @tb: tab pointer
+ * @tag: tag name (e.g "LABEL", "UUID", ...)
+ * @val: tag value
+ * @direction: MNT_ITER_{FORWARD,BACKWARD}
+ *
+ * Try to lookup an entry in given tab, first attempt is lookup by @tag and
+ * @val, for the second attempt the tag is evaluated (converted to the device
+ * name) and mnt_tab_find_srcpath() is preformed. The second attempt is not
+ * performed when @tb cache is not set (see mnt_tab_set_cache()).
+
+ * Returns: a tab entry or NULL.
+ */
+mnt_fs *mnt_tab_find_tag(mnt_tab *tb, const char *tag,
+			const char *val, int direction)
+{
+	mnt_iter itr;
+	mnt_fs *fs = NULL;
+
+	assert(tb);
+	assert(tag);
+	assert(val);
+
+	if (!tb || !tag || !val)
+		return NULL;
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: lookup by TAG: %s %s\n", tb->filename, tag, val));
+
+	/* look up by TAG */
+	mnt_reset_iter(&itr, direction);
+	while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+		if (fs->tagname && fs->tagval &&
+		    strcmp(fs->tagname, tag) == 0 &&
+		    strcmp(fs->tagval, val) == 0)
+			return fs;
+	}
+
+	if (tb->cache) {
+		/* look up by device name */
+		char *cn = mnt_resolve_tag(tag, val, tb->cache);
+		if (cn)
+			return mnt_tab_find_srcpath(tb, cn, direction);
+	}
+	return NULL;
+}
+
+/**
+ * mnt_tab_find_source:
+ * @tb: tab pointer
+ * @source: TAG or path
+ * @direction: MNT_ITER_{FORWARD,BACKWARD}
+ *
+ * This is high-level API for mnt_tab_find_{srcpath,tag}. You needn't to care
+ * about @source format (device, LABEL, UUID, ...). This function parses @source
+ * and calls mnt_tab_find_tag() or mnt_tab_find_srcpath().
+ *
+ * Returns: a tab entry or NULL.
+ */
+mnt_fs *mnt_tab_find_source(mnt_tab *tb, const char *source, int direction)
+{
+	mnt_fs *fs = NULL;
+
+	assert(tb);
+	assert(source);
+
+	if (!tb || !source)
+		return NULL;
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: lookup SOURCE: %s\n", tb->filename, source));
+
+	if (strchr(source, '=')) {
+		char *tag, *val;
+
+		if (blkid_parse_tag_string(source, &tag, &val) == 0) {
+
+			fs = mnt_tab_find_tag(tb, tag, val, direction);
+
+			free(tag);
+			free(val);
+		}
+	} else
+		fs = mnt_tab_find_srcpath(tb, source, direction);
+
+	return fs;
+}
+
+
+/**
+ * mnt_tab_fprintf:
+ * @tb: tab pointer
+ * @f: FILE
+ * @fmt: per line printf-like format string (see MNT_TAB_PRINTFMT)
+ *
+ * Returns: 0 on success, -1 in case of error.
+ */
+int mnt_tab_fprintf(mnt_tab *tb, FILE *f, const char *fmt)
+{
+	mnt_iter itr;
+	mnt_fs *fs;
+
+	assert(f);
+	assert(fmt);
+	assert(tb);
+
+	if (!f || !fmt || !tb)
+		return -1;
+
+	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
+	while(mnt_tab_next_fs(tb, &itr, &fs) == 0) {
+		if (mnt_fs_fprintf(fs, f, fmt) == -1)
+			return -1;
+	}
+
+	return 0;
+}
+
+/**
+ * mnt_tab_update_file
+ * @tb: tab pointer
+ *
+ * Writes tab to disk. Don't forget to lock the file (see mnt_lock()).
+ *
+ * Returns: 0 on success, -1 in case of error.
+ */
+int mnt_tab_update_file(mnt_tab *tb)
+{
+	FILE *f = NULL;
+	char tmpname[PATH_MAX];
+	const char *filename;
+	struct stat st;
+	int fd;
+
+	assert(tb);
+	if (!tb)
+		goto error;
+
+	filename = mnt_tab_get_name(tb);
+	if (!filename)
+		goto error;
+
+	if (snprintf(tmpname, sizeof(tmpname), "%s.tmp", filename)
+						>= sizeof(tmpname))
+		goto error;
+
+	f = fopen(tmpname, "w");
+	if (!f)
+		goto error;
+
+	if (mnt_tab_fprintf(tb, f, MNT_TAB_PRINTFMT) != 0)
+		goto error;
+
+	fd = fileno(f);
+
+	if (fchmod(fd, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) < 0)
+		goto error;
+
+	/* Copy uid/gid from the present file before renaming. */
+	if (stat(filename, &st) == 0) {
+		if (fchown(fd, st.st_uid, st.st_gid) < 0)
+			goto error;
+	}
+
+	fclose(f);
+	f = NULL;
+
+	if (rename(tmpname, filename) < 0)
+		goto error;
+
+	return 0;
+error:
+	if (f)
+		fclose(f);
+	return -1;
+}
+
+#ifdef TEST_PROGRAM
+int test_strerr(struct mtest *ts, int argc, char *argv[])
+{
+	char buf[BUFSIZ];
+	mnt_tab *tb;
+	int i;
+
+	tb = mnt_new_tab("-test-");
+	if (!tb)
+		goto err;
+
+	for (i = 0; i < 10; i++) {
+		mnt_fs *fs = mnt_new_fs();
+		if (!fs)
+			goto err;
+		if (i % 2)
+			fs->flags |= MNT_FS_ERROR;	/* mark entry as broken */
+		fs->lineno = i+1;
+		mnt_tab_add_fs(tb, fs);
+	}
+
+	printf("\tadded %d valid lines\n", mnt_tab_get_nents(tb));
+	printf("\tadded %d broken lines\n", mnt_tab_get_nerrs(tb));
+
+	if (!mnt_tab_get_nerrs(tb))		/* report broken entries */
+		goto err;
+	mnt_tab_strerror(tb, buf, sizeof(buf));
+	printf("\t%s\n", buf);
+
+	mnt_free_tab(tb);
+	return 0;
+err:
+	return -1;
+}
+
+mnt_tab *create_tab(const char *file)
+{
+	mnt_tab *tb;
+
+	if (!file)
+		return NULL;
+	tb = mnt_new_tab(file);
+	if (!tb)
+		goto err;
+	if (mnt_tab_parse_file(tb) != 0)
+		goto err;
+	if (mnt_tab_get_nerrs(tb)) {
+		char buf[BUFSIZ];
+		mnt_tab_strerror(tb, buf, sizeof(buf));
+		fprintf(stderr, "%s\n", buf);
+		goto err;
+	}
+	return tb;
+err:
+	mnt_free_tab(tb);
+	return NULL;
+}
+
+int test_parse(struct mtest *ts, int argc, char *argv[])
+{
+	mnt_tab *tb;
+	mnt_iter *itr;
+	mnt_fs *fs;
+
+	tb = create_tab(argv[1]);
+	if (!tb)
+		return -1;
+
+	itr = mnt_new_iter(MNT_ITER_FORWARD);
+	if (!itr)
+		goto err;
+	while(mnt_tab_next_fs(tb, itr, &fs) == 0)
+		mnt_fs_print_debug(fs, stdout);
+err:
+	mnt_free_iter(itr);
+	mnt_free_tab(tb);
+	return 0;
+}
+
+int test_find(struct mtest *ts, int argc, char *argv[], int dr)
+{
+	mnt_tab *tb;
+	mnt_fs *fs = NULL;
+	mnt_cache *mpc;
+	const char *file, *find, *what;
+
+	if (argc != 4) {
+		fprintf(stderr, "try --help\n");
+		goto err;
+	}
+
+	file = argv[1], find = argv[2], what = argv[3];
+
+	tb = create_tab(file);
+	if (!tb)
+		goto err;
+
+	/* create a cache for canonicalized paths */
+	mpc = mnt_new_cache();
+	if (!mpc)
+		goto err;
+	mnt_tab_set_cache(tb, mpc);
+
+	if (strcasecmp(find, "source") == 0)
+		fs = mnt_tab_find_source(tb, what, dr);
+	else if (strcasecmp(find, "target") == 0)
+		fs = mnt_tab_find_target(tb, what, dr);
+
+	if (!fs)
+		fprintf(stderr, "%s: not found %s '%s'\n", file, find, what);
+	else {
+		const char *s = mnt_fs_get_srcpath(fs);
+		if (s)
+			printf("%s", s);
+		else {
+			const char *tag, *val;
+			mnt_fs_get_tag(fs, &tag, &val);
+			printf("%s=%s", tag, val);
+		}
+		printf("|%s|%s\n", mnt_fs_get_target(fs),
+				mnt_fs_get_optstr(fs));
+	}
+	mnt_free_tab(tb);
+	mnt_free_cache(mpc);
+	return 0;
+err:
+	return -1;
+}
+
+int test_find_bw(struct mtest *ts, int argc, char *argv[])
+{
+	return test_find(ts, argc, argv, MNT_ITER_BACKWARD);
+}
+
+int test_find_fw(struct mtest *ts, int argc, char *argv[])
+{
+	return test_find(ts, argc, argv, MNT_ITER_FORWARD);
+}
+
+int main(int argc, char *argv[])
+{
+	struct mtest tss[] = {
+	{ "--strerror", test_strerr,       "        test tab error reporting" },
+	{ "--parse",    test_parse,        "<file>  parse and print tab" },
+	{ "--find-forward",  test_find_fw, "<file> <source|target> <string>" },
+	{ "--find-backward", test_find_bw, "<file> <source|target> <string>" },
+	{ NULL }
+	};
+
+	return mnt_run_test(tss, argc, argv);
+}
+
+#endif /* TEST_PROGRAM */
diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
new file mode 100644
index 00000000..680e1fc1
--- /dev/null
+++ b/shlibs/mount/src/tab_parse.c
@@ -0,0 +1,528 @@
+/*
+ * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <limits.h>
+
+#include "nls.h"
+#include "mangle.h"
+#include "mountP.h"
+
+static inline char *skip_spaces(char *s)
+{
+	assert(s);
+
+	while (*s == ' ' || *s == '\t')
+		s++;
+	return s;
+}
+
+static inline char *skip_nonspaces(char *s)
+{
+	assert(s);
+
+	while (*s && !(*s == ' ' || *s == '\t'))
+		s++;
+	return s;
+}
+
+static size_t next_word_size(char *s, char **start, char **end)
+{
+	char *e;
+
+	assert(s);
+
+	s = skip_spaces(s);
+	if (!*s)
+		return 0;
+	e = skip_nonspaces(s);
+
+	if (start)
+		*start = s;
+	if (end)
+		*end = e;
+
+	return e - s;
+}
+
+static char *next_word(char **s)
+{
+	size_t sz;
+	char *res, *end;
+
+	assert(s);
+
+	sz = next_word_size(*s, s, &end) + 1;
+	if (sz == 1)
+		return NULL;
+
+	res = malloc(sz);
+	if (!res)
+		return NULL;
+
+	unmangle_to_buffer(*s, res, sz);
+	*s = end + 1;
+	return res;
+}
+
+static int next_word_skip(char **s)
+{
+	*s = skip_spaces(*s);
+	if (!**s)
+		return 1;
+	*s = skip_nonspaces(*s);
+	return 0;
+}
+
+static int next_number(char **s, int *num)
+{
+	char *end = NULL;
+
+	assert(num);
+	assert(s);
+
+	*s = skip_spaces(*s);
+	if (!**s)
+		return -1;
+	*num = strtol(*s, &end, 10);
+	if (end == NULL || *s == end)
+	       return -1;
+
+	*s = end;
+
+	/* valid end of number is space or terminator */
+	if (*end == ' ' || *end == '\t' || *end == '\0')
+		return 0;
+	return -1;
+}
+
+/*
+ * Parses one line from {fs,m}tab
+ */
+static int mnt_tab_parse_file_line(mnt_fs *fs, char *s)
+{
+	/* SOURCE */
+	if (__mnt_fs_set_source(fs, next_word(&s)) != 0)
+		return 1;
+
+	/* TARGET */
+	fs->target = next_word(&s);
+	if (!fs->target)
+		return 1;
+
+	/* TYPE */
+	if (__mnt_fs_set_fstype(fs, next_word(&s)) != 0)
+		return 1;
+
+	/* OPTS */
+	fs->optstr = next_word(&s);
+	if (!fs->optstr)
+		return 1;
+	/* default */
+	fs->passno = fs->freq = 0;
+
+	/* FREQ (optional) */
+	if (next_number(&s, &fs->freq) != 0) {
+		if (*s)
+			return 1;
+
+	/* PASSNO (optional) */
+	} else if (next_number(&s, &fs->passno) != 0 && *s)
+		return 1;
+
+	return 0;
+}
+
+/*
+ * Parses one line from mountinfo file
+ */
+static int mnt_parse_mountinfo_line(mnt_fs *fs, char *s)
+{
+	unsigned int maj, min;
+
+	/* ID */
+	if (next_number(&s, &fs->id) != 0)
+		return 1;
+
+	/* PARENT */
+	if (next_number(&s, &fs->parent) != 0)
+		return 1;
+
+	/* <maj>:<min> */
+	s = skip_spaces(s);
+	if (!*s || sscanf(s, "%u:%u", &maj, &min) != 2)
+		return 1;
+	fs->devno = makedev(maj, min);
+	next_word_skip(&s);
+
+	/* MOUNTROOT */
+	fs->mntroot = next_word(&s);
+	if (!fs->mntroot)
+		return 1;
+
+	/* TARGET (mountpoit) */
+	fs->target = next_word(&s);
+	if (!fs->target)
+		return 1;
+
+	/* OPTIONS (fs-independent) */
+	fs->vfs_optstr = next_word(&s);
+	if (!fs->vfs_optstr)
+		return 1;
+
+	/* optional fields (ignore) */
+	do {
+		s = skip_spaces(s);
+		if (s && *s == '-' &&
+		    (*(s + 1) == ' ' || *(s + 1) == '\t')) {
+			s++;
+			break;
+		}
+		if (s && next_word_skip(&s) != 0)
+			return 1;
+	} while (s);
+
+	/* FSTYPE */
+	if (__mnt_fs_set_fstype(fs, next_word(&s)) != 0)
+		return 1;
+
+	/* SOURCE or "none" */
+	if (__mnt_fs_set_source(fs, next_word(&s)) != 0)
+		return 1;
+
+	/* OPTIONS (fs-dependent) */
+	fs->fs_optstr = next_word(&s);
+	if (!fs->fs_optstr)
+		return 1;
+
+	return 0;
+}
+
+/*
+ * Returns {m,fs}tab or mountinfo file format (MNT_FMT_*)
+ *
+ * The "mountinfo" format is always: "<number> <number> ... "
+ */
+static int detect_fmt(char *line)
+{
+	int num;
+
+	/* ID */
+	if (next_number(&line, &num) != 0)
+		return MNT_FMT_FSTAB;
+
+	/* PARENT */
+	if (next_number(&line, &num) != 0)
+		return MNT_FMT_FSTAB;
+
+	return MNT_FMT_MOUNTINFO;
+}
+
+
+/*
+ * Merges @vfs and @fs options strings into a new string.
+ * This function cares about 'ro/rw' options. The 'ro' is
+ * always used if @vfs or @fs is read-only.
+ * For example:
+ *
+ *    mnt_merge_optstr("rw,noexec", "ro,journal=update")
+ *
+ *           returns: "ro,noexec,journal=update"
+ *
+ *    mnt_merge_optstr("rw,noexec", "rw,journal=update")
+ *
+ *           returns: "rw,noexec,journal=update"
+
+ * We need this function for /proc/self/mountinfo parsing.
+ */
+static char *merge_optstr(const char *vfs, const char *fs)
+{
+	char *res, *p;
+	size_t sz;
+	int ro = 0, rw = 0;
+
+	if (!vfs && !fs)
+		return NULL;
+	if (!vfs || !fs)
+		return strdup(fs ? fs : vfs);
+	if (!strcmp(vfs, fs))
+		return strdup(vfs);		/* e.g. "aaa" and "aaa" */
+
+	/* leave space for leading "r[ow],", "," and trailing zero */
+	sz = strlen(vfs) + strlen(fs) + 5;
+	res = malloc(sz);
+	if (!res)
+		return NULL;
+	p = res + 3;			/* make a room for rw/ro flag */
+
+	snprintf(p, sz - 3, "%s,%s", vfs, fs);
+
+	/* remove 'rw' flags */
+	rw += !mnt_optstr_remove_option(&p, "rw");	/* from vfs */
+	rw += !mnt_optstr_remove_option(&p, "rw");	/* from fs */
+
+	/* remove 'ro' flags if necessary */
+	if (rw != 2) {
+		ro += !mnt_optstr_remove_option(&p, "ro");
+		if (ro + rw < 2)
+			ro += !mnt_optstr_remove_option(&p, "ro");
+	}
+
+	if (!strlen(p))
+		memcpy(res, ro ? "ro" : "rw", 3);
+	else
+		memcpy(res, ro ? "ro," : "rw,", 3);
+	return res;
+}
+
+/*
+ * Read and parse the next line from {fs,m}tab or mountinfo
+ */
+static int mnt_tab_parse_next(mnt_tab *tb, FILE *f, mnt_fs *fs)
+{
+	char buf[BUFSIZ];
+	char *s;
+
+	assert(tb);
+	assert(f);
+	assert(fs);
+
+	/* read the next non-blank non-comment line */
+	do {
+		if (fgets(buf, sizeof(buf), f) == NULL)
+			return -1;
+		tb->nlines++;
+		s = index (buf, '\n');
+		if (!s) {
+			/* Missing final newline?  Otherwise extremely */
+			/* long line - assume file was corrupted */
+			if (feof(f)) {
+				DBG(DEBUG_TAB, fprintf(stderr,
+					"libmount: WARNING: no final newline at the end of %s\n",
+					tb->filename));
+				s = index (buf, '\0');
+			} else {
+				DBG(DEBUG_TAB, fprintf(stderr,
+					"libmount: %s: %d: missing newline at line\n",
+					tb->filename, tb->nlines));
+				goto err;
+			}
+		}
+		*s = '\0';
+		if (--s >= buf && *s == '\r')
+			*s = '\0';
+		s = skip_spaces(buf);
+	} while (*s == '\0' || *s == '#');
+
+	DBG(DEBUG_TAB, fprintf(stderr, "libmount: %s:%d: %s\n",
+		tb->filename, tb->nlines, s));
+
+	if (!tb->fmt)
+		tb->fmt = detect_fmt(s);
+
+	if (tb->fmt == MNT_FMT_FSTAB) {
+		/* parse /etc/{fs,m}tab */
+		if (mnt_tab_parse_file_line(fs, s) != 0)
+			goto err;
+	} else if (tb->fmt == MNT_FMT_MOUNTINFO) {
+		/* parse /proc/self/mountinfo */
+		if (mnt_parse_mountinfo_line(fs, s) != 0)
+			goto err;
+	}
+
+	/* merge fs_optstr and vfs_optstr into optstr (necessary for "mountinfo") */
+	if (!fs->optstr && (fs->vfs_optstr || fs->fs_optstr)) {
+		fs->optstr = merge_optstr(fs->vfs_optstr, fs->fs_optstr);
+		if (!fs->optstr)
+			goto err;
+	}
+
+	fs->lineno = tb->nlines;
+
+	DBG(DEBUG_TAB, fprintf(stderr,
+		"libmount: %s: %d: SOURCE:%s, MNTPOINT:%s, TYPE:%s, "
+				  "OPTS:%s, FREQ:%d, PASSNO:%d\n",
+		tb->filename, fs->lineno,
+		fs->source, fs->target, fs->fstype,
+		fs->optstr, fs->freq, fs->passno));
+
+	return 0;
+err:
+	/* we don't report parse errors to caller; caller has to check
+	 * errors by mnt_tab_get_nerrs() or internaly by MNT_ENTRY_ERR flag
+	 */
+	fs->lineno = tb->nlines;
+	fs->flags |= MNT_FS_ERROR;
+	return 0;
+}
+
+/**
+ * mnt_tab_parse_file:
+ * @tb: tab pointer
+ *
+ * Parses whole table (e.g. /etc/fstab).
+ *
+ * <informalexample>
+ *   <programlisting>
+ *	mnt_tab *tb = mnt_new_tab("/etc/fstab");
+ *	int rc;
+ *
+ *	rc = mnt_tab_parse_file(tb);
+ *	if (rc) {
+ *		if (mnt_tab_get_nerrs(tb)) {             / * parse error * /
+ *			mnt_tab_strerror(tb, buf, sizeof(buf));
+ *			fprintf(stderr, "%s: %s\n", progname, buf);
+ *		} else
+ *			perror(mnt_tab_get_name(tb));  / * system error * /
+ *	} else
+ *		mnt_fprintf_tab(tb, stdout, NULL);
+ *
+ *	mnt_free_tab(tb);
+ *   </programlisting>
+ * </informalexample>
+ *
+ * Returns: 0 on success and -1 in case of error. The parse errors is possible
+ * to detect by mnt_tab_get_nerrs() and error message is possible to create by
+ * mnt_tab_strerror().
+ */
+int mnt_tab_parse_file(mnt_tab *tb)
+{
+	FILE *f;
+
+	assert(tb);
+	assert(tb->filename);
+
+	if (!tb->filename)
+		return -1;
+
+	f = fopen(tb->filename, "r");
+	if (!f)
+		return -1;
+
+	while (!feof(f)) {
+		int rc;
+		mnt_fs *fs = mnt_new_fs();
+		if (!fs)
+			goto error;
+
+		rc = mnt_tab_parse_next(tb, f, fs);
+		if (!rc)
+			rc = mnt_tab_add_fs(tb, fs);
+		else if (feof(f)) {
+			mnt_free_fs(fs);
+			break;
+		}
+		if (rc) {
+			mnt_free_fs(fs);
+			goto error;
+		}
+	}
+
+	fclose(f);
+	return 0;
+error:
+	fclose(f);
+	return -1;
+}
+
+/**
+ * mnt_new_tab_parse:
+ * @filename: /etc/{m,fs}tab or /proc/self/mountinfo path
+ *
+ * Same as mnt_new_tab() + mnt_tab_parse_file(). Note that this function does
+ * not provide details (by mnt_tab_strerror()) about failed parsing -- so you
+ * should not to use this function for user-writeable files like /etc/fstab.
+ *
+ * Returns: newly allocated tab on success and NULL in case of error.
+ */
+mnt_tab *mnt_new_tab_from_file(const char *filename)
+{
+	mnt_tab *tb;
+
+	assert(filename);
+
+	if (!filename)
+		return NULL;
+	tb = mnt_new_tab(filename);
+	if (tb && mnt_tab_parse_file(tb) != 0) {
+		mnt_free_tab(tb);
+		tb = NULL;
+	}
+	return tb;
+}
+
+/**
+ * mnt_tab_get_nerrs:
+ * @tb: pointer to table
+ *
+ * Returns: number of broken (parse error) entries in the table.
+ */
+int mnt_tab_get_nerrs(mnt_tab *tb)
+{
+	assert(tb);
+	return tb->nerrs;
+}
+
+/**
+ * mnt_tab_strerror:
+ * @tb: pointer to table
+ * @buf: buffer to return error message
+ * @buflen: lenght of the buf
+ *
+ * Returns: error message for table (file) parse errors. For example:
+ *
+ *	"/etc/fstab: parse error at line(s): 1, 2 and 3."
+ */
+char *mnt_tab_strerror(mnt_tab *tb, char *buf, size_t buflen)
+{
+	struct list_head *p;
+	int last = -1;
+	char *b = buf;
+	char *end = buf + buflen - 1;
+
+	assert(tb);
+	assert(buf);
+	assert(buflen);
+
+	if (!tb || !tb->nerrs || !buf || buflen <=0)
+		return NULL;
+
+	if (tb->filename) {
+		snprintf(b, end - b, "%s: ", tb->filename);
+		b += strnlen(b, end - b);
+	}
+
+	if (tb->nerrs > 1)
+		strncpy(b, _("parse error at lines: "), end - b);
+	else
+		strncpy(b, _("parse error at line: "), end - b);
+	b += strnlen(b, end - b);
+	*b = '\0';
+
+	list_for_each(p, &tb->ents) {
+		mnt_fs *fs = list_entry(p, mnt_fs, ents);
+		if (b == end)
+			goto done;
+		if (fs->flags & MNT_FS_ERROR) {
+			if (last != -1) {
+				snprintf(b, end - b, "%d, ", last);
+				b += strnlen(b, end - b);
+			}
+			last = fs->lineno;
+		}
+	}
+
+	if (tb->nerrs == 1)
+		snprintf(b, end - b, "%d.", last);
+	else
+		snprintf(b - 1, end - b, _(" and %d."), last);
+done:
+	return buf;
+}
+
diff --git a/shlibs/mount/src/test.c b/shlibs/mount/src/test.c
new file mode 100644
index 00000000..eb4f2d1d
--- /dev/null
+++ b/shlibs/mount/src/test.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ *
+ * Routines for TEST_PROGRAMs
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#ifndef TEST_PROGRAM
+#define TEST_PROGRAM
+#endif
+
+#include "mountP.h"
+
+int mnt_run_test(struct mtest *tests, int argc, char *argv[])
+{
+	int rc = -1;
+	struct mtest *ts;
+
+	assert(tests);
+	assert(argc);
+	assert(argv);
+
+	if (argc < 2 ||
+	    strcmp(argv[1], "--help") == 0 ||
+	    strcmp(argv[1], "-h") == 0)
+		goto usage;
+
+	mnt_init_debug(0);
+
+	for (ts = tests; ts->name; ts++) {
+		if (strcmp(ts->name, argv[1]) == 0) {
+			rc = ts->body(ts, argc - 1, argv + 1);
+			if (rc)
+				printf("FAILED [rc=%d]", rc);
+			break;
+		}
+	}
+
+	if (rc == -1 && ts->name == NULL)
+		goto usage;
+
+	return rc == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+usage:
+	printf("\nUsage:\n\t%s <test> [testoptions]\nTests:\n",
+			program_invocation_short_name);
+	for (ts = tests; ts->name; ts++) {
+		printf("\t%-15s", ts->name);
+		if (ts->usage)
+			printf(" %s\n", ts->usage);
+	}
+	printf("\n");
+	return EXIT_FAILURE;
+}
diff --git a/shlibs/mount/src/utils.c b/shlibs/mount/src/utils.c
new file mode 100644
index 00000000..f487383a
--- /dev/null
+++ b/shlibs/mount/src/utils.c
@@ -0,0 +1,349 @@
+/*
+ * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ *
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
+ */
+
+/**
+ * SECTION: utils
+ * @title: Utils
+ * @short_description: misc utils.
+ */
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#else
+#define PR_GET_DUMPABLE 3
+#endif
+#if (!defined(HAVE_PRCTL) && defined(linux))
+#include <sys/syscall.h>
+#endif
+#include <sys/stat.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <pwd.h>
+
+#include "mountP.h"
+
+char *mnt_getenv_safe(const char *arg)
+{
+	if ((getuid() != geteuid()) || (getgid() != getegid()))
+		return NULL;
+#if HAVE_PRCTL
+	if (prctl(PR_GET_DUMPABLE, 0, 0, 0, 0) == 0)
+		return NULL;
+#else
+#if (defined(linux) && defined(SYS_prctl))
+	if (syscall(SYS_prctl, PR_GET_DUMPABLE, 0, 0, 0, 0) == 0)
+		return NULL;
+#endif
+#endif
+
+#ifdef HAVE___SECURE_GETENV
+	return __secure_getenv(arg);
+#else
+	return getenv(arg);
+#endif
+}
+
+/* TODO: move strn<...> functions to top-level lib/strn.c */
+#ifndef HAVE_STRNLEN
+size_t strnlen(const char *s, size_t maxlen)
+{
+	int i;
+
+	for (i = 0; i < maxlen; i++) {
+		if (s[i] == '\0')
+			return i + 1;
+	}
+	return maxlen;
+}
+#endif
+
+#ifndef HAVE_STRNCHR
+char *strnchr(const char *s, size_t maxlen, int c)
+{
+	for (; maxlen-- && *s != '\0'; ++s)
+		if (*s == (char)c)
+			return (char *)s;
+	return NULL;
+}
+#endif
+
+#ifndef HAVE_STRNDUP
+char *strndup(const char *s, size_t n)
+{
+  size_t len = strnlen (s, n);
+  char *new = (char *) malloc (len + 1);
+
+  if (new == NULL)
+    return NULL;
+
+  new[len] = '\0';
+  return (char *) memcpy (new, s, len);
+}
+#endif
+
+
+/**
+ * mnt_fstype_is_pseudofs:
+ * @type: filesystem name
+ *
+ * Returns: 1 for filesystems like proc, sysfs, ... or 0.
+ */
+int mnt_fstype_is_pseudofs(const char *type)
+{
+	if (!type)
+		return 0;
+	if (strcmp(type, "none")  == 0 ||
+	    strcmp(type, "proc")  == 0 ||
+	    strcmp(type, "tmpfs") == 0 ||
+	    strcmp(type, "sysfs") == 0 ||
+	    strcmp(type, "devpts") == 0||
+	    strcmp(type, "cgroups") == 0 ||
+	    strcmp(type, "devfs") == 0 ||
+	    strcmp(type, "dlmfs") == 0 ||
+	    strcmp(type, "cpuset") == 0 ||
+	    strcmp(type, "spufs") == 0)
+		return 1;
+	return 0;
+}
+
+/**
+ * mnt_fstype_is_netfs:
+ * @type: filesystem name
+ *
+ * Returns: 1 for filesystems like cifs, nfs, ... or 0.
+ */
+int mnt_fstype_is_netfs(const char *type)
+{
+	if (!type)
+		return 0;
+	if (strcmp(type, "cifs")  == 0 ||
+	    strcmp(type, "smbfs")  == 0 ||
+	    strncmp(type, "nfs", 3) == 0 ||
+	    strcmp(type, "afs") == 0 ||
+	    strcmp(type, "ncpfs") == 0)
+		return 1;
+	return 0;
+}
+
+/**
+ * mnt_match_fstype:
+ * @type: filesystem type
+ * @pattern: filesystem name or comma delimitted list of names
+ *
+ * The @pattern list of filesystem can be prefixed with a global
+ * "no" prefix to invert matching of the whole list. The "no" could
+ * also used for individual items in the @pattern list. So,
+ * "nofoo,bar" has the same meaning as "nofoo,nobar".
+ *
+ * "bar"  : "nofoo,bar"		-> False   (global "no" prefix)
+ *
+ * "bar"  : "foo,bar"		-> True
+ *
+ * "bar" : "foo,nobar"		-> False
+ *
+ * Returns: 1 if type is matching, else 0. This function also returns
+ *          0 if @pattern is NULL and @type is non-NULL.
+ */
+int mnt_match_fstype(const char *type, const char *pattern)
+{
+	int no = 0;		/* negated types list */
+	int len;
+	const char *p;
+
+	if (!pattern && !type)
+		return 1;
+	if (!pattern)
+		return 0;
+
+	if (!strncmp(pattern, "no", 2)) {
+		no = 1;
+		pattern += 2;
+	}
+
+	/* Does type occur in types, separated by commas? */
+	len = strlen(type);
+	p = pattern;
+	while(1) {
+		if (!strncmp(p, "no", 2) && !strncmp(p+2, type, len) &&
+		    (p[len+2] == 0 || p[len+2] == ','))
+			return 0;
+		if (strncmp(p, type, len) == 0 && (p[len] == 0 || p[len] == ','))
+			return !no;
+		p = strchr(p,',');
+		if (!p)
+			break;
+		p++;
+	}
+	return no;
+}
+
+
+/* Returns 1 if needle found or noneedle not found in haystack
+ * Otherwise returns 0
+ */
+static int check_option(const char *haystack, size_t len,
+			const char *needle, size_t needle_len)
+{
+	const char *p;
+	int no = 0;
+
+	if (needle_len >= 2 && !strncmp(needle, "no", 2)) {
+		no = 1;
+		needle += 2;
+		needle_len -= 2;
+	}
+
+	for (p = haystack; p && p < haystack + len; p++) {
+		char *sep = strchr(p, ',');
+		size_t plen = sep ? sep - p : len - (p - haystack);
+
+		if (plen == needle_len) {
+			if (!strncmp(p, needle, plen))
+				return !no;	/* foo or nofoo was found */
+		}
+		p += plen;
+	}
+
+	return no;  /* foo or nofoo was not found */
+}
+
+/**
+ * mnt_match_options:
+ * @optstr: options string
+ * @pattern: comma delimitted list of options
+ *
+ * The "no" could used for individual items in the @options list. The "no"
+ * prefix does not have a global meanning.
+ *
+ * Unlike fs type matching, nonetdev,user and nonetdev,nouser have
+ * DIFFERENT meanings; each option is matched explicitly as specified.
+ *
+ * "xxx,yyy,zzz" : "nozzz"	-> False
+ *
+ * "xxx,yyy,zzz" : "xxx,noeee"	-> True
+ *
+ * Returns: 1 if pattern is matching, else 0. This function also returns 0
+ *          if @pattern is NULL and @optstr is non-NULL.
+ */
+int mnt_match_options(const char *optstr, const char *pattern)
+{
+	const char *p;
+	size_t len, optstr_len = 0;
+
+	if (!pattern && !optstr)
+		return 1;
+	if (!pattern)
+		return 0;
+
+	len = strlen(pattern);
+	if (optstr)
+		optstr_len = strlen(optstr);
+
+	for (p = pattern; p < pattern + len; p++) {
+		char *sep = strchr(p, ',');
+		size_t plen = sep ? sep - p : len - (p - pattern);
+
+		if (!plen)
+			continue; /* if two ',' appear in a row */
+
+		if (!check_option(optstr, optstr_len, p, plen))
+			return 0; /* any match failure means failure */
+
+		p += plen;
+	}
+
+	/* no match failures in list means success */
+	return 1;
+}
+
+/*
+ * Reallocates its first arg @s - typical use: s = mnt_strconcat3(s,t,u);
+ * Returns reallocated @s ion succes or NULL in case of error.
+ */
+char *mnt_strconcat3(char *s, const char *t, const char *u)
+{
+     size_t len = 0;
+
+     len = (s ? strlen(s) : 0) + (t ? strlen(t) : 0) + (u ? strlen(u) : 0);
+
+     if (!len)
+	     return NULL;
+     if (!s) {
+	     s = malloc(len + 1);
+	     *s = '\0';
+     } else
+	     s = realloc(s, len + 1);
+
+     if (!s)
+	     return NULL;
+     if (t)
+	     strcat(s, t);
+     if (u)
+	     strcat(s, u);
+     return s;
+}
+
+/*
+ * Returns allocated string with username or NULL.
+ */
+char *mnt_get_username(const uid_t uid)
+{
+        struct passwd pwd;
+	struct passwd *res;
+	size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
+	char *buf, *username = NULL;
+
+	if (sz <= 0)
+		sz = 16384;        /* Should be more than enough */
+
+	buf = malloc(sz);
+	if (!buf)
+		return NULL;
+
+	if (!getpwuid_r(uid, &pwd, buf, sz, &res) && res)
+		username = strdup(pwd.pw_name);
+
+	free(buf);
+	return username;
+}
+
+#ifdef TEST_PROGRAM
+int test_match_fstype(struct mtest *ts, int argc, char *argv[])
+{
+	char *type = argv[1];
+	char *pattern = argv[2];
+
+	printf("%s\n", mnt_match_fstype(type, pattern) ? "MATCH" : "NOT-MATCH");
+	return 0;
+}
+
+int test_match_options(struct mtest *ts, int argc, char *argv[])
+{
+	char *optstr = argv[1];
+	char *pattern = argv[2];
+
+	printf("%s\n", mnt_match_options(optstr, pattern) ? "MATCH" : "NOT-MATCH");
+	return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+	struct mtest tss[] = {
+	{ "--match-fstype",  test_match_fstype,    "<type> <pattern>     FS types matching" },
+	{ "--match-options", test_match_options,   "<options> <pattern>  options matching" },
+	{ NULL }
+	};
+
+	return mnt_run_test(tss, argc, argv);
+}
+
+#endif /* TEST_PROGRAM */
diff --git a/shlibs/mount/src/version.c b/shlibs/mount/src/version.c
new file mode 100644
index 00000000..d00a1686
--- /dev/null
+++ b/shlibs/mount/src/version.c
@@ -0,0 +1,86 @@
+/*
+ * version.c - Return the version of the blkid library
+ *
+ * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ * [Based on libblkid/version.c by Theodore Ts'o]
+ *
+ * See COPYING.libmount for the License of this software.
+ */
+
+/**
+ * SECTION: version
+ * @title: Version functions
+ * @short_description: functions to get library version.
+ */
+
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+
+#include "mountP.h"
+
+static const char *lib_version = LIBMOUNT_VERSION;
+
+/**
+ * mnt_parse_version_string:
+ * @ver_string: version string (e.g "2.18.0")
+ *
+ * Returns: release version code.
+ */
+int mnt_parse_version_string(const char *ver_string)
+{
+	const char *cp;
+	int version = 0;
+
+	for (cp = ver_string; *cp; cp++) {
+		if (*cp == '.')
+			continue;
+		if (!isdigit(*cp))
+			break;
+		version = (version * 10) + (*cp - '0');
+	}
+	return version;
+}
+
+/**
+ * mnt_get_library_version:
+ * @ver_string: return pointer to the static library version string
+ *
+ * Returns: release version number.
+ */
+int mnt_get_library_version(const char **ver_string)
+{
+	if (ver_string)
+		*ver_string = lib_version;
+
+	return mnt_parse_version_string(lib_version);
+}
+
+#ifdef TEST_PROGRAM
+int test_version(struct mtest *ts, int argc, char *argv[])
+{
+	const char *ver;
+
+	mnt_get_library_version(&ver);
+
+	printf("Library version: %s\n", ver);
+	printf("Library API version: " LIBMOUNT_VERSION "\n");
+
+	if (mnt_get_library_version(NULL) ==
+			mnt_parse_version_string(LIBMOUNT_VERSION))
+		return 0;
+
+	return -1;
+}
+
+int main(int argc, char *argv[])
+{
+	struct mtest ts[] = {
+		{ "--print", test_version, "print versions" },
+		{ NULL }
+	};
+
+	return mnt_run_test(ts, argc, argv);
+}
+#endif
diff --git a/shlibs/uuid/Makefile.am b/shlibs/uuid/Makefile.am
index 2bdef334..66fe6909 100644
--- a/shlibs/uuid/Makefile.am
+++ b/shlibs/uuid/Makefile.am
@@ -6,5 +6,5 @@ SUBDIRS = src man
 pkgconfigdir = $(usrlib_execdir)/pkgconfig
 pkgconfig_DATA = uuid.pc
 
-EXTRA_DIST = uuid.pc.in
+EXTRA_DIST = COPYING.libuuid uuid.pc.in
 
diff --git a/shlibs/uuid/man/Makefile.am b/shlibs/uuid/man/Makefile.am
index ffaf0241..38809522 100644
--- a/shlibs/uuid/man/Makefile.am
+++ b/shlibs/uuid/man/Makefile.am
@@ -8,5 +8,5 @@ UUID_GENERATE_LINKS = uuid_generate_random.3 uuid_generate_time.3
 man_MANS = $(UUID_GENERATE_LINKS)
 CLEANFILES = $(man_MANS)
 
-$(UUID_GENERATE_LINKS): uuid_generate.3
-	echo ".so man3/uuid_generate.3" > $@
+$(UUID_GENERATE_LINKS):
+	$(AM_V_GEN)echo ".so man3/uuid_generate.3" > $@
diff --git a/shlibs/uuid/man/uuid_generate.3 b/shlibs/uuid/man/uuid_generate.3
index 11f48ffd..e1b8143f 100644
--- a/shlibs/uuid/man/uuid_generate.3
+++ b/shlibs/uuid/man/uuid_generate.3
@@ -59,7 +59,7 @@ a high-quality random number generator (i.e.,
 .IR /dev/urandom )
 is not available, in which case a pseudo-random
 generator will be subsituted.  Note that the use of a pseudo-random
-generator may compromise the uniqueness of UUID's
+generator may compromise the uniqueness of UUIDs
 generated in this fashion.
 .sp
 The
diff --git a/shlibs/uuid/src/compare.c b/shlibs/uuid/src/compare.c
index f28a7267..8f3437a2 100644
--- a/shlibs/uuid/src/compare.c
+++ b/shlibs/uuid/src/compare.c
@@ -1,7 +1,7 @@
 /*
- * compare.c --- compare whether or not two UUID's are the same
+ * compare.c --- compare whether or not two UUIDs are the same
  *
- * Returns 0 if the two UUID's are different, and 1 if they are the same.
+ * Returns 0 if the two UUIDs are different, and 1 if they are the same.
  *
  * Copyright (C) 1996, 1997 Theodore Ts'o.
  *
diff --git a/shlibs/uuid/src/pack.c b/shlibs/uuid/src/pack.c
index 097516d2..6e124766 100644
--- a/shlibs/uuid/src/pack.c
+++ b/shlibs/uuid/src/pack.c
@@ -1,5 +1,5 @@
 /*
- * Internal routine for packing UUID's
+ * Internal routine for packing UUIDs
  *
  * Copyright (C) 1996, 1997 Theodore Ts'o.
  *
diff --git a/sys-utils/.gitignore b/sys-utils/.gitignore
index 7985d7a5..7af5ffbf 100644
--- a/sys-utils/.gitignore
+++ b/sys-utils/.gitignore
@@ -4,6 +4,7 @@ cytune
 dmesg
 fallocate
 flock
+fsfreeze
 i386.8
 ia64.8
 ipcmk
@@ -23,11 +24,8 @@ pivot_root
 ppc32.8
 ppc64.8
 ppc.8
-ramsize.8
-rdev
 readprofile
 renice
-rootflags.8
 rtcwake
 s390.8
 s390x.8
@@ -40,5 +38,4 @@ sparc.8
 switch_root
 tunelp
 unshare
-vidmode.8
 x86_64.8
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index 76828cc1..166d7188 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -10,12 +10,19 @@ dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \
 
 if LINUX
 bin_PROGRAMS += dmesg
-sbin_PROGRAMS += ctrlaltdel
-usrbin_exec_PROGRAMS += cytune setarch lscpu
+sbin_PROGRAMS += ctrlaltdel fsfreeze
+usrbin_exec_PROGRAMS += cytune setarch
 usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake
 
 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
-		ldattach.8 lscpu.1 tunelp.8 rtcwake.8
+		ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8
+
+if HAVE_CPU_SET_T
+usrbin_exec_PROGRAMS += lscpu
+lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
+dist_man_MANS += lscpu.1
+endif
+
 endif
 
 cytune_SOURCES = cytune.c cyclades.h
@@ -23,9 +30,10 @@ tunelp_SOURCES = tunelp.c lp.h
 
 info_TEXINFOS = ipc.texi
 
+
 if BUILD_FALLOCATE
 usrbin_exec_PROGRAMS += fallocate
-fallocate_SOURCES = fallocate.c ../lib/strtosize.c
+fallocate_SOURCES = fallocate.c $(top_srcdir)/lib/strtosize.c
 dist_man_MANS += fallocate.1
 endif
 
@@ -49,13 +57,6 @@ bin_PROGRAMS += arch
 dist_man_MANS += arch.1
 endif
 
-RDEV_LINKS =
-if BUILD_RDEV
-usrsbin_exec_PROGRAMS += rdev
-RDEV_LINKS += ramsize vidmode rootflags
-dist_man_MANS += rdev.8
-endif
-
 SETARCH_LINKS = linux32 linux64
 
 if ARCH_S390
@@ -83,21 +84,14 @@ if ARCH_HPPA
 SETARCH_LINKS += parisc parisc64 parisc32
 endif
 
-RDEV_MAN_LINKS = $(RDEV_LINKS:=.8)
 SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8)
 man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS)
 CLEANFILES = $(man_MANS)
 
-$(RDEV_MAN_LINKS): rdev.8
-	echo ".so man8/rdev.8" > $@
-
-$(SETARCH_MAN_LINKS): setarch.8
-	echo ".so man8/setarch.8" > $@
+$(SETARCH_MAN_LINKS):
+	$(AM_V_GEN)echo ".so man8/setarch.8" > $@
 
 install-exec-hook:
-	for I in $(RDEV_LINKS); do \
-		cd $(DESTDIR)$(usrsbin_execdir) && ln -sf rdev $$I ; \
-	done
 	for I in $(SETARCH_LINKS); do \
 		cd $(DESTDIR)$(usrbin_execdir) && ln -sf setarch $$I ; \
 	done
diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
index e41643a2..d1f43c24 100644
--- a/sys-utils/fallocate.c
+++ b/sys-utils/fallocate.c
@@ -122,6 +122,11 @@ int main(int argc, char **argv)
 
 	fname = argv[optind++];
 
+	if (optind != argc) {
+		warnx(_("unexpected number of arguments"));
+		usage(stderr);
+	}
+
 	fd = open(fname, O_WRONLY|O_CREAT, 0644);
 	if (fd < 0)
 		err(EXIT_FAILURE, _("%s: open failed"), fname);
diff --git a/sys-utils/flock.1 b/sys-utils/flock.1
index 6d60ff71..6ae584bd 100644
--- a/sys-utils/flock.1
+++ b/sys-utils/flock.1
@@ -51,11 +51,11 @@ used the following manner:
 .PP
 \fC(
 .br
-  flock -s 200
+  flock -s 9
 .br
   # ... commands executed under lock ...
 .br
-) 200>/var/lock/mylockfile\fP
+) 9>/var/lock/mylockfile\fP
 .PP
 The mode used to open the file doesn't matter to \fBflock\fP; using
 \fC>\fP or \fP>>\fP allows the lockfile to be created if it does not
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 75c007c7..1f1c563b 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
       memset(&sa, 0, sizeof sa);
 
       sa.sa_handler = timeout_handler;
-      sa.sa_flags   = SA_ONESHOT;
+      sa.sa_flags   = SA_RESETHAND;
       sigaction(SIGALRM, &sa, &old_sa);
 
       setitimer(ITIMER_REAL, &timeout, &old_timer);
diff --git a/sys-utils/fsfreeze.8 b/sys-utils/fsfreeze.8
new file mode 100644
index 00000000..4408bddd
--- /dev/null
+++ b/sys-utils/fsfreeze.8
@@ -0,0 +1,75 @@
+.\" -*- nroff -*-
+.TH FSFREEZE 8 "May 2010"
+.SH NAME
+fsfreeze \- suspend access to an filesystem (Linux Ext3/4, ReiserFS, JFS, XFS).
+.SH SYNOPSIS
+.B fsfreeze
+.RB \-f
+.I mountpoint
+
+.B fsfreeze
+.RB \-u
+.I mountpoint
+
+.SH DESCRIPTION
+.B fsfreeze
+suspends and resumes access to an filesystem
+.PP
+.B fsfreeze
+halts new access to the filesystem and creates a stable image on disk.
+.B fsfreeze
+is intended to be used with hardware RAID devices that support the creation 
+of snapshots.
+.PP
+.B fsfreeze
+is unncessary for
+.B device-mapper
+devices. The device-mapper (and LVM)
+automatically freezes filesystem on the device when a snapshot creation is requested.
+For more details see the
+.BR dmsetup (8)
+man page.
+.PP
+The
+.I mount-point
+argument is the pathname of the directory where the filesystem
+is mounted.
+The filesystem must be mounted to be frozen (see
+.BR mount (8)).
+.SH OPTIONS
+.IP "\fB\-h, \-\-help\fP"
+Print help and exit.
+.IP "\fB\-f, \-\-freeze\fP"
+This option requests the specified a filesystem to be frozen from new
+modifications.  When this is selected, all ongoing transactions in the
+filesystem are allowed to complete, new write system calls are halted, other
+calls which modify the filesystem are halted, and all dirty data, metadata, and
+log information are written to disk.  Any process attempting to write to the
+frozen filesystem will block waiting for the filesystem to be unfrozen.
+
+Note that even after freezing, the on-disk filesystem can contain
+information on files that are still in the process of unlinking.
+These files will not be unlinked until the filesystem is unfrozen
+or a clean mount of the snapshot is complete.
+.IP "\fB\-u, \-\-unfreeze\fP
+This option is used to un-freeze the filesystem and allow operations to
+continue.  Any filesystem modifications that were blocked by the freeze are
+unblocked and allowed to complete.
+.SH AUTHOR
+.PP
+Written by Hajime Taira.
+.SH NOTES
+.PP
+This man page based on xfs_freeze.
+One of
+.B \-f
+or
+.B \-u
+must be supplied to
+.BR fsfreeze .
+.SH SEE ALSO
+.BR mount (8)
+.SH AVAILABILITY
+The fsfreeze command is part of the util-linux-ng package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+
diff --git a/sys-utils/fsfreeze.c b/sys-utils/fsfreeze.c
new file mode 100644
index 00000000..4ca6e5e2
--- /dev/null
+++ b/sys-utils/fsfreeze.c
@@ -0,0 +1,132 @@
+/*
+ * fsfreeze.c -- Filesystem freeze/unfreeze IO for Linux
+ *
+ * Copyright (C) 2010 Hajime Taira <htaira@redhat.com>
+ *                    Masatake Yamato <yamato@redhat.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 1 or
+ * (at your option) any later version.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include <linux/fs.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <getopt.h>
+#include <err.h>
+
+#include "blkdev.h"
+#include "nls.h"
+#include "c.h"
+
+static int freeze_f(int fd)
+{
+	return ioctl(fd, FIFREEZE, 0);
+}
+
+static int unfreeze_f(int fd)
+{
+	return ioctl(fd, FITHAW, 0);
+}
+
+static void __attribute__((__noreturn__)) usage(FILE *out)
+{
+	fprintf(out, _("Usage: %s [options] <mount point>\n\nOptions:\n"),
+			program_invocation_short_name);
+
+	fprintf(out, _(
+		" -h, --help          this help\n"
+		" -f, --freeze        freeze the filesystem\n"
+		" -u, --unfreeze      unfreeze the filesystem\n"));
+
+	fprintf(out, _("\nFor more information see fsfreeze(8).\n"));
+
+	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
+int main(int argc, char **argv)
+{
+	int fd = -1, c;
+	int freeze = -1, rc = EXIT_FAILURE;
+	char *path;
+	struct stat sb;
+
+	struct option longopts[] = {
+	    { "help",      0, 0, 'h' },
+	    { "freeze",    0, 0, 'f' },
+	    { "unfreeze",  0, 0, 'u' },
+	    { NULL,        0, 0, 0 }
+	};
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	while ((c = getopt_long(argc, argv, "hfu", longopts, NULL)) != -1) {
+		switch(c) {
+		case 'h':
+			usage(stdout);
+			break;
+		case 'f':
+			freeze = TRUE;
+			break;
+		case 'u':
+			freeze = FALSE;
+			break;
+		default:
+			usage(stderr);
+			break;
+		}
+	}
+
+	if (freeze == -1)
+		errx(EXIT_FAILURE, _("no action specified"));
+	if (optind == argc)
+		errx(EXIT_FAILURE, _("no filename specified"));
+	path = argv[optind++];
+
+	if (optind != argc) {
+		warnx(_("unexpected number of arguments"));
+		usage(stderr);
+	}
+
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+		err(EXIT_FAILURE, _("%s: open failed"), path);
+
+	if (fstat(fd, &sb) == -1) {
+		warn(_("%s: fstat failed"), path);
+		goto done;
+	}
+
+	if (!S_ISDIR(sb.st_mode)) {
+		warnx(_("%s: is not a directory"), path);
+		goto done;
+	}
+
+	if (freeze) {
+		if (freeze_f(fd)) {
+			warn(_("%s: freeze failed"), path);
+			goto done;
+		}
+	} else {
+		if (unfreeze_f(fd)) {
+			warn(_("%s: unfreeze failed"), path);
+			goto done;
+		}
+	}
+
+	rc = EXIT_SUCCESS;
+done:
+	if (fd >= 0)
+		close(fd);
+	return rc;
+}
+
diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c
index f07eac82..e8d6ba61 100644
--- a/sys-utils/ipcrm.c
+++ b/sys-utils/ipcrm.c
@@ -176,8 +176,6 @@ int main(int argc, char **argv)
 
 		/* make sure the option is in range */
 		if (c != 'q' && c != 'm' && c != 's') {
-			fprintf(stderr, _("%s: illegal option -- %c\n"),
-				prog, c);
 			usage(prog);
 			error++;
 			return error;
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 99ad09d7..0a950f66 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -109,26 +109,41 @@ void print_shm (int id);
 void print_msg (int id);
 void print_sem (int id);
 
-static char *progname;
-
 static void
 usage(int rc) {
-	printf (_("usage : %s -asmq -tclup \n"), progname);
-	printf (_("\t%s [-s -m -q] -i id\n"), progname);
-	printf (_("\t%s -h for help.\n"), progname);
+	printf (_("Usage: %1$s [-asmq] [-t|-c|-l|-u|-p]\n"
+	          "       %1$s [-s|-m|-q] -i id\n"
+	          "       %1$s -h for help\n"),
+		program_invocation_short_name);
 	exit(rc);
 }
 
 static void
 help (int rc) {
-	printf (_("%s provides information on ipc facilities for"
-		  " which you have read access.\n"), progname);
-	printf (_("Resource Specification:\n\t-m : shared_mem\n\t-q : messages\n"));
-	printf (_("\t-s : semaphores\n\t-a : all (default)\n"));
-	printf (_("Output Format:\n\t-t : time\n\t-p : pid\n\t-c : creator\n"));
-	printf (_("\t-l : limits\n\t-u : summary\n"));
-	printf (_("-i id [-s -q -m] : details on resource identified by id\n"));
-	usage(rc);
+	printf (_("Usage: %1$s [resource]... [output-format]\n"
+	          "       %1$s [resource] -i id\n\n"),
+		program_invocation_short_name);
+
+	printf (_("Provide information on IPC facilities for which you "
+		  "have read access.\n\n"));
+
+	printf (_(
+	"    -h      display this help\n"
+	"    -i id   print details on resource identified by id\n\n"));
+
+	printf (_("Resource options:\n"
+	"    -m      shared memory segments\n"
+	"    -q      message queues\n"
+	"    -s      semaphores\n"
+	"    -a      all (default)\n\n"));
+
+	printf (_("Output format:\n"
+	"    -t      time\n"
+	"    -p      pid\n"
+	"    -c      creator\n"
+	"    -l      limits\n"
+	"    -u      summary\n"));
+	exit(rc);
 }
 
 int
@@ -141,7 +156,6 @@ main (int argc, char **argv) {
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	progname = argv[0];
 	while ((opt = getopt (argc, argv, options)) != -1) {
 		switch (opt) {
 		case 'i':
@@ -274,11 +288,25 @@ void do_shm (char format)
 
 	case STATUS:
 		printf (_("------ Shared Memory Status --------\n"));
-		printf (_("segments allocated %d\n"), shm_info.used_ids);
-		printf (_("pages allocated %ld\n"), shm_info.shm_tot);
-		printf (_("pages resident  %ld\n"), shm_info.shm_rss);
-		printf (_("pages swapped   %ld\n"), shm_info.shm_swp);
-		printf (_("Swap performance: %ld attempts\t %ld successes\n"),
+		/* TRANSLATORS: This output format is mantained for backward compatibility
+		   as ipcs is used in scripts. For consistency with the rest, the translated
+		   form can follow this model:
+
+		   "segments allocated = %d\n"
+		   "pages allocated = %ld\n"
+		   "pages resident = %ld\n"
+		   "pages swapped = %ld\n"
+		   "swap performance = %ld attempts, %ld successes\n"
+		*/
+		printf (_("segments allocated %d\n"
+		          "pages allocated %ld\n"
+		          "pages resident  %ld\n"
+		          "pages swapped   %ld\n"
+		          "Swap performance: %ld attempts\t %ld successes\n"),
+			shm_info.used_ids,
+			shm_info.shm_tot,
+			shm_info.shm_rss,
+			shm_info.shm_swp,
 			shm_info.swap_attempts, shm_info.swap_successes);
 		return;
 
@@ -296,7 +324,7 @@ void do_shm (char format)
 		break;
 
 	case PID:
-		printf (_("------ Shared Memory Creator/Last-op --------\n"));
+		printf (_("------ Shared Memory Creator/Last-op PIDs --------\n"));
 		printf ("%-10s %-10s %-10s %-10s\n",
 			_("shmid"),_("owner"),_("cpid"),_("lpid"));
 		break;
@@ -487,14 +515,14 @@ void do_msg (char format)
 	case LIMITS:
 		if ((msgctl (0, IPC_INFO, (struct msqid_ds *) (void *) &msginfo)) < 0 )
 			return;
-		printf (_("------ Messages: Limits --------\n"));
+		printf (_("------ Messages Limits --------\n"));
 		printf (_("max queues system wide = %d\n"), msginfo.msgmni);
 		printf (_("max size of message (bytes) = %d\n"), msginfo.msgmax);
 		printf (_("default max size of queue (bytes) = %d\n"), msginfo.msgmnb);
 		return;
 
 	case STATUS:
-		printf (_("------ Messages: Status --------\n"));
+		printf (_("------ Messages Status --------\n"));
 #ifndef __FreeBSD_kernel__
 		printf (_("allocated queues = %d\n"), msginfo.msgpool);
 		printf (_("used headers = %d\n"), msginfo.msgmap);
@@ -503,7 +531,7 @@ void do_msg (char format)
 		return;
 
 	case CREATOR:
-		printf (_("------ Message Queues: Creators/Owners --------\n"));
+		printf (_("------ Message Queues Creators/Owners --------\n"));
 		printf ("%-10s %-10s %-10s %-10s %-10s %-10s\n",
 			_("msqid"),_("perms"),_("cuid"),_("cgid"),_("uid"),_("gid"));
 		break;
diff --git a/sys-utils/lscpu.1 b/sys-utils/lscpu.1
index 2b8d33b1..4f78ee6b 100644
--- a/sys-utils/lscpu.1
+++ b/sys-utils/lscpu.1
@@ -23,12 +23,15 @@ Print a help message.
 .BR \-p , " \-\-parse"
 Print out in parsable instead of printable format.
 .SH BUGS
-The program at the moment does not handle the system installed with
-different types of physical processors.
+The basic overview about CPU family, model, etc. is always based on the first
+CPU only.
 
 Sometimes in Xen Dom0 kernel reports wrong data.
 .SH AUTHOR
+.nf
 Cai Qian <qcai@redhat.com>
+Karel Zak <kzak@redhat.com>
+.fi
 .SH AVAILABILITY
-The setarch command is part of the util-linux-ng package and is available from
+The lscpu command is part of the util-linux-ng package and is available from
 ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 77a3e5c2..74f5e781 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -31,28 +31,18 @@
 #include <unistd.h>
 #include <stdarg.h>
 
+#include "cpuset.h"
 #include "nls.h"
 
 #define CACHE_MAX 100
 
 /* /sys paths */
-#define _PATH_SYS_SYSTEM	"sys/devices/system"
-#define _PATH_SYS_CPU0		_PATH_SYS_SYSTEM "/cpu/cpu0"
-#define _PATH_PROC_XEN		"proc/xen"
+#define _PATH_SYS_SYSTEM	"/sys/devices/system"
+#define _PATH_SYS_CPU		_PATH_SYS_SYSTEM "/cpu"
+#define _PATH_PROC_XEN		"/proc/xen"
 #define _PATH_PROC_XENCAP	_PATH_PROC_XEN "/capabilities"
-#define _PATH_PROC_CPUINFO	"proc/cpuinfo"
-#define _PATH_PROC_PCIDEVS	"proc/bus/pci/devices"
-
-int have_topology;
-int have_cache;
-int have_node;
-
-/* cache(s) description */
-struct ca_desc {
-	char	*caname;
-	char	*casize;
-	int	camap;
-};
+#define _PATH_PROC_CPUINFO	"/proc/cpuinfo"
+#define _PATH_PROC_PCIDEVS	"/proc/bus/pci/devices"
 
 /* virtualization types */
 enum {
@@ -87,17 +77,17 @@ enum {
 	MODE_LONG	= (1 << 3)
 };
 
-/* CPU(s) description */
-struct cpu_desc {
-	/* counters */
-	int	ct_cpu;
-	int	ct_thread;
-	int	ct_core;
-	int	ct_socket;
-	int	ct_node;
-	int	ct_cache;
-
-	/* who is who */
+/* cache(s) description */
+struct cpu_cache {
+	char		*name;
+	char		*size;
+
+	int		nsharedmaps;
+	cpu_set_t	**sharedmaps;
+};
+
+/* global description */
+struct lscpu_desc {
 	char	*arch;
 	char	*vendor;
 	char	*family;
@@ -105,78 +95,137 @@ struct cpu_desc {
 	char	*virtflag;	/* virtualization flag (vmx, svm) */
 	int	hyper;		/* hypervisor vendor ID */
 	int	virtype;	/* VIRT_PARA|FULL|NONE ? */
-
-	/* caches */
-	struct ca_desc	cache[CACHE_MAX];
-
-	/* misc */
 	char	*mhz;
 	char	*stepping;
 	char	*flags;
-
 	int	mode;		/* rm, lm or/and tm */
 
-	/* NUMA */
-	int	*nodecpu;
+	int		ncpus;		/* number of CPUs */
+
+	int		nnodes;		/* number of NUMA modes */
+	cpu_set_t	**nodemaps;	/* array with NUMA nodes */
+
+	/* sockets -- based on core_siblings (internal kernel map of cpuX's
+	 * hardware threads within the same physical_package_id (socket)) */
+	int		nsockets;	/* number of all sockets */
+	cpu_set_t	**socketmaps;	/* unique core_siblings */
+
+	/* cores -- based on thread_siblings (internel kernel map of cpuX's
+	 * hardware threads within the same core as cpuX) */
+	int		ncores;		/* number of all cores */
+	cpu_set_t	**coremaps;	/* unique thread_siblings */
+
+	int		nthreads;	/* number of threads */
+
+	int		ncaches;
+	struct cpu_cache *caches;
 };
 
-char pathbuf[PATH_MAX] = "/";
+static size_t sysrootlen;
+static char pathbuf[PATH_MAX];
+static int maxcpus;		/* size in bits of kernel cpu mask */
 
-static void path_scanstr(char *result, const char *path, ...)
-		__attribute__ ((__format__ (__printf__, 2, 3)));
+static FILE *path_fopen(const char *mode, int exit_on_err, const char *path, ...)
+		__attribute__ ((__format__ (__printf__, 3, 4)));
+static void path_getstr(char *result, size_t len, const char *path, ...)
+		__attribute__ ((__format__ (__printf__, 3, 4)));
+static int path_getnum(const char *path, ...)
+		__attribute__ ((__format__ (__printf__, 1, 2)));
 static int path_exist(const char *path, ...)
 		__attribute__ ((__format__ (__printf__, 1, 2)));
-static int path_sibling(const char *path, ...)
+static cpu_set_t *path_cpuset(const char *path, ...)
 		__attribute__ ((__format__ (__printf__, 1, 2)));
 
+static const char *
+path_vcreate(const char *path, va_list ap)
+{
+	if (sysrootlen)
+		vsnprintf(pathbuf + sysrootlen,
+			  sizeof(pathbuf) - sysrootlen, path, ap);
+	else
+		vsnprintf(pathbuf, sizeof(pathbuf), path, ap);
+	return pathbuf;
+}
+
 static FILE *
-xfopen(const char *path, const char *mode)
+path_vfopen(const char *mode, int exit_on_error, const char *path, va_list ap)
 {
-	FILE *fd = fopen(path, mode);
-	if (!fd)
-		err(EXIT_FAILURE, _("error: %s"), path);
-	return fd;
+	FILE *f;
+	const char *p = path_vcreate(path, ap);
+
+	f = fopen(p, mode);
+	if (!f && exit_on_error)
+		err(EXIT_FAILURE, _("error: cannot open %s"), p);
+	return f;
 }
 
 static FILE *
-path_vfopen(const char *mode, const char *path, va_list ap)
+path_fopen(const char *mode, int exit_on_error, const char *path, ...)
 {
-	vsnprintf(pathbuf, sizeof(pathbuf), path, ap);
-	return xfopen(pathbuf, mode);
+	FILE *fd;
+	va_list ap;
+
+	va_start(ap, path);
+	fd = path_vfopen("r", exit_on_error, path, ap);
+	va_end(ap);
+
+	return fd;
 }
 
 static void
-path_scanstr(char *result, const char *path, ...)
+path_getstr(char *result, size_t len, const char *path, ...)
 {
 	FILE *fd;
 	va_list ap;
 
 	va_start(ap, path);
-	fd = path_vfopen("r", path, ap);
+	fd = path_vfopen("r", 1, path, ap);
 	va_end(ap);
 
-	if (fscanf(fd, "%s", result) != 1) {
+	if (!fgets(result, len, fd))
+		err(EXIT_FAILURE, _("failed to read: %s"), pathbuf);
+	fclose(fd);
+
+	len = strlen(result);
+	if (result[len - 1] == '\n')
+		result[len - 1] = '\0';
+}
+
+static int
+path_getnum(const char *path, ...)
+{
+	FILE *fd;
+	va_list ap;
+	int result;
+
+	va_start(ap, path);
+	fd = path_vfopen("r", 1, path, ap);
+	va_end(ap);
+
+	if (fscanf(fd, "%d", &result) != 1) {
 		if (ferror(fd))
-			err(EXIT_FAILURE, _("error: %s"), pathbuf);
+			err(EXIT_FAILURE, _("failed to read: %s"), pathbuf);
 		else
-			errx(EXIT_FAILURE, _("error parse: %s"), pathbuf);
+			errx(EXIT_FAILURE, _("parse error: %s"), pathbuf);
 	}
 	fclose(fd);
+	return result;
 }
 
 static int
 path_exist(const char *path, ...)
 {
 	va_list ap;
+	const char *p;
 
 	va_start(ap, path);
-	vsnprintf(pathbuf, sizeof(pathbuf), path, ap);
+	p = path_vcreate(path, ap);
 	va_end(ap);
 
-	return access(pathbuf, F_OK) == 0;
+	return access(p, F_OK) == 0;
 }
 
-char *
+static char *
 xstrdup(const char *str)
 {
 	char *s = strdup(str);
@@ -185,33 +234,35 @@ xstrdup(const char *str)
 	return s;
 }
 
-/* count the set bit in a mapping file */
-static int
-path_sibling(const char *path, ...)
+static cpu_set_t *
+path_cpuset(const char *path, ...)
 {
-	int c, n;
-	int result = 0;
-	char s[2];
-	FILE *fp;
+	FILE *fd;
 	va_list ap;
+	cpu_set_t *set;
+	size_t setsize, len = maxcpus * 7;
+	char buf[len];
 
 	va_start(ap, path);
-	fp = path_vfopen("r", path, ap);
+	fd = path_vfopen("r", 1, path, ap);
 	va_end(ap);
 
-	while ((c = fgetc(fp)) != EOF) {
-		if (isxdigit(c)) {
-			s[0] = c;
-			s[1] = '\0';
-			for (n = strtol(s, NULL, 16); n > 0; n /= 2) {
-				if (n % 2)
-					result++;
-			}
-		}
-	}
-	fclose(fp);
+	if (!fgets(buf, len, fd))
+		err(EXIT_FAILURE, _("failed to read: %s"), pathbuf);
+	fclose(fd);
 
-	return result;
+	len = strlen(buf);
+	if (buf[len - 1] == '\n')
+		buf[len - 1] = '\0';
+
+	set = cpuset_alloc(maxcpus, &setsize, NULL);
+	if (!set)
+		err(EXIT_FAILURE, _("failed to callocate cpu set"));
+
+	if (cpumask_parse(buf, set, setsize))
+		errx(EXIT_FAILURE, _("failed to parse CPU mask %s"), buf);
+
+	return set;
 }
 
 /* Lookup a pattern and get the value from cpuinfo.
@@ -256,53 +307,64 @@ int lookup(char *line, char *pattern, char **value)
 }
 
 static void
-read_basicinfo(struct cpu_desc *cpu)
+read_basicinfo(struct lscpu_desc *desc)
 {
-	FILE *fp = xfopen(_PATH_PROC_CPUINFO, "r");
+	FILE *fp = path_fopen("r", 1, _PATH_PROC_CPUINFO);
 	char buf[BUFSIZ];
 	struct utsname utsbuf;
 
 	/* architecture */
 	if (uname(&utsbuf) == -1)
 		err(EXIT_FAILURE, _("error: uname failed"));
-	cpu->arch = xstrdup(utsbuf.machine);
+	desc->arch = xstrdup(utsbuf.machine);
 
 	/* count CPU(s) */
-	while(path_exist(_PATH_SYS_SYSTEM "/cpu/cpu%d", cpu->ct_cpu))
-		cpu->ct_cpu++;
+	while(path_exist(_PATH_SYS_SYSTEM "/cpu/cpu%d", desc->ncpus))
+		desc->ncpus++;
 
 	/* details */
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
 		/* IA64 */
-		if (lookup(buf, "vendor", &cpu->vendor)) ;
-		else if (lookup(buf, "vendor_id", &cpu->vendor)) ;
+		if (lookup(buf, "vendor", &desc->vendor)) ;
+		else if (lookup(buf, "vendor_id", &desc->vendor)) ;
 		/* IA64 */
-		else if (lookup(buf, "family", &cpu->family)) ;
-		else if (lookup(buf, "cpu family", &cpu->family)) ;
-		else if (lookup(buf, "model", &cpu->model)) ;
-		else if (lookup(buf, "stepping", &cpu->stepping)) ;
-		else if (lookup(buf, "cpu MHz", &cpu->mhz)) ;
-		else if (lookup(buf, "flags", &cpu->flags)) ;
+		else if (lookup(buf, "family", &desc->family)) ;
+		else if (lookup(buf, "cpu family", &desc->family)) ;
+		else if (lookup(buf, "model", &desc->model)) ;
+		else if (lookup(buf, "stepping", &desc->stepping)) ;
+		else if (lookup(buf, "cpu MHz", &desc->mhz)) ;
+		else if (lookup(buf, "flags", &desc->flags)) ;
 		else
 			continue;
 	}
 
-	if (cpu->flags) {
-		snprintf(buf, sizeof(buf), " %s ", cpu->flags);
+	if (desc->flags) {
+		snprintf(buf, sizeof(buf), " %s ", desc->flags);
 		if (strstr(buf, " svm "))
-			cpu->virtflag = strdup("svm");
+			desc->virtflag = strdup("svm");
 		else if (strstr(buf, " vmx "))
-			cpu->virtflag = strdup("vmx");
+			desc->virtflag = strdup("vmx");
 
 		if (strstr(buf, " rm "))
-			cpu->mode |= MODE_REAL;
+			desc->mode |= MODE_REAL;
 		if (strstr(buf, " tm "))
-			cpu->mode |= MODE_TRANSPARENT;
+			desc->mode |= MODE_TRANSPARENT;
 		if (strstr(buf, " lm "))
-			cpu->mode |= MODE_LONG;
+			desc->mode |= MODE_LONG;
 	}
 
 	fclose(fp);
+
+	if (path_exist(_PATH_SYS_SYSTEM "/cpu/kernel_max"))
+		maxcpus = path_getnum(_PATH_SYS_SYSTEM "/cpu/kernel_max");
+
+	else if (!sysrootlen)
+		/* the root is '/' so we are working with data from the current kernel */
+		maxcpus = get_max_number_of_cpus();
+	else
+		/* we are reading some /sys snapshot instead of the real /sys,
+		 * let's use any crazy number... */
+		maxcpus = desc->ncpus > 2048 ? desc->ncpus : 2048;
 }
 
 static int
@@ -312,7 +374,7 @@ has_pci_device(int vendor, int device)
 	int num, fn, ven, dev;
 	int res = 1;
 
-	f = fopen(_PATH_PROC_PCIDEVS, "r");
+	f = path_fopen("r", 0, _PATH_PROC_PCIDEVS);
 	if (!f)
 		return 0;
 
@@ -364,7 +426,7 @@ cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx,
 }
 
 static void
-read_hypervisor_cpuid(struct cpu_desc *cpu)
+read_hypervisor_cpuid(struct lscpu_desc *desc)
 {
 	unsigned int eax = 0, ebx = 0, ecx = 0, edx = 0;
 	char hyper_vendor_id[13];
@@ -381,32 +443,32 @@ read_hypervisor_cpuid(struct cpu_desc *cpu)
 		return;
 
 	if (!strncmp("XenVMMXenVMM", hyper_vendor_id, 12))
-		cpu->hyper = HYPER_XEN;
+		desc->hyper = HYPER_XEN;
 	else if (!strncmp("KVMKVMKVM", hyper_vendor_id, 9))
-		cpu->hyper = HYPER_KVM;
+		desc->hyper = HYPER_KVM;
 	else if (!strncmp("Microsoft Hv", hyper_vendor_id, 12))
-		cpu->hyper = HYPER_MSHV;
+		desc->hyper = HYPER_MSHV;
 }
 
 #else	/* ! __x86_64__ */
 static void
-read_hypervisor_cpuid(struct cpu_desc *cpu)
+read_hypervisor_cpuid(struct lscpu_desc *desc)
 {
 }
 #endif
 
 static void
-read_hypervisor(struct cpu_desc *cpu)
+read_hypervisor(struct lscpu_desc *desc)
 {
-	read_hypervisor_cpuid(cpu);
+	read_hypervisor_cpuid(desc);
 
-	if (cpu->hyper)
+	if (desc->hyper)
 		/* hvm */
-		cpu->virtype = VIRT_FULL;
+		desc->virtype = VIRT_FULL;
 
-	else if (!access(_PATH_PROC_XEN, F_OK)) {
+	else if (path_exist(_PATH_PROC_XEN)) {
 		/* Xen para-virt or dom0 */
-		FILE *fd = fopen(_PATH_PROC_XENCAP, "r");
+		FILE *fd = path_fopen("r", 0, _PATH_PROC_XENCAP);
 		int dom0 = 0;
 
 		if (fd) {
@@ -417,123 +479,179 @@ read_hypervisor(struct cpu_desc *cpu)
 				dom0 = 1;
 			fclose(fd);
 		}
-		cpu->virtype = dom0 ? VIRT_NONE : VIRT_PARA;
-		cpu->hyper = HYPER_XEN;
+		desc->virtype = dom0 ? VIRT_NONE : VIRT_PARA;
+		desc->hyper = HYPER_XEN;
 
 	} else if (has_pci_device(0x5853, 0x0001)) {
 		/* Xen full-virt on non-x86_64 */
-		cpu->hyper = HYPER_XEN;
-		cpu->virtype = VIRT_FULL;
+		desc->hyper = HYPER_XEN;
+		desc->virtype = VIRT_FULL;
 	}
 }
 
-static void
-read_topology(struct cpu_desc *cpu)
+/* add @set to the @ary, unnecesary set is deallocated. */
+static int add_cpuset_to_array(cpu_set_t **ary, int *items, cpu_set_t *set)
 {
-	/* number of threads */
-	cpu->ct_thread = path_sibling(
-				_PATH_SYS_CPU0 "/topology/thread_siblings");
+	int i;
+	size_t setsize = CPU_ALLOC_SIZE(maxcpus);
 
-	/* number of cores */
-	cpu->ct_core = path_sibling(
-				_PATH_SYS_CPU0 "/topology/core_siblings")
-			/ cpu->ct_thread;
+	if (!ary)
+		return -1;
 
-	/* number of sockets */
-	cpu->ct_socket = cpu->ct_cpu / cpu->ct_core / cpu->ct_thread;
+	for (i = 0; i < *items; i++) {
+		if (CPU_EQUAL_S(setsize, set, ary[i]))
+			break;
+	}
+	if (i == *items) {
+		ary[*items] = set;
+		++*items;
+		return 0;
+	}
+	CPU_FREE(set);
+	return 1;
 }
 
 static void
-read_cache(struct cpu_desc *cpu)
+read_topology(struct lscpu_desc *desc, int num)
 {
-	char buf[256];
-	DIR *dp;
-	struct dirent *dir;
-	int level, type;
+	cpu_set_t *thread_siblings, *core_siblings;
 
-	dp = opendir(_PATH_SYS_CPU0 "/cache");
-	if (dp == NULL)
-		err(EXIT_FAILURE, _("error: %s"), _PATH_SYS_CPU0 "/cache");
+	if (!path_exist(_PATH_SYS_CPU "/cpu%d/topology/thread_siblings", num))
+		return;
 
-	while ((dir = readdir(dp)) != NULL) {
-		if (!strcmp(dir->d_name, ".")
-		    || !strcmp(dir->d_name, ".."))
-			continue;
+	thread_siblings = path_cpuset(_PATH_SYS_CPU
+					"/cpu%d/topology/thread_siblings", num);
+	core_siblings = path_cpuset(_PATH_SYS_CPU
+					"/cpu%d/topology/core_siblings", num);
+	if (num == 0) {
+		int ncores, nsockets, nthreads;
+		size_t setsize = CPU_ALLOC_SIZE(maxcpus);
+
+		/* threads within one core */
+		nthreads = CPU_COUNT_S(setsize, thread_siblings);
+		/* cores within one socket */
+		ncores = CPU_COUNT_S(setsize, core_siblings) / nthreads;
+		/* number of sockets */
+		nsockets = desc->ncpus / nthreads / ncores;
+		/* all threads */
+		desc->nthreads = nsockets * ncores * nthreads;
+
+		desc->socketmaps = calloc(nsockets, sizeof(cpu_set_t *));
+		if (!desc->socketmaps)
+			err(EXIT_FAILURE, _("error: calloc failed"));
+		desc->coremaps = calloc(ncores * nsockets, sizeof(cpu_set_t *));
+		if (!desc->coremaps)
+			err(EXIT_FAILURE, _("error: calloc failed"));
+	}
 
-		/* cache type */
-		path_scanstr(buf, _PATH_SYS_CPU0 "/cache/%s/type", dir->d_name);
-		if (!strcmp(buf, "Data"))
-			type = 'd';
-		else if (!strcmp(buf, "Instruction"))
-			type = 'i';
-		else
-			type = 0;
+	add_cpuset_to_array(desc->socketmaps, &desc->nsockets, core_siblings);
+	add_cpuset_to_array(desc->coremaps, &desc->ncores, thread_siblings);
+}
 
-		/* cache level */
-		path_scanstr(buf, _PATH_SYS_CPU0 "/cache/%s/level", dir->d_name);
-		level = atoi(buf);
+static int
+cachecmp(const void *a, const void *b)
+{
+	struct cpu_cache *c1 = (struct cpu_cache *) a;
+	struct cpu_cache *c2 = (struct cpu_cache *) b;
 
-		if (type)
-			snprintf(buf, sizeof(buf), "L%d%c", level, type);
-		else
-			snprintf(buf, sizeof(buf), "L%d", level);
+	return strcmp(c2->name, c1->name);
+}
+
+static void
+read_cache(struct lscpu_desc *desc, int num)
+{
+	char buf[256];
+	int i;
 
-		cpu->cache[cpu->ct_cache].caname = xstrdup(buf);
+	if (num == 0) {
+		while(path_exist(_PATH_SYS_SYSTEM "/cpu/cpu%d/cache/index%d",
+					num, desc->ncaches))
+			desc->ncaches++;
 
-		/* cache size */
-		path_scanstr(buf, _PATH_SYS_CPU0 "/cache/%s/size", dir->d_name);
-		cpu->cache[cpu->ct_cache].casize = xstrdup(buf);
+		if (!desc->ncaches)
+			return;
+
+		desc->caches = calloc(desc->ncaches, sizeof(*desc->caches));
+		if (!desc->caches)
+			err(EXIT_FAILURE, _("calloc failed"));
+	}
+	for (i = 0; i < desc->ncaches; i++) {
+		struct cpu_cache *ca = &desc->caches[i];
+		cpu_set_t *map;
+
+		if (!ca->name) {
+			int type, level;
+
+			/* cache type */
+			path_getstr(buf, sizeof(buf),
+					_PATH_SYS_CPU "/cpu%d/cache/index%d/type",
+					num, i);
+			if (!strcmp(buf, "Data"))
+				type = 'd';
+			else if (!strcmp(buf, "Instruction"))
+				type = 'i';
+			else
+				type = 0;
+
+			/* cache level */
+			level = path_getnum(_PATH_SYS_CPU "/cpu%d/cache/index%d/level",
+					num, i);
+			if (type)
+				snprintf(buf, sizeof(buf), "L%d%c", level, type);
+			else
+				snprintf(buf, sizeof(buf), "L%d", level);
+
+			ca->name = xstrdup(buf);
+
+			/* cache size */
+			path_getstr(buf, sizeof(buf),
+					_PATH_SYS_CPU "/cpu%d/cache/index%d/size",
+					num, i);
+			ca->size = xstrdup(buf);
+		}
 
 		/* information about how CPUs share different caches */
-		cpu->cache[cpu->ct_cache].camap = path_sibling(
-				_PATH_SYS_CPU0 "/cache/%s/shared_cpu_map",
-				dir->d_name);
-		cpu->ct_cache++;
+		map = path_cpuset(_PATH_SYS_CPU "/cpu%d/cache/index%d/shared_cpu_map",
+				num, i);
+
+		if (!ca->sharedmaps) {
+			ca->sharedmaps = calloc(desc->ncpus, sizeof(cpu_set_t *));
+			if (!ca->sharedmaps)
+				err(EXIT_FAILURE, _("error: calloc failed"));
+		}
+
+		add_cpuset_to_array(ca->sharedmaps, &ca->nsharedmaps, map);
 	}
 }
 
 static void
-read_nodes(struct cpu_desc *cpu)
+read_nodes(struct lscpu_desc *desc)
 {
 	int i;
 
 	/* number of NUMA node */
-	while (path_exist(_PATH_SYS_SYSTEM "/node/node%d", cpu->ct_node))
-		cpu->ct_node++;
+	while (path_exist(_PATH_SYS_SYSTEM "/node/node%d", desc->nnodes))
+		desc->nnodes++;
+
+	if (!desc->nnodes)
+		return;
 
-	cpu->nodecpu = (int *) malloc(cpu->ct_node * sizeof(int));
-	if (!cpu->nodecpu)
-		err(EXIT_FAILURE, _("error: malloc failed"));
+	desc->nodemaps = calloc(desc->nnodes, sizeof(cpu_set_t *));
+	if (!desc->nodemaps)
+		err(EXIT_FAILURE, _("error: calloc failed"));
 
 	/* information about how nodes share different CPUs */
-	for (i = 0; i < cpu->ct_node; i++)
-		cpu->nodecpu[i] = path_sibling(
+	for (i = 0; i < desc->nnodes; i++)
+		desc->nodemaps[i] = path_cpuset(
 					_PATH_SYS_SYSTEM "/node/node%d/cpumap",
 					i);
 }
 
 static void
-check_system(void)
-{
-	/* Read through sysfs. */
-	if (access(_PATH_SYS_SYSTEM, F_OK))
-		errx(EXIT_FAILURE,
-		     _("error: /sys filesystem is not accessable."));
-
-	if (!access(_PATH_SYS_SYSTEM "/node", F_OK))
-		have_node = 1;
-
-	if (!access(_PATH_SYS_CPU0 "/topology/thread_siblings", F_OK))
-		have_topology = 1;
-
-	if (!access(_PATH_SYS_CPU0 "/cache", F_OK))
-		have_cache = 1;
-}
-
-static void
-print_parsable(struct cpu_desc *cpu)
+print_parsable(struct lscpu_desc *desc)
 {
 	int i, j;
+	size_t setsize = CPU_ALLOC_SIZE(maxcpus);
 
 	printf(_(
 	"# The following is the parsable format, which can be fed to other\n"
@@ -541,50 +659,66 @@ print_parsable(struct cpu_desc *cpu)
 	"# starting from zero.\n"
 	"# CPU,Core,Socket,Node"));
 
-	if (have_cache) {
+	if (desc->ncaches) {
 		/* separator between CPU topology and cache information */
 		putchar(',');
 
-		for (i = cpu->ct_cache - 1; i >= 0; i--)
-			printf(",%s", cpu->cache[i].caname);
+		for (i = desc->ncaches - 1; i >= 0; i--)
+			printf(",%s", desc->caches[i].name);
 	}
 	putchar('\n');
 
-	for (i = 0; i < cpu->ct_cpu; i++) {
+	for (i = 0; i < desc->ncpus; i++) {
+
+		/* #CPU */
 		printf("%d", i);
 
-		if (have_topology)
-			printf(",%d,%d",
-				i / cpu->ct_thread,
-			        i / cpu->ct_core / cpu->ct_thread);
-		else
-			printf(",,");
+		/* Core */
+		for (j = 0; j < desc->ncores; j++) {
+			if (CPU_ISSET_S(i, setsize, desc->coremaps[j])) {
+				printf(",%d", j);
+				break;
+			}
+		}
+		if (j == desc->ncores)
+			putchar(',');
 
-		if (have_node) {
-			int c = 0;
+		/* Socket */
+		for (j = 0; j < desc->nsockets; j++) {
+			if (CPU_ISSET_S(i, setsize, desc->socketmaps[j])) {
+				printf(",%d", j);
+				break;
+			}
+		}
+		if (j == desc->nsockets)
+			putchar(',');
 
-			for (j = 0; j < cpu->ct_node; j++) {
-				c += cpu->nodecpu[j];
-				if (i < c) {
-					printf(",%d", j);
-					break;
-				}
+		/* Nodes */
+		for (j = 0; j < desc->nnodes; j++) {
+			if (CPU_ISSET_S(i, setsize, desc->nodemaps[j])) {
+				printf(",%d", j);
+				break;
 			}
-		} else
+		}
+		if (j == desc->nnodes)
 			putchar(',');
 
-		if (have_cache) {
+		if (desc->ncaches)
 			putchar(',');
 
-			for (j = cpu->ct_cache - 1; j >= 0; j--) {
-				/* If shared_cpu_map is 0, all CPUs share the same
-				   cache. */
-				if (cpu->cache[j].camap == 0)
-					cpu->cache[j].camap = cpu->ct_core *
-							      cpu->ct_thread;
+		/* Caches */
+		for (j = desc->ncaches - 1; j >= 0; j--) {
+			struct cpu_cache *ca = &desc->caches[j];
+			int x;
 
-				printf(",%d", i / cpu->cache[j].camap);
+			for (x = 0; x < ca->nsharedmaps; x++) {
+				if (CPU_ISSET_S(i, setsize, ca->sharedmaps[x])) {
+					printf(",%d", x);
+					break;
+				}
 			}
+			if (x == ca->nsharedmaps)
+				putchar(',');
 		}
 		putchar('\n');
 	}
@@ -596,22 +730,25 @@ print_parsable(struct cpu_desc *cpu)
 #define print_n(_key, _val)	printf("%-23s%d\n", _key, _val)
 
 static void
-print_readable(struct cpu_desc *cpu)
+print_readable(struct lscpu_desc *desc)
 {
-	print_s("Architecture:", cpu->arch);
+	char buf[512];
+	int i;
+
+	print_s(_("Architecture:"), desc->arch);
 
-	if (cpu->mode & (MODE_REAL | MODE_TRANSPARENT | MODE_LONG)) {
+	if (desc->mode & (MODE_REAL | MODE_TRANSPARENT | MODE_LONG)) {
 		char buf[64], *p = buf;
 
-		if (cpu->mode & MODE_REAL) {
+		if (desc->mode & MODE_REAL) {
 			strcpy(p, "16-bit, ");
 			p += 8;
 		}
-		if (cpu->mode & MODE_TRANSPARENT) {
+		if (desc->mode & MODE_TRANSPARENT) {
 			strcpy(p, "32-bit, ");
 			p += 8;
 		}
-		if (cpu->mode & MODE_LONG) {
+		if (desc->mode & MODE_LONG) {
 			strcpy(p, "64-bit, ");
 			p += 8;
 		}
@@ -619,44 +756,57 @@ print_readable(struct cpu_desc *cpu)
 		print_s(_("CPU op-mode(s):"), buf);
 	}
 
-	print_n("CPU(s):", cpu->ct_cpu);
+	print_n(_("CPU(s):"), desc->ncpus);
 
-	if (have_topology) {
-		print_n(_("Thread(s) per core:"), cpu->ct_thread);
-		print_n(_("Core(s) per socket:"), cpu->ct_core);
-		print_n(_("CPU socket(s):"), cpu->ct_socket);
+	if (desc->nsockets) {
+		print_n(_("Thread(s) per core:"), desc->nthreads / desc->ncores);
+		print_n(_("Core(s) per socket:"), desc->ncores / desc->nsockets);
+		print_n(_("CPU socket(s):"), desc->nsockets);
 	}
 
-	if (have_node)
-		print_n(_("NUMA node(s):"), cpu->ct_node);
-	if (cpu->vendor)
-		print_s(_("Vendor ID:"), cpu->vendor);
-	if (cpu->family)
-		print_s(_("CPU family:"), cpu->family);
-	if (cpu->model)
-		print_s(_("Model:"), cpu->model);
-	if (cpu->stepping)
-		print_s(_("Stepping:"), cpu->stepping);
-	if (cpu->mhz)
-		print_s(_("CPU MHz:"), cpu->mhz);
-	if (cpu->virtflag) {
-		if (!strcmp(cpu->virtflag, "svm"))
+	if (desc->nnodes)
+		print_n(_("NUMA node(s):"), desc->nnodes);
+	if (desc->vendor)
+		print_s(_("Vendor ID:"), desc->vendor);
+	if (desc->family)
+		print_s(_("CPU family:"), desc->family);
+	if (desc->model)
+		print_s(_("Model:"), desc->model);
+	if (desc->stepping)
+		print_s(_("Stepping:"), desc->stepping);
+	if (desc->mhz)
+		print_s(_("CPU MHz:"), desc->mhz);
+	if (desc->virtflag) {
+		if (!strcmp(desc->virtflag, "svm"))
 			print_s(_("Virtualization:"), "AMD-V");
-		else if (!strcmp(cpu->virtflag, "vmx"))
+		else if (!strcmp(desc->virtflag, "vmx"))
 			print_s(_("Virtualization:"), "VT-x");
 	}
-	if (cpu->hyper) {
-		print_s(_("Hypervisor vendor:"), hv_vendors[cpu->hyper]);
-		print_s(_("Virtualization type:"), virt_types[cpu->virtype]);
+	if (desc->hyper) {
+		print_s(_("Hypervisor vendor:"), hv_vendors[desc->hyper]);
+		print_s(_("Virtualization type:"), virt_types[desc->virtype]);
 	}
-	if (have_cache) {
+	if (desc->ncaches) {
 		char buf[512];
 		int i;
 
-		for (i = cpu->ct_cache - 1; i >= 0; i--) {
+		for (i = desc->ncaches - 1; i >= 0; i--) {
 			snprintf(buf, sizeof(buf),
-					_("%s cache:"), cpu->cache[i].caname);
-			print_s(buf, cpu->cache[i].casize);
+					_("%s cache:"), desc->caches[i].name);
+			print_s(buf, desc->caches[i].size);
+		}
+	}
+
+	if (desc->nnodes) {
+		size_t setbuflen = 7 * maxcpus;
+		char setbuf[setbuflen];
+
+		for (i = 0; i < desc->nnodes; i++) {
+			snprintf(buf, sizeof(buf), _("NUMA node%d CPU(s):"), i);
+			print_s(buf, cpulist_create(
+						setbuf, setbuflen,
+						desc->nodemaps[i],
+						CPU_ALLOC_SIZE(maxcpus)));
 		}
 	}
 }
@@ -673,19 +823,10 @@ void usage(int rc)
 	exit(rc);
 }
 
-static int
-ca_compare(const void *a, const void *b)
-{
-	struct ca_desc *cache1 = (struct ca_desc *) a;
-	struct ca_desc *cache2 = (struct ca_desc *) b;
-
-	return strcmp(cache2->caname, cache1->caname);
-}
-
 int main(int argc, char *argv[])
 {
-	struct cpu_desc _cpu, *cpu = &_cpu;
-	int parsable = 0, c;
+	struct lscpu_desc _desc, *desc = &_desc;
+	int parsable = 0, c, i;
 
 	struct option longopts[] = {
 		{ "help",	no_argument,       0, 'h' },
@@ -694,7 +835,7 @@ int main(int argc, char *argv[])
 		{ NULL,		0, 0, 0 }
 	};
 
-	setlocale(LC_MESSAGES, "");
+	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
@@ -706,39 +847,35 @@ int main(int argc, char *argv[])
 			parsable = 1;
 			break;
 		case 's':
+			sysrootlen = strlen(optarg);
 			strncpy(pathbuf, optarg, sizeof(pathbuf));
+			pathbuf[sizeof(pathbuf) - 1] = '\0';
 			break;
 		default:
 			usage(EXIT_FAILURE);
 		}
 	}
 
-	if (chdir(pathbuf) == -1)
-		errx(EXIT_FAILURE,
-		     _("error: change working directory to %s."), pathbuf);
+	memset(desc, 0, sizeof(*desc));
 
-	memset(cpu, 0, sizeof(*cpu));
+	read_basicinfo(desc);
 
-	check_system();
+	for (i = 0; i < desc->ncpus; i++) {
+		read_topology(desc, i);
+		read_cache(desc, i);
+	}
 
-	read_basicinfo(cpu);
+	qsort(desc->caches, desc->ncaches, sizeof(struct cpu_cache), cachecmp);
 
-	if (have_topology)
-		read_topology(cpu);
-	if (have_cache) {
-		read_cache(cpu);
-		qsort(cpu->cache, cpu->ct_cache, sizeof(struct ca_desc), ca_compare);
-	}
-	if (have_node)
-		read_nodes(cpu);
+	read_nodes(desc);
 
-	read_hypervisor(cpu);
+	read_hypervisor(desc);
 
 	/* Show time! */
 	if (parsable)
-		print_parsable(cpu);
+		print_parsable(desc);
 	else
-		print_readable(cpu);
+		print_readable(desc);
 
 	return EXIT_SUCCESS;
 }
diff --git a/sys-utils/rdev.8 b/sys-utils/rdev.8
deleted file mode 100644
index 16d6420f..00000000
--- a/sys-utils/rdev.8
+++ /dev/null
@@ -1,207 +0,0 @@
-.\" Copyright 1992, 1993 Rickard E. Faith (faith@cs.unc.edu)
-.\" May be distributed under the GNU General Public License
-.\" Changes from sct@dcs.ed.ac.uk added Sat Oct  9 09:54:00 1993.
-.TH RDEV 8 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual"
-.SH NAME
-rdev \- query/set image root device, RAM disk size, or video mode
-.SH SYNOPSIS
-.B rdev
-.RB [ \-Rrvh ]
-.RB [ \-o
-.IR offset ]
-.RI [ image
-.RI [ value
-.RI [  offset ]]]
-.br
-.B rdev
-.RB [ \-o
-.IR offset ]
-.RI [ image
-.RI [ root_device
-.RI [  offset ]]]
-.br
-.B ramsize
-.RB [ \-o
-.IR offset ]
-.RI [ image
-.RI [ size
-.RI [  offset ]]]
-.br
-.B vidmode
-.RB [ \-o
-.IR offset ]
-.RI [ image
-.RI [ mode
-.RI [  offset ]]]
-.br
-.B rootflags
-.RB [ \-o
-.IR offset ]
-.RI [ image
-.RI [ flags
-.RI [  offset ]]]
-.SH DESCRIPTION
-With no arguments,
-.B rdev
-outputs an
-.I /etc/mtab
-line for the current root file system.
-With no arguments,
-.BR ramsize ", " vidmode ", and " rootflags
-print usage information.
-
-In a bootable image for the Linux kernel on i386, there are several pairs
-of bytes which specify the root device, the video mode, and the size of
-the RAM disk.  These pairs of bytes, by default, begin
-at offset 504 (decimal) in the kernel image:
-
-.nf
-.RS
- 498 Root flags
-(500 and 502 Reserved)
- 504 RAM Disk Size
- 506 VGA Mode
- 508 Root Device
-(510 Boot Signature)
-.RE
-.fi
-
-.B rdev
-will change these values.
-
-Typical values for the
-.I image
-parameter, which is a bootable Linux kernel image, might be:
-
-.nf
-.RS
-/vmlinux
-/vmunix
-/boot/bzImage-2.4.0
-/dev/fd0
-/dev/fd1
-.RE
-.fi
-
-When using the
-.B rdev
-command, the
-.I root_device
-parameter might be something like:
-
-.nf
-.RS
-/dev/hda1
-/dev/hdf13
-/dev/sda2
-/dev/sdc4
-/dev/ida/c0d0p1
-.RE
-.fi
-
-One may also specify the device by a comma-separated pair
-of decimal integers
-.IR major , minor .
-
-For the
-.B ramsize
-command, the
-.I size
-parameter specifies the size of the RAM disk in kilobytes. 2.0.x kernels
-and newer dynamically allocate the ramdisk and do not need this setting.
-
-For the
-.B rootflags
-command, the
-.I flags
-parameter contains extra information used when mounting root.
-Currently the only effect of these flags is to force the kernel to
-mount the root filesystem in readonly mode if
-.I flags
-is non-zero.
-
-For the
-.B vidmode
-command, the
-.I mode
-parameter specifies the video mode:
-
-.nf
-.RS
--3 = Prompt
--2 = Extended VGA
--1 = Normal VGA
- 0 = as if "0" was pressed at the prompt
- 1 = as if "1" was pressed at the prompt
- 2 = as if "2" was pressed at the prompt
- n = as if "n" was pressed at the prompt
-.RE
-.fi
-
-If the
-.I value
-is not specified, the
-.I image
-will be examined to determine the current settings.
-.SH OPTIONS
-.TP
-.B \-r
-Causes
-.B rdev
-to act like
-.BR ramsize
-(Not relevant for 2.0.x and newer kernels).
-.TP
-.B \-R
-Causes
-.B rdev
-to act like
-.BR rootflags .
-.TP
-.B \-v
-Causes
-.B rdev
-to act like
-.BR vidmode .
-.TP
-.B \-h
-Provides help.
-.SH BUGS
-The
-.B rdev
-utility, when used other than to find a name for the current root device,
-is an ancient hack that works by patching a kernel image at a magic offset
-with magic numbers. It does not work on architectures other than i386.
-Its use is strongly discouraged. Use a boot loader like SysLinux or LILO
-instead.
-.SH HISTORY
-At offset 502 there used to be the device number of the swap device
-(in Linux 0.12), and "rdev -s" or "swapdev" would set this.
-However, since Linux 0.95 this constant is not used any longer,
-and the swap device is specified using the
-.BR swapon (2)
-system call.
-
-At offset 504 there used to be the size of the ramdisk in kilobytes.
-One would specify a size, and this much was grabbed off the top of memory.
-In Linux 1.1.39 it became also possible to set this value on the kernel
-command line.
-In Linux 1.3.48 the ramdisk setup was changed. Ramdisk memory is now
-taken from the buffer cache, so that the ramdisk can grow dynamically.
-The interpretation of the ramdisk word was changed to a word of which
-the high order bit is a prompt flag (1: prompt for ramdisk:
-"VFS: Insert ramdisk floppy and press ENTER" - this is needed with a
-two-floppy boot), the next bit a load flag (1: load ramdisk),
-and the low order 11 bits give the starting block number of the
-root filesystem image (so that one can have a single floppy boot).
-See also
-.IR linux/Documentation/ramdisk.txt .
-.SH AUTHORS
-.nf
-Originally by Werner Almesberger (almesber@nessie.cs.id.ethz.ch)
-Modified by Peter MacDonald (pmacdona@sanjuan.UVic.CA)
-rootflags support added by Stephen Tweedie (sct@dcs.ed.ac.uk)
-.fi
-.SH AVAILABILITY
-The rdev command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
diff --git a/sys-utils/rdev.c b/sys-utils/rdev.c
deleted file mode 100644
index 14fac814..00000000
--- a/sys-utils/rdev.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-
-  rdev.c  -  query/set root device.
-
--------------------------------------------------------------------------
-
-Date: Sun, 27 Dec 1992 15:55:31 +0000
-Subject: Re: rdev
-From: almesber@nessie.cs.id.ethz.ch (Werner Almesberger)
-To: Rik Faith <faith@cs.unc.edu>
-
-There are quite a few versions of rdev:
-
-  - the original rootdev that only printed the current root device, by
-    Linus.
-  - rdev that does what rootdev did and that also allows you to change
-    the root (and swap) device, by me.
-  - rdev got renamed to setroot and I think even to rootdev on various
-    distributions.
-  - Peter MacDonald added video mode and RAM disk setting and included
-    this version on SLS, called rdev again. I've attached his rdev.c to
-    this mail.
-    
--------------------------------------------------------------------------
-    
-Date: 11 Mar 92 21:37:37 GMT
-Subject: rdev - query/set root device
-From: almesber@nessie.cs.id.ethz.ch (Werner Almesberger)
-Organization: Swiss Federal Institute of Technology (ETH), Zurich, CH
-
-With all that socket, X11, disk driver and FS hacking going on, apparently
-nobody has found time to address one of the minor nuisances of life: set-
-ting the root FS device is still somewhat cumbersome. I've written a little
-utility which can read and set the root device in boot images:
-
-rdev accepts an optional offset argument, just in case the address should
-ever move from 508. If called without arguments, rdev outputs an mtab line
-for the current root FS, just like /etc/rootdev does.
-
-ramsize sets the size of the ramdisk.  If size is zero, no ramdisk is used.
-
-vidmode sets the default video mode at bootup time.  -1 uses default video
-mode, -2 uses menu.
-
--------------------------------------------------------------------------
-
-Sun Dec 27 10:42:16 1992: Minor usage changes, faith@cs.unc.edu.
-Tue Mar 30 09:31:52 1993: rdev -Rn to set root readonly flag, sct@dcs.ed.ac.uk
-Wed Jun 22 21:12:29 1994: Applied patches from Dave
-                          (gentzel@nova.enet.dec.com) to prevent dereferencing
-			  the NULL pointer, faith@cs.unc.edu
-1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL>
-- added Native Language Support
-
--------------------------------------------------------------------------
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "nls.h"
-
-/* rdev.c  -  query/set root device. */
-
-static void
-usage(void) {
-
-    puts(_("usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"));
-    puts(_("  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"));
-    puts(_("  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"));
-    puts(_("  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"));
-    puts(_("  rdev -r /dev/fd0 627            set the RAMDISK size"));
-    puts(_("  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"));
-    puts(_("  rdev -o N ...                   use the byte offset N"));
-    puts(_("  rootflags ...                   same as rdev -R"));
-    puts(_("  ramsize ...                     same as rdev -r"));
-    puts(_("  vidmode ...                     same as rdev -v"));
-    puts(_("Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."));
-    puts(_("      use -R 1 to mount root readonly, -R 0 for read/write."));
-    exit(-1);
-}
-
-
-#define DEFAULT_OFFSET 508
-
-
-static void
-die(char *msg) {
-	perror(msg);
-	exit(1);
-}
-
-/* Earlier rdev fails on /dev/ida/c0d0p1 so we allow for
-   recursion in /dev. -- Paul Clements */
-/* In fact devfs needs deep recursion. */
-
-static int
-find_dev_recursive(char *dirnamebuf, int number) {
-	DIR *dp;
-	struct dirent *dir;
-	struct stat s;
-	int dirnamelen = 0;
-
-	if ((dp = opendir(dirnamebuf)) == NULL)
-		die("opendir");
-	dirnamelen = strlen(dirnamebuf);
-	while ((dir = readdir(dp)) != NULL) {
-		if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
-			continue;
-		if (dirnamelen + 1 + strlen(dir->d_name) > PATH_MAX)
-			continue;
-		dirnamebuf[dirnamelen] = '/';
-		strcpy(dirnamebuf+dirnamelen+1, dir->d_name);
-		if (lstat(dirnamebuf, &s) < 0)
-			continue;
-		if ((s.st_mode & S_IFMT) == S_IFBLK && s.st_rdev == number)
-			return 1;
-		if ((s.st_mode & S_IFMT) == S_IFDIR &&
-		    find_dev_recursive(dirnamebuf, number))
-			return 1;
-	}
-	dirnamebuf[dirnamelen] = 0;
-	closedir(dp);
-	return 0;
-}
-
-static char *
-find_dev(int number) {
-	static char name[PATH_MAX+1];
-
-	if (!number)
-		return "Boot device";
-	strcpy(name, "/dev");
-	if (find_dev_recursive(name, number))
-		return name;
-	sprintf(name, "0x%04x", number);
-	return name;
-}
-
-/* The enum values are significant, things are stored in this order,
-   see bootsect.S */
-enum { RDEV, VIDMODE, RAMSIZE, __swapdev__, __syssize__, ROOTFLAGS };
-char *cmdnames[6] = { "rdev", "vidmode",  "ramsize", "", 
-		      "", "rootflags"};
-char *desc[6] = { "Root device", "Video mode",  "Ramsize",  "",
-		  "", "Root flags"};
-#define shift(n) argv+=n,argc-=n
-
-int
-main(int argc, char **argv) {
-	int image, offset, dev_nr, i, newoffset=-1;
-	char *ptr;
-	unsigned short val, have_val;
-	struct stat s;
-	int cmd;
-
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-
-	/* use the command name to figure out what we have to do - ugly */
-	cmd = RDEV;
-	if ((ptr = strrchr(argv[0],'/')) != NULL)
-		ptr++;
-	else
-		ptr = argv[0];
-	for (i=0; i<=5; i++) {
-		if (!strcmp(ptr,cmdnames[i])) {
-			cmd = i;
-			break;
-		}
-	}
-
-	while (argc > 1) { 
-		if (argv[1][0] != '-')
-			break;
-		switch (argv[1][1]) {
-		case 'R':
-			cmd = ROOTFLAGS;
-			shift(1);
-			break;
-		case 'r': 
-			cmd = RAMSIZE;
-			shift(1);
-			break;
-		case 'v':
-			cmd = VIDMODE;
-			shift(1);
-			break;
-		case 'o':
-			if (argv[1][2]) {
-				newoffset = atoi(argv[1]+2);
-				shift(1);
-				break;
-			} else if (argc > 2) {
-				newoffset = atoi(argv[2]);
-				shift(2);
-				break;
-			}
-			/* Fall through. . . */
-		default:
-			usage();
-		}
-	}
-
-	/* Here the only sensible way of using rdev */
-	if (argc == 1) {
-		if (cmd == RDEV) {
-			if (stat("/",&s) < 0) die("/");
-			printf("%s /\n", find_dev(s.st_dev));
-			exit(0);
-		}
-		usage();
-	}
-
-	if (argc > 4)
-		usage();
-
-	/* Ancient garbage.. */
-	offset = DEFAULT_OFFSET-cmd*2;
-	if (newoffset >= 0)
-		offset = newoffset;
-	if (argc == 4)
-		offset = atoi(argv[3]);
-
-	have_val = 0;
-
-	if (argc >= 3) {
-		if (cmd == RDEV) {
-			if (isdigit(*argv[2])) {
-				/* earlier: specify offset */
-				/* now: specify major,minor */
-				char *p;
-				unsigned int ma,mi;
-				if ((p = strchr(argv[2], ',')) == NULL)
-					die(_("missing comma"));
-				ma = atoi(argv[2]);
-				mi = atoi(p+1);
-				val = ((ma<<8) | mi);
-			} else {
-				char *device = argv[2];
-				if (stat(device,&s) < 0)
-					die(device);
-				val = s.st_rdev;
-			}
-		} else {
-			val = atoi(argv[2]);
-		}
-		have_val = 1;
-	}
-
-	if (have_val) {
-		if ((image = open(argv[1],O_WRONLY)) < 0) die(argv[1]);
-		if (lseek(image,offset,0) < 0) die("lseek");
-		if (write(image,(char *)&val,2) != 2) die(argv[1]);
-		if (close(image) < 0) die("close");
-	} else {
-		if ((image = open(argv[1],O_RDONLY)) < 0) die(argv[1]);
-		if (lseek(image,offset,0) < 0) die("lseek");
-		dev_nr = 0;
-		if (read(image,(char *)&dev_nr,2) != 2) die(argv[1]);
-		if (close(image) < 0) die("close");
-		fputs(desc[cmd], stdout);
-		if (cmd == RDEV)
-			printf(" %s\n", find_dev(dev_nr));
-		else
-			printf(" %d\n", dev_nr);
-	}
-	return 0;
-}
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 619cf422..00ad5b76 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, PACKAGE_STRING);
+  printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
 }
 
 static void *
@@ -256,7 +256,7 @@ main (int argc, char ** argv) {
       status = 0xdeadbeef;
       retval = ioctl(fd, LPGETSTATUS - offset, &status);
       if (retval < 0)
-      	perror("LPGETSTATUS error");
+	perror(_("LPGETSTATUS error"));
       else {
         if (status == 0xdeadbeef)	/* a few 1.1.7x kernels will do this */
           status = retval;
@@ -271,7 +271,7 @@ main (int argc, char ** argv) {
     } else
 #endif /* LPGETSTATUS */
     if (ioctl(fd, cmds->op - offset, cmds->val) < 0) {
-      perror("tunelp: ioctl");
+      perror(_("tunelp: ioctl failed"));
     }
     cmdst = cmds;
     cmds = cmds->next;
diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index f52a6868..94f6521e 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -11,6 +11,7 @@ TS_HELPER_MD5="$TS_TOPDIR/helpers/test_md5"
 
 TS_HELPER_ISMOUNTED="$TOPDIR/lib/test_ismounted"
 TS_HELPER_STRTOSIZE="$TOPDIR/lib/test_strtosize"
+TS_HELPER_CPUSET="$TOPDIR/lib/test_cpuset"
 
 # TODO: use partx
 TS_HELPER_PARTITIONS="$TOPDIR/shlibs/blkid/samples/partitions"
diff --git a/tests/expected/blkid/low-probe-ddf-raid b/tests/expected/blkid/low-probe-ddf-raid
index 08329501..7956dcd0 100644
--- a/tests/expected/blkid/low-probe-ddf-raid
+++ b/tests/expected/blkid/low-probe-ddf-raid
@@ -1,5 +1,5 @@
 ID_FS_TYPE=ddf_raid_member
 ID_FS_USAGE=raid
-ID_FS_UUID=8Z_I__B_8Z_I_e_I_q_I____
-ID_FS_UUID_ENC=8Z\xb0I\x95\x10B\x028Z\xb0I\xc8e\xb0I\xb8q\xb0I\xff\xff\xff\xff
-ID_FS_VERSION=02.00.00
+ID_FS_UUID=Linux-MDޭ__
+ID_FS_UUID_ENC=Linux-MDޭ\xbe\xef
+ID_FS_VERSION=01.02.00
diff --git a/tests/expected/blkid/low-probe-exfat b/tests/expected/blkid/low-probe-exfat
new file mode 100644
index 00000000..b9defbdf
--- /dev/null
+++ b/tests/expected/blkid/low-probe-exfat
@@ -0,0 +1,7 @@
+ID_FS_LABEL=Новый_том
+ID_FS_LABEL_ENC=Новый\x20том
+ID_FS_TYPE=exfat
+ID_FS_USAGE=filesystem
+ID_FS_UUID=9C23-8877
+ID_FS_UUID_ENC=9C23-8877
+ID_FS_VERSION=1.0
diff --git a/tests/expected/blkid/low-probe-nilfs2 b/tests/expected/blkid/low-probe-nilfs2
new file mode 100644
index 00000000..c6c9cab1
--- /dev/null
+++ b/tests/expected/blkid/low-probe-nilfs2
@@ -0,0 +1,7 @@
+ID_FS_LABEL=test-nilfs2
+ID_FS_LABEL_ENC=test-nilfs2
+ID_FS_TYPE=nilfs2
+ID_FS_USAGE=filesystem
+ID_FS_UUID=524025fb-6d31-40e6-baad-1db36cfdf806
+ID_FS_UUID_ENC=524025fb-6d31-40e6-baad-1db36cfdf806
+ID_FS_VERSION=2
diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index d770a741..f1d4cbbb 100644
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -6,14 +6,6 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-WARNING: DOS-compatible mode is deprecated. It's strongly recommended to
-         switch off the mode (command 'c') and change display units to
-         sectors (command 'u').
-
-Command (m for help): DOS Compatibility flag is not set
-
-Command (m for help): Changing display/entry units to sectors
-
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
@@ -53,7 +45,6 @@ ID_FS_VERSION=0.90.0
 ID_PART_ENTRY_NUMBER=1
 ID_PART_ENTRY_SCHEME=dos
 ID_PART_ENTRY_TYPE=0x83
-ID_PART_ENTRY_TYPE_ENC=0x83
 Probe second RAID member
 ID_FS_TYPE=linux_raid_member
 ID_FS_USAGE=raid
@@ -63,4 +54,3 @@ ID_FS_VERSION=0.90.0
 ID_PART_ENTRY_NUMBER=2
 ID_PART_ENTRY_SCHEME=dos
 ID_PART_ENTRY_TYPE=0x83
-ID_PART_ENTRY_TYPE_ENC=0x83
diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index 670a6023..32281c61 100644
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -8,14 +8,6 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-WARNING: DOS-compatible mode is deprecated. It's strongly recommended to
-         switch off the mode (command 'c') and change display units to
-         sectors (command 'u').
-
-Command (m for help): DOS Compatibility flag is not set
-
-Command (m for help): Changing display/entry units to sectors
-
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 9613e176..7be7c039 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -10,28 +10,20 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-WARNING: DOS-compatible mode is deprecated. It's strongly recommended to
-         switch off the mode (command 'c') and change display units to
-         sectors (command 'u').
-
-Command (m for help): DOS Compatibility flag is not set
-
-Command (m for help): Changing display/entry units to sectors
-
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (2048-102399, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (22528-102399, default 22528): Using default value 22528
+Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (43008-102399, default 43008): Using default value 43008
+Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
 Command (m for help): Command action
    e   extended
diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 95e3bd9b..51e75f95 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -10,28 +10,20 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-WARNING: DOS-compatible mode is deprecated. It's strongly recommended to
-         switch off the mode (command 'c') and change display units to
-         sectors (command 'u').
-
-Command (m for help): DOS Compatibility flag is not set
-
-Command (m for help): Changing display/entry units to sectors
-
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (7-102399, default 7): Using default value 7
+Partition number (1-4, default 1): First sector (7-102399, default 7): Using default value 7
 Last sector, +sectors or +size{K,M,G} (7-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (20487-102399, default 20487): Using default value 20487
+Partition number (1-4, default 2): First sector (20487-102399, default 20487): Using default value 20487
 Last sector, +sectors or +size{K,M,G} (20487-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (40967-102399, default 40967): Using default value 40967
+Partition number (1-4, default 3): First sector (40967-102399, default 40967): Using default value 40967
 Last sector, +sectors or +size{K,M,G} (40967-102399, default 102399): 
 Command (m for help): Command action
    e   extended
diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 026b94a6..db43ec6d 100644
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -10,23 +10,15 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-WARNING: DOS-compatible mode is deprecated. It's strongly recommended to
-         switch off the mode (command 'c') and change display units to
-         sectors (command 'u').
-
-Command (m for help): DOS Compatibility flag is not set
-
-Command (m for help): Changing display/entry units to sectors
-
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (2048-102399, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (43008-102399, default 43008): Using default value 43008
+Partition number (1-4, default 2): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using default value 102399
 
 Command (m for help): 
@@ -60,23 +52,15 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-WARNING: DOS-compatible mode is deprecated. It's strongly recommended to
-         switch off the mode (command 'c') and change display units to
-         sectors (command 'u').
-
-Command (m for help): DOS Compatibility flag is not set
-
-Command (m for help): Changing display/entry units to sectors
-
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (2048-100095, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-100095, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-100095, default 100095): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (22528-100095, default 22528): Using default value 22528
+Partition number (1-4, default 2): First sector (22528-100095, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095): 
 Command (m for help): 
 Disk /dev/md8: 51 MB, 51249152 bytes
diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index e984d6bc..c940f806 100644
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -6,28 +6,20 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-WARNING: DOS-compatible mode is deprecated. It's strongly recommended to
-         switch off the mode (command 'c') and change display units to
-         sectors (command 'u').
-
-Command (m for help): DOS Compatibility flag is not set
-
-Command (m for help): Changing display/entry units to sectors
-
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (2048-102399, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (22528-102399, default 22528): Using default value 22528
+Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (43008-102399, default 43008): Using default value 43008
+Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
 Command (m for help): Command action
    e   extended
diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 91cd1b4f..f37b5a3b 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -6,28 +6,20 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-WARNING: DOS-compatible mode is deprecated. It's strongly recommended to
-         switch off the mode (command 'c') and change display units to
-         sectors (command 'u').
-
-Command (m for help): DOS Compatibility flag is not set
-
-Command (m for help): Changing display/entry units to sectors
-
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (2048-102399, default 2048): Using default value 2048
+Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (22528-102399, default 22528): Using default value 22528
+Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
 Command (m for help): Command action
    e   extended
    p   primary partition (1-4)
-Partition number (1-4): First sector (43008-102399, default 43008): Using default value 43008
+Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
 Command (m for help): Command action
    e   extended
diff --git a/tests/expected/ipcs/headers b/tests/expected/ipcs/headers
index 155d3080..298d8c93 100644
--- a/tests/expected/ipcs/headers
+++ b/tests/expected/ipcs/headers
@@ -1,7 +1,7 @@
 test: shm headers
 ------ Shared Memory Attach/Detach/Change Times --------
 shmid      owner      attached             detached             changed             
------- Shared Memory Creator/Last-op --------
+------ Shared Memory Creator/Last-op PIDs --------
 shmid      owner      cpid       lpid      
 ------ Shared Memory Segment Creators/Owners --------
 shmid      perms      cuid       cgid       uid        gid       
@@ -13,10 +13,10 @@ test: mesg headers
 msqid    owner      send                 recv                 change              
 ------ Message Queues PIDs --------
 msqid      owner      lspid      lrpid     
------- Message Queues: Creators/Owners --------
+------ Message Queues Creators/Owners --------
 msqid      perms      cuid       cgid       uid        gid       
------- Messages: Limits --------
------- Messages: Status --------
+------ Messages Limits --------
+------ Messages Status --------
 
 test: sem headers
 ------ Semaphore Operation/Change Times --------
@@ -43,7 +43,7 @@ semid    owner      last-op                    last-changed
 --
 ------ Message Queues Send/Recv/Change Times --------
 msqid    owner      send                 recv                 change              
------- Shared Memory Creator/Last-op --------
+------ Shared Memory Creator/Last-op PIDs --------
 shmid      owner      cpid       lpid      
 --
 ------ Message Queues PIDs --------
@@ -54,11 +54,11 @@ shmid      perms      cuid       cgid       uid        gid
 ------ Semaphore Arrays Creators/Owners --------
 semid      perms      cuid       cgid       uid        gid       
 --
------- Message Queues: Creators/Owners --------
+------ Message Queues Creators/Owners --------
 msqid      perms      cuid       cgid       uid        gid       
 ------ Shared Memory Limits --------
 ------ Semaphore Limits --------
------- Messages: Limits --------
+------ Messages Limits --------
 ------ Shared Memory Status --------
 ------ Semaphore Status --------
------- Messages: Status --------
+------ Messages Status --------
diff --git a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
index e38bf46d..f7a38445 100644
--- a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
+++ b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn
@@ -11,16 +11,19 @@ L1d cache:             16K
 L1i cache:             16K
 L2 cache:              256K
 L3 cache:              3072K
+NUMA node0 CPU(s):     4-7
+NUMA node1 CPU(s):     0-3
+NUMA node2 CPU(s):     
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
 # starting from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,0,,0,0,0,0
-1,1,1,0,,1,1,1,1
-2,2,2,0,,2,2,2,2
-3,3,3,0,,3,3,3,3
-4,4,4,1,,4,4,4,4
-5,5,5,1,,5,5,5,5
-6,6,6,1,,6,6,6,6
-7,7,7,1,,7,7,7,7
+0,0,0,1,,0,0,0,0
+1,1,1,1,,1,1,1,1
+2,2,2,1,,2,2,2,2
+3,3,3,1,,3,3,3,3
+4,4,4,0,,4,4,4,4
+5,5,5,0,,5,5,5,5
+6,6,6,0,,6,6,6,6
+7,7,7,0,,7,7,7,7
diff --git a/tests/expected/lscpu/lscpu-ia64-hprx1620 b/tests/expected/lscpu/lscpu-ia64-hprx1620
index 081d8788..4812be6a 100644
--- a/tests/expected/lscpu/lscpu-ia64-hprx1620
+++ b/tests/expected/lscpu/lscpu-ia64-hprx1620
@@ -11,6 +11,7 @@ L1d cache:             16K
 L1i cache:             16K
 L2 cache:              256K
 L3 cache:              3072K
+NUMA node0 CPU(s):     0,1
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
diff --git a/tests/expected/lscpu/lscpu-ia64-pg0 b/tests/expected/lscpu/lscpu-ia64-pg0
index 7600b808..22c4539c 100644
--- a/tests/expected/lscpu/lscpu-ia64-pg0
+++ b/tests/expected/lscpu/lscpu-ia64-pg0
@@ -12,24 +12,26 @@ L1i cache:             16K
 L2d cache:             256K
 L2i cache:             1024K
 L3 cache:              6144K
+NUMA node0 CPU(s):     0-7
+NUMA node1 CPU(s):     8-15
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
 # starting from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i,L3
-0,0,0,0,,0,0,0,0,0
-1,1,0,0,,1,1,1,0,0
-2,2,1,0,,2,2,2,1,1
-3,3,1,0,,3,3,3,1,1
-4,4,2,0,,4,4,4,2,2
-5,5,2,0,,5,5,5,2,2
-6,6,3,0,,6,6,6,3,3
-7,7,3,0,,7,7,7,3,3
-8,8,4,1,,8,8,8,4,4
-9,9,4,1,,9,9,9,4,4
-10,10,5,1,,10,10,10,5,5
-11,11,5,1,,11,11,11,5,5
-12,12,6,1,,12,12,12,6,6
-13,13,6,1,,13,13,13,6,6
-14,14,7,1,,14,14,14,7,7
-15,15,7,1,,15,15,15,7,7
+0,0,0,0,,0,0,0,,
+1,1,0,0,,1,1,1,,
+2,2,1,0,,2,2,2,,
+3,3,1,0,,3,3,3,,
+4,4,2,0,,4,4,4,,
+5,5,2,0,,5,5,5,,
+6,6,3,0,,6,6,6,,
+7,7,3,0,,7,7,7,,
+8,8,4,1,,8,8,8,,
+9,9,4,1,,9,9,9,,
+10,10,5,1,,10,10,10,,
+11,11,5,1,,11,11,11,,
+12,12,6,1,,12,12,12,,
+13,13,6,1,,13,13,13,,
+14,14,7,1,,14,14,14,,
+15,15,7,1,,15,15,15,,
diff --git a/tests/expected/lscpu/lscpu-x86_64-dellr710 b/tests/expected/lscpu/lscpu-x86_64-dellr710
new file mode 100644
index 00000000..43679dc4
--- /dev/null
+++ b/tests/expected/lscpu/lscpu-x86_64-dellr710
@@ -0,0 +1,39 @@
+CPU op-mode(s):        32-bit, 64-bit
+CPU(s):                16
+Thread(s) per core:    2
+Core(s) per socket:    4
+CPU socket(s):         2
+NUMA node(s):          2
+Vendor ID:             GenuineIntel
+CPU family:            6
+Model:                 26
+Stepping:              5
+CPU MHz:               2527.073
+Virtualization:        VT-x
+L1d cache:             32K
+L1i cache:             32K
+L2 cache:              256K
+L3 cache:              8192K
+NUMA node0 CPU(s):     0,2,4,6,8,10,12,14
+NUMA node1 CPU(s):     1,3,5,7,9,11,13,15
+
+# The following is the parsable format, which can be fed to other
+# programs. Each different item in every column has an unique ID
+# starting from zero.
+# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
+0,0,0,0,,0,0,0,0
+1,1,1,1,,1,1,1,1
+2,2,0,0,,2,2,2,0
+3,3,1,1,,3,3,3,1
+4,4,0,0,,4,4,4,0
+5,5,1,1,,5,5,5,1
+6,6,0,0,,6,6,6,0
+7,7,1,1,,7,7,7,1
+8,0,0,0,,0,0,0,0
+9,1,1,1,,1,1,1,1
+10,2,0,0,,2,2,2,0
+11,3,1,1,,3,3,3,1
+12,4,0,0,,4,4,4,0
+13,5,1,1,,5,5,5,1
+14,6,0,0,,6,6,6,0
+15,7,1,1,,7,7,7,1
diff --git a/tests/expected/lscpu/lscpu-x86_64-hpdl585 b/tests/expected/lscpu/lscpu-x86_64-hpdl585
index 52bc8cb9..54a1a242 100644
--- a/tests/expected/lscpu/lscpu-x86_64-hpdl585
+++ b/tests/expected/lscpu/lscpu-x86_64-hpdl585
@@ -14,24 +14,28 @@ L1d cache:             512K
 L1i cache:             512K
 L2 cache:              512K
 L3 cache:              2048K
+NUMA node0 CPU(s):     0,4,8,12
+NUMA node1 CPU(s):     1,5,9,13
+NUMA node2 CPU(s):     2,6,10,14
+NUMA node3 CPU(s):     3,7,11,15
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
 # starting from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
 0,0,0,0,,0,0,0,0
-1,1,0,0,,1,1,1,1
-2,2,0,0,,2,2,2,2
-3,3,0,0,,3,3,3,3
-4,4,1,1,,4,4,4,4
+1,1,1,1,,1,1,1,1
+2,2,2,2,,2,2,2,2
+3,3,3,3,,3,3,3,3
+4,4,0,0,,4,4,4,4
 5,5,1,1,,5,5,5,5
-6,6,1,1,,6,6,6,6
-7,7,1,1,,7,7,7,7
-8,8,2,2,,8,8,8,8
-9,9,2,2,,9,9,9,9
+6,6,2,2,,6,6,6,6
+7,7,3,3,,7,7,7,7
+8,8,0,0,,8,8,8,8
+9,9,1,1,,9,9,9,9
 10,10,2,2,,10,10,10,10
-11,11,2,2,,11,11,11,11
-12,12,3,3,,12,12,12,12
-13,13,3,3,,13,13,13,13
-14,14,3,3,,14,14,14,14
+11,11,3,3,,11,11,11,11
+12,12,0,0,,12,12,12,12
+13,13,1,1,,13,13,13,13
+14,14,2,2,,14,14,14,14
 15,15,3,3,,15,15,15,15
diff --git a/tests/expected/lscpu/lscpu-x86_64-ibme326m b/tests/expected/lscpu/lscpu-x86_64-ibme326m
index a373aacc..ccc64a07 100644
--- a/tests/expected/lscpu/lscpu-x86_64-ibme326m
+++ b/tests/expected/lscpu/lscpu-x86_64-ibme326m
@@ -12,6 +12,7 @@ CPU MHz:               1995.058
 L1d cache:             1024K
 L1i cache:             1024K
 L2 cache:              1024K
+NUMA node0 CPU(s):     0,1
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
diff --git a/tests/expected/lscpu/lscpu-x86_64-necem14 b/tests/expected/lscpu/lscpu-x86_64-necem14
index 0cde9c31..c823f7e7 100644
--- a/tests/expected/lscpu/lscpu-x86_64-necem14
+++ b/tests/expected/lscpu/lscpu-x86_64-necem14
@@ -11,6 +11,7 @@ Stepping:              3
 CPU MHz:               3790.599
 L1d cache:             16K
 L2 cache:              2048K
+NUMA node0 CPU(s):     0,1
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
diff --git a/tests/expected/schedutils/cpuset b/tests/expected/schedutils/cpuset
new file mode 100644
index 00000000..10e17606
--- /dev/null
+++ b/tests/expected/schedutils/cpuset
@@ -0,0 +1,24 @@
+masks:
+0x00000001      =               1 [0]
+0x00000002      =               2 [1]
+0x00000003      =               3 [0,1]
+0x00000004      =               4 [2]
+0x00000005      =               5 [0,2]
+0x00000006      =               6 [1,2]
+0x00000007      =               7 [0-2]
+0x00000008      =               8 [3]
+0x00000009      =               9 [0,3]
+0x00005555      =            5555 [0,2,4,6,8,10,12,14]
+0x00007777      =            7777 [0-2,4-6,8-10,12-14]
+strings:
+0               =               1 [0]
+1               =               2 [1]
+0,1             =               3 [0,1]
+2               =               4 [2]
+0,2             =               5 [0,2]
+1,2             =               6 [1,2]
+0-2             =               7 [0-2]
+3               =               8 [3]
+0,3             =               9 [0,3]
+0,2,4,6,8,10,12,14 =            5555 [0,2,4,6,8,10,12,14]
+0-2,4-6,8-10,12-14 =            7777 [0-2,4-6,8-10,12-14]
diff --git a/tests/ts/blkid/images-fs/exfat.img.bz2 b/tests/ts/blkid/images-fs/exfat.img.bz2
new file mode 100644
index 00000000..f96c3f06
--- /dev/null
+++ b/tests/ts/blkid/images-fs/exfat.img.bz2
diff --git a/tests/ts/blkid/images-fs/nilfs2.img.bz2 b/tests/ts/blkid/images-fs/nilfs2.img.bz2
new file mode 100644
index 00000000..a9762eb1
--- /dev/null
+++ b/tests/ts/blkid/images-fs/nilfs2.img.bz2
diff --git a/tests/ts/blkid/images-fs/tuxonice.img.bz2 b/tests/ts/blkid/images-fs/tuxonice.img.bz2
index c47ab3e8..a70c95ad 100644
--- a/tests/ts/blkid/images-fs/tuxonice.img.bz2
+++ b/tests/ts/blkid/images-fs/tuxonice.img.bz2
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index 1d55f6bb..909edd03 100755
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -40,8 +40,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 4589dcff..0539e018 100755
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -46,8 +46,6 @@ ts_log "Create RAID device"
 
 ts_log "Create partitions on RAID device"
 $TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index eb85c55c..99b039e2 100755
--- a/tests/ts/cramfs/mkfs
+++ b/tests/ts/cramfs/mkfs
@@ -71,7 +71,7 @@ ts_device_has "TYPE" "cramfs" $DEVICE
 [  "$?" == "0" ] || ts_die "Cannot found cramfs on $DEVICE" $DEVICE
 
 ts_log "mount the image"
-$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
+$TS_CMD_MOUNT -r -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
 
 # check it
 ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index 329d4308..956b015d 100755
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -43,8 +43,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index 1963dd09..6ffd47eb 100755
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -43,8 +43,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index ed0ec156..d2c5c753 100755
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -44,8 +44,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
@@ -74,8 +72,6 @@ MD_DEVICE=/dev/${MD_DEVNAME}
 
 ts_log "Create partitions (MD)"
 $TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512
index 70f0805e..f78feba5 100755
--- a/tests/ts/fdisk/align-512-512
+++ b/tests/ts/fdisk/align-512-512
@@ -31,8 +31,6 @@ DEVICE=$(ts_device_init 50)
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 63801d23..207ec178 100755
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -43,8 +43,6 @@ DEVICE="/dev/${DEVNAME}"
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
-c
-u
 n
 p
 1
diff --git a/tests/ts/fdisk/doslabel b/tests/ts/fdisk/doslabel
index 762cdaac..209a7b3e 100755
--- a/tests/ts/fdisk/doslabel
+++ b/tests/ts/fdisk/doslabel
@@ -43,57 +43,57 @@ ts_image_md5sum >> $TS_OUTPUT 2>&1
 # ID will be random and will screw up md5's
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
-	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	 | $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Create primary partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Set partition type"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CHANGE_PARTTYPE}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Set primary partition active"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_SET_ACTIVE}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Re-create primary partition"
 echo -e "${FDISK_CMD_INIT}d\n${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Create extended partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \
-	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	$TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Create logical partitions"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Delete logical partitions"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Create another logical partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Delete primary partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Delete extended partition"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \
-	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput
index 9d5c4762..ceb6102c 100755
--- a/tests/ts/fdisk/oddinput
+++ b/tests/ts/fdisk/oddinput
@@ -28,12 +28,12 @@ ts_image_md5sum >> $TS_OUTPUT 2>&1
 
 ts_log "Empty image listing" # this should report empty partition table
 # TEST_IMAGE_NAME has absolute path, and is by definition different on each computer, we need to sed it away
-$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} 2>&1 | sed -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" >> $TS_OUTPUT
+$TS_CMD_FDISK -c=dos -u=cylinders -l ${TEST_IMAGE_NAME} 2>&1 | sed -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" >> $TS_OUTPUT
 
 ts_log "Nonexistant file" # this originally does absolutely nothing
-$TS_CMD_FDISK -l _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>&1
+$TS_CMD_FDISK -c=dos -u=cylinders -l _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>&1
 
 ts_log "Too small file" # same here
-$TS_CMD_FDISK -l $TS_TOPDIR/expected/fdisk/oddinput.toosmall >> $TS_OUTPUT 2>&1
+$TS_CMD_FDISK -c=dos -u=cylinders -l $TS_TOPDIR/expected/fdisk/oddinput.toosmall >> $TS_OUTPUT 2>&1
 
 ts_finalize
diff --git a/tests/ts/lscpu/dumps/x86_64-dellr710.tar.gz b/tests/ts/lscpu/dumps/x86_64-dellr710.tar.gz
new file mode 100644
index 00000000..2c163816
--- /dev/null
+++ b/tests/ts/lscpu/dumps/x86_64-dellr710.tar.gz
diff --git a/tests/ts/schedutils/cpuset b/tests/ts/schedutils/cpuset
new file mode 100755
index 00000000..6ad240dc
--- /dev/null
+++ b/tests/ts/schedutils/cpuset
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+#
+# This file is part of util-linux-ng.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This 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.
+#
+
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="cpuset"
+
+. $TS_TOPDIR/functions.sh
+ts_init "$*"
+
+MASKS=" 0x00000001 \
+	0x00000002 \
+	0x00000003 \
+	0x00000004 \
+	0x00000005 \
+	0x00000006 \
+	0x00000007 \
+	0x00000008 \
+	0x00000009 \
+	0x00005555 \
+	0x00007777"
+
+RANGES="0 \
+	1 \
+	0,1 \
+	2 \
+	0,2 \
+	1,2 \
+	0-2 \
+	3 \
+	0,3 \
+	0,2,4,6,8,10,12,14 \
+	0-2,4-6,8-10,12-14"
+
+ts_log "masks:"
+for i in $MASKS; do
+	$TS_HELPER_CPUSET --mask $i >> $TS_OUTPUT
+done
+
+ts_log "strings:"
+for i in $RANGES; do
+	$TS_HELPER_CPUSET --range $i >> $TS_OUTPUT
+done
+
+ts_finalize
diff --git a/text-utils/more.c b/text-utils/more.c
index 2eedfbe1..20efc28d 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -62,6 +62,10 @@
 #include <regex.h>
 #undef _REGEX_RE_COMP
 
+#ifndef XTABS
+#define XTABS TAB3
+#endif
+
 #define VI		"vi"	/* found on the user's path */
 
 #define Fopen(s,m)	(Currline = 0,file_pos=0,fopen(s,m))