158 files changed, 29997 insertions, 17609 deletions
diff --git a/HISTORY b/HISTORY
index 9c6099de28..265d02f3e9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,76 @@
+util-linux 2.10s:
+
+* Danish messages (Claus Hindsgaul)
+* fixes to make gcc happy (Joseph S. Myers)
+* fix for more on parisc (Richard Hirst)
+* change rdev to search subdirectories of /dev (Paul Clements)
+* ul fix (Masao Kawamura) - set columns correctly
+* cal fix (Brendan Kehoe) - don't overflow weekday array in Gaelic
+* fdisk fix (niles@scyld.com) - flush stdout
+* fdisk fix - don't forget to write out empty label
+* login: make default tty mode 0600
+* script: refuse to write typescript if that is a symlink
+* script: accept -V to output version
+* whereis: also search /usr/share/man.
+* hwclock: improve locale handling
+* hwclock: fix for Nautilus (Neoklis Kyriazis)
+* isosize: new
+
+util-linux 2.10r:
+
+* mount: support mount by uuid or label for xfs (Nathan Scott)
+* mount: added probe for minix on bigendian systems (Nathan Scott)
+* mount: added probes for cramfs, hfs, hpfs and adfs (Sepp Wijnands)
+* mount: change setup; let umount remove at most one line from /etc/mtab
+* mount: improve man page
+* more, col, colcrt, colrm, column, ul: nls improvements (Masao Kawamura)
+
+util-linux 2.10q:
+
+* mount: accept nonnumeric uid= and gid= options
+* write and wall: security improvement
+* fixed fdformat flaw (Werner Almesberger)
+* use right mountport upon umount (Glenn Lingle)
+* simpleinit / need / initctl stuff (Richard Gooch)
+* Portuguese messages (Rodrigo Stulzer Lopes et al.)
+
+util-linux 2.10p:
+
+* mount: don't set up a loop file with -o loop,remount (Marc Mutz)
+* fdisk: changes for sectorsize different from 512
+* more: standout fix (Paul Vojta)
+* more: improve usage message (Lincoln Myers)
+* logger: Added -d option to use datagrams (Gerwin Pfab)
+* cal: Added -3 option to also print prev/next month (Michael Charles Pruznick)
+* French messages (Christophe Merlet)
+* Japanese messages (Daisuke Yamashita)
+
+util-linux 2.10o:
+
+* fdformat: fixed to work with kernel 2.4.0test6 (Marek Wojtowicz)
+* losetup: also return status when only showing loop device status (ewt)
+* mount: do not retry ro if mount was ro; improve error message
+* login: not installed suid
+* getopt: by default install aux files in /usr/share/misc
+
+util-linux 2.10n:
+
+* added blockdev.8
+* change to elvtune (andrea)
+* fixed overrun in agetty (vii@penguinpowered.com)
+* shutdown: prefer umounting by mount point (rgooch)
+* fdisk: added plan9
+* fdisk: remove empty links in chain of extended partitions
+* mount: define ALWAYS_STAT
+* mount: add replace, after, before, over, bind
+* umount: also free loop device when not writing mtab
+* lomount: try both /dev/loopN and /dev/loop/N
+* hwclock: handle both /dev/rtc and /dev/efirtc (Bill Nottingham)
+* script: added -f (flush) option (Ivan Schreter)
+* script: added -q (quiet) option (Per Andreas Buer)
+* getopt: updated to version 1.1.0 (Frodo Looijaard)
+* Czech messages (Jiri Pavlovsky)
+
 util-linux 2.10m:
 
 * chfn fix when PAM is used (Martin-D. Lacasse)
@@ -6,6 +79,7 @@ util-linux 2.10m:
 * mount new option -l: also print label when listing mounts
 * mount add heuristic for xfs (Martin K. Petersen)
 * mount UUID and label cache (Erik Troan)
+* mount improve check for `already mounted' in case of label or uuid
 * fdisk partition names more devfs-friendly
 * fdisk bsdlabel large disk support
 * setterm.1: options documented (Colin Watson)
diff --git a/INSTALL b/INSTALL
index 2f960b1f09..fe3359fca5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -37,6 +37,10 @@ To install from source:
 
 If you have compilation problems: tell util-linux@math.uio.no about it.
 
+Compilation will fail on a minix filesystem with 14-byte filenames
+since for example mount_guess_fstype.h, mount_guess_fstype.c and
+mount_guess_fstype.o will be the same file. (However, 30 bytes suffice.)
+
 A glibc header bug causes
   /usr/include/bits/string2.h:419: warning: pointer of type `void *'
     used in arithmetic
@@ -50,6 +54,7 @@ broken.
 
 Several old libc have complaints like
   /usr/include/sys/syslog.h:71: warning: missing braces around initializer
+  /usr/include/sys/syslog.h:87: warning: aggregate has a partly bracketed initializer
   /usr/include/rpc/xdr.h:103: warning: function declaration isn't a prototype
   /usr/include/rpc/auth.h:86: warning: function declaration isn't a prototype
   /usr/include/rpc/svc.h:79: warning: function declaration isn't a prototype
diff --git a/MAINTAINER b/MAINTAINER
index 5cd7a84e91..7fdaafc126 100644
--- a/MAINTAINER
+++ b/MAINTAINER
@@ -1,2 +1,4 @@
-Maintainer: Andries Brouwer (aeb@cwi.nl)
+Maintainer: Andries Brouwer <aeb@cwi.nl>
 Maintainer address: util-linux@math.uio.no
+
+Maintainer of simpleinit: Richard Gooch <rgooch@atnf.csiro.au>
diff --git a/MCONFIG b/MCONFIG
index f1f0e3d076..a97f259d84 100644
--- a/MCONFIG
+++ b/MCONFIG
@@ -7,11 +7,11 @@
 #  - set USE_TTY_GROUP=no
 #  - define DESTDIR
 
-# Select for CPU one of intel, alpha, sparc, arm, m68k, mips
-CPU=$(shell uname -m | sed 's/i.86/intel/;s/arm.*/arm/')
-
-# define where is locale directrory (default /usr/share/locale)
-LOCALEDIR=/usr/share/locale
+# Select for ARCH one of intel, alpha, sparc, arm, m68k, mips
+# Select for CPU i386 if the binaries must be able to run on an intel 386
+# (by default i486 code is generated, see below)
+CPU=$(shell uname -m)
+ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
 
 # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
 # will use PAM for authentication. Additionally, passwd will not be
@@ -65,6 +65,12 @@ HAVE_GETTY=no
 # properly.]
 USE_TTY_GROUP=yes
 
+# If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
+# to the current user, allowing her to make a screendump and do other
+# nifty things on the console, but also allowing him to keep an open
+# file descriptor after logging out to trick the next user.
+ALLOW_VCS_USE=yes
+
 # If HAVE_RESET is set to "yes", then reset won't be installed.  The version
 # of reset that comes with the ncurses package is less aggressive.
 HAVE_RESET=yes
@@ -81,40 +87,27 @@ HAVE_TSORT=no
 # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
 HAVE_FDUTILS=no
 
-# Get CC from environment if defined
-ifeq "$(CC)" ""
-  CC=		gcc
-endif
-
 # Different optimizations for different cpus.
-# Change the -m486 part if you have a 386.
-ifeq "$(CPU)" "intel"
-  OPT=		-pipe -O2 -m486 -fomit-frame-pointer
+ifeq "$(ARCH)" "intel"
+  ifeq "$(CPU)" "i386"
+    OPT=	-pipe -O2 -m386 -fomit-frame-pointer
+  else
+    OPT=	-pipe -O2 -m486 -fomit-frame-pointer
+  endif
 else 
-  ifeq "$(CPU)" "arm"
+  ifeq "$(ARCH)" "arm"
     OPT=	-pipe -O2 -fsigned-char -fomit-frame-pointer
   else
     OPT=	-O2 -fomit-frame-pointer
   endif
 endif
 
-LDFLAGS   = -s
-
 WARNFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes
 
 LIB=../lib
 
 ERR_O=$(LIB)/err.o
 
-CFLAGS    = $(OPT) -I. -I$(LIB) $(WARNFLAGS) \
-			$(CURSESFLAGS) $(SLANGFLAGS) \
-			$(EXTRACFLAGS) \
-			-DSBINDIR=\"$(SBINDIR)\" \
-			-DUSRSBINDIR=\"$(USRSBINDIR)\" \
-			-DLOGDIR=\"$(LOGDIR)\" \
-			-DVARPATH=\"$(VARPATH)\" \
-			-DLOCALEDIR=\"$(LOCALEDIR)\"
-
 # Set HAVE_SLANG to yes if you have slang (and prefer to use that for cfdisk)
 # (If neither HAVE_NCURSES nor HAVE_SLANG is defined, cfdisk is not made.)
 # HAVE_SLANG=yes
@@ -125,7 +118,6 @@ CFLAGS    = $(OPT) -I. -I$(LIB) $(WARNFLAGS) \
 #   (no extra definition required).
 LIBSLANG=-lslang
 
-
 DEVDIR=		$(DESTDIR)/dev
 ETCDIR=		$(DESTDIR)/etc
 SBINDIR=	$(DESTDIR)/sbin
@@ -133,6 +125,8 @@ USRSBINDIR=	$(DESTDIR)/usr/sbin
 USRLIBDIR=      $(DESTDIR)/usr/lib
 USRBINDIR=      $(DESTDIR)/usr/bin
 USRGAMESDIR=    $(DESTDIR)/usr/games
+USRSHAREMISCDIR=$(DESTDIR)/usr/share/misc
+LOCALEDIR=      $(DESTDIR)/usr/share/locale
 BINDIR=         $(DESTDIR)/bin
 VARPATH=	$(DESTDIR)/var
 LOGDIR=		$(DESTDIR)/var/log
@@ -153,8 +147,8 @@ FSCKDIR=	$(SBINDIR)
 # Directory for passwd
 PASSWDDIR=	$(USRBINDIR)
 
-# Directory for help file for more.  Some may want /usr/share/misc .
-MOREHELPDIR=	$(USRLIBDIR)
+# Directory for help file for more.  Used to be /usr/lib.
+MOREHELPDIR=	$(USRSHAREMISCDIR)
 
 # Modes
 DIRMODE=	755
@@ -172,6 +166,15 @@ INSTALLMAN=	$(INSTALL) -m $(MANMODE)
 INSTALLDAT=	$(INSTALL) -m $(DATMODE)
 INSTALLSUID=    $(INSTALL) -m $(SUIDMODE) -o root
 
+CFLAGS    := $(CFLAGS) $(OPT) -I$(LIB) $(WARNFLAGS) \
+			$(CURSESFLAGS) $(SLANGFLAGS) \
+			-DSBINDIR=\"$(SBINDIR)\" \
+			-DUSRSBINDIR=\"$(USRSBINDIR)\" \
+			-DLOGDIR=\"$(LOGDIR)\" \
+			-DVARPATH=\"$(VARPATH)\" \
+			-DLOCALEDIR=\"$(LOCALEDIR)\"
+
+
 %.o: %.c
 	$(CC) -c $(CFLAGS) $< -o $@
 
diff --git a/Makefile b/Makefile
index b67fb3d4b0..0d68c83336 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,14 @@ include ./MCONFIG
 
 SUBDIRS=po \
 	lib \
-	getopt-1.0.3b \
+	getopt-1.1.0a \
 	disk-utils \
 	games \
 	login-utils \
 	misc-utils \
 	mount \
 	fdisk \
-	clock \
+	hwclock \
 	sys-utils \
 	text-utils \
 	kbd
diff --git a/README b/README
new file mode 100644
index 0000000000..48a0b13a16
--- /dev/null
+++ b/README
@@ -0,0 +1,9 @@
+util-linux is a random collection of Linux utilities
+
+The stuff in the subdirectories mount, fdisk, disk-utils, text-utils,
+misc-utils, sys-utils, getopt-* should be rather distribution-neutral,
+and installing it does no harm.
+On the other hand, the stuff in login-utils defines initial boot-time
+stuff, things that are done in different ways by different distributions.
+If you install it, your machine may not boot anymore.
+No RPMs are provided - get yours from your distributor.
diff --git a/VERSION b/VERSION
index d877938d22..77744d0d22 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.10m
+2.10s
diff --git a/configure b/configure
index 4ac10b0463..fd5ab6422f 100755
--- a/configure
+++ b/configure
@@ -3,27 +3,35 @@
 #
 # We need to find out the following things:
 #
-#  1. For mount/nfsmount.c: is inet_aton() available?
-#  2. For fdisk/fdisksunlabel.c: is there a <scsi/scsi.h>?
-#     For fdisk/fdisk.c: is there a <linux/blkpg.h>?
-#  4. For sys-utils/cytune.c: do we need <linux/tqueue.h>?
-#  5. For sys-utils/kbd_rate.c: does <linux/kd.h> exist?
-#  6. For cfdisk, setterm, more, ul: do we have ncurses? How installed?
-#     For more: do we have libtermcap?
-#  7. For chfn, chsh, login, newgrp, passwd: do we need -lcrypt?
-#  8. For sln: does static compilation work?
-#  9. For lib/nls.h: do we have <locale.h>?
-# 10. For lib/nls.h: do we have <libintl.h> and gettext()?
-# 11. For xgettext: does it take the option --foreign-user?
-# 12. For cal.c: do we have <langinfo.h>?
-# 13. For err.c: do we have __progname?
-# 14. For script.c: do we have <pty.h> and openpty()?
-# 15. For lib/widechar.h: do we have wide character support?
-# 16. For clock/kd.c: do we have nanosleep()?
-# 17. For mkswap: do we have personality()?
-# 18. For pivot_root.c: does <linux/unistd.h> define __NR_pivot_root?
-# 19. For hwclock.c: does struct tm have a field tm_gmtoff?
-# 20. For nfsmount: does the output of rpcgen compile?
+# Existence of header files:
+# H1. For fdisksunlabel.c: is there a <scsi/scsi.h>?
+# H2. For fdisk.c: is there a <linux/blkpg.h>?
+# H3. For kbd_rate.c: does <linux/kd.h> exist?
+# H4. For nls.h: do we have <locale.h>?
+# H5. For cal.c: do we have <langinfo.h>?
+# H6. For mkswap.c: do we have <asm/page.h>?
+# H7. For nfsmount.h (nfsmount_xdr.c: int32_t): do we have <asm/types.h>?
+#
+# Existence of functions:
+# F1. For nfsmount.c: is inet_aton() available?
+# F2. For mkswap.c: is fsync() available?
+# F3. For agetty.c: is getdomainname() available?
+# F4. For hwclock/kd.c: do we have nanosleep()?
+# F5. For mkswap.c: do we have personality()?
+#
+#  1. For sys-utils/cytune.c: do we need <linux/tqueue.h>?
+#  2. For cfdisk, setterm, more, ul: do we have ncurses? How installed?
+#  3. For more: do we have libtermcap?
+#  4. For chfn, chsh, login, newgrp, passwd: do we need -lcrypt?
+#  5. For sln: does static compilation work?
+#  6. For lib/nls.h: do we have <libintl.h> and gettext()?
+#  7. For xgettext: does it take the option --foreign-user?
+#  8. For err.c: do we have __progname?
+#  9. For script.c: do we have <pty.h> and openpty()?
+# 10. For lib/widechar.h: do we have wide character support?
+# 11. For pivot_root.c: does <linux/unistd.h> define __NR_pivot_root?
+# 12. For hwclock.c: does struct tm have a field tm_gmtoff?
+# 13. For nfsmount: does the output of rpcgen compile?
 
 rm -f make_include defines.h
 
@@ -36,24 +44,13 @@ echo '#define UTIL_LINUX_VERSION "'$VERSION'"' > defines.h
 echo '#define util_linux_version "util-linux-'$VERSION'"' >> defines.h
 echo >> defines.h
 
-if test -z "$CC"
-then
-  if test "$RANDOM" = "$RANDOM"; then
-    # Plain old Bourne shell.
-    echo checking for gcc
-    test -z "$CC" -a -n "`gcc 2>&1`" && CC="gcc -O"
-  else
-    # ksh, bash or zsh.  ksh and zsh write "command not found" to stderr.
-    echo checking for gcc
-    test -z "$CC" && type gcc && CC="gcc -O"
-  fi
-else
-  echo "Using CC=\"$CC\""
-  echo
-fi
-
 CC=${CC-cc}
 CFLAGS=${CFLAGS-"-O"}
+LDFLAGS=${LDFLAGS-"-s"}
+echo CC=$CC >> make_include
+echo CFLAGS=$CFLAGS >> make_include
+echo LDFLAGS=$LDFLAGS >> make_include
+
 DEFS=
 LIBS=
 compile='$CC $CFLAGS $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1'
@@ -63,8 +60,80 @@ export COMPILE
 
 rm -f conftest.c conftest
 
+
+#
+# Find out about the existence of header files
+#
+
 #
-# 1. For mount/nfsmount.c: is inet_aton() available?
+# H1. For fdisk/fdisksunlabel.c: is <scsi/scsi.h> available?
+#     Some kernels have <scsi/scsi.h> that uses u_char
+#     But maybe there is already a typedef. Let us use a #define
+#
+echo "
+#define u_char	unsigned char
+#include <scsi/scsi.h>
+#undef u_char
+main(){ exit(0); }
+" > conftest.c
+eval $compile
+if test -s conftest && ./conftest 2>/dev/null; then
+        echo "#define HAVE_scsi_h" >> defines.h
+        echo "You have <scsi/scsi.h>"
+else
+        echo "You don't have <scsi/scsi.h>"
+fi
+rm -f conftest conftest.c
+
+#
+# H2. For fdisk/fdisk.c: is <linux/blkpg.h> available?
+#
+if ./testincl "linux/blkpg.h"; then
+        echo "#define HAVE_blkpg_h" >> defines.h
+fi
+
+#
+# H3. Does <linux/kd.h> exist?
+#
+if ./testincl "linux/kd.h"; then
+	echo "#define HAVE_kd_h" >> defines.h
+fi
+
+#
+# H4. For lib/nls.h: do we have <locale.h>?
+#
+if ./testincl "locale.h"; then
+        echo "#define HAVE_locale_h" >> defines.h
+fi
+
+#
+# H5. For cal.c: do we have <langinfo.h>?
+#
+if ./testincl "langinfo.h"; then
+        echo "#define HAVE_langinfo_h" >> defines.h
+fi
+
+#
+# H6. For mkswap.c: do we have <asm/page.h>?
+#
+if ./testincl "asm/page.h"; then
+        echo "#define HAVE_asm_page_h" >> defines.h
+fi
+
+#
+# H7. For nfsmount.h: do we have <asm/types.h>?
+#
+if ./testincl "asm/types.h"; then
+        echo "#define HAVE_asm_types_h" >> defines.h
+fi
+
+
+#
+# Find out about the existence of functions
+#
+
+#
+# F1. For mount/nfsmount.c: is inet_aton() available?
 #
 echo "
 #include <sys/socket.h>
@@ -86,34 +155,88 @@ fi
 rm -f conftest conftest.c
 
 #
-# 2. For fdisk/fdisksunlabel.c: is <scsi/scsi.h> available?
-#    Some kernels have <scsi/scsi.h> that uses u_char
-#    But maybe there is already a typedef. Let us use a #define
+# F2. For mkswap.c: is fsync() available?
 #
 echo "
-#define u_char	unsigned char
-#include <scsi/scsi.h>
-#undef u_char
-main(){ exit(0); }
+#include <unistd.h>
+main(int a, char **v){
+  if (a == -1)  /* false */
+    fsync(0);
+  exit(0);
+}
 " > conftest.c
 eval $compile
 if test -s conftest && ./conftest 2>/dev/null; then
-        echo "#define HAVE_scsi_h" >> defines.h
-        echo "You have <scsi/scsi.h>"
+	echo "#define HAVE_fsync" >> defines.h
+	echo "You have fsync()"
 else
-        echo "You don't have <scsi/scsi.h>"
+	echo "You don't have fsync()"
 fi
 rm -f conftest conftest.c
 
 #
-# 2A. For fdisk/fdisk.c: is <linux/blkpg.h> available?
+# F3. For agetty.c: is getdomainname() available?
 #
-if ./testincl "linux/blkpg.h"; then
-        echo "#define HAVE_blkpg_h" >> defines.h
+echo "
+#include <unistd.h>
+main(int a, char **v){
+  char buf[1];
+  if (a == -1)  /* false */
+    getdomainname(buf, sizeof buf);
+  exit(0);
+}
+" > conftest.c
+eval $compile
+if test -s conftest && ./conftest 2>/dev/null; then
+        echo "#define HAVE_getdomainname" >> defines.h
+        echo "You have getdomainname()"
+else
+        echo "You don't have getdomainname()"
 fi
+rm -f conftest conftest.c
 
 #
-# 4. cytune.c may need struct tq_struct
+# F4. For hwclock/kd.c: do we have nanosleep?
+#
+echo "
+#include <time.h>
+int main () {
+  struct timespec sleep = { 0, 1 };
+  nanosleep( &sleep, NULL );
+  exit(0);
+}
+" > conftest.c
+eval $compile
+if test -s conftest && ./conftest 2>/dev/null; then
+	echo "#define HAVE_nanosleep" >> defines.h
+	echo "You have nanosleep()"
+else
+	echo "You don't have nanosleep()"
+fi
+rm -f conftest conftest.c
+
+#
+# F5. For mkswap.c: do we have personality()?
+#
+echo "
+int main () {
+  extern int personality(unsigned long);
+  personality(0);
+  exit(0);
+}
+" > conftest.c
+eval $compile
+if test -s conftest && ./conftest 2>/dev/null; then
+	echo "#define HAVE_personality" >> defines.h
+	echo "You have personality()"
+else
+	echo "You don't have personality()"
+fi
+rm -f conftest conftest.c
+
+
+#
+# 1. cytune.c may need struct tq_struct
 #
 echo "
 #include <sys/types.h>
@@ -130,14 +253,7 @@ fi
 rm -f conftest conftest.c
 
 #
-# 5. Does <linux/kd.h> exist?
-#
-if ./testincl "linux/kd.h"; then
-	echo "#define HAVE_kd_h" >> defines.h
-fi
-
-#
-# 6. How is [n]curses installed?
+# 2. How is [n]curses installed?
 #
 test_curses_h=0
 have_ncurses=1
@@ -214,7 +330,7 @@ fi
 rm -f conftest conftest.c
 
 #
-# 7. Do we need -lcrypt?
+# 4. Do we need -lcrypt?
 #
 echo '
 #define _XOPEN_SOURCE
@@ -232,7 +348,7 @@ fi
 rm -f conftest conftest.c
 
 #
-# 8. Does static compilation work?
+# 5. Does static compilation work?
 #
 echo "
 main(){ return 0; }
@@ -244,17 +360,10 @@ else
 	echo "CAN_DO_STATIC=no" >> make_include
 	echo "Strange... Static compilation fails here."
 fi
+rm -f conftest.c conftest
 
 #
-# 9. For lib/nls.h: do we have <locale.h>?
-#
-if ./testincl "locale.h"; then
-        echo "#define HAVE_locale_h" >> defines.h
-fi
-
-
-#
-# 10. For lib/nls.h: do we have <libintl.h> and gettext() ?
+# 6. For lib/nls.h: do we have <libintl.h> and gettext() ?
 #
 echo '
 #include <libintl.h>
@@ -280,7 +389,7 @@ rm -f conftest conftest.c
 
 
 #
-# 11. Does xgettext exist and take the option --foreign-user?
+# 7. Does xgettext exist and take the option --foreign-user?
 #
 if (test $ENABLE_NLS = yes && type xgettext > /dev/null 2>&1); then
 	msg=`xgettext --foreign-user 2>&1 | grep unrecognized`
@@ -294,16 +403,9 @@ else
 	echo "HAVE_XGETTEXT=no" >> make_include
 fi
 
-#
-# 12. For cal.c: do we have <langinfo.h>?
-#
-if ./testincl "langinfo.h"; then
-        echo "#define HAVE_langinfo_h" >> defines.h
-fi
-
 
 #
-# 13. For err.c: do we have __progname?
+# 8. For err.c: do we have __progname?
 # [make sure gcc -O does not optimize the access away]
 #
 echo "
@@ -321,7 +423,7 @@ fi
 rm -f conftest conftest.c
 
 #
-# 14. For script.c: do we have <pty.h> and openpty()?
+# 9. For script.c: do we have <pty.h> and openpty()?
 #
 echo "
 #include <pty.h>
@@ -340,7 +442,7 @@ fi
 rm -f conftest conftest.c
 
 #
-# 15. For lib/widechar.h: do we have wide character support?
+# 10. For lib/widechar.h: do we have wide character support?
 # [Do we have the headers <wchar.h>, <wctype.h>, the types wchar_t, wint_t
 # and the fgetwc, fputwc, WEOF functions/macros?]
 #
@@ -368,46 +470,7 @@ fi
 rm -f conftest conftest.c
 
 #
-# 16. For clock/kd.c: do we have nanosleep?
-#
-echo "
-#include <time.h>
-int main () {
-  struct timespec sleep = { 0, 1 };
-  nanosleep( &sleep, NULL );
-  exit(0);
-}
-" > conftest.c
-eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
-	echo "#define HAVE_nanosleep" >> defines.h
-	echo "You have nanosleep()"
-else
-	echo "You don't have nanosleep()"
-fi
-rm -f conftest conftest.c
-
-#
-# 17. For mkswap.c: do we have personality()?
-#
-echo "
-int main () {
-  extern int personality(unsigned long);
-  personality(0);
-  exit(0);
-}
-" > conftest.c
-eval $compile
-if test -s conftest && ./conftest 2>/dev/null; then
-	echo "#define HAVE_personality" >> defines.h
-	echo "You have personality()"
-else
-	echo "You don't have personality()"
-fi
-rm -f conftest conftest.c
-
-#
-# 18. For pivot_root.c: does <linux/unistd.h> define __NR_pivot_root?
+# 11. For pivot_root.c: does <linux/unistd.h> define __NR_pivot_root?
 #
 echo "
 #include <linux/unistd.h>
@@ -426,7 +489,7 @@ fi
 rm -f conftest conftest.c
 
 #
-# 19. For hwclock.c: does struct tm have a field tm_gmtoff?
+# 12. For hwclock.c: does struct tm have a field tm_gmtoff?
 #
 echo "
 #include <time.h>
@@ -449,9 +512,15 @@ fi
 rm -f conftest conftest.c
 
 #
-# 20. For nfsmount: does the output of rpcgen compile?
+# 13. For nfsmount: does the output of rpcgen compile?
+#
+# On some systems the output of rpcgen compiles with warnings
+# Here we conclude "Your rpcgen output does not compile"
+# and use pregenerated files. If one wishes to use rpcgen anyway,
+# just add the line "HAVE_GOOD_RPC=yes" to make_include.
 #
 rm -f conftest conftestx.c conftestl.c conftest.h conftest.x
+rm -f conftestx.o conftestl.o
 echo "
 #ifdef RPC_CLNT
 %#include <string.h>            /* for memset() */
@@ -476,10 +545,10 @@ program MOUNTPROG {
     } = 2;
 } = 100005;
 " > conftest.x
-if rpcgen -h -o conftest.h conftest.x && \
-   rpcgen -c -o conftestx.c conftest.x && \
-   rpcgen -l -o conftestl.c conftest.x && \
-   cc -c conftestx.c 2> conferrs && cc -c conftestl.c 2>> conferrs && \
+if rpcgen -h -o conftest.h conftest.x 2> conferrs && \
+   rpcgen -c -o conftestx.c conftest.x 2>> conferrs && \
+   rpcgen -l -o conftestl.c conftest.x 2>> conferrs && \
+   cc -c conftestx.c 2>> conferrs && cc -c conftestl.c 2>> conferrs && \
    test ! -s conferrs
 then
         echo "HAVE_GOOD_RPC=yes" >> make_include
@@ -488,3 +557,4 @@ else
         echo "Your rpcgen output does not compile"
 fi
 rm -f conftest conftestx.c conftestl.c conftest.h conftest.x conferrs
+rm -f conftestx.o conftestl.o
diff --git a/disk-utils/Makefile b/disk-utils/Makefile
index ab9237c88e..af15ee4105 100644
--- a/disk-utils/Makefile
+++ b/disk-utils/Makefile
@@ -8,16 +8,17 @@ include ../MCONFIG
 
 # Where to put man pages?
 
-MAN8= 		fdformat.8 mkfs.8 mkswap.8 elvtune.8 fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
+MAN8= 	blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 elvtune.8 \
+	fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
 
 # Where to put binaries?
 # See the "install" rule for the links. . .
 
-SBIN= 		mkfs mkswap blockdev elvtune fsck.minix mkfs.minix mkfs.bfs
+SBIN= 	mkfs mkswap blockdev elvtune fsck.minix mkfs.minix mkfs.bfs
 
-USRBIN=		fdformat
+USRBIN=	fdformat isosize
 
-ETC=		fdprm
+ETC=	fdprm
 
 ifneq "$(HAVE_FDUTILS)" "yes"
 USRBIN:=$(USRBIN) setfdprm
@@ -47,4 +48,4 @@ endif
 
 .PHONY:	clean
 clean:
-	-rm -f *.o *~ core $(SBIN) $(USRBIN)
+	-rm -f *.o *~ core $(SBIN) $(USRBIN) raw
diff --git a/disk-utils/blockdev.8 b/disk-utils/blockdev.8
new file mode 100644
index 0000000000..bde64265f5
--- /dev/null
+++ b/disk-utils/blockdev.8
@@ -0,0 +1,55 @@
+.\" -*- nroff -*-
+.\" Copyright 1998 Andries E. Brouwer (aeb@cwi.nl)
+.\"
+.\" May be distributed under the GNU General Public License
+.TH BLOCKDEV 8 "May 2000" ""
+.SH NAME
+blockdev \- call block device ioctls from the command line
+.SH SYNOPSIS
+.B blockdev
+.RI [ options ]
+.I commands devices
+.SH DESCRIPTION
+The utility
+.B blockdev
+allows one to call block device ioctls from the command line.
+.SH OPTIONS
+.TP
+.B \-V
+Print version and exit.
+.TP
+.B \-q
+Be quiet.
+.TP
+.B \-v
+Be verbose.
+.SH COMMANDS
+.TP
+.B \--setro
+Set read-only.
+.TP
+.B \--setrw
+Set read-write.
+.TP
+.B \--getro
+Get read-only. Print 1 if the device is read-only, 0 otherwise.
+.TP
+.B \--getss
+Print sectorsize in bytes - usually 512.
+.TP
+.B \--getsize
+Print device capacity (in 512-byte sectors).
+.TP
+.BI \--setra " N"
+Set readahead to
+.I N
+512-byte sectors.
+.TP
+.B \--getra
+Print readahead (in 512-byte sectors).
+.TP
+.B \--flushbufs
+Flush buffers.
+.TP
+.B \--rereadpt
+Reread partition table.
diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c
index 00640fedec..75ab57c0e9 100644
--- a/disk-utils/elvtune.c
+++ b/disk-utils/elvtune.c
@@ -26,28 +26,33 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <stdlib.h>
-
-#define BLKELVGET   _IO(0x12,106)/* elevator get */
-#define BLKELVSET   _IO(0x12,107)/* elevator set */
+#include "nls.h"
 
 /* this has to match with the kernel structure */
+/* current version for ac19 and 2.2.16 */
 typedef struct blkelv_ioctl_arg_s {
-	void * queue_ID;
+	int queue_ID;
 	int read_latency;
 	int write_latency;
 	int max_bomb_segments;
 } blkelv_ioctl_arg_t;
 
+#define BLKELVGET   _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
+#define BLKELVSET   _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
+
 static void
 usage(void) {
-	fprintf(stderr, "usage:\n\telvtune [-r r_lat] [-w w_lat] [-b b_lat] /dev/blkdev1 [/dev/blkdev2...]\n");
+	fprintf(stderr, "elvtune (%s)\n", util_linux_version);
+	fprintf(stderr, _("usage:\n"));
+	fprintf(stderr, "\telvtune [-r r_lat] [-w w_lat] [-b b_lat]"
+		        " /dev/blkdev1 [/dev/blkdev2...]\n");
 	fprintf(stderr, "\telvtune -h\n");
 	fprintf(stderr, "\telvtune -v\n");
 }
 
 static void
 version(void) {
-	fprintf(stderr, "elvtune: version 1.0\n");
+	fprintf(stderr, "elvtune (%s)\n", util_linux_version);
 }
 
 int
@@ -128,7 +133,7 @@ main(int argc, char * argv[]) {
 			}
 		}
 
-		printf("\n%s elevator ID %p\n", devname, elevator.queue_ID);
+		printf("\n%s elevator ID\t\t%d\n", devname, elevator.queue_ID);
 		printf("\tread_latency:\t\t%d\n", elevator.read_latency);
 		printf("\twrite_latency:\t\t%d\n", elevator.write_latency);
 		printf("\tmax_bomb_segments:\t%d\n\n", elevator.max_bomb_segments);
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index 0251e34404..b4aec0076b 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -1,4 +1,4 @@
-/* fdformat.c  -  Low-level formats a floppy disk. */
+/* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger */
 
 /* 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
  * - added Native Language Support
@@ -135,11 +135,11 @@ int main(int argc,char **argv)
 	exit(1);
     }
     if (access(argv[1],W_OK) < 0) PERROR(argv[1]);
-    if ((ctrl = open(argv[1],3)) < 0) PERROR(argv[1]);
+    if ((ctrl = open(argv[1],O_WRONLY)) < 0) PERROR(argv[1]);
     if (ioctl(ctrl,FDGETPRM,(long) &param) < 0) 
       PERROR(_("Could not determine current format type"));
     printf(_("%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"),
-	   param.head ? _("Double") : _("Single"),
+	   (param.head == 2) ? _("Double") : _("Single"),
 	   param.track, param.sect,param.size >> 1);
     format_disk(argv[1]);
     if (verify) verify_disk(argv[1]);
diff --git a/disk-utils/isosize.8 b/disk-utils/isosize.8
new file mode 100644
index 0000000000..47ab71fc5e
--- /dev/null
+++ b/disk-utils/isosize.8
@@ -0,0 +1,29 @@
+.TH ISOSIZE "8" "December 2000" "sg3_utils-0.91" SG_UTILS
+.SH NAME
+isosize \- outputs the length of a iso9660 file system
+.SH SYNOPSIS
+.B isosize
+[\fI-x\fR] [\fI-d <num>\fR] \fI<iso9660_image_file>\fR...
+.SH DESCRIPTION
+.\" Add any additional description here
+.PP
+This command outputs the length of an iso9660 file system that
+is contained in given file. That file may be a normal file or
+a block device (e.g. /dev/hdd or /dev/sr0). In the absence of
+any switches (or errors) it will output the size of the iso9660
+file system in bytes. This can now be a large number (> > 4 GB).
+.TP
+-x
+output in humanly readable form the block count and the block
+size. Output uses the term "sectors" for "blocks".
+.TP
+-d <num>
+only has affect when "-x" is not given. The number output (if no errors)
+is the iso9660 file size in bytes divided by <num>. So if <num> is
+the block size then the output number will be the block count.
+.PP
+The size of the file (or block device) holding a iso9660 file
+system can be marginally larger than the actual size of the
+iso9660 file system. One reason for this is that cd writers
+are allowed to add "run out" sectors at the end of a iso9660
+image.
diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
new file mode 100644
index 0000000000..bff45d923b
--- /dev/null
+++ b/disk-utils/isosize.c
@@ -0,0 +1,218 @@
+/*
+ * isosize.c - Andries Brouwer, 000608
+ *
+ * use header info to find size of iso9660 file system
+ * output a number - useful in scripts
+ *
+ * Synopsis:
+ *    isosize [-x] [-d <num>] <filename>
+ *        where "-x" gives length in sectors and sector size while
+ *              without this argument the size is given in bytes
+ *        without "-x" gives length in bytes unless "-d <num>" is
+ *		given. In the latter case the length in bytes divided
+ *		by <num> is given
+ *
+ *  Version 2.03 2000/12/21
+ *     - add "-d <num>" option and use long long to fix things > 2 GB
+ *  Version 2.02 2000/10/11
+ *     - error messages on IO failures [D. Gilbert]
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "nls.h"
+
+#define ISODCL(from, to) (to - from + 1)
+
+int xflag;
+
+static int
+isonum_721 (unsigned char * p) {
+        return ((p[0] & 0xff)
+                | ((p[1] & 0xff) << 8));
+}
+
+static int
+isonum_722 (unsigned char * p) {
+        return ((p[1] & 0xff)
+                | ((p[0] & 0xff) << 8));
+}
+
+static int
+isonum_723 (unsigned char * p) {
+        int le = isonum_721 (p);
+        int be = isonum_722 (p+2);
+        if (xflag && le != be)
+		/* translation is useless */
+                fprintf(stderr, "723error: le=%d be=%d\n", le, be);
+        return (le);
+}
+
+static int
+isonum_731 (unsigned char * p) {
+    return ((p[0] & 0xff)
+            | ((p[1] & 0xff) << 8)
+            | ((p[2] & 0xff) << 16)
+            | ((p[3] & 0xff) << 24));
+}
+
+static int
+isonum_732 (unsigned char * p) {
+    return ((p[3] & 0xff)
+            | ((p[2] & 0xff) << 8)
+            | ((p[1] & 0xff) << 16)
+            | ((p[0] & 0xff) << 24));
+}
+
+
+static int
+isonum_733 (unsigned char * p) {
+    int le = isonum_731 (p);
+    int be = isonum_732 (p+4);
+    if (xflag && le != be)
+	    /* translation is useless */
+            fprintf(stderr, "733error: le=%d be=%d\n", le, be);
+    return (le);
+}
+
+struct iso_primary_descriptor {
+    unsigned char type                      [ISODCL (  1,   1)]; /* 711 */
+    unsigned char id                        [ISODCL (  2,   6)];
+    unsigned char version                   [ISODCL (  7,   7)]; /* 711 */
+    unsigned char unused1                   [ISODCL (  8,   8)];
+    unsigned char system_id                 [ISODCL (  9,  40)]; /* auchars */
+    unsigned char volume_id                 [ISODCL ( 41,  72)]; /* duchars */
+    unsigned char unused2                   [ISODCL ( 73,  80)];
+    unsigned char volume_space_size         [ISODCL ( 81,  88)]; /* 733 */
+    unsigned char unused3                   [ISODCL ( 89, 120)];
+    unsigned char volume_set_size           [ISODCL (121, 124)]; /* 723 */
+    unsigned char volume_sequence_number    [ISODCL (125, 128)]; /* 723 */
+    unsigned char logical_block_size        [ISODCL (129, 132)]; /* 723 */
+    unsigned char path_table_size           [ISODCL (133, 140)]; /* 733 */
+    unsigned char type_l_path_table         [ISODCL (141, 144)]; /* 731 */
+    unsigned char opt_type_l_path_table     [ISODCL (145, 148)]; /* 731 */
+    unsigned char type_m_path_table         [ISODCL (149, 152)]; /* 732 */
+    unsigned char opt_type_m_path_table     [ISODCL (153, 156)]; /* 732 */
+    unsigned char root_directory_record     [ISODCL (157, 190)]; /* 9.1 */
+    unsigned char volume_set_id             [ISODCL (191, 318)]; /* duchars */
+    unsigned char publisher_id              [ISODCL (319, 446)]; /* achars */
+    unsigned char preparer_id               [ISODCL (447, 574)]; /* achars */
+    unsigned char application_id            [ISODCL (575, 702)]; /* achars */
+    unsigned char copyright_file_id         [ISODCL (703, 739)]; /* 7.5 dchars */
+    unsigned char abstract_file_id          [ISODCL (740, 776)]; /* 7.5 dchars */
+    unsigned char bibliographic_file_id     [ISODCL (777, 813)]; /* 7.5 dchars */
+    unsigned char creation_date             [ISODCL (814, 830)]; /* 8.4.26.1 */
+    unsigned char modification_date         [ISODCL (831, 847)]; /* 8.4.26.1 */
+    unsigned char expiration_date           [ISODCL (848, 864)]; /* 8.4.26.1 */
+    unsigned char effective_date            [ISODCL (865, 881)]; /* 8.4.26.1 */
+    unsigned char file_structure_version    [ISODCL (882, 882)]; /* 711 */
+    unsigned char unused4                   [ISODCL (883, 883)];
+    unsigned char application_data          [ISODCL (884, 1395)];
+    unsigned char unused5                   [ISODCL (1396, 2048)];
+};
+
+const char *progname;
+int divisor = 0;
+
+static void
+isosize(char *filenamep) {
+	int fd, nsecs, ssize;
+	struct iso_primary_descriptor ipd;
+
+	if ((fd = open(filenamep, O_RDONLY)) < 0) {
+		perror(filenamep);
+		fprintf(stderr, _("%s: failed to open: %s\n"),
+			progname, filenamep);
+		exit(1);
+	}
+	if (lseek(fd, 16 << 11, 0) == (off_t)-1) {
+		perror("lseek");
+		fprintf(stderr, _("%s: seek error on %s\n"),
+			progname, filenamep);
+		exit(1);
+	}
+	if (read(fd, &ipd, sizeof(ipd)) < 0) {
+		perror("read");
+		fprintf(stderr, _("%s: read error on %s\n"),
+			progname, filenamep);
+		exit(1);
+	}
+
+	nsecs = isonum_733(ipd.volume_space_size);
+	ssize = isonum_723(ipd.logical_block_size); /* nowadays always 2048 */
+
+	if (xflag) {
+		printf (_("sector count: %d, sector size: %d\n"),
+			nsecs, ssize);
+	} else {
+		long long product = nsecs;
+
+		if (divisor == 0)
+			printf ("%lld\n", product * ssize);
+		else if (divisor == ssize)
+			printf ("%d\n", nsecs);
+		else
+			printf ("%lld\n", (product * ssize) / divisor);
+	}
+}
+
+int
+main(int argc, char * argv[]) {
+	int j, ct;
+	char *p;
+
+	progname = argv[0];
+	if ((p = strrchr(progname, '/')) != NULL)
+		progname = p+1;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	if (argc >= 2 &&
+	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
+		printf(_("%s from %s\n"), progname, util_linux_version);
+		exit(0);
+	}
+
+	for (;;) {
+		int opt;
+
+		opt = getopt(argc, argv, "xd:");
+		if (opt < 0)
+			break;
+		switch (opt) {
+		case 'd':
+			divisor = atoi(optarg);
+			break;
+		case 'x':
+			xflag = 1;
+			break;
+		default:
+			fprintf(stderr,
+				_("%s: option parse error\n"), progname);
+			exit(1);
+		}
+	}
+
+	ct = argc - optind;
+
+	if (ct <= 0) {
+		fprintf(stderr, _("Usage: %s [-x] [-d <num>] iso9660-image\n"),
+			progname);
+		exit(1);
+	}
+
+	for (j = optind; j < argc; j++) {
+		if (ct > 1)
+			printf("%s: ", argv[j]);
+		isosize(argv[j]);
+	}
+
+	return 0;
+}
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index a8f5578377..b27fd2eb69 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -15,14 +15,13 @@
 #include <errno.h>
 #include <string.h>
 #include <time.h>
+#include "nls.h"
 
 /* cannot include <linux/fs.h> */
 #ifndef BLKGETSIZE
 #define BLKGETSIZE _IO(0x12,96)    /* return device size */
 #endif
 
-#include "../defines.h"		/* for util_linux_version */
-
 #define BFS_ROOT_INO		2
 #define BFS_NAMELEN		14
 #define BFS_BLOCKSIZE		512
@@ -85,9 +84,9 @@ fatal(char *s, ...) {
 
 static void
 usage(void) {
-	fprintf(stderr,
+	fprintf(stderr, _(
 		"Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
-		"       [-F fsname] device [block-count]\n",
+		"       [-F fsname] device [block-count]\n"),
 		progname);
 	exit(1);
 }
@@ -117,7 +116,7 @@ main(int argc, char *argv[]) {
 
 	if (argc == 2 &&
 	    (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-		printf("%s from %s\n", progname, util_linux_version);
+		printf(_("%s from %s\n"), progname, util_linux_version);
 		exit(0);
 	}
 
@@ -133,14 +132,14 @@ main(int argc, char *argv[]) {
 		case 'V':
 			len = strlen(optarg);
 			if (len <= 0 || len > 6)
-				fatal("volume name too long");
+				fatal(_("volume name too long"));
 			volume = strdup(optarg);
 			break;
 
 		case 'F':
 			len = strlen(optarg);
 			if (len <= 0 || len > 6)
-				fatal("fsname name too long");
+				fatal(_("fsname name too long"));
 			fsname = strdup(optarg);
 			break;
 
@@ -165,16 +164,16 @@ main(int argc, char *argv[]) {
 
 	if (stat(device, &statbuf) == -1) {
 		perror(device);
-		fatal("cannot stat device %s", device);
+		fatal(_("cannot stat device %s"), device);
 	}
 
 	if (!S_ISBLK(statbuf.st_mode))
-		fatal("%s is not a block special device", device);
+		fatal(_("%s is not a block special device"), device);
 
 	fd = open(device, O_RDWR);
 	if (fd == -1) {
 		perror(device);
-		fatal("cannot open %s", device);
+		fatal(_("cannot open %s"), device);
 	}
 
 	if (optind == argc-1)
@@ -185,12 +184,12 @@ main(int argc, char *argv[]) {
 	if (ioctl(fd, BLKGETSIZE, &total_blocks) == -1) {
 		if (!user_specified_total_blocks) {
 			perror("BLKGETSIZE");
-			fatal("cannot get size of %s", device);
+			fatal(_("cannot get size of %s"), device);
 		}
 		total_blocks = user_specified_total_blocks;
 	} else if (user_specified_total_blocks) {
 		if (user_specified_total_blocks > total_blocks)
-			fatal("blocks argument too large, max is %d",
+			fatal(_("blocks argument too large, max is %lu"),
 			      total_blocks);
 		total_blocks = user_specified_total_blocks;
 	}
@@ -205,7 +204,7 @@ main(int argc, char *argv[]) {
 	} else {
 		/* believe the user */
 		if (inodes > 512)
-			fatal("too many inodes - max is 512");
+			fatal(_("too many inodes - max is 512"));
 	}
 
 	ino_bytes = inodes * sizeof(struct bfsi);
@@ -214,7 +213,7 @@ main(int argc, char *argv[]) {
 
 	/* mimic the behaviour of SCO's mkfs - maybe this limit is needed */
 	if (data_blocks < 32)
-		fatal("not enough space, need at least %d blocks",
+		fatal(_("not enough space, need at least %lu blocks"),
 		      ino_blocks + 33);
 
 	memset(&sb, 0, sizeof(sb));
@@ -226,19 +225,23 @@ main(int argc, char *argv[]) {
 	memcpy(sb.s_volume, volume, 6);
 
 	if (verbose) {
-		fprintf(stderr, "Device: %s\n", device);
-		fprintf(stderr, "Volume: <%-6s>\n", volume);
-		fprintf(stderr, "FSname: <%-6s>\n", fsname);
-		fprintf(stderr, "BlockSize: %d\n", BFS_BLOCKSIZE);
-		fprintf(stderr, "Inodes: %d (in %ld block%s)\n",
-			inodes, ino_blocks, (ino_blocks==1) ? "" : "s");
-		fprintf(stderr, "Blocks: %ld\n", total_blocks);
-		fprintf(stderr, "Inode end: %d, Data end: %d\n",
+		fprintf(stderr, _("Device: %s\n"), device);
+		fprintf(stderr, _("Volume: <%-6s>\n"), volume);
+		fprintf(stderr, _("FSname: <%-6s>\n"), fsname);
+		fprintf(stderr, _("BlockSize: %d\n"), BFS_BLOCKSIZE);
+		if (ino_blocks==1)
+			fprintf(stderr, _("Inodes: %d (in 1 block)\n"),
+				inodes);
+		else
+			fprintf(stderr, _("Inodes: %d (in %ld blocks)\n"),
+				inodes, ino_blocks);
+		fprintf(stderr, _("Blocks: %ld\n"), total_blocks);
+		fprintf(stderr, _("Inode end: %d, Data end: %d\n"),
 			sb.s_start-1, sb.s_end);
 	}
 
 	if (write(fd, &sb, sizeof(sb)) != sizeof(sb))
-		fatal("error writing superblock");
+		fatal(_("error writing superblock"));
 
 	memset(&ri, 0, sizeof(ri));
 	ri.i_ino = BFS_ROOT_INO;
@@ -258,29 +261,29 @@ main(int argc, char *argv[]) {
 	ri.i_ctime = now;
 
 	if (write(fd, &ri, sizeof(ri)) != sizeof(ri))
-		fatal("error writing root inode");
+		fatal(_("error writing root inode"));
 
 	memset(&ri, 0, sizeof(ri));
 	for (i=1; i<inodes; i++)
 		if (write(fd, &ri, sizeof(ri)) != sizeof(ri))
-			fatal("error writing inode");
+			fatal(_("error writing inode"));
 
 	if (lseek(fd, (1 + ino_blocks)*BFS_BLOCKSIZE, SEEK_SET) == -1)
-		fatal("seek error");
+		fatal(_("seek error"));
 
 	memset(&de, 0, sizeof(de));
 	de.d_ino = BFS_ROOT_INO;
 	memcpy(de.d_name, ".", 1);
 	if (write(fd, &de, sizeof(de)) != sizeof(de))
-		fatal("error writing . entry");
+		fatal(_("error writing . entry"));
 
 	memcpy(de.d_name, "..", 2);
 	if (write(fd, &de, sizeof(de)) != sizeof(de))
-		fatal("error writing .. entry");
+		fatal(_("error writing .. entry"));
 
 	if (close(fd) == -1) {
 		perror(device);
-		fatal("error closing %s", device);
+		fatal(_("error closing %s"), device);
 	}
 
 	return 0;
diff --git a/disk-utils/mkfs.minix.8 b/disk-utils/mkfs.minix.8
index 2325805a25..689c26399d 100644
--- a/disk-utils/mkfs.minix.8
+++ b/disk-utils/mkfs.minix.8
@@ -46,7 +46,8 @@ are found, the count is printed.
 .BI \-n " namelength"
 Specify the maximum length of filenames.
 Currently, the only allowable values are 14 and 30.
-The default is 30.
+The default is 30. Note that kernels older than 0.99p7
+only accept namelength 14.
 .TP
 .BI \-i " inodecount"
 Specify the number of inodes for the filesystem.
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 4eb9aa4b98..4c2afbb28b 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -32,8 +32,8 @@
  * 03.01.94  -	Added support for file system valid flag.
  *		(Dr. Wettstein, greg%wind.uucp@plains.nodak.edu)
  *
- * 30.10.94 - added support for v2 filesystem
- *	      (Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
+ * 30.10.94  -  Added support for v2 filesystem
+ *		(Andreas Schwab, schwab@issan.informatik.uni-dortmund.de)
  * 
  * 09.11.94  -	Added test to prevent overwrite of mounted fs adapted
  *		from Theodore Ts'o's (tytso@athena.mit.edu) mke2fs
@@ -538,8 +538,8 @@ do_check(char * buffer, int try, unsigned int current_block) {
 	
 	/* Seek to the correct loc. */
 	if (lseek(DEV, current_block * BLOCK_SIZE, SEEK_SET) !=
-                       current_block * BLOCK_SIZE ) {
-                 die(_("seek failed during testing of blocks"));
+		       current_block * BLOCK_SIZE ) {
+		 die(_("seek failed during testing of blocks"));
 	}
 
 
@@ -653,7 +653,7 @@ main(int argc, char ** argv) {
       case 'c':
 	check=1; break;
       case 'i':
-        req_nr_inodes = (unsigned long) atol(optarg);
+	req_nr_inodes = (unsigned long) atol(optarg);
 	break;
       case 'l':
 	listfile = optarg; break;
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 960500013b..6bd96d9043 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -39,9 +39,14 @@
 #include <sys/ioctl.h>		/* for _IO */
 #include <sys/utsname.h>
 #include <sys/stat.h>
+#include "nls.h"
+
+#ifdef HAVE_asm_page_h
 #include <asm/page.h>		/* for PAGE_SIZE and PAGE_SHIFT */
 				/* we also get PAGE_SIZE via getpagesize() */
-#include "nls.h"
+/* recent glibc systems also define this in <sys/user.h> */
+#endif
+
 
 #ifndef _IO
 /* pre-1.3.45 */
@@ -609,7 +614,9 @@ the -f option to force it.\n"),
 	 * A subsequent swapon() will fail if the signature
 	 * is not actually on disk. (This is a kernel bug.)
 	 */
+#ifdef HAVE_fsync
 	if (fsync(DEV))
 		 die(_("fsync failed"));
+#endif
 	return 0;
 }
diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index 54e1008cbe..4fc5e24706 100644
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -161,6 +161,7 @@ int main(int argc, char *argv[])
 		break;
 		
 	default:
+		block_major = block_minor = 0; /* just to keep gcc happy */
 		usage(1);
 	}
 	
diff --git a/disk-utils/setfdprm.c b/disk-utils/setfdprm.c
index 73b3b7174e..958f98c16c 100644
--- a/disk-utils/setfdprm.c
+++ b/disk-utils/setfdprm.c
@@ -20,28 +20,29 @@
 #define MAXLINE   200
 
 
-static int convert(char *arg)
-{
+static int
+convert(char *arg) {
     long result;
     char *end;
 
     result = strtol(arg,&end,0);
-    if (!*end) return (int) result;
+    if (!*end)
+	    return (int) result;
     fprintf(stderr,_("Invalid number: %s\n"),arg);
     exit(1);
 }
 
-
-static void cmd_without_param(int cmd,int fd)
-{
-    if (ioctl(fd,cmd,NULL) >= 0) exit(0);
+static void
+cmd_without_param(int cmd,int fd) {
+    if (ioctl(fd,cmd,NULL) >= 0)
+	    exit(0);
     perror("ioctl");
     exit(1);
 }
 
-
-static void set_params(int cmd,int fd,char **params)
-{
+/* set given fd parameters */
+static void
+set_params(int cmd,int fd,char **params) {
     struct floppy_struct ft;
 
     ft.size = convert(params[0]);
@@ -59,9 +60,9 @@ static void set_params(int cmd,int fd,char **params)
     exit(1);
 }
 
-
-static void find_params(int cmd,int fd,char *name)
-{
+/* find parameter set in file, and use it */
+static void
+find_params(int cmd,int fd,char *name) {
     FILE *file;
     char line[MAXLINE+2],this[MAXLINE+2],param[9][MAXLINE+2];
     char *params[9],*start;
@@ -91,9 +92,8 @@ static void find_params(int cmd,int fd,char *name)
     exit(1);
 }
 
-
-static void usage(char *name)
-{
+static void
+usage(char *name) {
     char *this;
 
     if ((this = strrchr(name,'/')) != NULL) name = this+1;
@@ -109,8 +109,7 @@ gap rate spec1 fmt_gap\n"),name);
 }
 
 int
-main(int argc, char **argv)
-{
+main(int argc, char **argv) {
     int fd;
     unsigned int cmd;
     char *progname, *p;
@@ -129,7 +128,8 @@ main(int argc, char **argv)
 	    exit(0);
     }
 
-    if (argc < 3) usage(progname);
+    if (argc < 2)
+	    usage(progname);
     cmd = FDSETPRM;
     if (*argv[1] == '-') {
 	switch (argv[1][1]) {
@@ -156,7 +156,7 @@ main(int argc, char **argv)
 	argc--;
 	argv++;
     }
-    if ((fd = open(argv[1],3)) < 0) { /* 3 == no access at all */
+    if ((fd = open(argv[1],3)) < 0) { /* O_WRONLY needed in a few kernels */
 	perror(argv[1]);
 	exit(1);
     }
diff --git a/fdisk/Makefile b/fdisk/Makefile
index a319c2baf4..3a851fa027 100644
--- a/fdisk/Makefile
+++ b/fdisk/Makefile
@@ -18,12 +18,13 @@ NOTMADE=cfdisk
 endif
 endif
 
-ifeq "$(CPU)" "m68k"
+ifeq "$(ARCH)" "m68k"
 # It seems the m68k people do not want *fdisk
 else
 SBIN:=$(SBIN) fdisk
 MAN8:=$(MAN8) fdisk.8
-ifneq "$(CPU)" "sparc"
+
+ifneq "$(ARCH)" "sparc"
 SBIN:=$(SBIN) $(CFDISK) sfdisk
 MAN8:=$(MAN8) cfdisk.8 sfdisk.8
 endif
diff --git a/fdisk/common.h b/fdisk/common.h
index c5e237148e..86802c41e2 100644
--- a/fdisk/common.h
+++ b/fdisk/common.h
@@ -5,6 +5,7 @@
 #define BLKRRPART  _IO(0x12,95)    /* re-read partition table */
 #define BLKGETSIZE _IO(0x12,96)    /* return device size */
 #define BLKFLSBUF  _IO(0x12,97)    /* flush buffer cache */
+#define BLKSSZGET  _IO(0x12,104)   /* get block device sector size */
 
 struct systypes {
 	unsigned char type;
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 45110ccd62..969bf87901 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -57,6 +57,8 @@
 #include <linux/blkpg.h>
 #endif
 
+static void delete_partition(int i);
+
 #define hex_val(c)	({ \
 				char _c = (c); \
 				isdigit(_c) ? _c - '0' : \
@@ -176,6 +178,7 @@ uint	heads,
 	sectors,
 	cylinders,
 	sector_size = DEFAULT_SECTOR_SIZE,
+	user_set_sector_size = 0,
 	sector_offset = 1,
 	units_per_sector = 1,
 	display_in_cyl_units = 1,
@@ -567,13 +570,13 @@ void update_units(void)
 static void
 warn_cylinders(void) {
 	if (dos_label && cylinders > 1024 && !nowarn)
-		fprintf(stderr, "\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",
+		fprintf(stderr, _("\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"),
 			cylinders);
 }
 
@@ -588,9 +591,13 @@ read_extended(int ext) {
 	pex->ext_pointer = pex->part_table;
 
 	p = pex->part_table;
-	if (!get_start_sect(p))
-		fprintf(stderr, _("Bad offset in primary extended partition\n"));
-	else while (IS_EXTENDED (p->sys_ind)) {
+	if (!get_start_sect(p)) {
+		fprintf(stderr,
+			_("Bad offset in primary extended partition\n"));
+		return;
+	}
+
+	while (IS_EXTENDED (p->sys_ind)) {
 		struct pte *pe = &ptes[partitions];
 
 		if (partitions >= MAXIMUM_PARTS) {
@@ -613,7 +620,7 @@ read_extended(int ext) {
 			extended_offset = get_start_sect(p);
 
 		q = p = pt_offset(pe->sectorbuffer, 0);
-		for (i = 0; i < 4; i++, p++) {
+		for (i = 0; i < 4; i++, p++) if (get_nr_sects(p)) {
 			if (IS_EXTENDED (p->sys_ind)) {
 				if (pe->ext_pointer)
 					fprintf(stderr, _("Warning: extra link"
@@ -649,6 +656,18 @@ read_extended(int ext) {
 		p = pe->ext_pointer;
 		partitions++;
 	}
+
+	/* remove empty links */
+ remove:
+	for (i = 4; i < partitions; i++) {
+		struct pte *pe = &ptes[i];
+
+		if (!get_nr_sects(pe->part_table)) {
+			printf("omitting empty partition (%d)\n", i+1);
+			delete_partition(i);
+			goto remove; 	/* numbering changed */
+		}
+	}
 }
 
 static void
@@ -672,19 +691,39 @@ create_doslabel(void) {
 	get_boot(create_empty);
 }
 
+#include <sys/utsname.h>
+#define MAKE_VERSION(p,q,r)     (65536*(p) + 256*(q) + (r))
+
+static int
+linux_version_code(void) {
+	static int kernel_version = 0;
+        struct utsname my_utsname;
+        int p, q, r;
+
+        if (!kernel_version && uname(&my_utsname) == 0) {
+                p = atoi(strtok(my_utsname.release, "."));
+                q = atoi(strtok(NULL, "."));
+                r = atoi(strtok(NULL, "."));
+                kernel_version = MAKE_VERSION(p,q,r);
+        }
+        return kernel_version;
+}
+
 static void
 get_sectorsize(int fd) {
-#if defined(BLKSSZGET) && defined(HAVE_blkpg_h)
-	/* For a short while BLKSSZGET gave a wrong sector size */
-	{ int arg;
-	if (ioctl(fd, BLKSSZGET, &arg) == 0)
-		sector_size = arg;
-	if (sector_size != DEFAULT_SECTOR_SIZE)
-		printf(_("Note: sector size is %d (not %d)\n"),
-		       sector_size, DEFAULT_SECTOR_SIZE);
+#if defined(BLKSSZGET)
+	if (!user_set_sector_size &&
+	    linux_version_code() >= MAKE_VERSION(2,3,3)) {
+		int arg;
+		if (ioctl(fd, BLKSSZGET, &arg) == 0)
+			sector_size = arg;
+		if (sector_size != DEFAULT_SECTOR_SIZE)
+			printf(_("Note: sector size is %d (not %d)\n"),
+			       sector_size, DEFAULT_SECTOR_SIZE);
 	}
 #else
-	sector_size = DEFAULT_SECTOR_SIZE;
+	/* maybe the user specified it; and otherwise we still
+	   have the DEFAULT_SECTOR_SIZE default */
 #endif
 }
 
@@ -818,9 +857,9 @@ got_table:
 
 		pe->part_table = pt_offset(MBRbuffer, i);
 		pe->ext_pointer = NULL;
-		pe->changed = 0;
 		pe->offset = 0;
 		pe->sectorbuffer = MBRbuffer;
+		pe->changed = (what == create_empty);
 	}
 
 	for (i = 0; i < 4; i++) {
@@ -877,6 +916,7 @@ read_char(char *mesg)
 {
 	do {
 		fputs(mesg, stdout);
+		fflush (stdout);	 /* requested by niles@scyld.com */
 	} while (!read_line());
 	return *line_ptr;
 }
@@ -885,6 +925,7 @@ char
 read_chars(char *mesg)
 {
         fputs(mesg, stdout);
+	fflush (stdout);	/* niles@scyld.com */
         if (!read_line()) {
 		*line_ptr = '\n';
 		line_ptr[1] = 0;
@@ -1079,10 +1120,12 @@ delete_partition(int i) {
 		sun_delete_partition(i);
 		return;
 	}
+
 	if (sgi_label) {
 		sgi_delete_partition(i);
 		return;
 	}
+
 	if (i < 4) {
 		if (IS_EXTENDED (p->sys_ind) && i == ext_index) {
 			partitions = 4;
@@ -1090,14 +1133,15 @@ delete_partition(int i) {
 			extended_offset = 0;
 		}
 		clear_partition(p);
+		return;
 	}
-	else if (!q->sys_ind && i > 4) {
+
+	if (!q->sys_ind && i > 4) {
 		--partitions;
 		--i;
 		clear_partition(ptes[i].ext_pointer);
 		ptes[i].changed = 1;
-	}
-	else if (i > 3) {
+	} else {
 		if (i > 4) {
 			p = ptes[i-1].ext_pointer;
 			p->boot_ind = 0;
@@ -1111,7 +1155,7 @@ delete_partition(int i) {
 			set_start_sect(p, get_start_sect(q));
 			set_nr_sects(p, get_nr_sects(q));
 			ptes[i-1].changed = 1;
-		} else {
+		} else if (partitions > 5) {    /* 5 will be moved to 4 */
 			struct pte *pe = &ptes[5];
 
 			if(pe->part_table) /* prevent SEGFAULT */
@@ -1121,6 +1165,7 @@ delete_partition(int i) {
 			pe->offset = extended_offset;
 			pe->changed = 1;
 		}
+
 		if (partitions > 5) {
 			partitions--;
 			while (i < partitions) {
@@ -1389,7 +1434,7 @@ list_table(int xtra) {
 		struct pte *pe = &ptes[i];
 
 		p = pe->part_table;
-		if (p->sys_ind) {
+		if (p && p->sys_ind) {
 			unsigned int psects = get_nr_sects(p);
 			unsigned int pblocks = psects;
 			unsigned int podd = 0;
@@ -2030,6 +2075,8 @@ try(char *device, int user_specified) {
 		if ((fd = open(disk_device, type_open)) >= 0) {
 			if (get_boot(try_only) < 0) {
 				list_disk_geometry();
+				if (aix_label)
+					return;
 				if (btrydev(device) < 0)
 					fprintf(stderr,
 						_("Disk %s doesn't contain a valid "
@@ -2075,7 +2122,7 @@ tryprocpt(void) {
 		if (isdigit(s[-1]))
 			continue;
 		sprintf(devname, "/dev/%s", ptname);
-		try(devname, 1);
+		try(devname, 0);
 	}
 }
 
@@ -2091,7 +2138,6 @@ int
 main(int argc, char **argv) {
 	int j, c;
 	int optl = 0, opts = 0;
-	int user_set_sector_size = 0;
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
@@ -2194,6 +2240,8 @@ main(int argc, char **argv) {
 		fatal(usage2);
 
 	get_boot(fdisk);
+	if (aix_label)
+		exit(0);
 
 #ifdef __alpha__
 	/* On alpha, if we detect a disklabel, go directly to
diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h
index 68747d48e3..e46e026142 100644
--- a/fdisk/fdiskbsdlabel.h
+++ b/fdisk/fdiskbsdlabel.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include <linux/types.h>	/* for __u32 etc */
+#include <linux/types.h>	/* for __u32, __u16, __u8, __s16 */
 
 #ifndef BSD_DISKMAGIC	/* perhaps from <linux/genhd.h> */
 #define BSD_DISKMAGIC     ((__u32) 0x82564557)
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index 3ec5624a12..f96cb0b152 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -67,6 +67,12 @@ get_num_sectors(struct sun_partition p) {
 	return SSWAP32(p.num_sectors);
 }
 
+#ifndef IDE0_MAJOR
+#define IDE0_MAJOR 3
+#endif
+#ifndef IDE1_MAJOR
+#define IDE1_MAJOR 22
+#endif
 void guess_device_type(int fd) {
 	struct stat bootstat;
 
diff --git a/fdisk/fdisksunlabel.h b/fdisk/fdisksunlabel.h
index 424f462ea6..647a2cec1f 100644
--- a/fdisk/fdisksunlabel.h
+++ b/fdisk/fdisksunlabel.h
@@ -1,4 +1,4 @@
-#include <linux/types.h>   /* for __u32 etc */
+#include <linux/types.h>   /* for __u16, __u32 */
 
 typedef struct {
 	unsigned char info[128];   /* Informative text string */
diff --git a/fdisk/i386_sys_types.c b/fdisk/i386_sys_types.c
index 0cad6fa72f..3e5f0f1b7e 100644
--- a/fdisk/i386_sys_types.c
+++ b/fdisk/i386_sys_types.c
@@ -29,6 +29,7 @@ struct systypes i386_sys_types[] = {
 	{0x1c, N_("Hidden Win95 FAT32 (LBA)")},
 	{0x1e, N_("Hidden Win95 FAT16 (LBA)")},
 	{0x24, N_("NEC DOS")},
+	{0x39, N_("Plan 9")},
 	{0x3c, N_("PartitionMagic recovery")},
 	{0x40, N_("Venix 80286")},
 	{0x41, N_("PPC PReP Boot")},
@@ -72,16 +73,21 @@ struct systypes i386_sys_types[] = {
 	{0xc4, N_("DRDOS/sec (FAT-16 < 32M)")},
 	{0xc6, N_("DRDOS/sec (FAT-16)")},
 	{0xc7, N_("Syrinx")},
-	{0xdb, N_("CP/M / CTOS / ...")},/* CP/M or Concurrent CP/M or Concurrent DOS or CTOS */
-	{0xe1, N_("DOS access")},	/* DOS access or SpeedStor 12-bit FAT extended partition */
+	{0xda, N_("Non-FS data")},
+	{0xdb, N_("CP/M / CTOS / ...")},/* CP/M or Concurrent CP/M or
+					   Concurrent DOS or CTOS */
+	{0xe1, N_("DOS access")},	/* DOS access or SpeedStor 12-bit FAT
+					   extended partition */
 	{0xe3, N_("DOS R/O")},		/* DOS R/O or SpeedStor */
-	{0xe4, N_("SpeedStor")},	/* SpeedStor 16-bit FAT extended partition < 1024 cyl. */
+	{0xe4, N_("SpeedStor")},	/* SpeedStor 16-bit FAT extended
+					   partition < 1024 cyl. */
 	{0xeb, N_("BeOS fs")},
 	{0xf1, N_("SpeedStor")},
 	{0xf4, N_("SpeedStor")},	/* SpeedStor large partition */
 	{0xf2, N_("DOS secondary")},	/* DOS 3.3+ secondary */
-	{0xfd, N_("Linux raid autodetect")},/* New (2.2.x) raid partition with autodetect
-					       using persistent superblock */
+	{0xfd, N_("Linux raid autodetect")},/* New (2.2.x) raid partition with
+					       autodetect using persistent
+					       superblock */
 	{0xfe, N_("LANstep")},		/* SpeedStor >1024 cyl. or LANstep */
 	{0xff, N_("BBT")},		/* Xenix Bad Block Table */
 	{ 0, 0 }
diff --git a/fdisk/llseek.c b/fdisk/llseek.c
index 9e00d3e6df..b55dfa7922 100644
--- a/fdisk/llseek.c
+++ b/fdisk/llseek.c
@@ -35,10 +35,24 @@ extern ext2_loff_t ext2_llseek (unsigned int, ext2_loff_t, unsigned int);
 static int _llseek (unsigned int, unsigned long,
 		   unsigned long, ext2_loff_t *, unsigned int);
 
+#ifdef __NR__llseek
+
 static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
 		 unsigned long, offset_low,ext2_loff_t *,result,
 		 unsigned int, origin)
 
+#else
+
+/* no __NR__llseek on compilation machine - might give it explicitly */
+static int _llseek (unsigned int fd, unsigned long oh,
+		    unsigned long ol, ext2_loff_t *result,
+		    unsigned int origin) {
+	errno = ENOSYS;
+	return -1;
+}
+
+#endif
+
 static ext2_loff_t my_llseek (unsigned int fd, ext2_loff_t offset,
 		unsigned int origin)
 {
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 206ea28dc8..e60259849e 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -432,25 +432,25 @@ get_cylindersize(char *dev, int fd, int silent) {
 
     if (R.start && !force) {
 	warn(
-	    _("Warning: start=%d - this looks like a partition rather than\n"
+	    _("Warning: start=%lu - this looks like a partition rather than\n"
 	      "the entire disk. Using fdisk on it is probably meaningless.\n"
 	      "[Use the --force option if you really want this]\n"), R.start);
 	exit(1);
     }
 
     if (R.heads && B.heads != R.heads)
-	warn(_("Warning: HDIO_GETGEO says that there are %d heads\n"),
+	warn(_("Warning: HDIO_GETGEO says that there are %lu heads\n"),
 	     R.heads);
     if (R.sectors && B.sectors != R.sectors)
-	warn(_("Warning: HDIO_GETGEO says that there are %d sectors\n"),
+	warn(_("Warning: HDIO_GETGEO says that there are %lu sectors\n"),
 	     R.sectors);
     if (R.cylinders && B.cylinders != R.cylinders
 	    && B.cylinders < 65536 && R.cylinders < 65536)
-	warn(_("Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"),
+	warn(_("Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"),
 	     R.cylinders);
 
     if (B.sectors > 63)
-      warn(_("Warning: unlikely number of sectors (%d) - usually at most 63\n"
+      warn(_("Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 	   "This will give problems with all software that uses C/H/S addressing.\n"),
 	   B.sectors);
     if (!silent)
@@ -537,17 +537,17 @@ chs_ok (chs a, char *v, char *w) {
       return 1;
     if (B.heads && aa.h >= B.heads) {
 	warn(_("%s of partition %s has impossible value for head: "
-	     "%d (should be in 0-%d)\n"), w, v, aa.h, B.heads-1);
+	     "%lu (should be in 0-%lu)\n"), w, v, aa.h, B.heads-1);
 	ret = 0;
     }
     if (B.sectors && (aa.s == 0 || aa.s > B.sectors)) {
 	warn(_("%s of partition %s has impossible value for sector: "
-	     "%d (should be in 1-%d)\n"), w, v, aa.s, B.sectors);
+	     "%lu (should be in 1-%lu)\n"), w, v, aa.s, B.sectors);
 	ret = 0;
     }
     if (B.cylinders && aa.c >= B.cylinders) {
 	warn(_("%s of partition %s has impossible value for cylinders: "
-	     "%d (should be in 0-%d)\n"), w, v, aa.c, B.cylinders-1);
+	     "%lu (should be in 0-%lu)\n"), w, v, aa.c, B.cylinders-1);
 	ret = 0;
     }
     return ret;
@@ -2774,7 +2774,7 @@ do_change_id(char *dev, char *pnam, char *id) {
     }
     i = strtoul(id, NULL, 16);
     if (i > 255)
-      fatal(_("Bad Id %x\n"), i);
+      fatal(_("Bad Id %lx\n"), i);
     z->partitions[pno].p.sys_type = i;
 
     if(write_partitions(dev, fd, z))
diff --git a/getopt-1.0.3b/Changelog b/getopt-1.0.3b/Changelog
deleted file mode 100644
index 24a4c3235d..0000000000
--- a/getopt-1.0.3b/Changelog
+++ /dev/null
@@ -1,14 +0,0 @@
-980628: Bumped up version number to 1.0.3
-980628: Removed remaining incompatibility with tcsh-6.02 from parse.tcsh
-980626: Added separate Makefile for util-linux
-980625: Removed several bugs from parse.tcsh, partly thanks to Volker Kuhlmann
-        (v.kuhlmann@elec.canterbury.ac.nz).
-980612: Removed reference to getopt in util-linux
-980611: Bumped up version number to 1.0.2
-980611: Fixed --version bug (was not available, though documented!)
-980611: Removed compiler warnings.
-980603: Bumped up version number to 1.0.1
-980603: Fixed sizeof() bug (should be strlen) in getopt.c, thanks to Bob Proulx
-        (rwp@hprwp.fc.hp.com).
-980505: Changed date field in LSM to proper syntax
-980505: Released version 1.0
diff --git a/getopt-1.0.3b/COPYING b/getopt-1.1.0a/COPYING
index a43ea2126f..a43ea2126f 100644
--- a/getopt-1.0.3b/COPYING
+++ b/getopt-1.1.0a/COPYING
diff --git a/getopt-1.1.0a/Changelog b/getopt-1.1.0a/Changelog
new file mode 100644
index 0000000000..e144bb0f86
--- /dev/null
+++ b/getopt-1.1.0a/Changelog
@@ -0,0 +1,24 @@
+20000630: Ported the Native Language Support patches from util-linux
+          They are written by Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
+20000627: Bumped up version number to 1.0.6
+20000627: A few manpage tweaks
+20000616: Introduced DESTDIR and directory creation in the Makefile.
+19990716: Bumped up version number to 1.0.5
+19990622: Made -u work
+19990101: Bumped up version number to 1.0.4 (aka. 1.0.3a in util-linux)
+19990101: Very small fix in main()
+19990101: Updated util-linux Makefile
+19980628: Bumped up version number to 1.0.3
+19980628: Removed remaining incompatibility with tcsh-6.02 from parse.tcsh
+980626: Added separate Makefile for util-linux
+19980625: Removed several bugs from parse.tcsh, partly thanks to Volker Kuhlmann
+          (v.kuhlmann@elec.canterbury.ac.nz).
+19980612: Removed reference to getopt in util-linux
+19980611: Bumped up version number to 1.0.2
+19980611: Fixed --version bug (was not available, though documented!)
+19980611: Removed compiler warnings.
+19980603: Bumped up version number to 1.0.1
+19980603: Fixed sizeof() bug (should be strlen) in getopt.c, thanks to 
+          Bob Proulx (rwp@hprwp.fc.hp.com).
+19980505: Changed date field in LSM to proper syntax
+19980505: Released version 1.0
diff --git a/getopt-1.0.3b/Makefile b/getopt-1.1.0a/Makefile
index 92e99e9de2..6b50f849b0 100644
--- a/getopt-1.0.3b/Makefile
+++ b/getopt-1.1.0a/Makefile
@@ -3,7 +3,7 @@
 include ../make_include
 include ../MCONFIG
 
-GETOPTDIR=$(USRLIBDIR)/getopt
+GETOPTDIR=$(USRSHAREMISCDIR)/getopt
 
 # Define this to 0 to use the getopt(3) routines in this package.
 LIBCGETOPT=1
@@ -26,7 +26,7 @@ WARNINGS=-Wall \
          -W -Wshadow -Wpointer-arith -Wcast-qual \
          -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
          -Wnested-externs -Winline
-CFLAGS=$(WARNINGS) $(OPT)
+# CFLAGS= $(WARNINGS) $(OPT)
 
 SOURCES=getopt.c
 ifeq ($(LIBCGETOPT),0)
diff --git a/getopt-1.0.3b/README b/getopt-1.1.0a/README
index 1d795f5e47..1d795f5e47 100644
--- a/getopt-1.0.3b/README
+++ b/getopt-1.1.0a/README
diff --git a/getopt-1.0.3b/TODO b/getopt-1.1.0a/TODO
index 70f2ea9cb5..70f2ea9cb5 100644
--- a/getopt-1.0.3b/TODO
+++ b/getopt-1.1.0a/TODO
diff --git a/getopt-1.1.0a/getopt-1.0.6.lsm b/getopt-1.1.0a/getopt-1.0.6.lsm
new file mode 100644
index 0000000000..6323916c31
--- /dev/null
+++ b/getopt-1.1.0a/getopt-1.0.6.lsm
@@ -0,0 +1,19 @@
+Begin3
+Title: Getopt
+Version: 1.0.6
+Entered-date: 27JUN00
+Description: An improved implementation of getopt(1), a program to parse
+             options within a shell script. Fully compatible with other
+             getopt(1) implementations, but with many additions like
+             long options and mixing of options and parameters.
+Keywords: getopt script parse bash tcsh
+Author: frodol@dds.nl (Frodo Looijaard)
+Primary-site: http://huizen.dds.nl/~frodol
+              28kB getopt-1.0.6.tar.gz
+              600  getopt-1.0.6.lsm
+Alternate-site: sunsite.unc.edu /pub/Linux/utils/shell
+              28kB getopt-1.0.6.tar.gz
+              600  getopt-1.0.6.lsm
+Copying-policy: GPL
+End
+
diff --git a/getopt-1.0.3b/getopt.1 b/getopt-1.1.0a/getopt.1
index c3aaa01950..b7e360315b 100644
--- a/getopt-1.0.3b/getopt.1
+++ b/getopt-1.1.0a/getopt.1
@@ -427,6 +427,11 @@ can parse long options with optional arguments that are given an empty optional
 argument (but can not do this for short options). This 
 .BR getopt (1)
 treats optional arguments that are empty as if they were not present.
+
+The syntax if you do not want any short option variables at all is
+not very intuitive (you have to set them explicitely to the empty
+string).
+
 .SH AUTHOR
 Frodo Looijaard <frodol@dds.nl>
 .SH "SEE ALSO"
diff --git a/getopt-1.0.3b/getopt.c b/getopt-1.1.0a/getopt.c
index 345c1b977a..86efe2f84a 100644
--- a/getopt-1.0.3b/getopt.c
+++ b/getopt-1.1.0a/getopt.c
@@ -1,6 +1,6 @@
 /*
     getopt.c - Enhanced implementation of BSD getopt(1)
-    Copyright (c) 1997, 1998  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 1997, 1998, 1999, 2000  Frodo Looijaard <frodol@dds.nl>
 
     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
@@ -28,10 +28,13 @@
  * Version 1.0.2: Thu Jun 11 1998 (not present)
  *   Fixed gcc-2.8.1 warnings
  *   Fixed --version/-V option (not present)
- * Version 1.0.3
- *   1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
- *   - added Native Language Support
- *   
+ * Version 1.0.5: Tue Jun 22 1999
+ *   Make -u option work (not present)
+ * Version 1.0.6: Tue Jun 27 2000
+ *   No important changes
+ * Version 1.1.0: Tue Jun 30 2000
+ *   Added NLS support (partly written by Arkadiusz Mi<B6>kiewicz 
+ *     <misiek@misiek.eu.org>)
  */
 
 #include <stdio.h>
@@ -39,7 +42,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
-#include "../lib/nls.h"
 
 #if LIBCGETOPT
 #include <getopt.h>
@@ -47,6 +49,8 @@
 #include "getopt.h"
 #endif
 
+#include "../lib/nls.h"
+
 /* NON_OPT is the code that is returned when a non-option is found in '+' 
    mode */
 #define NON_OPT 1
@@ -90,12 +94,12 @@ void *our_malloc(size_t size)
 
 void *our_realloc(void *ptr, size_t size)
 {
-        void *ret=realloc(ptr,size);
-        if (! ret && size) {
-		fprintf(stderr,_("%s: Out of memory!\n"), "getopt");
-                exit(3);
-        }
-        return(ret);
+	void *ret=realloc(ptr,size);
+	if (! ret && size) {
+		fprintf(stderr,_("%s: Out of memory!\n"),"getopt");
+		exit(3);
+	}
+	return(ret);
 }
 
 /*
@@ -113,8 +117,8 @@ const char *normalize(const char *arg)
 	const char *argptr=arg;
 	char *bufptr;
 
-        if (BUFFER != NULL)
-                free(BUFFER);
+	if (BUFFER != NULL)
+		free(BUFFER);
 
 	if (!quote) { /* Just copy arg */
 		BUFFER=our_malloc(strlen(arg)+1);
@@ -320,16 +324,17 @@ void print_help(void)
 	fputs(_("Usage: getopt optstring parameters\n"),stderr);
 	fputs(_("       getopt [options] [--] optstring parameters\n"),stderr);
 	fputs(_("       getopt [options] -o|--options optstring [options] [--]\n"),stderr);
-        fputs(_("              parameters\n"),stderr);
+	fputs(_("              parameters\n"),stderr);
 	fputs(_("  -a, --alternative            Allow long options starting with single -\n"),stderr);
 	fputs(_("  -h, --help                   This small usage guide\n"),stderr);
 	fputs(_("  -l, --longoptions=longopts   Long options to be recognized\n"),stderr);
 	fputs(_("  -n, --name=progname          The name under which errors are reported\n"),stderr);
 	fputs(_("  -o, --options=optstring      Short options to be recognized\n"),stderr);
-        fputs(_("  -q, --quiet                  Disable error reporting by getopt(3)\n"),stderr);
+	fputs(_("  -q, --quiet                  Disable error reporting by getopt(3)\n"),stderr);
 	fputs(_("  -Q, --quiet-output           No normal output\n"),stderr);
 	fputs(_("  -s, --shell=shell            Set shell quoting conventions\n"),stderr);	
 	fputs(_("  -T, --test                   Test for getopt(1) version\n"),stderr);
+	fputs(_("  -u, --unqote                 Do not quote the output\n"),stderr);
 	fputs(_("  -V, --version                Output version information\n"),stderr);
 	exit(2);
 }
@@ -366,7 +371,7 @@ int main(int argc, char *argv[])
 	int opt;
 	int compatible=0;
 
-	setlocale(LC_ALL, "");
+	setlocale(LC_ALL,"");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
@@ -429,8 +434,11 @@ int main(int argc, char *argv[])
 			break;
 		case 'T':
 			exit(4);
+		case 'u':
+			quote=0;
+			break;
 		case 'V':
-			printf(_("getopt (enhanced) 1.0.3\n"));
+			printf(_("getopt (enhanced) 1.1.0\n"));
 			exit(0);
 		case '?':
 		case ':':
diff --git a/getopt-1.0.3b/gnu/getopt.c b/getopt-1.1.0a/gnu/getopt.c
index 59b51cd679..59b51cd679 100644
--- a/getopt-1.0.3b/gnu/getopt.c
+++ b/getopt-1.1.0a/gnu/getopt.c
diff --git a/getopt-1.0.3b/gnu/getopt.h b/getopt-1.1.0a/gnu/getopt.h
index d6ceb0eee1..d6ceb0eee1 100644
--- a/getopt-1.0.3b/gnu/getopt.h
+++ b/getopt-1.1.0a/gnu/getopt.h
diff --git a/getopt-1.0.3b/gnu/getopt1.c b/getopt-1.1.0a/gnu/getopt1.c
index 4aa8de6f67..4aa8de6f67 100644
--- a/getopt-1.0.3b/gnu/getopt1.c
+++ b/getopt-1.1.0a/gnu/getopt1.c
diff --git a/getopt-1.0.3b/parse.bash b/getopt-1.1.0a/parse.bash
index 864fc0add8..864fc0add8 100644
--- a/getopt-1.0.3b/parse.bash
+++ b/getopt-1.1.0a/parse.bash
diff --git a/getopt-1.0.3b/parse.tcsh b/getopt-1.1.0a/parse.tcsh
index 2266d0e648..2266d0e648 100644
--- a/getopt-1.0.3b/parse.tcsh
+++ b/getopt-1.1.0a/parse.tcsh
diff --git a/getopt-1.0.3b/test.bash b/getopt-1.1.0a/test.bash
index 149e1f9b05..149e1f9b05 100644
--- a/getopt-1.0.3b/test.bash
+++ b/getopt-1.1.0a/test.bash
diff --git a/getopt-1.0.3b/test.tcsh b/getopt-1.1.0a/test.tcsh
index d661e767de..d661e767de 100644
--- a/getopt-1.0.3b/test.tcsh
+++ b/getopt-1.1.0a/test.tcsh
diff --git a/clock/Makefile b/hwclock/Makefile
index 10e96051aa..70ff6436c5 100644
--- a/clock/Makefile
+++ b/hwclock/Makefile
@@ -23,7 +23,8 @@ hwclock: hwclock.o shhopt.o cmos.o rtc.o kd.o
 CWFLAGS := $(subst -Wmissing-prototypes,,$(CFLAGS))
 
 cmos.o: cmos.c
-	$(CC) $(CWFLAGS) -c $< -o $@
+	$(CC) $(CWFLAGS) -c cmos.c -o $@
+# $< expands to clock.h on some systems
 
 install: all
 	$(INSTALLDIR) $(SBINDIR) $(BINDIR) $(USRBINDIR)
diff --git a/clock/README.aeb b/hwclock/README.aeb
index 3955f90507..3955f90507 100644
--- a/clock/README.aeb
+++ b/hwclock/README.aeb
diff --git a/clock/README.hwclock b/hwclock/README.hwclock
index ba8bc44c37..ba8bc44c37 100644
--- a/clock/README.hwclock
+++ b/hwclock/README.hwclock
diff --git a/clock/README.shhopt-1.1 b/hwclock/README.shhopt-1.1
index 766d6cbdcf..766d6cbdcf 100644
--- a/clock/README.shhopt-1.1
+++ b/hwclock/README.shhopt-1.1
diff --git a/clock/adjtime.patch b/hwclock/adjtime.patch
index 81d0430fdd..81d0430fdd 100644
--- a/clock/adjtime.patch
+++ b/hwclock/adjtime.patch
diff --git a/clock/clock-ppc.c b/hwclock/clock-ppc.c
index 6d8969adb1..6d8969adb1 100644
--- a/clock/clock-ppc.c
+++ b/hwclock/clock-ppc.c
diff --git a/clock/clock.h b/hwclock/clock.h
index fc91826ce5..91d3df801a 100644
--- a/clock/clock.h
+++ b/hwclock/clock.h
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>		/* for errno, EPERM, EINVAL, ENOENT */
 #include <time.h>
@@ -23,7 +24,7 @@ typedef int bool;
 extern char *progname;
 extern int debug;
 extern int epoch_option;
-extern void outsyserr(char *msg);
+extern void outsyserr(char *msg, ...);
 
 /* cmos.c */
 extern void set_cmos_epoch(int ARCconsole, int SRM);
diff --git a/clock/cmos.c b/hwclock/cmos.c
index 16705bf7fe..4fc82d7982 100644
--- a/clock/cmos.c
+++ b/hwclock/cmos.c
@@ -184,10 +184,12 @@ set_cmos_access(int Jensen, int funky_toy) {
 
   /* see whether we are dealing with PC164/LX164/SX164, as they have a TOY
      that must be accessed differently to work correctly. */
+  /* Nautilus stuff reported by Neoklis Kyriazis */
   if (funky_toy ||
       is_in_cpuinfo("system variation", "PC164") ||
       is_in_cpuinfo("system variation", "LX164") ||
-      is_in_cpuinfo("system variation", "SX164")) {
+      is_in_cpuinfo("system variation", "SX164") ||
+      is_in_cpuinfo("system type", "Nautilus")) {
       funkyTOY = 1;
       if (debug) printf (_("funky TOY!\n"));
   }
@@ -553,7 +555,7 @@ set_hardware_clock_cmos(const struct tm *new_broken_time) {
 static int
 i386_iopl(const int level) {
 #if defined(__i386__) || defined(__alpha__)
-  extern int iopl(const int level);
+  extern int iopl(const int lvl);
   return iopl(level);
 #else
   return -2;
diff --git a/clock/hwclock.8 b/hwclock/hwclock.8
index f34bfac009..7e4106d453 100644
--- a/clock/hwclock.8
+++ b/hwclock/hwclock.8
@@ -33,21 +33,21 @@ Also, equivalent options \-r, \-w, \-s, \-a, \-v, \-u,
 with the program "clock", while \-h asks for a help message.
 
 .SH DESCRIPTION
-.I hwclock
+.B hwclock
 is a tool for accessing the Hardware Clock.  You can display the
 current time, set the Hardware Clock to a specified time, set the
 Hardware Clock to the System Time, and set the System Time from the
 Hardware Clock.
 .PP
 You can also run 
-.I hwclock 
+.B hwclock 
 periodically to insert or remove time from the Hardware Clock to
 compensate for systematic drift (where the clock consistently gains or
 loses time at a certain rate if left to run).
 
 .SH OPTIONS
 You need exactly one of the following options to tell 
-.I hwclock 
+.B hwclock 
 what function to perform:
 .PP
 .TP
@@ -106,7 +106,7 @@ option for details.
 .TP
 .B \-\-version
 Print the version of 
-.I hwclock 
+.B hwclock 
 on Standard Output.
 .br
 You need the following option if you specify 
@@ -116,14 +116,14 @@ option.  Otherwise, it is ignored.
 .B \-\-date=date_string
 Specifies the time to which to set the Hardware Clock.  The value of this
 option is an argument to the
-.I date(1)
+.BR date (1)
 program.  For example,
 .sp
 .I hwclock --set --date="9/22/96 16:45:05"
 .sp
 The argument is in local time, even if you keep your Hardware Clock in 
 Coordinated Universal time.  See the 
-.I \-\-utc
+.B \-\-utc
 option.
 
 .TP
@@ -146,7 +146,7 @@ Indicates that the Hardware Clock is kept in Coordinated Universal
 Time or local time, respectively.  It is your choice whether to keep
 your clock in UTC or local time, but nothing in the clock tells which
 you've chosen.  So this option is how you give that information to
-.IR hwclock .
+.BR hwclock .
 
 If you specify the wrong one of these options (or specify neither and
 take a wrong default), both setting and querying of the Hardware Clock
@@ -157,7 +157,7 @@ If you specify neither
 nor
 .B \-\-localtime
 , the default is whichever was specified the last time
-.I hwclock
+.B hwclock
 was used to set the clock (i.e. hwclock was successfully run with the
 .B \-\-set
 , 
@@ -172,12 +172,12 @@ exist, the default is local time.
 .B \-\-directisa
 is meaningful only on an ISA machine or an Alpha (which implements enough
 of ISA to be, roughly speaking, an ISA machine for 
-.IR hwclock 's
+.BR hwclock 's
 purposes).  For other machines, it has no effect.  This option tells
-.I hwclock
+.B hwclock
 to use explicit I/O instructions to access the Hardware Clock.
 Without this option, 
-.I hwclock
+.B hwclock
 will try to use the /dev/rtc device (which it assumes to be driven by the
 rtc device driver).  If it is unable to open the device (for read), it will
 use the explicit I/O instructions anyway.
@@ -191,7 +191,7 @@ Award BIOSes made between 4/26/94 and 5/31/95) wherein they are unable
 to deal with years after 1999.  If one attempts to set the year-of-century
 value to something less than 94 (or 95 in some cases), the value that
 actually gets set is 94 (or 95).  Thus, if you have one of these machines,
-.I hwclock
+.B hwclock
 cannot set the year after 1999 and cannot use the value of the clock as
 the true time in the normal way.
 
@@ -199,7 +199,7 @@ To compensate for this (without your getting a BIOS update, which would
 definitely be preferable), always use 
 .B \-\-badyear
 if you have one of these machines.  When  
-.I hwclock
+.B hwclock
 knows it's working with a brain-damaged clock, it ignores the year part of
 the Hardware Clock value and instead tries to guess the year based on the 
 last calibrated date in the adjtime file, by assuming that that date is
@@ -210,7 +210,7 @@ or
 at least once a year!
 
 Though 
-.I hwclock
+.B hwclock
 ignores the year value when it reads the Hardware Clock, it sets the
 year value when it sets the clock.  It sets it to 1995, 1996, 1997, or
 1998, whichever one has the same position in the leap year cycle as
@@ -219,7 +219,7 @@ they belong.  Again, if you let the Hardware Clock run for more than a
 year without setting it, this scheme could be defeated and you could
 end up losing a day.
 
-.I hwclock
+.B hwclock
 warns you that you probably need 
 .B \-\-badyear
 whenever it finds your Hardware Clock set to 1994 or 1995.  
@@ -233,16 +233,16 @@ whenever it finds your Hardware Clock set to 1994 or 1995.
 .TP
 .B \-\-funky\-toy
 These options all tell 
-.I hwclock 
+.B hwclock 
 what kind of Alpha machine you have.  They
 are invalid if you don't have an Alpha and shouldn't be necessary if you
 do, because 
-.I hwclock 
+.B hwclock 
 should be able to determine by itself what it's 
 running on, at least when
 .I /proc
 is mounted.  These options make it possible for 
-.I hwclock 
+.B hwclock 
 to work even when
 its environment does not conform to its expectations and thus it cannot
 accurately determine what sort of system it is running on.  If you think
@@ -251,9 +251,9 @@ running with the
 .B \-\-debug 
 option to see what conclusions the program is
 reaching and how.  If you find you need one of these options to make
-.I hwclock 
+.B hwclock 
 work, contact the 
-.I hwclock 
+.B hwclock 
 maintainer to see if the program can be improved to detect your system
 automatically.
 
@@ -280,11 +280,11 @@ Do everything except actually updating the Hardware Clock or anything
 else.  This is useful, especially in conjunction with
 .B \-\-debug,
 in learning about 
-.I hwclock.
+.B hwclock.
 .TP
 .B \-\-debug
 Display a lot of information about what 
-.I hwclock 
+.B hwclock 
 is doing internally.  Some of its function is complex and this output
 can help you understand how the program works.
 
@@ -308,7 +308,7 @@ ticks, so the clock actually has virtually infinite precision.
 This clock is commonly called the hardware clock, the real time clock,
 the RTC, the BIOS clock, and the CMOS clock.  Hardware Clock, in its
 capitalized form, was coined for use by 
-.I hwclock 
+.B hwclock 
 because all of the other names are inappropriate to the point of being
 misleading.
 .PP
@@ -349,7 +349,7 @@ the kernel timezone value.  An example is the vfat filesystem.  If the
 kernel timezone value is wrong, the vfat filesystem will report and
 set the wrong timestamps on files.
 .PP
-.I hwclock
+.B hwclock
 sets the kernel timezone to the value indicated by TZ and/or
 /usr/local/timezone when you set the System Time using the 
 .B \-\-hctosys
@@ -366,7 +366,7 @@ This second field is not used under Linux and is always zero.
 
 .SH How hwclock Accesses the Hardware Clock
 .PP
-.I hwclock 
+.B hwclock 
 Uses many different ways to get and set Hardware Clock values.
 The most normal way is to do I/O to the device special file /dev/rtc,
 which is presumed to be driven by the rtc device driver.  However,
@@ -380,13 +380,13 @@ On older systems, the method of accessing the Hardware Clock depends on
 the system hardware. 
 .PP
 On an ISA system, 
-.I hwclock 
+.B hwclock 
 can directly access the "CMOS memory" registers that
 constitute the clock, by doing I/O to Ports 0x70 and 0x71.  It does
 this with actual I/O instructions and consequently can only do it if
 running with superuser effective userid.  (In the case of a Jensen
 Alpha, there is no way for
-.I hwclock 
+.B hwclock 
 to execute those I/O instructions, and so it uses instead the
 /dev/port device special file, which provides almost as low-level an
 interface to the I/O subsystem).
@@ -399,17 +399,17 @@ working rtc device drivers available.
 
 .PP
 On an m68k system,
-.I hwclock
+.B hwclock
 can access the clock via the console driver, via the device special
 file /dev/tty1.
 .PP
-.I hwclock 
+.B hwclock 
 tries to use /dev/rtc.  If it is compiled for a kernel that doesn't have
 that function or it is unable to open /dev/rtc, 
-.I hwclock 
+.B hwclock 
 will fall back to another method, if available.  On an ISA or Alpha
 machine, you can force
-.I hwclock
+.B hwclock
 to use the direct manipulation of the CMOS registers without even trying
 .I /dev/rtc
 by specifying the \-\-directisa option.
@@ -420,12 +420,12 @@ by specifying the \-\-directisa option.
 The Hardware Clock is usually not very accurate.  However, much of its
 inaccuracy is completely predictable - it gains or loses the same amount
 of time every day.  This is called systematic drift.
-.IR hwclock 's 
+.BR hwclock 's 
 "adjust" function lets you make systematic corrections to correct the
 systematic drift.
 .PP
 It works like this:  
-.I hwclock 
+.B hwclock 
 keeps a file,
 .I /etc/adjtime,
 that keeps some historical information.  This is called the adjtime file.
@@ -433,27 +433,26 @@ that keeps some historical information.  This is called the adjtime file.
 Suppose you start with no adjtime file.  You issue a 
 .I hwclock \-\-set
 command to set the Hardware Clock to the true current time.  
-.I Hwclock 
+.B Hwclock 
 creates the adjtime file and records in it the current time as the 
 last time the clock was calibrated.
-5 days
-later, the clock has gained 10 seconds, so you issue another
+5 days later, the clock has gained 10 seconds, so you issue another
 .I hwclock \-\-set
 command to set it back 10 seconds.  
-.I Hwclock 
+.B Hwclock 
 updates the adjtime file to show the current time as the last time the
 clock was calibrated, and records 2 seconds per day as the systematic
 drift rate.  24 hours go by, and then you issue a
 .I hwclock \-\-adjust
 command.  
-.I Hwclock 
+.B Hwclock 
 consults the adjtime file and sees that the clock gains 2 seconds per
 day when left alone and that it has been left alone for exactly one
 day.  So it subtracts 2 seconds from the Hardware Clock.  It then
 records the current time as the last time the clock was adjusted.
 Another 24 hours goes by and you issue another
 .I hwclock \-\-adjust.
-.I Hwclock 
+.B Hwclock 
 does the same thing: subtracts 2 seconds and updates the adjtime file
 with the current time as the last time the clock was adjusted.
 .PP
@@ -462,18 +461,18 @@ Every time you calibrate (set) the clock (using
 or
 .I \-\-systohc
 ),
-.I hwclock 
+.B hwclock 
 recalculates the systematic drift rate based on how long it has been
 since the last calibration, how long it has been since the last
 adjustment, what drift rate was assumed in any intervening
 adjustments, and the amount by which the clock is presently off.
 .PP
 A small amount of error creeps in any time 
-.I hwclock 
+.B hwclock 
 sets the clock, so it refrains from making an adjustment that would be
 less than 1 second.  Later on, when you request an adjustment again,
 the accumulated drift will be more than a second and
-.I hwclock 
+.B hwclock 
 will do the adjustment then.
 .PP
 It is good to do a 
@@ -493,7 +492,7 @@ Line 1: 3 numbers, separated by blanks: 1) systematic drift rate in
 seconds per day, floating point decimal; 2) Resulting number of
 seconds since 1969 UTC of most recent adjustment or calibration,
 decimal integer; 3) zero (for compatibility with
-.IR clock )
+.BR clock (8))
 as a decimal integer.
 .PP
 Line 2: 1 number: Resulting number of seconds since 1969 UTC of most
@@ -505,13 +504,13 @@ contain a valid time).  This is a decimal integer.
 Line 3: "UTC" or "LOCAL".  Tells whether the Hardware Clock is set to 
 Coordinated Universal Time or local time.  You can always override this
 value with options on the 
-.I hwclock
+.B hwclock
 command line.
 .PP
 You can use an adjtime file that was previously used with the 
-.I clock
+.BR clock (8)
 program with 
-.I hwclock.
+.B hwclock.
 
 
 .SH "Automatic Hardware Clock Synchronization By the Kernel"
@@ -552,14 +551,14 @@ minute mode.
 
 There is some sort of standard that defines CMOS memory Byte 50 on an ISA
 machine as an indicator of what century it is.  
-.I hwclock
+.B hwclock
 does not use or set that byte because there are some machines that
 don't define the byte that way, and it really isn't necessary anyway,
 since the year-of-century does a good job of implying which century it
 is.
 
 If you have a bona fide use for a CMOS century byte, contact the 
-.I hwclock
+.B hwclock
 maintainer; an option may be appropriate.
 
 Note that this section is only relevant when you are using the "direct
diff --git a/clock/hwclock.c b/hwclock/hwclock.c
index d45516b4bc..3a3a94e1aa 100644
--- a/clock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -20,6 +20,8 @@
  *
  * Fix for Award 2094 bug, Dave Coffin  (dcoffin@shore.net)  11/12/98
  * Change of local time handling, Stefan Ring <e9725446@stud3.tuwien.ac.at>
+ *
+ * Distributed under GPL
  */
 
 /*
@@ -75,9 +77,9 @@
 #include <time.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <shhopt.h>
 #include <stdarg.h>
 
+#include "shhopt.h"
 #include "clock.h"
 #include "nls.h"
 
@@ -526,14 +528,12 @@ display_time(const bool hclock_valid, const time_t systime,
             "either invalid (e.g. 50th day of month) or beyond the range "
             "we can handle (e.g. Year 2095).\n"));
   else {
-    char *ctime_now;  /* Address of static storage containing time string */
+    struct tm *lt;
+    char *format = "%c";
+    char ctime_now[200];
 
-    /* For some strange reason, ctime() is designed to include a newline
-       character at the end.  We have to remove that.
-       */
-    ctime_now = ctime(&systime);    /* Compute display value for time */
-    *(ctime_now+strlen(ctime_now)-1) = '\0';  /* Cut off trailing newline */
-    
+    lt = localtime(&systime);
+    strftime(ctime_now, sizeof(ctime_now), format, lt);
     printf(_("%s  %.6f seconds\n"), ctime_now, -(sync_duration));
   }
 }
@@ -821,7 +821,7 @@ save_adjtime(const struct adjtime adjtime, const bool testing) {
                "in it (" ADJPATH ") for writing");
 	err = 1;
       } else {
-        if (fprintf(adjfile, newfile) < 0) {
+        if (fputs(newfile, adjfile) < 0) {
 	  outsyserr("Could not update file with the clock adjustment "
 		    "parameters (" ADJPATH ") in it");
 	  err = 1;
@@ -1075,6 +1075,12 @@ manipulate_epoch(const bool getepoch, const bool setepoch,
 #endif
 }
 
+#if __ia64__
+#define RTC_DEV "/dev/efirtc"
+#else
+#define RTC_DEV "/dev/rtc"
+#endif
+
 /*
     usage - Output (error and) usage information
 
@@ -1110,12 +1116,12 @@ usage( const char *fmt, ... ) {
     "\nOptions: \n"
     "  --utc         the hardware clock is kept in coordinated universal time\n"
     "  --localtime   the hardware clock is kept in local time\n"
-    "  --directisa   access the ISA bus directly instead of /dev/rtc\n"
+    "  --directisa   access the ISA bus directly instead of %s\n"
     "  --badyear     ignore rtc's year because the bios is broken\n"
     "  --date        specifies the time to which to set the hardware clock\n"
     "  --epoch=year  specifies the year which is the beginning of the \n"
     "                hardware clock's epoch value\n"
-    ));
+    ),RTC_DEV);
 #ifdef __alpha__
   fprintf( usageto, _(
     "  --jensen, --arc, --srm, --funky-toy\n"
@@ -1136,7 +1142,7 @@ usage( const char *fmt, ... ) {
 }
 
 int 
-main(int argc, char **argv, char **envp) {
+main(int argc, char **argv) {
 
   struct timeval startup_time;
     /* The time we started up, in seconds into the epoch, including fractions.
@@ -1190,9 +1196,13 @@ main(int argc, char **argv, char **envp) {
 
   gettimeofday(&startup_time, NULL);  /* Remember what time we were invoked */
 
-  /* not LC_ALL - the LC_NUMERIC part gives problems when
-     writing to /etc/adjtime - gqueri@mail.dotcom.fr */
-  setlocale(LC_MESSAGES, "");
+  setlocale(LC_ALL, "");
+#ifdef LC_NUMERIC
+  /* We need LC_CTYPE and LC_TIME and LC_MESSAGES, but must avoid
+     LC_NUMERIC since it gives problems when we write to /etc/adjtime.
+     - gqueri@mail.dotcom.fr */
+  setlocale(LC_NUMERIC, "C");
+#endif
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 
@@ -1301,9 +1311,16 @@ main(int argc, char **argv, char **envp) {
 
 /* A single routine for greater uniformity */
 void
-outsyserr(char *msg) {
-	fprintf(stderr, "%s: %s, errno=%d: %s.\n",
-		progname, msg, errno, strerror(errno));
+outsyserr(char *msg, ...) {
+	va_list args;
+	int errsv = errno;
+	
+	fprintf(stderr, "%s: ", progname);
+	va_start(args, msg);
+	vfprintf(stderr, msg, args);
+	va_end(args);
+	fprintf(stderr, ", errno=%d: %s.\n",
+		errsv, strerror(errsv));
 }
 
 /****************************************************************************
diff --git a/clock/kd.c b/hwclock/kd.c
index 8fab619ff7..fd4fdd5a12 100644
--- a/clock/kd.c
+++ b/hwclock/kd.c
@@ -55,8 +55,8 @@ synchronize_to_clock_tick_kd(void) {
        to keep the machine from freezing. */
 
 #ifdef HAVE_nanosleep
-    struct timespec sleep = { 0, 1 };
-    nanosleep( &sleep, NULL );
+    struct timespec xsleep = { 0, 1 };
+    nanosleep( &xsleep, NULL );
 #else
     usleep(1);
 #endif
diff --git a/clock/rtc.c b/hwclock/rtc.c
index 652388430d..2874bfa14b 100644
--- a/clock/rtc.c
+++ b/hwclock/rtc.c
@@ -18,6 +18,13 @@
  * used a struct rtc_time different from that used in mc146818rtc.h.
  */
 
+/* ia64 uses /dev/efirtc (char 10,136) */
+#if __ia64__
+#define RTC_DEV "/dev/efirtc"
+#else
+#define RTC_DEV "/dev/rtc"
+#endif
+
 /* On Sparcs, there is a <asm/rtc.h> that defines different ioctls
    (that are required on my machine). However, this include file
    does not exist on other architectures. */
@@ -95,7 +102,7 @@ do_rtc_read_ioctl(int rtc_fd, struct tm *tm) {
 #endif
   if (rc == -1) {
     perror(ioctlname);
-    fprintf(stderr, _("ioctl() to /dev/rtc to read the time failed.\n"));
+    fprintf(stderr, _("ioctl() to %s to read the time failed.\n"),RTC_DEV);
     exit(5);
   }
 #ifdef __sparc__
@@ -126,7 +133,7 @@ busywait_for_rtc_clock_tick(const int rtc_fd) {
   int rc;
 
   if (debug)
-    printf(_("Waiting in loop for time from /dev/rtc to change\n"));
+    printf(_("Waiting in loop for time from %s to change\n"),RTC_DEV);
 
   rc = do_rtc_read_ioctl(rtc_fd, &start_time);
   if (rc)
@@ -160,9 +167,9 @@ synchronize_to_clock_tick_rtc(void) {
 int rtc_fd;  /* File descriptor of /dev/rtc */
 int ret;
 
-  rtc_fd = open("/dev/rtc",O_RDONLY);
+  rtc_fd = open(RTC_DEV,O_RDONLY);
   if (rtc_fd == -1) {
-    outsyserr(_("open() of /dev/rtc failed"));
+    outsyserr(_("open() of %s failed"),RTC_DEV);
     ret = 1;
   } else {
     int rc;  /* Return code from ioctl */
@@ -179,16 +186,16 @@ int ret;
          on an Alpha, where the Hardware Clock interrupts are used by the
          kernel for the system clock, so aren't at the user's disposal.
          */
-      if (debug) printf(_("/dev/rtc does not have interrupt functions. "));
+      if (debug)
+	      printf(_("%s does not have interrupt functions. "),RTC_DEV);
       ret = busywait_for_rtc_clock_tick(rtc_fd);
-    } else if (rc != -1) {
-      int rc;  /* return code from ioctl */
+    } else if (rc == 0) {
       unsigned long dummy;
 
       /* this blocks until the next update interrupt */
       rc = read(rtc_fd, &dummy, sizeof(dummy));
       if (rc == -1) {
-        outsyserr(_("read() to /dev/rtc to wait for clock tick failed"));
+        outsyserr(_("read() to %s to wait for clock tick failed"),RTC_DEV);
         ret = 1;
       } else {
         ret = 0;
@@ -196,11 +203,11 @@ int ret;
       /* Turn off update interrupts */
       rc = ioctl(rtc_fd, RTC_UIE_OFF, 0);
       if (rc == -1)
-        outsyserr(_("ioctl() to /dev/rtc to turn off update interrupts "
-		    "failed"));
+        outsyserr(_("ioctl() to %s to turn off update interrupts "
+		    "failed"),RTC_DEV);
     } else {
-      outsyserr(_("ioctl() to /dev/rtc to turn on update interrupts "
-		"failed unexpectedly"));
+      outsyserr(_("ioctl() to %s to turn on update interrupts "
+		"failed unexpectedly"),RTC_DEV);
       ret = 1;
     }
     close(rtc_fd);
@@ -217,9 +224,9 @@ read_hardware_clock_rtc(struct tm *tm) {
 -----------------------------------------------------------------------------*/
   int rtc_fd;  /* File descriptor of /dev/rtc */
 
-  rtc_fd = open("/dev/rtc",O_RDONLY);
+  rtc_fd = open(RTC_DEV,O_RDONLY);
   if (rtc_fd == -1) {
-    outsyserr(_("open() of /dev/rtc failed"));
+    outsyserr(_("open() of %s failed"),RTC_DEV);
     exit(5);
   }
 
@@ -240,9 +247,9 @@ set_hardware_clock_rtc(const struct tm *new_broken_time) {
   int rc;
   int rtc_fd;
 
-  rtc_fd = open("/dev/rtc", O_RDONLY);
+  rtc_fd = open(RTC_DEV, O_RDONLY);
   if (rtc_fd < 0) {
-    outsyserr(_("Unable to open /dev/rtc"));
+    outsyserr(_("Unable to open %s"),RTC_DEV);
     exit(5);
   } else {
     char *ioctlname;
@@ -265,7 +272,7 @@ set_hardware_clock_rtc(const struct tm *new_broken_time) {
 #endif
     if (rc == -1) {
       perror(ioctlname);
-      fprintf(stderr, _("ioctl() to /dev/rtc to set the time failed.\n"));
+      fprintf(stderr, _("ioctl() to %s to set the time failed.\n"),RTC_DEV);
       exit(5);
     } else {
       if (debug)
@@ -293,13 +300,13 @@ static struct clock_ops rtc = {
 /* return &rtc if /dev/rtc can be opened, NULL otherwise */
 struct clock_ops *
 probe_for_rtc_clock(){
-    int rtc_fd = open("/dev/rtc", O_RDONLY);
+    int rtc_fd = open(RTC_DEV, O_RDONLY);
     if (rtc_fd > 0) {
       close(rtc_fd);
       return &rtc;
     }
     if (debug)
-      outsyserr(_("Open of /dev/rtc failed"));
+      outsyserr(_("Open of %s failed"),RTC_DEV);
     return NULL;
 }
 
@@ -312,30 +319,30 @@ get_epoch_rtc(unsigned long *epoch_p, int silent) {
 ----------------------------------------------------------------------------*/
   int rtc_fd;
 
-  rtc_fd = open("/dev/rtc", O_RDONLY);
+  rtc_fd = open(RTC_DEV, O_RDONLY);
   if (rtc_fd < 0) {
     if (!silent) {
       if (errno == ENOENT) 
         fprintf(stderr, _(
 		"To manipulate the epoch value in the kernel, we must "
                 "access the Linux 'rtc' device driver via the device special "
-                "file /dev/rtc.  This file does not exist on this system.\n"));
+                "file %s.  This file does not exist on this system.\n"),RTC_DEV);
       else 
-        outsyserr(_("Unable to open /dev/rtc"));
+        outsyserr(_("Unable to open %s"),RTC_DEV);
     }
     return 1;
   }
 
   if (ioctl(rtc_fd, RTC_EPOCH_READ, epoch_p) == -1) {
     if (!silent)
-      outsyserr(_("ioctl(RTC_EPOCH_READ) to /dev/rtc failed"));
+      outsyserr(_("ioctl(RTC_EPOCH_READ) to %s failed"),RTC_DEV);
     close(rtc_fd);
     return 1;
   }
 
   if (debug)
-	  printf(_("we have read epoch %ld from /dev/rtc "
-		 "with RTC_EPOCH_READ ioctl.\n"), *epoch_p);
+	  printf(_("we have read epoch %ld from %s "
+		 "with RTC_EPOCH_READ ioctl.\n"), *epoch_p,RTC_DEV);
 
   close(rtc_fd);
   return 0;
@@ -359,27 +366,27 @@ set_epoch_rtc(unsigned long epoch) {
     return 1;
   }
 
-  rtc_fd = open("/dev/rtc", O_RDONLY);
+  rtc_fd = open(RTC_DEV, O_RDONLY);
   if (rtc_fd < 0) {
     if (errno == ENOENT) 
       fprintf(stderr, _("To manipulate the epoch value in the kernel, we must "
               "access the Linux 'rtc' device driver via the device special "
-              "file /dev/rtc.  This file does not exist on this system.\n"));
+              "file %s.  This file does not exist on this system.\n"),RTC_DEV);
     else
-      outsyserr(_("Unable to open /dev/rtc"));
+      outsyserr(_("Unable to open %s"),RTC_DEV);
     return 1;
   }
 
   if (debug)
     printf(_("setting epoch to %ld "
-	   "with RTC_EPOCH_SET ioctl to /dev/rtc.\n"), epoch);
+	   "with RTC_EPOCH_SET ioctl to %s.\n"), epoch, RTC_DEV);
 
   if (ioctl(rtc_fd, RTC_EPOCH_SET, epoch) == -1) {
     if (errno == EINVAL)
-      fprintf(stderr, _("The kernel device driver for /dev/rtc "
-	      "does not have the RTC_EPOCH_SET ioctl.\n"));
+      fprintf(stderr, _("The kernel device driver for %s "
+	      "does not have the RTC_EPOCH_SET ioctl.\n"),RTC_DEV);
     else 
-      outsyserr(_("ioctl(RTC_EPOCH_SET) to /dev/rtc failed"));
+      outsyserr(_("ioctl(RTC_EPOCH_SET) to %s failed"),RTC_DEV);
     close(rtc_fd);
     return 1;
   }
diff --git a/clock/shhopt-1.1.lsm b/hwclock/shhopt-1.1.lsm
index a61a26969c..a61a26969c 100644
--- a/clock/shhopt-1.1.lsm
+++ b/hwclock/shhopt-1.1.lsm
diff --git a/clock/shhopt.c b/hwclock/shhopt.c
index ac34128292..ac34128292 100644
--- a/clock/shhopt.c
+++ b/hwclock/shhopt.c
diff --git a/clock/shhopt.h b/hwclock/shhopt.h
index ca8501ef58..ca8501ef58 100644
--- a/clock/shhopt.h
+++ b/hwclock/shhopt.h
diff --git a/kbd/kbdrate.c b/kbd/kbdrate.c
index 747757daf2..df116e1e07 100644
--- a/kbd/kbdrate.c
+++ b/kbd/kbdrate.c
@@ -273,7 +273,8 @@ int main( int argc, char **argv )
 
       close( fd );
 
-      if (!silent) printf( _("Typematic Rate set to %.1f cps (delay = %d ms)\n"),
+      if (!silent)
+	      printf( _("Typematic Rate set to %.1f cps (delay = %d ms)\n"),
                            valid_rates[value & 0x1f] / 10.0,
                            valid_delays[ (value & 0x60) >> 5 ] );
 
diff --git a/lib/Makefile b/lib/Makefile
index a9f8596d1c..31e953ce79 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,9 +1,7 @@
 include ../make_include
 include ../MCONFIG
 
-CFLAGS=-I$(LIB) $(OPT)
-
-all: err.o my_reboot.o setproctitle.o env.o
+all: err.o my_reboot.o setproctitle.o env.o carefulputc.o
 
 err.o: err.c
 
@@ -13,6 +11,8 @@ env.o: env.h
 
 setproctitle.o: setproctitle.h
 
+carefulputc.o: carefulputc.h
+
 .PHONY: clean
 clean:
 	-rm -f *.o *~ core
diff --git a/lib/carefulputc.c b/lib/carefulputc.c
new file mode 100644
index 0000000000..9322337721
--- /dev/null
+++ b/lib/carefulputc.c
@@ -0,0 +1,26 @@
+/* putc() for use in write and wall (that sometimes are sgid tty) */
+/* Avoid control characters in our locale, and also ASCII control characters.
+   Note that the locale of the recipient is unknown. */
+#include <stdio.h>
+#include <ctype.h>
+#include "carefulputc.h"
+
+#define iso8859x_iscntrl(c) \
+	(((c) & 0x7f) < 0x20 || (c) == 0x7f)
+
+int
+carefulputc(int c, FILE *fp) {
+	int ret;
+
+	if (c == '\007' || c == '\t' || c == '\r' || c == '\n' ||
+	    (!iso8859x_iscntrl(c) && (isprint(c) || isspace(c))))
+		ret = putc(c, fp);
+	else if ((c & 0x80) || !isprint(c^0x40))
+		ret = fprintf(fp, "\\%3o", (unsigned char) c);
+	else {
+		ret = putc('^', fp);
+		if (ret != EOF)
+			ret = putc(c^0x40, fp);
+	}
+	return (ret < 0) ? EOF : 0;
+}
diff --git a/lib/carefulputc.h b/lib/carefulputc.h
new file mode 100644
index 0000000000..29cc75da0e
--- /dev/null
+++ b/lib/carefulputc.h
@@ -0,0 +1 @@
+extern int carefulputc(int c, FILE *fp);
diff --git a/lib/nls.h b/lib/nls.h
index 67b42a9991..d36a5bc881 100644
--- a/lib/nls.h
+++ b/lib/nls.h
@@ -1,3 +1,4 @@
+int main(int argc, char *argv[]);
 
 #include "../defines.h"		/* for HAVE_locale_h */
 
diff --git a/lib/pathnames.h b/lib/pathnames.h
index 60797f94eb..672b58e92b 100644
--- a/lib/pathnames.h
+++ b/lib/pathnames.h
@@ -128,7 +128,7 @@ Libc5 and glibc 2.0-2.1 have /var/spool/mail, but glibc 2.1.1 has /var/mail.
 /* used in login-utils/shutdown.c */
 #define _PATH_MTAB		"/etc/mtab"
 #define _PATH_UMOUNT		"/bin/umount"
-#define UMOUNT_ARGS		"umount", "-a"
+#define UMOUNT_ARGS		"umount", "-a", "-t", "nodevfs"
 #define SWAPOFF_ARGS            "swapoff", "-a"
 
 /* used in login-utils/setpwnam.h and login-utils/islocal.c */
diff --git a/lib/widechar.h b/lib/widechar.h
index a8d288298a..c440006f79 100644
--- a/lib/widechar.h
+++ b/lib/widechar.h
@@ -38,4 +38,6 @@
 # define wcsdup strdup
 # define wcslen strlen
 
+# define wcwidth(c) 1
+
 #endif
diff --git a/login-utils/Makefile b/login-utils/Makefile
index 0960854ecb..d986501e13 100644
--- a/login-utils/Makefile
+++ b/login-utils/Makefile
@@ -19,7 +19,7 @@ MAN1.PASSWD=    passwd.1
 MAN8.GETTY=	agetty.8
 
 MAN8.INIT=	fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \
-		need.8
+		initctl.8
 
 MAN8.PUTILS=	vipw.8 vigr.8
 
@@ -28,7 +28,7 @@ MAN8.PUTILS=	vipw.8 vigr.8
 
 SBIN.GETTY=	agetty
 
-SBIN.INIT=	simpleinit shutdown need
+SBIN.INIT=	simpleinit shutdown initctl
 
 BIN.PUTILS=	login
 
@@ -84,14 +84,22 @@ all-misc: $(USRBIN.MISC)
 
 # Rules for everything else
 
-agetty.o: $(LIB)/pathnames.h
+checktty.o login.o: login.h
+cryptocard.o login.o: cryptocard.h
+chfn.o chsh.o islocal.o passwd.o: islocal.h
+chfn.o chsh.o passwd.o setpwnam.o vipw.o: setpwnam.h
+chfn.o chsh.o login.o newgrp.o passwd.o simpleinit.o: my_crypt.h
+initctl.o simpleinit.o: simpleinit.h
+agetty.o islocal.o last.o setpwnam.o shutdown.o simpleinit.o \
+	vipw.o: $(LIB)/pathnames.h
+shutdown.o simpleinit.o: $(LIB)/linux_reboot.h
+wall.o: ttymsg.h $(LIB)/carefulputc.h
+
 agetty: agetty.o
 chfn: chfn.o islocal.o setpwnam.o $(LIB)/env.o
 	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM)
 chsh: chsh.o islocal.o setpwnam.o $(LIB)/env.o
 	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM)
-islocal.o: $(LIB)/pathnames.h
-last.o: $(LIB)/pathnames.h
 last: last.o
 
 ifeq "$(HAVE_PAM)" "yes"
@@ -107,36 +115,35 @@ mesg: mesg.o $(ERR_O)
 newgrp: newgrp.o 
 	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT) $(PAM)
 
-setpwnam.o: $(LIB)/pathnames.h
-shutdown.o: $(LIB)/pathnames.h $(LIB)/linux_reboot.h
 shutdown: shutdown.o $(LIB)/my_reboot.o
-simpleinit.o: $(LIB)/pathnames.h $(LIB)/linux_reboot.h simpleinit.h
-need.o: simpleinit.h
 
 simpleinit: simpleinit.o $(LIB)/my_reboot.o
 	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT)
 
-need: need.o
+initctl: initctl.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
-vipw.o: $(LIB)/pathnames.h
 vipw: vipw.o
 
 newgrp.o: $(LIB)/pathnames.h
 	$(CC) -c $(CFLAGS) $(PAMFL) newgrp.c 
 
-wall: wall.o ttymsg.o
+wall: wall.o ttymsg.o $(LIB)/carefulputc.o
 
+LOGINFLAGS=
 ifeq "$(USE_TTY_GROUP)" "yes"
+	LOGINFLAGS += -DUSE_TTY_GROUP
+endif
+ifeq "$(ALLOW_VCS_USE)" "yes"
+	LOGINFLAGS += -DCHOWNVCS
+endif
+
 login.o: login.c $(LIB)/pathnames.h $(LIB)/setproctitle.c $(LIB)/setproctitle.h
-	$(CC) -c $(CFLAGS) $(PAMFL) -DUSE_TTY_GROUP login.c
+	$(CC) -c $(CFLAGS) $(PAMFL) $(LOGINFLAGS) login.c
+
+# LOGINFLAGS here only for -DUSE_TTY_GROUP
 mesg.o: mesg.c $(LIB)/errs.h
-	$(CC) -c $(CFLAGS) -DUSE_TTY_GROUP mesg.c
-else
-login.o: $(LIB)/pathnames.h
-	$(CC) -c $(CFLAGS) $(PAMFL) login.c
-mesg.o: $(LIB)/errs.h
-endif
+	$(CC) -c $(CFLAGS) $(LOGINFLAGS) mesg.c
 
 passwd: passwd.o islocal.o setpwnam.o $(LIB)/env.o
 	$(CC) $(LDFLAGS) -o $@ $^ $(CRYPT)
@@ -159,7 +166,7 @@ install: all $(WHAT_TO_INSTALL)
 
 install-putils: $(BIN.PUTILS) $(USRBIN.PUTILS) $(USRSBIN.PUTILS)
 	$(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(USRSBINDIR)
-	$(INSTALLSUID) $(BIN.PUTILS) $(BINDIR)
+	$(INSTALLBIN) $(BIN.PUTILS) $(BINDIR)
 	$(INSTALLSUID) $(USRBIN.PUTILS) $(USRBINDIR)
 	$(INSTALLBIN) $(USRSBIN.PUTILS) $(USRSBINDIR)
 	(cd $(USRSBINDIR); ln -sf vipw vigr)
@@ -183,7 +190,12 @@ install-init: $(SBIN.INIT)
 	(cd $(SHUTDOWNDIR); ln -sf shutdown fastboot)
 	(cd $(SHUTDOWNDIR); ln -sf shutdown halt)
 	(cd $(SHUTDOWNDIR); ln -sf shutdown fasthalt)
-	(cd $(SHUTDOWNDIR); ln -sf need display-services)
+	(cd $(SHUTDOWNDIR); ln -sf initctl need)
+	(cd $(SHUTDOWNDIR); ln -sf initctl display-services)
+	(cd $(SHUTDOWNDIR); ln -sf initctl provide)
+	(cd $(MAN8DIR);     ln -sf initctl.8 need.8)
+	(cd $(MAN8DIR);     ln -sf initctl.8 display-services.8)
+	(cd $(MAN8DIR);     ln -sf initctl.8 provide.8)
 
 
 install-getty: $(SBIN.GETTY)
diff --git a/login-utils/agetty.c b/login-utils/agetty.c
index 6ae4e83358..63f4adfa65 100644
--- a/login-utils/agetty.c
+++ b/login-utils/agetty.c
@@ -489,6 +489,38 @@ parse_args(argc, argv, op)
     if (argc > optind && argv[optind])
 	setenv ("TERM", argv[optind], 1);
 
+#ifdef DO_DEVFS_FIDDLING
+    /*
+     * some devfs junk, following Goswin Brederlow:
+     *   turn ttyS<n> into tts/<n>
+     *   turn tty<n> into vc/<n>
+     */
+    if (op->tty && strlen(op->tty) < 90) {
+	    char dev_name[100];
+	    struct stat st;
+
+	    if (strncmp(op->tty, "ttyS", 4) == 0) {
+		    strcpy(dev_name, "/dev/");
+		    strcat(dev_name, op->tty);
+		    if (stat(dev_name, &st) < 0) {
+			    strcpy(dev_name, "/dev/tts/");
+			    strcat(dev_name, op->tty + 4);
+			    if (stat(dev_name, &st) == 0)
+				    op->tty = strdup(dev_name + 5);
+		    }
+	    } else if (strncmp(op->tty, "tty", 3) == 0) {
+		    strcpy(dev_name, "/dev/");
+		    strncat(dev_name, op->tty, 90);
+		    if (stat(dev_name, &st) < 0) {
+			    strcpy(dev_name, "/dev/vc/");
+			    strcat(dev_name, op->tty + 3);
+			    if (stat(dev_name, &st) == 0)
+				    op->tty = strdup(dev_name + 5);
+		    }
+	    }
+    }
+#endif
+
     debug(_("exiting parseargs\n"));
 }
 
@@ -505,7 +537,7 @@ parse_speeds(op, arg)
     for (cp = strtok(arg, ","); cp != 0; cp = strtok((char *) 0, ",")) {
 	if ((op->speeds[op->numspeed++] = bcode(cp)) <= 0)
 	    error(_("bad speed: %s"), cp);
-	if (op->numspeed > MAX_SPEED)
+	if (op->numspeed >= MAX_SPEED)
 	    error(_("too many alternate speeds"));
     }
     debug(_("exiting parsespeeds\n"));
@@ -847,8 +879,11 @@ do_prompt(op, tp)
 		  case 'o':
 		   {
 		     char domainname[256];
-
+#ifdef HAVE_getdomainname
 		     getdomainname(domainname, sizeof(domainname));
+#else
+		     strcpy(domainname, "unknown_domain");
+#endif
 		     domainname[sizeof(domainname)-1] = '\0';
 		     printf ("%s", domainname);
 		   }
diff --git a/login-utils/checktty.c b/login-utils/checktty.c
index 66fee73385..6269b6b07d 100644
--- a/login-utils/checktty.c
+++ b/login-utils/checktty.c
@@ -29,12 +29,7 @@
 #endif
 
 #include "pathnames.h"
-
-/* functions in login.c */
-void badlogin(const char *s);
-void sleepexit(int);
-extern struct hostent hostaddress;
-extern char *hostname;
+#include "login.h"
 
 #ifdef TESTING
 struct hostent hostaddress;
@@ -43,13 +38,13 @@ char *hostname;
 void 
 badlogin(const char *s)
 {
-    printf(_("badlogin: %s\n"), s);
+    printf("badlogin: %s\n", s);
 }
 
 void
 sleepexit(int x)
 {
-    printf(_("sleepexit %d\n"), x);
+    printf("sleepexit %d\n", x);
     exit(1);
 }
 #endif
@@ -315,7 +310,7 @@ in_class(const char *tty, char *class)
 }
 
 /* start JDS - SBA */
-void 
+static void 
 free_group(struct grplist *ge)
 {
     if (ge) {
@@ -326,7 +321,7 @@ free_group(struct grplist *ge)
     }
 }
 
-void 
+static void 
 free_class(struct ttyclass *tc)
 {
     if (tc) {
@@ -339,7 +334,7 @@ free_class(struct ttyclass *tc)
     }
 }
 
-void 
+static void 
 free_all(void)
 {
     free_class(ttyclasses);
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 73a9b89186..de228241b8 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -34,6 +34,8 @@
 #include <ctype.h>
 #include <getopt.h>
 #include "my_crypt.h"
+#include "islocal.h"
+#include "setpwnam.h"
 #include "nls.h"
 #include "env.h"
 
@@ -42,15 +44,6 @@
 #include <security/pam_misc.h>
 #endif
 
-extern int is_local(char *);
-
-#undef P
-#if __STDC__
-#define P(foo) foo
-#else
-#define P(foo) ()
-#endif
-
 typedef unsigned char boolean;
 #define false 0
 #define true 1
@@ -69,17 +62,15 @@ struct finfo {
     char *other;
 };
 
-static boolean parse_argv P((int argc, char *argv[], struct finfo *pinfo));
-static void usage P((FILE *fp));
-static void parse_passwd P((struct passwd *pw, struct finfo *pinfo));
-static void ask_info P((struct finfo *oldfp, struct finfo *newfp));
-static char *prompt P((char *question, char *def_val));
-static int check_gecos_string P((char *msg, char *gecos));
-static boolean set_changed_data P((struct finfo *oldfp, struct finfo *newfp));
-static int save_new_data P((struct finfo *pinfo));
-static void *xmalloc P((int bytes));
-
-extern int setpwnam P((struct passwd *pwd));
+static boolean parse_argv (int argc, char *argv[], struct finfo *pinfo);
+static void usage (FILE *fp);
+static void parse_passwd (struct passwd *pw, struct finfo *pinfo);
+static void ask_info (struct finfo *oldfp, struct finfo *newfp);
+static char *prompt (char *question, char *def_val);
+static int check_gecos_string (char *msg, char *gecos);
+static boolean set_changed_data (struct finfo *oldfp, struct finfo *newfp);
+static int save_new_data (struct finfo *pinfo);
+static void *xmalloc (int bytes);
 
 #define memzero(ptr, size) memset((char *) ptr, 0, size)
 
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index f17b176fb2..d1a3fa8207 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -37,6 +37,8 @@
 #include <ctype.h>
 #include <getopt.h>
 #include "my_crypt.h"
+#include "islocal.h"
+#include "setpwnam.h"
 #include "nls.h"
 #include "env.h"
 
@@ -45,15 +47,6 @@
 #include <security/pam_misc.h>
 #endif
 
-extern int is_local(char *);
-
-#undef P
-#if __STDC__
-#define P(foo) foo
-#else
-#define P(foo) ()
-#endif
-
 typedef unsigned char boolean;
 #define false 0
 #define true 1
@@ -71,19 +64,17 @@ struct sinfo {
     char *shell;
 };
 
-static void parse_argv P((int argc, char *argv[], struct sinfo *pinfo));
-static void usage P((FILE *fp));
-static char *prompt P((char *question, char *def_val));
-static int check_shell P((char *shell));
-static boolean get_shell_list P((char *shell));
-static void *xmalloc P((int bytes));
-extern int setpwnam P((struct passwd *pwd));
+static void parse_argv (int argc, char *argv[], struct sinfo *pinfo);
+static void usage (FILE *fp);
+static char *prompt (char *question, char *def_val);
+static int check_shell (char *shell);
+static boolean get_shell_list (char *shell);
+static void *xmalloc (int bytes);
+
 #define memzero(ptr, size) memset((char *) ptr, 0, size)
 
-int main (argc, argv)
-    int argc;
-    char *argv[];
-{
+int
+main (int argc, char *argv[]) {
     char *cp, *shell, *oldshell;
     uid_t uid;
     struct sinfo info;
diff --git a/login-utils/cryptocard.c b/login-utils/cryptocard.c
index 1195b2eb80..9e221cbe6d 100644
--- a/login-utils/cryptocard.c
+++ b/login-utils/cryptocard.c
@@ -54,9 +54,7 @@
 #include "../libdes/des.h"
 #endif /* EAY_LIBDES */
 
-extern char *getpass(const char *prompt);
-extern struct passwd *pwd;
-extern int timeout;
+#include "cryptocard.h"
 
 static char *
 generate_challenge(void)
diff --git a/login-utils/cryptocard.h b/login-utils/cryptocard.h
new file mode 100644
index 0000000000..a967137f9f
--- /dev/null
+++ b/login-utils/cryptocard.h
@@ -0,0 +1,7 @@
+/* defined in cryptocard.c */
+extern int cryptocard (void);
+
+/* defined in login.c */
+extern struct passwd *pwd;
+extern int timeout;
+
diff --git a/login-utils/need.8 b/login-utils/initctl.8
index cc3712d747..1aa421a02c 100644
--- a/login-utils/need.8
+++ b/login-utils/initctl.8
@@ -18,26 +18,30 @@
 .\" The postal address is:
 .\"   Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
 .\"
-.\"	need.8		Richard Gooch	28-FEB-2000
+.\"	initctl.8		Richard Gooch	6-NOV-2000
 .\"
-.TH NEED 8 "28 Feb 2000" "Util-Linux Package"
+.TH INITCTL 8 "6 Nov 2000" "Util-Linux Package"
 .SH NAME
-need \- utility to tell simpleinit(8) to start a service
+initctl \- utility to control simpleinit(8)
 .SH SYNOPSIS
 .nf
-\fBneed\fP [\fB-r\fP] [\fBservice\fP]
+\fBneed\fP [\fB-r\fP] \fBservice\fP
 .BR display-services
+\fBprovide service\fP
 .fi
-.SH DESCRIPTION
+.SH OVERVIEW
+The \fBneed\fP programme is designed to help improve the robustness,
+scalability and readability of system boot scripts. It is now possible
+to write a modularised set of boot scripts without the complex and
+fragile numbered symlink scheme used in SysV-style boot scripts. Each
+script can simply declare, using \fBneed\fP(8), what must run before
+them.
+.SH DESCRIPTION for need
 The \fBneed\fP programme is a utility that tells \fBsimpleinit\fP(8)
 to start a \fIservice\fP (usually a script in \fI/sbin/init.d\fP) and
 will wait for the service to become available. If the service is
 already available, it will not be started again.
 
-When invoked as \fBdisplay-services\fP it will write the list of
-currently available services and the list of failed services to the
-standard output.
-
 The \fB-r\fP option is used to tell \fBsimpleinit\fP(8) to "roll back"
 (stop) services up to (but not including) \fIservice\fP. If
 \fIservice\fP is not specified, all services are stopped. The \fB-r\fP
@@ -45,12 +49,24 @@ option thus allows the system to be partially or wholly shut down in
 an orderly fashion. The \fBshutdown\fP(8) programme still needs to be
 run.
 
-The \fBneed\fP programme is designed to help improve the robustness,
-scalability and readability of system boot scripts. It is now possible
-to write a modularised set of boot scripts without the complex and
-fragile numbered symlink scheme used in SysV-style boot scripts. Each
-script can simply declare, using \fBneed\fP(8), what must run before
-them.
+.SH DESCRIPTION for display-services
+When invoked as \fBdisplay-services\fP it will write the list of
+currently available services and the list of failed services to the
+standard output.
+
+.SH DESCRIPTION for provide
+When invoked as \fBprovide\fP it tells \fBsimpleinit\fP(8) that the
+parent (calling) process will be providing a service with name
+\fIservice\fP. If the calling process exits successfully (status 0)
+the service is deemed to be available. Only one instance of
+\fIservice\fP may be started, so alternate providers will block and
+may fail.
+
+Using \fBprovide\fP it is possible to have multiple potential
+providers for the same (generic) service (e.g. \fBsendmail\fP and
+\fBqmail\fP both provide a \fBmta\fP service), where only one actually
+provides the service. This may be used by service startup scripts
+which check for configuration files.
 .SH EXIT CODE
 The exit code from \fBneed\fP is 0 if the service was successfully
 started, 1 if the service failed badly, and 2 if the service is
@@ -61,6 +77,11 @@ The exit code from \fBneed -r\fP is 0 if the service was successfully
 stopped, 1 if the service could not be stopped, and 2 if the service
 was not available to start with. The service shutdown scripts may only
 return 0 (for success) or 1 (for failure).
+
+The exit code from \fBprovide\fP is 0 if the service may be provided,
+1 if it may not, and 2 if the parent process is not a child of
+init. It may block waiting for another provider which is initialising
+the service.
 .SH SIGNALS
 \fBneed\fP(8) uses \fBSIGUSR1\fP, \fBSIGUSR2\fP and \fBSIGPOLL\fP for
 communication with \fBsimpleinit\fP(8). Don't send these signals to
diff --git a/login-utils/need.c b/login-utils/initctl.c
index 97690c4617..6fb8d097fe 100644
--- a/login-utils/need.c
+++ b/login-utils/initctl.c
@@ -1,6 +1,6 @@
-/*  need.c
+/*  initctl.c
 
-    Source file for  need  (init(8) dependency tool).
+    Source file for  initctl  (init(8) control tool).
 
     Copyright (C) 2000  Richard Gooch
 
@@ -24,16 +24,19 @@
 */
 
 /*
-    This tool will request init(8) to start a service and will wait for that
-    service to be available. If the service is already available, init(8) will
-    not start it again.
+    This tool will send control messages to init(8). For example, it may
+    request init(8) to start a service and will wait for that service to be
+    available. If the service is already available, init(8) will not start it
+    again.
     This tool may also be used to inspect the list of currently available
     services.
 
 
     Written by      Richard Gooch   28-FEB-2000
 
-    Last updated by Richard Gooch   28-FEB-2000
+    Updated by      Richard Gooch   11-OCT-2000: Added provide support.
+
+    Last updated by Richard Gooch   6-NOV-2000: Renamed to initctl.c
 
 
 */
@@ -44,6 +47,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
 #include "simpleinit.h"
 
@@ -60,7 +64,7 @@ int main (int argc, char **argv)
     struct sigaction sa;
     sigset_t ss;
     char *ptr;
-    long buffer[COMMAND_SIZE / sizeof (long)];
+    long buffer[COMMAND_SIZE / sizeof (long) + 1];
     struct command_struct *command = (struct command_struct *) buffer;
 
     sigemptyset (&ss);
@@ -75,11 +79,55 @@ int main (int argc, char **argv)
     sigaction (SIG_NOT_PRESENT, &sa, NULL);
     sigaction (SIG_FAILED, &sa, NULL);
     command->pid = getpid ();
+    command->ppid = getppid ();
     if ( ( ptr = strrchr (argv[0], '/') ) == NULL ) ptr = argv[0];
     else ++ptr;
+    /*  First generate command number by looking at invocation name  */
     if (strcmp (ptr, "display-services") == 0)
-    {
 	command->command = COMMAND_DUMP_LIST;
+    else if (strcmp (ptr, "need") == 0) command->command = COMMAND_NEED;
+    else if (strcmp (ptr, "provide") == 0) command->command = COMMAND_PROVIDE;
+    else command->command = COMMAND_TEST;
+    /*  Now check for switches  */
+    if ( (argc > 1) && (argv[1][0] == '-') )
+    {
+	switch (argv[1][1])
+	{
+	  case 'n':
+	    command->command = COMMAND_NEED;
+	    break;
+	  case 'r':
+	    command->command = COMMAND_ROLLBACK;
+	    break;
+	  case 'd':
+	    command->command = COMMAND_DUMP_LIST;
+	    break;
+	  case 'p':
+	    command->command = COMMAND_PROVIDE;
+	    break;
+	  default:
+	    fprintf (stderr, "Illegal switch: \"%s\"\n", argv[1]);
+	    exit (1);
+	    /*break;*/
+	}
+	--argc;
+	++argv;
+    }
+    switch (command->command)
+    {
+      case COMMAND_NEED:
+      case COMMAND_PROVIDE:
+	if (argc < 2)
+	{
+	    fprintf (stderr, "Usage:\tneed|provide programme\n");
+	    exit (1);
+	}
+	/*  Fall through  */
+      case COMMAND_ROLLBACK:
+	if (argc > 1) strcpy (command->name, argv[1]);
+	else command->name[0] = '\0';
+	break;
+      case COMMAND_DUMP_LIST:
 	if (tmpnam (command->name) == NULL)
 	{
 	    fprintf (stderr, "Unable to create a unique filename\t%s\n",
@@ -92,26 +140,7 @@ int main (int argc, char **argv)
 		     command->name, ERRSTRING);
 	    exit (1);
 	}
-    }
-    else
-    {
-	if ( (argc > 1) && (strcmp (argv[1], "-r") == 0) )
-	{
-	    command->command = COMMAND_ROLLBACK;
-	    --argc;
-	    ++argv;
-	}
-	else command->command = COMMAND_NEED;
-	if (argc == 2) strcpy (command->name, argv[1]);
-	else
-	{
-	    if (command->command == COMMAND_ROLLBACK) command->name[0] = '\0';
-	    else
-	    {
-		fprintf (stderr, "Usage:\tneed programme\n");
-		exit (1);
-	    }
-	}
+	break;
     }
     if ( ( fd = open ("/dev/initctl", O_WRONLY, 0) ) < 0 )
     {
@@ -128,14 +157,35 @@ int main (int argc, char **argv)
     {
 	sigemptyset (&ss);
 	while (caught_signal == 0) sigsuspend (&ss);
-	switch (caught_signal)
+	switch (command->command)
 	{
-	  case SIG_PRESENT:
-	    return 0;
-	  case SIG_NOT_PRESENT:
-	    return 2;
-	  case SIG_FAILED:
-	    return 1;
+	  case COMMAND_PROVIDE:
+	    switch (caught_signal)
+	    {
+	      case SIG_PRESENT:
+		return 1;
+	      case SIG_NOT_PRESENT:
+		return 0;
+	      case SIG_NOT_CHILD:
+		fprintf (stderr, "Error\n");
+		return 2;
+	      default:
+		return 3;
+	    }
+	    break;
+	  default:
+	    switch (caught_signal)
+	    {
+	      case SIG_PRESENT:
+		return 0;
+	      case SIG_NOT_PRESENT:
+		return 2;
+	      case SIG_FAILED:
+		return 1;
+	      default:
+		return 3;
+	    }
+	    break;
 	}
 	return 3;
     }
diff --git a/login-utils/islocal.c b/login-utils/islocal.c
index 10a709b565..87f8f1cb24 100644
--- a/login-utils/islocal.c
+++ b/login-utils/islocal.c
@@ -17,10 +17,12 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "nls.h"
 #include "pathnames.h"
+#include "islocal.h"
 
 #define MAX_LENGTH	1024
 
diff --git a/login-utils/islocal.h b/login-utils/islocal.h
new file mode 100644
index 0000000000..305bc57c68
--- /dev/null
+++ b/login-utils/islocal.h
@@ -0,0 +1 @@
+extern int is_local(char *user);
diff --git a/login-utils/last.c b/login-utils/last.c
index b78d00b868..8375f9f072 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -90,16 +90,16 @@ static char	*file = _PATH_WTMP;		/* wtmp file */
 static int	doyear = 0;			/* output year in dates */
 static int	dolong = 0;			/* print also ip-addr */
 
-static void wtmp(), addarg(), hostconv();
-static int want();
-TTY *addtty();
-static char *ttyconv();
+static void wtmp(void);
+static void addarg(int, char *);
+static void hostconv(char *);
+static void onintr(int);
+static int want(struct utmp *, int);
+TTY *addtty(char *);
+static char *ttyconv(char *);
 
 int
-main(argc, argv)
-	int	argc;
-	char	**argv;
-{
+main(int argc, char **argv) {
 	extern int	optind;
 	extern char	*optarg;
 	int	ch;
@@ -159,10 +159,8 @@ main(argc, argv)
  * print_partial_line --
  *	print the first part of each output line according to specified format
  */
-void
-print_partial_line(bp)
-     struct utmp *bp;
-{
+static void
+print_partial_line(struct utmp *bp) {
     char *ct;
 
     ct = ctime(&bp->ut_time);
@@ -193,12 +191,10 @@ print_partial_line(bp)
  *	read through the wtmp file
  */
 static void
-wtmp()
-{
+wtmp(void) {
 	register struct utmp	*bp;		/* current structure */
 	register TTY	*T;			/* tty list entry */
 	long	delta;				/* time difference */
-	void	onintr();
 	char *crmsg = NULL;
 	char *ct = NULL;
 	struct utmp **utmplist = NULL;
@@ -310,10 +306,7 @@ wtmp()
  *	see if want this entry
  */
 static int
-want(bp, check)
-	register struct utmp	*bp;
-	int	check;
-{
+want(struct utmp *bp, int check) {
 	register ARG	*step;
 
 	if (check) {
@@ -357,10 +350,7 @@ want(bp, check)
  *	add an entry to a linked list of arguments
  */
 static void
-addarg(type, arg)
-	int	type;
-	char	*arg;
-{
+addarg(int type, char *arg) {
 	register ARG	*cur;
 
 	if (!(cur = (ARG *)malloc((unsigned int)sizeof(ARG)))) {
@@ -378,9 +368,7 @@ addarg(type, arg)
  *	add an entry to a linked list of ttys
  */
 TTY *
-addtty(ttyname)
-	char	*ttyname;
-{
+addtty(char *ttyname) {
 	register TTY	*cur;
 
 	if (!(cur = (TTY *)malloc((unsigned int)sizeof(TTY)))) {
@@ -400,9 +388,7 @@ addtty(ttyname)
  *	off the domain suffix since that's what login(1) does.
  */
 static void
-hostconv(arg)
-	char	*arg;
-{
+hostconv(char *arg) {
 	static int	first = 1;
 	static char	*hostdot,
 			name[MAXHOSTNAMELEN];
@@ -427,9 +413,7 @@ hostconv(arg)
  *	convert tty to correct name.
  */
 static char *
-ttyconv(arg)
-	char	*arg;
-{
+ttyconv(char *arg) {
 	char	*mval;
 
 	/*
@@ -459,10 +443,8 @@ ttyconv(arg)
  * onintr --
  *	on interrupt, we inform the user how far we've gotten
  */
-void
-onintr(signo)
-	int	signo;
-{
+static void
+onintr(int signo) {
 	char	*ct;
 
 	ct = ctime(&utmpbuf.ut_time);
diff --git a/login-utils/login.c b/login-utils/login.c
index eaaf1a5204..3ad3b219c2 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -116,7 +116,9 @@
 #include <sys/syslog.h>
 #include <sys/sysmacros.h>
 #include <netdb.h>
+#include "pathnames.h"
 #include "my_crypt.h"
+#include "login.h"
 #include "nls.h"
 
 #ifdef __linux__
@@ -188,25 +190,22 @@ struct  lastlog
 };
 #endif
 
-#include "pathnames.h"
 
-#define P_(s) ()
-void opentty P_((const char *tty));
-void getloginname P_((void));
-void timedout P_((void));
-int rootterm P_((char *ttyn));
-void motd P_((void));
-void sigint P_((void));
-void checknologin P_((void));
-void dolastlog P_((int quiet));
-void badlogin P_((const char *name));
-char *stypeof P_((char *ttyid));
-void checktty P_((char *user, char *tty, struct passwd *pwd));
-void sleepexit P_((int eval));
+static void getloginname (void);
+static void timedout (int);
+static void sigint (int);
+static int rootterm (char *ttyn);
+static void motd (void);
+static void checknologin (void);
+static void dolastlog (int quiet);
+
+#ifndef __linux__
+static char *stypeof (char *ttyid);
+#endif
+
 #ifdef CRYPTOCARD
-int cryptocard P_((void));
+#include "cryptocard.h"
 #endif
-#undef P_
 
 #ifdef	KERBEROS
 #include <kerberos/krb.h>
@@ -235,14 +234,14 @@ int	kerror = KSUCCESS, notickets = 1;
 #ifndef __linux__
 int	timeout = 300;
 #else
-int     timeout = 60;
+int     timeout = 60;		/* used in cryptocard.c */
 #endif
 
-struct	passwd *pwd;
-int	failures = 1;
+struct	passwd *pwd;		/* used in cryptocard.c */
+struct  hostent hostaddress;	/* used in checktty.c */
 char	term[64], *hostname, *username, *tty;
-struct  hostent hostaddress;
-char	thishost[100];
+static char	thishost[100];
+static int	failures = 1;
 
 #ifndef __linux__
 struct	sgttyb sgttyb;
@@ -266,7 +265,7 @@ const char *months[] =
    connection. I believe login should open the line in the non-blocking mode
    leaving the decision to make a connection to getty (where it actually
    belongs). */
-void 
+static void
 opentty(const char * tty)
 {
     int i;
@@ -313,11 +312,7 @@ main(int argc, char **argv)
     int quietlog, passwd_req;
     char *domain, *ttyn;
     char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
-    char *ctime(), *ttyname(), *stypeof();
-    time_t time();
-    void timedout();
     char *termenv;
-    char vcsn[20], vcsan[20];
     char * childArgv[10];
     char * buff;
     int childArgc = 0;
@@ -329,6 +324,9 @@ main(int argc, char **argv)
 #else
     char *salt, *pp;
 #endif
+#ifdef CHOWNVCS
+    char vcsn[20], vcsan[20];
+#endif
 #ifndef __linux__
     int ioctlval;
 #endif
@@ -446,6 +444,7 @@ main(int argc, char **argv)
 	ttyn = tname;
     }
 
+#ifdef CHOWNVCS
     /* find names of Virtual Console devices, for later mode change */
     {
 	char *p = ttyn;
@@ -455,6 +454,7 @@ main(int argc, char **argv)
 	strcpy(vcsn, "/dev/vcs"); strcat(vcsn, p);
 	strcpy(vcsan, "/dev/vcsa"); strcat(vcsan, p);
     }
+#endif
 
     setpgrp();
     
@@ -464,8 +464,8 @@ main(int argc, char **argv)
 	tcgetattr(0, &tt);
 	ttt = tt;
 	ttt.c_cflag &= ~HUPCL;
-	
-	if((chown(ttyn, 0, 0) == 0) && (chmod(ttyn, 0622) == 0)) {
+
+	if((chown(ttyn, 0, 0) == 0) && (chmod(ttyn, TTY_MODE) == 0)) {
 	    tcsetattr(0,TCSAFLUSH,&ttt);
 	    signal(SIGHUP, SIG_IGN); /* so vhangup() wont kill us */
 	    vhangup();
@@ -816,8 +816,8 @@ main(int argc, char **argv)
 	    else if (tp.tv_sec - pwd->pw_change < TWOWEEKS && !quietlog) {
 		struct tm *ttp;
 		ttp = localtime(&pwd->pw_change);
-		printf(_("Warning: your password expires on %s %d, %d\n"),
-		       months[ttp->tm_mon], ttp->tm_mday,
+		printf(_("Warning: your password expires on %d %s %d.\n"),
+		       ttp->tm_mday, months[ttp->tm_mon],
 		       TM_YEAR_BASE + ttp->tm_year);
 	    }
 	}
@@ -830,8 +830,8 @@ main(int argc, char **argv)
 	    else if (tp.tv_sec - pwd->pw_expire < TWOWEEKS && !quietlog) {
 		struct tm *ttp;
 		ttp = localtime(&pwd->pw_expire);
-		printf(_("Warning: your account expires on %s %d, %d\n"),
-		       months[ttp->tm_mon], ttp->tm_mday,
+		printf(_("Warning: your account expires on %d %s %d.\n"),
+		       ttp->tm_mday, months[ttp->tm_mon],
 		       TM_YEAR_BASE + ttp->tm_year);
 	    }
 	}
@@ -970,6 +970,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
 	  (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid);
     chmod(ttyn, TTY_MODE);
 
+#ifdef CHOWNVCS
     /* if tty is one of the VC's then change owner and mode of the 
        special /dev/vcs devices as well */
     if (consoletty(0)) {
@@ -978,6 +979,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
 	chmod(vcsn, TTY_MODE);
 	chmod(vcsan, TTY_MODE);
     }
+#endif
 
     setgid(pwd->pw_gid);
     
@@ -1184,12 +1186,10 @@ Michael Riepe <michael@stud.uni-hannover.de>
 }
 
 void
-getloginname()
-{
-    register int ch;
-    register char *p;
+getloginname(void) {
+    int ch, cnt, cnt2;
+    char *p;
     static char nbuf[UT_NAMESIZE + 1];
-    int cnt, cnt2;
     
     cnt2 = 0;
     for (;;) {
@@ -1231,8 +1231,7 @@ getloginname()
 }
 
 void
-timedout()
-{
+timedout(int sig) {
     struct termio ti;
     
     fprintf(stderr, _("Login timed out after %d seconds\n"), timeout);
@@ -1245,8 +1244,7 @@ timedout()
 }
 
 int
-rootterm(ttyn)
-     char *ttyn;
+rootterm(char * ttyn)
 #ifndef __linux__
 {
     struct ttyent *t;
@@ -1286,10 +1284,9 @@ rootterm(ttyn)
 jmp_buf motdinterrupt;
 
 void
-motd()
-{
-    register int fd, nchars;
-    void (*oldint)(), sigint();
+motd(void) {
+    int fd, nchars;
+    void (*oldint)(int);
     char tbuf[8192];
     
     if ((fd = open(_PATH_MOTDFILE, O_RDONLY, 0)) < 0)
@@ -1303,15 +1300,13 @@ motd()
 }
 
 void
-sigint()
-{
+sigint(int sig) {
     longjmp(motdinterrupt, 1);
 }
 
 #ifndef USE_PAM				/* PAM takes care of this */
 void
-checknologin()
-{
+checknologin(void) {
     register int fd, nchars;
     char tbuf[8192];
     
@@ -1324,9 +1319,7 @@ checknologin()
 #endif
 
 void
-dolastlog(quiet)
-     int quiet;
-{
+dolastlog(int quiet) {
     struct lastlog ll;
     int fd;
     
@@ -1385,9 +1378,7 @@ badlogin(const char *name)
 
 #ifndef __linux__
 char *
-stypeof(ttyid)
-     char *ttyid;
-{
+stypeof(char *ttyid) {
     struct ttyent *t;
 
     return(ttyid && (t = getttynam(ttyid)) ? t->ty_type : UNKNOWN);
@@ -1396,9 +1387,7 @@ stypeof(ttyid)
 
 /* should not be called from PAM code... Why? */
 void
-sleepexit(eval)
-     int eval;
-{
+sleepexit(int eval) {
     sleep(SLEEP_EXIT_TIMEOUT);
     exit(eval);
 }
diff --git a/login-utils/login.h b/login-utils/login.h
new file mode 100644
index 0000000000..14b698e320
--- /dev/null
+++ b/login-utils/login.h
@@ -0,0 +1,8 @@
+/* defined in login.c */
+extern void badlogin(const char *s);
+extern void sleepexit(int);
+extern struct hostent hostaddress;
+extern char *hostname;
+
+/* defined in checktty.c */
+extern void checktty(const char *user, const char *tty, struct passwd *pwd);
diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c
index 1f8be95f22..ade173e538 100644
--- a/login-utils/newgrp.c
+++ b/login-utils/newgrp.c
@@ -12,6 +12,7 @@
 #include <grp.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include "pathnames.h"
 #include "my_crypt.h"
diff --git a/login-utils/passwd.c b/login-utils/passwd.c
index ba679cd239..6741ee210a 100644
--- a/login-utils/passwd.c
+++ b/login-utils/passwd.c
@@ -64,7 +64,10 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/resource.h>
+#include <stdlib.h>
 #include "my_crypt.h"
+#include "setpwnam.h"
+#include "islocal.h"
 #include "nls.h"
 #include "env.h"
 
@@ -79,9 +82,6 @@
 #include <syslog.h>
 #endif /* LOGALL */
 
-extern int is_local(char *);		/* islocal.c */
-extern int setpwnam(struct passwd *);	/* setpwnam.c */
-
 #define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.')
 #define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
 
@@ -104,9 +104,8 @@ pexit(char *str, ...)
  * This would probably be the best place for checking against 
  * dictionaries. :-)
  */
-
-int check_passwd_string(char *passwd, char *string)
-{
+static int
+check_passwd_string(char *passwd, char *string) {
     int r;
     char *p, *q;
 
@@ -152,8 +151,8 @@ int check_passwd_string(char *passwd, char *string)
     return 1;
 }
 	
-int check_passwd(char *passwd, char *oldpasswd, char *user, char *gecos)
-{
+static int
+check_passwd(char *passwd, char *oldpasswd, char *user, char *gecos) {
     int ucase, lcase, digit, other;
     char *c, *g, *p;
 
@@ -216,17 +215,16 @@ int check_passwd(char *passwd, char *oldpasswd, char *user, char *gecos)
     return 1; /* fine */
 }
 
-void usage()
-{
+#if 0
+static void
+usage(void) {
     printf (_("Usage: passwd [username [password]]\n"));
     printf(_("Only root may use the one and two argument forms.\n"));
 }
+#endif
 
 int
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+main(int argc, char *argv[]) {
     struct passwd *pe;
     uid_t gotuid = getuid();
     char *pwdstr = NULL, *cryptstr, *oldstr;
diff --git a/login-utils/setpwnam.c b/login-utils/setpwnam.c
index 8631e7adc6..62d47a51c7 100644
--- a/login-utils/setpwnam.c
+++ b/login-utils/setpwnam.c
@@ -64,6 +64,11 @@
 
 #include "setpwnam.h"
 
+#define false 0
+#define true 1
+
+typedef int boolean;
+
 static void pw_init(void);
 
 /*
diff --git a/login-utils/setpwnam.h b/login-utils/setpwnam.h
index b4790f7abb..84d1c208f1 100644
--- a/login-utils/setpwnam.h
+++ b/login-utils/setpwnam.h
@@ -14,11 +14,6 @@
 
 #include "pathnames.h"
 
-#define false 0
-#define true 1
-
-typedef int boolean;
-
 #ifndef DEBUG
 #define PASSWD_FILE    _PATH_PASSWD
 #define PTMP_FILE      _PATH_PTMP
@@ -36,3 +31,5 @@ typedef int boolean;
 #define GTMP_FILE      "/tmp/gtmp"
 #define GTMPTMP_FILE   "/tmp/gtmptmp"
 #endif
+
+extern int setpwnam (struct passwd *pwd);
diff --git a/login-utils/shutdown.c b/login-utils/shutdown.c
index e3ec93c1ec..d1034d5eb9 100644
--- a/login-utils/shutdown.c
+++ b/login-utils/shutdown.c
@@ -33,6 +33,19 @@
  *
  * 2000-03-02 Richard Gooch <rgooch@atnf.csiro.au>
  * - pause forever if (pid == 1) and send SIGQUIT to pid = 1
+ *
+ * 2000-11-04 Richard Gooch <rgooch@atnf.csiro.au>
+ * - continue reaping if (pid == 1)
+ *
+ * 2000-11-06 Richard Gooch <rgooch@atnf.csiro.au>
+ * - shut down "finalprog" from /etc/inittab
+ * - kill normal user (non-root and non-daemon) processes first with SIGTERM
+ *
+ * 2000-11-08 Richard Gooch <rgooch@atnf.csiro.au>
+ * - rollback services
+ * - do not unmount devfs (otherwise get harmless but annoying messages)
+ * - created syncwait() for faster shutting down
+ * - kill getty processes
  */
 
 #include <stdio.h>
@@ -52,13 +65,22 @@
 #include <sys/wait.h>
 #include <syslog.h>
 #include <sys/resource.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
 #include "linux_reboot.h"
 #include "pathnames.h"
 #include "nls.h"
 
-static void usage(), int_handler(), write_user(struct utmp *);
-static void wall(), write_wtmp(), unmount_disks(), unmount_disks_ourselves();
-static void swap_off(), do_halt(char *);
+static void usage(void), int_handler(int), write_user(struct utmp *);
+static void wall(void), write_wtmp(void), unmount_disks(void);
+static void unmount_disks_ourselves(void);
+static void swap_off(void), do_halt(char *);
+static void kill_mortals (int sig);
+static void stop_finalprog (void);
+static void syncwait (int timeval);
+
 
 char	*prog;		/* name of the program */
 int	opt_reboot;	/* true if -r option or reboot command */
@@ -81,14 +103,14 @@ char	halt_action[256];		/* to find out what to do upon halt */
 
 
 void
-usage()
+usage(void)
 {
 	fprintf(stderr,
 		_("Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"));
 	exit(1);
 }
 
-void
+static void
 my_puts(char *s)
 {
 	/* Use a fresh stdout after forking */
@@ -98,7 +120,7 @@ my_puts(char *s)
 }
 
 void 
-int_handler()
+int_handler(int sig)
 {
 	unlink(_PATH_NOLOGIN);
 	signal(SIGINT, SIG_DFL);
@@ -106,7 +128,7 @@ int_handler()
 	exit(1);
 }
 
-int
+static int
 iswhitespace(int a) {
 	return (a == ' ' || a == '\t');
 }
@@ -120,14 +142,14 @@ main(int argc, char *argv[])
 
 	if (getpid () == 1) {
 		for (i = 0; i < getdtablesize (); i++) close (i);
-		while (1) pause ();
+		while (1) wait (NULL);  /*  Grim reaper never stops  */
 	}
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
 #ifndef DEBUGGING
-	if(geteuid()) {
+	if(setreuid (0, 0)) {
 		fprintf(stderr, _("%s: Only root can shut a system down.\n"),
 			argv[0]);
 		exit(1);
@@ -350,6 +372,15 @@ main(int argc, char *argv[])
 
 #ifndef DEBUGGING
 	/* a gentle kill of all other processes except init */
+	kill_mortals (SIGTERM);
+	stop_finalprog ();
+	sleep (1);                    /*  Time for saves to start           */
+	kill (1, SIGTERM);            /*  Tell init to kill spawned gettys  */
+	usleep (100000);              /*  Wait for gettys to die            */
+	my_puts ("");                 /*  Get past the login prompt         */
+	system ("/sbin/initctl -r");  /*  Roll back services                */
+	syncwait (1);
+	my_puts ("Sending SIGTERM to all remaining processes...");
 	kill(-1, SIGTERM);
 	sleep(2);		/* default 2, some people need 5 */
 
@@ -371,17 +402,16 @@ main(int argc, char *argv[])
 	    required. Need to sleep before remounting root read-only  */
 	kill (1, SIGQUIT);
 
-	sync();
-	sleep(2);
+	sleep (1);	/* Time for processes to die and close files */
+	syncwait (2);
 
 	/* remove swap files and partitions using swapoff */
 	swap_off();
 
 	/* unmount disks... */
 	unmount_disks();
-	sync();
-	sleep(1);
-	
+	syncwait (1);
+
 	if(opt_reboot) {
 		my_reboot(LINUX_REBOOT_CMD_RESTART); /* RB_AUTOBOOT */
 		my_puts(_("\nWhy am I still alive after reboot?"));
@@ -390,6 +420,7 @@ main(int argc, char *argv[])
 
 		/* allow C-A-D now, faith@cs.unc.edu, re-fixed 8-Jul-96 */
 		my_reboot(LINUX_REBOOT_CMD_CAD_ON); /* RB_ENABLE_CAD */
+		sleep (1);  /*  Wait for devices to finish writing to media  */
 		do_halt(halt_action);
 	}
 	/* NOTREACHED */
@@ -432,6 +463,9 @@ write_user(struct utmp *ut)
 	char msg[100];
 
 	minutes = timeout / 60;
+	hours = minutes / 60;
+	minutes %= 60;
+
 	(void) strncat(term, ut->ut_line, sizeof(ut->ut_line));
 
 	/* try not to get stuck on a mangled ut_line entry... */
@@ -443,16 +477,20 @@ write_user(struct utmp *ut)
 	WR(msg);
 	WRCRLF;
 
-	if(minutes == 0) {
-	    sprintf(msg, _("System going down IMMEDIATELY!\n"));
-	} else if(minutes > 60) {
-	    hours = minutes / 60;
-	    sprintf(msg, _("System going down in %d hour%s %d minutes"),
-		    hours, hours == 1 ? "" : _("s"), minutes - 60*hours);
-	} else {
-	    sprintf(msg, _("System going down in %d minute%s\n"),
-		    minutes, minutes == 1 ? "" : _("s"));
-	}
+	if (hours > 1)
+		sprintf(msg, _("System going down in %d hours %d minutes"),
+			hours, minutes);
+	else if (hours == 1)
+		sprintf(msg, _("System going down in 1 hour %d minutes"),
+			minutes);
+	else if (minutes > 1)
+		sprintf(msg, _("System going down in %d minutes\n"),
+			minutes);
+	else if (minutes == 1)
+		sprintf(msg, _("System going down in 1 minute\n"));
+	else
+		sprintf(msg, _("System going down IMMEDIATELY!\n"));
+
 	WR(msg);
 	WRCRLF;
 
@@ -464,7 +502,7 @@ write_user(struct utmp *ut)
 }
 
 void
-wall()
+wall(void)
 {
 	/* write to all users, that the system is going down. */
 	struct utmp *ut;
@@ -480,7 +518,7 @@ wall()
 }
 
 void
-write_wtmp()
+write_wtmp(void)
 {
 	/* write in wtmp that we are dying */
 	int fd;
@@ -500,7 +538,7 @@ write_wtmp()
 }
 
 void
-swap_off()
+swap_off(void)
 {
 	/* swapoff esp. swap FILES so the underlying partition can be
 	   unmounted. It you don't have swapoff(1) or use mount to
@@ -530,7 +568,7 @@ swap_off()
 }
 
 void
-unmount_disks()
+unmount_disks(void)
 {
 	/* better to use umount directly because it may be smarter than us */
 
@@ -563,7 +601,7 @@ unmount_disks()
 }
 
 void
-unmount_disks_ourselves()
+unmount_disks_ourselves(void)
 {
 	/* unmount all disks */
 
@@ -581,8 +619,8 @@ unmount_disks_ourselves()
 	}
 	n = 0;
 	while (n < 100 && (mnt = getmntent(mtab))) {
-		mntlist[n++] = strdup(mnt->mnt_fsname[0] == '/' ?
-			mnt->mnt_fsname : mnt->mnt_dir);
+		if (strcmp (mnt->mnt_type, "devfs") == 0) continue;
+		mntlist[n++] = strdup(mnt->mnt_dir);
 	}
 	endmntent(mtab);
 
@@ -594,7 +632,96 @@ unmount_disks_ourselves()
 		printf("umount %s\n", filesys);
 #else
 		if (umount(mntlist[i]) < 0)
-			printf(_("shutdown: Couldn't umount %s\n"), filesys);
+			printf(_("shutdown: Couldn't umount %s: %s\n"),
+			       filesys, ERRSTRING);
 #endif
 	}
 }
+
+static void kill_mortals (int sig)
+{
+    int npids = 0;
+    int index = 0;
+    int pid;
+    struct stat statbuf;
+    DIR *dp;
+    struct dirent *de;
+    pid_t *pids = NULL;
+    char path[256];
+
+    if ( ( dp = opendir ("/proc") ) == NULL ) return;
+    while ( ( de = readdir (dp) ) != NULL )
+    {
+	if ( !isdigit (de->d_name[0]) ) continue;
+	pid = atoi (de->d_name);
+	sprintf (path, "/proc/%d", pid);
+	if (stat (path, &statbuf) != 0) continue;
+	if (statbuf.st_uid < 100) continue;
+	if (index <= npids)
+	{
+	    pids = realloc (pids, npids + 16384);
+	    if (pids == NULL) return;
+	    npids += 16384;
+	}
+	pids[index++] = pid;
+    }
+    fputs ("Sending SIGTERM to mortals...", stderr);
+    for (--index; index >= 0; --index) kill (pids[index], sig);
+    free (pids);
+    closedir (dp);
+}   /*  End Function kill_mortals  */
+
+static void stop_finalprog (void)
+{
+    char *p1, *p2;
+    FILE *fp;
+    char line[256];
+
+    if ( ( fp = fopen (_PATH_INITTAB, "r") ) == NULL ) return;
+    while (fgets (line, 256, fp) != NULL)
+    {
+	pid_t pid;
+
+	line[strlen (line) - 1] = '\0';
+	p1 = line;
+	while ( isspace (*p1) ) ++p1;
+	if (strncmp (p1, "finalprog", 9) != 0) continue;
+	if ( ( p1 = strchr (p1 + 9, '=') ) == NULL ) continue;
+	for (++p1; isspace (*p1); ++p1);
+	if (*p1 == '\0') continue;
+	for (p2 = p1; !isspace (*p2); ++p2);
+	*p2 = '\0';
+	switch ( pid = fork () )
+	{
+	  case 0:   /*  Child   */
+	    execl (p1, p1, "stop", NULL);
+	    break;
+	  case -1:  /*  Error   */
+	    break;
+	  default:  /*  Parent  */
+	    waitpid (pid, NULL, 0);
+	    break;
+	}
+	fclose (fp);
+	return;
+    }
+    fclose (fp);
+}   /*  End Function stop_finalprog  */
+
+static void syncwait (int timeval)
+{
+    static int do_wait = 0;
+    static int first_time = 1;
+
+    sync ();
+    /*  Kernel version 1.3.20 and after are supposed to wait automatically  */
+    if (first_time)
+    {
+	struct utsname uts;
+
+	first_time = 0;
+	uname (&uts);
+	if (uts.release[0] < '2') do_wait = 1;
+    }
+    if (do_wait) sleep (timeval);
+}   /*  End Function syncwait  */
diff --git a/login-utils/simpleinit.8 b/login-utils/simpleinit.8
index 2a2f666ed9..f367f2f63d 100644
--- a/login-utils/simpleinit.8
+++ b/login-utils/simpleinit.8
@@ -1,7 +1,7 @@
 .\" Copyright 1992, 1993 Rickard E. Faith (faith@cs.unc.edu)
 .\" May be distributed under the GNU General Public License
 .\" " for emacs's hilit19 mode :-)
-.TH SIMPLEINIT 8 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual"
+.TH SIMPLEINIT 8 "4 November 2000" "Linux 0.99" "Linux Programmer's Manual"
 .SH NAME
 simpleinit \- process control initialization
 .SH SYNOPSIS
@@ -33,7 +33,9 @@ After single user mode is terminated, the
 .I /etc/rc
 file is executed, and the information in
 .I /etc/inittab
-will be used to start processes.
+will be used to start processes. Alternatively, the \fI/etc/inittab\fP
+file may be configured to run a different boot script. See below for
+details.
 
 .SH "THE INITTAB FILE"
 Because of the number of init programs which are appearing in the Linux
@@ -52,16 +54,21 @@ The format is
 
 .B PATH=search path
 
+.B INIT_PATH=search path
+
 .B "ttyline:termcap-entry:getty-command"
+
+.B finalprog=path
 .RE
 
 An example is as follows:
 
 .nf
 .RS
-bootprog    = rc
-fileprefix  = /sbin/
-PATH        = /sbin:/bin
+bootprog     =
+fileprefix   =  /sbin/init.d/
+PATH         =  /usr/sbin:/usr/bin:/sbin:/bin
+INIT_PATH    =  /sbin/init.d
 
 tty1:linux:/sbin/getty 9600 tty1
 tty2:linux:/sbin/getty 9600 tty2
@@ -70,6 +77,8 @@ tty4:linux:/sbin/getty 9600 tty4
 # tty5:linux:/sbin/getty 9600 tty5
 # ttyS1:dumb:/sbin/getty 9600 ttyS1
 # ttyS2:dumb:/sbin/getty -m -t60 2400 ttyS2
+
+finalprog   = /sbin/rc.xdm
 .RE
 .fi
 
@@ -79,6 +88,26 @@ character are treated as comments.  Please see documentation for the
 .B getty (8)
 command that you are using, since there are several of these in the Linux
 community at this time.
+
+The \fBbootprog\fP value is appended to the \fBfileprefix\fP value,
+and the result specifies the boot programme (script) to run. If
+unspecified, the default is \fI/etc/rc\fP. If the boot programme is a
+directory, then all scripts in that directory tree are executed, in
+parallel. See the \fBneed\fP(8) programme for details on how to
+elegantly control order of execution and manage dependencies.
+
+The \fBPATH\fP value is assigned to the PATH environment variable of
+child processes (boot scripts). The \fBINIT_PATH\fP value is used by
+simpleinit(8) itself to find the location of scripts to run (if an
+absolute path is not given). If unset the default value \fBPATH\fP is
+used. This separation allows boot scripts to invoke programmes of the
+same name without conflict and without needing to specify absolute
+paths.
+
+The \fBfinalprog\fP value specifies the path of the programme to run
+after all \fBgetty\fP(8) instances are spawned. At bootup, it is
+passed a single argument: "start". At shutdown, it is called again,
+this time with the argument: "stop".
 .SH SIGNALS
 \fBsimpleinit\fP(8) responds to signals in a variety of ways:
 .TP
@@ -121,7 +150,8 @@ remount (read-only) the root filesystem, even if the old inode for the
 .BR termcap (5),
 .BR getty (8),
 .BR agetty (8),
-.BR shutdown (8)
+.BR shutdown (8),
+.BR need (8)
 .SH BUGS
 This program is called
 .B simpleinit
@@ -135,4 +165,7 @@ for correct functionality.
 Peter Orbaek (poe@daimi.aau.dk)
 .br
 Version 1.20, with patches for singleuser mode by Werner Almesberger
-
+.br
+Richard Gooch <rgooch@atnf.csiro.au>
+.br
+Dependency support
diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c
index 1baf50cd76..9c4b63a5f7 100644
--- a/login-utils/simpleinit.c
+++ b/login-utils/simpleinit.c
@@ -64,8 +64,10 @@ struct initline {
 struct initline inittab[NUMCMD];
 int numcmd;
 int stopped = 0;	/* are we stopped */
-static char boot_script[PATH_SIZE] = _PATH_RC;
+static char boot_prog[PATH_SIZE] = _PATH_RC;
 static char script_prefix[PATH_SIZE] = "\0";
+static char final_prog[PATH_SIZE] = "\0";
+static char init_path[PATH_SIZE] = "\0";
 static int caught_sigint = 0;
 static const char *initctl_name = "/dev/initctl";
 static int initctl_fd = -1;
@@ -73,23 +75,27 @@ static volatile int do_longjmp = 0;
 static sigjmp_buf jmp_env;
 
 
-static void do_single ();
+static void do_single (void);
 static int do_rc_tty (const char *path);
 static int process_path ( const char *path, int (*func) (const char *path) );
 static int preload_file (const char *path);
 static int run_file (const char *path);
-void spawn(), hup_handler(), read_inittab();
-void tstp_handler ();
-void int_handler ();
+static void spawn (int i), read_inittab (void);
+static void hup_handler (int sig);
+static void sigtstp_handler (int sig);
+static void int_handler (int sig);
 static void sigchild_handler (int sig);
 static void sigquit_handler (int sig);
-void set_tz(), write_wtmp();
-static pid_t mywaitpid (pid_t pid, int *status, int *rc_status);
-static int run_command (const char *path, const char *name, pid_t pid);
-static void forget_those_not_present ();
+static void sigterm_handler (int sig);
+#ifdef SET_TZ
+static void set_tz (void);
+#endif
+static void write_wtmp (void);
+static pid_t mywaitpid (pid_t pid, int *status);
+static int run_command (const char *file, const char *name, pid_t pid);
 
 
-void err(char *s)
+static void err (char *s)
 {
 	int fd;
 	
@@ -100,8 +106,7 @@ void err(char *s)
 	close(fd);
 }
 
-void
-enter_single()
+static void enter_single (void)
 {
     pid_t pid;
     int i;
@@ -130,10 +135,13 @@ int main(int argc, char *argv[])
 #ifdef SET_TZ
 	set_tz();
 #endif
+	signal (SIGINT, int_handler);
 	sigemptyset (&sa.sa_mask);
 	sa.sa_flags = 0;
-	signal (SIGTSTP, tstp_handler);
-	signal (SIGINT, int_handler);
+	sa.sa_handler = sigtstp_handler;
+	sigaction (SIGTSTP, &sa, NULL);
+	sa.sa_handler = sigterm_handler;
+	sigaction (SIGTERM, &sa, NULL);
 	sa.sa_handler = sigchild_handler;
 	sigaction (SIGCHLD, &sa, NULL);
 	sa.sa_handler = sigquit_handler;
@@ -156,7 +164,7 @@ int main(int argc, char *argv[])
 			strcpy (path, script_prefix);
 			strcat (path, argv[i]);
 			if (access (path, R_OK | X_OK) == 0)
-				strcpy (boot_script, path);
+				strcpy (boot_prog, path);
 		}
 	}
 
@@ -172,7 +180,7 @@ int main(int argc, char *argv[])
 	while(stopped)	
 		pause();
 
-	if ( do_rc_tty (boot_script) ) do_single ();
+	if ( do_rc_tty (boot_prog) ) do_single ();
 
 	while(stopped)	/*Also if /etc/rc fails & we get SIGTSTP*/
 		pause();
@@ -195,10 +203,26 @@ int main(int argc, char *argv[])
 
 	for(i = 0; i < numcmd; i++)
 		spawn(i);
-	
+
+	if (final_prog[0] != '\0') {
+		switch ( fork () )
+		{
+		  case 0:   /*  Child   */
+		    execl (final_prog, final_prog, "start", NULL);
+		    err ( _("error running finalprog\n") );
+		    _exit (1);
+		    break;
+		  case -1:  /*  Error   */
+		    err ( _("error forking finalprog\n") );
+		    break;
+		  default:  /*  Parent  */
+		    break;
+		}
+	}
+
 	for ever {
-		pid = mywaitpid (-1, &vec, NULL);
-		if (pid == 0) continue;
+		pid = mywaitpid (-1, &vec);
+		if (pid < 1) continue;
 
 		/* clear utmp entry, and append to wtmp if possible */
 		{
@@ -249,7 +273,7 @@ int main(int argc, char *argv[])
  * return true if singleuser mode is allowed.
  * If /etc/securesingle exists ask for root password, otherwise always OK.
  */
-static int check_single_ok ()
+static int check_single_ok (void)
 {
     char *pass, *rootpass = NULL;
     struct passwd *pwd;
@@ -273,7 +297,7 @@ static int check_single_ok ()
     return 0;
 }
 
-static void do_single ()
+static void do_single (void)
 {
     char path[PATH_SIZE];
 
@@ -293,15 +317,15 @@ static void do_single ()
  */
 static int do_rc_tty (const char *path)
 {
-    int status, rc_status = 0;
-    pid_t pid;
+    int status;
+    pid_t pid, child;
     sigset_t ss;
 
     if (caught_sigint) return 0;
     process_path (path, preload_file);
     /*  Launch off a subprocess to start a new session (required for frobbing
 	the TTY) and capture control-C  */
-    switch ( pid = fork () )
+    switch ( child = fork () )
     {
       case 0:   /*  Child  */
 	for (status = 1; status < NSIG; status++) signal (status, SIG_DFL);
@@ -312,7 +336,7 @@ static int do_rc_tty (const char *path)
 	setsid ();
 	ioctl (0, TIOCSCTTY, 0);  /*  I want my control-C  */
 	sigsuspend (&ss);  /*  Should never return, should just be killed  */
-	break;             /*  No-one is controlled by this TTY now       */
+	break;             /*  No-one else is controlled by this TTY now   */
       case -1:  /*  Error  */
 	return (1);
 	/*break;*/
@@ -321,13 +345,15 @@ static int do_rc_tty (const char *path)
     }
     /*  Parent  */
     process_path (path, run_file);
-    while (rc_status == 0)
-	if (mywaitpid (-1, &status, &rc_status) == pid)
+    while (1)
+    {
+	if ( ( pid = mywaitpid (-1, &status) ) == child )
 	    return (WTERMSIG (status) == SIGINT) ? 0 : 1;
-    forget_those_not_present ();
-    kill (pid, SIGKILL);
-    while (waitpid (pid, NULL, 0) != pid)  /*  Nothing  */;
-    return (rc_status < 0) ? 1 : 0;
+	if (pid < 0) break;
+    }
+    kill (child, SIGKILL);
+    while (waitpid (child, NULL, 0) != child)  /*  Nothing  */;
+    return 0;
 }   /*  End Function do_rc_tty  */
 
 static int process_path ( const char *path, int (*func) (const char *path) )
@@ -368,7 +394,7 @@ static int preload_file (const char *path)
     char ch;
 
     if ( ( fd = open (path, O_RDONLY, 0) ) < 0) return 0;
-    while (read (fd, &ch, 1) == 1) lseek (fd, 1023, SEEK_CUR);
+    while (read (fd, &ch, 1) == 1) lseek (fd, 1024, SEEK_CUR);
     close (fd);
     return 0;
 }   /*  End Function preload_file  */
@@ -380,9 +406,9 @@ static int run_file (const char *path)
     if ( ( ptr = strrchr ( (char *) path, '/' ) ) == NULL ) ptr = path;
     else ++ptr;
     return (run_command (path, ptr, 0) == SIG_FAILED) ? 1 : 0;
-}   /*  End Function preload_file  */
+}   /*  End Function run_file  */
 
-void spawn(int i)
+static void spawn (int i)
 {
 	pid_t pid;
 	int j;
@@ -419,6 +445,7 @@ void spawn(int i)
 		/* this is the parent */
 		inittab[i].pid = pid;
 		inittab[i].last_start = ct;
+		sched_yield ();
 		return;
 	} else {
 		/* this is the child */
@@ -448,7 +475,7 @@ void spawn(int i)
 	}
 }
 
-void read_inittab()
+static void read_inittab (void)
 {
 	FILE *f;
 	char buf[CMDSIZ];
@@ -460,7 +487,7 @@ void read_inittab()
 	char tty[50];
 	struct stat stb;
 #endif
-	char *termenv, *getenv();
+	char *termenv;
 	
 	termenv = getenv("TERM");	/* set by kernel */
 	/* termenv = "vt100"; */
@@ -502,6 +529,16 @@ void read_inittab()
 				setenv ("PATH", ptr, 1);
 				continue;
 			}
+			if ( !strncmp (buf, "INIT_PATH", 9) ) {
+				while ( isspace (*ptr) ) ++ptr;
+				strcpy (init_path, ptr);
+				continue;
+			}
+			if ( !strncmp (buf, "finalprog", 8) ) {
+				while ( isspace (*ptr) ) ++ptr;
+				strcpy (final_prog, ptr);
+				continue;
+			}
 		}
 			
 
@@ -549,11 +586,11 @@ void read_inittab()
 		len = strlen (path);
 		if (path[len - 1] == '/') path[len - 1] = '\0';
 		if (access (path, R_OK | X_OK) == 0)
-			strcpy (boot_script, path);
+			strcpy (boot_prog, path);
 	}
 }
 
-void hup_handler()
+static void hup_handler (int sig)
 {
 	int i,j;
 	int oldnum;
@@ -564,7 +601,7 @@ void hup_handler()
 
 	memcpy(savetab, inittab, NUMCMD * sizeof(struct initline));
 	oldnum = numcmd;		
-	read_inittab();
+	read_inittab ();
 	
 	for(i = 0; i < numcmd; i++) {
 		had_already = 0;
@@ -581,15 +618,21 @@ void hup_handler()
 	(void) signal(SIGHUP, hup_handler);
 }
 
-void tstp_handler()
+static void sigtstp_handler (int sig)
 {
-	stopped = ~stopped;
-	if(!stopped) hup_handler();
+    stopped = ~stopped;
+    if (!stopped) hup_handler (sig);
+}   /*  End Function sigtstp_handler  */
 
-	signal(SIGTSTP, tstp_handler);
-}
+static void sigterm_handler (int sig)
+{
+    int i;
+
+    for (i = 0; i < numcmd; i++)
+	if (inittab[i].pid > 0) kill (inittab[i].pid, SIGTERM);
+}   /*  End Function sigterm_handler  */
 
-void int_handler()
+static void int_handler (int sig)
 {
 	pid_t pid;
 	
@@ -617,7 +660,8 @@ static void sigquit_handler (int sig)
     execl (_PATH_REBOOT, _PATH_REBOOT, NULL); /*  It knows pid=1 must sleep  */
 }
 
-void set_tz()
+#ifdef SET_TZ
+static void set_tz (void)
 {
 	FILE *f;
 	int len;
@@ -629,8 +673,9 @@ void set_tz()
 	tzone[len-1] = 0; /* get rid of the '\n' */
 	setenv("TZ", tzone, 0);
 }
+#endif
 
-void write_wtmp()
+static void write_wtmp (void)
 {
     int fd, lf;
     struct utmp ut;
@@ -653,44 +698,66 @@ void write_wtmp()
 }     
 
 
-struct waiter_struct
+struct needer_struct
 {
-    struct waiter_struct *next;
+    struct needer_struct *next;
     pid_t pid;
 };
 
+struct service_struct
+{
+    struct service_struct *prev, *next;    /*  Script services chain         */
+    struct needer_struct *needers;         /*  Needers waiting for service   */
+    struct script_struct *attempting_providers;
+    int failed;                /*  TRUE if attempting provider failed badly  */
+    char name[1];
+};
+
 struct script_struct
 {
     pid_t pid;
-    struct script_struct *prev, *next;
-    struct waiter_struct *first_waiter;
-    char name[1];
+    struct script_struct *prev, *next;              /*  For the list         */
+    struct service_struct *first_service, *last_service; /*First is true name*/
+    struct script_struct *next_attempting_provider; /*  Provider chain       */
 };
 
 struct list_head
 {
     struct script_struct *first, *last;
+    unsigned int num_entries;
 };
 
 
-static struct list_head available_list = {NULL, NULL};
-static struct list_head starting_list = {NULL, NULL};
-static struct list_head failed_list = {NULL, NULL};
-static struct list_head unavailable_list = {NULL, NULL};
+static struct list_head available_list = {NULL, NULL, 0};
+static struct list_head starting_list = {NULL, NULL, 0};
+static struct service_struct *unavailable_services = NULL;  /*  For needers  */
+static int num_needers = 0;
 
 
-static void process_pidstat (pid_t pid, int status, int *rc_status);
-static struct script_struct *find_script (const char *name,
-					  struct list_head *head);
+static int process_pidstat (pid_t pid, int status);
+static void process_command (const struct command_struct *command);
+static struct service_struct *find_service_in_list (const char *name,
+						    struct service_struct *sv);
+static struct script_struct *find_script_byname
+    (const char *name,struct list_head *head, struct service_struct **service);
+static struct script_struct *find_script_bypid (pid_t pid,
+						struct list_head *head);
 static void insert_entry (struct list_head *head, struct script_struct *entry);
 static void remove_entry (struct list_head *head, struct script_struct *entry);
-static void signal_waiters (struct script_struct *script, int sig);
-
-
-static pid_t mywaitpid (pid_t pid, int *status, int *rc_status)
+static void signal_needers (struct service_struct *service, int sig);
+static void handle_nonworking (struct script_struct *script);
+static int force_progress (void);
+static void show_scripts (FILE *fp, const struct script_struct *script,
+			  const char *type);
+static const char *get_path (const char *file);
+
+
+static pid_t mywaitpid (pid_t pid, int *status)
+/*  [RETURNS] The pid for a process to be reaped, 0 if no process is to be
+    reaped, and less than 0 if the boot scripts appear to have finished.
+*/
 {
     int ival;
-    struct script_struct *script;
     sigset_t ss_new, ss_old;
     long buffer[COMMAND_SIZE / sizeof (long)];
     struct command_struct *command = (struct command_struct *) buffer;
@@ -699,8 +766,7 @@ static pid_t mywaitpid (pid_t pid, int *status, int *rc_status)
     if (status == NULL) status = &ival;
     if ( ( pid = waitpid (pid, status, WNOHANG) ) > 0 )
     {
-	process_pidstat (pid, *status, rc_status);
-	return pid;
+	return process_pidstat (pid, *status);
     }
     /*  Some magic to avoid races  */
     command->command = -1;
@@ -717,23 +783,76 @@ static pid_t mywaitpid (pid_t pid, int *status, int *rc_status)
     }
     if (command->command < 0) read (initctl_fd, buffer, COMMAND_SIZE);
     do_longjmp = 0;
+    process_command (command);
+    return 0;
+}   /*  End Function mywaitpid  */
+
+static pid_t process_pidstat (pid_t pid, int status)
+/*  [RETURNS] The pid for a process to be reaped, 0 if no process is to be
+    reaped, and less than 0 if the boot scripts appear to have finished.
+*/
+{
+    int failed;
+    struct script_struct *script;
+    struct service_struct *service;
+
+    if ( ( script = find_script_bypid (pid, &starting_list) ) == NULL )
+	return pid;
+    remove_entry (&starting_list, script);
+    if ( WIFEXITED (status) && (WEXITSTATUS (status) == 0) )
+    {
+	struct script_struct *provider;
+
+	/*  Notify needers and other providers  */
+	for (service = script->first_service; service != NULL;
+	     service = service->next)
+	{
+	    signal_needers (service, SIG_PRESENT);
+	    for (provider = service->attempting_providers; provider != NULL;
+		 provider = provider->next_attempting_provider)
+		kill (provider->pid, SIG_PRESENT);
+	    service->attempting_providers = NULL;
+	}
+	insert_entry (&available_list, script);
+	return force_progress ();
+    }
+    failed = ( WIFEXITED (status) && (WEXITSTATUS (status) == 2) ) ? 0 : 1;
+    for (service = script->first_service; service != NULL;
+	 service = service->next)
+	service->failed = failed;
+    handle_nonworking (script);
+    return force_progress ();
+}   /*  End Function process_pidstat  */
+
+static void process_command (const struct command_struct *command)
+{
+    int ival;
+    struct script_struct *script;
+    struct service_struct *service;
+
     switch (command->command)
     {
       case COMMAND_TEST:
 	kill (command->pid,
-	      (find_script (command->name, &available_list) == NULL) ?
+	      (find_script_byname (command->name, &available_list,
+				   NULL) == NULL) ?
 	      SIG_NOT_PRESENT : SIG_PRESENT);
 	break;
       case COMMAND_NEED:
 	ival = run_command (command->name, command->name, command->pid);
-	if (ival != 0) kill (command->pid, ival);
+	if (ival == 0)
+	{
+	    ++num_needers;
+	    force_progress ();
+	}
+	else kill (command->pid, ival);
 	break;
       case COMMAND_ROLLBACK:
 	if (command->name[0] == '\0') script = NULL;
 	else
 	{
-	    if ( ( script = find_script (command->name, &available_list) )
-		 == NULL )
+	    if ( ( script = find_script_byname (command->name, &available_list,
+						NULL) ) == NULL )
 	    {
 		kill (command->pid, SIG_NOT_PRESENT);
 		break;
@@ -741,7 +860,9 @@ static pid_t mywaitpid (pid_t pid, int *status, int *rc_status)
 	}
 	while (script != available_list.first)
 	{
+	    pid_t pid;
 	    struct script_struct *victim = available_list.first;
+	    char txt[256];
 
 	    if ( ( pid = fork () ) == 0 )   /*  Child   */
 	    {
@@ -749,7 +870,8 @@ static pid_t mywaitpid (pid_t pid, int *status, int *rc_status)
 		open ("/dev/console", O_RDONLY, 0);
 		open ("/dev/console", O_RDWR, 0);
 		dup2 (1, 2);
-		execlp (victim->name, victim->name, "stop", NULL);
+		execlp (get_path (victim->first_service->name),
+			victim->first_service->name, "stop", NULL);
 		err ( _("error running programme\n") );
 		_exit (SIG_NOT_STOPPED);
 	    }
@@ -759,8 +881,11 @@ static pid_t mywaitpid (pid_t pid, int *status, int *rc_status)
 		while (waitpid (pid, &ival, 0) != pid) /*  Nothing  */;
 		if ( WIFEXITED (ival) && (WEXITSTATUS (ival) == 0) )
 		{
+		    sprintf (txt, "Stopped service: %s\n",
+			     victim->first_service->name);
 		    remove_entry (&available_list, victim);
 		    free (victim);
+		    err (txt);
 		}
 		else break;
 	    }
@@ -769,119 +894,187 @@ static pid_t mywaitpid (pid_t pid, int *status, int *rc_status)
 	      (script ==available_list.first) ? SIG_STOPPED : SIG_NOT_STOPPED);
 	break;
       case COMMAND_DUMP_LIST:
-	if (fork () == 0)
+	if (fork () == 0) /* Do it in a child process so pid=1 doesn't block */
 	{
 	    FILE *fp;
 
 	    if ( ( fp = fopen (command->name, "w") ) == NULL ) _exit (1);
-	    fputs ("AVAILABLE SERVICES:\n", fp);
-	    for (script = available_list.first; script != NULL;
-		 script = script->next) fprintf (fp, "%s\n", script->name);
-	    fputs ("FAILED SERVICES:\n", fp);
-	    for (script = failed_list.first; script != NULL;
-		 script = script->next) fprintf (fp, "%s\n", script->name);
+	    show_scripts (fp, available_list.first, "AVAILABLE");
+	    show_scripts (fp, starting_list.first, "STARTING");
+	    fputs ("UNAVAILABLE SERVICES:\n", fp);
+	    for (service = unavailable_services; service != NULL;
+		 service = service->next)
+		fprintf (fp, "%s (%s)\n", service->name,
+			 service->failed ? "FAILED" : "not configured");
 	    fclose (fp);
 	    _exit (0);
 	}
 	break;
+      case COMMAND_PROVIDE:
+	/*  Sanity check  */
+	if ( ( script = find_script_bypid (command->ppid, &starting_list) )
+	     == NULL )
+	{
+	    kill (command->pid, SIG_NOT_CHILD);
+	    break;
+	}
+	if (find_script_byname (command->name, &available_list, NULL) != NULL)
+	{
+	    kill (command->pid, SIG_PRESENT);
+	    break;
+	}
+	if (find_script_byname (command->name, &starting_list, &service)
+	    != NULL)
+	{   /*  Someone else is trying to provide  */
+	    script->next_attempting_provider = service->attempting_providers;
+	    service->attempting_providers = script;
+	    break;
+	}
+	if ( ( service = find_service_in_list (command->name,
+					       unavailable_services) )
+	     == NULL )
+	{   /*  We're the first to try and provide: create it  */
+	    if ( ( service =
+		   calloc (1, strlen (command->name) + sizeof *service) )
+		 == NULL )
+	    {
+		kill (command->pid, SIG_NOT_CHILD);
+		break;
+	    }
+	    strcpy (service->name, command->name);
+	}
+	else
+	{   /*  Orphaned service: unhook and grab it  */
+	    if (service->prev == NULL) unavailable_services = service->next;
+	    else service->prev->next = service->next;
+	    if (service->next != NULL) service->next->prev = service->prev;
+	    service->next = NULL;
+	}
+	service->prev = script->last_service;
+	script->last_service->next = service;
+	script->last_service = service;
+	kill (command->pid, SIG_NOT_PRESENT);
+	break;
       case -1:
       default:
 	break;
     }
-    return 0;
-}   /*  End Function mywaitpid  */
-
-static void process_pidstat (pid_t pid, int status, int *rc_status)
-{
-    struct script_struct *script;
-
-    if (initctl_fd < 0) return;
-    if (pid < 1) return;
-    for (script = starting_list.first; script != NULL; script = script->next)
-	if (script->pid == pid) break;
-    if (script == NULL) return;
-    remove_entry (&starting_list, script);
-    if ( WIFEXITED (status) && (WEXITSTATUS (status) == 0) )
-    {
-	signal_waiters (script, SIG_PRESENT);
-	insert_entry (&available_list, script);
-    }
-    else if ( WIFEXITED (status) && (WEXITSTATUS (status) == 2) )
-    {
-	signal_waiters (script, SIG_NOT_PRESENT);
-	insert_entry (&unavailable_list, script);
-    }
-    else
-    {
-	signal_waiters (script, SIG_FAILED);
-	insert_entry (&failed_list, script);
-    }
-    if ( (rc_status == NULL) || (starting_list.first != NULL) ) return;
-    *rc_status = (failed_list.first == NULL) ? 1 : -1;
-}   /*  End Function process_pidstat  */
+}   /*  End Function process_command  */
 
-static int run_command (const char *path, const char *name, pid_t pid)
+static int run_command (const char *file, const char *name, pid_t pid)
 {
     struct script_struct *script;
-    struct waiter_struct *waiter = NULL;
+    struct needer_struct *needer = NULL;
+    struct service_struct *service;
 
-    if (find_script (name, &available_list) != NULL) return SIG_PRESENT;
-    if (find_script (name, &failed_list) != NULL) return SIG_FAILED;
-    if (find_script (name, &unavailable_list) != NULL) return SIG_NOT_PRESENT;
+    if (find_script_byname (name, &available_list, NULL) != NULL)
+	return SIG_PRESENT;
     if (pid != 0)
     {
-	waiter = calloc (1, sizeof *waiter);
-	if (waiter == NULL) return SIG_FAILED;
-	waiter->pid = pid;
+	needer = calloc (1, sizeof *needer);
+	if (needer == NULL) return SIG_FAILED;
+	needer->pid = pid;
     }
-    script = find_script (name, &starting_list);
+    script = find_script_byname (name, &starting_list, &service);
+    if (script == NULL)
+	service = find_service_in_list (name, unavailable_services);
     if (script == NULL)
     {
 	int i;
+	char txt[1024];
 
-	script = calloc (1, strlen (name) + sizeof *script);
-	if (script == NULL)
+	if ( ( script = calloc (1, sizeof *script) ) == NULL )
 	{
-	    if (waiter != NULL) free (waiter);
+	    if (needer != NULL) free (needer);
 	    return SIG_FAILED;
 	}
-	strcpy (script->name, name);
+	if (service == NULL)
+	{
+	    service = calloc (1, strlen (name) + sizeof *service);
+	    if (service == NULL)
+	    {
+		free (script);
+		return SIG_FAILED;
+	    }
+	    strcpy (service->name, name);
+	}
+	else  /*  Unhook service from unavailable list  */
+	{
+	    if (service->prev == NULL) unavailable_services = service->next;
+	    else service->prev->next = service->next;
+	    if (service->next != NULL) service->next->prev = service->prev;
+	    service->prev = NULL;
+	    service->next = NULL;
+	}
 	switch ( script->pid = fork () )
 	{
 	  case 0:   /*  Child   */
 	    for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
-	    execlp (path, script->name, "start", NULL);
-	    err ( _("error running programme\n") );
+	    execlp (get_path (file), service->name, "start", NULL);
+	    sprintf (txt, "error running programme: \"%s\"\n", service->name);
+	    err ( _(txt) );
 	    _exit (SIG_FAILED);
 	    break;
 	  case -1:  /*  Error   */
+	    service->next = unavailable_services;
+	    if (unavailable_services != NULL)
+		unavailable_services->prev = service;
+	    unavailable_services = service;
 	    free (script);
-	    if (waiter != NULL) free (waiter);
+	    if (needer != NULL) free (needer);
 	    return SIG_FAILED;
 	    /*break;*/
 	  default:  /*  Parent  */
+	    script->first_service = service;
+	    script->last_service = service;
 	    insert_entry (&starting_list, script);
 	    sched_yield ();
 	    break;
 	}
     }
-    if (waiter == NULL) return 0;
-    waiter->next = script->first_waiter;
-    script->first_waiter = waiter;
+    if (needer == NULL) return 0;
+    needer->next = service->needers;
+    service->needers = needer;
     return 0;
 }   /*  End Function run_command  */
 
-static struct script_struct *find_script (const char *name,
-					  struct list_head *head)
+static struct service_struct *find_service_in_list (const char *name,
+						    struct service_struct *sv)
+{
+    for (; sv != NULL; sv = sv->next)
+	if (strcmp (sv->name, name) == 0) return (sv);
+    return NULL;
+}   /*  End Function find_service_in_list  */
+
+static struct script_struct *find_script_byname (const char *name,
+						 struct list_head *head,
+						 struct service_struct **service)
 {
-    struct script_struct *entry;
+    struct script_struct *script;
 
-    for (entry = head->first; entry != NULL; entry = entry->next)
+    for (script = head->first; script != NULL; script = script->next)
     {
-	if (strcmp (entry->name, name) == 0) return (entry);
+	struct service_struct *sv;
+
+	if ( ( sv = find_service_in_list (name, script->first_service) )
+	     != NULL )
+	{
+	    if (service != NULL) *service = sv;
+	    return (script);
+	}
     }
     return NULL;
-}   /*  End Function find_script  */
+}   /*  End Function find_script_byname  */
+
+static struct script_struct *find_script_bypid (pid_t pid,
+						struct list_head *head)
+{
+    struct script_struct *script;
+
+    for (script = head->first; script != NULL; script = script->next)
+	if (script->pid == pid) return (script);
+    return NULL;
+}   /*  End Function find_script_bypid  */
 
 static void insert_entry (struct list_head *head, struct script_struct *entry)
 {
@@ -891,6 +1084,7 @@ static void insert_entry (struct list_head *head, struct script_struct *entry)
     if (head->first != NULL) head->first->prev = entry;
     head->first = entry;
     if (head->last == NULL) head->last = entry;
+    ++head->num_entries;
 }   /*  End Function insert_entry  */
 
 static void remove_entry (struct list_head *head, struct script_struct *entry)
@@ -899,37 +1093,96 @@ static void remove_entry (struct list_head *head, struct script_struct *entry)
     else entry->prev->next = entry->next;
     if (entry->next == NULL) head->last = entry->prev;
     else entry->next->prev = entry->prev;
+    --head->num_entries;
 }   /*  End Function remove_entry  */
 
-static void signal_waiters (struct script_struct *script, int sig)
+static void signal_needers (struct service_struct *service, int sig)
 {
-    struct waiter_struct *waiter, *next_waiter;
+    struct needer_struct *needer, *next_needer;
 
-    for (waiter = script->first_waiter; waiter != NULL; waiter = next_waiter)
+    for (needer = service->needers; needer != NULL; needer = next_needer)
     {
-	kill (waiter->pid, sig);
-	next_waiter = waiter->next;
-	free (waiter);
+	kill (needer->pid, sig);
+	next_needer = needer->next;
+	free (needer);
+	--num_needers;
     }
-    script->first_waiter = NULL;
-}   /*  End Function signal_waiters  */
+    service->needers = NULL;
+}   /*  End Function signal_needers  */
 
-static void forget_those_not_present ()
+static void handle_nonworking (struct script_struct *script)
 {
-    struct script_struct *curr, *next;
+    struct service_struct *service, *next;
 
-    for (curr = failed_list.first; curr != NULL; curr = next)
+    for (service = script->first_service; service != NULL; service = next)
     {
-	next = curr->next;
-	free (curr);
+	struct script_struct *provider = service->attempting_providers;
+
+	next = service->next;
+	if (provider == NULL)
+	{
+	    service->next = unavailable_services;
+	    if (unavailable_services != NULL)
+		unavailable_services->prev = service;
+	    unavailable_services = service;
+	    continue;
+	}
+	service->attempting_providers = provider->next_attempting_provider;
+	provider->last_service->next = service;
+	service->prev = provider->last_service;
+	provider->last_service = service;
+	service->next = NULL;
+	kill (provider->pid, SIG_NOT_PRESENT);
     }
-    failed_list.first = NULL;
-    failed_list.last = NULL;
-    for (curr = unavailable_list.first; curr != NULL; curr = next)
+    free (script);
+}   /*  End Function handle_nonworking  */
+
+static int force_progress (void)
+/*  [RETURNS] 0 if boot scripts are still running, else -1.
+*/
+{
+    struct service_struct *service;
+
+    if (starting_list.num_entries > num_needers) return 0;
+    /*  No progress can be made: signal needers  */
+    for (service = unavailable_services; service != NULL;
+	 service = service->next)
+	signal_needers (service,
+			service->failed ? SIG_FAILED : SIG_NOT_PRESENT);
+    return (starting_list.num_entries < 1) ? -1 : 0;
+}   /*  End Function force_progress  */
+
+static void show_scripts (FILE *fp, const struct script_struct *script,
+			  const char *type)
+{
+    fprintf (fp, "%s SERVICES:\n", type);
+    for (; script != NULL; script = script->next)
+    {
+	struct service_struct *service = script->first_service;
+
+	fputs (service->name, fp);
+	for (service = service->next; service != NULL; service = service->next)
+	    fprintf (fp, "  (%s)", service->name);
+	putc ('\n', fp);
+    }
+}   /*  End Function show_scripts  */
+
+static const char *get_path (const char *file)
+{
+    char *p1, *p2;
+    static char path[PATH_SIZE];
+
+    if (file[0] == '/') return file;
+    if (init_path[0] == '\0') return file;
+    for (p1 = init_path; *p1 != '\0'; p1 = p2)
     {
-	next = curr->next;
-	free (curr);
+	if ( ( p2 = strchr (p1, ':') ) == NULL )
+	    p2 = p1 + strlen (p1);
+	strncpy (path, p1, p2 - p1);
+	path[p2 - p1] = '/';
+	strcat (path + (p2 - p1) + 1, file);
+	if (*p2 == ':') ++p2;
+	if (access (path, X_OK) == 0) return path;
     }
-    unavailable_list.first = NULL;
-    unavailable_list.last = NULL;
-}   /*  End Function forget_those_not_present  */
+    return file;
+}   /*  End Function get_path  */
diff --git a/login-utils/simpleinit.h b/login-utils/simpleinit.h
index ff26480f72..1d8762975d 100644
--- a/login-utils/simpleinit.h
+++ b/login-utils/simpleinit.h
@@ -10,16 +10,19 @@
 #define COMMAND_NEED       1  /*  Wait, signal                               */
 #define COMMAND_ROLLBACK   2  /*  Wait, signal                               */
 #define COMMAND_DUMP_LIST  3  /*  No wait, no signal                         */
+#define COMMAND_PROVIDE    4  /*  Wait, signal                               */
 
 #define SIG_PRESENT        SIGUSR1  /*  Service is available                 */
 #define SIG_STOPPED        SIGUSR1  /*  Service was stopped OK               */
 #define SIG_NOT_PRESENT    SIGUSR2  /*  Not present, but that's OK           */
 #define SIG_FAILED         SIGPOLL  /*  Startup failed                       */
 #define SIG_NOT_STOPPED    SIGPOLL  /*  Failed to stop                       */
+#define SIG_NOT_CHILD      SIGPOLL  /*  Not a child of init                  */
 
 struct command_struct  /*  Must always be COMMAND_SIZE  */
 {
     signed int command;
     pid_t pid;
+    pid_t ppid;
     char name[1];
 };
diff --git a/login-utils/ttymsg.c b/login-utils/ttymsg.c
index 6bf2f82f68..b422abb859 100644
--- a/login-utils/ttymsg.c
+++ b/login-utils/ttymsg.c
@@ -53,9 +53,8 @@
 #include <stdlib.h>
 #include "nls.h"
 
-#ifdef __linux__
 #include "pathnames.h"
-#endif
+#include "ttymsg.h"
 
 /*
  * Display the contents of a uio structure on a terminal.  Used by wall(1),
@@ -65,12 +64,7 @@
  * ignored (exclusive-use, lack of permission, etc.).
  */
 char *
-ttymsg(iov, iovcnt, line, tmout)
-	struct iovec *iov;
-	int iovcnt;
-	char *line;
-	int tmout;
-{
+ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout) {
 	static char device[MAXNAMLEN];
 	static char errbuf[MAXNAMLEN+1024];
 	register int cnt, fd, left, wret;
diff --git a/login-utils/ttymsg.h b/login-utils/ttymsg.h
new file mode 100644
index 0000000000..5d27951977
--- /dev/null
+++ b/login-utils/ttymsg.h
@@ -0,0 +1,2 @@
+char *ttymsg(struct iovec *iov, int iovcnt, char *line, int tmout);
+
diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index dfcdca2ed5..665d77daab 100644
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -77,11 +77,9 @@ char tmptmp_file[FILENAMELEN]; /* very tmp file */
 
 void pw_error __P((char *, int, int));
 
-void
-copyfile(from, to)
-	register int from, to;
-{
-	register int nr, nw, off;
+static void
+copyfile(int from, int to) {
+	int nr, nw, off;
 	char buf[8*1024];
 	
 	while ((nr = read(from, buf, sizeof(buf))) > 0)
@@ -94,9 +92,8 @@ copyfile(from, to)
 }
 
 
-void
-pw_init()
-{
+static void
+pw_init(void) {
 	struct rlimit rlim;
 
 	/* Unlimited resource limits. */
@@ -125,9 +122,8 @@ pw_init()
 	(void)umask(0);
 }
 
-int
-pw_lock()
-{
+static int
+pw_lock(void) {
 	int lockfd, fd, ret;
 
 	/* 
@@ -179,9 +175,8 @@ pw_lock()
 	return(1);
 }
 
-void
-pw_unlock()
-{
+static void
+pw_unlock(void) {
   char tmp[FILENAMELEN];
   
   sprintf(tmp, "%s%s", orig_file, ".OLD");
@@ -198,9 +193,8 @@ pw_unlock()
 }
 
 
-void
-pw_edit(int notsetuid)
-{
+static void
+pw_edit(int notsetuid) {
 	int pstat;
 	pid_t pid;
 	char *p, *editor;
diff --git a/login-utils/wall.c b/login-utils/wall.c
index d476edd64d..6840015d40 100644
--- a/login-utils/wall.c
+++ b/login-utils/wall.c
@@ -55,8 +55,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <utmp.h>
+
 #include "nls.h"
+#include "ttymsg.h"
 #include "pathnames.h"
+#include "carefulputc.h"
 
 void	makemsg __P((char *));
 
@@ -68,17 +71,13 @@ char *mbuf;
 
 char *progname = "wall";
 
-/* ARGSUSED */
 int
-main(argc, argv)
-	int argc;
-	char **argv;
-{
+main(int argc, char **argv) {
 	extern int optind;
 	int ch;
 	struct iovec iov;
 	struct utmp *utmpptr;
-	char *p, *ttymsg();
+	char *p;
 	char line[sizeof(utmpptr->ut_line) + 1];
 
 	setlocale(LC_ALL, "");
@@ -139,7 +138,7 @@ makemsg(fname)
 	struct tm *lt;
 	struct passwd *pw;
 	struct stat sbuf;
-	time_t now, time();
+	time_t now;
 	FILE *fp;
 	int fd;
 	char *p, *whom, *where, hostname[MAXHOSTNAMELEN],
@@ -184,11 +183,26 @@ makemsg(fname)
 	}
 	(void)fprintf(fp, "%79s\r\n", " ");
 
-	if (fname && !(freopen(fname, "r", stdin))) {
-		(void)fprintf(stderr, _("%s: can't read %s.\n"), progname, fname);
-		exit(1);
+	if (fname) {
+		/*
+		 * When we are not root, but suid or sgid, refuse to read files
+		 * (e.g. device files) that the user may not have access to.
+		 * After all, our invoker can easily do "wall < file"
+		 * instead of "wall file".
+		 */
+		int uid = getuid();
+		if (uid && (uid != geteuid() || getgid() != getegid())) {
+			fprintf(stderr, _("%s: will not read %s - use stdin.\n"),
+				progname, fname);
+			exit(1);
+		}
+		if (!freopen(fname, "r", stdin)) {
+			fprintf(stderr, _("%s: can't read %s.\n"), progname, fname);
+			exit(1);
+		}
 	}
-	while (fgets(lbuf, sizeof(lbuf), stdin))
+
+	while (fgets(lbuf, sizeof(lbuf), stdin)) {
 		for (cnt = 0, p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) {
 			if (cnt == 79 || ch == '\n') {
 				for (; cnt < 79; ++cnt)
@@ -197,15 +211,10 @@ makemsg(fname)
 				putc('\n', fp);
 				cnt = 0;
 			} else {
-			   /* Test for control chars added Fri Mar 10
-			      19:49:30 1995, faith@cs.unc.edu */
-			   if (!isprint(ch) && !isspace(ch) && ch != '\007') {
-			      putc('^', fp);
-			      putc(ch^0x40,fp); /* DEL to ?, others to alpha */
-			   } else
-			      putc(ch, fp);
+				carefulputc(ch, fp);
 			}
 		}
+	}
 	(void)fprintf(fp, "%79s\r\n", " ");
 	rewind(fp);
 
diff --git a/misc-utils/Makefile b/misc-utils/Makefile
index 088d2ccee9..5b74dd39e5 100644
--- a/misc-utils/Makefile
+++ b/misc-utils/Makefile
@@ -21,6 +21,8 @@ BIN=            kill
 USRBIN=		cal chkdupexe ddate logger look mcookie \
 		namei rename script whereis write
 
+MAYBE=		reset setterm tsort
+
 ifeq "$(HAVE_RESET)" "no"
 USRBIN:=$(USRBIN) reset
 MAN1:=$(MAN1) reset.1
@@ -79,6 +81,8 @@ mcookie.o: mcookie.c md5.h
 md5.o: md5.c md5.h
 reset: reset.sh
 script: script.o
+write.o: $(LIB)/carefulputc.h
+write: write.o $(LIB)/carefulputc.o
 
 ifeq "$(HAVE_NCURSES)" "yes"
 setterm: setterm.o
@@ -97,4 +101,4 @@ endif
 
 .PHONY:	clean
 clean:
-	-rm -f *.o *~ core $(BIN) $(USRBIN)
+	-rm -f *.o *~ core $(BIN) $(USRBIN) $(MAYBE)
diff --git a/misc-utils/cal.1 b/misc-utils/cal.1
index 6a5ec5ae51..9bade9d0b4 100644
--- a/misc-utils/cal.1
+++ b/misc-utils/cal.1
@@ -42,7 +42,7 @@
 .Nd displays a calendar
 .Sh SYNOPSIS
 .Nm cal
-.Op Fl mjy
+.Op Fl mjy13
 .Op Ar month Op Ar year
 .Sh DESCRIPTION
 .Nm Cal
@@ -51,6 +51,12 @@ If arguments are not specified,
 the current month is displayed.
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl 1
+Display single month output (use if cal was built with -3 as default to get 
+older traditional output)
+.It Fl 3
+Display prev/current/next month output (use if cal was built with traditional
+-1 as default to get newer improved output)
 .It Fl m
 Display Monday as the first day of the week.
 (The default is Sunday.)
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index bc0c1eff57..aba1b6f061 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -39,6 +39,12 @@
  * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
  * - added Native Language Support
  *
+ * 2000-09-01  Michael Charles Pruznick <dummy@netwiz.net> 
+ *             Added "-3" option to print prev/next month with current.
+ *             Added over-ridable default NUM_MONTHS and "-1" option to
+ *             get traditional output when -3 is the default.  I hope that
+ *             enough people will like -3 as the default that one day the
+ *             product can be shipped that way.
  */
 
 #include <sys/types.h>
@@ -60,6 +66,15 @@
 # include <localeinfo.h>	/* libc4 only */
 #endif
 
+/* allow compile-time define to over-ride default */
+#ifndef NUM_MONTHS
+#define NUM_MONTHS 1
+#endif
+
+#if ( NUM_MONTHS != 1 && NUM_MONTHS !=3 )
+#error NUM_MONTHS must be 1 or 3
+#endif
+
 #define	THURSDAY		4		/* for reformation */
 #define	SATURDAY 		6		/* 1 Jan 1 was a Saturday */
 
@@ -102,7 +117,7 @@ int sep1752[MAXDAYS] = {
 
 char day_headings[]   = " S  M Tu  W Th  F  S ";
 /* week1stday = 1  =>   " M Tu  W Th  F  S  S " */
-char j_day_headings[] = "  S   M  Tu   W  Th   F   S ";
+char j_day_headings[] = "Sun Mon Tue Wed Thu Fri Sat ";
 /* week1stday = 1  =>   "  M  Tu   W  Th   F   S   S " */
 const char *full_month[12];
 
@@ -127,13 +142,22 @@ const char *full_month[12];
 int week1stday;
 int julian;
 
+#define FMT_ST_LINES 8
+#define FMT_ST_CHARS 300	/* 90 suffices in most locales */
+struct fmt_st
+{
+  char s[FMT_ST_LINES][FMT_ST_CHARS];
+};
+
 void	ascii_day __P((char *, int));
 void	center __P((const char *, int, int));
 void	day_array __P((int, int, int *));
 int	day_in_week __P((int, int, int));
 int	day_in_year __P((int, int, int));
 void	j_yearly __P((int));
+void	do_monthly __P((int, int, struct fmt_st*));
 void	monthly __P((int, int));
+void	monthly3 __P((int, int));
 void	trim_trailing_spaces __P((char *));
 void	usage __P((void));
 void	yearly __P((int));
@@ -146,6 +170,7 @@ main(int argc, char **argv) {
 	time_t now;
 	int ch, month, year, yflag;
 	char *progname, *p;
+	int num_months = NUM_MONTHS;
 
 	progname = argv[0];
 	if ((p = strrchr(progname, '/')) != NULL)
@@ -157,8 +182,14 @@ main(int argc, char **argv) {
 	textdomain(PACKAGE);
 	
 	yflag = 0;
-	while ((ch = getopt(argc, argv, "mjy")) != EOF)
+	while ((ch = getopt(argc, argv, "13mjyV")) != EOF)
 		switch(ch) {
+ 		case '1':
+ 			num_months = 1;
+ 			break;
+ 		case '3':
+ 			num_months = 3;
+ 			break;
 		case 'm':
 			week1stday = 1;
 			break;
@@ -201,8 +232,10 @@ main(int argc, char **argv) {
 	}
 	headers_init();
 
-	if (month)
+	if (month && num_months == 1)
 		monthly(month, year);
+	else if (month && num_months == 3)
+		monthly3(month, year);
 	else if (julian)
 		j_yearly(year);
 	else
@@ -233,7 +266,7 @@ void headers_init(void)
   for(i = 0 ; i < 7 ; i++ ) {
      wd = (i + week1stday) % 7;
      strncat(day_headings,weekday(wd),2);
-     strcat(j_day_headings,weekday(wd));
+     strncat(j_day_headings,weekday(wd),3);
      if (strlen(weekday(wd)) == 2)
 	strcat(j_day_headings," ");
      strcat(day_headings," ");
@@ -252,24 +285,86 @@ void headers_init(void)
 }
 
 void
-monthly(month, year)
+do_monthly(month, year, out)
 	int month, year;
+	struct fmt_st* out;
 {
 	int col, row, len, days[MAXDAYS];
 	char *p, lineout[300];
 
 	day_array(month, year, days);
 	len = sprintf(lineout, "%s %d", full_month[month - 1], year);
-	(void)printf("%*s%s\n%s\n",
-	    ((julian ? J_WEEK_LEN : WEEK_LEN) - len) / 2, "",
-	    lineout, julian ? j_day_headings : day_headings);
+	(void)sprintf(out->s[0],"%*s%s",
+	    ((julian ? J_WEEK_LEN : WEEK_LEN) - len) / 2, "", lineout );
+	(void)sprintf(out->s[1],"%s",
+	    julian ? j_day_headings : day_headings);
 	for (row = 0; row < 6; row++) {
 		for (col = 0, p = lineout; col < 7; col++,
 		    p += julian ? J_DAY_LEN : DAY_LEN)
 			ascii_day(p, days[row * 7 + col]);
 		*p = '\0';
 		trim_trailing_spaces(lineout);
-		(void)printf("%s\n", lineout);
+		(void)sprintf(out->s[row+2],"%s", lineout);
+	}
+}
+
+void
+monthly(month, year)
+	int month, year;
+{
+	int i;
+	struct fmt_st out;
+
+	do_monthly(month, year, &out);
+	for ( i = 0; i < FMT_ST_LINES; i++ )
+	{
+	  printf("%s\n", out.s[i]);
+	}
+}
+
+void
+monthly3(month, year)
+	int month, year;
+{
+	int i;
+	int width;
+	struct fmt_st out_prev;
+	struct fmt_st out_curm;
+	struct fmt_st out_next;
+	int prev_month, prev_year;
+	int next_month, next_year;
+
+	if ( month == 1 )
+	{
+	  prev_month = 12;
+	  prev_year  = year - 1;
+	}
+	else
+	{
+	  prev_month = month - 1;
+	  prev_year  = year;
+	}
+	if ( month == 12 )
+	{
+	  next_month = 1;
+	  next_year  = year + 1;
+	}
+	else
+	{
+	  next_month = month + 1;
+	  next_year  = year;
+	}
+
+	do_monthly(prev_month, prev_year, &out_prev);
+	do_monthly(month,      year,      &out_curm);
+	do_monthly(next_month, next_year, &out_next);
+        width = (julian ? J_WEEK_LEN : WEEK_LEN);
+	for ( i = 0; i < FMT_ST_LINES; i++ )
+	{
+	  printf("%-*.*s %-*.*s %-*.*s\n", 
+	      width, width, out_prev.s[i], 
+	      width, width, out_curm.s[i], 
+	      width, width, out_next.s[i] );
 	}
 }
 
diff --git a/misc-utils/ddate.c b/misc-utils/ddate.c
index 304c31c60b..bf7a37f281 100644
--- a/misc-utils/ddate.c
+++ b/misc-utils/ddate.c
@@ -153,8 +153,7 @@ struct disc_time convert(int,int);
 struct disc_time makeday(int,int,int);
 
 int
-main (int argc, char *argv[]) 
-{
+main (int argc, char *argv[]) {
     long t;
     struct tm *eris;
     int bob,raw;
diff --git a/misc-utils/logger.1 b/misc-utils/logger.1
index b5459ed4c9..2c154ec096 100644
--- a/misc-utils/logger.1
+++ b/misc-utils/logger.1
@@ -41,7 +41,7 @@
 .Nd make entries in the system log
 .Sh SYNOPSIS
 .Nm logger
-.Op Fl is
+.Op Fl isd
 .Op Fl f Ar file
 .Op Fl p Ar pri
 .Op Fl t Ar tag
@@ -80,11 +80,12 @@ Mark every line in the log with the specified
 Write to socket as specified with
 .Ar socket
 instead of builtin syslog routines.
+.It Fl d
+Use a datagram instead of a stream connection to this socket.
 .It --
 End the argument list. This is to allow the
 .Ar message
-to start with a hyphen (\-).  This feature was not present in the
-original BSD logger command; it is a GNU-specific extra.
+to start with a hyphen (\-).
 .It Ar message
 Write the message to log; if not specified, and the
 .Fl f
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 372fe1eced..ae0ebec00b 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -45,6 +45,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/un.h>
 #include "nls.h"
 
 #define	SYSLOG_NAMES
@@ -54,20 +55,27 @@ int	decode __P((char *, CODE *));
 int	pencode __P((char *));
 void	usage __P((void));
 
+static int optd = 0;
+
 static int
 myopenlog(const char *sock) {
        int fd;
-       static struct sockaddr s_addr;     /* AF_UNIX address of local logger */
+       static struct sockaddr_un s_addr; /* AF_UNIX address of local logger */
+
+       if (strlen(sock) >= sizeof(s_addr.sun_path)) {
+	       printf ("logger: openlog: pathname too long\n");
+	       exit(1);
+       }
 
-       s_addr.sa_family = AF_UNIX;
-       (void)strncpy(s_addr.sa_data, sock, sizeof(s_addr.sa_data));
+       s_addr.sun_family = AF_UNIX;
+       (void)strcpy(s_addr.sun_path, sock);
 
-       if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+       if ((fd = socket(AF_UNIX, optd ? SOCK_DGRAM : SOCK_STREAM, 0)) == -1) {
                printf ("socket: %s.\n", strerror(errno));
                exit (1);
        }
 
-       if (connect(fd, &s_addr, sizeof(s_addr.sa_family)+strlen(s_addr.sa_data)) == -1) {
+       if (connect(fd, (struct sockaddr *) &s_addr, sizeof(s_addr)) == -1) {
                printf ("connect: %s.\n", strerror(errno));
                exit (1);
        }
@@ -80,7 +88,6 @@ mysyslog(int fd, int logflags, int pri, char *tag, char *msg) {
        time_t now;
 
        if (fd > -1) {
-	       /* there was a gethostname call here, but its output was not used */
 	       /* avoid snprintf - it does not exist on ancient systems */
                if (logflags & LOG_PID)
                        sprintf (pid, "[%d]", getpid());
@@ -125,7 +132,7 @@ main(int argc, char **argv) {
 	tag = NULL;
 	pri = LOG_NOTICE;
 	logflags = 0;
-	while ((ch = getopt(argc, argv, "f:ip:st:u:")) != EOF)
+	while ((ch = getopt(argc, argv, "f:ip:st:u:d")) != EOF)
 		switch((char)ch) {
 		case 'f':		/* file to log */
 			if (freopen(optarg, "r", stdin) == NULL) {
@@ -150,6 +157,9 @@ main(int argc, char **argv) {
 		case 'u':		/* unix socket */
 			usock = optarg;
 			break;
+		case 'd':
+			optd = 1;	/* use datagrams */
+			break;
 		case '?':
 		default:
 			usage();
diff --git a/misc-utils/look.c b/misc-utils/look.c
index a8e826fa48..d601e1c97f 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -137,13 +137,25 @@ main(int argc, char *argv[])
 
 	if ((fd = open(file, O_RDONLY, 0)) < 0 || fstat(fd, &sb))
 		err("%s: %s", file, strerror(errno));
-	if ((void *)(front = mmap(NULL,
-				  (size_t)sb.st_size,
-				  PROT_READ,
-				  MAP_FILE|MAP_SHARED,
-				  fd,
-				  (off_t)0)) <= (void *)0)
+	front = mmap(NULL, (size_t) sb.st_size, PROT_READ,
+#ifdef MAP_FILE
+		     MAP_FILE |
+#endif
+		     MAP_SHARED, fd, (off_t) 0);
+	if
+#ifdef MAP_FAILED
+	   (front == MAP_FAILED)
+#else
+	   ((void *)(front) <= (void *)0)
+#endif
 		err("%s: %s", file, strerror(errno));
+
+#if 0
+	/* workaround for mmap problem (rmiller@duskglow.com) */
+	if (front == (void *)0)
+		return 1;
+#endif
+
 	back = front + sb.st_size;
 	return look(front, back);
 }
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index 65faad4f3c..f77d501c45 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -47,6 +47,7 @@ chdir to /,  or if it encounters an unknown file type.
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/misc-utils/procs.c b/misc-utils/procs.c
index 715d9fb099..3f52387de7 100644
--- a/misc-utils/procs.c
+++ b/misc-utils/procs.c
@@ -14,14 +14,14 @@
 
 #define _POSIX_SOURCE 1
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "kill.h"
 
 extern char *mybasename (char *);
diff --git a/misc-utils/script.1 b/misc-utils/script.1
index ddc35223d1..3edd82d4b7 100644
--- a/misc-utils/script.1
+++ b/misc-utils/script.1
@@ -31,15 +31,17 @@
 .\"
 .\"	@(#)script.1	6.5 (Berkeley) 7/27/91
 .\"
-.Dd July 27, 1991
+.Dd July 30, 2000
 .Dt SCRIPT 1
-.Os BSD 4
+.Os Linux
 .Sh NAME
 .Nm script
 .Nd make typescript of terminal session
 .Sh SYNOPSIS
 .Nm script
 .Op Fl a
+.Op Fl f
+.Op Fl q
 .Op Ar file
 .Sh DESCRIPTION
 .Nm Script
@@ -58,7 +60,7 @@ saves all dialogue in
 If no file name is given, the typescript is saved in the file
 .Pa typescript  .
 .Pp
-Option:
+Options:
 .Bl -tag -width Ds
 .It Fl a
 Append the output to
@@ -66,6 +68,12 @@ Append the output to
 or
 .Pa typescript ,
 retaining the prior contents.
+.It Fl f
+Flush output after each write. This is nice for telecooperation:
+One person does `mkfifo foo; script -f foo' and another can
+supervise real-time what is being done using `cat foo'.
+.It Fl q
+Be quiet.
 .El
 .Pp
 The script ends when the forked shell exits (a
diff --git a/misc-utils/script.c b/misc-utils/script.c
index cb7ae1a967..c3bf142e6d 100644
--- a/misc-utils/script.c
+++ b/misc-utils/script.c
@@ -31,8 +31,11 @@
  * SUCH DAMAGE.
  */
 
-/* 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
+/*
+ * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
  * - added Native Language Support
+ *
+ * 2000-07-30 Per Andreas Buer <per@linpro.no> - added "q"-option
  */
 
 /*
@@ -86,25 +89,65 @@ int	l;
 #ifndef HAVE_openpty
 char	line[] = "/dev/ptyXX";
 #endif
-int	aflg;
+int	aflg = 0;
+int	fflg = 0;
+int	qflg = 0;
+
+static char *progname;
+
+static void
+die_if_symlink(char *fn) {
+	struct stat s;
+
+	if (lstat(fn, &s) == 0 && S_ISLNK(s.st_mode)) {
+		fprintf(stderr,
+			_("Warning: `%s' is a symlink.\n"
+			  "Use `%s [options] %s' if you really "
+			  "want to use it.\n"
+			  "Script not started.\n"),
+			fn, progname, fn);
+		exit(1);
+	}
+}
 
 int
 main(int argc, char **argv) {
 	extern int optind;
+	char *p;
 	int ch;
 
+	progname = argv[0];
+	if ((p = strrchr(progname, '/')) != NULL)
+		progname = p+1;
+
+
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 	
-	while ((ch = getopt(argc, argv, "a")) != EOF)
+	if (argc == 2) {
+		if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
+			printf(_("%s from %s\n"),
+			       progname, util_linux_version);
+			return 0;
+		}
+	}
+
+	while ((ch = getopt(argc, argv, "afq")) != EOF)
 		switch((char)ch) {
 		case 'a':
 			aflg++;
 			break;
+		case 'f':
+			fflg++;
+			break;
+		case 'q':
+			qflg++;
+			break;
 		case '?':
 		default:
-			fprintf(stderr, _("usage: script [-a] [file]\n"));
+			fprintf(stderr,
+				_("usage: script [-a] [-f] [-q] [file]\n"));
 			exit(1);
 		}
 	argc -= optind;
@@ -112,8 +155,10 @@ main(int argc, char **argv) {
 
 	if (argc > 0)
 		fname = argv[0];
-	else
+	else {
 		fname = "typescript";
+		die_if_symlink(fname);
+	}
 	if ((fscript = fopen(fname, aflg ? "a" : "w")) == NULL) {
 		perror(fname);
 		fail();
@@ -124,7 +169,8 @@ main(int argc, char **argv) {
 		shell = _PATH_BSHELL;
 
 	getmaster();
-	printf(_("Script started, file is %s\n"), fname);
+	if (!qflg)
+		printf(_("Script started, file is %s\n"), fname);
 	fixtty();
 
 	(void) signal(SIGCHLD, finish);
@@ -167,11 +213,11 @@ doinput() {
 
 void
 finish(int dummy) {
-	union wait status;
+	int status;
 	register int pid;
 	register int die = 0;
 
-	while ((pid = wait3((int *)&status, WNOHANG, 0)) > 0)
+	while ((pid = wait3(&status, WNOHANG, 0)) > 0)
 		if (pid == child)
 			die = 1;
 
@@ -197,6 +243,8 @@ dooutput() {
 			break;
 		(void) write(1, obuf, cc);
 		(void) fwrite(obuf, 1, cc, fscript);
+		if (fflg)
+			(void) fflush(fscript);
 	}
 	done();
 }
@@ -250,13 +298,17 @@ done() {
 	time_t tvec;
 
 	if (subchild) {
-		tvec = time((time_t *)NULL);
-		fprintf(fscript,_("\nScript done on %s"), ctime(&tvec));
+		if (!qflg) {
+			tvec = time((time_t *)NULL);
+			fprintf(fscript, _("\nScript done on %s"),
+				ctime(&tvec));
+		}
 		(void) fclose(fscript);
 		(void) close(master);
 	} else {
 		(void) tcsetattr(0, TCSAFLUSH, &tt);
-		printf(_("Script done, file is %s\n"), fname);
+		if (!qflg)
+			printf(_("Script done, file is %s\n"), fname);
 	}
 	exit(0);
 }
diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index bc505c54f0..239b1f4aee 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -41,6 +41,7 @@
 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include "nls.h"
@@ -111,6 +112,7 @@ static char *bindirs[] = {
 
 static char *mandirs[] = {
 	"/usr/man/*",
+	"/usr/share/man/*",
 	"/usr/X386/man/*",
 	"/usr/X11/man/*",
 	"/usr/TeX/man/*",
diff --git a/misc-utils/write.c b/misc-utils/write.c
index 1cf99c7f00..e794a4eee2 100644
--- a/misc-utils/write.c
+++ b/misc-utils/write.c
@@ -53,6 +53,7 @@
 #include <time.h>
 #include <pwd.h>
 #include <string.h>
+#include <stdlib.h>
 #include <locale.h>
 #include <signal.h>
 #include <sys/param.h>
@@ -60,10 +61,9 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/time.h>
-#ifdef __linux__
 #include <paths.h>
 #include "pathnames.h"
-#endif
+#include "carefulputc.h"
 #include "nls.h"
  
 void search_utmp(char *, char *, char *, uid_t);
@@ -73,7 +73,6 @@ static void done(int);
 int term_chk(char *, int *, time_t *, int);
 int utmp_chk(char *, char *);
 
-
 int
 main(int argc, char **argv) {
 	time_t atime;
@@ -289,24 +288,25 @@ int term_chk(char *tty, int *msgsokP, time_t *atimeP, int showerror)
  * do_write - actually make the connection
  */
 void do_write(char *tty, char *mytty, uid_t myuid) {
-	register char *login, *nows;
-	register struct passwd *pwd;
+	char *login, *pwuid, *nows;
+	struct passwd *pwd;
 	time_t now;
 	char path[MAXPATHLEN], host[MAXHOSTNAMELEN], line[512];
 
-	/* Determine our login name before the we reopen() stdout */
-	if ((login = getlogin()) == NULL) {
-		if ((pwd = getpwuid(myuid)) != NULL)
-			login = pwd->pw_name;
-		else
-			login = "???";
-	}
+	/* Determine our login name(s) before the we reopen() stdout */
+	if ((pwd = getpwuid(myuid)) != NULL)
+		pwuid = pwd->pw_name;
+	else
+		pwuid = "???";
+	if ((login = getlogin()) == NULL)
+		login = pwuid;
 
 	if (strlen(tty) + 6 > sizeof(path))
 		exit(1);
 	(void)sprintf(path, "/dev/%s", tty);
 	if ((freopen(path, "w", stdout)) == NULL) {
-		(void)fprintf(stderr, "write: %s: %s\n", path, strerror(errno));
+		(void)fprintf(stderr, "write: %s: %s\n",
+			      path, strerror(errno));
 		exit(1);
 	}
 
@@ -320,8 +320,12 @@ void do_write(char *tty, char *mytty, uid_t myuid) {
 	nows = ctime(&now);
 	nows[16] = '\0';
 	printf("\r\n\007\007\007");
-	(void)printf(_("Message from %s@%s on %s at %s ..."),
-	    login, host, mytty, nows + 11);
+	if (strcmp(login, pwuid))
+		(void)printf(_("Message from %s@%s (as %s) on %s at %s ..."),
+			     login, host, pwuid, mytty, nows + 11);
+	else
+		(void)printf(_("Message from %s@%s on %s at %s ..."),
+			     login, host, mytty, nows + 11);
 	printf("\r\n");
 
 	while (fgets(line, sizeof(line), stdin) != NULL)
@@ -339,34 +343,24 @@ done(int dummy) {
 
 /*
  * wr_fputs - like fputs(), but makes control characters visible and
- *     turns \n into \r\n
+ *     turns \n into \r\n.
  */
-void wr_fputs(char *s)
-
-{
+void
+wr_fputs(char *s) {
 	char c;
 
-#define	PUTC(c)	if (putchar(c) == EOF) goto err;
+#define	PUTC(c)	if (carefulputc(c,stdout) == EOF) goto err;
 
-	for (; *s != '\0'; ++s) {
-		c = *s;
-		if (c == '\n') {
+	while(*s) {
+		c = *s++;
+		if (c == '\n')
 			PUTC('\r');
-			PUTC('\n');
-		} else if (!isprint(c) && !isspace(c) && c != '\007') {
-			if (c & 0x80) {
-				/* use some fallback? */
-				(void)printf("\\%3o", (unsigned char) c);
-			} else {
-				PUTC('^');
-				PUTC(c^0x40);	/* DEL to ?, others to alpha */
-			}
-		} else
-			PUTC(c);
+		PUTC(c);
 	}
 	return;
 
-err:	(void)fprintf(stderr, "write: %s\n", strerror(errno));
+err:
+	fprintf(stderr, "write: %s\n", strerror(errno));
 	exit(1);
 #undef PUTC
 }
diff --git a/mount/Makefile b/mount/Makefile
index 6f72413dbb..18e30cde6a 100644
--- a/mount/Makefile
+++ b/mount/Makefile
@@ -1,15 +1,13 @@
 include ../make_include
 include ../MCONFIG
 
-CFLAGS = -I$(LIB) $(OPT)
-WARNFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes
 DEFINES = -DHAVE_NFS
 
 RPCSVCDIR = rpcsvc
 RPC_CFLAGS = -Wno-unused 
 RPCGEN = rpcgen
 
-COMPILE = $(CC) -c $(WARNFLAGS) $(CFLAGS) $(DEFINES)
+COMPILE = $(CC) -c $(CFLAGS) $(DEFINES)
 LINK = $(CC) $(LDFLAGS)
 
 SUID_PROGS = mount umount
@@ -24,6 +22,8 @@ endif
 
 PROGS = $(SUID_PROGS) $(NOSUID_PROGS)
 
+MAYBE = pivot_root swapoff
+
 # comment these out if you are not compiling in NFS support
 NFS_OBJS = nfsmount.o nfsmount_xdr.o nfsmount_clnt.o
 # uncomment this if you don't have libc-4.2 but do have the rpclib
@@ -59,8 +59,7 @@ swapon:	swapon.o version.o
 	$(LINK) $^ -o $@
 
 losetup.o: lomount.c
-	$(COMPILE) -DMAIN lomount.c
-	mv lomount.o losetup.o
+	$(COMPILE) -DMAIN lomount.c -o $@
 
 losetup: losetup.o
 	$(LINK) $^ -o $@
@@ -117,7 +116,7 @@ loop.h:
 	sh mk_loop_h
 
 clean:
-	rm -f a.out core *~ *.o swapargs.h $(PROGS) swapoff
+	rm -f a.out core *~ *.o swapargs.h $(PROGS) $(MAYBE)
 	rm -f loop.h nfs_mountversion.h
 
 clobber distclean realclean: clean
diff --git a/mount/README.mount b/mount/README.mount
index 2a8fae1c1f..f010a1bd86 100644
--- a/mount/README.mount
+++ b/mount/README.mount
@@ -6,5 +6,5 @@ Rick Sladkey <jrs@world.std.com>,
 Stephen Tweedie <sct@dcs.ed.ac.uk>.
 
 Presently maintained by Andries Brouwer <aeb@cwi.nl>.
-Ftp site: ftp.win.tue.nl:/pub/linux/util .
+Ftp site: ftp.win.tue.nl:/pub/linux/utils/util-linux
 
diff --git a/mount/bind.c b/mount/bind.c
new file mode 100644
index 0000000000..4af72a9c34
--- /dev/null
+++ b/mount/bind.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+#include <sys/mount.h>
+
+main(int argc, char **argv) {
+	int ret;
+
+	ret = mount(argv[1], argv[2], "bind", MS_MGC_VAL, NULL);
+	if (ret)
+		perror("bind");
+	return ret;
+}
diff --git a/mount/fstab.c b/mount/fstab.c
index aef26d90c8..3ee1f36a10 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -99,21 +99,19 @@ read_mntentchn(mntFILE *mfp, const char *fnam, struct mntentchn *mc0) {
 	struct mntent *mnt;
 
 	while ((mnt = my_getmntent (mfp)) != NULL) {
-	    if (!streq (mnt->mnt_type, MNTTYPE_IGNORE)) {
-		mc->nxt = (struct mntentchn *) xmalloc(sizeof(*mc));
-		mc->nxt->prev = mc;
-		mc = mc->nxt;
-		mc->mnt_fsname = mnt->mnt_fsname;
-		mc->mnt_dir = mnt->mnt_dir;
-		mc->mnt_type = mnt->mnt_type;
-		mc->mnt_opts = mnt->mnt_opts;
-		mc->nxt = NULL;
-	    }
+		if (!streq (mnt->mnt_type, MNTTYPE_IGNORE)) {
+			mc->nxt = (struct mntentchn *) xmalloc(sizeof(*mc));
+			mc->nxt->prev = mc;
+			mc = mc->nxt;
+			mc->m = *mnt;
+			mc->nxt = mc0;
+		}
 	}
 	mc0->prev = mc;
 	if (ferror (mfp->mntent_fp)) {
 		int errsv = errno;
-		error(_("warning: error reading %s: %s"), fnam, strerror (errsv));
+		error(_("warning: error reading %s: %s"),
+		      fnam, strerror (errsv));
 		mc0->nxt = mc0->prev = NULL;
 	}
 	my_endmntent(mfp);
@@ -163,7 +161,8 @@ read_fstab() {
      mfp = my_setmntent (fnam, "r");
      if (mfp == NULL || mfp->mntent_fp == NULL) {
      	  int errsv = errno;
-	  error(_("warning: can't open %s: %s"), _PATH_FSTAB, strerror (errsv));
+	  error(_("warning: can't open %s: %s"),
+		_PATH_FSTAB, strerror (errsv));
 	  return;
      }
      read_mntentchn(mfp, fnam, mc);
@@ -173,13 +172,14 @@ read_fstab() {
 /* Given the name NAME, try to find it in mtab.  */ 
 struct mntentchn *
 getmntfile (const char *name) {
-    struct mntentchn *mc;
-
-    for (mc = mtab_head()->nxt; mc; mc = mc->nxt)
-        if (streq (mc->mnt_dir, name) || (streq (mc->mnt_fsname, name)))
-	    break;
-
-    return mc;
+	struct mntentchn *mc, *mc0;
+
+	mc0 = mtab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if (streq (mc->m.mnt_dir, name) ||
+		    streq (mc->m.mnt_fsname, name))
+			return mc;
+	return NULL;
 }
 
 /*
@@ -188,110 +188,108 @@ getmntfile (const char *name) {
  */ 
 struct mntentchn *
 getmntfilesbackward (const char *name, struct mntentchn *mcprev) {
-    struct mntentchn *mc, *mh;
-
-    mh = mtab_head();
-    if (!mcprev)
-	mcprev = mh;
-    for (mc = mcprev->prev; mc && mc != mh; mc = mc->prev)
-        if (streq (mc->mnt_dir, name) || (streq (mc->mnt_fsname, name)))
-	    return mc;
-
-    return NULL;
+	struct mntentchn *mc, *mc0;
+
+	mc0 = mtab_head();
+	if (!mcprev)
+		mcprev = mc0;
+	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
+		if (streq (mc->m.mnt_dir, name) ||
+		    streq (mc->m.mnt_fsname, name))
+			return mc;
+	return NULL;
 }
 
 /* Given the name FILE, try to find the option "loop=FILE" in mtab.  */ 
 struct mntentchn *
-getmntoptfile (const char *file)
-{
-     struct mntentchn *mc;
-     char *opts, *s;
-     int l;
-
-     if (!file)
-	  return NULL;
-
-     l = strlen(file);
-
-     for (mc = mtab_head()->nxt; mc; mc = mc->nxt)
-	  if ((opts = mc->mnt_opts) != NULL
-	      && (s = strstr(opts, "loop="))
-	      && !strncmp(s+5, file, l)
-	      && (s == opts || s[-1] == ',')
-	      && (s[l+5] == 0 || s[l+5] == ','))
-	       return mc;
-
-     return NULL;
+getmntoptfile (const char *file) {
+	struct mntentchn *mc, *mc0;
+	char *opts, *s;
+	int l;
+
+	if (!file)
+		return NULL;
+
+	l = strlen(file);
+
+	mc0 = mtab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if ((opts = mc->m.mnt_opts) != NULL
+		    && (s = strstr(opts, "loop="))
+		    && !strncmp(s+5, file, l)
+		    && (s == opts || s[-1] == ',')
+		    && (s[l+5] == 0 || s[l+5] == ','))
+			return mc;
+	return NULL;
 }
 
 /* Find the entry (SPEC,FILE) in fstab */
 struct mntentchn *
 getfsspecfile (const char *spec, const char *file) {
-    struct mntentchn *mc;
-
-    for (mc = fstab_head()->nxt; mc; mc = mc->nxt)
-	if (streq (mc->mnt_dir, file) && streq (mc->mnt_fsname, spec))
-	     return mc;
-    for (mc = fstab_head()->nxt; mc; mc = mc->nxt)
-	if ((streq (mc->mnt_dir, file) ||
-	     streq (canonicalize(mc->mnt_dir), file))
-	    && (streq (mc->mnt_fsname, spec) ||
-		streq (canonicalize(mc->mnt_fsname), spec)))
-	     break;
-    return mc;
+	struct mntentchn *mc, *mc0;
+
+	mc0 = fstab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if (streq (mc->m.mnt_dir, file) &&
+		    streq (mc->m.mnt_fsname, spec))
+			return mc;
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if ((streq (mc->m.mnt_dir, file) ||
+		     streq (canonicalize(mc->m.mnt_dir), file))
+		    && (streq (mc->m.mnt_fsname, spec) ||
+			streq (canonicalize(mc->m.mnt_fsname), spec)))
+			return mc;
+	return NULL;
 }
 
 /* Find the dir FILE in fstab.  */
 struct mntentchn *
 getfsfile (const char *file) {
-    struct mntentchn *mc;
-
-    for (mc = fstab_head()->nxt; mc; mc = mc->nxt)
-        if (streq (mc->mnt_dir, file))
-	    break;
+	struct mntentchn *mc, *mc0;
 
-    return mc;
+	mc0 = fstab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if (streq (mc->m.mnt_dir, file))
+			return mc;
+	return NULL;
 }
 
 /* Find the device SPEC in fstab.  */
 struct mntentchn *
-getfsspec (const char *spec)
-{
-    struct mntentchn *mc;
-
-    for (mc = fstab_head()->nxt; mc; mc = mc->nxt)
-        if (streq (mc->mnt_fsname, spec))
-	    break;
-
-    return mc;
+getfsspec (const char *spec) {
+	struct mntentchn *mc, *mc0;
+
+	mc0 = fstab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if (streq (mc->m.mnt_fsname, spec))
+			return mc;
+	return NULL;
 }
 
 /* Find the uuid UUID in fstab. */
 struct mntentchn *
-getfsuuidspec (const char *uuid)
-{
-    struct mntentchn *mc;
-
-    for (mc = fstab_head()->nxt; mc; mc = mc->nxt)
-	if (strncmp (mc->mnt_fsname, "UUID=", 5) == 0
-	    && streq(mc->mnt_fsname + 5, uuid))
-	    break;
-
-    return mc;
+getfsuuidspec (const char *uuid) {
+	struct mntentchn *mc, *mc0;
+
+	mc0 = fstab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if (strncmp (mc->m.mnt_fsname, "UUID=", 5) == 0
+		    && streq(mc->m.mnt_fsname + 5, uuid))
+			return mc;
+	return NULL;
 }
 
 /* Find the label LABEL in fstab. */
 struct mntentchn *
-getfsvolspec (const char *label)
-{
-    struct mntentchn *mc;
-
-    for (mc = fstab_head()->nxt; mc; mc = mc->nxt)
-	if (strncmp (mc->mnt_fsname, "LABEL=", 6) == 0
-	    && streq(mc->mnt_fsname + 6, label))
-	    break;
-
-    return mc;
+getfsvolspec (const char *label) {
+	struct mntentchn *mc, *mc0;
+
+	mc0 = fstab_head();
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+		if (strncmp (mc->m.mnt_fsname, "LABEL=", 6) == 0
+		    && streq(mc->m.mnt_fsname + 6, label))
+			return mc;
+	return NULL;
 }
 
 /* Updating mtab ----------------------------------------------*/
@@ -371,7 +369,8 @@ lock_mtab (void) {
 			int errsv = errno;
 			/* linktargetfile does not exist (as a file)
 			   and we cannot create it. Read-only filesystem?
-			   Too many files open in the system? Filesystem full? */
+			   Too many files open in the system?
+			   Filesystem full? */
 			die (EX_FILEIO, _("can't create lock file %s: %s "
 			     "(use -n flag to override)"),
 			     linktargetfile, strerror (errsv));
@@ -455,7 +454,7 @@ unlock_mtab (void) {
 
 /*
  * Update the mtab.
- *  Used by umount with null INSTEAD: remove any DIR entries.
+ *  Used by umount with null INSTEAD: remove the last DIR entry.
  *  Used by mount upon a remount: update option part,
  *   and complain if a wrong device or type was given.
  *   [Note that often a remount will be a rw remount of /
@@ -465,90 +464,87 @@ unlock_mtab (void) {
 
 void
 update_mtab (const char *dir, struct mntent *instead) {
-     struct mntent *mnt;
-     struct mntent *next;
-     struct mntent remnt;
-     int added = 0;
-     mntFILE *mfp, *mftmp;
+	mntFILE *mfp, *mftmp;
+	const char *fnam = MOUNTED;
+	struct mntentchn mtabhead;	/* dummy */
+	struct mntentchn *mc, *mc0, absent;
 
-     if (mtab_does_not_exist() || mtab_is_a_symlink())
-	  return;
+	if (mtab_does_not_exist() || mtab_is_a_symlink())
+		return;
 
-     lock_mtab();
+	lock_mtab();
 
-     mfp = my_setmntent(MOUNTED, "r");
-     if (mfp == NULL || mfp->mntent_fp == NULL) {
-     	  int errsv = errno;
-	  error (_("cannot open %s (%s) - mtab not updated"),
-		 MOUNTED, strerror (errsv));
-	  goto leave;
-     }
+	/* having locked mtab, read it again */
+	mc0 = mc = &mtabhead;
+	mc->nxt = mc->prev = NULL;
 
-     mftmp = my_setmntent (MOUNTED_TEMP, "w");
-     if (mftmp == NULL || mfp->mntent_fp == NULL) {
-     	  int errsv = errno;
-	  error (_("cannot open %s (%s) - mtab not updated"),
-		 MOUNTED_TEMP, strerror (errsv));
-	  goto leave;
-     }
-  
-     while ((mnt = my_getmntent (mfp))) {
-	  if (streq (mnt->mnt_dir, dir)
-#if 0
-	      /* Matthew Wilcox <willy@odie.barnet.ac.uk> */
-	      /* This is meant for Patch 212 on Jitterbug,
-		 still in incoming, to allow remounting
-		 on a different directory. */
-	      || (instead && instead->mnt_fsname &&
-		  (!streq (instead->mnt_fsname, "none")) &&
-		  (streq (mnt->mnt_fsname, instead->mnt_fsname)))
-#endif
-		  ) {
-	       added++;
-	       if (instead) {	/* a remount */
-		    remnt = *instead;
-		    next = &remnt;
-		    remnt.mnt_fsname = mnt->mnt_fsname;
-		    remnt.mnt_type = mnt->mnt_type;
-		    if (instead->mnt_fsname
-			&& !streq(mnt->mnt_fsname, instead->mnt_fsname))
-			 printf(_("mount: warning: cannot change "
-				"mounted device with a remount\n"));
-		    else if (instead->mnt_type
-			     && !streq(instead->mnt_type, "unknown")
-			     && !streq(mnt->mnt_type, instead->mnt_type))
-			 printf(_("mount: warning: cannot change "
-				"filesystem type with a remount\n"));
-	       } else
-		    next = NULL;
-	  } else
-	       next = mnt;
-	  if (next && my_addmntent(mftmp, next) == 1) {
-	       int errsv = errno;
-	       die (EX_FILEIO, _("error writing %s: %s"),
-		    MOUNTED_TEMP, strerror (errsv));
-	  }
-     }
-     if (instead && !added && my_addmntent(mftmp, instead) == 1) {
-     	  int errsv = errno;
-	  die (EX_FILEIO, _("error writing %s: %s"),
-	       MOUNTED_TEMP, strerror (errsv));
-    }
+	mfp = my_setmntent(fnam, "r");
+	if (mfp == NULL || mfp->mntent_fp == NULL) {
+		int errsv = errno;
+		error (_("cannot open %s (%s) - mtab not updated"),
+		       fnam, strerror (errsv));
+		goto leave;
+	}
 
-     my_endmntent (mfp);
-     if (fchmod (fileno (mftmp->mntent_fp), S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) < 0) {
-     	  int errsv = errno;
-	  fprintf(stderr, _("error changing mode of %s: %s\n"), MOUNTED_TEMP,
-		  strerror (errsv));
-     }
-     my_endmntent (mftmp);
+	read_mntentchn(mfp, fnam, mc);
+
+	/* find last occurrence of dir */
+	for (mc = mc0->prev; mc && mc != mc0; mc = mc->prev)
+		if (streq (mc->m.mnt_dir, dir))
+			break;
+	if (mc && mc != mc0) {
+		if (instead == NULL) {
+			/* An umount - remove entry */
+			if (mc && mc != mc0) {
+				mc->prev->nxt = mc->nxt;
+				mc->nxt->prev = mc->prev;
+			}
+		} else {
+			/* A remount */
+			mc->m.mnt_opts = instead->mnt_opts;
+		}
+	} else if (instead) {
+		/* not found, add a new entry */
+		absent.m = *instead;
+		absent.nxt = mc0;
+		absent.prev = mc0->prev;
+		mc0->prev = &absent;
+		if (mc0->nxt == NULL)
+			mc0->nxt = &absent;
+	}
 
-     if (rename (MOUNTED_TEMP, MOUNTED) < 0) {
-     	  int errsv = errno;
-	  fprintf(stderr, _("can't rename %s to %s: %s\n"), MOUNTED_TEMP, MOUNTED,
-		  strerror(errsv));
-     }
+	/* write chain to mtemp */
+	mftmp = my_setmntent (MOUNTED_TEMP, "w");
+	if (mftmp == NULL || mfp->mntent_fp == NULL) {
+		int errsv = errno;
+		error (_("cannot open %s (%s) - mtab not updated"),
+		       MOUNTED_TEMP, strerror (errsv));
+		goto leave;
+	}
+
+	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
+		if (my_addmntent(mftmp, &(mc->m)) == 1) {
+			int errsv = errno;
+			die (EX_FILEIO, _("error writing %s: %s"),
+			     MOUNTED_TEMP, strerror (errsv));
+		}
+	}
+
+	if (fchmod (fileno (mftmp->mntent_fp),
+		    S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) < 0) {
+		int errsv = errno;
+		fprintf(stderr, _("error changing mode of %s: %s\n"),
+			MOUNTED_TEMP, strerror (errsv));
+	}
+	my_endmntent (mftmp);
+
+	/* rename mtemp to mtab */
+	if (rename (MOUNTED_TEMP, MOUNTED) < 0) {
+		int errsv = errno;
+		fprintf(stderr, _("can't rename %s to %s: %s\n"),
+			MOUNTED_TEMP, MOUNTED, strerror(errsv));
+	}
 
-leave:
-     unlock_mtab();
+ leave:
+	unlock_mtab();
 }
diff --git a/mount/fstab.h b/mount/fstab.h
index 65bf5dba6a..820f418a03 100644
--- a/mount/fstab.h
+++ b/mount/fstab.h
@@ -1,3 +1,4 @@
+#include <mntent.h>
 #define _PATH_FSTAB	"/etc/fstab"
 #ifdef _PATH_MOUNTED
 #define MOUNTED_LOCK	_PATH_MOUNTED "~"
@@ -13,11 +14,8 @@ int mtab_does_not_exist(void);
 int mtab_is_a_symlink(void);
 
 struct mntentchn {
-     struct mntentchn *nxt, *prev;
-     char *mnt_fsname;
-     char *mnt_dir;
-     char *mnt_type;
-     char *mnt_opts;
+	struct mntentchn *nxt, *prev;
+	struct mntent m;
 };
 
 struct mntentchn *mtab_head (void);
diff --git a/mount/linux_fs.h b/mount/linux_fs.h
index 635389a010..043ac16a70 100644
--- a/mount/linux_fs.h
+++ b/mount/linux_fs.h
@@ -100,3 +100,52 @@ struct fat_super_block {
     u_char    s_label2[11];	/* for Windows? */
     u_char    s_fs2[8];	        /* garbage or "FAT32   " */
 };
+
+#define XFS_SUPER_MAGIC "XFSB"
+#define XFS_SUPER_MAGIC2 "BSFX"
+struct xfs_super_block {
+    u_char    s_magic[4];
+    u_char    s_dummy[28];
+    u_char    s_uuid[16];
+    u_char    s_dummy2[60];
+    u_char    s_fname[12];
+};
+
+#define CRAMFS_SUPER_MAGIC 0x28cd3d45
+struct cramfs_super_block {
+	u_char    s_magic[4];
+	u_char    s_dummy[12];
+	u_char    s_id[16];
+};
+#define cramfsmagic(s)	((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8) + \
+			 (((uint) s.s_magic[2]) << 16) + \
+			 (((uint) s.s_magic[3]) << 24))
+
+#define HFS_SUPER_MAGIC 0x4244
+struct hfs_super_block {
+	u_char    s_magic[2];
+	u_char    s_dummy[18];
+	u_char    s_blksize[4];
+};
+#define hfsmagic(s)	((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8))
+#define hfsblksize(s)	((uint) s.s_blksize[0] + \
+			 (((uint) s.s_blksize[1]) << 8) + \
+			 (((uint) s.s_blksize[2]) << 16) + \
+			 (((uint) s.s_blksize[3]) << 24))
+
+#define HPFS_SUPER_MAGIC 0xf995e849
+struct hpfs_super_block {
+	u_char    s_magic[4];
+	u_char    s_magic2[4];
+};
+#define hpfsmagic(s)	((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8) + \
+			 (((uint) s.s_magic[2]) << 16) + \
+			 (((uint) s.s_magic[3]) << 24))
+
+struct adfs_super_block {
+	u_char    s_dummy[448];
+	u_char    s_blksize[1];
+	u_char    s_dummy2[62];
+	u_char    s_checksum[1];
+};
+#define adfsblksize(s)	((uint) s.s_blksize[0])
diff --git a/mount/lomount.c b/mount/lomount.c
index 52157a14a8..cabc444618 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -68,7 +68,7 @@ crypt_name (int id) {
 	return "undefined";
 }
 
-static void 
+static int
 show_loop (char *device) {
 	struct loop_info loopinfo;
 	int fd;
@@ -77,36 +77,69 @@ show_loop (char *device) {
 		int errsv = errno;
 		fprintf(stderr, _("loop: can't open device %s: %s\n"),
 			device, strerror (errsv));
-		return;
+		return 2;
 	}
 	if (ioctl (fd, LOOP_GET_STATUS, &loopinfo) < 0) {
 		int errsv = errno;
 		fprintf(stderr, _("loop: can't get info on device %s: %s\n"),
 			device, strerror (errsv));
 		close (fd);
-		return;
+		return 1;
 	}
 	printf (_("%s: [%04x]:%ld (%s) offset %d, %s encryption\n"),
 		device, loopinfo.lo_device, loopinfo.lo_inode,
 		loopinfo.lo_name, loopinfo.lo_offset,
 		crypt_name (loopinfo.lo_encrypt_type));
 	close (fd);
+
+	return 0;
 }
 #endif
 
+int
+is_loop_device (const char *device) {
+	struct stat statbuf;
+	int loopmajor;
+#if 1
+	loopmajor = 7;
+#else
+	FILE *procdev;
+	char line[100], *cp;
+
+	loopmajor = 0;
+	if ((procdev = fopen(PROC_DEVICES, "r")) != NULL) {
+		while (fgets (line, sizeof(line), procdev)) {
+			if ((cp = strstr (line, " loop\n")) != NULL) {
+				*cp='\0';
+				loopmajor=atoi(line);
+				break;
+			}
+		}
+		fclose(procdev);
+	}
+#endif
+	return (loopmajor && stat(device, &statbuf) == 0 &&
+		S_ISBLK(statbuf.st_mode) &&
+		(statbuf.st_rdev>>8) == loopmajor);
+}
+
+#define SIZE(a) (sizeof(a)/sizeof(a[0]))
+
 char *
 find_unused_loop_device (void) {
 	/* Just creating a device, say in /tmp, is probably a bad idea -
 	   people might have problems with backup or so.
 	   So, we just try /dev/loop[0-7]. */
 	char dev[20];
-	int i, fd, somedev = 0, someloop = 0, loop_known = 0;
+	char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" };
+	int i, j, fd, somedev = 0, someloop = 0, loop_known = 0;
 	struct stat statbuf;
 	struct loop_info loopinfo;
 	FILE *procdev;
 
-	for(i = 0; i < 256; i++) {
-		sprintf(dev, "/dev/loop%d", i);
+	for (j = 0; j < SIZE(loop_formats); j++) {
+	    for(i = 0; i < 256; i++) {
+		sprintf(dev, loop_formats[j], i);
 		if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
 			somedev++;
 			fd = open (dev, O_RDONLY);
@@ -121,8 +154,8 @@ find_unused_loop_device (void) {
 			}
 			continue;/* continue trying as long as devices exist */
 		}
-		if (i >= 7)
-			break;
+		break;
+	    }
 	}
 
 	/* Nothing found. Why not? */
@@ -393,7 +426,7 @@ main(int argc, char **argv) {
 		if (delete)
 			res = del_loop(argv[optind]);
 		else
-			show_loop(argv[optind]);
+			res = show_loop(argv[optind]);
 	} else {
 		if (offset && sscanf(offset,"%d",&off) != 1)
 			usage();
diff --git a/mount/lomount.h b/mount/lomount.h
index 00a49f5587..1a93c693f5 100644
--- a/mount/lomount.h
+++ b/mount/lomount.h
@@ -1,4 +1,5 @@
 extern int verbose;
 extern int set_loop (const char *, const char *, int, const char *, int *);
 extern int del_loop (const char *);
+extern int is_loop_device (const char *);
 extern char * find_unused_loop_device (void);
diff --git a/mount/losetup.8 b/mount/losetup.8
index c2e41307d2..d364f4f1ec 100644
--- a/mount/losetup.8
+++ b/mount/losetup.8
@@ -46,6 +46,15 @@ attacks.
 .IP "\fB\-o \fIoffset\fP"
 the data start is moved \fIoffset\fP bytes into the specified file or
 device.
+.SH RETURN VALUE
+.B losetup
+returns 0 on success, nonzero on failure. When
+.B losetup
+displays the status of a loop device, it returns 1 if the device
+is not configured and 2 if an error occurred which prevented
+.B losetup
+from determining the status of the device.
+
 .SH FILES
 .nf
 /dev/loop0,/dev/loop1,...   loop devices (major=7)
@@ -81,7 +90,5 @@ DES encryption is painfully slow. On the other hand, XOR is terribly weak.
 .SH AUTHORS
 .nf
 Original version: Theodore Ts'o <tytso@athena.mit.edu>
-Maintained by: Werner Almesberger <almesber@bernina.ethz.ch>
 Original DES by: Eric Young <eay@psych.psy.uq.oz.au>
-Modularized and updated 28-5-94: Mitch DSouza <m.dsouza@mrc-apu.cam.ac.uk>
 .fi
diff --git a/mount/mount.8 b/mount/mount.8
index 7016ee5351..f903411984 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -98,6 +98,14 @@ lists all mounted file systems (of type
 The option \-l adds the (ext2) labels in this listing.
 See below.
 
+.\" In fact since 2.3.99. At first the syntax was mount -t bind.
+Since Linux 2.4.0 it is possible to remount part of the
+file hierarchy somewhere else. The call is
+.RS
+.br
+.B "mount --bind olddir newdir"
+.RE
+
 The
 .I proc
 file system is not associated with a special device, and when
@@ -367,7 +375,8 @@ necessary. The nfs ad hoc code is built in, but smbfs and ncpfs
 have a separate mount program. In order to make it possible to
 treat all types in a uniform way, mount will execute the program
 .I /sbin/mount.TYPE
-(if that exists) when called with type smb or ncp.
+(if that exists) when called with type
+.IR TYPE .
 Since various versions of the
 .I smbmount
 program have different calling conventions,
diff --git a/mount/mount.c b/mount/mount.c
index b8ee2ebec9..39ccd3e634 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -36,6 +36,7 @@
  * - added `owner' mount option
  * 2000-05-11 Mark A. Peloquin <peloquin@us.ibm.com>
  * - check_special_mountprog now returns correct status
+ * 2000-11-08 aeb: accept nonnumeric uid=, gid= options
  */
 
 #include <unistd.h>
@@ -45,6 +46,9 @@
 #include <getopt.h>
 #include <stdio.h>
 
+#include <pwd.h>
+#include <grp.h>
+
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -58,6 +62,7 @@
 #include "lomount.h"
 #include "loop.h"
 #include "linux_fs.h"		/* for BLKGETSIZE */
+#include "mount_guess_rootdev.h"
 #include "mount_guess_fstype.h"
 #include "mount_by_label.h"
 #include "getusername.h"
@@ -96,6 +101,12 @@ static int optfork = 0;
 /* Add volumelabel in a listing of mounted devices (-l). */
 static int list_with_volumelabel = 0;
 
+/* Nonzero for mount --bind */
+static int bind = 0;
+
+/* Nonzero for mount {--replace|--before|--after|--over} */
+static int mounttype = 0;
+
 /* True if ruid != euid.  */
 static int suid = 0;
 
@@ -108,8 +119,7 @@ struct opt_map {
 };
 
 /* Custom mount options for our own purposes.  */
-/* We can use the high-order 16 bits, since the mount call
-   has MS_MGC_VAL there. */
+/* Maybe these should now be freed for kernel use again */
 #define MS_NOAUTO	0x80000000
 #define MS_USERS	0x40000000
 #define MS_USER		0x20000000
@@ -141,6 +151,7 @@ static const struct opt_map opt_map[] = {
   { "sync",	0, 0, MS_SYNCHRONOUS},	/* synchronous I/O */
   { "async",	0, 1, MS_SYNCHRONOUS},	/* asynchronous I/O */
   { "remount",  0, 0, MS_REMOUNT},      /* Alter flags of mounted FS */
+  { "bind",	0, 0, MS_BIND   },	/* Remount part of tree elsewhere */
   { "auto",	0, 1, MS_NOAUTO	},	/* Can be mounted using -a */
   { "noauto",	0, 0, MS_NOAUTO	},	/* Can  only be mounted explicitly */
   { "users",	0, 0, MS_USERS	},	/* Allow ordinary user to mount */
@@ -217,17 +228,17 @@ int mount_quiet=0;
 
 /* Report on a single mount.  */
 static void
-print_one (const struct mntentchn *mc) {
+print_one (const struct mntent *me) {
      if (mount_quiet)
 	  return;
-     printf ("%s on %s", mc->mnt_fsname, mc->mnt_dir);
-     if (mc->mnt_type != NULL && *(mc->mnt_type) != '\0')
-	  printf (" type %s", mc->mnt_type);
-     if (mc->mnt_opts != NULL)
-	  printf (" (%s)", mc->mnt_opts);
+     printf ("%s on %s", me->mnt_fsname, me->mnt_dir);
+     if (me->mnt_type != NULL && *(me->mnt_type) != '\0')
+	  printf (" type %s", me->mnt_type);
+     if (me->mnt_opts != NULL)
+	  printf (" (%s)", me->mnt_opts);
      if (list_with_volumelabel) {
 	     const char *label;
-	     label = get_volume_label_by_spec(mc->mnt_fsname);
+	     label = get_volume_label_by_spec(me->mnt_fsname);
 	     if (label)
 		     printf (" [%s]", label);
      }
@@ -237,18 +248,22 @@ print_one (const struct mntentchn *mc) {
 /* Report on everything in mtab (of the specified types if any).  */
 static int
 print_all (string_list types) {
-     struct mntentchn *mc;
+     struct mntentchn *mc, *mc0;
 
-     for (mc = mtab_head()->nxt; mc; mc = mc->nxt) {
-	  if (matching_type (mc->mnt_type, types))
-	       print_one (mc);
+     mc0 = mtab_head();
+     for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
+	  if (matching_type (mc->m.mnt_type, types))
+	       print_one (&(mc->m));
      }
      exit (0);
 }
 
 
-/* Look for OPT in opt_map table and return mask value.  If OPT isn't found,
-   tack it onto extra_opts (which is non-NULL).  */
+/*
+ * Look for OPT in opt_map table and return mask value.
+ * If OPT isn't found, tack it onto extra_opts (which is non-NULL).
+ * For the options uid= and gid= replace user or group name by its value.
+ */
 static inline void
 parse_opt (const char *opt, int *mask, char *extra_opts) {
   const struct opt_map *om;
@@ -272,36 +287,62 @@ parse_opt (const char *opt, int *mask, char *extra_opts) {
 #endif
 	return;
       }
+
   if (*extra_opts)
     strcat(extra_opts, ",");
+
+  /* convert nonnumeric ids to numeric */
+  if (!strncmp(opt, "uid=", 4) && !isdigit(opt[4])) {
+	  struct passwd *pw = getpwnam(opt+4);
+	  char uidbuf[20];
+
+	  if (pw) {
+		  sprintf(uidbuf, "uid=%d", pw->pw_uid);
+		  strcat(extra_opts, uidbuf);
+		  return;
+	  }
+  }
+  if (!strncmp(opt, "gid=", 4) && !isdigit(opt[4])) {
+	  struct group *gr = getgrnam(opt+4);
+	  char gidbuf[20];
+
+	  if (gr) {
+		  sprintf(gidbuf, "gid=%d", gr->gr_gid);
+		  strcat(extra_opts, gidbuf);
+		  return;
+	  }
+  }
+
   strcat(extra_opts, opt);
 }
   
 /* Take -o options list and compute 4th and 5th args to mount(2).  flags
-   gets the standard options and extra_opts anything we don't recognize.  */
+   gets the standard options (indicated by bits) and extra_opts all the rest */
 static void
 parse_opts (char *opts, int *flags, char **extra_opts) {
-  char *opt;
+	char *opt;
 
-  *flags = 0;
-  *extra_opts = NULL;
+	*flags = 0;
+	*extra_opts = NULL;
 
-  clear_string_opts();
+	clear_string_opts();
 
-  if (opts != NULL)
-    {
-      *extra_opts = xmalloc (strlen (opts) + 1); 
-      **extra_opts = '\0';
+	if (opts != NULL) {
+		*extra_opts = xmalloc (strlen (opts) + 1); 
+		**extra_opts = '\0';
 
-      for (opt = strtok (opts, ","); opt; opt = strtok (NULL, ","))
-	if (!parse_string_opt (opt))
-	  parse_opt (opt, flags, *extra_opts);
-    }
+		for (opt = strtok (opts, ","); opt; opt = strtok (NULL, ","))
+			if (!parse_string_opt (opt))
+				parse_opt (opt, flags, *extra_opts);
+	}
 
-  if (readonly)
-    *flags |= MS_RDONLY;
-  if (readwrite)
-    *flags &= ~MS_RDONLY;
+	if (readonly)
+		*flags |= MS_RDONLY;
+	if (readwrite)
+		*flags &= ~MS_RDONLY;
+	*flags |= mounttype;
+	if (bind)
+		*flags |= MS_BIND;
 }
 
 /* Try to build a canonical options string.  */
@@ -340,10 +381,11 @@ already (const char *spec, const char *node) {
 
     if ((mc = getmntfile(node)) != NULL)
         error (_("mount: according to mtab, %s is already mounted on %s"),
-	       mc->mnt_fsname, node);
-    else if ((mc = getmntfile(spec)) != NULL)
+	       mc->m.mnt_fsname, node);
+    else if (spec && strcmp (spec, "none") &&
+	     (mc = getmntfile(spec)) != NULL)
         error (_("mount: according to mtab, %s is mounted on %s"),
-	       spec, mc->mnt_dir);
+	       spec, mc->m.mnt_dir);
     else
         ret = 0;
     return ret;
@@ -369,10 +411,10 @@ create_mtab (void) {
 
   /* Find the root entry by looking it up in fstab */
   if ((fstab = getfsfile ("/")) || (fstab = getfsfile ("root"))) {
-      parse_opts (xstrdup (fstab->mnt_opts), &flags, &extra_opts);
+      parse_opts (xstrdup (fstab->m.mnt_opts), &flags, &extra_opts);
       mnt.mnt_dir = "/";
-      mnt.mnt_fsname = canonicalize (fstab->mnt_fsname);
-      mnt.mnt_type = fstab->mnt_type;
+      mnt.mnt_fsname = canonicalize (fstab->m.mnt_fsname);
+      mnt.mnt_type = fstab->m.mnt_type;
       mnt.mnt_opts = fix_opts_string (flags, extra_opts, NULL);
       mnt.mnt_freq = mnt.mnt_passno = 0;
 
@@ -424,6 +466,9 @@ guess_fstype_and_mount (char *spec, char *node, char **type,
    if (*type && strcasecmp (*type, "auto") == 0)
       *type = NULL;
 
+   if (!*type && (flags & MS_BIND))
+      *type = "none";		/* random, but not "bind" */
+
    if (!*type && !(flags & MS_REMOUNT)) {
       *type = guess_fstype_from_superblock(spec);
       if (*type && !strcmp(*type, "swap")) {
@@ -547,21 +592,19 @@ loop_check(char **spec, char **type, int *flags,
 static void
 update_mtab_entry(char *spec, char *node, char *type, char *opts,
 		  int flags, int freq, int pass) {
-    struct mntentchn mcn;
     struct mntent mnt;
 
-    mcn.mnt_fsname = mnt.mnt_fsname = canonicalize (spec);
-    mcn.mnt_dir = mnt.mnt_dir = canonicalize (node);
-    mcn.mnt_type = mnt.mnt_type = type;
-    mcn.mnt_opts = mnt.mnt_opts = opts;
-    mcn.nxt = 0;
+    mnt.mnt_fsname = canonicalize (spec);
+    mnt.mnt_dir = canonicalize (node);
+    mnt.mnt_type = type;
+    mnt.mnt_opts = opts;
     mnt.mnt_freq = freq;
     mnt.mnt_passno = pass;
       
     /* We get chatty now rather than after the update to mtab since the
        mount succeeded, even if the write to /etc/mtab should fail.  */
     if (verbose)
-	print_one (&mcn);
+	    print_one (&mnt);
 
     if (!nomtab && mtab_is_writable()) {
 	if (flags & MS_REMOUNT)
@@ -610,6 +653,8 @@ cdrom_setspeed(char *spec) {
  *	If there is a special mount program for this type, exec it.
  * returns: 0: no exec was done, 1: exec was done, status has result
  */
+#define ALWAYS_STAT
+
 static int
 check_special_mountprog(char *spec, char *node, char *type, int flags,
 			char *extra_opts, int *status) {
@@ -708,9 +753,15 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
   if (opt_speed)
       cdrom_setspeed(spec);
 
-  res = loop_check (&spec, &type, &flags, &loop, &loopdev, &loopfile);
-  if (res)
+  if (!(flags & MS_REMOUNT)) {
+      /* don't set up a (new) loop device if we only remount - this left
+       * stale assignments of files to loop devices. Nasty when used for
+       * encryption.
+       */
+      res = loop_check (&spec, &type, &flags, &loop, &loopdev, &loopfile);
+      if (res)
 	  return res;
+  }
 
   /*
    * Call mount.TYPE for types that require a separate mount program.
@@ -836,6 +887,7 @@ retry_nfs:
     case EINVAL:
     { int fd;
       long size;
+      int warned=0;
 
       if (flags & MS_REMOUNT) {
 	error (_("mount: %s not mounted already, or bad option"), node);
@@ -846,10 +898,29 @@ retry_nfs:
 
 	if (stat (spec, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)
 	   && (fd = open(spec, O_RDONLY | O_NONBLOCK)) >= 0) {
-	  if(ioctl(fd, BLKGETSIZE, &size) == 0 && size <= 2)
+	  if(ioctl(fd, BLKGETSIZE, &size) == 0) {
+	    if (size == 0) {
+	      warned++;
+	  error ("       (could this be the IDE device where you in fact use\n"
+		 "       ide-scsi so that sr0 or sda or so is needed?)");
+	    }
+	    if (size && size <= 2) {
+	      warned++;
 	  error ("       (aren't you trying to mount an extended partition,\n"
 		 "       instead of some logical partition inside?)");
+	    }
 	  close(fd);
+	  }
+#if 0
+	  /* 0xf for SCSI, 0x3f for IDE. One might check /proc/partitions
+	     to see whether this thing really is partitioned.
+	     Do not suggest partitions for /dev/fd0. */
+	  if (!warned && (statbuf.st_rdev & 0xf) == 0) {
+	    warned++;
+	    error ("       (could this be the whole disk device\n"
+		   "       where you need a partition?)");
+	  }
+#endif
 	}
       }
       break;
@@ -859,9 +930,10 @@ retry_nfs:
     case EIO:
       error (_("mount: %s: can't read superblock"), spec); break;
     case ENODEV:
-      if (is_in_procfs(type) || !strcmp(type, "guess"))
-        error(_("mount: %s has wrong major or minor number"), spec);
-      else if (have_procfs()) {
+    { int pfs;
+      if ((pfs = is_in_procfs(type)) == 1 || !strcmp(type, "guess"))
+        error(_("mount: %s: unknown device"), spec);
+      else if (pfs == 0) {
 	char *lowtype, *p;
 	int u;
 
@@ -876,15 +948,16 @@ retry_nfs:
 	    u++;
 	  }
 	}
-	if (u && is_in_procfs(lowtype))
+	if (u && is_in_procfs(lowtype) == 1)
 	  error (_("mount: probably you meant %s"), lowtype);
-	else if (!strncmp(lowtype, "iso", 3) && is_in_procfs("iso9660"))
+	else if (!strncmp(lowtype, "iso", 3) && is_in_procfs("iso9660") == 1)
 	  error (_("mount: maybe you meant iso9660 ?"));
 	free(lowtype);
       } else
 	error (_("mount: %s has wrong device number or fs type %s not supported"),
 	       spec, type);
       break;
+    }
     case ENOTBLK:
       if (stat (spec, &statbuf)) /* strange ... */
 	error (_("mount: %s is not a block device, and stat fails?"), spec);
@@ -902,8 +975,8 @@ retry_nfs:
     case EACCES:  /* pre-linux 1.1.38, 1.1.41 and later */
     case EROFS:   /* linux 1.1.38 and later */
     { char *bd = (loop ? "" : _("block device "));
-      if (ro) {
-          error (_("mount: %s%s is not permitted on its filesystem"),
+      if (ro || (flags & MS_RDONLY)) {
+          error (_("mount: cannot mount %s%s read-only"),
 		 bd, spec);
           break;
       } else if (readwrite) {
@@ -1011,15 +1084,15 @@ mount_one (const char *spec, const char *node, char *type, const char *opts,
   if (specset) {
       if (nspec) {
 	  spec = nspec;
-	  if (verbose)
-		  printf(_("mount: consider mounting %s by %s\n"), spec,
+	  if (verbose > 1)
+		  printf(_("mount: going to mount %s by %s\n"), spec,
 			 (specset==1) ? _("UUID") : _("label"));
       } else if(!all)
           die (EX_USAGE, _("mount: no such partition found"));
       /* if -a then we may be rescued by a noauto option */
   }
 
-  if (type == NULL) {
+  if (type == NULL && !bind) {
       if (strchr (spec, ':') != NULL) {
 	type = "nfs";
 	if (verbose)
@@ -1057,7 +1130,7 @@ mount_one (const char *spec, const char *node, char *type, const char *opts,
 /* Check if an fsname/dir pair was already in the old mtab.  */
 static int
 mounted (char *spec, char *node) {
-     struct mntentchn *mc;
+     struct mntentchn *mc, *mc0;
      char *nspec = NULL;
 
      if (!strncmp(spec, "UUID=", 5))
@@ -1071,8 +1144,9 @@ mounted (char *spec, char *node) {
      spec = canonicalize (spec);
      node = canonicalize (node);
 
-     for (mc = mtab_head()->nxt; mc; mc = mc->nxt)
-	  if (streq (spec, mc->mnt_fsname) && streq (node, mc->mnt_dir))
+     mc0 = mtab_head();
+     for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
+	  if (streq (spec, mc->m.mnt_fsname) && streq (node, mc->m.mnt_dir))
 	       return 1;
      return 0;
 }
@@ -1085,7 +1159,7 @@ mounted (char *spec, char *node) {
 
 static int
 mount_all (string_list types, char *options) {
-     struct mntentchn *mc, *mtmp;
+     struct mntentchn *mc, *mc0, *mtmp;
      int status = 0;
      struct stat statbuf;
      struct child {
@@ -1102,28 +1176,29 @@ mount_all (string_list types, char *options) {
 	several chains, one for each major or NFS host */
      childhead.nxt = 0;
      childtail = &childhead;
-     for (mc = fstab_head()->nxt; mc; mc = mc->nxt) {
-	  if (matching_type (mc->mnt_type, types)
-	      && !streq (mc->mnt_dir, "/")
-	      && !streq (mc->mnt_dir, "root")) {
-	       if (mounted (mc->mnt_fsname, mc->mnt_dir)) {
+     mc0 = fstab_head();
+     for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
+	  if (matching_type (mc->m.mnt_type, types)
+	      && !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->mnt_fsname, mc->mnt_dir);
+				mc->m.mnt_fsname, mc->m.mnt_dir);
 	       } else {
 		    mtmp = (struct mntentchn *) xmalloc(sizeof(*mtmp));
 		    *mtmp = *mc;
 		    mtmp->nxt = 0;
 		    g = NULL;
 		    if (optfork) {
-			 if (stat(mc->mnt_fsname, &statbuf) == 0 &&
+			 if (stat(mc->m.mnt_fsname, &statbuf) == 0 &&
 			     S_ISBLK(statbuf.st_mode)) {
 			      sprintf(major, "#%x", DISKMAJOR(statbuf.st_rdev));
 			      g = major;
 			 }
 #ifdef HAVE_NFS
-			 if (strcmp(mc->mnt_type, "nfs") == 0) {
-			      g = xstrdup(mc->mnt_fsname);
+			 if (strcmp(mc->m.mnt_type, "nfs") == 0) {
+			      g = xstrdup(mc->m.mnt_fsname);
 			      colon = strchr(g, ':');
 			      if (colon)
 				   *colon = '\0';
@@ -1166,8 +1241,8 @@ mount_all (string_list types, char *options) {
 	  /* if child, or not forked, do the mounting */
 	  if (p == 0 || p == -1) {
 	       for (mc = cp->mec; mc; mc = mc->nxt)
-		    status |= mount_one (mc->mnt_fsname, mc->mnt_dir,
-					 mc->mnt_type, mc->mnt_opts,
+		    status |= mount_one (mc->m.mnt_fsname, mc->m.mnt_dir,
+					 mc->m.mnt_type, mc->m.mnt_opts,
 					 options, 0, 0);
 	       if (mountcount)
 		    status |= EX_SOMEOK;
@@ -1198,222 +1273,271 @@ mount_all (string_list types, char *options) {
 }
 
 extern char version[];
-static struct option longopts[] =
-{
-  { "all", 0, 0, 'a' },
-  { "fake", 0, 0, 'f' },
-  { "fork", 0, 0, 'F' },
-  { "help", 0, 0, 'h' },
-  { "no-mtab", 0, 0, 'n' },
-  { "read-only", 0, 0, 'r' },
-  { "ro", 0, 0, 'r' },
-  { "verbose", 0, 0, 'v' },
-  { "version", 0, 0, 'V' },
-  { "read-write", 0, 0, 'w' },
-  { "rw", 0, 0, 'w' },
-  { "options", 1, 0, 'o' },
-  { "types", 1, 0, 't' },
-  { NULL, 0, 0, 0 }
+static struct option longopts[] = {
+	{ "all", 0, 0, 'a' },
+	{ "fake", 0, 0, 'f' },
+	{ "fork", 0, 0, 'F' },
+	{ "help", 0, 0, 'h' },
+	{ "no-mtab", 0, 0, 'n' },
+	{ "read-only", 0, 0, 'r' },
+	{ "ro", 0, 0, 'r' },
+	{ "verbose", 0, 0, 'v' },
+	{ "version", 0, 0, 'V' },
+	{ "read-write", 0, 0, 'w' },
+	{ "rw", 0, 0, 'w' },
+	{ "options", 1, 0, 'o' },
+	{ "types", 1, 0, 't' },
+	{ "bind", 0, 0, 128 },
+	{ "replace", 0, 0, 129 },
+	{ "after", 0, 0, 130 },
+	{ "before", 0, 0, 131 },
+	{ "over", 0, 0, 132 },
+	{ NULL, 0, 0, 0 }
 };
 
+/* Keep the usage message at max 22 lines, each at most 70 chars long.
+   The user should not need a pager to read it. */
 static void
-usage (FILE *fp, int n)
-{
-  fprintf (fp, _("Usage: mount [-lhV]\n"
-	       "       mount -a [-nfFrsvw] [-t vfstypes]\n"
-	       "       mount [-nfrsvw] [-o options] special | node\n"
-	       "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-	       "       A special device can be indicated by  -L label  or  -U uuid .\n"));
-  unlock_mtab();
-  exit (n);
+usage (FILE *fp, int n) {
+	fprintf(fp, _(
+	  "Usage: mount -V                 : print version\n"
+	  "       mount -h                 : print this help\n"
+	  "       mount                    : list mounted filesystems\n"
+	  "       mount -l                 : idem, including volume labels\n"
+	  "So far the informational part. Next the mounting.\n"
+	  "The command is `mount [-t fstype] something somewhere'.\n"
+	  "Details found in /etc/fstab may be omitted.\n"
+	  "       mount -a                 : mount all stuff from /etc/fstab\n"
+	  "       mount device             : mount device at the known place\n"
+	  "       mount directory          : mount known device here\n"
+	  "       mount -t type dev dir    : ordinary mount command\n"
+	  "Note that one does not really mount a device, one mounts\n"
+	  "a filesystem (of the given type) found on the device.\n"
+	  "One can also mount an already visible directory tree elsewhere:\n"
+	  "       mount --bind olddir newdir\n"
+	  "A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+	  "or by label, using  -L label  or by uuid, using  -U uuid .\n"
+	  "Union or stack mounts are specified using one of\n"
+	  "       --replace, --after, --before, --over\n"
+	  "Other options: [-nfFrsvw] [-o options].\n"
+	  "For many more details, say  man 8 mount .\n"
+	));
+	unlock_mtab();
+	exit (n);
 }
 
 int
 main (int argc, char *argv[]) {
-  int c, result = 0, specseen;
-  char *options = NULL, *spec, *node;
-  char *volumelabel = NULL;
-  char *uuid = NULL;
-  string_list types = NULL;
-  struct mntentchn *mc;
-  int fd;
-
-  setlocale(LC_ALL, "");
-  bindtextdomain(PACKAGE, LOCALEDIR);
-  textdomain(PACKAGE);
-
-  /* People report that a mount called from init without console
-     writes error messages to /etc/mtab
-     Let us try to avoid getting fd's 0,1,2 */
-  while((fd = open("/dev/null", O_RDWR)) == 0 || fd == 1 || fd == 2) ;
-  if (fd > 2)
-     close(fd);
+	int c, result = 0, specseen;
+	char *options = NULL, *spec, *node;
+	char *volumelabel = NULL;
+	char *uuid = NULL;
+	string_list types = NULL;
+	struct mntentchn *mc;
+	int fd;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	/* People report that a mount called from init without console
+	   writes error messages to /etc/mtab
+	   Let us try to avoid getting fd's 0,1,2 */
+	while((fd = open("/dev/null", O_RDWR)) == 0 || fd == 1 || fd == 2) ;
+	if (fd > 2)
+		close(fd);
 
 #ifdef DO_PS_FIDDLING
-  initproctitle(argc, argv);
+	initproctitle(argc, argv);
 #endif
 
-  while ((c = getopt_long (argc, argv, "afFhlL:no:rsU:vVwt:", longopts, NULL))
-	 != EOF)
-    switch (c) {
-      case 'a':			/* mount everything in fstab */
-	++all;
-	break;
-      case 'f':			/* fake (don't actually do mount(2) call) */
-	++fake;
-	break;
-      case 'F':
-	++optfork;
-	break;
-      case 'h':			/* help */
-	usage (stdout, 0);
-	break;
-      case 'l':
-	list_with_volumelabel = 1;
-	break;
-      case 'L':
-	volumelabel = optarg;
-	break;
-      case 'n':			/* mount without writing in /etc/mtab */
-	++nomtab;
-	break;
-      case 'o':			/* specify mount options */
-	if (options)
-	     options = xstrconcat3(options, ",", optarg);
-	else
-	     options = xstrdup(optarg);
-	break;
-      case 'r':			/* mount readonly */
-	readonly = 1;
-	readwrite = 0;
-	break;
-      case 's':			/* allow sloppy mount options */
-	sloppy = 1;
-	break;
-      case 't':			/* specify file system types */
-	types = parse_list (optarg);
-	break;
-      case 'U':
-	uuid = optarg;
-	break;
-      case 'v':			/* be chatty - very chatty if repeated */
-	++verbose;
-	break;
-      case 'V':			/* version */
-	printf ("mount: %s\n", version);
-	exit (0);
-      case 'w':			/* mount read/write */
-	readwrite = 1;
-	readonly = 0;
-	break;
-      case 0:
-	break;
-      case '?':
-      default:
-	usage (stderr, EX_USAGE);
-    }
-
-  argc -= optind;
-  argv += optind;
-
-  specseen = (uuid || volumelabel) ? 1 : 0; 	/* yes, .. i know */
+	while ((c = getopt_long (argc, argv, "afFhlL:no:rsU:vVwt:",
+				 longopts, NULL)) != EOF) {
+		switch (c) {
+		case 'a':		/* mount everything in fstab */
+			++all;
+			break;
+		case 'f':		/* fake: don't actually call mount(2) */
+			++fake;
+			break;
+		case 'F':
+			++optfork;
+			break;
+		case 'h':		/* help */
+			usage (stdout, 0);
+			break;
+		case 'l':
+			list_with_volumelabel = 1;
+			break;
+		case 'L':
+			volumelabel = optarg;
+			break;
+		case 'n':		/* do not write /etc/mtab */
+			++nomtab;
+			break;
+		case 'o':		/* specify mount options */
+			if (options)
+				options = xstrconcat3(options, ",", optarg);
+			else
+				options = xstrdup(optarg);
+			break;
+		case 'r':		/* mount readonly */
+			readonly = 1;
+			readwrite = 0;
+			break;
+		case 's':		/* allow sloppy mount options */
+			sloppy = 1;
+			break;
+		case 't':		/* specify file system types */
+			types = parse_list (optarg);
+			break;
+		case 'U':
+			uuid = optarg;
+			break;
+		case 'v':		/* be chatty - more so if repeated */
+			++verbose;
+			break;
+		case 'V':		/* version */
+			printf ("mount: %s\n", version);
+			exit (0);
+		case 'w':		/* mount read/write */
+			readwrite = 1;
+			readonly = 0;
+			break;
+		case 0:
+			break;
+
+		case 128: /* bind */
+			++bind;
+			break;
+		case 129: /* replace */
+			mounttype = MS_REPLACE;
+			break;
+		case 130: /* after */
+			mounttype = MS_AFTER;
+			break;
+		case 131: /* before */
+			mounttype = MS_BEFORE;
+			break;
+		case 132: /* over */
+			mounttype = MS_OVER;
+			break;
+	      
+		case '?':
+		default:
+			usage (stderr, EX_USAGE);
+		}
+	}
 
-  if (argc+specseen == 0 && !all) {
-      if (options)
-	usage (stderr, EX_USAGE);
-      return print_all (types);
-  }
+	argc -= optind;
+	argv += optind;
 
-  if (getuid () != geteuid ()) {
-      suid = 1;
-      if (types || options || readwrite || nomtab || all || fake ||
-	  (argc + specseen) != 1)
-	die (EX_USAGE, _("mount: only root can do that"));
-  }
+	specseen = (uuid || volumelabel) ? 1 : 0; 	/* yes, .. i know */
 
-  if (!nomtab && mtab_does_not_exist()) {
-       if (verbose > 1)
-	    printf(_("mount: no %s found - creating it..\n"), MOUNTED);
-       create_mtab ();
-  }
+	if (argc+specseen == 0 && !all) {
+		if (options || mounttype || bind)
+			usage (stderr, EX_USAGE);
+		return print_all (types);
+	}
 
-  if (specseen) {
-	  if (uuid)
-		  spec = get_spec_by_uuid(uuid);
-	  else
-		  spec = get_spec_by_volume_label(volumelabel);
-	  if (!spec)
-		  die (EX_USAGE, _("mount: no such partition found"));
-	  if (verbose)
-		  printf(_("mount: mounting %s\n"), spec);
-  } else
-	  spec = NULL;		/* just for gcc */
-
-  switch (argc+specseen) {
-    case 0:
-      /* mount -a */
-      result = mount_all (types, options);
-      if (result == 0 && verbose)
-	   error(_("not mounted anything"));
-      break;
+	if (getuid () != geteuid ()) {
+		suid = 1;
+		if (types || options || readwrite || nomtab || all || fake ||
+		    bind || mounttype || (argc + specseen) != 1)
+			die (EX_USAGE, _("mount: only root can do that"));
+	}
 
-    case 1:
-      /* mount [-nfrvw] [-o options] special | node */
-      if (types != NULL)
-	usage (stderr, EX_USAGE);
-      if (specseen) {
-	      /* We know the device. Where shall we mount it? */
-	      mc = (uuid ? getfsuuidspec (uuid) : getfsvolspec (volumelabel));
-	      if (mc == NULL)
-		      mc = getfsspec (spec);
-	      if (mc == NULL)
-		      die (EX_USAGE, _("mount: cannot find %s in %s"),
-			   spec, _PATH_FSTAB);
-	      mc->mnt_fsname = spec;
-      } else {
-	      /* Try to find the other pathname in fstab.  */
-	      spec = canonicalize (*argv);
-	      if ((mc = getfsspec (spec)) == NULL &&
-		  (mc = getfsfile (spec)) == NULL &&
-	      /* Try noncanonical name in fstab
-	         perhaps /dev/cdrom or /dos is a symlink */
-		  (mc = getfsspec (*argv)) == NULL &&
-		  (mc = getfsfile (*argv)) == NULL &&
-	      /* Try mtab - maybe this was a remount */
-		  (mc = getmntfile (spec)) == NULL)
-		      die (EX_USAGE, _("mount: can't find %s in %s or %s"),
-			   spec, _PATH_FSTAB, MOUNTED);
-	      /* Earlier mtab was tried first, but this would
-		 sometimes try the wrong mount in case mtab had
-		 the root device entry wrong. */
-      }
+	if (!nomtab && mtab_does_not_exist()) {
+		if (verbose > 1)
+			printf(_("mount: no %s found - creating it..\n"),
+			       MOUNTED);
+		create_mtab ();
+	}
 
-      result = mount_one (xstrdup (mc->mnt_fsname), xstrdup (mc->mnt_dir),
-			  xstrdup (mc->mnt_type), mc->mnt_opts, options, 0, 0);
-      break;
+	if (specseen) {
+		if (uuid)
+			spec = get_spec_by_uuid(uuid);
+		else
+			spec = get_spec_by_volume_label(volumelabel);
+		if (!spec)
+			die (EX_USAGE, _("mount: no such partition found"));
+		if (verbose)
+			printf(_("mount: mounting %s\n"), spec);
+	} else
+		spec = NULL;		/* just for gcc */
+
+	switch (argc+specseen) {
+	case 0:
+		/* mount -a */
+		result = mount_all (types, options);
+		if (result == 0 && verbose)
+			error(_("not mounted anything"));
+		break;
+
+	case 1:
+		/* mount [-nfrvw] [-o options] special | node */
+		if (types != NULL)
+			usage (stderr, EX_USAGE);
+		if (specseen) {
+			/* We know the device. Where shall we mount it? */
+			mc = (uuid ? getfsuuidspec (uuid)
+			           : getfsvolspec (volumelabel));
+			if (mc == NULL)
+				mc = getfsspec (spec);
+			if (mc == NULL)
+				die (EX_USAGE,
+				     _("mount: cannot find %s in %s"),
+				     spec, _PATH_FSTAB);
+			mc->m.mnt_fsname = spec;
+		} else {
+			/* Try to find the other pathname in fstab.  */
+			spec = canonicalize (*argv);
+			if ((mc = getfsspec (spec)) == NULL &&
+			    (mc = getfsfile (spec)) == NULL &&
+			    /* Try noncanonical name in fstab
+			       perhaps /dev/cdrom or /dos is a symlink */
+			    (mc = getfsspec (*argv)) == NULL &&
+			    (mc = getfsfile (*argv)) == NULL &&
+			    /* Try mtab - maybe this was a remount */
+			    (mc = getmntfile (spec)) == NULL)
+				die (EX_USAGE,
+				     _("mount: can't find %s in %s or %s"),
+				     spec, _PATH_FSTAB, MOUNTED);
+			/* Earlier mtab was tried first, but this would
+			   sometimes try the wrong mount in case mtab had
+			   the root device entry wrong. */
+		}
 
-    case 2:
-      /* mount [-nfrvw] [-t vfstype] [-o options] special node */
-      if (specseen) {
-	      /* we have spec already */
-	      node = argv[0];
-      } else {
-	      spec = argv[0];
-	      node = argv[1];
-      }
-      if (types == NULL)
-	result = mount_one (spec, node, NULL, NULL, options, 0, 0);
-      else if (cdr (types) == NULL)
-	result = mount_one (spec, node, car (types), NULL, options, 0, 0);
-      else
-	usage (stderr, EX_USAGE);
-      break;
+		result = mount_one (xstrdup (mc->m.mnt_fsname),
+				    xstrdup (mc->m.mnt_dir),
+				    xstrdup (mc->m.mnt_type),
+				    mc->m.mnt_opts, options, 0, 0);
+		break;
+
+	case 2:
+		/* mount [-nfrvw] [-t vfstype] [-o options] special node */
+		if (specseen) {
+			/* we have spec already */
+			node = argv[0];
+		} else {
+			spec = argv[0];
+			node = argv[1];
+		}
+		if (types == NULL)
+			result = mount_one (spec, node, NULL, NULL,
+					    options, 0, 0);
+		else if (cdr (types) == NULL)
+			result = mount_one (spec, node, car (types), NULL,
+					    options, 0, 0);
+		else
+			usage (stderr, EX_USAGE);
+		break;
       
-    default:
-      usage (stderr, EX_USAGE);
-  }
+	default:
+		usage (stderr, EX_USAGE);
+	}
 
-  if (result == EX_SOMEOK)
-       result = 0;
-  exit (result);
+	if (result == EX_SOMEOK)
+		result = 0;
+	exit (result);
 }
diff --git a/mount/mount_by_label.c b/mount/mount_by_label.c
index 1567bfb184..e24d880d26 100644
--- a/mount/mount_by_label.c
+++ b/mount/mount_by_label.c
@@ -7,6 +7,8 @@
  * - Added error message if /proc/partitions cannot be opened
  * 2000-05-09 Erik Troan <ewt@redhat.com>
  * - Added cache for UUID and disk labels
+ * 2000-11-07 Nathan Scott <nathans@sgi.com>
+ * - Added XFS support
  */
 
 #include <stdio.h>
@@ -29,33 +31,44 @@ static struct uuidCache_s {
 	char *device;
 } *uuidCache = NULL;
 
-/* for now, only ext2 is supported */
+/* for now, only ext2 and xfs are supported */
 static int
 get_label_uuid(const char *device, char **label, char *uuid) {
 
-	/* start with a test for ext2, taken from mount_guess_fstype */
+	/* start with ext2 and xfs tests, taken from mount_guess_fstype */
 	/* should merge these later */
 	int fd;
+	int rv = 1;
+	size_t namesize;
 	struct ext2_super_block e2sb;
+	struct xfs_super_block xfsb;
 
 	fd = open(device, O_RDONLY);
 	if (fd < 0)
-		return 1;
-
-	if (lseek(fd, 1024, SEEK_SET) != 1024
-	    || read(fd, (char *) &e2sb, sizeof(e2sb)) != sizeof(e2sb)
-	    || (ext2magic(e2sb) != EXT2_SUPER_MAGIC)) {
-		close(fd);
-		return 1;
+		return rv;
+
+	if (lseek(fd, 1024, SEEK_SET) == 1024
+	    && read(fd, (char *) &e2sb, sizeof(e2sb)) == sizeof(e2sb)
+	    && (ext2magic(e2sb) == EXT2_SUPER_MAGIC)) {
+		memcpy(uuid, e2sb.s_uuid, sizeof(e2sb.s_uuid));
+		namesize = sizeof(e2sb.s_volume_name);
+		if ((*label = calloc(namesize + 1, 1)) != NULL)
+			memcpy(*label, e2sb.s_volume_name, namesize);
+		rv = 0;
+	}
+	else if (lseek(fd, 0, SEEK_SET) == 0
+	    && read(fd, (char *) &xfsb, sizeof(xfsb)) == sizeof(xfsb)
+	    && (strncmp((char *) &xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0 ||
+	        strncmp((char *) &xfsb.s_magic, XFS_SUPER_MAGIC2,4) == 0)) {
+		memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid));
+		namesize = sizeof(xfsb.s_fname);
+		if ((*label = calloc(namesize + 1, 1)) != NULL)
+			memcpy(*label, xfsb.s_fname, namesize);
+		rv = 0;
 	}
 
 	close(fd);
-
-	/* superblock is ext2 - now what is its label? */
-	memcpy(uuid, e2sb.s_uuid, sizeof(e2sb.s_uuid));
-	*label = strdup(e2sb.s_volume_name);
-
-	return 0;
+	return rv;
 }
 
 static void
@@ -91,8 +104,14 @@ uuidcache_init(void) {
 		return;
 
 	procpt = fopen(PROC_PARTITIONS, "r");
-	if (!procpt)
+	if (!procpt) {
+		static int warn = 0;
+		if (!warn++)
+		    error (_("mount: could not open %s, so UUID and LABEL "
+			     "conversion cannot be done.\n"),
+		       PROC_PARTITIONS);
 		return;
+	}
 
 	for (firstPass = 1; firstPass >= 0; firstPass--) {
 	    fseek(procpt, 0, SEEK_SET);
diff --git a/mount/mount_constants.h b/mount/mount_constants.h
index aeb7edfb37..5fd2908291 100644
--- a/mount/mount_constants.h
+++ b/mount/mount_constants.h
@@ -19,12 +19,31 @@
 #ifndef MS_MANDLOCK
 #define MS_MANDLOCK	64	/* Allow mandatory locks on an FS */
 #endif
+#ifndef MS_ACTION_MASK
+#define	MS_ACTION_MASK	0x380
+/* Remount, but new filesystem may be different from old. Atomic
+   (i.e. there is no interval when nothing is mounted at the mountpoint).
+   If new fs differs from the old one and old is busy - -EBUSY. */
+#define	MS_REPLACE	0x080	/* 128 */
+/* After, Before: as soon as we get unions these will add a new member
+   in the end or beginning of the chain. Fail if there is a stack
+   on the mountpoint. */
+#define	MS_AFTER	0x100	/* 256 */
+#define	MS_BEFORE	0x180
+/* Over: if nothing mounted on a mountpoint - same as if none of these
+flags had been set; if we have a union with more than one element - fail;
+if we have a stack or plain mount - mount atop of it, forming a stack. */
+#define	MS_OVER		0x200	/* 512 */
+#endif
 #ifndef MS_NOATIME
 #define MS_NOATIME	1024	/* Do not update access times. */
 #endif
 #ifndef MS_NODIRATIME
 #define MS_NODIRATIME   2048    /* Do not update directory access times */
 #endif
+#ifndef MS_BIND
+#define	MS_BIND		4096
+#endif
 /*
  * Magic mount flag number. Has to be or-ed to the flag values.
  */
diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c
index ec39c531a4..5a3733f983 100644
--- a/mount/mount_guess_fstype.c
+++ b/mount/mount_guess_fstype.c
@@ -20,6 +20,9 @@
  * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org>
  * - added Native Language Support
  *
+ * Fri Dec  1 23:31:00 2000: Sepp Wijnands <mrrazz@garbage-coderz.net>
+ * added probes for cramfs, hfs, hpfs and adfs.
+ *
  * aeb - many changes.
  *
  */
@@ -63,24 +66,21 @@ swapped(unsigned short a) {
     Original routine by <jmorriso@bogomips.ww.ubc.ca>; made into a function
     for mount(8) by Mike Grupenhoff <kashmir@umiacs.umd.edu>.
     Read the superblock only once - aeb
-    Added a test for iso9660 - aeb
+    Added iso9660, romfs, qnx4, udf, swap - aeb
     Added a test for high sierra (iso9660) - quinlan@bucknell.edu
     Corrected the test for xiafs - aeb
-    Added romfs - aeb
     Added ufs from a patch by jj. But maybe there are several types of ufs?
     Added ntfs from a patch by Richard Russon.
     Added a very weak heuristic for vfat - aeb
-    Added qnx4 - aeb
-    Added swap - aeb
     Added xfs - 2000-03-21 Martin K. Petersen <mkp@linuxcare.com>
-
-    Currently supports: minix, ext, ext2, xiafs, iso9660, romfs,
-    ufs, ntfs, vfat, qnx4, bfs, xfs
+    Added cramfs, hfs, hpfs, adfs - Sepp Wijnands <mrrazz@garbage-coderz.net>
 */
 static char
-*magic_known[] = { "minix", "ext", "ext2", "xiafs", "iso9660", "romfs",
-		   "ufs", "ntfs", "qnx4", "bfs", "udf", "xfs",
-		   "swap"	/* last - just to warn the user */
+*magic_known[] = {
+	"adfs", "bfs", "cramfs", "ext", "ext2",
+	"hfs", "hpfs", "iso9660", "minix", "ntfs",
+	"qnx4", "romfs", "swap", "udf", "ufs",
+	"xfs", "xiafs"
 };
 
 static int
@@ -97,7 +97,6 @@ tested(const char *device) {
    causes a very large kernel delay, almost killing the machine.
    So, we do not try udf unless there is positive evidence that it
    might work. Try iso9660 first, it is much more likely.
-
    Strings below taken from ECMA 167. */
 static char
 *udf_magic[] = { "BEA01", "BOOT2", "CD001", "CDW02", "NSR02",
@@ -119,6 +118,20 @@ may_be_swap(const char *s) {
 		strncmp(s-10, "SWAPSPACE2", 10) == 0);
 }
 
+/* rather weak necessary condition */
+static int
+may_be_adfs(const u_char *s) {
+	u_char *p;
+	int sum;
+
+	p = (u_char *) s + 511;
+	sum = 0;
+	while(--p != s)
+		sum = (sum >> 8) + (sum & 0xff) + *p;
+
+	return (sum == p[511]);
+}
+
 static char *
 fstype(const char *device) {
     int fd;
@@ -131,17 +144,21 @@ fstype(const char *device) {
     union {
 	struct xiafs_super_block xiasb;
 	char romfs_magic[8];
-	char xfs_magic[4];
 	char qnx4fs_magic[10];	/* ignore first 4 bytes */
 	long bfs_magic;
 	struct ntfs_super_block ntfssb;
 	struct fat_super_block fatsb;
+	struct xfs_super_block xfsb;
+	struct cramfs_super_block cramfssb;
     } xsb;
     struct ufs_super_block ufssb;
     union {
 	struct iso_volume_descriptor iso;
 	struct hs_volume_descriptor hs;
     } isosb;
+    struct hfs_super_block hfssb;
+    struct hpfs_super_block hpfssb;
+    struct adfs_super_block adfssb;
     struct stat statbuf;
 
     /* opening and reading an arbitrary unknown path can have
@@ -164,7 +181,8 @@ fstype(const char *device) {
 	 type = "ext2";
 
     else if (minixmagic(sb.ms) == MINIX_SUPER_MAGIC
-	     || minixmagic(sb.ms) == MINIX_SUPER_MAGIC2)
+	     || minixmagic(sb.ms) == MINIX_SUPER_MAGIC2
+	     || minixmagic(sb.ms) == swapped(MINIX_SUPER_MAGIC2))
 	 type = "minix";
 
     else if (extmagic(sb.es) == EXT_SUPER_MAGIC)
@@ -179,8 +197,8 @@ fstype(const char *device) {
 	      type = "xiafs";
 	 else if(!strncmp(xsb.romfs_magic, "-rom1fs-", 8))
 	      type = "romfs";
-	 else if(!strncmp(xsb.xfs_magic, "XFSB", 4) ||
-		 !strncmp(xsb.xfs_magic, "BSFX", 4))
+	 else if(!strncmp(xsb.xfsb.s_magic, XFS_SUPER_MAGIC, 4) ||
+		 !strncmp(xsb.xfsb.s_magic, XFS_SUPER_MAGIC2, 4))
 	      type = "xfs";
 	 else if(!strncmp(xsb.qnx4fs_magic+4, "QNX4FS", 6))
 	      type = "qnx4fs";
@@ -189,6 +207,8 @@ fstype(const char *device) {
 	 else if(!strncmp(xsb.ntfssb.s_magic, NTFS_SUPER_MAGIC,
 			  sizeof(xsb.ntfssb.s_magic)))
 	      type = "ntfs";
+	 else if(cramfsmagic(xsb.cramfssb) == CRAMFS_SUPER_MAGIC)
+	      type = "cramfs";
 	 else if ((!strncmp(xsb.fatsb.s_os, "MSDOS", 5) ||
 		   !strncmp(xsb.fatsb.s_os, "MSWIN", 5) ||
 		   !strncmp(xsb.fatsb.s_os, "MTOOL", 5) ||
@@ -222,6 +242,43 @@ fstype(const char *device) {
     }
 
     if (!type) {
+        if (lseek(fd, 0x400, SEEK_SET) != 0x400
+            || read(fd, (char *) &hfssb, sizeof(hfssb)) != sizeof(hfssb))
+             goto io_error;
+
+        /* also check if block size is equal to 512 bytes,
+           since the hfs driver currently only has support
+           for block sizes of 512 bytes long, and to be
+           more accurate (sb magic is only a short int) */
+        if ((hfsmagic(hfssb) == HFS_SUPER_MAGIC &&
+	     hfsblksize(hfssb) == 0x20000) ||
+            (swapped(hfsmagic(hfssb)) == HFS_SUPER_MAGIC &&
+             hfsblksize(hfssb) == 0x200))
+             type = "hfs";
+    }
+
+    if (!type) {
+        if (lseek(fd, 0x2000, SEEK_SET) != 0x2000
+            || read(fd, (char *) &hpfssb, sizeof(hpfssb)) != sizeof(hpfssb))
+             goto io_error;
+
+        if (hpfsmagic(hpfssb) == HPFS_SUPER_MAGIC)
+             type = "hpfs";
+    }
+
+    if (!type) {
+        if (lseek(fd, 0xc00, SEEK_SET) != 0xc00
+            || read(fd, (char *) &adfssb, sizeof(adfssb)) != sizeof(adfssb))
+             goto io_error;
+
+	/* only a weak test */
+        if (may_be_adfs((u_char *) &adfssb)
+            && (adfsblksize(adfssb) >= 8 &&
+                adfsblksize(adfssb) <= 10))
+             type = "adfs";
+    }
+
+    if (!type) {
 	    /* perhaps the user tries to mount the swap space
 	       on a new disk; warn her before she does mke2fs on it */
 	    int pagesize = getpagesize();
@@ -267,46 +324,40 @@ guess_fstype_from_superblock(const char *spec) {
 	return type;
 }
 
-static FILE *procfs;
-
-static void
-procfsclose(void) {
-	if (procfs)
-		fclose (procfs);
-	procfs = 0;
-}
-
-static int
-procfsopen(void) {
-	procfs = fopen(ETC_FILESYSTEMS, "r");
-	if (!procfs)
-		procfs = fopen(PROC_FILESYSTEMS, "r");
-	return (procfs != NULL);
-}
-
 static char *
-procfsnext(void) {
+procfsnext(FILE *procfs) {
    char line[100];
-   static char fsname[100];
+   char fsname[100];
 
    while (fgets(line, sizeof(line), procfs)) {
       if (sscanf (line, "nodev %[^\n]\n", fsname) == 1) continue;
       if (sscanf (line, " %[^ \n]\n", fsname) != 1) continue;
-      return fsname;
+      return strdup(fsname);
    }
    return 0;
 }
 
+/* Only use /proc/filesystems here, this is meant to test what
+   the kernel knows about, so /etc/filesystems is irrelevant.
+   Return: 1: yes, 0: no, -1: cannot open procfs */
 int
 is_in_procfs(const char *type) {
+    FILE *procfs;
     char *fsname;
-
-    if (procfsopen()) {
-	while ((fsname = procfsnext()) != NULL)
-	  if (!strcmp(fsname, type))
-	    return 1;
+    int ret = -1;
+
+    procfs = fopen(PROC_FILESYSTEMS, "r");
+    if (procfs) {
+	ret = 0;
+	while ((fsname = procfsnext(procfs)) != NULL)
+	    if (!strcmp(fsname, type)) {
+		ret = 1;
+		break;
+	    }
+	fclose(procfs);
+	procfs = NULL;
     }
-    return 0;
+    return ret;
 }
 
 /* return: 0: OK, -1: error in errno, 1: type not found */
@@ -314,12 +365,20 @@ is_in_procfs(const char *type) {
 int
 procfsloop(int (*mount_fn)(struct mountargs *), struct mountargs *args,
 	   char **type) {
+   FILE *procfs;
    char *fsname;
+   int ret = 1;
+   int errsv = 0;
 
    *type = NULL;
-   if (!procfsopen())
-     return 1;
-   while ((fsname = procfsnext()) != NULL) {
+
+   procfs = fopen(ETC_FILESYSTEMS, "r");
+   if (!procfs) {
+	procfs = fopen(PROC_FILESYSTEMS, "r");
+	if (!procfs)
+             return 1;
+   }
+   while ((fsname = procfsnext(procfs)) != NULL) {
       if (tested (fsname))
 	 continue;
       args->type = fsname;
@@ -328,20 +387,17 @@ procfsloop(int (*mount_fn)(struct mountargs *), struct mountargs *args,
 	 fflush(stdout);
       }
       if ((*mount_fn) (args) == 0) {
-	 *type = xstrdup(fsname);
-	 procfsclose();
-	 return 0;
-      } else if (errno != EINVAL) {
+	 *type = fsname;
+	 ret = 0;
+	 break;
+      } else if (errno != EINVAL && is_in_procfs(fsname) == 1) {
          *type = "guess";
-	 procfsclose();
-	 return -1;
+	 ret = -1;
+	 errsv = errno;
+	 break;
       }
    }
-   procfsclose();
-   return 1;
-}
-
-int
-have_procfs(void) {
-	return procfs != NULL;
+   fclose(procfs);
+   errno = errsv;
+   return ret;
 }
diff --git a/mount/mount_guess_fstype.h b/mount/mount_guess_fstype.h
index 3663f74ca0..9c0903b541 100644
--- a/mount/mount_guess_fstype.h
+++ b/mount/mount_guess_fstype.h
@@ -12,4 +12,4 @@ char *guess_fstype_from_superblock(const char *device);
 int procfsloop(int (*mount_fn)(struct mountargs *), struct mountargs *args,
 	       char **type);
 int is_in_procfs(const char *fstype);
-int have_procfs(void);
+
diff --git a/mount/mount_guess_rootdev.c b/mount/mount_guess_rootdev.c
new file mode 100644
index 0000000000..072c09fc48
--- /dev/null
+++ b/mount/mount_guess_rootdev.c
@@ -0,0 +1,90 @@
+/*
+ * Having the wrong rootdevice listed in mtab is slightly inconvenient.
+ * Try to guess what it could be...
+ * In case /proc/cmdline exists, and has the format
+ *	stuff root=R more stuff...
+ * and we think we understand the number R, decode it as a root device.
+ *
+ * Another possibility:
+ * Erik Andersen writes:
+ *  I did a similar find_real_root_device_name() in busybox some time back.  
+ *  Basically, do a stat("/", &rootstat) then walk /dev stat'ing each file
+ *  and if (statbuf.st_rdev == rootstat.st_rdev) then you have a match.
+ *  Works fine.
+ */
+#include <stdio.h>
+#include <string.h>
+#include "mount_guess_rootdev.h"
+
+#define PROC_CMDLINE	"/proc/cmdline"
+
+static char *
+rootdev(char *p) {
+	unsigned long devno;
+	char *ep;
+	char *type = "hd";
+	char let;
+	int ma, mi;
+	char devname[8];
+
+	devno = strtoul(p, &ep, 16);
+	if ((ep == p+3 || ep == p+4) && (*ep == ' ' || *ep == 0)) {
+		ma = (devno >> 8);
+		mi = (devno & 0xff);
+		switch(ma) {
+		case 8:
+			type = "sd";
+			let = 'a'+(mi/16);
+			mi = mi%16;
+			break;
+		case 3:
+			let = 'a'; break;
+		case 0x16:
+			let = 'c'; break;
+		case 0x21:
+			let = 'e'; break;
+		case 0x22:
+			let = 'g'; break;
+		case 0x38:
+			let = 'i'; break;
+		case 0x39:
+			let = 'k'; break;
+		default:
+			return NULL;
+		}
+		if (mi & 0x40) {
+			mi -= 0x40;
+			let++;
+		}
+		if (mi == 0)
+			sprintf(devname, "/dev/%s%c", type, let);
+		else
+			sprintf(devname, "/dev/%s%c%d", type, let, mi);
+		return strdup(devname);
+	}
+	return NULL;
+}
+
+char *
+mount_guess_rootdev() {
+	FILE *cf;
+	char line[1024];
+	char *p;
+
+	cf = fopen(PROC_CMDLINE, "r");
+	if (cf && fgets(line, sizeof(line), cf)) {
+		for (p = line; *p; p++)
+			if (!strncmp(p, " root=", 6))
+				return rootdev(p+6);
+	}
+	return NULL;
+}
+
+#if 0
+main(){
+	char *p = mount_guess_rootdev();
+	if (!p)
+		p = "/dev/root";
+	printf("%s\n", p);
+}
+#endif
diff --git a/mount/mount_guess_rootdev.h b/mount/mount_guess_rootdev.h
new file mode 100644
index 0000000000..41b3270376
--- /dev/null
+++ b/mount/mount_guess_rootdev.h
@@ -0,0 +1 @@
+extern char *mount_guess_rootdev(void);
diff --git a/mount/nfs_mount4.h b/mount/nfs_mount4.h
index 0e3b052bde..85650773a4 100644
--- a/mount/nfs_mount4.h
+++ b/mount/nfs_mount4.h
@@ -50,4 +50,5 @@ struct nfs_mount_data {
 #define NFS_MOUNT_VER3		0x0080	/* 3 */
 #define NFS_MOUNT_KERBEROS	0x0100	/* 3 */
 #define NFS_MOUNT_NONLM		0x0200	/* 3 */
+#define NFS_MOUNT_BROKEN_SUID	0x0400	/* 4 */
 
diff --git a/mount/nfsmount.c b/mount/nfsmount.c
index bf4be63694..6fc917db51 100644
--- a/mount/nfsmount.c
+++ b/mount/nfsmount.c
@@ -58,6 +58,13 @@
 
 #include "../defines.h"		/* for HAVE_inet_aton */
 
+#ifndef NFS_PORT
+#define NFS_PORT 2049
+#endif
+#ifndef NFS_FHSIZE
+#define NFS_FHSIZE 32
+#endif
+
 static char *nfs_strerror(int stat);
 
 #define MAKE_VERSION(p,q,r)	(65536*(p) + 256*(q) + (r))
@@ -90,7 +97,6 @@ int nfs_mount_version = NFS_MOUNT_VERSION;
  * and figure out what version the kernel expects.
  *
  * Variables:
- *	KERNEL_NFS_MOUNT_VERSION: kernel sources at compile time
  *	NFS_MOUNT_VERSION: these nfsmount sources at compile time
  *	nfs_mount_version: version this source and running kernel can handle
  */
@@ -106,6 +112,10 @@ find_kernel_nfs_mount_version(void) {
 	if (kernel_version) {
 	     if (kernel_version < MAKE_VERSION(2,1,32))
 		  nfs_mount_version = 1;
+	     else if (kernel_version < MAKE_VERSION(2,2,18))
+		  nfs_mount_version = 3;
+	     else if (kernel_version < MAKE_VERSION(2,3,0))
+		  nfs_mount_version = 4; /* since 2.2.18pre9 */
 	     else if (kernel_version < MAKE_VERSION(2,3,99))
 		  nfs_mount_version = 3;
 	     else
@@ -201,6 +211,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	int nocto;
 	int noac;
 	int nolock;
+	int broken_suid;
 	int retry;
 	int tcp;
 	int mountprog;
@@ -297,6 +308,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	posix = 0;
 	nocto = 0;
 	nolock = 0;
+	broken_suid = 0;
 	noac = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
 	tcp = 0;
@@ -407,6 +419,8 @@ int nfsmount(const char *spec, const char *node, int *flags,
 					nolock = !val;
 				else
 					printf(_("Warning: option nolock is not supported.\n"));
+			} else if (!strcmp(opt, "broken_suid")) {
+				broken_suid = val;
 			} else {
 				if (!sloppy) {
 					printf(_("unknown nfs mount option: "
@@ -431,6 +445,10 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	if (nfs_mount_version >= 3)
 		data.flags |= (nolock ? NFS_MOUNT_NONLM : 0);
 #endif
+#if NFS_MOUNT_VERSION >= 4
+	if (nfs_mount_version >= 4)
+		data.flags |= (broken_suid ? NFS_MOUNT_BROKEN_SUID : 0);
+#endif
 	if (nfsvers > MAX_NFSPROT) {
 		fprintf(stderr, "NFSv%d not supported!\n", nfsvers);
 		return 0;
diff --git a/mount/pivot_root.c b/mount/pivot_root.c
index 4ab8be853b..fd4bef9dfd 100644
--- a/mount/pivot_root.c
+++ b/mount/pivot_root.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <linux/unistd.h>
 
-
+static
 _syscall2(int,pivot_root,const char *,new_root,const char *,put_old)
 
 
diff --git a/mount/umount.8 b/mount/umount.8
index 08d39888d6..0b67314c53 100644
--- a/mount/umount.8
+++ b/mount/umount.8
@@ -67,6 +67,10 @@ Unmount without writing in
 .B \-r
 In case unmounting fails, try to remount read-only.
 .TP
+.B \-d
+In case the unmounted device was a loop device, also
+free this loop device.
+.TP
 .B \-a
 All of the file systems described in
 .I /etc/mtab
@@ -92,7 +96,8 @@ The
 .B umount
 command will free the loop device (if any) associated
 with the mount, in case it finds the option `loop=...' in
-.IR /etc/mtab .
+.IR /etc/mtab ,
+or when the \-d option was given.
 Any pending loop devices can be freed using `losetup -d', see
 .BR losetup (8).
 
diff --git a/mount/umount.c b/mount/umount.c
index 98a1d330a1..24622bc985 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -16,18 +16,21 @@
  * 960223: aeb - several minor changes
  * 960324: aeb - added some changes from Rob Leslie <rob@mars.org>
  * 960823: aeb - also try umount(spec) when umount(node) fails
- * 970307: aeb - canonise names from fstab
+ * 970307: aeb - canonicalise names from fstab
  * 970726: aeb - remount read-only in cases where umount fails
  * 980810: aeb - umount2 support
  * 981222: aeb - If mount point or special file occurs several times
  *               in mtab, try them all, with last one tried first
  *             - Differentiate "user" and "users" key words in fstab
+ * 001202: aeb - remove at most one line from /etc/mtab
  */
 
+#include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <string.h>
 #include <errno.h>
+#include <ctype.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include "mount_constants.h"
@@ -88,7 +91,10 @@ int remount = 0;
 /* Don't write a entry in /etc/mtab (-n).  */
 int nomtab = 0;
 
-/* Nonzero for chatty (-v).  This is a nonstandard flag (not in BSD).  */
+/* Call losetup -d for each unmounted loop device. */
+int delloop = 0;
+
+/* Nonzero for chatty (-v). */
 int verbose = 0;
 
 /* True if ruid != euid.  */
@@ -107,6 +113,7 @@ nfs_umount_rpc_call(const char *spec, const char *opts)
       struct sockaddr_in saddr;
       struct timeval pertry, try;
       enum clnt_stat clnt_stat;
+      int port = 0;
       int so = RPC_ANYSOCK;
       struct hostent *hostp;
       char *hostname;
@@ -131,6 +138,9 @@ nfs_umount_rpc_call(const char *spec, const char *opts)
 	   hostname = xstrndup(p,q-p);
       }
 
+      if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10)))
+	   port = atoi(p+10);
+
       if (hostname[0] >= '0' && hostname[0] <= '9')
 	   saddr.sin_addr.s_addr = inet_addr(hostname);
       else {
@@ -147,7 +157,7 @@ nfs_umount_rpc_call(const char *spec, const char *opts)
       }
 
       saddr.sin_family = AF_INET;
-      saddr.sin_port = 0;
+      saddr.sin_port = htons(port);
       pertry.tv_sec = 3;
       pertry.tv_usec = 0;
       if ((clp = clntudp_create(&saddr, MOUNTPROG, MOUNTVERS,
@@ -202,134 +212,147 @@ static void complain(int err, const char *dev) {
    on a non-fatal error.  We lock/unlock around each umount.  */
 static int
 umount_one (const char *spec, const char *node, const char *type,
-	    const char *opts, struct mntentchn *mc)
-{
-  int umnt_err, umnt_err2;
-  int isroot;
-  int res;
-
-  /* Special case for root.  As of 0.99pl10 we can (almost) unmount root;
-     the kernel will remount it readonly so that we can carry on running
-     afterwards.  The readonly remount is illegal if any files are opened
-     for writing at the time, so we can't update mtab for an unmount of
-     root.  As it is only really a remount, this doesn't matter too
-     much.  [sct May 29, 1993] */
-  isroot = (streq (node, "/") || streq (node, "root")
-	                      || streq (node, "rootfs"));
-  if (isroot)
-    nomtab++;
+	    const char *opts, struct mntentchn *mc) {
+	int umnt_err, umnt_err2;
+	int isroot;
+	int res;
+	const char *loopdev;
+
+	/* Special case for root.  As of 0.99pl10 we can (almost) unmount root;
+	   the kernel will remount it readonly so that we can carry on running
+	   afterwards.  The readonly remount is illegal if any files are opened
+	   for writing at the time, so we can't update mtab for an unmount of
+	   root.  As it is only really a remount, this doesn't matter too
+	   much.  [sct May 29, 1993] */
+	isroot = (streq (node, "/") || streq (node, "root")
+		  || streq (node, "rootfs"));
+	if (isroot)
+		nomtab++;
 
 #ifdef HAVE_NFS
-  /* Ignore any RPC errors, so that you can umount the filesystem
-     if the server is down.  */
-  if (strcasecmp(type, "nfs") == 0)
-	  nfs_umount_rpc_call(spec, opts);
+	/* Ignore any RPC errors, so that you can umount the filesystem
+	   if the server is down.  */
+	if (strcasecmp(type, "nfs") == 0)
+		nfs_umount_rpc_call(spec, opts);
 #endif
  
 
-  umnt_err = umnt_err2 = 0;
-  if (force) {
-       /* completely untested - 2.1.116 only has some support in nfs case */
-       /* probably this won't work */
-       int flags = MNT_FORCE;
-
-       res = umount2 (node, flags);
-       if (res == -1) {
-	       perror("umount2");
-	       if (errno == ENOSYS) {
-		       if (verbose)
-			       printf(_("no umount2, trying umount...\n"));
-		       res = umount (node);
-	       }
-       }
-  } else
-       res = umount (node);
-  if (res < 0) {
-       umnt_err = errno;
-       /* A device might have been mounted on a node that has since
-	  been deleted or renamed, so if node fails, also try spec. */
-       /* if (umnt_err == ENOENT || umnt_err == EINVAL) */
-       if (umnt_err != EBUSY && strcmp(node, spec)) {
-	    if (verbose)
-		 printf (_("could not umount %s - trying %s instead\n"),
-			 node, spec);
-	    res = umount (spec);
-	    if (res < 0)
-		 umnt_err2 = errno;
-	    /* Do not complain about remote NFS mount points */
-	    if (errno == ENOENT && index(spec, ':'))
-		 umnt_err2 = 0;
-       }
-  }
-
-  if (res < 0 && remount && (umnt_err == EBUSY || umnt_err2 == EBUSY)) {
-       /* Umount failed - let us try a remount */
-       res=mount(spec, node, NULL, MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
-       if (res == 0) {
-	    struct mntent remnt;
-	    fprintf(stderr, _("umount: %s busy - remounted read-only\n"), spec);
-	    remnt.mnt_type = remnt.mnt_fsname = NULL;
-	    remnt.mnt_dir = xstrdup(node);
-	    remnt.mnt_opts = "ro";
-	    update_mtab(node, &remnt);
-	    return 0;
-       } else if (errno != EBUSY) { 	/* hmm ... */
-	    perror("remount");
-	    fprintf(stderr, _("umount: could not remount %s read-only\n"),
-		    spec);
-       }
-  }
-
-  if (res >= 0) {
-      /* Umount succeeded, update mtab.  */
-      if (verbose)
-	printf (_("%s umounted\n"), spec);
-
-      if (!nomtab && mtab_is_writable()) {
-				/* Special stuff for loop devices */
-	  if (mc) {
-	     char *optl;
-
-	     /* old style mtab line? */
-	     if (streq(mc->mnt_type, "loop"))
-		if (del_loop(spec))
-		      goto fail;
-
-	     /* new style mtab line? */
-	     optl = mc->mnt_opts ? xstrdup(mc->mnt_opts) : "";
-	     for (optl = strtok (optl, ","); optl; optl = strtok (NULL, ",")) {
-		 if (!strncmp(optl, "loop=", 5)) {
-		     if (del_loop(optl+5))
-		       goto fail;
-		     break;
-		 }
-	     }
-	  } else {
-	      /* maybe spec is a loop device? */
-	      /* no del_loop() - just delete it from mtab */
-	      if ((mc = getmntoptfile (spec)) != NULL)
-		node = mc->mnt_dir;
-	  }
-
-				/* Non-loop stuff */
-	  update_mtab (node, NULL);
-      }
-      return 0;
-  }
-
-fail:
-  /* Umount or del_loop failed, complain, but don't die.  */
-  if (!nomtab) {
-      /* remove obsolete entry */
-      if (umnt_err == EINVAL || umnt_err == ENOENT)
-	  update_mtab (node, NULL);
-  }
+	umnt_err = umnt_err2 = 0;
+	if (force) {
+		/* completely untested;
+		   2.1.116 only has some support in nfs case */
+		/* probably this won't work */
+		int flags = MNT_FORCE;
+
+		res = umount2 (node, flags);
+		if (res == -1) {
+			perror("umount2");
+			if (errno == ENOSYS) {
+				if (verbose)
+					printf(_("no umount2, trying umount...\n"));
+				res = umount (node);
+			}
+		}
+	} else
+		res = umount (node);
+
+	if (res < 0) {
+		umnt_err = errno;
+		/* A device might have been mounted on a node that has since
+		   been deleted or renamed, so if node fails, also try spec. */
+		/* Note that this is incorrect in case spec was mounted
+		   several times. */
+		/* if (umnt_err == ENOENT || umnt_err == EINVAL) */
+		if (umnt_err != EBUSY && strcmp(node, spec)) {
+			if (verbose)
+				printf (_("could not umount %s - trying %s instead\n"),
+					node, spec);
+			res = umount (spec);
+			if (res < 0)
+				umnt_err2 = errno;
+			/* Do not complain about remote NFS mount points */
+			if (errno == ENOENT && index(spec, ':'))
+				umnt_err2 = 0;
+		}
+	}
+
+	if (res < 0 && remount && (umnt_err == EBUSY || umnt_err2 == EBUSY)) {
+		/* Umount failed - let us try a remount */
+		res = mount(spec, node, NULL,
+			    MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
+		if (res == 0) {
+			struct mntent remnt;
+			fprintf(stderr,
+				_("umount: %s busy - remounted read-only\n"),
+				spec);
+			remnt.mnt_type = remnt.mnt_fsname = NULL;
+			remnt.mnt_dir = xstrdup(node);
+			remnt.mnt_opts = "ro";
+			update_mtab(node, &remnt);
+			return 0;
+		} else if (errno != EBUSY) { 	/* hmm ... */
+			perror("remount");
+			fprintf(stderr,
+				_("umount: could not remount %s read-only\n"),
+				spec);
+		}
+	}
+
+	loopdev = 0;
+	if (res >= 0) {
+		/* Umount succeeded */
+		if (verbose)
+			printf (_("%s umounted\n"), spec);
+
+		/* Free any loop devices that we allocated ourselves */
+		if (mc) {
+			char *optl;
+
+			/* old style mtab line? */
+			if (streq(mc->m.mnt_type, "loop")) {
+				loopdev = spec;
+				goto gotloop;
+			}
+
+			/* new style mtab line? */
+			optl = mc->m.mnt_opts ? xstrdup(mc->m.mnt_opts) : "";
+			for (optl = strtok (optl, ","); optl;
+			     optl = strtok (NULL, ",")) {
+				if (!strncmp(optl, "loop=", 5)) {
+					loopdev = optl+5;
+					goto gotloop;
+				}
+			}
+		} else {
+			/*
+			 * If option "-o loop=spec" occurs in mtab,
+			 * note the mount point, and delete mtab line.
+			 */
+			if ((mc = getmntoptfile (spec)) != NULL)
+				node = mc->m.mnt_dir;
+		}
+
+		/* Also free loop devices when -d flag is given */
+		if (delloop && is_loop_device(spec))
+			loopdev = spec;
+	}
+ gotloop:
+	if (loopdev)
+		del_loop(loopdev);
+
+	if (!nomtab && mtab_is_writable() &&
+	    (umnt_err == 0 || umnt_err == EINVAL || umnt_err == ENOENT)) {
+		update_mtab (node, NULL);
+	}
+
+	if (res >= 0)
+		return 0;
 
-  if (umnt_err2)
-       complain(umnt_err2, spec);
-  if (umnt_err && umnt_err != umnt_err2)
-       complain(umnt_err, node);
-  return 1;
+	if (umnt_err2)
+		complain(umnt_err2, spec);
+	if (umnt_err && umnt_err != umnt_err2)
+		complain(umnt_err, node);
+	return 1;
 }
 
 /*
@@ -347,8 +370,8 @@ umount_one_bw (const char *file, struct mntentchn *mc) {
      int res = 1;
 
      while (res && mc) {
-	  res = umount_one(mc->mnt_fsname, mc->mnt_dir,
-			   mc->mnt_type, mc->mnt_opts, mc);
+	  res = umount_one(mc->m.mnt_fsname, mc->m.mnt_dir,
+			   mc->m.mnt_type, mc->m.mnt_opts, mc);
 	  mc = getmntfilesbackward (file, mc);
      }
      return res;
@@ -368,9 +391,9 @@ umount_all (string_list types) {
      if (!hd->prev)
 	  die (2, _("umount: cannot find list of filesystems to unmount"));
      for (mc = hd->prev; mc != hd; mc = mc->prev) {
-	  if (matching_type (mc->mnt_type, types)) {
-	       errors |= umount_one (mc->mnt_fsname, mc->mnt_dir,
-				     mc->mnt_type, mc->mnt_opts, mc);
+	  if (matching_type (mc->m.mnt_type, types)) {
+	       errors |= umount_one (mc->m.mnt_fsname, mc->m.mnt_dir,
+				     mc->m.mnt_type, mc->m.mnt_opts, mc);
 	  }
      }
 
@@ -424,6 +447,10 @@ main (int argc, char *argv[])
       case 'a':			/* umount everything */
 	++all;
 	break;
+	/* fall through? */
+      case 'd':			/* do losetup -d for unmounted loop devices */
+	++delloop;
+	break;
       case 'f':			/* force umount */
 	++force;
 	break;
@@ -489,7 +516,7 @@ main (int argc, char *argv[])
 	     then "mount /dev/sda4" followed by "umount /mnt/zip"
 	     used to fail. So, we must not look for file, but for
 	     the pair (spec,file) in fstab. */
-	  fs = getfsspecfile(mc->mnt_fsname, mc->mnt_dir);
+	  fs = getfsspecfile(mc->m.mnt_fsname, mc->m.mnt_dir);
 	  if (!fs) {
 	    if (!getfsspec (file) && !getfsfile (file))
 	      die (2,
@@ -508,7 +535,7 @@ main (int argc, char *argv[])
 	  /* The option `owner' only allows (un)mounting by the owner. */
 	  /* A convenient side effect is that the user who mounted
 	     is visible in mtab. */
-	  options = parse_list (fs->mnt_opts);
+	  options = parse_list (fs->m.mnt_opts);
 	  while (options) {
 	      if (streq (car (options), "user") ||
 		  streq (car (options), "users") ||
@@ -518,18 +545,18 @@ main (int argc, char *argv[])
 	  }
 	  if (!options)
 	    die (2, _("umount: only root can unmount %s from %s"),
-		 fs->mnt_fsname, fs->mnt_dir);
+		 fs->m.mnt_fsname, fs->m.mnt_dir);
 	  if (streq (car (options), "user") ||
 	      streq (car (options), "owner")) {
 	      char *user = getusername();
 
-	      options = parse_list (mc->mnt_opts);
+	      options = parse_list (mc->m.mnt_opts);
 	      while (options) {
 		  char *co = car (options);
 		  if (!strncmp(co, "user=", 5)) {
 		      if (!user || !streq(co+5,user))
 			  die(2, _("umount: only %s can unmount %s from %s"),
-			      co+5, fs->mnt_fsname, fs->mnt_dir);
+			      co+5, fs->m.mnt_fsname, fs->m.mnt_dir);
 		      break;
 		  }
 		  options = cdr (options);
diff --git a/po/Makefile b/po/Makefile
index 3e59fedc80..a93f77553a 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -13,12 +13,8 @@ INTL = /usr/share/gettext/intl
 
 SHELL = /bin/sh
 
-prefix = $(DESTDIR)/usr
-exec_prefix = ${prefix}
-datadir = $(prefix)/share
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
+localedir = $(LOCALEDIR)
+gnulocaledir = $(LOCALEDIR)
 
 # Not giving an explicit path improves the chances of finding this
 INSTALL = install -c
@@ -26,7 +22,7 @@ INSTALL_DATA = ${INSTALL} -m 644
 
 # Not giving an explicit path improves the chances of finding these
 GENCAT = gencat
-MSGFMT = msgfmt
+MSGFMT = msgfmt -c	# -c: undocumented, but useful option
 XGETTEXT = xgettext
 MSGMERGE = msgmerge
 
@@ -38,9 +34,9 @@ INCLUDES = -I.. -I$(INTL)
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
 # Enter here all .po files
-POFILES = cs.po de.po es.po fr.po it.po ja.po nl.po pt_BR.po
+POFILES = cs.po da.po de.po es.po fr.po it.po ja.po nl.po pt_BR.po
 # the same but with .gmo
-GMOFILES = cs.gmo de.gmo es.gmo fr.gmo it.gmo ja.gmo nl.gmo pt_BR.gmo
+GMOFILES = cs.gmo da.gmo de.gmo es.gmo fr.gmo it.gmo ja.gmo nl.gmo pt_BR.gmo
 
 CATALOGS = $(GMOFILES)
 CATOBJEXT = .gmo
@@ -90,7 +86,6 @@ stamp-cat-id: util-linux.pot
 install: install-data-$(HAVE_XGETTEXT)
 install-data-no: all
 install-data-yes: all
-	../mkinstalldirs $(datadir);
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  case "$$cat" in \
@@ -117,7 +112,6 @@ uninstall:
 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT); \
 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/util-linux$(INSTOBJEXT).m; \
 	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
 
 cat-id-tbl.o: $(INTL)/libgettext.h
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7ea5b80525..6ce99166c8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,12 @@
-clock/cmos.c
-clock/hwclock.c
-clock/kd.c
-clock/rtc.c
-clock/shhopt.c
+hwclock/cmos.c
+hwclock/hwclock.c
+hwclock/kd.c
+hwclock/rtc.c
+hwclock/shhopt.c
 disk-utils/blockdev.c
 disk-utils/fdformat.c
 disk-utils/fsck.minix.c
+disk-utils/isosize.c
 disk-utils/mkfs.c
 disk-utils/mkfs.minix.c
 disk-utils/mkswap.c
@@ -20,7 +21,7 @@ fdisk/i386_sys_types.c
 fdisk/llseek.c
 fdisk/sfdisk.c
 games/banner.c
-getopt-1.0.3b/getopt.c
+getopt-1.1.0a/getopt.c
 lib/env.c
 lib/err.c
 lib/my_reboot.c
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index b5f9b13421..42dc43ade5 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -126,7 +126,7 @@ Functions:\n\
 Options: \n\
   --utc         the hardware clock is kept in coordinated universal time\n\
   --localtime   the hardware clock is kept in local time\n\
-  --directisa   access the ISA bus directly instead of /dev/rtc\n\
+  --directisa   access the ISA bus directly instead of %s\n\
   --badyear     ignore rtc's year because the bios is broken\n\
   --date        specifies the time to which to set the hardware clock\n\
   --epoch=year  specifies the year which is the beginning of the \n\
@@ -159,29 +159,28 @@ method.\n", 74},
   {"ioctl() to open /dev/tty1 failed", 80},
   {"KDGHWCLK ioctl failed", 81},
   {"Can't open /dev/tty1", 82},
-  {"ioctl() to /dev/rtc to read the time failed.\n", 83},
-  {"Waiting in loop for time from /dev/rtc to change\n", 84},
-  {"open() of /dev/rtc failed", 85},
-  {"/dev/rtc does not have interrupt functions. ", 86},
-  {"read() to /dev/rtc to wait for clock tick failed", 87},
-  {"ioctl() to /dev/rtc to turn off update interrupts failed", 88},
-  {"ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly", 89},
-  {"Unable to open /dev/rtc", 90},
-  {"ioctl() to /dev/rtc to set the time failed.\n", 91},
+  {"ioctl() to %s to read the time failed.\n", 83},
+  {"Waiting in loop for time from %s to change\n", 84},
+  {"open() of %s failed", 85},
+  {"%s does not have interrupt functions. ", 86},
+  {"read() to %s to wait for clock tick failed", 87},
+  {"ioctl() to %s to turn off update interrupts failed", 88},
+  {"ioctl() to %s to turn on update interrupts failed unexpectedly", 89},
+  {"Unable to open %s", 90},
+  {"ioctl() to %s to set the time failed.\n", 91},
   {"ioctl(%s) was successful.\n", 92},
-  {"Open of /dev/rtc failed", 93},
+  {"Open of %s failed", 93},
   {"\
 To manipulate the epoch value in the kernel, we must access the Linux 'rtc' \
-device driver via the device special file /dev/rtc.  This file does not \
-exist on this system.\n", 94},
-  {"ioctl(RTC_EPOCH_READ) to /dev/rtc failed", 95},
-  {"we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n", 96},
+device driver via the device special file %s.  This file does not exist on \
+this system.\n", 94},
+  {"ioctl(RTC_EPOCH_READ) to %s failed", 95},
+  {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 96},
   {"The epoch value may not be less than 1900.  You requested %ld\n", 97},
-  {"setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n", 98},
+  {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 98},
   {"\
-The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET \
-ioctl.\n", 99},
-  {"ioctl(RTC_EPOCH_SET) to /dev/rtc failed", 100},
+The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 99},
+  {"ioctl(RTC_EPOCH_SET) to %s failed", 100},
   {"invalid number `%s'\n", 101},
   {"number `%s' to `%s' out of range\n", 102},
   {"unrecognized option `%s'\n", 103},
@@ -311,267 +310,273 @@ namelen=%d\n\
 ----------------------------\n\
 FILE SYSTEM HAS BEEN CHANGED\n\
 ----------------------------\n", 209},
-  {"Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n", 210},
-  {"%s: Out of memory!\n", 211},
-  {"mkfs version %s (%s)\n", 212},
-  {"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", 213},
-  {"%s is mounted; will not make a filesystem here!", 214},
-  {"seek to boot block failed in write_tables", 215},
-  {"unable to clear boot sector", 216},
-  {"seek failed in write_tables", 217},
-  {"unable to write inode map", 218},
-  {"unable to write zone map", 219},
-  {"unable to write inodes", 220},
-  {"write failed in write_block", 221},
-  {"too many bad blocks", 222},
-  {"not enough good blocks", 223},
-  {"unable to allocate buffers for maps", 224},
-  {"unable to allocate buffer for inodes", 225},
+  {"%s: failed to open: %s\n", 210},
+  {"%s: seek error on %s\n", 211},
+  {"%s: read error on %s\n", 212},
+  {"sector count: %d, sector size: %d\n", 213},
+  {"%s: option parse error\n", 214},
+  {"Usage: %s [-x] [-d <num>] iso9660-image\n", 215},
+  {"Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n", 216},
+  {"%s: Out of memory!\n", 217},
+  {"mkfs version %s (%s)\n", 218},
+  {"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", 219},
+  {"%s is mounted; will not make a filesystem here!", 220},
+  {"seek to boot block failed in write_tables", 221},
+  {"unable to clear boot sector", 222},
+  {"seek failed in write_tables", 223},
+  {"unable to write inode map", 224},
+  {"unable to write zone map", 225},
+  {"unable to write inodes", 226},
+  {"write failed in write_block", 227},
+  {"too many bad blocks", 228},
+  {"not enough good blocks", 229},
+  {"unable to allocate buffers for maps", 230},
+  {"unable to allocate buffer for inodes", 231},
   {"\
 Maxsize=%ld\n\
-\n", 226},
-  {"seek failed during testing of blocks", 227},
-  {"Weird values in do_check: probably bugs\n", 228},
-  {"seek failed in check_blocks", 229},
-  {"bad blocks before data-area: cannot make fs", 230},
-  {"%d bad blocks\n", 231},
-  {"one bad block\n", 232},
-  {"can't open file of bad blocks", 233},
-  {"%s: not compiled with minix v2 support\n", 234},
-  {"strtol error: number of blocks not specified", 235},
-  {"unable to open %s", 236},
-  {"unable to stat %s", 237},
-  {"will not try to make filesystem on '%s'", 238},
-  {"Bad user-specified page size %d\n", 239},
-  {"Using user-specified page size %d, instead of the system values %d/%d\n", 240},
-  {"Assuming pages of size %d (not %d)\n", 241},
-  {"Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n", 242},
-  {"too many bad pages", 243},
-  {"Out of memory", 244},
-  {"one bad page\n", 245},
-  {"%d bad pages\n", 246},
-  {"%s: error: Nowhere to set up swap on?\n", 247},
-  {"%s: error: size %ld is larger than device size %d\n", 248},
-  {"%s: error: unknown version %d\n", 249},
-  {"%s: error: swap area needs to be at least %ldkB\n", 250},
-  {"%s: warning: truncating swap area to %ldkB\n", 251},
-  {"Will not try to make swapdevice on '%s'", 252},
-  {"fatal: first page unreadable", 253},
+\n", 232},
+  {"seek failed during testing of blocks", 233},
+  {"Weird values in do_check: probably bugs\n", 234},
+  {"seek failed in check_blocks", 235},
+  {"bad blocks before data-area: cannot make fs", 236},
+  {"%d bad blocks\n", 237},
+  {"one bad block\n", 238},
+  {"can't open file of bad blocks", 239},
+  {"%s: not compiled with minix v2 support\n", 240},
+  {"strtol error: number of blocks not specified", 241},
+  {"unable to open %s", 242},
+  {"unable to stat %s", 243},
+  {"will not try to make filesystem on '%s'", 244},
+  {"Bad user-specified page size %d\n", 245},
+  {"Using user-specified page size %d, instead of the system values %d/%d\n", 246},
+  {"Assuming pages of size %d (not %d)\n", 247},
+  {"Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n", 248},
+  {"too many bad pages", 249},
+  {"Out of memory", 250},
+  {"one bad page\n", 251},
+  {"%d bad pages\n", 252},
+  {"%s: error: Nowhere to set up swap on?\n", 253},
+  {"%s: error: size %ld is larger than device size %d\n", 254},
+  {"%s: error: unknown version %d\n", 255},
+  {"%s: error: swap area needs to be at least %ldkB\n", 256},
+  {"%s: warning: truncating swap area to %ldkB\n", 257},
+  {"Will not try to make swapdevice on '%s'", 258},
+  {"fatal: first page unreadable", 259},
   {"\
 %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", 254},
-  {"Unable to set up swap-space: unreadable", 255},
-  {"Setting up swapspace version %d, size = %ld bytes\n", 256},
-  {"unable to rewind swap-device", 257},
-  {"unable to write signature page", 258},
-  {"fsync failed", 259},
-  {"Invalid number: %s\n", 260},
-  {"Syntax error: '%s'\n", 261},
-  {"No such parameter set: '%s'\n", 262},
-  {"usage: %s [ -p ] dev name\n", 263},
-  {"\
-       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n", 264},
-  {"       %s [ -c | -y | -n | -d ] dev\n", 265},
-  {"       %s [ -c | -y | -n ] dev\n", 266},
-  {"Unusable", 267},
-  {"Free Space", 268},
-  {"Linux ext2", 269},
-  {"Linux", 270},
-  {"OS/2 HPFS", 271},
-  {"OS/2 IFS", 272},
-  {"NTFS", 273},
-  {"Disk has been changed.\n", 274},
-  {"Reboot the system to ensure the partition table is correctly updated.\n", 275},
+the -f option to force it.\n", 260},
+  {"Unable to set up swap-space: unreadable", 261},
+  {"Setting up swapspace version %d, size = %ld bytes\n", 262},
+  {"unable to rewind swap-device", 263},
+  {"unable to write signature page", 264},
+  {"fsync failed", 265},
+  {"Invalid number: %s\n", 266},
+  {"Syntax error: '%s'\n", 267},
+  {"No such parameter set: '%s'\n", 268},
+  {"usage: %s [ -p ] dev name\n", 269},
+  {"\
+       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n", 270},
+  {"       %s [ -c | -y | -n | -d ] dev\n", 271},
+  {"       %s [ -c | -y | -n ] dev\n", 272},
+  {"Unusable", 273},
+  {"Free Space", 274},
+  {"Linux ext2", 275},
+  {"Linux", 276},
+  {"OS/2 HPFS", 277},
+  {"OS/2 IFS", 278},
+  {"NTFS", 279},
+  {"Disk has been changed.\n", 280},
+  {"Reboot the system to ensure the partition table is correctly updated.\n", 281},
   {"\
 \n\
 WARNING: If you have created or modified any\n\
 DOS 6.x partitions, please see the cfdisk manual\n\
-page for additional information.\n", 276},
-  {"FATAL ERROR", 277},
-  {"Press any key to exit cfdisk", 278},
-  {"Cannot seek on disk drive", 279},
-  {"Cannot read disk drive", 280},
-  {"Cannot write disk drive", 281},
-  {"Too many partitions", 282},
-  {"Partition begins before sector 0", 283},
-  {"Partition ends before sector 0", 284},
-  {"Partition begins after end-of-disk", 285},
-  {"Partition ends after end-of-disk", 286},
-  {"logical partitions not in disk order", 287},
-  {"logical partitions overlap", 288},
-  {"enlarged logical partitions overlap", 289},
-  {"\
-!!!! Internal error creating logical drive with no extended partition !!!!", 290},
-  {"\
-Cannot create logical drive here -- would create two extended partitions", 291},
-  {"Menu item too long. Menu may look odd.", 292},
-  {"Menu without direction. Defaulting horizontal.", 293},
-  {"Illegal key", 294},
-  {"Press a key to continue", 295},
-  {"Primary", 296},
-  {"Create a new primary partition", 297},
-  {"Logical", 298},
-  {"Create a new logical partition", 299},
-  {"Cancel", 300},
-  {"Don't create a partition", 301},
-  {"!!! Internal error !!!", 302},
-  {"Size (in MB): ", 303},
-  {"Beginning", 304},
-  {"Add partition at beginning of free space", 305},
-  {"End", 306},
-  {"Add partition at end of free space", 307},
-  {"No room to create the extended partition", 308},
-  {"Bad signature on partition table", 309},
-  {"You specified more cylinders than fit on disk", 310},
-  {"Cannot open disk drive", 311},
-  {"Opened disk read-only - you have no permission to write", 312},
-  {"Cannot get disk size", 313},
-  {"Bad primary partition", 314},
-  {"Bad logical partition", 315},
-  {"Warning!!  This may destroy data on your disk!", 316},
-  {"Are you sure you want write the partition table to disk? (yes or no): ", 317},
-  {"no", 318},
-  {"Did not write partition table to disk", 319},
-  {"yes", 320},
-  {"Please enter `yes' or `no'", 321},
-  {"Writing partition table to disk...", 322},
-  {"Wrote partition table to disk", 323},
-  {"\
-Wrote partition table, but re-read table failed.  Reboot to update table.", 324},
-  {"\
-Not precisely one primary partition is bootable. DOS MBR cannot boot this.", 325},
-  {"Enter filename or press RETURN to display on screen: ", 326},
-  {"Cannot open file '%s'", 327},
-  {"Disk Drive: %s\n", 328},
-  {"Sector 0:\n", 329},
-  {"Sector %d:\n", 330},
-  {"   None   ", 331},
-  {"   Pri/Log", 332},
-  {"   Primary", 333},
-  {"   Logical", 334},
-  {"Unknown", 335},
-  {"Boot (%02X)", 336},
-  {"Unknown (%02X)", 337},
-  {"None (%02X)", 338},
-  {"Partition Table for %s\n", 339},
-  {"            First    Last\n", 340},
-  {"\
- # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n", 341},
+page for additional information.\n", 282},
+  {"FATAL ERROR", 283},
+  {"Press any key to exit cfdisk", 284},
+  {"Cannot seek on disk drive", 285},
+  {"Cannot read disk drive", 286},
+  {"Cannot write disk drive", 287},
+  {"Too many partitions", 288},
+  {"Partition begins before sector 0", 289},
+  {"Partition ends before sector 0", 290},
+  {"Partition begins after end-of-disk", 291},
+  {"Partition ends after end-of-disk", 292},
+  {"logical partitions not in disk order", 293},
+  {"logical partitions overlap", 294},
+  {"enlarged logical partitions overlap", 295},
+  {"\
+!!!! Internal error creating logical drive with no extended partition !!!!", 296},
+  {"\
+Cannot create logical drive here -- would create two extended partitions", 297},
+  {"Menu item too long. Menu may look odd.", 298},
+  {"Menu without direction. Defaulting horizontal.", 299},
+  {"Illegal key", 300},
+  {"Press a key to continue", 301},
+  {"Primary", 302},
+  {"Create a new primary partition", 303},
+  {"Logical", 304},
+  {"Create a new logical partition", 305},
+  {"Cancel", 306},
+  {"Don't create a partition", 307},
+  {"!!! Internal error !!!", 308},
+  {"Size (in MB): ", 309},
+  {"Beginning", 310},
+  {"Add partition at beginning of free space", 311},
+  {"End", 312},
+  {"Add partition at end of free space", 313},
+  {"No room to create the extended partition", 314},
+  {"Bad signature on partition table", 315},
+  {"You specified more cylinders than fit on disk", 316},
+  {"Cannot open disk drive", 317},
+  {"Opened disk read-only - you have no permission to write", 318},
+  {"Cannot get disk size", 319},
+  {"Bad primary partition", 320},
+  {"Bad logical partition", 321},
+  {"Warning!!  This may destroy data on your disk!", 322},
+  {"Are you sure you want write the partition table to disk? (yes or no): ", 323},
+  {"no", 324},
+  {"Did not write partition table to disk", 325},
+  {"yes", 326},
+  {"Please enter `yes' or `no'", 327},
+  {"Writing partition table to disk...", 328},
+  {"Wrote partition table to disk", 329},
+  {"\
+Wrote partition table, but re-read table failed.  Reboot to update table.", 330},
+  {"\
+Not precisely one primary partition is bootable. DOS MBR cannot boot this.", 331},
+  {"Enter filename or press RETURN to display on screen: ", 332},
+  {"Cannot open file '%s'", 333},
+  {"Disk Drive: %s\n", 334},
+  {"Sector 0:\n", 335},
+  {"Sector %d:\n", 336},
+  {"   None   ", 337},
+  {"   Pri/Log", 338},
+  {"   Primary", 339},
+  {"   Logical", 340},
+  {"Unknown", 341},
+  {"Boot (%02X)", 342},
+  {"Unknown (%02X)", 343},
+  {"None (%02X)", 344},
+  {"Partition Table for %s\n", 345},
+  {"            First    Last\n", 346},
+  {"\
+ # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n", 347},
   {"\
 -- ------- -------- --------- ------ --------- ---------------------- \
----------\n", 342},
-  {"         ---Starting---      ----Ending----    Start Number of\n", 343},
-  {" # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n", 344},
-  {"-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n", 345},
-  {"Raw", 346},
-  {"Print the table using raw data format", 347},
-  {"Sectors", 348},
-  {"Print the table ordered by sectors", 349},
-  {"Table", 350},
-  {"Just print the partition table", 351},
-  {"Don't print the table", 352},
-  {"Help Screen for cfdisk", 353},
-  {"This is cfdisk, a curses based disk partitioning program, which", 354},
-  {"allows you to create, delete and modify partitions on your hard", 355},
-  {"disk drive.", 356},
-  {"Copyright (C) 1994-1999 Kevin E. Martin & aeb", 357},
-  {"Command      Meaning", 358},
-  {"-------      -------", 359},
-  {"  b          Toggle bootable flag of the current partition", 360},
-  {"  d          Delete the current partition", 361},
-  {"  g          Change cylinders, heads, sectors-per-track parameters", 362},
-  {"             WARNING: This option should only be used by people who", 363},
-  {"             know what they are doing.", 364},
-  {"  h          Print this screen", 365},
-  {"  m          Maximize disk usage of the current partition", 366},
-  {"             Note: This may make the partition incompatible with", 367},
-  {"             DOS, OS/2, ...", 368},
-  {"  n          Create new partition from free space", 369},
-  {"  p          Print partition table to the screen or to a file", 370},
-  {"             There are several different formats for the partition", 371},
-  {"             that you can choose from:", 372},
-  {"                r - Raw data (exactly what would be written to disk)", 373},
-  {"                s - Table ordered by sectors", 374},
-  {"                t - Table in raw format", 375},
-  {"  q          Quit program without writing partition table", 376},
-  {"  t          Change the filesystem type", 377},
-  {"  u          Change units of the partition size display", 378},
-  {"             Rotates through MB, sectors and cylinders", 379},
-  {"  W          Write partition table to disk (must enter upper case W)", 380},
-  {"             Since this might destroy data on the disk, you must", 381},
-  {"             either confirm or deny the write by entering `yes' or", 382},
-  {"             `no'", 383},
-  {"Up Arrow     Move cursor to the previous partition", 384},
-  {"Down Arrow   Move cursor to the next partition", 385},
-  {"CTRL-L       Redraws the screen", 386},
-  {"  ?          Print this screen", 387},
-  {"Note: All of the commands can be entered with either upper or lower", 388},
-  {"case letters (except for Writes).", 389},
-  {"Cylinders", 390},
-  {"Change cylinder geometry", 391},
-  {"Heads", 392},
-  {"Change head geometry", 393},
-  {"Change sector geometry", 394},
-  {"Done", 395},
-  {"Done with changing geometry", 396},
-  {"Enter the number of cylinders: ", 397},
-  {"Illegal cylinders value", 398},
-  {"Enter the number of heads: ", 399},
-  {"Illegal heads value", 400},
-  {"Enter the number of sectors per track: ", 401},
-  {"Illegal sectors value", 402},
-  {"Enter filesystem type: ", 403},
-  {"Cannot change FS Type to empty", 404},
-  {"Cannot change FS Type to extended", 405},
-  {"Boot", 406},
-  {"Unk(%02X)", 407},
-  {", NC", 408},
-  {"NC", 409},
-  {"Pri/Log", 410},
-  {"Disk Drive: %s", 411},
-  {"Size: %lld bytes", 412},
-  {"Heads: %d   Sectors per Track: %d   Cylinders: %d", 413},
-  {"Name", 414},
-  {"Flags", 415},
-  {"Part Type", 416},
-  {"FS Type", 417},
-  {"[Label]", 418},
-  {"  Sectors", 419},
-  {"Size (MB)", 420},
-  {"Size (GB)", 421},
-  {"Bootable", 422},
-  {"Toggle bootable flag of the current partition", 423},
-  {"Delete", 424},
-  {"Delete the current partition", 425},
-  {"Geometry", 426},
-  {"Change disk geometry (experts only)", 427},
-  {"Help", 428},
-  {"Print help screen", 429},
-  {"Maximize", 430},
-  {"Maximize disk usage of the current partition (experts only)", 431},
-  {"New", 432},
-  {"Create new partition from free space", 433},
-  {"Print", 434},
-  {"Print partition table to the screen or to a file", 435},
-  {"Quit", 436},
-  {"Quit program without writing partition table", 437},
-  {"Type", 438},
-  {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 439},
-  {"Units", 440},
-  {"Change units of the partition size display (MB, sect, cyl)", 441},
-  {"Write", 442},
-  {"Write partition table to disk (this might destroy data)", 443},
-  {"Cannot make this partition bootable", 444},
-  {"Cannot delete an empty partition", 445},
-  {"Cannot maximize this partition", 446},
-  {"This partition is unusable", 447},
-  {"This partition is already in use", 448},
-  {"Cannot change the type of an empty partition", 449},
-  {"No more partitions", 450},
-  {"Illegal command", 451},
-  {"Copyright (C) 1994-2000 Kevin E. Martin & aeb\n", 452},
+---------\n", 348},
+  {"         ---Starting---      ----Ending----    Start Number of\n", 349},
+  {" # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n", 350},
+  {"-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n", 351},
+  {"Raw", 352},
+  {"Print the table using raw data format", 353},
+  {"Sectors", 354},
+  {"Print the table ordered by sectors", 355},
+  {"Table", 356},
+  {"Just print the partition table", 357},
+  {"Don't print the table", 358},
+  {"Help Screen for cfdisk", 359},
+  {"This is cfdisk, a curses based disk partitioning program, which", 360},
+  {"allows you to create, delete and modify partitions on your hard", 361},
+  {"disk drive.", 362},
+  {"Copyright (C) 1994-1999 Kevin E. Martin & aeb", 363},
+  {"Command      Meaning", 364},
+  {"-------      -------", 365},
+  {"  b          Toggle bootable flag of the current partition", 366},
+  {"  d          Delete the current partition", 367},
+  {"  g          Change cylinders, heads, sectors-per-track parameters", 368},
+  {"             WARNING: This option should only be used by people who", 369},
+  {"             know what they are doing.", 370},
+  {"  h          Print this screen", 371},
+  {"  m          Maximize disk usage of the current partition", 372},
+  {"             Note: This may make the partition incompatible with", 373},
+  {"             DOS, OS/2, ...", 374},
+  {"  n          Create new partition from free space", 375},
+  {"  p          Print partition table to the screen or to a file", 376},
+  {"             There are several different formats for the partition", 377},
+  {"             that you can choose from:", 378},
+  {"                r - Raw data (exactly what would be written to disk)", 379},
+  {"                s - Table ordered by sectors", 380},
+  {"                t - Table in raw format", 381},
+  {"  q          Quit program without writing partition table", 382},
+  {"  t          Change the filesystem type", 383},
+  {"  u          Change units of the partition size display", 384},
+  {"             Rotates through MB, sectors and cylinders", 385},
+  {"  W          Write partition table to disk (must enter upper case W)", 386},
+  {"             Since this might destroy data on the disk, you must", 387},
+  {"             either confirm or deny the write by entering `yes' or", 388},
+  {"             `no'", 389},
+  {"Up Arrow     Move cursor to the previous partition", 390},
+  {"Down Arrow   Move cursor to the next partition", 391},
+  {"CTRL-L       Redraws the screen", 392},
+  {"  ?          Print this screen", 393},
+  {"Note: All of the commands can be entered with either upper or lower", 394},
+  {"case letters (except for Writes).", 395},
+  {"Cylinders", 396},
+  {"Change cylinder geometry", 397},
+  {"Heads", 398},
+  {"Change head geometry", 399},
+  {"Change sector geometry", 400},
+  {"Done", 401},
+  {"Done with changing geometry", 402},
+  {"Enter the number of cylinders: ", 403},
+  {"Illegal cylinders value", 404},
+  {"Enter the number of heads: ", 405},
+  {"Illegal heads value", 406},
+  {"Enter the number of sectors per track: ", 407},
+  {"Illegal sectors value", 408},
+  {"Enter filesystem type: ", 409},
+  {"Cannot change FS Type to empty", 410},
+  {"Cannot change FS Type to extended", 411},
+  {"Boot", 412},
+  {"Unk(%02X)", 413},
+  {", NC", 414},
+  {"NC", 415},
+  {"Pri/Log", 416},
+  {"Disk Drive: %s", 417},
+  {"Size: %lld bytes", 418},
+  {"Heads: %d   Sectors per Track: %d   Cylinders: %d", 419},
+  {"Name", 420},
+  {"Flags", 421},
+  {"Part Type", 422},
+  {"FS Type", 423},
+  {"[Label]", 424},
+  {"  Sectors", 425},
+  {"Size (MB)", 426},
+  {"Size (GB)", 427},
+  {"Bootable", 428},
+  {"Toggle bootable flag of the current partition", 429},
+  {"Delete", 430},
+  {"Delete the current partition", 431},
+  {"Geometry", 432},
+  {"Change disk geometry (experts only)", 433},
+  {"Help", 434},
+  {"Print help screen", 435},
+  {"Maximize", 436},
+  {"Maximize disk usage of the current partition (experts only)", 437},
+  {"New", 438},
+  {"Create new partition from free space", 439},
+  {"Print", 440},
+  {"Print partition table to the screen or to a file", 441},
+  {"Quit", 442},
+  {"Quit program without writing partition table", 443},
+  {"Type", 444},
+  {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 445},
+  {"Units", 446},
+  {"Change units of the partition size display (MB, sect, cyl)", 447},
+  {"Write", 448},
+  {"Write partition table to disk (this might destroy data)", 449},
+  {"Cannot make this partition bootable", 450},
+  {"Cannot delete an empty partition", 451},
+  {"Cannot maximize this partition", 452},
+  {"This partition is unusable", 453},
+  {"This partition is already in use", 454},
+  {"Cannot change the type of an empty partition", 455},
+  {"No more partitions", 456},
+  {"Illegal command", 457},
+  {"Copyright (C) 1994-2000 Kevin E. Martin & aeb\n", 458},
   {"\
 \n\
 Usage:\n\
@@ -587,7 +592,7 @@ Options:\n\
 -z: Start with a zero partition table, instead of reading the pt from disk;\n\
 -c C -h H -s S: Override the kernel's idea of the number of cylinders,\n\
                 the number of heads and the number of sectors/track.\n\
-\n", 453},
+\n", 459},
   {"\
 Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n\
        fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n\
@@ -596,211 +601,219 @@ Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\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 drives) use 2048-byte sectors\n", 454},
+-b 2048: (for certain MO drives) use 2048-byte sectors\n", 460},
   {"\
 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", 455},
-  {"Unable to open %s\n", 456},
-  {"Unable to read %s\n", 457},
-  {"Unable to seek on %s\n", 458},
-  {"Unable to write %s\n", 459},
-  {"BLKGETSIZE ioctl failed on %s\n", 460},
-  {"Unable to allocate any more memory\n", 461},
-  {"Fatal error\n", 462},
-  {"Command action", 463},
-  {"   a   toggle a read only flag", 464},
-  {"   b   edit bsd disklabel", 465},
-  {"   c   toggle the mountable flag", 466},
-  {"   d   delete a partition", 467},
-  {"   l   list known partition types", 468},
-  {"   m   print this menu", 469},
-  {"   n   add a new partition", 470},
-  {"   o   create a new empty DOS partition table", 471},
-  {"   p   print the partition table", 472},
-  {"   q   quit without saving changes", 473},
-  {"   s   create a new empty Sun disklabel", 474},
-  {"   t   change a partition's system id", 475},
-  {"   u   change display/entry units", 476},
-  {"   v   verify the partition table", 477},
-  {"   w   write table to disk and exit", 478},
-  {"   x   extra functionality (experts only)", 479},
-  {"   a   select bootable partition", 480},
-  {"   b   edit bootfile entry", 481},
-  {"   c   select sgi swap partition", 482},
-  {"   a   toggle a bootable flag", 483},
-  {"   c   toggle the dos compatibility flag", 484},
-  {"   a   change number of alternate cylinders", 485},
-  {"   c   change number of cylinders", 486},
-  {"   d   print the raw data in the partition table", 487},
-  {"   e   change number of extra sectors per cylinder", 488},
-  {"   h   change number of heads", 489},
-  {"   i   change interleave factor", 490},
-  {"   o   change rotation speed (rpm)", 491},
-  {"   r   return to main menu", 492},
-  {"   s   change number of sectors/track", 493},
-  {"   y   change number of physical cylinders", 494},
-  {"   b   move beginning of data in a partition", 495},
-  {"   e   list extended partitions", 496},
-  {"   g   create an IRIX partition table", 497},
-  {"   f   fix partition order", 498},
-  {"You must set", 499},
-  {"heads", 500},
-  {"sectors", 501},
-  {"cylinders", 502},
+  ...\n", 461},
+  {"Unable to open %s\n", 462},
+  {"Unable to read %s\n", 463},
+  {"Unable to seek on %s\n", 464},
+  {"Unable to write %s\n", 465},
+  {"BLKGETSIZE ioctl failed on %s\n", 466},
+  {"Unable to allocate any more memory\n", 467},
+  {"Fatal error\n", 468},
+  {"Command action", 469},
+  {"   a   toggle a read only flag", 470},
+  {"   b   edit bsd disklabel", 471},
+  {"   c   toggle the mountable flag", 472},
+  {"   d   delete a partition", 473},
+  {"   l   list known partition types", 474},
+  {"   m   print this menu", 475},
+  {"   n   add a new partition", 476},
+  {"   o   create a new empty DOS partition table", 477},
+  {"   p   print the partition table", 478},
+  {"   q   quit without saving changes", 479},
+  {"   s   create a new empty Sun disklabel", 480},
+  {"   t   change a partition's system id", 481},
+  {"   u   change display/entry units", 482},
+  {"   v   verify the partition table", 483},
+  {"   w   write table to disk and exit", 484},
+  {"   x   extra functionality (experts only)", 485},
+  {"   a   select bootable partition", 486},
+  {"   b   edit bootfile entry", 487},
+  {"   c   select sgi swap partition", 488},
+  {"   a   toggle a bootable flag", 489},
+  {"   c   toggle the dos compatibility flag", 490},
+  {"   a   change number of alternate cylinders", 491},
+  {"   c   change number of cylinders", 492},
+  {"   d   print the raw data in the partition table", 493},
+  {"   e   change number of extra sectors per cylinder", 494},
+  {"   h   change number of heads", 495},
+  {"   i   change interleave factor", 496},
+  {"   o   change rotation speed (rpm)", 497},
+  {"   r   return to main menu", 498},
+  {"   s   change number of sectors/track", 499},
+  {"   y   change number of physical cylinders", 500},
+  {"   b   move beginning of data in a partition", 501},
+  {"   e   list extended partitions", 502},
+  {"   g   create an IRIX partition table", 503},
+  {"   f   fix partition order", 504},
+  {"You must set", 505},
+  {"heads", 506},
+  {"sectors", 507},
+  {"cylinders", 508},
   {"\
 %s%s.\n\
-You can do this from the extra functions menu.\n", 503},
-  {" and ", 504},
-  {"Bad offset in primary extended partition\n", 505},
-  {"Warning: deleting partitions after %d\n", 506},
-  {"Warning: extra link pointer in partition table %d\n", 507},
-  {"Warning: ignoring extra data in partition table %d\n", 508},
+You can do this from the extra functions menu.\n", 509},
+  {" and ", 510},
+  {"\
+\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", 511},
+  {"Bad offset in primary extended partition\n", 512},
+  {"Warning: deleting partitions after %d\n", 513},
+  {"Warning: extra link pointer in partition table %d\n", 514},
+  {"Warning: ignoring extra data in partition table %d\n", 515},
   {"\
 Building a new DOS disklabel. Changes will remain in memory only,\n\
 until you decide to write them. After that, of course, the previous\n\
 content won't be recoverable.\n\
-\n", 509},
-  {"Note: sector size is %d (not %d)\n", 510},
-  {"You will not be able to write the partition table.\n", 511},
+\n", 516},
+  {"Note: sector size is %d (not %d)\n", 517},
+  {"You will not be able to write the partition table.\n", 518},
   {"\
 Device contains neither a valid DOS partition table, nor Sun, SGI or OSF \
-disklabel\n", 512},
-  {"Internal error\n", 513},
-  {"Ignoring extra extended partition %d\n", 514},
+disklabel\n", 519},
+  {"Internal error\n", 520},
+  {"Ignoring extra extended partition %d\n", 521},
   {"\
 Warning: invalid flag 0x%04x of partition table %d will be corrected by \
-w(rite)\n", 515},
+w(rite)\n", 522},
   {"\
 \n\
-got EOF thrice - exiting..\n", 516},
-  {"Hex code (type L to list codes): ", 517},
-  {"%s (%d-%d, default %d): ", 518},
-  {"Using default value %d\n", 519},
-  {"Value out of range.\n", 520},
-  {"Partition number", 521},
-  {"Warning: partition %d has empty type\n", 522},
-  {"cylinder", 523},
-  {"sector", 524},
-  {"Changing display/entry units to %s\n", 525},
-  {"WARNING: Partition %d is an extended partition\n", 526},
-  {"DOS Compatibility flag is set\n", 527},
-  {"DOS Compatibility flag is not set\n", 528},
-  {"Partition %d does not exist yet!\n", 529},
+got EOF thrice - exiting..\n", 523},
+  {"Hex code (type L to list codes): ", 524},
+  {"%s (%d-%d, default %d): ", 525},
+  {"Using default value %d\n", 526},
+  {"Value out of range.\n", 527},
+  {"Partition number", 528},
+  {"Warning: partition %d has empty type\n", 529},
+  {"cylinder", 530},
+  {"sector", 531},
+  {"Changing display/entry units to %s\n", 532},
+  {"WARNING: Partition %d is an extended partition\n", 533},
+  {"DOS Compatibility flag is set\n", 534},
+  {"DOS Compatibility flag is not set\n", 535},
+  {"Partition %d does not exist yet!\n", 536},
   {"\
 Type 0 means free space to many systems\n\
 (but not to Linux). Having partitions of\n\
 type 0 is probably unwise. You can delete\n\
-a partition using the `d' command.\n", 530},
+a partition using the `d' command.\n", 537},
   {"\
 You cannot change a partition into an extended one or vice versa\n\
-Delete it first.\n", 531},
+Delete it first.\n", 538},
   {"\
 Consider leaving partition 3 as Whole disk (5),\n\
 as SunOS/Solaris expects it and even Linux likes it.\n\
-\n", 532},
+\n", 539},
   {"\
 Consider leaving partition 9 as volume header (0),\n\
 and partition 11 as entire volume (6)as IRIX expects it.\n\
-\n", 533},
-  {"Changed system type of partition %d to %x (%s)\n", 534},
-  {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 535},
-  {"     phys=(%d, %d, %d) ", 536},
-  {"logical=(%d, %d, %d)\n", 537},
-  {"Partition %d has different physical/logical endings:\n", 538},
-  {"Partition %i does not start on cylinder boundary:\n", 539},
-  {"should be (%d, %d, 1)\n", 540},
-  {"Partition %i does not end on cylinder boundary:\n", 541},
-  {"should be (%d, %d, %d)\n", 542},
+\n", 540},
+  {"Changed system type of partition %d to %x (%s)\n", 541},
+  {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 542},
+  {"     phys=(%d, %d, %d) ", 543},
+  {"logical=(%d, %d, %d)\n", 544},
+  {"Partition %d has different physical/logical endings:\n", 545},
+  {"Partition %i does not start on cylinder boundary:\n", 546},
+  {"should be (%d, %d, 1)\n", 547},
+  {"Partition %i does not end on cylinder boundary:\n", 548},
+  {"should be (%d, %d, %d)\n", 549},
   {"\
 \n\
 Disk %s: %d heads, %d sectors, %d cylinders\n\
 Units = %s of %d * %d bytes\n\
-\n", 543},
+\n", 550},
   {"\
 Nothing to do. Ordering is correct already.\n\
-\n", 544},
-  {"%*s Boot    Start       End    Blocks   Id  System\n", 545},
-  {"Device", 546},
+\n", 551},
+  {"%*s Boot    Start       End    Blocks   Id  System\n", 552},
+  {"Device", 553},
   {"\
 \n\
-Partition table entries are not in disk order\n", 547},
+Partition table entries are not in disk order\n", 554},
   {"\
 \n\
 Disk %s: %d heads, %d sectors, %d cylinders\n\
-\n", 548},
-  {"Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n", 549},
-  {"Warning: partition %d contains sector 0\n", 550},
-  {"Partition %d: head %d greater than maximum %d\n", 551},
-  {"Partition %d: sector %d greater than maximum %d\n", 552},
-  {"Partitions %d: cylinder %d greater than maximum %d\n", 553},
-  {"Partition %d: previous sectors %d disagrees with total %d\n", 554},
-  {"Warning: bad start-of-data in partition %d\n", 555},
-  {"Warning: partition %d overlaps partition %d.\n", 556},
-  {"Warning: partition %d is empty\n", 557},
-  {"Logical partition %d not entirely in partition %d\n", 558},
-  {"Total allocated sectors %d greater than the maximum %d\n", 559},
-  {"%d unallocated sectors\n", 560},
-  {"Partition %d is already defined.  Delete it before re-adding it.\n", 561},
-  {"First %s", 562},
-  {"Sector %d is already allocated\n", 563},
-  {"No free sectors available\n", 564},
-  {"Last %s or +size or +sizeM or +sizeK", 565},
-  {"Warning: partition %d has an odd number of sectors.\n", 566},
-  {"The maximum number of partitions has been created\n", 567},
-  {"You must delete some partition and add an extended partition first\n", 568},
+\n", 555},
+  {"Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n", 556},
+  {"Warning: partition %d contains sector 0\n", 557},
+  {"Partition %d: head %d greater than maximum %d\n", 558},
+  {"Partition %d: sector %d greater than maximum %d\n", 559},
+  {"Partitions %d: cylinder %d greater than maximum %d\n", 560},
+  {"Partition %d: previous sectors %d disagrees with total %d\n", 561},
+  {"Warning: bad start-of-data in partition %d\n", 562},
+  {"Warning: partition %d overlaps partition %d.\n", 563},
+  {"Warning: partition %d is empty\n", 564},
+  {"Logical partition %d not entirely in partition %d\n", 565},
+  {"Total allocated sectors %d greater than the maximum %d\n", 566},
+  {"%d unallocated sectors\n", 567},
+  {"Partition %d is already defined.  Delete it before re-adding it.\n", 568},
+  {"First %s", 569},
+  {"Sector %d is already allocated\n", 570},
+  {"No free sectors available\n", 571},
+  {"Last %s or +size or +sizeM or +sizeK", 572},
+  {"Warning: partition %d has an odd number of sectors.\n", 573},
+  {"The maximum number of partitions has been created\n", 574},
+  {"You must delete some partition and add an extended partition first\n", 575},
   {"\
 Command action\n\
    %s\n\
-   p   primary partition (1-4)\n", 569},
-  {"l   logical (5 or over)", 570},
-  {"e   extended", 571},
-  {"Invalid partition number for type `%c'\n", 572},
+   p   primary partition (1-4)\n", 576},
+  {"l   logical (5 or over)", 577},
+  {"e   extended", 578},
+  {"Invalid partition number for type `%c'\n", 579},
   {"\
 The partition table has been altered!\n\
-\n", 573},
-  {"Calling ioctl() to re-read partition table.\n", 574},
+\n", 580},
+  {"Calling ioctl() to re-read partition table.\n", 581},
   {"\
 Re-read table failed with error %d: %s.\n\
-Reboot your system to ensure the partition table is updated.\n", 575},
+Reboot your system to ensure the partition table is updated.\n", 582},
   {"\
 \n\
 WARNING: If you have created or modified any DOS 6.x\n\
 partitions, please see the fdisk manual page for additional\n\
-information.\n", 576},
-  {"Syncing disks.\n", 577},
-  {"Device: %s\n", 578},
-  {"Partition %d has no data area\n", 579},
-  {"New beginning of data", 580},
-  {"Expert command (m for help): ", 581},
-  {"Number of cylinders", 582},
-  {"Number of heads", 583},
-  {"Number of sectors", 584},
-  {"Warning: setting sector offset for DOS compatiblity\n", 585},
-  {"Disk %s doesn't contain a valid partition table\n", 586},
-  {"Cannot open %s\n", 587},
-  {"cannot open %s\n", 588},
-  {"%c: unknown command\n", 589},
-  {"This kernel finds the sector size itself - -b option ignored\n", 590},
+information.\n", 583},
+  {"Syncing disks.\n", 584},
+  {"Device: %s\n", 585},
+  {"Partition %d has no data area\n", 586},
+  {"New beginning of data", 587},
+  {"Expert command (m for help): ", 588},
+  {"Number of cylinders", 589},
+  {"Number of heads", 590},
+  {"Number of sectors", 591},
+  {"Warning: setting sector offset for DOS compatiblity\n", 592},
+  {"Disk %s doesn't contain a valid partition table\n", 593},
+  {"Cannot open %s\n", 594},
+  {"cannot open %s\n", 595},
+  {"%c: unknown command\n", 596},
+  {"This kernel finds the sector size itself - -b option ignored\n", 597},
   {"\
 Warning: the -b (set sector size) option should be used with one specified \
-device\n", 591},
+device\n", 598},
   {"\
 Detected an OSF/1 disklabel on %s, entering disklabel mode.\n\
-To return to DOS partition table mode, use the 'r' command.\n", 592},
-  {"Command (m for help): ", 593},
+To return to DOS partition table mode, use the 'r' command.\n", 599},
+  {"Command (m for help): ", 600},
   {"\
 \n\
-The current boot file is: %s\n", 594},
-  {"Please enter the name of the new boot file: ", 595},
-  {"Boot file unchanged\n", 596},
+The current boot file is: %s\n", 601},
+  {"Please enter the name of the new boot file: ", 602},
+  {"Boot file unchanged\n", 603},
   {"\
 \n\
 \tSorry, no experts menu for SGI partition tables available.\n\
-\n", 597},
+\n", 604},
   {"\
 \n\
 \tThere is a valid AIX label on this disk.\n\
@@ -813,92 +826,92 @@ The current boot file is: %s\n", 594},
 \t   erase the other disks as well, if unmirrored.)\n\
 \t3. Before deleting this physical volume be sure\n\
 \t   to remove the disk logically from your AIX\n\
-\t   machine.  (Otherwise you become an AIXpert).", 598},
+\t   machine.  (Otherwise you become an AIXpert).", 605},
   {"\
 \n\
-BSD label for device: %s\n", 599},
-  {"   d   delete a BSD partition", 600},
-  {"   e   edit drive data", 601},
-  {"   i   install bootstrap", 602},
-  {"   l   list known filesystem types", 603},
-  {"   n   add a new BSD partition", 604},
-  {"   p   print BSD partition table", 605},
-  {"   s   show complete disklabel", 606},
-  {"   t   change a partition's filesystem id", 607},
-  {"   u   change units (cylinders/sectors)", 608},
-  {"   w   write disklabel to disk", 609},
-  {"   x   link BSD partition to non-BSD partition", 610},
-  {"Partition %s has invalid starting sector 0.\n", 611},
-  {"Reading disklabel of %s at sector %d.\n", 612},
-  {"There is no *BSD partition on %s.\n", 613},
-  {"BSD disklabel command (m for help): ", 614},
-  {"type: %s\n", 615},
-  {"type: %d\n", 616},
-  {"disk: %.*s\n", 617},
-  {"label: %.*s\n", 618},
-  {"flags:", 619},
-  {" removable", 620},
-  {" ecc", 621},
-  {" badsect", 622},
-  {"bytes/sector: %ld\n", 623},
-  {"sectors/track: %ld\n", 624},
-  {"tracks/cylinder: %ld\n", 625},
-  {"sectors/cylinder: %ld\n", 626},
-  {"cylinders: %ld\n", 627},
-  {"rpm: %d\n", 628},
-  {"interleave: %d\n", 629},
-  {"trackskew: %d\n", 630},
-  {"cylinderskew: %d\n", 631},
-  {"headswitch: %ld\t\t# milliseconds\n", 632},
-  {"track-to-track seek: %ld\t# milliseconds\n", 633},
-  {"drivedata: ", 634},
+BSD label for device: %s\n", 606},
+  {"   d   delete a BSD partition", 607},
+  {"   e   edit drive data", 608},
+  {"   i   install bootstrap", 609},
+  {"   l   list known filesystem types", 610},
+  {"   n   add a new BSD partition", 611},
+  {"   p   print BSD partition table", 612},
+  {"   s   show complete disklabel", 613},
+  {"   t   change a partition's filesystem id", 614},
+  {"   u   change units (cylinders/sectors)", 615},
+  {"   w   write disklabel to disk", 616},
+  {"   x   link BSD partition to non-BSD partition", 617},
+  {"Partition %s has invalid starting sector 0.\n", 618},
+  {"Reading disklabel of %s at sector %d.\n", 619},
+  {"There is no *BSD partition on %s.\n", 620},
+  {"BSD disklabel command (m for help): ", 621},
+  {"type: %s\n", 622},
+  {"type: %d\n", 623},
+  {"disk: %.*s\n", 624},
+  {"label: %.*s\n", 625},
+  {"flags:", 626},
+  {" removable", 627},
+  {" ecc", 628},
+  {" badsect", 629},
+  {"bytes/sector: %ld\n", 630},
+  {"sectors/track: %ld\n", 631},
+  {"tracks/cylinder: %ld\n", 632},
+  {"sectors/cylinder: %ld\n", 633},
+  {"cylinders: %ld\n", 634},
+  {"rpm: %d\n", 635},
+  {"interleave: %d\n", 636},
+  {"trackskew: %d\n", 637},
+  {"cylinderskew: %d\n", 638},
+  {"headswitch: %ld\t\t# milliseconds\n", 639},
+  {"track-to-track seek: %ld\t# milliseconds\n", 640},
+  {"drivedata: ", 641},
   {"\
 \n\
-%d partitions:\n", 635},
-  {"#       start       end      size     fstype   [fsize bsize   cpg]\n", 636},
-  {"Writing disklabel to %s.\n", 637},
-  {"%s contains no disklabel.\n", 638},
-  {"Do you want to create a disklabel? (y/n) ", 639},
-  {"bytes/sector", 640},
-  {"sectors/track", 641},
-  {"tracks/cylinder", 642},
-  {"sectors/cylinder", 643},
-  {"Must be <= sectors/track * tracks/cylinder (default).\n", 644},
-  {"rpm", 645},
-  {"interleave", 646},
-  {"trackskew", 647},
-  {"cylinderskew", 648},
-  {"headswitch", 649},
-  {"track-to-track seek", 650},
-  {"Bootstrap: %sboot -> boot%s (%s): ", 651},
-  {"Bootstrap overlaps with disk label!\n", 652},
-  {"Bootstrap installed on %s.\n", 653},
-  {"Partition (a-%c): ", 654},
-  {"This partition already exists.\n", 655},
-  {"Warning: too many partitions (%d, maximum is %d).\n", 656},
+%d partitions:\n", 642},
+  {"#       start       end      size     fstype   [fsize bsize   cpg]\n", 643},
+  {"Writing disklabel to %s.\n", 644},
+  {"%s contains no disklabel.\n", 645},
+  {"Do you want to create a disklabel? (y/n) ", 646},
+  {"bytes/sector", 647},
+  {"sectors/track", 648},
+  {"tracks/cylinder", 649},
+  {"sectors/cylinder", 650},
+  {"Must be <= sectors/track * tracks/cylinder (default).\n", 651},
+  {"rpm", 652},
+  {"interleave", 653},
+  {"trackskew", 654},
+  {"cylinderskew", 655},
+  {"headswitch", 656},
+  {"track-to-track seek", 657},
+  {"Bootstrap: %sboot -> boot%s (%s): ", 658},
+  {"Bootstrap overlaps with disk label!\n", 659},
+  {"Bootstrap installed on %s.\n", 660},
+  {"Partition (a-%c): ", 661},
+  {"This partition already exists.\n", 662},
+  {"Warning: too many partitions (%d, maximum is %d).\n", 663},
   {"\
 \n\
-Syncing disks.\n", 657},
-  {"SGI volhdr", 658},
-  {"SGI trkrepl", 659},
-  {"SGI secrepl", 660},
-  {"SGI raw", 661},
-  {"SGI bsd", 662},
-  {"SGI sysv", 663},
-  {"SGI volume", 664},
-  {"SGI efs", 665},
-  {"SGI lvol", 666},
-  {"SGI rlvol", 667},
-  {"SGI xfs", 668},
-  {"SGI xlvol", 669},
-  {"SGI rxlvol", 670},
-  {"Linux swap", 671},
-  {"Linux native", 672},
-  {"Linux LVM", 673},
+Syncing disks.\n", 664},
+  {"SGI volhdr", 665},
+  {"SGI trkrepl", 666},
+  {"SGI secrepl", 667},
+  {"SGI raw", 668},
+  {"SGI bsd", 669},
+  {"SGI sysv", 670},
+  {"SGI volume", 671},
+  {"SGI efs", 672},
+  {"SGI lvol", 673},
+  {"SGI rlvol", 674},
+  {"SGI xfs", 675},
+  {"SGI xlvol", 676},
+  {"SGI rxlvol", 677},
+  {"Linux swap", 678},
+  {"Linux native", 679},
+  {"Linux LVM", 680},
   {"\
 According to MIPS Computer Systems, Inc the Label must not contain more than \
-512 bytes\n", 674},
-  {"Detected sgi disklabel with wrong checksum.\n", 675},
+512 bytes\n", 681},
+  {"Detected sgi disklabel with wrong checksum.\n", 682},
   {"\
 \n\
 Disk %s (SGI disk label): %d heads, %d sectors\n\
@@ -906,139 +919,139 @@ Disk %s (SGI disk label): %d heads, %d sectors\n\
 %d extra sects/cyl, interleave %d:1\n\
 %s\n\
 Units = %s of %d * 512 bytes\n\
-\n", 676},
+\n", 683},
   {"\
 \n\
 Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n\
 Units = %s of %d * 512 bytes\n\
-\n", 677},
+\n", 684},
   {"\
 ----- partitions -----\n\
-%*s  Info      Start       End   Sectors  Id  System\n", 678},
+%*s  Info      Start       End   Sectors  Id  System\n", 685},
   {"\
 ----- bootinfo -----\n\
 Bootfile: %s\n\
------ directory entries -----\n", 679},
-  {"%2d: %-10s sector%5u size%8u\n", 680},
+----- directory entries -----\n", 686},
+  {"%2d: %-10s sector%5u size%8u\n", 687},
   {"\
 \n\
 Invalid Bootfile!\n\
 \tThe bootfile must be an absolute non-zero pathname,\n\
-\te.g. \"/unix\" or \"/unix.save\".\n", 681},
+\te.g. \"/unix\" or \"/unix.save\".\n", 688},
   {"\
 \n\
-\tName of Bootfile too long:  16 bytes maximum.\n", 682},
+\tName of Bootfile too long:  16 bytes maximum.\n", 689},
   {"\
 \n\
-\tBootfile must have a fully qualified pathname.\n", 683},
+\tBootfile must have a fully qualified pathname.\n", 690},
   {"\
 \n\
 \tBe aware, that the bootfile is not checked for existence.\n\
-\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 684},
+\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 691},
   {"\
 \n\
-\tBootfile is changed to \"%s\".\n", 685},
-  {"More than one entire disk entry present.\n", 686},
-  {"No partitions defined\n", 687},
-  {"IRIX likes when Partition 11 covers the entire disk.\n", 688},
+\tBootfile is changed to \"%s\".\n", 692},
+  {"More than one entire disk entry present.\n", 693},
+  {"No partitions defined\n", 694},
+  {"IRIX likes when Partition 11 covers the entire disk.\n", 695},
   {"\
 The entire disk partition should start at block 0,\n\
-not at diskblock %d.\n", 689},
+not at diskblock %d.\n", 696},
   {"\
 The entire disk partition is only %d diskblock large,\n\
-but the disk is %d diskblocks long.\n", 690},
-  {"One Partition (#11) should cover the entire disk.\n", 691},
-  {"Partition %d does not start on cylinder boundary.\n", 692},
-  {"Partition %d does not end on cylinder boundary.\n", 693},
-  {"The Partition %d and %d overlap by %d sectors.\n", 694},
-  {"Unused gap of %8d sectors - sectors %8d-%d\n", 695},
+but the disk is %d diskblocks long.\n", 697},
+  {"One Partition (#11) should cover the entire disk.\n", 698},
+  {"Partition %d does not start on cylinder boundary.\n", 699},
+  {"Partition %d does not end on cylinder boundary.\n", 700},
+  {"The Partition %d and %d overlap by %d sectors.\n", 701},
+  {"Unused gap of %8d sectors - sectors %8d-%d\n", 702},
   {"\
 \n\
-The boot partition does not exist.\n", 696},
+The boot partition does not exist.\n", 703},
   {"\
 \n\
-The swap partition does not exist.\n", 697},
+The swap partition does not exist.\n", 704},
   {"\
 \n\
-The swap partition has no swap type.\n", 698},
-  {"\tYou have chosen an unusual boot file name.\n", 699},
-  {"Sorry You may change the Tag of non-empty partitions.\n", 700},
+The swap partition has no swap type.\n", 705},
+  {"\tYou have chosen an unusual boot file name.\n", 706},
+  {"Sorry You may change the Tag of non-empty partitions.\n", 707},
   {"\
 It is highly recommended that the partition at offset 0\n\
 is of type \"SGI volhdr\", the IRIX system will rely on it to\n\
 retrieve from its directory standalone tools like sash and fx.\n\
 Only the \"SGI volume\" entire disk section may violate this.\n\
-Type YES if you are sure about tagging this partition differently.\n", 701},
-  {"Do You know, You got a partition overlap on the disk?\n", 702},
-  {"Attempting to generate entire disk entry automatically.\n", 703},
-  {"The entire disk is already covered with partitions.\n", 704},
-  {"You got a partition overlap on the disk. Fix it first!\n", 705},
+Type YES if you are sure about tagging this partition differently.\n", 708},
+  {"Do You know, You got a partition overlap on the disk?\n", 709},
+  {"Attempting to generate entire disk entry automatically.\n", 710},
+  {"The entire disk is already covered with partitions.\n", 711},
+  {"You got a partition overlap on the disk. Fix it first!\n", 712},
   {"\
 It is highly recommended that eleventh partition\n\
-covers the entire disk and is of type `SGI volume'\n", 706},
-  {"You will get a partition overlap on the disk. Fix it first!\n", 707},
-  {" Last %s", 708},
+covers the entire disk and is of type `SGI volume'\n", 713},
+  {"You will get a partition overlap on the disk. Fix it first!\n", 714},
+  {" Last %s", 715},
   {"\
 Building a new SGI disklabel. Changes will remain in memory only,\n\
 until you decide to write them. After that, of course, the previous\n\
 content will be unrecoverably lost.\n\
-\n", 709},
-  {"Trying to keep parameters of partition %d.\n", 710},
-  {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 711},
-  {"Empty", 712},
-  {"SunOS root", 713},
-  {"SunOS swap", 714},
-  {"SunOS usr", 715},
-  {"Whole disk", 716},
-  {"SunOS stand", 717},
-  {"SunOS var", 718},
-  {"SunOS home", 719},
+\n", 716},
+  {"Trying to keep parameters of partition %d.\n", 717},
+  {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 718},
+  {"Empty", 719},
+  {"SunOS root", 720},
+  {"SunOS swap", 721},
+  {"SunOS usr", 722},
+  {"Whole disk", 723},
+  {"SunOS stand", 724},
+  {"SunOS var", 725},
+  {"SunOS home", 726},
   {"\
 Detected sun disklabel with wrong checksum.\n\
 Probably you'll have to set all the values,\n\
 e.g. heads, sectors, cylinders and partitions\n\
-or force a fresh label (s command in main menu)\n", 720},
-  {"Autoconfigure found a %s%s%s\n", 721},
+or force a fresh label (s command in main menu)\n", 727},
+  {"Autoconfigure found a %s%s%s\n", 728},
   {"\
 Building a new sun disklabel. Changes will remain in memory only,\n\
 until you decide to write them. After that, of course, the previous\n\
 content won't be recoverable.\n\
-\n", 722},
+\n", 729},
   {"\
 Drive type\n\
    ?   auto configure\n\
-   0   custom (with hardware detected defaults)", 723},
-  {"Select type (? for auto, 0 for custom): ", 724},
-  {"Autoconfigure failed.\n", 725},
-  {"Sectors/track", 726},
-  {"Alternate cylinders", 727},
-  {"Physical cylinders", 728},
-  {"Rotation speed (rpm)", 729},
-  {"Interleave factor", 730},
-  {"Extra sectors per cylinder", 731},
-  {"You may change all the disk params from the x menu", 732},
-  {"3,5\" floppy", 733},
-  {"Linux custom", 734},
-  {"Partition %d doesn't end on cylinder boundary\n", 735},
-  {"Partition %d overlaps with others in sectors %d-%d\n", 736},
-  {"Unused gap - sectors 0-%d\n", 737},
-  {"Unused gap - sectors %d-%d\n", 738},
+   0   custom (with hardware detected defaults)", 730},
+  {"Select type (? for auto, 0 for custom): ", 731},
+  {"Autoconfigure failed.\n", 732},
+  {"Sectors/track", 733},
+  {"Alternate cylinders", 734},
+  {"Physical cylinders", 735},
+  {"Rotation speed (rpm)", 736},
+  {"Interleave factor", 737},
+  {"Extra sectors per cylinder", 738},
+  {"You may change all the disk params from the x menu", 739},
+  {"3,5\" floppy", 740},
+  {"Linux custom", 741},
+  {"Partition %d doesn't end on cylinder boundary\n", 742},
+  {"Partition %d overlaps with others in sectors %d-%d\n", 743},
+  {"Unused gap - sectors 0-%d\n", 744},
+  {"Unused gap - sectors %d-%d\n", 745},
   {"\
 Other partitions already cover the whole disk.\n\
-Delete some/shrink them before retry.\n", 739},
+Delete some/shrink them before retry.\n", 746},
   {"\
 You haven't covered the whole disk with the 3rd partition, but your value\n\
 %d %s covers some other partition. Your entry has been changed\n\
-to %d %s\n", 740},
+to %d %s\n", 747},
   {"\
 If you want to maintain SunOS/Solaris compatibility, consider leaving this\n\
-partition as Whole disk (5), starting at 0, with %u sectors\n", 741},
+partition as Whole disk (5), starting at 0, with %u sectors\n", 748},
   {"\
 It is highly recommended that the partition at offset 0\n\
 is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n\
 there may destroy your partition table and bootblock.\n\
 Type YES if you're very sure you would like that partition\n\
-tagged with 82 (Linux swap): ", 742},
+tagged with 82 (Linux swap): ", 749},
   {"\
 \n\
 Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\
@@ -1046,1099 +1059,1126 @@ Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\
 %d extra sects/cyl, interleave %d:1\n\
 %s\n\
 Units = %s of %d * 512 bytes\n\
-\n", 743},
+\n", 750},
   {"\
 \n\
 Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n\
 Units = %s of %d * 512 bytes\n\
-\n", 744},
-  {"%*s Flag    Start       End    Blocks   Id  System\n", 745},
-  {"Number of alternate cylinders", 746},
-  {"Number of physical cylinders", 747},
-  {"FAT12", 748},
-  {"XENIX root", 749},
-  {"XENIX usr", 750},
-  {"FAT16 <32M", 751},
-  {"Extended", 752},
-  {"FAT16", 753},
-  {"HPFS/NTFS", 754},
-  {"AIX", 755},
-  {"AIX bootable", 756},
-  {"OS/2 Boot Manager", 757},
-  {"Win95 FAT32", 758},
-  {"Win95 FAT32 (LBA)", 759},
-  {"Win95 FAT16 (LBA)", 760},
-  {"Win95 Ext'd (LBA)", 761},
-  {"OPUS", 762},
-  {"Hidden FAT12", 763},
-  {"Compaq diagnostics", 764},
-  {"Hidden FAT16 <32M", 765},
-  {"Hidden FAT16", 766},
-  {"Hidden HPFS/NTFS", 767},
-  {"AST Windows swapfile", 768},
-  {"Hidden Win95 FAT32", 769},
-  {"Hidden Win95 FAT32 (LBA)", 770},
-  {"Hidden Win95 FAT16 (LBA)", 771},
-  {"NEC DOS", 772},
-  {"PartitionMagic recovery", 773},
-  {"Venix 80286", 774},
-  {"PPC PReP Boot", 775},
-  {"SFS", 776},
-  {"QNX4.x", 777},
-  {"QNX4.x 2nd part", 778},
-  {"QNX4.x 3rd part", 779},
-  {"OnTrack DM", 780},
-  {"OnTrack DM6 Aux1", 781},
-  {"CP/M", 782},
-  {"OnTrack DM6 Aux3", 783},
-  {"OnTrackDM6", 784},
-  {"EZ-Drive", 785},
-  {"Golden Bow", 786},
-  {"Priam Edisk", 787},
-  {"SpeedStor", 788},
-  {"GNU HURD or SysV", 789},
-  {"Novell Netware 286", 790},
-  {"Novell Netware 386", 791},
-  {"DiskSecure Multi-Boot", 792},
-  {"PC/IX", 793},
-  {"Old Minix", 794},
-  {"Minix / old Linux", 795},
-  {"OS/2 hidden C: drive", 796},
-  {"Linux extended", 797},
-  {"NTFS volume set", 798},
-  {"Amoeba", 799},
-  {"Amoeba BBT", 800},
-  {"BSD/OS", 801},
-  {"IBM Thinkpad hibernation", 802},
-  {"BSD/386", 803},
-  {"OpenBSD", 804},
-  {"NeXTSTEP", 805},
-  {"BSDI fs", 806},
-  {"BSDI swap", 807},
-  {"DRDOS/sec (FAT-12)", 808},
-  {"DRDOS/sec (FAT-16 < 32M)", 809},
-  {"DRDOS/sec (FAT-16)", 810},
-  {"Syrinx", 811},
-  {"CP/M / CTOS / ...", 812},
-  {"DOS access", 813},
-  {"DOS R/O", 814},
-  {"BeOS fs", 815},
-  {"DOS secondary", 816},
-  {"Linux raid autodetect", 817},
-  {"LANstep", 818},
-  {"BBT", 819},
-  {"seek error on %s - cannot seek to %lu\n", 820},
-  {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 821},
-  {"out of memory - giving up\n", 822},
-  {"read error on %s - cannot read sector %lu\n", 823},
-  {"ERROR: sector %lu does not have an msdos signature\n", 824},
-  {"write error on %s - cannot write sector %lu\n", 825},
-  {"cannot open partition sector save file (%s)\n", 826},
-  {"write error on %s\n", 827},
-  {"cannot stat partition restore file (%s)\n", 828},
-  {"partition restore file has wrong size - not restoring\n", 829},
-  {"out of memory?\n", 830},
-  {"cannot open partition restore file (%s)\n", 831},
-  {"error reading %s\n", 832},
-  {"cannot open device %s for writing\n", 833},
-  {"error writing sector %lu on %s\n", 834},
-  {"Disk %s: cannot get size\n", 835},
-  {"Disk %s: cannot get geometry\n", 836},
-  {"\
-Warning: start=%d - this looks like a partition rather than\n\
+\n", 751},
+  {"%*s Flag    Start       End    Blocks   Id  System\n", 752},
+  {"Number of alternate cylinders", 753},
+  {"Number of physical cylinders", 754},
+  {"FAT12", 755},
+  {"XENIX root", 756},
+  {"XENIX usr", 757},
+  {"FAT16 <32M", 758},
+  {"Extended", 759},
+  {"FAT16", 760},
+  {"HPFS/NTFS", 761},
+  {"AIX", 762},
+  {"AIX bootable", 763},
+  {"OS/2 Boot Manager", 764},
+  {"Win95 FAT32", 765},
+  {"Win95 FAT32 (LBA)", 766},
+  {"Win95 FAT16 (LBA)", 767},
+  {"Win95 Ext'd (LBA)", 768},
+  {"OPUS", 769},
+  {"Hidden FAT12", 770},
+  {"Compaq diagnostics", 771},
+  {"Hidden FAT16 <32M", 772},
+  {"Hidden FAT16", 773},
+  {"Hidden HPFS/NTFS", 774},
+  {"AST Windows swapfile", 775},
+  {"Hidden Win95 FAT32", 776},
+  {"Hidden Win95 FAT32 (LBA)", 777},
+  {"Hidden Win95 FAT16 (LBA)", 778},
+  {"NEC DOS", 779},
+  {"Plan 9", 780},
+  {"PartitionMagic recovery", 781},
+  {"Venix 80286", 782},
+  {"PPC PReP Boot", 783},
+  {"SFS", 784},
+  {"QNX4.x", 785},
+  {"QNX4.x 2nd part", 786},
+  {"QNX4.x 3rd part", 787},
+  {"OnTrack DM", 788},
+  {"OnTrack DM6 Aux1", 789},
+  {"CP/M", 790},
+  {"OnTrack DM6 Aux3", 791},
+  {"OnTrackDM6", 792},
+  {"EZ-Drive", 793},
+  {"Golden Bow", 794},
+  {"Priam Edisk", 795},
+  {"SpeedStor", 796},
+  {"GNU HURD or SysV", 797},
+  {"Novell Netware 286", 798},
+  {"Novell Netware 386", 799},
+  {"DiskSecure Multi-Boot", 800},
+  {"PC/IX", 801},
+  {"Old Minix", 802},
+  {"Minix / old Linux", 803},
+  {"OS/2 hidden C: drive", 804},
+  {"Linux extended", 805},
+  {"NTFS volume set", 806},
+  {"Amoeba", 807},
+  {"Amoeba BBT", 808},
+  {"BSD/OS", 809},
+  {"IBM Thinkpad hibernation", 810},
+  {"BSD/386", 811},
+  {"OpenBSD", 812},
+  {"NeXTSTEP", 813},
+  {"BSDI fs", 814},
+  {"BSDI swap", 815},
+  {"DRDOS/sec (FAT-12)", 816},
+  {"DRDOS/sec (FAT-16 < 32M)", 817},
+  {"DRDOS/sec (FAT-16)", 818},
+  {"Syrinx", 819},
+  {"Non-FS data", 820},
+  {"CP/M / CTOS / ...", 821},
+  {"DOS access", 822},
+  {"DOS R/O", 823},
+  {"BeOS fs", 824},
+  {"DOS secondary", 825},
+  {"Linux raid autodetect", 826},
+  {"LANstep", 827},
+  {"BBT", 828},
+  {"seek error on %s - cannot seek to %lu\n", 829},
+  {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 830},
+  {"out of memory - giving up\n", 831},
+  {"read error on %s - cannot read sector %lu\n", 832},
+  {"ERROR: sector %lu does not have an msdos signature\n", 833},
+  {"write error on %s - cannot write sector %lu\n", 834},
+  {"cannot open partition sector save file (%s)\n", 835},
+  {"write error on %s\n", 836},
+  {"cannot stat partition restore file (%s)\n", 837},
+  {"partition restore file has wrong size - not restoring\n", 838},
+  {"out of memory?\n", 839},
+  {"cannot open partition restore file (%s)\n", 840},
+  {"error reading %s\n", 841},
+  {"cannot open device %s for writing\n", 842},
+  {"error writing sector %lu on %s\n", 843},
+  {"Disk %s: cannot get size\n", 844},
+  {"Disk %s: cannot get geometry\n", 845},
+  {"\
+Warning: start=%lu - this looks like a partition rather than\n\
 the entire disk. Using fdisk on it is probably meaningless.\n\
-[Use the --force option if you really want this]\n", 837},
-  {"Warning: HDIO_GETGEO says that there are %d heads\n", 838},
-  {"Warning: HDIO_GETGEO says that there are %d sectors\n", 839},
-  {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n", 840},
+[Use the --force option if you really want this]\n", 846},
+  {"Warning: HDIO_GETGEO says that there are %lu heads\n", 847},
+  {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 848},
+  {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 849},
   {"\
-Warning: unlikely number of sectors (%d) - usually at most 63\n\
-This will give problems with all software that uses C/H/S addressing.\n", 841},
+Warning: unlikely number of sectors (%lu) - usually at most 63\n\
+This will give problems with all software that uses C/H/S addressing.\n", 850},
   {"\
 \n\
-Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 842},
+Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 851},
   {"\
-%s of partition %s has impossible value for head: %d (should be in 0-%d)\n", 843},
+%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 852},
   {"\
-%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n", 844},
+%s of partition %s has impossible value for sector: %lu (should be in \
+1-%lu)\n", 853},
   {"\
-%s of partition %s has impossible value for cylinders: %d (should be in \
-0-%d)\n", 845},
+%s of partition %s has impossible value for cylinders: %lu (should be in \
+0-%lu)\n", 854},
   {"\
 Id  Name\n\
-\n", 846},
-  {"Re-reading the partition table ...\n", 847},
+\n", 855},
+  {"Re-reading the partition table ...\n", 856},
   {"\
 The command to re-read the partition table failed\n\
-Reboot your system now, before using mkfs\n", 848},
-  {"Error closing %s\n", 849},
-  {"%s: no such partition\n", 850},
-  {"unrecognized format - using sectors\n", 851},
-  {"# partition table of %s\n", 852},
-  {"unimplemented format - using %s\n", 853},
+Reboot your system now, before using mkfs\n", 857},
+  {"Error closing %s\n", 858},
+  {"%s: no such partition\n", 859},
+  {"unrecognized format - using sectors\n", 860},
+  {"# partition table of %s\n", 861},
+  {"unimplemented format - using %s\n", 862},
   {"\
 Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 854},
-  {"   Device Boot Start     End   #cyls   #blocks   Id  System\n", 855},
+\n", 863},
+  {"   Device Boot Start     End   #cyls   #blocks   Id  System\n", 864},
   {"\
 Units = sectors of 512 bytes, counting from %d\n\
-\n", 856},
-  {"   Device Boot    Start       End  #sectors  Id  System\n", 857},
+\n", 865},
+  {"   Device Boot    Start       End  #sectors  Id  System\n", 866},
   {"\
 Units = blocks of 1024 bytes, counting from %d\n\
-\n", 858},
-  {"   Device Boot   Start       End   #blocks   Id  System\n", 859},
+\n", 867},
+  {"   Device Boot   Start       End   #blocks   Id  System\n", 868},
   {"\
 Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 860},
-  {"   Device Boot Start   End     MB   #blocks   Id  System\n", 861},
-  {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 862},
-  {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 863},
-  {"partition ends on cylinder %ld, beyond the end of the disk\n", 864},
-  {"No partitions found\n", 865},
+\n", 869},
+  {"   Device Boot Start   End     MB   #blocks   Id  System\n", 870},
+  {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 871},
+  {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 872},
+  {"partition ends on cylinder %ld, beyond the end of the disk\n", 873},
+  {"No partitions found\n", 874},
   {"\
 Warning: The first partition looks like it was made\n\
   for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n\
-For this listing I'll assume that geometry.\n", 866},
-  {"no partition table present.\n", 867},
-  {"strange, only %d partitions defined.\n", 868},
-  {"Warning: partition %s has size 0 but is not marked Empty\n", 869},
-  {"Warning: partition %s has size 0 and is bootable\n", 870},
-  {"Warning: partition %s has size 0 and nonzero start\n", 871},
-  {"Warning: partition %s ", 872},
-  {"is not contained in partition %s\n", 873},
-  {"Warning: partitions %s ", 874},
-  {"and %s overlap\n", 875},
-  {"Warning: partition %s contains part of ", 876},
-  {"the partition table (sector %lu),\n", 877},
-  {"and will destroy it when filled\n", 878},
-  {"Warning: partition %s starts at sector 0\n", 879},
-  {"Warning: partition %s extends past end of disk\n", 880},
-  {"Among the primary partitions, at most one can be extended\n", 881},
-  {" (although this is not a problem under Linux)\n", 882},
-  {"Warning: partition %s does not start at a cylinder boundary\n", 883},
-  {"Warning: partition %s does not end at a cylinder boundary\n", 884},
+For this listing I'll assume that geometry.\n", 875},
+  {"no partition table present.\n", 876},
+  {"strange, only %d partitions defined.\n", 877},
+  {"Warning: partition %s has size 0 but is not marked Empty\n", 878},
+  {"Warning: partition %s has size 0 and is bootable\n", 879},
+  {"Warning: partition %s has size 0 and nonzero start\n", 880},
+  {"Warning: partition %s ", 881},
+  {"is not contained in partition %s\n", 882},
+  {"Warning: partitions %s ", 883},
+  {"and %s overlap\n", 884},
+  {"Warning: partition %s contains part of ", 885},
+  {"the partition table (sector %lu),\n", 886},
+  {"and will destroy it when filled\n", 887},
+  {"Warning: partition %s starts at sector 0\n", 888},
+  {"Warning: partition %s extends past end of disk\n", 889},
+  {"Among the primary partitions, at most one can be extended\n", 890},
+  {" (although this is not a problem under Linux)\n", 891},
+  {"Warning: partition %s does not start at a cylinder boundary\n", 892},
+  {"Warning: partition %s does not end at a cylinder boundary\n", 893},
   {"\
 Warning: more than one primary partition is marked bootable (active)\n\
-This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 885},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 894},
   {"\
 Warning: usually one can boot from primary partitions only\n\
-LILO disregards the `bootable' flag.\n", 886},
+LILO disregards the `bootable' flag.\n", 895},
   {"\
 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", 887},
-  {"\
-partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 888},
-  {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 889},
-  {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 890},
-  {"Warning: shifted start of the extd partition from %ld to %ld\n", 891},
-  {"(For listing purposes only. Do not change its contents.)\n", 892},
-  {"Warning: extended partition does not start at a cylinder boundary.\n", 893},
-  {"DOS and Linux will interpret the contents differently.\n", 894},
-  {"too many partitions - ignoring those past nr (%d)\n", 895},
-  {"tree of partitions?\n", 896},
-  {"detected Disk Manager - unable to handle that\n", 897},
-  {"DM6 signature found - giving up\n", 898},
-  {"strange..., an extended partition of size 0?\n", 899},
-  {"strange..., a BSD partition of size 0?\n", 900},
-  {" %s: unrecognized partition\n", 901},
-  {"-n flag was given: Nothing changed\n", 902},
-  {"Failed saving the old sectors - aborting\n", 903},
-  {"Failed writing the partition on %s\n", 904},
-  {"long or incomplete input line - quitting\n", 905},
-  {"input error: `=' expected after %s field\n", 906},
-  {"input error: unexpected character %c after %s field\n", 907},
-  {"unrecognized input: %s\n", 908},
-  {"number too big\n", 909},
-  {"trailing junk after number\n", 910},
-  {"no room for partition descriptor\n", 911},
-  {"cannot build surrounding extended partition\n", 912},
-  {"too many input fields\n", 913},
-  {"No room for more\n", 914},
-  {"Illegal type\n", 915},
-  {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 916},
-  {"Warning: empty partition\n", 917},
-  {"Warning: bad partition start (earliest %lu)\n", 918},
-  {"unrecognized bootable flag - choose - or *\n", 919},
-  {"partial c,h,s specification?\n", 920},
-  {"Extended partition not where expected\n", 921},
-  {"bad input\n", 922},
-  {"too many partitions\n", 923},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 896},
+  {"\
+partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 897},
+  {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 898},
+  {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 899},
+  {"Warning: shifted start of the extd partition from %ld to %ld\n", 900},
+  {"(For listing purposes only. Do not change its contents.)\n", 901},
+  {"Warning: extended partition does not start at a cylinder boundary.\n", 902},
+  {"DOS and Linux will interpret the contents differently.\n", 903},
+  {"too many partitions - ignoring those past nr (%d)\n", 904},
+  {"tree of partitions?\n", 905},
+  {"detected Disk Manager - unable to handle that\n", 906},
+  {"DM6 signature found - giving up\n", 907},
+  {"strange..., an extended partition of size 0?\n", 908},
+  {"strange..., a BSD partition of size 0?\n", 909},
+  {" %s: unrecognized partition\n", 910},
+  {"-n flag was given: Nothing changed\n", 911},
+  {"Failed saving the old sectors - aborting\n", 912},
+  {"Failed writing the partition on %s\n", 913},
+  {"long or incomplete input line - quitting\n", 914},
+  {"input error: `=' expected after %s field\n", 915},
+  {"input error: unexpected character %c after %s field\n", 916},
+  {"unrecognized input: %s\n", 917},
+  {"number too big\n", 918},
+  {"trailing junk after number\n", 919},
+  {"no room for partition descriptor\n", 920},
+  {"cannot build surrounding extended partition\n", 921},
+  {"too many input fields\n", 922},
+  {"No room for more\n", 923},
+  {"Illegal type\n", 924},
+  {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 925},
+  {"Warning: empty partition\n", 926},
+  {"Warning: bad partition start (earliest %lu)\n", 927},
+  {"unrecognized bootable flag - choose - or *\n", 928},
+  {"partial c,h,s specification?\n", 929},
+  {"Extended partition not where expected\n", 930},
+  {"bad input\n", 931},
+  {"too many partitions\n", 932},
   {"\
 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", 924},
-  {"version", 925},
-  {"Usage: %s [options] device ...\n", 926},
-  {"device: something like /dev/hda or /dev/sda", 927},
-  {"useful options:", 928},
-  {"    -s [or --show-size]: list size of a partition", 929},
-  {"    -c [or --id]:        print or change partition Id", 930},
-  {"    -l [or --list]:      list partitions of each device", 931},
-  {"    -d [or --dump]:      idem, but in a format suitable for later input", 932},
-  {"    -i [or --increment]: number cylinders etc. from 1 instead of from 0", 933},
+Usually you only need to specify <start> and <size> (and perhaps <type>).\n", 933},
+  {"version", 934},
+  {"Usage: %s [options] device ...\n", 935},
+  {"device: something like /dev/hda or /dev/sda", 936},
+  {"useful options:", 937},
+  {"    -s [or --show-size]: list size of a partition", 938},
+  {"    -c [or --id]:        print or change partition Id", 939},
+  {"    -l [or --list]:      list partitions of each device", 940},
+  {"    -d [or --dump]:      idem, but in a format suitable for later input", 941},
+  {"    -i [or --increment]: number cylinders etc. from 1 instead of from 0", 942},
   {"\
     -uS, -uB, -uC, -uM:  accept/report in units of \
-sectors/blocks/cylinders/MB", 934},
-  {"    -T [or --list-types]:list the known partition types", 935},
-  {"    -D [or --DOS]:       for DOS-compatibility: waste a little space", 936},
-  {"    -R [or --re-read]:   make kernel reread partition table", 937},
-  {"    -N# :                change only the partition with number #", 938},
-  {"    -n :                 do not actually write to disk", 939},
-  {"\
-    -O file :            save the sectors that will be overwritten to file", 940},
-  {"    -I file :            restore these sectors again", 941},
-  {"    -v [or --version]:   print version", 942},
-  {"    -? [or --help]:      print this message", 943},
-  {"dangerous options:", 944},
-  {"    -g [or --show-geometry]: print the kernel's idea of the geometry", 945},
+sectors/blocks/cylinders/MB", 943},
+  {"    -T [or --list-types]:list the known partition types", 944},
+  {"    -D [or --DOS]:       for DOS-compatibility: waste a little space", 945},
+  {"    -R [or --re-read]:   make kernel reread partition table", 946},
+  {"    -N# :                change only the partition with number #", 947},
+  {"    -n :                 do not actually write to disk", 948},
+  {"\
+    -O file :            save the sectors that will be overwritten to file", 949},
+  {"    -I file :            restore these sectors again", 950},
+  {"    -v [or --version]:   print version", 951},
+  {"    -? [or --help]:      print this message", 952},
+  {"dangerous options:", 953},
+  {"    -g [or --show-geometry]: print the kernel's idea of the geometry", 954},
   {"\
     -x [or --show-extended]: also list extended partitions on output\n\
-                             or expect descriptors for them on input", 946},
-  {"\
-    -L  [or --Linux]:      do not complain about things irrelevant for Linux", 947},
-  {"    -q  [or --quiet]:      suppress warning messages", 948},
-  {"    You can override the detected geometry using:", 949},
-  {"    -C# [or --cylinders #]:set the number of cylinders to use", 950},
-  {"    -H# [or --heads #]:    set the number of heads to use", 951},
-  {"    -S# [or --sectors #]:  set the number of sectors to use", 952},
-  {"You can disable all consistency checking with:", 953},
-  {"    -f  [or --force]:      do what I say, even if it is stupid", 954},
-  {"Usage:", 955},
-  {"%s device\t\t list active partitions on device\n", 956},
-  {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 957},
-  {"%s -An device\t activate partition n, inactivate the other ones\n", 958},
-  {"no command?\n", 959},
-  {"total: %d blocks\n", 960},
-  {"usage: sfdisk --print-id device partition-number\n", 961},
-  {"usage: sfdisk --change-id device partition-number Id\n", 962},
-  {"usage: sfdisk --id device partition-number [Id]\n", 963},
-  {"can specify only one device (except with -l or -s)\n", 964},
-  {"cannot open %s %s\n", 965},
-  {"read-write", 966},
-  {"for reading", 967},
-  {"%s: OK\n", 968},
-  {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 969},
-  {"BLKGETSIZE ioctl failed for %s\n", 970},
-  {"bad active byte: 0x%x instead of 0x80\n", 971},
+                             or expect descriptors for them on input", 955},
+  {"\
+    -L  [or --Linux]:      do not complain about things irrelevant for Linux", 956},
+  {"    -q  [or --quiet]:      suppress warning messages", 957},
+  {"    You can override the detected geometry using:", 958},
+  {"    -C# [or --cylinders #]:set the number of cylinders to use", 959},
+  {"    -H# [or --heads #]:    set the number of heads to use", 960},
+  {"    -S# [or --sectors #]:  set the number of sectors to use", 961},
+  {"You can disable all consistency checking with:", 962},
+  {"    -f  [or --force]:      do what I say, even if it is stupid", 963},
+  {"Usage:", 964},
+  {"%s device\t\t list active partitions on device\n", 965},
+  {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 966},
+  {"%s -An device\t activate partition n, inactivate the other ones\n", 967},
+  {"no command?\n", 968},
+  {"total: %d blocks\n", 969},
+  {"usage: sfdisk --print-id device partition-number\n", 970},
+  {"usage: sfdisk --change-id device partition-number Id\n", 971},
+  {"usage: sfdisk --id device partition-number [Id]\n", 972},
+  {"can specify only one device (except with -l or -s)\n", 973},
+  {"cannot open %s %s\n", 974},
+  {"read-write", 975},
+  {"for reading", 976},
+  {"%s: OK\n", 977},
+  {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 978},
+  {"BLKGETSIZE ioctl failed for %s\n", 979},
+  {"bad active byte: 0x%x instead of 0x80\n", 980},
   {"\
 Done\n\
-\n", 972},
+\n", 981},
   {"\
 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", 973},
-  {"partition %s has id %x and is not hidden\n", 974},
-  {"Bad Id %x\n", 975},
-  {"This disk is currently in use.\n", 976},
-  {"Fatal error: cannot find %s\n", 977},
-  {"Warning: %s is not a block device\n", 978},
-  {"Checking that no-one is using this disk right now ...\n", 979},
+but the DOS MBR will only boot a disk with 1 active partition.\n", 982},
+  {"partition %s has id %x and is not hidden\n", 983},
+  {"Bad Id %lx\n", 984},
+  {"This disk is currently in use.\n", 985},
+  {"Fatal error: cannot find %s\n", 986},
+  {"Warning: %s is not a block device\n", 987},
+  {"Checking that no-one is using this disk right now ...\n", 988},
   {"\
 \n\
 This disk is currently in use - repartitioning is probably a bad idea.\n\
 Umount all file systems, and swapoff all swap partitions on this disk.\n\
-Use the --no-reread flag to suppress this check.\n", 980},
-  {"Use the --force flag to overrule all checks.\n", 981},
-  {"OK\n", 982},
-  {"Old situation:\n", 983},
-  {"Partition %d does not exist, cannot change it\n", 984},
-  {"New situation:\n", 985},
+Use the --no-reread flag to suppress this check.\n", 989},
+  {"Use the --force flag to overrule all checks.\n", 990},
+  {"OK\n", 991},
+  {"Old situation:\n", 992},
+  {"Partition %d does not exist, cannot change it\n", 993},
+  {"New situation:\n", 994},
   {"\
 I don't like these partitions - nothing changed.\n\
-(If you really want this, use the --force option.)\n", 986},
-  {"I don't like this - probably you should answer No\n", 987},
-  {"Are you satisfied with this? [ynq] ", 988},
-  {"Do you want to write this to disk? [ynq] ", 989},
+(If you really want this, use the --force option.)\n", 995},
+  {"I don't like this - probably you should answer No\n", 996},
+  {"Are you satisfied with this? [ynq] ", 997},
+  {"Do you want to write this to disk? [ynq] ", 998},
   {"\
 \n\
-sfdisk: premature end of input\n", 990},
-  {"Quitting - nothing changed\n", 991},
-  {"Please answer one of y,n,q\n", 992},
+sfdisk: premature end of input\n", 999},
+  {"Quitting - nothing changed\n", 1000},
+  {"Please answer one of y,n,q\n", 1001},
   {"\
 Successfully wrote the new partition table\n\
-\n", 993},
+\n", 1002},
   {"\
 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", 994},
-  {"usage: banner [-w width]\n", 995},
-  {"Message: ", 996},
-  {"The character '%c' is not in my character set", 997},
-  {"Message '%s' is OK\n", 998},
-  {"Try `getopt --help' for more information.\n", 999},
-  {"empty long option after -l or --long argument", 1000},
-  {"unknown shell after -s or --shell argument", 1001},
-  {"Usage: getopt optstring parameters\n", 1002},
-  {"       getopt [options] [--] optstring parameters\n", 1003},
-  {"       getopt [options] -o|--options optstring [options] [--]\n", 1004},
-  {"              parameters\n", 1005},
-  {"\
-  -a, --alternative            Allow long options starting with single -\n", 1006},
-  {"  -h, --help                   This small usage guide\n", 1007},
-  {"  -l, --longoptions=longopts   Long options to be recognized\n", 1008},
-  {"\
-  -n, --name=progname          The name under which errors are reported\n", 1009},
-  {"  -o, --options=optstring      Short options to be recognized\n", 1010},
-  {"  -q, --quiet                  Disable error reporting by getopt(3)\n", 1011},
-  {"  -Q, --quiet-output           No normal output\n", 1012},
-  {"  -s, --shell=shell            Set shell quoting conventions\n", 1013},
-  {"  -T, --test                   Test for getopt(1) version\n", 1014},
-  {"  -V, --version                Output version information\n", 1015},
-  {"missing optstring argument", 1016},
-  {"getopt (enhanced) 1.0.3\n", 1017},
-  {"internal error, contact the author.", 1018},
-  {"calling open_tty\n", 1019},
-  {"calling termio_init\n", 1020},
-  {"writing init string\n", 1021},
-  {"before autobaud\n", 1022},
-  {"waiting for cr-lf\n", 1023},
-  {"read %c\n", 1024},
-  {"reading login name\n", 1025},
-  {"%s: can't exec %s: %m", 1026},
-  {"can't malloc initstring", 1027},
-  {"bad timeout value: %s", 1028},
-  {"after getopt loop\n", 1029},
-  {"exiting parseargs\n", 1030},
-  {"entered parse_speeds\n", 1031},
-  {"bad speed: %s", 1032},
-  {"too many alternate speeds", 1033},
-  {"exiting parsespeeds\n", 1034},
-  {"%s: open for update: %m", 1035},
-  {"%s: no utmp entry", 1036},
-  {"/dev: chdir() failed: %m", 1037},
-  {"/dev/%s: not a character device", 1038},
-  {"open(2)\n", 1039},
-  {"/dev/%s: cannot open as standard input: %m", 1040},
-  {"%s: not open for read/write", 1041},
-  {"duping\n", 1042},
-  {"%s: dup problem: %m", 1043},
-  {"term_io 2\n", 1044},
-  {"user", 1045},
-  {"users", 1046},
-  {"%s: read: %m", 1047},
-  {"%s: input overrun", 1048},
+(See fdisk(8).)\n", 1003},
+  {"usage: banner [-w width]\n", 1004},
+  {"Message: ", 1005},
+  {"The character '%c' is not in my character set", 1006},
+  {"Message '%s' is OK\n", 1007},
+  {"Try `getopt --help' for more information.\n", 1008},
+  {"empty long option after -l or --long argument", 1009},
+  {"unknown shell after -s or --shell argument", 1010},
+  {"Usage: getopt optstring parameters\n", 1011},
+  {"       getopt [options] [--] optstring parameters\n", 1012},
+  {"       getopt [options] -o|--options optstring [options] [--]\n", 1013},
+  {"              parameters\n", 1014},
+  {"\
+  -a, --alternative            Allow long options starting with single -\n", 1015},
+  {"  -h, --help                   This small usage guide\n", 1016},
+  {"  -l, --longoptions=longopts   Long options to be recognized\n", 1017},
+  {"\
+  -n, --name=progname          The name under which errors are reported\n", 1018},
+  {"  -o, --options=optstring      Short options to be recognized\n", 1019},
+  {"  -q, --quiet                  Disable error reporting by getopt(3)\n", 1020},
+  {"  -Q, --quiet-output           No normal output\n", 1021},
+  {"  -s, --shell=shell            Set shell quoting conventions\n", 1022},
+  {"  -T, --test                   Test for getopt(1) version\n", 1023},
+  {"  -u, --unqote                 Do not quote the output\n", 1024},
+  {"  -V, --version                Output version information\n", 1025},
+  {"missing optstring argument", 1026},
+  {"getopt (enhanced) 1.1.0\n", 1027},
+  {"internal error, contact the author.", 1028},
+  {"calling open_tty\n", 1029},
+  {"calling termio_init\n", 1030},
+  {"writing init string\n", 1031},
+  {"before autobaud\n", 1032},
+  {"waiting for cr-lf\n", 1033},
+  {"read %c\n", 1034},
+  {"reading login name\n", 1035},
+  {"%s: can't exec %s: %m", 1036},
+  {"can't malloc initstring", 1037},
+  {"bad timeout value: %s", 1038},
+  {"after getopt loop\n", 1039},
+  {"exiting parseargs\n", 1040},
+  {"entered parse_speeds\n", 1041},
+  {"bad speed: %s", 1042},
+  {"too many alternate speeds", 1043},
+  {"exiting parsespeeds\n", 1044},
+  {"%s: open for update: %m", 1045},
+  {"%s: no utmp entry", 1046},
+  {"/dev: chdir() failed: %m", 1047},
+  {"/dev/%s: not a character device", 1048},
+  {"open(2)\n", 1049},
+  {"/dev/%s: cannot open as standard input: %m", 1050},
+  {"%s: not open for read/write", 1051},
+  {"duping\n", 1052},
+  {"%s: dup problem: %m", 1053},
+  {"term_io 2\n", 1054},
+  {"user", 1055},
+  {"users", 1056},
+  {"%s: read: %m", 1057},
+  {"%s: input overrun", 1058},
   {"\
 Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H \
 login_host] baud_rate,... line [termtype]\n\
 or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] \
-line baud_rate,... [termtype]\n", 1049},
-  {"badlogin: %s\n", 1050},
-  {"sleepexit %d\n", 1051},
-  {"login: memory low, login may fail\n", 1052},
-  {"can't malloc for ttyclass", 1053},
-  {"can't malloc for grplist", 1054},
-  {"Login on %s from %s denied by default.\n", 1055},
-  {"Login on %s from %s denied.\n", 1056},
-  {"%s: you (user %d) don't exist.\n", 1057},
-  {"%s: user \"%s\" does not exist.\n", 1058},
-  {"%s: can only change local entries; use yp%s instead.\n", 1059},
-  {"Changing finger information for %s.\n", 1060},
-  {"Password error.", 1061},
-  {"Password: ", 1062},
-  {"Incorrect password.", 1063},
-  {"Finger information not changed.\n", 1064},
-  {"Usage: %s [ -f full-name ] [ -o office ] ", 1065},
+line baud_rate,... [termtype]\n", 1059},
+  {"login: memory low, login may fail\n", 1060},
+  {"can't malloc for ttyclass", 1061},
+  {"can't malloc for grplist", 1062},
+  {"Login on %s from %s denied by default.\n", 1063},
+  {"Login on %s from %s denied.\n", 1064},
+  {"%s: you (user %d) don't exist.\n", 1065},
+  {"%s: user \"%s\" does not exist.\n", 1066},
+  {"%s: can only change local entries; use yp%s instead.\n", 1067},
+  {"Changing finger information for %s.\n", 1068},
+  {"Password error.", 1069},
+  {"Password: ", 1070},
+  {"Incorrect password.", 1071},
+  {"Finger information not changed.\n", 1072},
+  {"Usage: %s [ -f full-name ] [ -o office ] ", 1073},
   {"\
 [ -p office-phone ]\n\
-\t[ -h home-phone ] ", 1066},
-  {"[ --help ] [ --version ]\n", 1067},
+\t[ -h home-phone ] ", 1074},
+  {"[ --help ] [ --version ]\n", 1075},
   {"\
 \n\
-Aborted.\n", 1068},
-  {"field is too long.\n", 1069},
-  {"'%c' is not allowed.\n", 1070},
-  {"Control characters are not allowed.\n", 1071},
-  {"Finger information *NOT* changed.  Try again later.\n", 1072},
-  {"Finger information changed.\n", 1073},
-  {"malloc failed", 1074},
-  {"%s: Your shell is not in /etc/shells, shell change denied\n", 1075},
-  {"Changing shell for %s.\n", 1076},
-  {"New shell", 1077},
-  {"Shell not changed.\n", 1078},
-  {"Shell *NOT* changed.  Try again later.\n", 1079},
-  {"Shell changed.\n", 1080},
-  {"Usage: %s [ -s shell ] ", 1081},
-  {"[ --list-shells ] [ --help ] [ --version ]\n", 1082},
-  {"       [ username ]\n", 1083},
-  {"%s: shell must be a full path name.\n", 1084},
-  {"%s: \"%s\" does not exist.\n", 1085},
-  {"%s: \"%s\" is not executable.\n", 1086},
-  {"%s: '%c' is not allowed.\n", 1087},
-  {"%s: Control characters are not allowed.\n", 1088},
-  {"Warning: \"%s\" is not listed in /etc/shells\n", 1089},
-  {"%s: \"%s\" is not listed in /etc/shells.\n", 1090},
-  {"%s: use -l option to see list\n", 1091},
-  {"Warning: \"%s\" is not listed in /etc/shells.\n", 1092},
-  {"Use %s -l to see list.\n", 1093},
-  {"No known shells.\n", 1094},
-  {"couldn't open /dev/urandom", 1095},
-  {"couldn't read random data from /dev/urandom", 1096},
-  {"can't open %s for reading", 1097},
-  {"can't stat(%s)", 1098},
-  {"%s doesn't have the correct filemodes", 1099},
-  {"can't read data from %s", 1100},
-  {"Can't read %s, exiting.", 1101},
-  {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1102},
-  {"  still logged in", 1103},
+Aborted.\n", 1076},
+  {"field is too long.\n", 1077},
+  {"'%c' is not allowed.\n", 1078},
+  {"Control characters are not allowed.\n", 1079},
+  {"Finger information *NOT* changed.  Try again later.\n", 1080},
+  {"Finger information changed.\n", 1081},
+  {"malloc failed", 1082},
+  {"%s: Your shell is not in /etc/shells, shell change denied\n", 1083},
+  {"Changing shell for %s.\n", 1084},
+  {"New shell", 1085},
+  {"Shell not changed.\n", 1086},
+  {"Shell *NOT* changed.  Try again later.\n", 1087},
+  {"Shell changed.\n", 1088},
+  {"Usage: %s [ -s shell ] ", 1089},
+  {"[ --list-shells ] [ --help ] [ --version ]\n", 1090},
+  {"       [ username ]\n", 1091},
+  {"%s: shell must be a full path name.\n", 1092},
+  {"%s: \"%s\" does not exist.\n", 1093},
+  {"%s: \"%s\" is not executable.\n", 1094},
+  {"%s: '%c' is not allowed.\n", 1095},
+  {"%s: Control characters are not allowed.\n", 1096},
+  {"Warning: \"%s\" is not listed in /etc/shells\n", 1097},
+  {"%s: \"%s\" is not listed in /etc/shells.\n", 1098},
+  {"%s: use -l option to see list\n", 1099},
+  {"Warning: \"%s\" is not listed in /etc/shells.\n", 1100},
+  {"Use %s -l to see list.\n", 1101},
+  {"No known shells.\n", 1102},
+  {"couldn't open /dev/urandom", 1103},
+  {"couldn't read random data from /dev/urandom", 1104},
+  {"can't open %s for reading", 1105},
+  {"can't stat(%s)", 1106},
+  {"%s doesn't have the correct filemodes", 1107},
+  {"can't read data from %s", 1108},
+  {"Can't read %s, exiting.", 1109},
+  {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1110},
+  {"  still logged in", 1111},
   {"\
 \n\
-wtmp begins %s", 1104},
-  {"last: malloc failure.\n", 1105},
-  {"last: gethostname", 1106},
+wtmp begins %s", 1112},
+  {"last: malloc failure.\n", 1113},
+  {"last: gethostname", 1114},
   {"\
 \n\
-interrupted %10.10s %5.5s \n", 1107},
-  {"login: -h for super-user only.\n", 1108},
-  {"usage: login [-fp] [username]\n", 1109},
-  {"login: PAM Failure, aborting: %s\n", 1110},
-  {"Couldn't initialize PAM: %s", 1111},
-  {"login: ", 1112},
-  {"FAILED LOGIN %d FROM %s FOR %s, %s", 1113},
+interrupted %10.10s %5.5s \n", 1115},
+  {"login: -h for super-user only.\n", 1116},
+  {"usage: login [-fp] [username]\n", 1117},
+  {"login: PAM Failure, aborting: %s\n", 1118},
+  {"Couldn't initialize PAM: %s", 1119},
+  {"login: ", 1120},
+  {"FAILED LOGIN %d FROM %s FOR %s, %s", 1121},
   {"\
 Login incorrect\n\
-\n", 1114},
-  {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1115},
-  {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1116},
+\n", 1122},
+  {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1123},
+  {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1124},
   {"\
 \n\
-Login incorrect\n", 1117},
-  {"Illegal username", 1118},
-  {"%s login refused on this terminal.\n", 1119},
-  {"LOGIN %s REFUSED FROM %s ON TTY %s", 1120},
-  {"LOGIN %s REFUSED ON TTY %s", 1121},
-  {"Login incorrect\n", 1122},
+Login incorrect\n", 1125},
+  {"Illegal username", 1126},
+  {"%s login refused on this terminal.\n", 1127},
+  {"LOGIN %s REFUSED FROM %s ON TTY %s", 1128},
+  {"LOGIN %s REFUSED ON TTY %s", 1129},
+  {"Login incorrect\n", 1130},
   {"\
 Too many users logged on already.\n\
-Try again later.\n", 1123},
-  {"You have too many processes running.\n", 1124},
-  {"Warning: no Kerberos tickets issued\n", 1125},
-  {"Sorry -- your password has expired.\n", 1126},
-  {"Warning: your password expires on %s %d, %d\n", 1127},
-  {"Sorry -- your account has expired.\n", 1128},
-  {"Warning: your account expires on %s %d, %d\n", 1129},
-  {"DIALUP AT %s BY %s", 1130},
-  {"ROOT LOGIN ON %s FROM %s", 1131},
-  {"ROOT LOGIN ON %s", 1132},
-  {"LOGIN ON %s BY %s FROM %s", 1133},
-  {"LOGIN ON %s BY %s", 1134},
-  {"You have %smail.\n", 1135},
-  {"new ", 1136},
-  {"login: failure forking: %s", 1137},
-  {"setuid() failed", 1138},
-  {"No directory %s!\n", 1139},
-  {"Logging in with home = \"/\".\n", 1140},
-  {"login: no memory for shell script.\n", 1141},
-  {"login: couldn't exec shell script: %s.\n", 1142},
-  {"login: no shell: %s.\n", 1143},
+Try again later.\n", 1131},
+  {"You have too many processes running.\n", 1132},
+  {"Warning: no Kerberos tickets issued\n", 1133},
+  {"Sorry -- your password has expired.\n", 1134},
+  {"Warning: your password expires on %d %s %d.\n", 1135},
+  {"Sorry -- your account has expired.\n", 1136},
+  {"Warning: your account expires on %d %s %d.\n", 1137},
+  {"DIALUP AT %s BY %s", 1138},
+  {"ROOT LOGIN ON %s FROM %s", 1139},
+  {"ROOT LOGIN ON %s", 1140},
+  {"LOGIN ON %s BY %s FROM %s", 1141},
+  {"LOGIN ON %s BY %s", 1142},
+  {"You have %smail.\n", 1143},
+  {"new ", 1144},
+  {"login: failure forking: %s", 1145},
+  {"setuid() failed", 1146},
+  {"No directory %s!\n", 1147},
+  {"Logging in with home = \"/\".\n", 1148},
+  {"login: no memory for shell script.\n", 1149},
+  {"login: couldn't exec shell script: %s.\n", 1150},
+  {"login: no shell: %s.\n", 1151},
   {"\
 \n\
-%s login: ", 1144},
-  {"login name much too long.\n", 1145},
-  {"NAME too long", 1146},
-  {"login names may not start with '-'.\n", 1147},
-  {"too many bare linefeeds.\n", 1148},
-  {"EXCESSIVE linefeeds", 1149},
-  {"Login timed out after %d seconds\n", 1150},
-  {"Last login: %.*s ", 1151},
-  {"from %.*s\n", 1152},
-  {"on %.*s\n", 1153},
-  {"LOGIN FAILURE FROM %s, %s", 1154},
-  {"LOGIN FAILURE ON %s, %s", 1155},
-  {"%d LOGIN FAILURES FROM %s, %s", 1156},
-  {"%d LOGIN FAILURES ON %s, %s", 1157},
-  {"is y\n", 1158},
-  {"is n\n", 1159},
-  {"usage: mesg [y | n]\n", 1160},
-  {"newgrp: Who are you?", 1161},
-  {"newgrp: setgid", 1162},
-  {"newgrp: No such group.", 1163},
-  {"newgrp: Permission denied", 1164},
-  {"newgrp: setuid", 1165},
-  {"No shell", 1166},
-  {"The password must have at least 6 characters, try again.\n", 1167},
-  {"The password must contain characters out of two of the following\n", 1168},
-  {"classes:  upper and lower case letters, digits and non alphanumeric\n", 1169},
-  {"characters. See passwd(1) for more information.\n", 1170},
-  {"You cannot reuse the old password.\n", 1171},
-  {"Please don't use something like your username as password!\n", 1172},
-  {"Please don't use something like your realname as password!\n", 1173},
-  {"Usage: passwd [username [password]]\n", 1174},
-  {"Only root may use the one and two argument forms.\n", 1175},
-  {"Usage: passwd [-foqsvV] [user [password]]\n", 1176},
-  {"Can't exec %s: %s\n", 1177},
-  {"Cannot find login name", 1178},
-  {"Only root can change the password for others.\n", 1179},
-  {"Too many arguments.\n", 1180},
-  {"Can't find username anywhere. Is `%s' really a user?", 1181},
-  {"Sorry, I can only change local passwords. Use yppasswd instead.", 1182},
-  {"UID and username does not match, imposter!", 1183},
-  {"Changing password for %s\n", 1184},
-  {"Enter old password: ", 1185},
-  {"Illegal password, imposter.", 1186},
-  {"Enter new password: ", 1187},
-  {"Password not changed.", 1188},
-  {"Re-type new password: ", 1189},
-  {"You misspelled it. Password not changed.", 1190},
-  {"password changed, user %s", 1191},
-  {"ROOT PASSWORD CHANGED", 1192},
-  {"password changed by root, user %s", 1193},
-  {"calling setpwnam to set password.\n", 1194},
-  {"Password *NOT* changed.  Try again later.\n", 1195},
-  {"Password changed.\n", 1196},
-  {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1197},
-  {"Shutdown process aborted", 1198},
-  {"%s: Only root can shut a system down.\n", 1199},
-  {"That must be tomorrow, can't you wait till then?\n", 1200},
-  {"for maintenance; bounce, bounce", 1201},
-  {"timeout = %d, quiet = %d, reboot = %d\n", 1202},
-  {"The system is being shut down within 5 minutes", 1203},
-  {"Login is therefore prohibited.", 1204},
-  {"%s by %s: %s", 1205},
-  {"rebooted", 1206},
-  {"halted", 1207},
+%s login: ", 1152},
+  {"login name much too long.\n", 1153},
+  {"NAME too long", 1154},
+  {"login names may not start with '-'.\n", 1155},
+  {"too many bare linefeeds.\n", 1156},
+  {"EXCESSIVE linefeeds", 1157},
+  {"Login timed out after %d seconds\n", 1158},
+  {"Last login: %.*s ", 1159},
+  {"from %.*s\n", 1160},
+  {"on %.*s\n", 1161},
+  {"LOGIN FAILURE FROM %s, %s", 1162},
+  {"LOGIN FAILURE ON %s, %s", 1163},
+  {"%d LOGIN FAILURES FROM %s, %s", 1164},
+  {"%d LOGIN FAILURES ON %s, %s", 1165},
+  {"is y\n", 1166},
+  {"is n\n", 1167},
+  {"usage: mesg [y | n]\n", 1168},
+  {"newgrp: Who are you?", 1169},
+  {"newgrp: setgid", 1170},
+  {"newgrp: No such group.", 1171},
+  {"newgrp: Permission denied", 1172},
+  {"newgrp: setuid", 1173},
+  {"No shell", 1174},
+  {"The password must have at least 6 characters, try again.\n", 1175},
+  {"The password must contain characters out of two of the following\n", 1176},
+  {"classes:  upper and lower case letters, digits and non alphanumeric\n", 1177},
+  {"characters. See passwd(1) for more information.\n", 1178},
+  {"You cannot reuse the old password.\n", 1179},
+  {"Please don't use something like your username as password!\n", 1180},
+  {"Please don't use something like your realname as password!\n", 1181},
+  {"Usage: passwd [username [password]]\n", 1182},
+  {"Only root may use the one and two argument forms.\n", 1183},
+  {"Usage: passwd [-foqsvV] [user [password]]\n", 1184},
+  {"Can't exec %s: %s\n", 1185},
+  {"Cannot find login name", 1186},
+  {"Only root can change the password for others.\n", 1187},
+  {"Too many arguments.\n", 1188},
+  {"Can't find username anywhere. Is `%s' really a user?", 1189},
+  {"Sorry, I can only change local passwords. Use yppasswd instead.", 1190},
+  {"UID and username does not match, imposter!", 1191},
+  {"Changing password for %s\n", 1192},
+  {"Enter old password: ", 1193},
+  {"Illegal password, imposter.", 1194},
+  {"Enter new password: ", 1195},
+  {"Password not changed.", 1196},
+  {"Re-type new password: ", 1197},
+  {"You misspelled it. Password not changed.", 1198},
+  {"password changed, user %s", 1199},
+  {"ROOT PASSWORD CHANGED", 1200},
+  {"password changed by root, user %s", 1201},
+  {"calling setpwnam to set password.\n", 1202},
+  {"Password *NOT* changed.  Try again later.\n", 1203},
+  {"Password changed.\n", 1204},
+  {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1205},
+  {"Shutdown process aborted", 1206},
+  {"%s: Only root can shut a system down.\n", 1207},
+  {"That must be tomorrow, can't you wait till then?\n", 1208},
+  {"for maintenance; bounce, bounce", 1209},
+  {"timeout = %d, quiet = %d, reboot = %d\n", 1210},
+  {"The system is being shut down within 5 minutes", 1211},
+  {"Login is therefore prohibited.", 1212},
+  {"%s by %s: %s", 1213},
+  {"rebooted", 1214},
+  {"halted", 1215},
   {"\
 \n\
-Why am I still alive after reboot?", 1208},
+Why am I still alive after reboot?", 1216},
   {"\
 \n\
-Now you can turn off the power...", 1209},
-  {"Calling kernel power-off facility...\n", 1210},
-  {"Error powering off\t%s\n", 1211},
-  {"Executing the program \"%s\" ...\n", 1212},
-  {"Error executing\t%s\n", 1213},
-  {"URGENT: broadcast message from %s:", 1214},
-  {"System going down IMMEDIATELY!\n", 1215},
-  {"System going down in %d hour%s %d minutes", 1216},
-  {"s", 1217},
-  {"System going down in %d minute%s\n", 1218},
-  {"\t... %s ...\n", 1219},
-  {"Cannot fork for swapoff. Shrug!", 1220},
-  {"Cannot exec swapoff, hoping umount will do the trick.", 1221},
-  {"Cannot fork for umount, trying manually.", 1222},
-  {"Cannot exec %s, trying umount.\n", 1223},
-  {"Cannot exec umount, giving up on umount.", 1224},
-  {"Unmounting any remaining filesystems...", 1225},
-  {"shutdown: Couldn't umount %s\n", 1226},
-  {"Booting to single user mode.\n", 1227},
-  {"exec of single user shell failed\n", 1228},
-  {"fork of single user shell failed\n", 1229},
-  {"error opening fifo\n", 1230},
+Now you can turn off the power...", 1217},
+  {"Calling kernel power-off facility...\n", 1218},
+  {"Error powering off\t%s\n", 1219},
+  {"Executing the program \"%s\" ...\n", 1220},
+  {"Error executing\t%s\n", 1221},
+  {"URGENT: broadcast message from %s:", 1222},
+  {"System going down in %d hours %d minutes", 1223},
+  {"System going down in 1 hour %d minutes", 1224},
+  {"System going down in %d minutes\n", 1225},
+  {"System going down in 1 minute\n", 1226},
+  {"System going down IMMEDIATELY!\n", 1227},
+  {"\t... %s ...\n", 1228},
+  {"Cannot fork for swapoff. Shrug!", 1229},
+  {"Cannot exec swapoff, hoping umount will do the trick.", 1230},
+  {"Cannot fork for umount, trying manually.", 1231},
+  {"Cannot exec %s, trying umount.\n", 1232},
+  {"Cannot exec umount, giving up on umount.", 1233},
+  {"Unmounting any remaining filesystems...", 1234},
+  {"shutdown: Couldn't umount %s: %s\n", 1235},
+  {"Booting to single user mode.\n", 1236},
+  {"exec of single user shell failed\n", 1237},
+  {"fork of single user shell failed\n", 1238},
+  {"error opening fifo\n", 1239},
+  {"error running finalprog\n", 1240},
+  {"error forking finalprog\n", 1241},
   {"\
 \n\
-Wrong password.\n", 1231},
-  {"stat of path failed\n", 1232},
-  {"open of directory failed\n", 1233},
-  {"fork failed\n", 1234},
-  {"exec failed\n", 1235},
-  {"cannot open inittab\n", 1236},
-  {"no TERM or cannot stat tty\n", 1237},
-  {"error running programme\n", 1238},
-  {"too many iov's (change code in wall/ttymsg.c)", 1239},
-  {"excessively long line arg", 1240},
-  {"cannot fork", 1241},
-  {"fork: %s", 1242},
-  {"%s: BAD ERROR", 1243},
-  {"%s: the %s file is busy.\n", 1244},
-  {"%s: the %s file is busy (%s present)\n", 1245},
-  {"%s: can't link %s: %s\n", 1246},
-  {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1247},
-  {"%s: Cannot fork\n", 1248},
-  {"%s: %s unchanged\n", 1249},
-  {"%s: no changes made\n", 1250},
-  {"usage: %s [file]\n", 1251},
-  {"%s: can't open temporary file.\n", 1252},
-  {"Broadcast Message from %s@%s", 1253},
-  {"%s: can't read %s.\n", 1254},
-  {"%s: can't stat temporary file.\n", 1255},
-  {"%s: can't read temporary file.\n", 1256},
-  {"illegal month value: use 1-12", 1257},
-  {"illegal year value: use 1-9999", 1258},
-  {"usage: cal [-mjyV] [[month] year]\n", 1259},
-  {"usage: %s [+format] [day month year]\n", 1260},
-  {"St. Tib's Day", 1261},
-  {"%s: unknown signal %s\n", 1262},
-  {"%s: can't find process \"%s\"\n", 1263},
-  {"%s: unknown signal %s; valid signals:\n", 1264},
-  {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1265},
-  {"       %s -l [ signal ]\n", 1266},
-  {"logger: %s: %s.\n", 1267},
-  {"logger: unknown facility name: %s.\n", 1268},
-  {"logger: unknown priority name: %s.\n", 1269},
-  {"\
-usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1270},
-  {"usage: look [-dfa] [-t char] string [file]\n", 1271},
-  {"Could not open %s\n", 1272},
-  {"Got %d bytes from %s\n", 1273},
-  {"namei: unable to get current directory - %s\n", 1274},
-  {"namei: unable to chdir to %s - %s (%d)\n", 1275},
-  {"usage: namei [-mx] pathname [pathname ...]\n", 1276},
-  {"namei: could not chdir to root!\n", 1277},
-  {"namei: could not stat root!\n", 1278},
-  {" ? could not chdir into %s - %s (%d)\n", 1279},
-  {" ? problems reading symlink %s - %s (%d)\n", 1280},
-  {"  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1281},
-  {"namei: unknown file type 0%06o on file %s\n", 1282},
-  {"usage: script [-a] [file]\n", 1283},
-  {"Script started, file is %s\n", 1284},
-  {"Script started on %s", 1285},
+Wrong password.\n", 1242},
+  {"stat of path failed\n", 1243},
+  {"open of directory failed\n", 1244},
+  {"fork failed\n", 1245},
+  {"exec failed\n", 1246},
+  {"cannot open inittab\n", 1247},
+  {"no TERM or cannot stat tty\n", 1248},
+  {"error running programme\n", 1249},
+  {"too many iov's (change code in wall/ttymsg.c)", 1250},
+  {"excessively long line arg", 1251},
+  {"cannot fork", 1252},
+  {"fork: %s", 1253},
+  {"%s: BAD ERROR", 1254},
+  {"%s: the %s file is busy.\n", 1255},
+  {"%s: the %s file is busy (%s present)\n", 1256},
+  {"%s: can't link %s: %s\n", 1257},
+  {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1258},
+  {"%s: Cannot fork\n", 1259},
+  {"%s: %s unchanged\n", 1260},
+  {"%s: no changes made\n", 1261},
+  {"usage: %s [file]\n", 1262},
+  {"%s: can't open temporary file.\n", 1263},
+  {"Broadcast Message from %s@%s", 1264},
+  {"%s: will not read %s - use stdin.\n", 1265},
+  {"%s: can't read %s.\n", 1266},
+  {"%s: can't stat temporary file.\n", 1267},
+  {"%s: can't read temporary file.\n", 1268},
+  {"illegal month value: use 1-12", 1269},
+  {"illegal year value: use 1-9999", 1270},
+  {"usage: cal [-mjyV] [[month] year]\n", 1271},
+  {"usage: %s [+format] [day month year]\n", 1272},
+  {"St. Tib's Day", 1273},
+  {"%s: unknown signal %s\n", 1274},
+  {"%s: can't find process \"%s\"\n", 1275},
+  {"%s: unknown signal %s; valid signals:\n", 1276},
+  {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1277},
+  {"       %s -l [ signal ]\n", 1278},
+  {"logger: %s: %s.\n", 1279},
+  {"logger: unknown facility name: %s.\n", 1280},
+  {"logger: unknown priority name: %s.\n", 1281},
+  {"\
+usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1282},
+  {"usage: look [-dfa] [-t char] string [file]\n", 1283},
+  {"Could not open %s\n", 1284},
+  {"Got %d bytes from %s\n", 1285},
+  {"namei: unable to get current directory - %s\n", 1286},
+  {"namei: unable to chdir to %s - %s (%d)\n", 1287},
+  {"usage: namei [-mx] pathname [pathname ...]\n", 1288},
+  {"namei: could not chdir to root!\n", 1289},
+  {"namei: could not stat root!\n", 1290},
+  {" ? could not chdir into %s - %s (%d)\n", 1291},
+  {" ? problems reading symlink %s - %s (%d)\n", 1292},
+  {"  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1293},
+  {"namei: unknown file type 0%06o on file %s\n", 1294},
+  {"\
+Warning: `%s' is a symlink.\n\
+Use `%s [options] %s' if you really want to use it.\n\
+Script not started.\n", 1295},
+  {"usage: script [-a] [-f] [-q] [file]\n", 1296},
+  {"Script started, file is %s\n", 1297},
+  {"Script started on %s", 1298},
   {"\
 \n\
-Script done on %s", 1286},
-  {"Script done, file is %s\n", 1287},
-  {"openpty failed\n", 1288},
-  {"Out of pty's\n", 1289},
-  {"%s: Argument error, usage\n", 1290},
-  {"  [ -term terminal_name ]\n", 1291},
-  {"  [ -reset ]\n", 1292},
-  {"  [ -initialize ]\n", 1293},
-  {"  [ -cursor [on|off] ]\n", 1294},
-  {"  [ -snow [on|off] ]\n", 1295},
-  {"  [ -softscroll [on|off] ]\n", 1296},
-  {"  [ -repeat [on|off] ]\n", 1297},
-  {"  [ -appcursorkeys [on|off] ]\n", 1298},
-  {"  [ -linewrap [on|off] ]\n", 1299},
-  {"  [ -default ]\n", 1300},
-  {"  [ -foreground black|blue|green|cyan", 1301},
-  {"|red|magenta|yellow|white|default ]\n", 1302},
-  {"  [ -background black|blue|green|cyan", 1303},
-  {"  [ -ulcolor black|grey|blue|green|cyan", 1304},
-  {"|red|magenta|yellow|white ]\n", 1305},
-  {"  [ -ulcolor bright blue|green|cyan", 1306},
-  {"  [ -hbcolor black|grey|blue|green|cyan", 1307},
-  {"  [ -hbcolor bright blue|green|cyan", 1308},
-  {"  [ -standout [ attr ] ]\n", 1309},
-  {"  [ -inversescreen [on|off] ]\n", 1310},
-  {"  [ -bold [on|off] ]\n", 1311},
-  {"  [ -half-bright [on|off] ]\n", 1312},
-  {"  [ -blink [on|off] ]\n", 1313},
-  {"  [ -reverse [on|off] ]\n", 1314},
-  {"  [ -underline [on|off] ]\n", 1315},
-  {"  [ -store ]\n", 1316},
-  {"  [ -clear [all|rest] ]\n", 1317},
-  {"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n", 1318},
-  {"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n", 1319},
-  {"  [ -regtabs [1-160] ]\n", 1320},
-  {"  [ -blank [0-60] ]\n", 1321},
-  {"  [ -dump   [1-NR_CONSOLES] ]\n", 1322},
-  {"  [ -append [1-NR_CONSOLES] ]\n", 1323},
-  {"  [ -file dumpfilename ]\n", 1324},
-  {"  [ -msg [on|off] ]\n", 1325},
-  {"  [ -msglevel [0-8] ]\n", 1326},
-  {"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1327},
-  {"  [ -powerdown [0-60] ]\n", 1328},
-  {"  [ -blength [0-2000] ]\n", 1329},
-  {"  [ -bfreq freqnumber ]\n", 1330},
-  {"snow.on", 1331},
-  {"snow.off", 1332},
-  {"softscroll.on", 1333},
-  {"softscroll.off", 1334},
-  {"cannot (un)set powersave mode\n", 1335},
-  {"klogctl error: %s\n", 1336},
-  {"Error reading %s\n", 1337},
-  {"Error writing screendump\n", 1338},
-  {"couldn't read %s, and cannot ioctl dump\n", 1339},
-  {"%s: $TERM is not defined.\n", 1340},
-  {"usage: tsort [ inputfile ]\n", 1341},
-  {"tsort: odd data count.\n", 1342},
-  {"tsort: cycle in data.\n", 1343},
-  {"tsort: internal error -- could not find cycle.\n", 1344},
-  {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1345},
-  {"write: can't find your tty's name\n", 1346},
-  {"write: you have write permission turned off.\n", 1347},
-  {"write: %s is not logged in on %s.\n", 1348},
-  {"write: %s has messages disabled on %s\n", 1349},
-  {"usage: write user [tty]\n", 1350},
-  {"write: %s is not logged in\n", 1351},
-  {"write: %s has messages disabled\n", 1352},
-  {"write: %s is logged in more than once; writing to %s\n", 1353},
-  {"Message from %s@%s on %s at %s ...", 1354},
-  {"warning: error reading %s: %s", 1355},
-  {"warning: can't open %s: %s", 1356},
-  {"mount: could not open %s - using %s instead\n", 1357},
-  {"can't create lock file %s: %s (use -n flag to override)", 1358},
-  {"can't link lock file %s: %s (use -n flag to override)", 1359},
-  {"can't open lock file %s: %s (use -n flag to override)", 1360},
-  {"Can't lock lock file %s: %s\n", 1361},
-  {"can't lock lock file %s: %s", 1362},
-  {"timed out", 1363},
+Script done on %s", 1299},
+  {"Script done, file is %s\n", 1300},
+  {"openpty failed\n", 1301},
+  {"Out of pty's\n", 1302},
+  {"%s: Argument error, usage\n", 1303},
+  {"  [ -term terminal_name ]\n", 1304},
+  {"  [ -reset ]\n", 1305},
+  {"  [ -initialize ]\n", 1306},
+  {"  [ -cursor [on|off] ]\n", 1307},
+  {"  [ -snow [on|off] ]\n", 1308},
+  {"  [ -softscroll [on|off] ]\n", 1309},
+  {"  [ -repeat [on|off] ]\n", 1310},
+  {"  [ -appcursorkeys [on|off] ]\n", 1311},
+  {"  [ -linewrap [on|off] ]\n", 1312},
+  {"  [ -default ]\n", 1313},
+  {"  [ -foreground black|blue|green|cyan", 1314},
+  {"|red|magenta|yellow|white|default ]\n", 1315},
+  {"  [ -background black|blue|green|cyan", 1316},
+  {"  [ -ulcolor black|grey|blue|green|cyan", 1317},
+  {"|red|magenta|yellow|white ]\n", 1318},
+  {"  [ -ulcolor bright blue|green|cyan", 1319},
+  {"  [ -hbcolor black|grey|blue|green|cyan", 1320},
+  {"  [ -hbcolor bright blue|green|cyan", 1321},
+  {"  [ -standout [ attr ] ]\n", 1322},
+  {"  [ -inversescreen [on|off] ]\n", 1323},
+  {"  [ -bold [on|off] ]\n", 1324},
+  {"  [ -half-bright [on|off] ]\n", 1325},
+  {"  [ -blink [on|off] ]\n", 1326},
+  {"  [ -reverse [on|off] ]\n", 1327},
+  {"  [ -underline [on|off] ]\n", 1328},
+  {"  [ -store ]\n", 1329},
+  {"  [ -clear [all|rest] ]\n", 1330},
+  {"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n", 1331},
+  {"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n", 1332},
+  {"  [ -regtabs [1-160] ]\n", 1333},
+  {"  [ -blank [0-60] ]\n", 1334},
+  {"  [ -dump   [1-NR_CONSOLES] ]\n", 1335},
+  {"  [ -append [1-NR_CONSOLES] ]\n", 1336},
+  {"  [ -file dumpfilename ]\n", 1337},
+  {"  [ -msg [on|off] ]\n", 1338},
+  {"  [ -msglevel [0-8] ]\n", 1339},
+  {"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1340},
+  {"  [ -powerdown [0-60] ]\n", 1341},
+  {"  [ -blength [0-2000] ]\n", 1342},
+  {"  [ -bfreq freqnumber ]\n", 1343},
+  {"snow.on", 1344},
+  {"snow.off", 1345},
+  {"softscroll.on", 1346},
+  {"softscroll.off", 1347},
+  {"cannot (un)set powersave mode\n", 1348},
+  {"klogctl error: %s\n", 1349},
+  {"Error reading %s\n", 1350},
+  {"Error writing screendump\n", 1351},
+  {"couldn't read %s, and cannot ioctl dump\n", 1352},
+  {"%s: $TERM is not defined.\n", 1353},
+  {"usage: tsort [ inputfile ]\n", 1354},
+  {"tsort: odd data count.\n", 1355},
+  {"tsort: cycle in data.\n", 1356},
+  {"tsort: internal error -- could not find cycle.\n", 1357},
+  {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1358},
+  {"write: can't find your tty's name\n", 1359},
+  {"write: you have write permission turned off.\n", 1360},
+  {"write: %s is not logged in on %s.\n", 1361},
+  {"write: %s has messages disabled on %s\n", 1362},
+  {"usage: write user [tty]\n", 1363},
+  {"write: %s is not logged in\n", 1364},
+  {"write: %s has messages disabled\n", 1365},
+  {"write: %s is logged in more than once; writing to %s\n", 1366},
+  {"Message from %s@%s (as %s) on %s at %s ...", 1367},
+  {"Message from %s@%s on %s at %s ...", 1368},
+  {"warning: error reading %s: %s", 1369},
+  {"warning: can't open %s: %s", 1370},
+  {"mount: could not open %s - using %s instead\n", 1371},
+  {"can't create lock file %s: %s (use -n flag to override)", 1372},
+  {"can't link lock file %s: %s (use -n flag to override)", 1373},
+  {"can't open lock file %s: %s (use -n flag to override)", 1374},
+  {"Can't lock lock file %s: %s\n", 1375},
+  {"can't lock lock file %s: %s", 1376},
+  {"timed out", 1377},
   {"\
 Cannot create link %s\n\
-Perhaps there is a stale lock file?\n", 1364},
-  {"cannot open %s (%s) - mtab not updated", 1365},
-  {"mount: warning: cannot change mounted device with a remount\n", 1366},
-  {"mount: warning: cannot change filesystem type with a remount\n", 1367},
-  {"error writing %s: %s", 1368},
-  {"error changing mode of %s: %s\n", 1369},
-  {"can't rename %s to %s: %s\n", 1370},
-  {"loop: can't open device %s: %s\n", 1371},
-  {"loop: can't get info on device %s: %s\n", 1372},
-  {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1373},
-  {"mount: could not find any device /dev/loop#", 1374},
+Perhaps there is a stale lock file?\n", 1378},
+  {"cannot open %s (%s) - mtab not updated", 1379},
+  {"error writing %s: %s", 1380},
+  {"error changing mode of %s: %s\n", 1381},
+  {"can't rename %s to %s: %s\n", 1382},
+  {"loop: can't open device %s: %s\n", 1383},
+  {"loop: can't get info on device %s: %s\n", 1384},
+  {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1385},
+  {"mount: could not find any device /dev/loop#", 1386},
   {"\
 mount: Could not find any loop device.\n\
-       Maybe /dev/loop# has a wrong major number?", 1375},
+       Maybe /dev/loop# has a wrong major number?", 1387},
   {"\
 mount: Could not find any loop device, and, according to %s,\n\
        this kernel does not know about the loop device.\n\
-       (If so, then recompile or `insmod loop.o'.)", 1376},
+       (If so, then recompile or `insmod loop.o'.)", 1388},
   {"\
 mount: Could not find any loop device. Maybe this kernel does not know\n\
        about the loop device (then recompile or `insmod loop.o'), or\n\
-       maybe /dev/loop# has the wrong major number?", 1377},
-  {"mount: could not find any free loop device", 1378},
-  {"Unsupported encryption type %s\n", 1379},
-  {"Couldn't lock into memory, exiting.\n", 1380},
-  {"Init (up to 16 hex digits): ", 1381},
-  {"Non-hex digit '%c'.\n", 1382},
-  {"Don't know how to get key for encryption system %d\n", 1383},
-  {"set_loop(%s,%s,%d): success\n", 1384},
-  {"loop: can't delete device %s: %s\n", 1385},
-  {"del_loop(%s): success\n", 1386},
-  {"This mount was compiled without loop support. Please recompile.\n", 1387},
+       maybe /dev/loop# has the wrong major number?", 1389},
+  {"mount: could not find any free loop device", 1390},
+  {"Unsupported encryption type %s\n", 1391},
+  {"Couldn't lock into memory, exiting.\n", 1392},
+  {"Init (up to 16 hex digits): ", 1393},
+  {"Non-hex digit '%c'.\n", 1394},
+  {"Don't know how to get key for encryption system %d\n", 1395},
+  {"set_loop(%s,%s,%d): success\n", 1396},
+  {"loop: can't delete device %s: %s\n", 1397},
+  {"del_loop(%s): success\n", 1398},
+  {"This mount was compiled without loop support. Please recompile.\n", 1399},
   {"\
 usage:\n\
   %s loop_device                                      # give info\n\
   %s -d loop_device                                   # delete\n\
-  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1388},
-  {"not enough memory", 1389},
-  {"No loop support was available at compile time. Please recompile.\n", 1390},
-  {"[mntent]: warning: no final newline at the end of %s\n", 1391},
-  {"[mntent]: line %d in %s is bad%s\n", 1392},
-  {"; rest of file ignored", 1393},
-  {"mount: according to mtab, %s is already mounted on %s", 1394},
-  {"mount: according to mtab, %s is mounted on %s", 1395},
-  {"mount: can't open %s for writing: %s", 1396},
-  {"mount: error writing %s: %s", 1397},
-  {"mount: error changing mode of %s: %s", 1398},
-  {"%s looks like swapspace - not mounted", 1399},
-  {"mount failed", 1400},
-  {"mount: only root can mount %s on %s", 1401},
-  {"mount: loop device specified twice", 1402},
-  {"mount: type specified twice", 1403},
-  {"mount: skipping the setup of a loop device\n", 1404},
-  {"mount: going to use the loop device %s\n", 1405},
-  {"mount: failed setting up loop device\n", 1406},
-  {"mount: setup loop device successfully\n", 1407},
-  {"mount: can't open %s: %s", 1408},
-  {"mount: cannot not open %s for setting speed", 1409},
-  {"mount: cannot set speed: %s", 1410},
-  {"mount: cannot fork: %s", 1411},
-  {"mount: this version was compiled without support for the type `nfs'", 1412},
-  {"mount: failed with nfs mount version 4, trying 3..\n", 1413},
-  {"\
-mount: I could not determine the filesystem type, and none was specified", 1414},
-  {"mount: you must specify the filesystem type", 1415},
-  {"mount: mount failed", 1416},
-  {"mount: mount point %s is not a directory", 1417},
-  {"mount: permission denied", 1418},
-  {"mount: must be superuser to use mount", 1419},
-  {"mount: %s is busy", 1420},
-  {"mount: proc already mounted", 1421},
-  {"mount: %s already mounted or %s busy", 1422},
-  {"mount: mount point %s does not exist", 1423},
-  {"mount: mount point %s is a symbolic link to nowhere", 1424},
-  {"mount: special device %s does not exist", 1425},
+  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1400},
+  {"not enough memory", 1401},
+  {"No loop support was available at compile time. Please recompile.\n", 1402},
+  {"[mntent]: warning: no final newline at the end of %s\n", 1403},
+  {"[mntent]: line %d in %s is bad%s\n", 1404},
+  {"; rest of file ignored", 1405},
+  {"mount: according to mtab, %s is already mounted on %s", 1406},
+  {"mount: according to mtab, %s is mounted on %s", 1407},
+  {"mount: can't open %s for writing: %s", 1408},
+  {"mount: error writing %s: %s", 1409},
+  {"mount: error changing mode of %s: %s", 1410},
+  {"%s looks like swapspace - not mounted", 1411},
+  {"mount failed", 1412},
+  {"mount: only root can mount %s on %s", 1413},
+  {"mount: loop device specified twice", 1414},
+  {"mount: type specified twice", 1415},
+  {"mount: skipping the setup of a loop device\n", 1416},
+  {"mount: going to use the loop device %s\n", 1417},
+  {"mount: failed setting up loop device\n", 1418},
+  {"mount: setup loop device successfully\n", 1419},
+  {"mount: can't open %s: %s", 1420},
+  {"mount: cannot not open %s for setting speed", 1421},
+  {"mount: cannot set speed: %s", 1422},
+  {"mount: cannot fork: %s", 1423},
+  {"mount: this version was compiled without support for the type `nfs'", 1424},
+  {"mount: failed with nfs mount version 4, trying 3..\n", 1425},
+  {"\
+mount: I could not determine the filesystem type, and none was specified", 1426},
+  {"mount: you must specify the filesystem type", 1427},
+  {"mount: mount failed", 1428},
+  {"mount: mount point %s is not a directory", 1429},
+  {"mount: permission denied", 1430},
+  {"mount: must be superuser to use mount", 1431},
+  {"mount: %s is busy", 1432},
+  {"mount: proc already mounted", 1433},
+  {"mount: %s already mounted or %s busy", 1434},
+  {"mount: mount point %s does not exist", 1435},
+  {"mount: mount point %s is a symbolic link to nowhere", 1436},
+  {"mount: special device %s does not exist", 1437},
   {"\
 mount: special device %s does not exist\n\
-       (a path prefix is not a directory)\n", 1426},
-  {"mount: %s not mounted already, or bad option", 1427},
+       (a path prefix is not a directory)\n", 1438},
+  {"mount: %s not mounted already, or bad option", 1439},
   {"\
 mount: wrong fs type, bad option, bad superblock on %s,\n\
-       or too many mounted file systems", 1428},
-  {"mount table full", 1429},
-  {"mount: %s: can't read superblock", 1430},
-  {"mount: %s has wrong major or minor number", 1431},
-  {"mount: fs type %s not supported by kernel", 1432},
-  {"mount: probably you meant %s", 1433},
-  {"mount: maybe you meant iso9660 ?", 1434},
-  {"mount: %s has wrong device number or fs type %s not supported", 1435},
-  {"mount: %s is not a block device, and stat fails?", 1436},
+       or too many mounted file systems", 1440},
+  {"mount table full", 1441},
+  {"mount: %s: can't read superblock", 1442},
+  {"mount: %s: unknown device", 1443},
+  {"mount: fs type %s not supported by kernel", 1444},
+  {"mount: probably you meant %s", 1445},
+  {"mount: maybe you meant iso9660 ?", 1446},
+  {"mount: %s has wrong device number or fs type %s not supported", 1447},
+  {"mount: %s is not a block device, and stat fails?", 1448},
   {"\
 mount: the kernel does not recognize %s as a block device\n\
-       (maybe `insmod driver'?)", 1437},
-  {"mount: %s is not a block device (maybe try `-o loop'?)", 1438},
-  {"mount: %s is not a block device", 1439},
-  {"mount: %s is not a valid block device", 1440},
-  {"block device ", 1441},
-  {"mount: %s%s is not permitted on its filesystem", 1442},
-  {"mount: %s%s is write-protected but explicit `-w' flag given", 1443},
-  {"mount: %s%s is write-protected, mounting read-only", 1444},
-  {"mount: consider mounting %s by %s\n", 1445},
-  {"UUID", 1446},
-  {"label", 1447},
-  {"mount: no such partition found", 1448},
-  {"mount: no type was given - I'll assume nfs because of the colon\n", 1449},
-  {"mount: backgrounding \"%s\"\n", 1450},
-  {"mount: giving up \"%s\"\n", 1451},
-  {"mount: %s already mounted on %s\n", 1452},
-  {"\
-Usage: mount [-lhV]\n\
-       mount -a [-nfFrsvw] [-t vfstypes]\n\
-       mount [-nfrsvw] [-o options] special | node\n\
-       mount [-nfrsvw] [-t vfstype] [-o options] special node\n\
-       A special device can be indicated by  -L label  or  -U uuid .\n", 1453},
-  {"mount: only root can do that", 1454},
-  {"mount: no %s found - creating it..\n", 1455},
-  {"mount: mounting %s\n", 1456},
-  {"not mounted anything", 1457},
-  {"mount: cannot find %s in %s", 1458},
-  {"mount: can't find %s in %s or %s", 1459},
-  {"mount: bad UUID", 1460},
-  {"mount: you didn't specify a filesystem type for %s\n", 1461},
-  {"       I will try all types mentioned in %s or %s\n", 1462},
-  {"       and it looks like this is swapspace\n", 1463},
-  {"       I will try type %s\n", 1464},
-  {"Trying %s\n", 1465},
-  {"mount: excessively long host:dir argument\n", 1466},
-  {"mount: warning: multiple hostnames not supported\n", 1467},
-  {"mount: directory to mount not in host:dir format\n", 1468},
-  {"mount: can't get address for %s\n", 1469},
-  {"mount: got bad hp->h_length\n", 1470},
-  {"mount: excessively long option argument\n", 1471},
-  {"Warning: Unrecognized proto= option.\n", 1472},
-  {"Warning: Option namlen is not supported.\n", 1473},
-  {"unknown nfs mount parameter: %s=%d\n", 1474},
-  {"Warning: option nolock is not supported.\n", 1475},
-  {"unknown nfs mount option: %s%s\n", 1476},
-  {"mount: got bad hp->h_length?\n", 1477},
-  {"NFS over TCP is not supported.\n", 1478},
-  {"nfs socket", 1479},
-  {"nfs bindresvport", 1480},
-  {"used portmapper to find NFS port\n", 1481},
-  {"using port %d for nfs deamon\n", 1482},
-  {"nfs connect", 1483},
-  {"unknown nfs status return value: %d", 1484},
-  {"bug in xstrndup call", 1485},
+       (maybe `insmod driver'?)", 1449},
+  {"mount: %s is not a block device (maybe try `-o loop'?)", 1450},
+  {"mount: %s is not a block device", 1451},
+  {"mount: %s is not a valid block device", 1452},
+  {"block device ", 1453},
+  {"mount: cannot mount %s%s read-only", 1454},
+  {"mount: %s%s is write-protected but explicit `-w' flag given", 1455},
+  {"mount: %s%s is write-protected, mounting read-only", 1456},
+  {"mount: going to mount %s by %s\n", 1457},
+  {"UUID", 1458},
+  {"label", 1459},
+  {"mount: no such partition found", 1460},
+  {"mount: no type was given - I'll assume nfs because of the colon\n", 1461},
+  {"mount: backgrounding \"%s\"\n", 1462},
+  {"mount: giving up \"%s\"\n", 1463},
+  {"mount: %s already mounted on %s\n", 1464},
+  {"\
+Usage: mount -V                 : print version\n\
+       mount -h                 : print this help\n\
+       mount                    : list mounted filesystems\n\
+       mount -l                 : idem, including volume labels\n\
+So far the informational part. Next the mounting.\n\
+The command is `mount [-t fstype] something somewhere'.\n\
+Details found in /etc/fstab may be omitted.\n\
+       mount -a                 : mount all stuff from /etc/fstab\n\
+       mount device             : mount device at the known place\n\
+       mount directory          : mount known device here\n\
+       mount -t type dev dir    : ordinary mount command\n\
+Note that one does not really mount a device, one mounts\n\
+a filesystem (of the given type) found on the device.\n\
+One can also mount an already visible directory tree elsewhere:\n\
+       mount --bind olddir newdir\n\
+A device can be given by name, say /dev/hda1 or /dev/cdrom,\n\
+or by label, using  -L label  or by uuid, using  -U uuid .\n\
+Union or stack mounts are specified using one of\n\
+       --replace, --after, --before, --over\n\
+Other options: [-nfFrsvw] [-o options].\n\
+For many more details, say  man 8 mount .\n", 1465},
+  {"mount: only root can do that", 1466},
+  {"mount: no %s found - creating it..\n", 1467},
+  {"mount: mounting %s\n", 1468},
+  {"not mounted anything", 1469},
+  {"mount: cannot find %s in %s", 1470},
+  {"mount: can't find %s in %s or %s", 1471},
+  {"\
+mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1472},
+  {"mount: bad UUID", 1473},
+  {"mount: you didn't specify a filesystem type for %s\n", 1474},
+  {"       I will try all types mentioned in %s or %s\n", 1475},
+  {"       and it looks like this is swapspace\n", 1476},
+  {"       I will try type %s\n", 1477},
+  {"Trying %s\n", 1478},
+  {"mount: excessively long host:dir argument\n", 1479},
+  {"mount: warning: multiple hostnames not supported\n", 1480},
+  {"mount: directory to mount not in host:dir format\n", 1481},
+  {"mount: can't get address for %s\n", 1482},
+  {"mount: got bad hp->h_length\n", 1483},
+  {"mount: excessively long option argument\n", 1484},
+  {"Warning: Unrecognized proto= option.\n", 1485},
+  {"Warning: Option namlen is not supported.\n", 1486},
+  {"unknown nfs mount parameter: %s=%d\n", 1487},
+  {"Warning: option nolock is not supported.\n", 1488},
+  {"unknown nfs mount option: %s%s\n", 1489},
+  {"mount: got bad hp->h_length?\n", 1490},
+  {"NFS over TCP is not supported.\n", 1491},
+  {"nfs socket", 1492},
+  {"nfs bindresvport", 1493},
+  {"used portmapper to find NFS port\n", 1494},
+  {"using port %d for nfs deamon\n", 1495},
+  {"nfs connect", 1496},
+  {"unknown nfs status return value: %d", 1497},
+  {"bug in xstrndup call", 1498},
   {"\
 usage: %s [-hV]\n\
        %s -a [-v]\n\
        %s [-v] [-p priority] special ...\n\
-       %s [-s]\n", 1486},
-  {"%s on %s\n", 1487},
-  {"swapon: cannot stat %s: %s\n", 1488},
-  {"swapon: warning: %s has insecure permissions %04o, 0600 suggested\n", 1489},
-  {"swapon: Skipping file %s - it appears to have holes.\n", 1490},
-  {"%s: cannot open %s: %s\n", 1491},
-  {"umount: compiled without support for -f\n", 1492},
-  {"host: %s, directory: %s\n", 1493},
-  {"umount: can't get address for %s\n", 1494},
-  {"umount: got bad hostp->h_length\n", 1495},
-  {"umount: %s: invalid block device", 1496},
-  {"umount: %s: not mounted", 1497},
-  {"umount: %s: can't write superblock", 1498},
-  {"umount: %s: device is busy", 1499},
-  {"umount: %s: not found", 1500},
-  {"umount: %s: must be superuser to umount", 1501},
-  {"umount: %s: block devices not permitted on fs", 1502},
-  {"umount: %s: %s", 1503},
-  {"no umount2, trying umount...\n", 1504},
-  {"could not umount %s - trying %s instead\n", 1505},
-  {"umount: %s busy - remounted read-only\n", 1506},
-  {"umount: could not remount %s read-only\n", 1507},
-  {"%s umounted\n", 1508},
-  {"umount: cannot find list of filesystems to unmount", 1509},
+       %s [-s]\n", 1499},
+  {"%s on %s\n", 1500},
+  {"swapon: cannot stat %s: %s\n", 1501},
+  {"swapon: warning: %s has insecure permissions %04o, 0600 suggested\n", 1502},
+  {"swapon: Skipping file %s - it appears to have holes.\n", 1503},
+  {"%s: cannot open %s: %s\n", 1504},
+  {"umount: compiled without support for -f\n", 1505},
+  {"host: %s, directory: %s\n", 1506},
+  {"umount: can't get address for %s\n", 1507},
+  {"umount: got bad hostp->h_length\n", 1508},
+  {"umount: %s: invalid block device", 1509},
+  {"umount: %s: not mounted", 1510},
+  {"umount: %s: can't write superblock", 1511},
+  {"umount: %s: device is busy", 1512},
+  {"umount: %s: not found", 1513},
+  {"umount: %s: must be superuser to umount", 1514},
+  {"umount: %s: block devices not permitted on fs", 1515},
+  {"umount: %s: %s", 1516},
+  {"no umount2, trying umount...\n", 1517},
+  {"could not umount %s - trying %s instead\n", 1518},
+  {"umount: %s busy - remounted read-only\n", 1519},
+  {"umount: could not remount %s read-only\n", 1520},
+  {"%s umounted\n", 1521},
+  {"umount: cannot find list of filesystems to unmount", 1522},
   {"\
 Usage: umount [-hV]\n\
        umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n\
-       umount [-f] [-r] [-n] [-v] special | node...\n", 1510},
-  {"umount: only root can do that", 1511},
-  {"Trying to umount %s\n", 1512},
-  {"Could not find %s in mtab\n", 1513},
-  {"umount: %s is not mounted (according to mtab)", 1514},
-  {"umount: it seems %s is mounted multiple times", 1515},
-  {"umount: %s is not in the fstab (and you are not root)", 1516},
-  {"umount: %s mount disagrees with the fstab", 1517},
-  {"umount: only root can unmount %s from %s", 1518},
-  {"umount: only %s can unmount %s from %s", 1519},
-  {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1520},
-  {"Usage: ctrlaltdel hard|soft\n", 1521},
+       umount [-f] [-r] [-n] [-v] special | node...\n", 1523},
+  {"umount: only root can do that", 1524},
+  {"Trying to umount %s\n", 1525},
+  {"Could not find %s in mtab\n", 1526},
+  {"umount: %s is not mounted (according to mtab)", 1527},
+  {"umount: it seems %s is mounted multiple times", 1528},
+  {"umount: %s is not in the fstab (and you are not root)", 1529},
+  {"umount: %s mount disagrees with the fstab", 1530},
+  {"umount: only root can unmount %s from %s", 1531},
+  {"umount: only %s can unmount %s from %s", 1532},
+  {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1533},
+  {"Usage: ctrlaltdel hard|soft\n", 1534},
   {"\
 File %s, For threshold value %lu, Maximum characters in fifo were %d,\n\
-and the maximum transfer rate in characters/second was %f\n", 1522},
+and the maximum transfer rate in characters/second was %f\n", 1535},
   {"\
 File %s, For threshold value %lu and timrout value %lu, Maximum characters \
 in fifo were %d,\n\
-and the maximum transfer rate in characters/second was %f\n", 1523},
-  {"Invalid interval value: %s\n", 1524},
-  {"Invalid set value: %s\n", 1525},
-  {"Invalid default value: %s\n", 1526},
-  {"Invalid set time value: %s\n", 1527},
-  {"Invalid default time value: %s\n", 1528},
+and the maximum transfer rate in characters/second was %f\n", 1536},
+  {"Invalid interval value: %s\n", 1537},
+  {"Invalid set value: %s\n", 1538},
+  {"Invalid default value: %s\n", 1539},
+  {"Invalid set time value: %s\n", 1540},
+  {"Invalid default time value: %s\n", 1541},
   {"\
 Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) \
-[-g|-G] file [file...]\n", 1529},
-  {"Can't open %s: %s\n", 1530},
-  {"Can't set %s to threshold %d: %s\n", 1531},
-  {"Can't set %s to time threshold %d: %s\n", 1532},
-  {"Can't get threshold for %s: %s\n", 1533},
-  {"Can't get timeout for %s: %s\n", 1534},
-  {"%s: %ld %s threshold and %ld %s timeout\n", 1535},
-  {"current", 1536},
-  {"default", 1537},
-  {"Can't set signal handler", 1538},
-  {"gettimeofday failed", 1539},
-  {"Can't issue CYGETMON on %s: %s\n", 1540},
-  {"%s: %lu ints, %lu/%lu chars; ", 1541},
-  {"fifo: %lu thresh, %lu tmout, ", 1542},
-  {"%lu max, %lu now\n", 1543},
-  {"   %f int/sec; %f rec, %f send (char/sec)\n", 1544},
-  {"\
-%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1545},
-  {"   %f int/sec; %f rec (char/sec)\n", 1546},
-  {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1547},
-  {"invalid id: %s\n", 1548},
-  {"cannot remove id %s (%s)\n", 1549},
-  {"usage: %s {shm | msg | sem} id ...\n", 1550},
-  {"unknown resource type: %s\n", 1551},
-  {"resource(s) deleted\n", 1552},
-  {"usage : %s -asmq -tclup \n", 1553},
-  {"\t%s [-s -m -q] -i id\n", 1554},
-  {"\t%s -h for help.\n", 1555},
-  {"%s provides information on ipc facilities for", 1556},
-  {" which you have read access.\n", 1557},
+[-g|-G] file [file...]\n", 1542},
+  {"Can't open %s: %s\n", 1543},
+  {"Can't set %s to threshold %d: %s\n", 1544},
+  {"Can't set %s to time threshold %d: %s\n", 1545},
+  {"Can't get threshold for %s: %s\n", 1546},
+  {"Can't get timeout for %s: %s\n", 1547},
+  {"%s: %ld %s threshold and %ld %s timeout\n", 1548},
+  {"current", 1549},
+  {"default", 1550},
+  {"Can't set signal handler", 1551},
+  {"gettimeofday failed", 1552},
+  {"Can't issue CYGETMON on %s: %s\n", 1553},
+  {"%s: %lu ints, %lu/%lu chars; ", 1554},
+  {"fifo: %lu thresh, %lu tmout, ", 1555},
+  {"%lu max, %lu now\n", 1556},
+  {"   %f int/sec; %f rec, %f send (char/sec)\n", 1557},
+  {"\
+%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n", 1558},
+  {"   %f int/sec; %f rec (char/sec)\n", 1559},
+  {"Usage: %s [-c] [-n level] [-s bufsize]\n", 1560},
+  {"invalid id: %s\n", 1561},
+  {"cannot remove id %s (%s)\n", 1562},
+  {"usage: %s {shm | msg | sem} id ...\n", 1563},
+  {"unknown resource type: %s\n", 1564},
+  {"resource(s) deleted\n", 1565},
+  {"usage : %s -asmq -tclup \n", 1566},
+  {"\t%s [-s -m -q] -i id\n", 1567},
+  {"\t%s -h for help.\n", 1568},
+  {"%s provides information on ipc facilities for", 1569},
+  {" which you have read access.\n", 1570},
   {"\
 Resource Specification:\n\
 \t-m : shared_mem\n\
-\t-q : messages\n", 1558},
+\t-q : messages\n", 1571},
   {"\
 \t-s : semaphores\n\
-\t-a : all (default)\n", 1559},
+\t-a : all (default)\n", 1572},
   {"\
 Output Format:\n\
 \t-t : time\n\
 \t-p : pid\n\
-\t-c : creator\n", 1560},
+\t-c : creator\n", 1573},
   {"\
 \t-l : limits\n\
-\t-u : summary\n", 1561},
-  {"-i id [-s -q -m] : details on resource identified by id\n", 1562},
-  {"kernel not configured for shared memory\n", 1563},
-  {"------ Shared Memory Limits --------\n", 1564},
-  {"max number of segments = %d\n", 1565},
-  {"max seg size (kbytes) = %d\n", 1566},
-  {"max total shared memory (kbytes) = %d\n", 1567},
-  {"min seg size (bytes) = %d\n", 1568},
-  {"------ Shared Memory Status --------\n", 1569},
-  {"segments allocated %d\n", 1570},
-  {"pages allocated %ld\n", 1571},
-  {"pages resident  %ld\n", 1572},
-  {"pages swapped   %ld\n", 1573},
-  {"Swap performance: %ld attempts\t %ld successes\n", 1574},
-  {"------ Shared Memory Segment Creators/Owners --------\n", 1575},
-  {"%-10s%-10s%-10s%-10s%-10s%-10s\n", 1576},
-  {"shmid", 1577},
-  {"perms", 1578},
-  {"cuid", 1579},
-  {"cgid", 1580},
-  {"uid", 1581},
-  {"gid", 1582},
-  {"------ Shared Memory Attach/Detach/Change Times --------\n", 1583},
-  {"%-10s%-10s  %-20s%-20s%-20s\n", 1584},
-  {"owner", 1585},
-  {"attached", 1586},
-  {"detached", 1587},
-  {"changed", 1588},
-  {"------ Shared Memory Creator/Last-op --------\n", 1589},
-  {"%-10s%-10s%-10s%-10s\n", 1590},
-  {"cpid", 1591},
-  {"lpid", 1592},
-  {"------ Shared Memory Segments --------\n", 1593},
-  {"%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n", 1594},
-  {"key", 1595},
-  {"bytes", 1596},
-  {"nattch", 1597},
-  {"status", 1598},
-  {"Not set", 1599},
-  {"dest", 1600},
-  {"locked", 1601},
-  {"kernel not configured for semaphores\n", 1602},
-  {"------ Semaphore Limits --------\n", 1603},
-  {"max number of arrays = %d\n", 1604},
-  {"max semaphores per array = %d\n", 1605},
-  {"max semaphores system wide = %d\n", 1606},
-  {"max ops per semop call = %d\n", 1607},
-  {"semaphore max value = %d\n", 1608},
-  {"------ Semaphore Status --------\n", 1609},
-  {"used arrays = %d\n", 1610},
-  {"allocated semaphores = %d\n", 1611},
-  {"------ Semaphore Arrays Creators/Owners --------\n", 1612},
-  {"semid", 1613},
-  {"------ Shared Memory Operation/Change Times --------\n", 1614},
-  {"%-8s%-10s  %-26.24s %-26.24s\n", 1615},
-  {"last-op", 1616},
-  {"last-changed", 1617},
-  {"------ Semaphore Arrays --------\n", 1618},
-  {"%-10s%-10s%-10s%-10s%-10s%-12s\n", 1619},
-  {"nsems", 1620},
-  {"------ Messages: Limits --------\n", 1621},
-  {"max queues system wide = %d\n", 1622},
-  {"max size of message (bytes) = %d\n", 1623},
-  {"default max size of queue (bytes) = %d\n", 1624},
-  {"------ Messages: Status --------\n", 1625},
-  {"allocated queues = %d\n", 1626},
-  {"used headers = %d\n", 1627},
-  {"used space = %d bytes\n", 1628},
-  {"------ Message Queues: Creators/Owners --------\n", 1629},
-  {"msqid", 1630},
-  {"------ Message Queues Send/Recv/Change Times --------\n", 1631},
-  {"%-8s%-10s  %-20s%-20s%-20s\n", 1632},
-  {"send", 1633},
-  {"recv", 1634},
-  {"change", 1635},
-  {"------ Message Queues PIDs --------\n", 1636},
-  {"lspid", 1637},
-  {"lrpid", 1638},
-  {"------ Message Queues --------\n", 1639},
-  {"%-10s%-10s%-10s%-10s%-12s%-12s\n", 1640},
-  {"used-bytes", 1641},
-  {"messages", 1642},
+\t-u : summary\n", 1574},
+  {"-i id [-s -q -m] : details on resource identified by id\n", 1575},
+  {"kernel not configured for shared memory\n", 1576},
+  {"------ Shared Memory Limits --------\n", 1577},
+  {"max number of segments = %ld\n", 1578},
+  {"max seg size (kbytes) = %ld\n", 1579},
+  {"max total shared memory (kbytes) = %ld\n", 1580},
+  {"min seg size (bytes) = %ld\n", 1581},
+  {"------ Shared Memory Status --------\n", 1582},
+  {"segments allocated %d\n", 1583},
+  {"pages allocated %ld\n", 1584},
+  {"pages resident  %ld\n", 1585},
+  {"pages swapped   %ld\n", 1586},
+  {"Swap performance: %ld attempts\t %ld successes\n", 1587},
+  {"------ Shared Memory Segment Creators/Owners --------\n", 1588},
+  {"%-10s%-10s%-10s%-10s%-10s%-10s\n", 1589},
+  {"shmid", 1590},
+  {"perms", 1591},
+  {"cuid", 1592},
+  {"cgid", 1593},
+  {"uid", 1594},
+  {"gid", 1595},
+  {"------ Shared Memory Attach/Detach/Change Times --------\n", 1596},
+  {"%-10s%-10s  %-20s%-20s%-20s\n", 1597},
+  {"owner", 1598},
+  {"attached", 1599},
+  {"detached", 1600},
+  {"changed", 1601},
+  {"------ Shared Memory Creator/Last-op --------\n", 1602},
+  {"%-10s%-10s%-10s%-10s\n", 1603},
+  {"cpid", 1604},
+  {"lpid", 1605},
+  {"------ Shared Memory Segments --------\n", 1606},
+  {"%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n", 1607},
+  {"key", 1608},
+  {"bytes", 1609},
+  {"nattch", 1610},
+  {"status", 1611},
+  {"Not set", 1612},
+  {"dest", 1613},
+  {"locked", 1614},
+  {"kernel not configured for semaphores\n", 1615},
+  {"------ Semaphore Limits --------\n", 1616},
+  {"max number of arrays = %d\n", 1617},
+  {"max semaphores per array = %d\n", 1618},
+  {"max semaphores system wide = %d\n", 1619},
+  {"max ops per semop call = %d\n", 1620},
+  {"semaphore max value = %d\n", 1621},
+  {"------ Semaphore Status --------\n", 1622},
+  {"used arrays = %d\n", 1623},
+  {"allocated semaphores = %d\n", 1624},
+  {"------ Semaphore Arrays Creators/Owners --------\n", 1625},
+  {"semid", 1626},
+  {"------ Shared Memory Operation/Change Times --------\n", 1627},
+  {"%-8s%-10s  %-26.24s %-26.24s\n", 1628},
+  {"last-op", 1629},
+  {"last-changed", 1630},
+  {"------ Semaphore Arrays --------\n", 1631},
+  {"%-10s%-10s%-10s%-10s%-10s%-12s\n", 1632},
+  {"nsems", 1633},
+  {"------ Messages: Limits --------\n", 1634},
+  {"max queues system wide = %d\n", 1635},
+  {"max size of message (bytes) = %d\n", 1636},
+  {"default max size of queue (bytes) = %d\n", 1637},
+  {"------ Messages: Status --------\n", 1638},
+  {"allocated queues = %d\n", 1639},
+  {"used headers = %d\n", 1640},
+  {"used space = %d bytes\n", 1641},
+  {"------ Message Queues: Creators/Owners --------\n", 1642},
+  {"msqid", 1643},
+  {"------ Message Queues Send/Recv/Change Times --------\n", 1644},
+  {"%-8s%-10s  %-20s%-20s%-20s\n", 1645},
+  {"send", 1646},
+  {"recv", 1647},
+  {"change", 1648},
+  {"------ Message Queues PIDs --------\n", 1649},
+  {"lspid", 1650},
+  {"lrpid", 1651},
+  {"------ Message Queues --------\n", 1652},
+  {"%-10s%-10s%-10s%-10s%-12s%-12s\n", 1653},
+  {"used-bytes", 1654},
+  {"messages", 1655},
   {"\
 \n\
-Shared memory Segment shmid=%d\n", 1643},
-  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1644},
-  {"mode=%#o\taccess_perms=%#o\n", 1645},
-  {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n", 1646},
-  {"att_time=%s", 1647},
-  {"Not set\n", 1648},
-  {"det_time=%s", 1649},
-  {"change_time=%s", 1650},
+Shared memory Segment shmid=%d\n", 1656},
+  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1657},
+  {"mode=%#o\taccess_perms=%#o\n", 1658},
+  {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1659},
+  {"att_time=%s", 1660},
+  {"Not set\n", 1661},
+  {"det_time=%s", 1662},
+  {"change_time=%s", 1663},
   {"\
 \n\
-Message Queue msqid=%d\n", 1651},
-  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1652},
-  {"cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n", 1653},
-  {"send_time=%srcv_time=%schange_time=%s", 1654},
-  {"Not Set\n", 1655},
+Message Queue msqid=%d\n", 1664},
+  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1665},
+  {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1666},
+  {"send_time=%srcv_time=%schange_time=%s", 1667},
+  {"Not Set\n", 1668},
   {"\
 \n\
-Semaphore Array semid=%d\n", 1656},
-  {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1657},
-  {"mode=%#o, access_perms=%#o\n", 1658},
-  {"nsems = %d\n", 1659},
-  {"otime = %s", 1660},
-  {"ctime = %s", 1661},
-  {"%-10s%-10s%-10s%-10s%-10s\n", 1662},
-  {"semnum", 1663},
-  {"value", 1664},
-  {"ncount", 1665},
-  {"zcount", 1666},
-  {"pid", 1667},
-  {"usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1668},
-  {"\
-  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device", 1669},
-  {"  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2", 1670},
-  {"  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)", 1671},
-  {"  rdev -s /dev/fd0 /dev/hda2      set the SWAP device", 1672},
-  {"  rdev -r /dev/fd0 627            set the RAMDISK size", 1673},
-  {"  rdev -v /dev/fd0 1              set the bootup VIDEOMODE", 1674},
-  {"  rdev -o N ...                   use the byte offset N", 1675},
-  {"  rootflags ...                   same as rdev -R", 1676},
-  {"  swapdev ...                     same as rdev -s", 1677},
-  {"  ramsize ...                     same as rdev -r", 1678},
-  {"  vidmode ...                     same as rdev -v", 1679},
-  {"\
-Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1680},
-  {"      use -R 1 to mount root readonly, -R 0 for read/write.", 1681},
+Semaphore Array semid=%d\n", 1669},
+  {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1670},
+  {"mode=%#o, access_perms=%#o\n", 1671},
+  {"nsems = %ld\n", 1672},
+  {"otime = %s", 1673},
+  {"ctime = %s", 1674},
+  {"%-10s%-10s%-10s%-10s%-10s\n", 1675},
+  {"semnum", 1676},
+  {"value", 1677},
+  {"ncount", 1678},
+  {"zcount", 1679},
+  {"pid", 1680},
+  {"usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1681},
+  {"\
+  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device", 1682},
+  {"  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2", 1683},
+  {"  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)", 1684},
+  {"  rdev -s /dev/fd0 /dev/hda2      set the SWAP device", 1685},
+  {"  rdev -r /dev/fd0 627            set the RAMDISK size", 1686},
+  {"  rdev -v /dev/fd0 1              set the bootup VIDEOMODE", 1687},
+  {"  rdev -o N ...                   use the byte offset N", 1688},
+  {"  rootflags ...                   same as rdev -R", 1689},
+  {"  swapdev ...                     same as rdev -s", 1690},
+  {"  ramsize ...                     same as rdev -r", 1691},
+  {"  vidmode ...                     same as rdev -v", 1692},
+  {"\
+Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1693},
+  {"      use -R 1 to mount root readonly, -R 0 for read/write.", 1694},
   {"\
 %s: Usage: \"%s [options]\n\
 \t -m <mapfile>  (default = \"%s\")\n\
@@ -2147,110 +2187,110 @@ Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1
 \t -v            print verbose data\n\
 \t -a            print all symbols, even if count is 0\n\
 \t -r            reset all the counters (root only)\n\
-\t -V            print version and exit\n", 1682},
-  {"%s Version %s\n", 1683},
-  {"anything\n", 1684},
-  {"Sampling_step: %i\n", 1685},
-  {"%s: %s(%i): wrong map line\n", 1686},
-  {"%s: can't find \"_stext\" in %s\n", 1687},
-  {"total", 1688},
-  {"\
-usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1689},
-  {"renice: %s: unknown user\n", 1690},
-  {"renice: %s: bad value\n", 1691},
-  {"getpriority", 1692},
-  {"setpriority", 1693},
-  {"%d: old priority %d, new priority %d\n", 1694},
-  {"usage: %s program [arg ...]\n", 1695},
+\t -V            print version and exit\n", 1695},
+  {"%s Version %s\n", 1696},
+  {"anything\n", 1697},
+  {"Sampling_step: %i\n", 1698},
+  {"%s: %s(%i): wrong map line\n", 1699},
+  {"%s: can't find \"_stext\" in %s\n", 1700},
+  {"total", 1701},
+  {"\
+usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1702},
+  {"renice: %s: unknown user\n", 1703},
+  {"renice: %s: bad value\n", 1704},
+  {"getpriority", 1705},
+  {"setpriority", 1706},
+  {"%d: old priority %d, new priority %d\n", 1707},
+  {"usage: %s program [arg ...]\n", 1708},
   {"\
 Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n\
           -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n\
-          -T [on|off] ]\n", 1696},
-  {"malloc error", 1697},
-  {"%s: bad value\n", 1698},
-  {"%s: %s not an lp device.\n", 1699},
-  {"%s status is %d", 1700},
-  {", busy", 1701},
-  {", ready", 1702},
-  {", out of paper", 1703},
-  {", on-line", 1704},
-  {", error", 1705},
-  {"LPGETIRQ error", 1706},
-  {"%s using IRQ %d\n", 1707},
-  {"%s using polling\n", 1708},
-  {"col: bad -l argument %s.\n", 1709},
-  {"usage: col [-bfpx] [-l nline]\n", 1710},
-  {"col: write error.\n", 1711},
-  {"col: warning: can't back up %s.\n", 1712},
-  {"past first line", 1713},
-  {"-- line already flushed", 1714},
-  {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1715},
-  {"line too long", 1716},
-  {"usage: column [-tx] [-c columns] [file ...]\n", 1717},
-  {"hexdump: bad length value.\n", 1718},
-  {"hexdump: bad skip value.\n", 1719},
-  {"\
-hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1720},
-  {"usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n", 1721},
+          -T [on|off] ]\n", 1709},
+  {"malloc error", 1710},
+  {"%s: bad value\n", 1711},
+  {"%s: %s not an lp device.\n", 1712},
+  {"%s status is %d", 1713},
+  {", busy", 1714},
+  {", ready", 1715},
+  {", out of paper", 1716},
+  {", on-line", 1717},
+  {", error", 1718},
+  {"LPGETIRQ error", 1719},
+  {"%s using IRQ %d\n", 1720},
+  {"%s using polling\n", 1721},
+  {"col: bad -l argument %s.\n", 1722},
+  {"usage: col [-bfpx] [-l nline]\n", 1723},
+  {"col: write error.\n", 1724},
+  {"col: warning: can't back up %s.\n", 1725},
+  {"past first line", 1726},
+  {"-- line already flushed", 1727},
+  {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1728},
+  {"line too long", 1729},
+  {"usage: column [-tx] [-c columns] [file ...]\n", 1730},
+  {"hexdump: bad length value.\n", 1731},
+  {"hexdump: bad skip value.\n", 1732},
+  {"\
+hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1733},
+  {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1734},
   {"\
 \n\
 *** %s: directory ***\n\
-\n", 1722},
+\n", 1735},
   {"\
 \n\
 ******** %s: Not a text file ********\n\
-\n", 1723},
-  {"[Use q or Q to quit]", 1724},
-  {"--More--", 1725},
-  {"(Next file: %s)", 1726},
-  {"[Press space to continue, 'q' to quit.]", 1727},
-  {"...back %d page", 1728},
-  {"...skipping %d line", 1729},
+\n", 1736},
+  {"[Use q or Q to quit]", 1737},
+  {"--More--", 1738},
+  {"(Next file: %s)", 1739},
+  {"[Press space to continue, 'q' to quit.]", 1740},
+  {"...back %d page", 1741},
+  {"...skipping %d line", 1742},
   {"\
 \n\
 ***Back***\n\
-\n", 1730},
-  {"Can't open help file", 1731},
-  {"[Press 'h' for instructions.]", 1732},
-  {"\"%s\" line %d", 1733},
-  {"[Not a file] line %d", 1734},
-  {"  Overflow\n", 1735},
-  {"...skipping\n", 1736},
-  {"Regular expression botch", 1737},
+\n", 1743},
+  {"Can't open help file", 1744},
+  {"[Press 'h' for instructions.]", 1745},
+  {"\"%s\" line %d", 1746},
+  {"[Not a file] line %d", 1747},
+  {"  Overflow\n", 1748},
+  {"...skipping\n", 1749},
+  {"Regular expression botch", 1750},
   {"\
 \n\
-Pattern not found\n", 1738},
-  {"Pattern not found", 1739},
-  {"can't fork\n", 1740},
+Pattern not found\n", 1751},
+  {"Pattern not found", 1752},
+  {"can't fork\n", 1753},
   {"\
 \n\
-...Skipping ", 1741},
-  {"...Skipping ", 1742},
-  {"to file ", 1743},
-  {"back to file ", 1744},
-  {"Line too long", 1745},
-  {"No previous command to substitute for", 1746},
-  {"od: od(1) has been deprecated for hexdump(1).\n", 1747},
-  {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1748},
-  {"; see strings(1).", 1749},
-  {"hexdump: can't read %s.\n", 1750},
-  {"hexdump: line too long.\n", 1751},
-  {"hexdump: byte count with multiple conversion characters.\n", 1752},
-  {"hexdump: bad byte count for conversion character %s.\n", 1753},
-  {"hexdump: %%s requires a precision or a byte count.\n", 1754},
-  {"hexdump: bad format {%s}\n", 1755},
-  {"hexdump: bad conversion character %%%s.\n", 1756},
-  {"Unable to allocate bufferspace\n", 1757},
-  {"usage: rev [file ...]\n", 1758},
-  {"usage: %s [ -i ] [ -tTerm ] file...\n", 1759},
-  {"trouble reading terminfo", 1760},
-  {"Unknown escape sequence in input: %o, %o\n", 1761},
-  {"Unable to allocate buffer.\n", 1762},
-  {"Input line too long.\n", 1763},
-  {"Out of memory when growing buffer.\n", 1764},
-  {"Typematic Rate set to %.1f cps (delay = %d ms)\n", 1765},
-  {"Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n", 1766},
-  {"Cannot open /dev/port", 1767},
+...Skipping ", 1754},
+  {"...Skipping ", 1755},
+  {"to file ", 1756},
+  {"back to file ", 1757},
+  {"Line too long", 1758},
+  {"No previous command to substitute for", 1759},
+  {"od: od(1) has been deprecated for hexdump(1).\n", 1760},
+  {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1761},
+  {"; see strings(1).", 1762},
+  {"hexdump: can't read %s.\n", 1763},
+  {"hexdump: line too long.\n", 1764},
+  {"hexdump: byte count with multiple conversion characters.\n", 1765},
+  {"hexdump: bad byte count for conversion character %s.\n", 1766},
+  {"hexdump: %%s requires a precision or a byte count.\n", 1767},
+  {"hexdump: bad format {%s}\n", 1768},
+  {"hexdump: bad conversion character %%%s.\n", 1769},
+  {"Unable to allocate bufferspace\n", 1770},
+  {"usage: rev [file ...]\n", 1771},
+  {"usage: %s [ -i ] [ -tTerm ] file...\n", 1772},
+  {"trouble reading terminfo", 1773},
+  {"Unknown escape sequence in input: %o, %o\n", 1774},
+  {"Unable to allocate buffer.\n", 1775},
+  {"Input line too long.\n", 1776},
+  {"Out of memory when growing buffer.\n", 1777},
+  {"Typematic Rate set to %.1f cps (delay = %d ms)\n", 1778},
+  {"Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n", 1779},
+  {"Cannot open /dev/port", 1780},
 };
 
-int _msg_tbl_length = 1767;
+int _msg_tbl_length = 1780;
diff --git a/po/cs.po b/po/cs.po
index dc3407e11c..ab7df2fdff 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,92 +4,92 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-2.10d\n"
-"POT-Creation-Date: 2000-02-08 11:01+0100\n"
-"PO-Revision-Date: 2000-02-08 11:13+0100\n"
+"POT-Creation-Date: 2000-10-16 16:44+0200\n"
+"PO-Revision-Date: 2000-07-13 22:39+0200\n"
 "Last-Translator: Ji�� Pavlovsk� <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:146
+#: clock/cmos.c:157
 msgid "booted from MILO\n"
 msgstr "spu�t�n pomoc� MILO\n"
 
-#: clock/cmos.c:155
+#: clock/cmos.c:166
 msgid "Ruffian BCD clock\n"
 msgstr "hodnoty ulo�eny v BCD tvaru\n"
 
-#: clock/cmos.c:171
+#: clock/cmos.c:182
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "vstupn�/v�stupn� port pro p��stup k hodin�m nastaven na 0x%x\n"
 
-#: clock/cmos.c:181
+#: clock/cmos.c:192
 msgid "funky TOY!\n"
 msgstr "pou�it p�ep�na� --funky-toy!\n"
 
-#: clock/cmos.c:235
+#: clock/cmos.c:246
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: 1000 ne�sp�n�ch pokus� o atomick� proveden� %s!"
 
-#: clock/cmos.c:559
+#: clock/cmos.c:570
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port nelze otev��t: %s"
 
-#: clock/cmos.c:566
+#: clock/cmos.c:577
 msgid "I failed to get permission because I didnt try.\n"
 msgstr "Jeliko� jsem se nesna�il, nepoda�ilo se mi z�skat pr�va pro p��stup.\n"
 
-#: clock/cmos.c:569
+#: clock/cmos.c:580
 #, 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"
 
-#: clock/cmos.c:572
+#: clock/cmos.c:583
 msgid "Probably you need root privileges.\n"
 msgstr "Pravd�podobn� je t�eba m�t pr�va superu�ivatele.\n"
 
-#: clock/hwclock.c:213
+#: clock/hwclock.c:219
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "P�edpokl�d�m, �e hodiny re�ln�ho �asu jsou nastaveny na %s �as.\n"
 
-#: clock/hwclock.c:214 clock/hwclock.c:303
+#: clock/hwclock.c:220 clock/hwclock.c:309
 msgid "UTC"
 msgstr "greenwichsk�"
 
-#: clock/hwclock.c:214 clock/hwclock.c:302
+#: clock/hwclock.c:220 clock/hwclock.c:308
 msgid "local"
 msgstr "m�stn�"
 
-#: clock/hwclock.c:286
+#: clock/hwclock.c:292
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Varov�n�: nezn�m� form�t t�et�ho ��dku v souboru adjtime\n"
 
-#: clock/hwclock.c:288
+#: clock/hwclock.c:294
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(O�ek�v�no `UTC', `LOCAL' �i nic.)\n"
 
-#: clock/hwclock.c:297
+#: clock/hwclock.c:303
 #, c-format
 msgid "Last drift adjustment done at %d seconds after 1969\n"
 msgstr "Posledn� oprava posunu prob�hla %d sekund od roku 1969.\n"
 
-#: clock/hwclock.c:299
+#: clock/hwclock.c:305
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
 msgstr "Posledn� kalibrace prob�hla %d sekund od roku 1969.\n"
 
-#: clock/hwclock.c:301
+#: clock/hwclock.c:307
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Hodiny re�ln�ho �asu jsou nastaveny na %s �as.\n"
 
-#: clock/hwclock.c:303
+#: clock/hwclock.c:309
 msgid "unknown"
 msgstr "nezn�m�"
 
@@ -107,42 +107,43 @@ msgstr "nezn�m�"
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:325
+#: clock/hwclock.c:331
 msgid "Waiting for clock tick...\n"
 msgstr "�ek�m na tiknut� hodin...\n"
 
-#: clock/hwclock.c:329
+#: clock/hwclock.c:335
 msgid "...got clock tick\n"
 msgstr "...hodiny tikly\n"
 
-#: clock/hwclock.c:380
+#: clock/hwclock.c:386
 #, c-format
-msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
-"Hodiny re�ln�ho �asu obsahuj� chybn� hodnoty: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+"Hodiny re�ln�ho �asu obsahuj� chybn� hodnoty: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: clock/hwclock.c:389
+#: clock/hwclock.c:394
 #, c-format
-msgid "Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
-"Hodiny re�ln�ho �asu: %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d sekund od roku 1969\n"
+"Hodiny re�ln�ho �asu: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund od roku "
+"1969\n"
 
-#: clock/hwclock.c:417
+#: clock/hwclock.c:422
 #, c-format
-msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
-msgstr "Hodiny re�ln�ho �asu ukazuj� %02d:%02d:%02d\n"
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Hodiny re�ln�ho �asu ukazuj� %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: clock/hwclock.c:443
+#: clock/hwclock.c:449
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
 msgstr ""
 "Nastavuji hodiny re�ln�ho �asu na %.2d:%.2d:%.2d = %d sekund od roku 1969\n"
 
-#: clock/hwclock.c:449
+#: clock/hwclock.c:455
 msgid "Clock not changed - testing only.\n"
 msgstr "Testovac� re�im - �as nezm�n�n.\n"
 
-#: clock/hwclock.c:497
+#: clock/hwclock.c:503
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -151,7 +152,7 @@ msgstr ""
 "Po�et sekund uplynul�ch od referen�n�ho �asu: %.6f.\n"
 "�ek�m, dokud neuplyne dal�� cel� sekunda.\n"
 
-#: clock/hwclock.c:521
+#: clock/hwclock.c:527
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
@@ -165,39 +166,39 @@ msgstr ""
 #.
 #. Compute display value for time
 #. Cut off trailing newline
-#: clock/hwclock.c:533
+#: clock/hwclock.c:539
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f sekundy\n"
 
-#: clock/hwclock.c:567
+#: clock/hwclock.c:573
 msgid "No --date option specified.\n"
 msgstr "P�ep�na� --date vy�aduje argument.\n"
 
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:572
+#: clock/hwclock.c:578
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
 "Argument p�ep�na�e --date nen� platn�m datem. Konkr�tn� obsahuje uvozovky.\n"
 
-#: clock/hwclock.c:578
+#: clock/hwclock.c:584
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Spou�t�m p��kaz 'date': %s\n"
 
-#: clock/hwclock.c:582
+#: clock/hwclock.c:588
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr "P��kaz 'date' nelze v shellu /bin/sh spustit. Vol�n� popen() selhalo."
 
-#: clock/hwclock.c:588
+#: clock/hwclock.c:594
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "odpov�� p��kazu 'date' = %s\n"
 
-#: clock/hwclock.c:590
+#: clock/hwclock.c:596
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -212,11 +213,11 @@ msgstr ""
 "Odpov��:\n"
 "  %s\n"
 
-#: clock/hwclock.c:599
+#: clock/hwclock.c:605
 #, c-format
 msgid ""
-"The date command issued by %s returnedsomething other than an integer where "
-"the convertedtime value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
@@ -229,12 +230,12 @@ msgstr ""
 "Odpov��:\n"
 "  %s\n"
 
-#: clock/hwclock.c:609
+#: clock/hwclock.c:615
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr "Datum %s odpov�d� %d sekund�m od roku 1969.\n"
 
-#: clock/hwclock.c:641
+#: clock/hwclock.c:647
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
@@ -242,33 +243,33 @@ msgstr ""
 "Syst�mov� �as nelze podle hodin re�ln�ho �asu nastavit, proto�e neukazuj�\n"
 "platn� �as.\n"
 
-#: clock/hwclock.c:654
+#: clock/hwclock.c:669
 msgid "Calling settimeofday:\n"
 msgstr "Vol�m settimeofday:\n"
 
-#: clock/hwclock.c:655
+#: clock/hwclock.c:670
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: clock/hwclock.c:657
+#: clock/hwclock.c:672
 #, c-format
-msgid "\ttz.tz_minuteswest = %ld\n"
-msgstr "\ttz.tz_minuteswest = %ld\n"
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: clock/hwclock.c:660
+#: clock/hwclock.c:675
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Testovac� re�im - syst�mov� �as nezm�n�n.\n"
 
-#: clock/hwclock.c:673
+#: clock/hwclock.c:683
 msgid "Must be superuser to set system clock.\n"
 msgstr "Nastavit syst�mov� �as m��e pouze superu�ivatel.\n"
 
-#: clock/hwclock.c:675
+#: clock/hwclock.c:685
 msgid "settimeofday() failed"
 msgstr "vol�n� settimeofday() selhalo"
 
-#: clock/hwclock.c:708
+#: clock/hwclock.c:718
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
@@ -276,7 +277,7 @@ msgstr ""
 "Neopravuji m�ru posunu, proto�e hodiny re�ln�ho �asu posledn� obsahovaly\n"
 "neplatn� hodnoty.\n"
 
-#: clock/hwclock.c:712
+#: clock/hwclock.c:722
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
@@ -284,7 +285,7 @@ msgstr ""
 "Neopravuji m�ru posunu, proto�e posledn� kalibrace je�t� neuplynul cel� "
 "den.\n"
 
-#: clock/hwclock.c:721
+#: clock/hwclock.c:731
 #, c-format
 msgid ""
 "Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
@@ -296,21 +297,21 @@ msgstr ""
 "je nastavena na %3$f sekund/den.\n"
 "Opravuji m�ru posunu o %4$f sekund.\n"
 
-#: clock/hwclock.c:772
+#: clock/hwclock.c:782
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Po�et sekund od posledn� opravy: %d\n"
 
-#: clock/hwclock.c:774
+#: clock/hwclock.c:784
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "Pot�ebn� zm�na �asu: sekund vp�ed: %d ; sekund zp�t: %.6f\n"
 
-#: clock/hwclock.c:803
+#: clock/hwclock.c:813
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Testovac� re�im - soubor adjtime nezm�n�n.\n"
 
-#: clock/hwclock.c:804
+#: clock/hwclock.c:814
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -319,33 +320,33 @@ msgstr ""
 "Do %s by bylo ulo�eno n�sleduj�c�:\n"
 "%s"
 
-#: clock/hwclock.c:828
+#: clock/hwclock.c:838
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Parametry opravy posunu nezm�n�ny.\n"
 
-#: clock/hwclock.c:869
+#: clock/hwclock.c:879
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr "Hodiny re�ln�ho �asu obsahuj� neplatn� �as, tud�� jej nelze opravit.\n"
 
-#: clock/hwclock.c:893
+#: clock/hwclock.c:903
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "Pot�ebn� oprava je men�� ne� 1 sekunda, proto hodiny nenastavuji.\n"
 
-#: clock/hwclock.c:919
+#: clock/hwclock.c:929
 #, c-format
 msgid "Using %s.\n"
 msgstr "Pou��v�m %s.\n"
 
-#: clock/hwclock.c:921
+#: clock/hwclock.c:931
 msgid "No usable clock interface found.\n"
 msgstr "Nebylo nalezeno ��dn� pou�iteln� rozhran� k hodin�m.\n"
 
-#: clock/hwclock.c:1016
+#: clock/hwclock.c:1026
 msgid "Unable to set system clock.\n"
 msgstr "Syst�mov� �as nelze nastavit.\n"
 
-#: clock/hwclock.c:1045
+#: clock/hwclock.c:1055
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
 "machine.\n"
@@ -358,31 +359,32 @@ msgstr ""
 "Tento program nebyl p�elo�en pro Alpha syst�m ( a tud�� pravd�podobn� nyn�\n"
 "neb�� na Alph�). Ignorov�no.\n"
 
-#: clock/hwclock.c:1054
+#: clock/hwclock.c:1064
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Po��tek epochy nelze z j�dra zjistit.\n"
 
-#: clock/hwclock.c:1056
+#: clock/hwclock.c:1066
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "J�dro pokl�d� za po��tek epochy %lu.\n"
 
-#: clock/hwclock.c:1059
+#: clock/hwclock.c:1069
 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"
 
-#: clock/hwclock.c:1062
+#: clock/hwclock.c:1072
 #, 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"
 
-#: clock/hwclock.c:1065
+#: clock/hwclock.c:1075
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Hodnotu po��tku epochy v j�d�e nelze nastavit.\n"
 
-#: clock/hwclock.c:1088
+#: clock/hwclock.c:1104
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -404,7 +406,7 @@ msgid ""
 "Options: \n"
 "  --utc         the hardware clock is kept in coordinated universal time\n"
 "  --localtime   the hardware clock is kept in local time\n"
-"  --directisa   access the ISA bus directly instead of /dev/rtc\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
 "  --badyear     ignore rtc's year because the bios is broken\n"
 "  --date        specifies the time to which to set the hardware clock\n"
 "  --epoch=year  specifies the year which is the beginning of the \n"
@@ -430,12 +432,12 @@ msgstr ""
 "Volby: \n"
 "  --utc         hodiny re�ln�ho �asu jsou nastaveny na UTC\n"
 "  --localtime   hodiny re�ln�ho �asu jsou nastaveny na m�stn� �as\n"
-"  --directisa   m�sto /dev/rtc pou�ije p��mo ISA sb�rnici\n"
+"  --directisa   m�sto %s pou�ije p��mo ISA sb�rnici\n"
 "  --badyear     ignoruje rok RTC, proto�e BIOS je chybn�\n"
 "  --date        �as, na kter� budou nastaveny hodiny re�ln�ho �asu\n"
 "  --epoch=ROK   nastav� po��tek epochy pro hodiny re�ln�ho �asu na ROK\n"
 
-#: clock/hwclock.c:1113
+#: clock/hwclock.c:1129
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -443,13 +445,13 @@ msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                nastav� typ alpha syst�mu (viz hwclock(8))\n"
 
-#: clock/hwclock.c:1209
+#: clock/hwclock.c:1227
 #, 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"
 
-#: clock/hwclock.c:1219
+#: clock/hwclock.c:1237
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
@@ -457,34 +459,41 @@ msgstr ""
 "Zadal jste v�cero funk�n�ch p�ep�na��. Program m��e prov�st maxim�ln� jednu\n"
 "funkci najednou.\n"
 
-#: clock/hwclock.c:1225
+#: clock/hwclock.c:1243
 #, 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"
 
-#: clock/hwclock.c:1238
+#: clock/hwclock.c:1256
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Nebyl zad�n platn� �as, kter� m�m nastavit. Hodiny nelze nastavit.\n"
 
-#: clock/hwclock.c:1253
+#: clock/hwclock.c:1271
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Hodiny re�ln�ho �asu m��e nastavit pouze superu�ivatel.\n"
 
-#: clock/hwclock.c:1257
+#: clock/hwclock.c:1275
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "Hodiny re�ln�ho �asu m��e nastavit pouze superu�ivatel.\n"
+
+#: clock/hwclock.c:1279
 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"
 
-#: clock/hwclock.c:1275
-msgid ""
-"Cannot access the Hardware Clock via any known method.  Use --debug option "
-"to see the details of our search for an access method.\n"
+#: clock/hwclock.c:1299
+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"
-"Pro zji�t�n� podrobnost� pou�ijte p�ep�na� --debug.\n"
+
+#: clock/hwclock.c:1302
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr "Pro zji�t�n� podrobnost� pou�ijte p�ep�na� --debug.\n"
 
 #: clock/kd.c:41
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
@@ -494,7 +503,7 @@ msgstr "Ve smy�ce se pokou��m zjistit �as pomoc� KDGHWCLK.\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "vol�n� KDGHWCLK ioctl selhalo."
 
-#: clock/kd.c:65 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
 msgstr "V �asov�m limitu se nepoda�ilo zjistit �as.\n"
 
@@ -514,103 +523,108 @@ msgstr "vol�n� ioctl() pro /dev/tty1 selhalo"
 msgid "KDGHWCLK ioctl failed"
 msgstr "vol�n� ioctl KDGHWCLK selhalo"
 
-#: clock/kd.c:161
+#: clock/kd.c:163
 msgid "Can't open /dev/tty1"
 msgstr "/dev/tty1 nelze otev��t"
 
-#: clock/rtc.c:98
-msgid "ioctl() to /dev/rtc to read the time failed.\n"
-msgstr "�as se pomoc� vol�n� ioctl() pro /dev/rtc nepoda�ilo zjistit\n"
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "�as se pomoc� vol�n� ioctl() pro %s nepoda�ilo zjistit\n"
 
-#: clock/rtc.c:129
-msgid "Waiting in loop for time from /dev/rtc to change\n"
-msgstr "Ve smy�ce se pokou��m zjistit �as z /dev/rtc.\n"
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Ve smy�ce se pokou��m zjistit �as z %s.\n"
 
-#: clock/rtc.c:165 clock/rtc.c:222
-msgid "open() of /dev/rtc failed"
-msgstr "/dev/rtc nelze otev��t - vol�n� open() selhalo"
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "%s nelze otev��t - vol�n� open() selhalo"
 
-#. This rtc device doesn't have interrupt functions.  This is typical
-#. on an Alpha, where the Hardware Clock interrupts are used by the
-#. kernel for the system clock, so aren't at the user's disposal.
-#.
-#: clock/rtc.c:182
-msgid "/dev/rtc does not have interrupt functions. "
-msgstr "/dev/rtc nem� p�eru�ovac� funkce. "
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s nem� p�eru�ovac� funkce. "
 
-#: clock/rtc.c:191
-msgid "read() to /dev/rtc to wait for clock tick failed"
-msgstr "tik�n� hodin nelze z /dev/rtc ��st - vol�n� read() selhalo"
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "tik�n� hodin nelze z %s ��st - vol�n� read() selhalo"
 
-#: clock/rtc.c:199
-msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
-msgstr ""
-"obnovovac� p�eru�en� nelze vypnout - vol�n� ioctl() pro /dev/rtc selhalo"
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "obnovovac� p�eru�en� nelze vypnout - vol�n� ioctl() pro %s selhalo"
 
-#: clock/rtc.c:202
-msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
-msgstr ""
-"obnovovac� p�eru�en� nelze zapnout - vol�n� ioctl() pro /dev/rtc selhalo"
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
+msgstr "obnovovac� p�eru�en� nelze zapnout - vol�n� ioctl() pro %s selhalo"
 
-#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
-msgid "Unable to open /dev/rtc"
-msgstr "/dev/rtc nelze otev��t."
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s nelze otev��t."
 
-#: clock/rtc.c:268
-msgid "ioctl() to /dev/rtc to set the time failed.\n"
-msgstr "�as nelze nastavit - vol�n� ioctl() pro /dev/rtc selhalo.\n"
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "�as nelze nastavit - vol�n� ioctl() pro %s selhalo.\n"
 
-#: clock/rtc.c:272
+#: clock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "Vol�n� ioctl(%s) bylo �sp�n�.\n"
 
-#: clock/rtc.c:302
-msgid "Open of /dev/rtc failed"
-msgstr "/dev/rtc nelze otev��t."
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "%s nelze otev��t."
 
-#: clock/rtc.c:320 clock/rtc.c:365
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file /dev/rtc.  This file does not "
-"exist on this system.\n"
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
 msgstr ""
 "Pro zm�nu hodnoty po��tku epochy v j�d�e je nutn� m�t p��stup ke zvl�tn�mu\n"
-"souboru /dev/rtc. Tento soubor neexistuje.\n"
+"souboru %s. Tento soubor neexistuje.\n"
 
-#: clock/rtc.c:331
-msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
-msgstr "vol�n�(RTC_EPOCH_READ) pro /dev/rtc selhalo"
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "vol�n�(RTC_EPOCH_READ) pro %s selhalo"
 
-#: clock/rtc.c:337
+#: clock/rtc.c:344
 #, c-format
-msgid "we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
-"Z /dev/rtc byl pomoc� RTC_EPOCH_READ ioctl zji�t�n po��tek epochy (%ld).\n"
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "epoch %ld: Z %s byl pomoc� RTC_EPOCH_READ ioctl zji�t�n po��tek epochy.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: clock/rtc.c:357
+#: clock/rtc.c:364
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "Hodnota po��tku epochy nesm� b�t men�� ne� 1900 (po�adov�no %ld).\n"
 
-#: clock/rtc.c:374
+#: clock/rtc.c:381
 #, c-format
-msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
-msgstr ""
-"Nastavuji pomoc� RTC_EPOCH_SET ioctl pro /dev/rtc po��tek epochy na %ld.\n"
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "epoch %ld: Nastavuji pomoc� RTC_EPOCH_SET ioctl pro %s po��tek epochy na --.\n"
 
-#: clock/rtc.c:379
+#: clock/rtc.c:386
+#, c-format
 msgid ""
-"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
-"ioctl.\n"
-msgstr "Ovlada� j�dra pro /dev/rtc nepodporuje RTC_EPOCH_SET ioctl.\n"
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "Ovlada� j�dra pro %s nepodporuje RTC_EPOCH_SET ioctl.\n"
 
-#: clock/rtc.c:382
-msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
-msgstr "vol�n� ioctl(RTC_EPOCH_SET) pro /dev/rtc selhalo"
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "vol�n� ioctl(RTC_EPOCH_SET) pro %s selhalo"
 
 #: clock/shhopt.c:255 clock/shhopt.c:281
 #, c-format
@@ -642,83 +656,83 @@ msgstr "p�ep�na� `%s' mus� b�t zad�n bez argumentu\n"
 msgid "unrecognized option `-%c'\n"
 msgstr "nezn�m� p�ep�na� `-%c'\n"
 
-#: disk-utils/blockdev.c:34
+#: disk-utils/blockdev.c:47
 msgid "set read-only"
 msgstr "nastav� pouze pro �ten�"
 
-#: disk-utils/blockdev.c:35
+#: disk-utils/blockdev.c:48
 msgid "set read-write"
 msgstr "nastav� pro �ten�/z�pis"
 
-#: disk-utils/blockdev.c:38
+#: disk-utils/blockdev.c:51
 msgid "get read-only"
 msgstr "zjist� zda je zak�z�n z�pis"
 
-#: disk-utils/blockdev.c:41
+#: disk-utils/blockdev.c:54
 msgid "get sectorsize"
 msgstr "zjist� velikost sektoru"
 
-#: disk-utils/blockdev.c:44
+#: disk-utils/blockdev.c:57
 msgid "get size"
 msgstr "zjist� velikost"
 
-#: disk-utils/blockdev.c:47
+#: disk-utils/blockdev.c:60
 msgid "set readahead"
 msgstr "nastav� dop�edn� �ten� sektor�"
 
-#: disk-utils/blockdev.c:50
+#: disk-utils/blockdev.c:63
 msgid "get readahead"
 msgstr "zjist� nastaven� dop�edn�ho �ten� sektor�"
 
-#: disk-utils/blockdev.c:53
+#: disk-utils/blockdev.c:66
 msgid "flush buffers"
 msgstr "vypr�zdnit buffery"
 
-#: disk-utils/blockdev.c:57
+#: disk-utils/blockdev.c:70
 msgid "reread partition table"
 msgstr "na�te znovu tabulku rozd�len� disku"
 
-#: disk-utils/blockdev.c:66
+#: disk-utils/blockdev.c:79
 #, c-format
 msgid "Usage: %s [-V] [-v|-q] commands devices\n"
 msgstr "Pou�it�: %s [-V] [-v|-q] p�ep�na�e za��zen�\n"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:80
 msgid "Available commands:\n"
 msgstr "Dostupn� p��kazy:\n"
 
-#: disk-utils/blockdev.c:167
+#: disk-utils/blockdev.c:180
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: nezn�m� p��kaz %s\n"
 
-#: disk-utils/blockdev.c:178
+#: disk-utils/blockdev.c:191
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "p�ep�na� %s vy�aduje argument\n"
 
-#: disk-utils/fdformat.c:33
+#: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Form�tuji ... "
 
-#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
 msgstr "hotovo\n"
 
-#: disk-utils/fdformat.c:62
+#: disk-utils/fdformat.c:65
 msgid "Verifying ... "
 msgstr "Ov��uji ... "
 
-#: disk-utils/fdformat.c:73
+#: disk-utils/fdformat.c:76
 msgid "Read: "
 msgstr "Chyba p�i �ten�: "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:78
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
 msgstr "Chyba p�i �ten� cylindru %d, p�edpoklad %d, p�e�teno %d\n"
 
-#: disk-utils/fdformat.c:81
+#: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
@@ -727,80 +741,80 @@ msgstr ""
 "chybn� data v cylindru %d\n"
 "Pokra�uji ... "
 
-#: disk-utils/fdformat.c:96
+#: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
 msgstr "Pou�it�: %s [ -n ] za��zen�\n"
 
-#: disk-utils/fdformat.c:117 disk-utils/fsck.minix.c:1255 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:650 disk-utils/mkswap.c:351
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:175 misc-utils/ddate.c:172
-#: misc-utils/kill.c:191
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:448
+#: disk-utils/setfdprm.c:128 misc-utils/cal.c:172 misc-utils/ddate.c:181
+#: misc-utils/kill.c:192
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s na %s\n"
 
-#: disk-utils/fdformat.c:131
+#: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
 msgstr "%s nen� za��zen�m pru�n�ho disku\n"
 
-#: disk-utils/fdformat.c:137
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
 msgstr "Typ form�tu nelze zjistit"
 
-#: disk-utils/fdformat.c:138
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "stran: %s, stop: %d, sekt/stopu %d. Celkov� kapacita %d kB.\n"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Double"
 msgstr "2"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Single"
 msgstr "1"
 
-#: disk-utils/fsck.minix.c:196
+#: disk-utils/fsck.minix.c:197
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Pou�it�: %s [ -larvsmf ] jm�no za��zen�\n"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:296
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s je ji� p�ipojeno.\t"
 
-#: disk-utils/fsck.minix.c:296
+#: disk-utils/fsck.minix.c:298
 msgid "Do you really want to continue"
 msgstr "Chcete opravdu pokra�ovat"
 
-#: disk-utils/fsck.minix.c:300
+#: disk-utils/fsck.minix.c:302
 msgid "check aborted.\n"
 msgstr "prohl�dka ukon�ena.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:337
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
 msgid "Zone nr < FIRSTZONE in file `"
 msgstr "��slo Z�ny < FIRSTZONE v souboru `"
 
-#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
 msgid "Zone nr >= ZONES in file `"
 msgstr "��slo Z�ny >= po�et Z�N v souboru `"
 
-#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
 msgid "Remove block"
 msgstr "Odstranit blok"
 
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:364
 msgid "Read error: unable to seek to block in file '"
 msgstr "Chyba p�i �ten�: nelze posunout ukazov�tko na blok v souboru '"
 
-#: disk-utils/fsck.minix.c:368
+#: disk-utils/fsck.minix.c:370
 msgid "Read error: bad block in file '"
 msgstr "Chyba p�i �ten�: chybn� blok v souboru '"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:386
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -808,284 +822,284 @@ msgstr ""
 "Vnit�n� chyba: pokus o z�pis chybn�ho bloku.\n"
 "��dost o z�pis ignorov�na.\n"
 
-#: disk-utils/fsck.minix.c:390 disk-utils/mkfs.minix.c:289
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
 msgid "seek failed in write_block"
 msgstr "chyba p�i posunu ukazov�tka ve write_block"
 
-#: disk-utils/fsck.minix.c:392
+#: disk-utils/fsck.minix.c:394
 msgid "Write error: bad block in file '"
 msgstr "Chyba p�i z�pisu: chybn� blok v souboru '"
 
-#: disk-utils/fsck.minix.c:511
+#: disk-utils/fsck.minix.c:513
 msgid "seek failed in write_super_block"
 msgstr "chyba p�i posunu ukazov�tka ve write_super_block"
 
-#: disk-utils/fsck.minix.c:513 disk-utils/mkfs.minix.c:276
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr "superblok nelze zapsat"
 
-#: disk-utils/fsck.minix.c:523
+#: disk-utils/fsck.minix.c:525
 msgid "Unable to write inode map"
 msgstr "mapu i-uzl� nelze zapsat"
 
-#: disk-utils/fsck.minix.c:525
+#: disk-utils/fsck.minix.c:527
 msgid "Unable to write zone map"
 msgstr "mapu z�n nelze zapsat"
 
-#: disk-utils/fsck.minix.c:527
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inodes"
 msgstr "i-uzly nelze zapsat"
 
-#: disk-utils/fsck.minix.c:556
+#: disk-utils/fsck.minix.c:558
 msgid "seek failed"
 msgstr "chyba p�i posunu ukazov�tka"
 
-#: disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.minix.c:560
 msgid "unable to read super block"
 msgstr "superblok nelze ��st"
 
-#: disk-utils/fsck.minix.c:578
+#: disk-utils/fsck.minix.c:580
 msgid "bad magic number in super-block"
 msgstr "superblok obsahuje chybn� magick� ��slo"
 
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:582
 msgid "Only 1k blocks/zones supported"
 msgstr "podporov�ny jsou pouze 1kilobajtov� bloky/z�ny"
 
-#: disk-utils/fsck.minix.c:582
+#: disk-utils/fsck.minix.c:584
 msgid "bad s_imap_blocks field in super-block"
 msgstr "superblok obsahuje chybnou polo�ku s_imap_blocks"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:586
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "superblok obsahuje chybnou polo�ku s_zmap_blocks"
 
-#: disk-utils/fsck.minix.c:591
+#: disk-utils/fsck.minix.c:593
 msgid "Unable to allocate buffer for inode map"
 msgstr "buffer pro mapu i-uzl� nelze alokovat"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inodes"
 msgstr "buffer pro i-uzly nelze alokovat"
 
-#: disk-utils/fsck.minix.c:602
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for inode count"
 msgstr "buffer pro po��tadlo i-uzl� nelze alokovat"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:607
 msgid "Unable to allocate buffer for zone count"
 msgstr "buffer pro po��tadlo z�n nelze alokovat"
 
-#: disk-utils/fsck.minix.c:607
+#: disk-utils/fsck.minix.c:609
 msgid "Unable to read inode map"
 msgstr "mapu i-uzl� nelze ��st"
 
-#: disk-utils/fsck.minix.c:609
+#: disk-utils/fsck.minix.c:611
 msgid "Unable to read zone map"
 msgstr "mapu z�n nelze ��st"
 
-#: disk-utils/fsck.minix.c:611
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to read inodes"
 msgstr "i-uzly nelze ��st"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:615
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Varov�n�: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:532
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "i-uzl�: %ld\n"
 
-#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:533
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "blok�: %ld\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Velikost z�ny=%d\n"
 
-#: disk-utils/fsck.minix.c:622
+#: disk-utils/fsck.minix.c:624
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxvelikost=%ld\n"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:625
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stav syst�mu soubor�=%d\n"
 
-#: disk-utils/fsck.minix.c:624
+#: disk-utils/fsck.minix.c:626
 #, c-format
 msgid ""
 "namelen=%d\n"
 "\n"
 msgstr "namelen=%d\n"
 
-#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:690
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
 msgid "Inode %d marked not used, but used for file '"
 msgstr "I-uzel %d je ozna�en jako nepou��van�, ale je pou�it pro soubor '"
 
-#: disk-utils/fsck.minix.c:643 disk-utils/fsck.minix.c:694
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
 msgstr "Ozna�en jako pou��van�"
 
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:714
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
 msgstr " m�d je %05o\n"
 
-#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
 msgid "Warning: inode count too big.\n"
 msgstr "Varov�n�: po�et i-uzl� je p��li� velik�.\n"
 
-#: disk-utils/fsck.minix.c:732
+#: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
 msgstr "root i-uzel nen� adres��em"
 
-#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:789
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
 msgid "Block has been used before. Now in file `"
 msgstr "Blok byl pou�it ji� p�edt�m. Nyn� v souboru `"
 
-#: disk-utils/fsck.minix.c:758 disk-utils/fsck.minix.c:792
-#: disk-utils/fsck.minix.c:1120 disk-utils/fsck.minix.c:1129
-#: disk-utils/fsck.minix.c:1173 disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
 msgid "Clear"
 msgstr "Smazat"
 
-#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:801
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
 msgstr "Blok %d v souboru `"
 
-#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
 msgstr "  je ozna�en jako nepou��van�."
 
-#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
 msgstr "Opravit"
 
-#: disk-utils/fsck.minix.c:954 disk-utils/fsck.minix.c:1018
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
 msgid " contains a bad inode number for file '"
 msgstr " obsahuje chybn� ��slo i-uzlu pro soubor '"
 
-#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
 msgstr " Odstranit"
 
-#: disk-utils/fsck.minix.c:970 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
 msgid ": bad directory: '.' isn't first\n"
 msgstr ": chybn� adres��: '.' nen� prvn�\n"
 
-#: disk-utils/fsck.minix.c:977 disk-utils/fsck.minix.c:1042
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
 msgid ": bad directory: '..' isn't second\n"
 msgstr ": chybn� adres��: '..' nen� druh�\n"
 
-#: disk-utils/fsck.minix.c:1074
+#: disk-utils/fsck.minix.c:1070
 msgid "internal error"
 msgstr "vnit�n� chyba"
 
-#: disk-utils/fsck.minix.c:1077
+#: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
 msgstr ": chybn� adres��: velikost<32"
 
-#: disk-utils/fsck.minix.c:1096
+#: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
 msgstr ": chybn� adres��: velikost < 32"
 
-#: disk-utils/fsck.minix.c:1109
+#: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
 msgstr "chyba p�i posunu ukazov�tka v bad_zone"
 
-#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1172
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "M�d I-uzlu %d nen� smaz�n."
 
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "I-uzel %d nen� pou��v�n a v bitmap� ozna�en jako pou��van�."
 
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1187
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "I-uzel %d je pou��v�n a v bitmap� ozna�en jako nepou��van�."
 
-#: disk-utils/fsck.minix.c:1140 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-uzel %d (mode = %07o), i_nlinks=%d, napo��t�no=%d."
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 msgid "Set i_nlinks to count"
 msgstr "Nastavit i_nlinks na po�et"
 
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Z�na %d je ozna�ena jako pou��van� a ��dn� soubory ji nepou��vaj�."
 
-#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1207
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Odzna�it"
 
-#: disk-utils/fsck.minix.c:1159 disk-utils/fsck.minix.c:1211
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
 #, c-format
 msgid "Zone %d: %sin use, counted=%d\n"
 msgstr "Z�na %d: %spou��van�, napo��t�no=%d\n"
 
-#: disk-utils/fsck.minix.c:1160 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
 msgstr "nen� "
 
-#: disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1182
 msgid "Set"
 msgstr "Nastavit"
 
-#: disk-utils/fsck.minix.c:1260 disk-utils/mkfs.minix.c:655
-#: disk-utils/mkfs.minix.c:658
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
 msgid "bad inode size"
 msgstr "chybn� velikost i-uzlu"
 
-#: disk-utils/fsck.minix.c:1263
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "chybn� velikost v2 i-uzlu"
 
-#: disk-utils/fsck.minix.c:1289
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "opravy s ��ast� u�ivatele vy�aduj� termin�l"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "'%s' nelze otev��t"
 
-#: disk-utils/fsck.minix.c:1308
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s je '�ist�', ov��ov�n� vynech�no.\n"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Kontrola syst�mu soubor� na %s vynucena.\n"
 
-#: disk-utils/fsck.minix.c:1314
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Syst�m soubor� na %s je '�pinav�', je t�eba jej zkontrolovat.\n"
 
-#: disk-utils/fsck.minix.c:1343
+#: disk-utils/fsck.minix.c:1336
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
@@ -1093,12 +1107,12 @@ msgstr ""
 "\n"
 "pou��van�ch i-uzl�: %6ld (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "pou��van�ch z�n: %6ld (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1350
-#, c-format
+#: disk-utils/fsck.minix.c:1343
+#, c-format, ycp-format
 msgid ""
 "\n"
 "%6d regular files\n"
@@ -1120,7 +1134,7 @@ msgstr ""
 "------\n"
 "soubor�:              %6d\n"
 
-#: disk-utils/fsck.minix.c:1363
+#: disk-utils/fsck.minix.c:1356
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -1134,8 +1148,8 @@ msgstr ""
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Pou�it�: mkfs [-V] [-t sstyp] [ss-volby] za��zen� [velikost]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Nedostatek pam�ti!\n"
@@ -1145,63 +1159,63 @@ msgstr "%s: Nedostatek pam�ti!\n"
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs verze %s (%s)\n"
 
-#: disk-utils/mkfs.minix.c:185
+#: disk-utils/mkfs.minix.c:179
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Pou�it�: %s [ -n ] [-c | -l soubor] [-nXX] [-iXX] /dev/jm�no [bloky]\n"
 
-#: disk-utils/mkfs.minix.c:209
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s je p�ipojeno; syst�m soubor� zde vytv��et nebudu!"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
 msgstr "chyba p�i posunu ukazov�tka na startovac� blok ve write_tables"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
 msgstr "startovac� blok nelze smazat"
 
-#: disk-utils/mkfs.minix.c:274
+#: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
 msgstr "chyba p�i posunu ukazov�tka ve write_tables"
 
-#: disk-utils/mkfs.minix.c:278
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
 msgstr "mapu i-uzl� nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:280
+#: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
 msgstr "mapu z�n nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:282
+#: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
 msgstr "i-uzly nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:291
+#: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
 msgstr "chyba p�i z�pisu ve write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:299 disk-utils/mkfs.minix.c:373
-#: disk-utils/mkfs.minix.c:424
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
 msgid "too many bad blocks"
 msgstr "p��li� mnoho chybn�ch blok�"
 
-#: disk-utils/mkfs.minix.c:307
+#: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
 msgstr "nedostatek korektn�ch blok�"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
 msgstr "buffery pro mapy nelze alokovat"
 
-#: disk-utils/mkfs.minix.c:530
+#: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
 msgstr "buffery pro i-uzly nelze alokovat"
 
-#: disk-utils/mkfs.minix.c:536
+#: disk-utils/mkfs.minix.c:528
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1210,132 +1224,134 @@ msgstr ""
 "Maxvelikost=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:550
+#: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
 msgstr "chyba p�i posunu ukazov�tka v pr�b�hu kontroly blok�"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:550
 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:589 disk-utils/mkswap.c:261
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
 msgid "seek failed in check_blocks"
 msgstr "chyba p�i posunu ukazov�tka v check_blocks"
 
-#: disk-utils/mkfs.minix.c:598
+#: disk-utils/mkfs.minix.c:590
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "chybn� bloky p�ed datovou oblast�: syst�m soubor� nelze vytvo�it"
 
-#: disk-utils/mkfs.minix.c:604 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "chybn�ch blok�: %d\n"
 
-#: disk-utils/mkfs.minix.c:606 disk-utils/mkfs.minix.c:628
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
 msgstr "chybn�ch blok�: 1\n"
 
-#: disk-utils/mkfs.minix.c:618
+#: disk-utils/mkfs.minix.c:608
 msgid "can't open file of bad blocks"
 msgstr "soubor chybn�ch blok� nelze otev��t"
 
-#: disk-utils/mkfs.minix.c:687
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
 msgstr "p�i p�ekladu %s nebyla zvolena podpora minix v2\n"
 
-#: disk-utils/mkfs.minix.c:703
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "chyba strtol: po�et blok� nebyl zad�n"
 
-#: disk-utils/mkfs.minix.c:735
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
 msgstr "%s nelze otev��t"
 
-#: disk-utils/mkfs.minix.c:737
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
 msgstr "o %s nelze z�skat informace"
 
-#: disk-utils/mkfs.minix.c:741
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "nebudu se pokou�et vytvo�it syst�m soubor� na '%s'"
 
-#: disk-utils/mkswap.c:117
+#: disk-utils/mkswap.c:174
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Zadadan� velikost str�nky (%d) je chybn�.\n"
 
-#: disk-utils/mkswap.c:126
+#: disk-utils/mkswap.c:183
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr "Pou��v�m zadanou velikost str�nky (%d) m�sto implicitn�ch hodnot (%d/%d).\n"
+msgstr ""
+"Pou��v�m zadanou velikost str�nky (%d) m�sto implicitn�ch hodnot (%d/%d).\n"
 
-#: disk-utils/mkswap.c:130
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "P�edpokl�d�m velikost str�nek %d (nikoliv %d)\n"
 
-#: disk-utils/mkswap.c:215
+#: disk-utils/mkswap.c:312
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr "Pou�it�: %s [-c] [-v0|-v1] [-pVELIKOST STR�NKY] jm�no za��zen� [bloky]\n"
+msgstr ""
+"Pou�it�: %s [-c] [-v0|-v1] [-pVELIKOST STR�NKY] jm�no za��zen� [bloky]\n"
 
-#: disk-utils/mkswap.c:238
+#: disk-utils/mkswap.c:335
 msgid "too many bad pages"
 msgstr "p��li� mnoho chybn�ch str�nek"
 
-#: disk-utils/mkswap.c:252 misc-utils/look.c:170 misc-utils/setterm.c:1100
-#: text-utils/more.c:1863 text-utils/more.c:1874
+#: disk-utils/mkswap.c:349 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1851 text-utils/more.c:1862
 msgid "Out of memory"
 msgstr "Nedostatek pam�ti"
 
-#: disk-utils/mkswap.c:269
+#: disk-utils/mkswap.c:366
 msgid "one bad page\n"
 msgstr "chybn�ch str�nek: 1\n"
 
-#: disk-utils/mkswap.c:271
+#: disk-utils/mkswap.c:368
 #, c-format
 msgid "%d bad pages\n"
 msgstr "chybn�ch str�nek: %d\n"
 
-#: disk-utils/mkswap.c:391
+#: disk-utils/mkswap.c:488
 #, 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:409
+#: disk-utils/mkswap.c:506
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
 msgstr "%s: chyba: zadan� velikost (%ld) je v�t�� ne� velikost za��zen� (%d)\n"
 
-#: disk-utils/mkswap.c:427
+#: disk-utils/mkswap.c:525
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: chyba: nezn�m� verze %d\n"
 
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:531
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: chyba: minim�ln� velikost odkl�dac�ho prostoru je %ldkB\n"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:550
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: varov�n�: odkl�dac� prostor useknut na %ldkB\n"
 
-#: disk-utils/mkswap.c:464
+#: disk-utils/mkswap.c:562
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "nebudu se pokou�et vytvo�it odkl�dac� za��zen� '%s'"
 
-#: disk-utils/mkswap.c:473 disk-utils/mkswap.c:494
+#: disk-utils/mkswap.c:571 disk-utils/mkswap.c:592
 msgid "fatal: first page unreadable"
 msgstr "osudov� chyba: prvn� str�nka je ne�iteln�"
 
-#: disk-utils/mkswap.c:479
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1343,30 +1359,30 @@ msgid ""
 "No swap created. If you really want to create swap v0 on that device, use\n"
 "the -f option to force it.\n"
 msgstr ""
-"%s: Za��zen� '%s' obsahuje korektn� 'Sun popis disku'.\n"
+"%s: Za��zen� '%s' obsahuje korektn� Sun popis disku.\n"
 "To znamen�, �e vytvo�en� odkl�dac�ho prostoru v0 by pravd�podobn� zni�ilo\n"
 "Va�� tabulku rozd�len� disku. Odkl�dac� prostor nebyl vytvo�en. Pokud "
 "opravdu\n"
 "chcete vytvo�it odkl�dac� prostor v0, pou�ijte p�ep�na� -f pro vynucen�.\n"
 
-#: disk-utils/mkswap.c:503
+#: disk-utils/mkswap.c:601
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Odkl�dac� prostor nelze nastavit: ne�iteln�"
 
-#: disk-utils/mkswap.c:504
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "Setting up swapspace version %d, size = %ld bytes\n"
 msgstr "Vytv���m odkl�dac� prostor verze %d, velikost (v bajtech) = %ld\n"
 
-#: disk-utils/mkswap.c:510
+#: disk-utils/mkswap.c:608
 msgid "unable to rewind swap-device"
 msgstr "odkl�dac� prostor nelze p�evinout"
 
-#: disk-utils/mkswap.c:513
+#: disk-utils/mkswap.c:611
 msgid "unable to write signature page"
 msgstr "str�nku signatur nelze zapsat"
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:619
 msgid "fsync failed"
 msgstr "vol�n� fsync selhalo"
 
@@ -1408,46 +1424,46 @@ msgstr "         %s [ -c | -y | -n | -d ] za��zen�\n"
 msgid "       %s [ -c | -y | -n ] dev\n"
 msgstr "         %s [ -c | -y | -n ] za��zen�\n"
 
-#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
 msgid "Unusable"
 msgstr "Nepou�iteln�"
 
-#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
 msgid "Free Space"
 msgstr "Voln� prostor"
 
-#: fdisk/cfdisk.c:399
+#: fdisk/cfdisk.c:398
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:403
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:405
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:410
+#: fdisk/cfdisk.c:409
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:420
 msgid "Disk has been changed.\n"
 msgstr "Na disku byly provedeny zm�ny.\n"
 
-#: fdisk/cfdisk.c:422
+#: fdisk/cfdisk.c:421
 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:425
+#: fdisk/cfdisk.c:424
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1459,23 +1475,23 @@ 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:520
+#: fdisk/cfdisk.c:519
 msgid "FATAL ERROR"
 msgstr "OSUDOV� CHYBA"
 
-#: fdisk/cfdisk.c:529
+#: fdisk/cfdisk.c:528
 msgid "Press any key to exit cfdisk"
 msgstr "Stiskn�te jakoukoliv kl�vesu pro ukon�en� programu cfdisk"
 
-#: fdisk/cfdisk.c:565 fdisk/cfdisk.c:573
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
 msgid "Cannot seek on disk drive"
 msgstr "Nelze posunout ukazov�tko na disku"
 
-#: fdisk/cfdisk.c:567
+#: fdisk/cfdisk.c:566
 msgid "Cannot read disk drive"
 msgstr "Z disku nelze ��st"
 
-#: fdisk/cfdisk.c:575
+#: fdisk/cfdisk.c:574
 msgid "Cannot write disk drive"
 msgstr "Nelze zapisovat na disk"
 
@@ -1711,8 +1727,8 @@ msgstr "  Logick�"
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1071 fdisk/fdisk.c:1220
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1213 fdisk/fdisk.c:1437
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Nezn�m�"
 
@@ -1943,8 +1959,8 @@ msgstr "Pozn�mka: V�echny p��kazy mohou b�t zad�ny mal�mi i velk�mi p�smeny"
 msgid "case letters (except for Writes)."
 msgstr "(s vyj�mkou z�pisu - W)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:305
-#: fdisk/fdisksunlabel.c:307
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cylindry"
 
@@ -1952,7 +1968,7 @@ msgstr "Cylindry"
 msgid "Change cylinder geometry"
 msgstr "Zm�n� geometrii cylindr�"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Hlavy"
 
@@ -2198,8 +2214,8 @@ msgid "Illegal command"
 msgstr "Chybn� p��kaz"
 
 #: fdisk/cfdisk.c:2718
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
@@ -2239,7 +2255,7 @@ msgstr ""
 "                j�dro.\n"
 "\n"
 
-#: fdisk/fdisk.c:246
+#: fdisk/fdisk.c:204
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2259,7 +2275,7 @@ msgstr ""
 "-u: zad�n� Za��tku a Konce v sektorech (m�sto cylindrech)\n"
 "-b 2048: (pro n�kter� MO jednotky) pou�ije 2048bajtov� sektory\n"
 
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:216
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2275,213 +2291,222 @@ msgstr ""
 "  �i: fdisk /dev/rd/c0d0  �i: fdisk /dev/ida/c0d0  (pro RAID za��zen�)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:224
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s nelze otev��t\n"
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s nelze ��st\n"
 
-#: fdisk/fdisk.c:272
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ukazov�tko nelze posunout na %s.\n"
 
-#: fdisk/fdisk.c:275
+#: fdisk/fdisk.c:233
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s nelze ulo�it\n"
 
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:236
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "vol�n� BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/fdisk.c:282
+#: fdisk/fdisk.c:240
 msgid "Unable to allocate any more memory\n"
 msgstr "Nelze alokovat v�ce pam�ti\n"
 
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:242
 msgid "Fatal error\n"
 msgstr "Fat�ln� chyba\n"
 
-#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:332 fdisk/fdisk.c:339
-#: fdisk/fdisk.c:362 fdisk/fdisk.c:380 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:348 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:378 fdisk/fdisk.c:396 fdisk/fdisk.c:412 fdisk/fdisk.c:428
+#: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
 msgstr "P��kazy"
 
-#: fdisk/fdisk.c:296
+#: fdisk/fdisk.c:312
 msgid "   a   toggle a read only flag"
 msgstr "   a   p�epne p��znak \"pouze pro �ten�\""
 
 #. sun
-#: fdisk/fdisk.c:297 fdisk/fdisk.c:341
+#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
 msgid "   b   edit bsd disklabel"
 msgstr "   b   �prava bsd popisu disku"
 
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:314
 msgid "   c   toggle the mountable flag"
 msgstr "   c   p�epne p��znak \"p�ipojiteln�\""
 
 #. sun
-#: fdisk/fdisk.c:299 fdisk/fdisk.c:318 fdisk/fdisk.c:343
+#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
 msgid "   d   delete a partition"
 msgstr "   d   sma�e diskov� odd�l"
 
-#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
 msgid "   l   list known partition types"
 msgstr "   l   vyp��e zn�m� typy diskov�ch odd�l�"
 
 #. sun
-#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:333 fdisk/fdisk.c:345
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:387 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:349 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   vyp��e tuto nab�dku"
 
-#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
 msgid "   n   add a new partition"
 msgstr "   n   vytvo�� nov� diskov� odd�l"
 
-#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:334 fdisk/fdisk.c:347
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   vytvo�� pr�zdn� DOSOV� diskov� odd�l"
 
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:348 fdisk/fdisk.c:371
-#: fdisk/fdisk.c:388
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
 msgid "   p   print the partition table"
 msgstr "   p   vyp��e tabulku rozd�len� disku"
 
-#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:335 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:372 fdisk/fdisk.c:389 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:351 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr "   q   ukon�� program bez ulo�en� zm�n"
 
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   vytvo�� pr�zdn� Sun popis disku"
 
 #. sun
-#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   t   change a partition's system id"
 msgstr "   t   zm�n� id diskov�ho odd�lu"
 
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
 msgid "   u   change display/entry units"
 msgstr "   u   zm�n� jednotky v nich� jsou vypisov�ny informace"
 
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:392
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   v   verify the partition table"
 msgstr "   v   ov��� tabulku rozd�len� disku"
 
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   w   write table to disk and exit"
 msgstr "   w   ulo�� tabulku rozd�len� disku a ukon�� program"
 
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   roz�i�uj�c� funkce (pouze pro odborn�ky)"
 
-#: fdisk/fdisk.c:315
+#: fdisk/fdisk.c:331
 msgid "   a   select bootable partition"
 msgstr "   a   nastav� startovac� diskov� odd�l"
 
 #. sgi flavour
-#: fdisk/fdisk.c:316
+#: fdisk/fdisk.c:332
 msgid "   b   edit bootfile entry"
 msgstr "   b   �prava polo�ky startovac�ho souboru"
 
 #. sgi
-#: fdisk/fdisk.c:317
+#: fdisk/fdisk.c:333
 msgid "   c   select sgi swap partition"
 msgstr "   c   nastav� sgi odkl�dac� diskov� odd�l"
 
-#: fdisk/fdisk.c:340
+#: fdisk/fdisk.c:356
 msgid "   a   toggle a bootable flag"
 msgstr "   a   p�epne p��znak \"startovac�\""
 
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:358
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   p�epne p��znak \"DOS kompatibiln�\""
 
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:379
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   zm�n� mno�stv� alternativn�ch cylindr�"
 
 #. sun
-#: fdisk/fdisk.c:364 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
 msgid "   c   change number of cylinders"
 msgstr "   c   zm�n� mno�stv� cylindr�"
 
-#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
 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:366
+#: fdisk/fdisk.c:382
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   zm�n� mno�stv� extra sektor� na stopu"
 
 #. sun
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
 msgid "   h   change number of heads"
 msgstr "   h   zm�n� mno�stv� hlav"
 
-#: fdisk/fdisk.c:368
+#: fdisk/fdisk.c:384
 msgid "   i   change interleave factor"
 msgstr "   i   zm�n� prokl�dac� faktor"
 
 #. sun
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:385
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   zm�n� rychlost ot��en�"
 
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   n�vrat do hlavn� nab�dky"
 
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   s   change number of sectors/track"
 msgstr "   s   zm�n� po�et sektor�/stopu"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:393
 msgid "   y   change number of physical cylinders"
 msgstr "   y   zm�n� po�et fyzick�ch cylindr�"
 
-#: fdisk/fdisk.c:381
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   posune po��tek dat v diskov�m odd�lu"
 
-#: fdisk/fdisk.c:384
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
 msgid "   e   list extended partitions"
 msgstr "   e   vyp��e roz���en� diskov� odd�ly"
 
 #. !sun
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
 msgid "   g   create an IRIX partition table"
 msgstr "   g   vytvo�� IRIX tabulku rozd�len� disku"
 
-#: fdisk/fdisk.c:481
+#. !sun
+#: fdisk/fdisk.c:433
+msgid "   f   fix partition order"
+msgstr "   f   oprav� �azen� diskov�ch odd�l�"
+
+#: fdisk/fdisk.c:532
 msgid "You must set"
 msgstr "Mus�te nastavit"
 
-#: fdisk/fdisk.c:495
+#: fdisk/fdisk.c:546
 msgid "heads"
 msgstr "hlavy"
 
-#: fdisk/fdisk.c:497 fdisk/fdisk.c:905 fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:548 fdisk/fdisk.c:1046 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sektory"
 
-#: fdisk/fdisk.c:499 fdisk/fdisk.c:905 fdisk/fdiskbsdlabel.c:444
-#: fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:550 fdisk/fdisk.c:1046 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cylindry"
 
-#: fdisk/fdisk.c:503
+#: fdisk/fdisk.c:554
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2490,30 +2515,30 @@ msgstr ""
 "%s%s.\n"
 "M��ete tak u�init z nab�dky roz�i�uj�c�ch funkc�.\n"
 
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:555
 msgid " and "
 msgstr " a "
 
-#: fdisk/fdisk.c:538
+#: fdisk/fdisk.c:595
 msgid "Bad offset in primary extended partition\n"
 msgstr "Chybn� posun v prim�rn�m diskov�m odd�lu\n"
 
-#: fdisk/fdisk.c:545
+#: fdisk/fdisk.c:609
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Varov�n�: ma�u diskov� odd�l za %d\n"
 
-#: fdisk/fdisk.c:566
+#: fdisk/fdisk.c:625
 #, 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:574
+#: fdisk/fdisk.c:633
 #, 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:600
+#: fdisk/fdisk.c:677
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -2526,34 +2551,34 @@ msgstr ""
 "data\n"
 "pochopiteln� dostupn�.\n"
 
-#: fdisk/fdisk.c:636
-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:645
+#: fdisk/fdisk.c:701
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Pozor: velikost sektoru je %d (nikoliv %d)\n"
 
-#: fdisk/fdisk.c:693
+#: fdisk/fdisk.c:783
+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:811
 msgid ""
-"Device contains neither a valid DOS partition table, nor Sun or SGI "
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 "Za��zen� neobsahuje ani DOSOVOU tabulku rozd�len� disku, ani SUN �i SGI "
 "popis\n"
 "disku\n"
 
-#: fdisk/fdisk.c:709
+#: fdisk/fdisk.c:827
 msgid "Internal error\n"
 msgstr "Vnit�n� chyba\n"
 
-#: fdisk/fdisk.c:719
+#: fdisk/fdisk.c:849
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Nadbyte�n� roz���en� diskov� odd�l %d ignorov�n.\n"
 
-#: fdisk/fdisk.c:726
+#: fdisk/fdisk.c:861
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2562,7 +2587,7 @@ msgstr ""
 "Varov�n�: chybn� p��znak 0x%04x tabulky rozd�len� disku %d bude opraven "
 "z�pisem(w)\n"
 
-#: fdisk/fdisk.c:747
+#: fdisk/fdisk.c:883
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2570,65 +2595,65 @@ msgstr ""
 "\n"
 "t�ikr�t jsem nalezl EOF - kon��m..\n"
 
-#: fdisk/fdisk.c:784
+#: fdisk/fdisk.c:921
 msgid "Hex code (type L to list codes): "
 msgstr "�estn�ctkov� (L vyp��e k�dy):"
 
-#: fdisk/fdisk.c:823
+#: fdisk/fdisk.c:960
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, implicitn� %d): "
 
-#: fdisk/fdisk.c:877
+#: fdisk/fdisk.c:1014
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Pou��v�m implicitn� hodnotu %d\n"
 
-#: fdisk/fdisk.c:881
+#: fdisk/fdisk.c:1018
 msgid "Value out of range.\n"
 msgstr "Hodnota je mimo meze.\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:1028
 msgid "Partition number"
 msgstr "��slo diskov�ho odd�lu"
 
-#: fdisk/fdisk.c:896
+#: fdisk/fdisk.c:1037
 #, 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:903
+#: fdisk/fdisk.c:1044
 msgid "cylinder"
 msgstr "cylindr"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1044
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:912
+#: fdisk/fdisk.c:1053
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "M�n�m jednotky v nich� jsou vypisov�ny informace na %sy\n"
 
-#: fdisk/fdisk.c:922
+#: fdisk/fdisk.c:1064
 #, 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:935
+#: fdisk/fdisk.c:1075
 msgid "DOS Compatibility flag is set\n"
 msgstr "P��znak DOSOV� kompatibility je nastaven.\n"
 
-#: fdisk/fdisk.c:939
+#: fdisk/fdisk.c:1079
 msgid "DOS Compatibility flag is not set\n"
 msgstr "P��znak DOSOV� kompatibility nen� nastaven.\n"
 
-#: fdisk/fdisk.c:1025
+#: fdisk/fdisk.c:1167
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Diskov� odd�l %d zat�m neexistuje!\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1172
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2639,7 +2664,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:1039
+#: fdisk/fdisk.c:1181
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2647,7 +2672,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:1048
+#: fdisk/fdisk.c:1190
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2657,7 +2682,7 @@ msgstr ""
 "nebo� SunOS/Solaris to o�ek�v� a i Linux tomu d�v� p�ednost.\n"
 "\n"
 
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1196
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2668,53 +2693,53 @@ msgstr ""
 "a diskov� odd�l 11 jako cel� svazek (6), nebo� IRIX to o�ek�v�.\n"
 "\n"
 
-#: fdisk/fdisk.c:1068
+#: fdisk/fdisk.c:1210
 #, 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:1121
+#: fdisk/fdisk.c:1261
 #, 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:1123 fdisk/fdisk.c:1131 fdisk/fdisk.c:1140 fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1263 fdisk/fdisk.c:1271 fdisk/fdisk.c:1280 fdisk/fdisk.c:1289
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyz=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132
+#: fdisk/fdisk.c:1264 fdisk/fdisk.c:1272
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logick�=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1129
+#: fdisk/fdisk.c:1269
 #, 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:1138
+#: fdisk/fdisk.c:1278
 #, 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:1141
+#: fdisk/fdisk.c:1281
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "m�lo by b�t (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1147
+#: fdisk/fdisk.c:1287
 #, 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:1150
+#: fdisk/fdisk.c:1290
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "m�lo by b�t (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1157
+#: fdisk/fdisk.c:1297
 #, c-format
 msgid ""
 "\n"
@@ -2726,18 +2751,32 @@ msgstr ""
 "Disk %s: hlav: %d, sektor�: %d, cylindr�: %d\n"
 "Jednotky = %s po %d * %d bajtech\n"
 
-#. FIXME! let's see how this shows up with other languagues
-#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1342
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+"Diskov� odd�ly jsou ji� se�azeny.\n"
+"\n"
+
+#: fdisk/fdisk.c:1408
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Boot    Za��tek     Konec  Bloky    Id  Syst�m\n"
 
-#: fdisk/fdisk.c:1195 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1409 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
 msgid "Device"
 msgstr "Za��zen�"
 
-#: fdisk/fdisk.c:1235
+#: fdisk/fdisk.c:1446
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr ""
+"\n"
+"Diskov� odd�ly jsou chybn� se�azeny\n"
+
+#: fdisk/fdisk.c:1456
 #, c-format
 msgid ""
 "\n"
@@ -2748,106 +2787,106 @@ msgstr ""
 "Disk %s: hlav: %d, sektor�: %d, cylindr�: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1237
+#: fdisk/fdisk.c:1458
 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:1276
+#: fdisk/fdisk.c:1502
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varov�n�: diskov� odd�l %d obsahuje sektor 0\n"
 
-#: fdisk/fdisk.c:1279
+#: fdisk/fdisk.c:1505
 #, 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:1282
+#: fdisk/fdisk.c:1508
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Diskov� odd�l %d: sektor %d m� v�t�� ��slo ne� je maximum %d\n"
 
-#: fdisk/fdisk.c:1285
+#: fdisk/fdisk.c:1511
 #, 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:1289
+#: fdisk/fdisk.c:1515
 #, 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:1319
+#: fdisk/fdisk.c:1547
 #, 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:1327
+#: fdisk/fdisk.c:1555
 #, 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:1345
+#: fdisk/fdisk.c:1575
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varov�n�: diskov� odd�l %d je pr�zdn�.\n"
 
-#: fdisk/fdisk.c:1350
+#: fdisk/fdisk.c:1580
 #, 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:1356
+#: fdisk/fdisk.c:1586
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Celkov� po�et alokovan�ch sektor� (%d) je v�t�� ne� maximum (%d).\n"
 
-#: fdisk/fdisk.c:1359
+#: fdisk/fdisk.c:1589
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "nealokovan�ch sektor�: %d\n"
 
-#: fdisk/fdisk.c:1371 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1602 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "Diskov� odd�l %d je ji� definov�n. P�ed op�tovn�m vytvo�en�m jej mus�te\n"
 "nejprve smazat.\n"
 
-#: fdisk/fdisk.c:1392 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
-#: fdisk/fdisksunlabel.c:494
+#: fdisk/fdisk.c:1623 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Prvn� %s"
 
-#: fdisk/fdisk.c:1407 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1638 fdisk/fdisksunlabel.c:542
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je ji� alokov�n\n"
 
-#: fdisk/fdisk.c:1439
+#: fdisk/fdisk.c:1674
 msgid "No free sectors available\n"
 msgstr "Nejsou ��dn� voln� sektory.\n"
 
-#: fdisk/fdisk.c:1449 fdisk/fdiskbsdlabel.c:259 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1682 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Posledn� %s �i +velikost �i +velikostM �i velikostK"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1715
 #, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
 msgstr "Varov�n�: diskov� odd�l %d m� lich� po�et sektor�.\n"
 
-#: fdisk/fdisk.c:1516 fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdisk.c:1755 fdisk/fdiskbsdlabel.c:611
 msgid "The maximum number of partitions has been created\n"
 msgstr "Ji� bylo vytvo�eno maxim�ln� mno�stv� diskov�ch odd�l�.\n"
 
-#: fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1765
 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:1530
+#: fdisk/fdisk.c:1769
 #, c-format
 msgid ""
 "Command action\n"
@@ -2858,30 +2897,30 @@ msgstr ""
 "   %s\n"
 "   p   prim�rn� diskov� odd�l (1-4)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1771
 msgid "l   logical (5 or over)"
 msgstr "l   logick� diskov� odd�l (5 nebo v�ce)"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1771
 msgid "e   extended"
 msgstr "e   roz���en� diskov� odd�l"
 
-#: fdisk/fdisk.c:1549
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Chybn� ��slo diskov�ho odd�lu pro typ `%c'.\n"
 
-#: fdisk/fdisk.c:1581
+#: fdisk/fdisk.c:1823
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr "Tabulka rozd�len� disku byla zm�n�na!\n"
 
-#: fdisk/fdisk.c:1590
+#: fdisk/fdisk.c:1832
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Vol�m ioctl() pro znovuna�ten� tabulky rozd�len� disku.\n"
 
-#: fdisk/fdisk.c:1606
+#: fdisk/fdisk.c:1848
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2890,7 +2929,7 @@ msgstr ""
 "Op�tovn� na�ten� tabulky rozd�len� disku skon�ilo s chybou %d: %s.\n"
 "Restartujte syst�m, aby tabulka byla zm�n�na.\n"
 
-#: fdisk/fdisk.c:1612
+#: fdisk/fdisk.c:1854
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2902,65 +2941,70 @@ 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:1619
+#: fdisk/fdisk.c:1861
 msgid "Syncing disks.\n"
 msgstr "Synchronizuj� se disky.\n"
 
-#: fdisk/fdisk.c:1650
+#: fdisk/fdisk.c:1892
 #, c-format
 msgid "Device: %s\n"
 msgstr "Za��zen�: %s\n"
 
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1908
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Diskov� odd�l %d neobsahuje datovou oblast.\n"
 
-#: fdisk/fdisk.c:1671
+#: fdisk/fdisk.c:1913
 msgid "New beginning of data"
 msgstr "Nov� za��tek dat"
 
-#: fdisk/fdisk.c:1685
+#: fdisk/fdisk.c:1929
 msgid "Expert command (m for help): "
 msgstr "P��kaz pro odborn�ky (m pro n�pov�du): "
 
-#: fdisk/fdisk.c:1696
+#: fdisk/fdisk.c:1942
 msgid "Number of cylinders"
 msgstr "Po�et cylindr�"
 
-#: fdisk/fdisk.c:1717
+#: fdisk/fdisk.c:1968
 msgid "Number of heads"
 msgstr "Po�et hlav"
 
-#: fdisk/fdisk.c:1742
+#: fdisk/fdisk.c:1993
 msgid "Number of sectors"
 msgstr "Po�et sektor�"
 
-#: fdisk/fdisk.c:1745
+#: fdisk/fdisk.c:1996
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varov�n�: nastaven posun sektoru kv�li kompatibilit� s DOSEM\n"
 
-#: fdisk/fdisk.c:1807
+#: fdisk/fdisk.c:2058
 #, 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:1821
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s nelze otev��t.\n"
 
-#: fdisk/fdisk.c:1838
+#: fdisk/fdisk.c:2089
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s nelze otev��t.\n"
 
-#: fdisk/fdisk.c:1911
+#: fdisk/fdisk.c:2110
+#, c-format
+msgid "%c: unknown command\n"
+msgstr "p��kaz %c nen� zn�m\n"
+
+#: fdisk/fdisk.c:2161
 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:1914
+#: fdisk/fdisk.c:2164
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2969,11 +3013,20 @@ msgstr ""
 "jedn�m\n"
 "          zadan�m za��zen�m.\n"
 
-#: fdisk/fdisk.c:1973
+#: fdisk/fdisk.c:2227
+#, c-format
+msgid ""
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
+msgstr ""
+"Na %s nalezen OSF/1 popis disku. Spou�t�m re�im popisu disku.\n"
+"Pro n�vrat do re�imu DOS tabulky rozd�len� disku pou�ijte p��kaz 'r'.\n"
+
+#: fdisk/fdisk.c:2236
 msgid "Command (m for help): "
 msgstr "P��kaz (m pro n�pov�du): "
 
-#: fdisk/fdisk.c:1987
+#: fdisk/fdisk.c:2252
 #, c-format
 msgid ""
 "\n"
@@ -2982,15 +3035,15 @@ msgstr ""
 "\n"
 "Aktu�ln� startovac� soubor: %s\n"
 
-#: fdisk/fdisk.c:1989
+#: fdisk/fdisk.c:2254
 msgid "Please enter the name of the new boot file: "
 msgstr "Zadejte jm�no nov�ho startovac�ho souboru: "
 
-#: fdisk/fdisk.c:1991
+#: fdisk/fdisk.c:2256
 msgid "Boot file unchanged\n"
 msgstr "Startovac� soubor nebyl zm�n�n.\n"
 
-#: fdisk/fdisk.c:2051
+#: fdisk/fdisk.c:2320
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3000,7 +3053,7 @@ msgstr ""
 "\tPro SGI diskov� odd�ly nejsou k dispozici ��dn� roz�i�uj�c� funkce.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:29
+#: fdisk/fdiskaixlabel.c:28
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3027,7 +3080,7 @@ msgstr ""
 "\t   ji� nen� logickou sou��st� Va�eho AIX syst�mu. (Jinak\n"
 "\t   se z V�s st�v� AIXpert)."
 
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:117
 #, c-format
 msgid ""
 "\n"
@@ -3036,166 +3089,170 @@ msgstr ""
 "\n"
 "BSD tabulka rozd�len� disku pro za��zen�: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:125
 msgid "   d   delete a BSD partition"
 msgstr "   d   smazat BSD diskov� odd�l"
 
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
 msgstr "   e   upravovat data na disku"
 
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
 msgstr "   i   instalovat zavad��"
 
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
 msgstr "   l   vypsat zn�m� typy syst�m� soubor�"
 
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   n   add a new BSD partition"
 msgstr "   n   vytvo�it nov� BSD diskov� odd�l"
 
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   p   print BSD partition table"
 msgstr "   p   vytisknout BSD tabulku rozd�len� disku"
 
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
-msgstr "   s   zobraz� �plnou tabulku rozd�len� disku"
+msgstr "   s   zobraz� �pln� popis disku"
 
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
 msgstr "   t   zm�n� id syst�mu soubor� dan�ho diskov�ho odd�lu"
 
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   zm�n� jednotky (cylindry/sektory)"
+
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
-msgstr "   w   ulo�� tabulku rozd�len� disku na disk"
+msgstr "   w   ulo�� popis disku na disk"
 
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   p�ipoj� BSD diskov� odd�l na ne-BSD diskov� odd�l"
 
-#: fdisk/fdiskbsdlabel.c:146
+#: fdisk/fdiskbsdlabel.c:168
 #, c-format
-msgid "Partition %s%d has invalid starting sector 0.\n"
-msgstr "Diskov� odd�l %s%d m� chybn� po��te�n� sektor 0.\n"
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "Diskov� odd�l %s m� chybn� po��te�n� sektor 0.\n"
 
-#: fdisk/fdiskbsdlabel.c:150
+#: fdisk/fdiskbsdlabel.c:172
 #, c-format
-msgid "Reading disklabel of %s%d at sector %d.\n"
-msgstr "�tu tabulku rozd�len� disku %s%d v sektoru %d.\n"
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "�tu popis disku %s v sektoru %d.\n"
 
-#: fdisk/fdiskbsdlabel.c:159
+#: fdisk/fdiskbsdlabel.c:182
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
 msgstr "Na %s se nenach�z� ��dn� *BSD diskov� odd�l.\n"
 
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
-msgstr "P��kaz pro BSD tabulku rozd�len� disku (m pro n�pov�du): "
+msgstr "P��kaz pro BSD popis disku (m pro n�pov�du): "
 
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:310
 #, c-format
 msgid "type: %s\n"
 msgstr "typ: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:312
 #, c-format
 msgid "type: %d\n"
 msgstr "typ: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:313
 #, c-format
 msgid "disk: %.*s\n"
 msgstr "disk: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:292
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
 msgstr "tabulka: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:315
 msgid "flags:"
 msgstr "p��znaky:"
 
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:317
 msgid " removable"
 msgstr " v�m�nn�"
 
 # ???
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
 msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:299
+#: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
 msgstr " chybn�sekt"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr "bajt�/sektor: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr "sektor�/stopu: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr "stop/cylindr: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr "sektor�/cylindr: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:329
 #, c-format
 msgid "cylinders: %ld\n"
 msgstr "cylindr�: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
 msgstr "otm: %d\n"
 
 # *skew ??? 
 # zde p�eklad sp��e odhaduji
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
 msgstr "interleave: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "zak�iven� stopy: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "cylinderskew: %d\n"
 msgstr "zak�iven� cylindru: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr "p�esun hlavy: %ld\t\t# milisekund\n"
 
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr "posun stopa-stopa: %ld\t# milisekund\n"
 
-#: fdisk/fdiskbsdlabel.c:314
+#: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
 msgstr "diskdata: "
 
-#: fdisk/fdiskbsdlabel.c:323
+#: fdisk/fdiskbsdlabel.c:347
 #, c-format
 msgid ""
 "\n"
@@ -3204,112 +3261,97 @@ msgstr ""
 "\n"
 "po�et diskov�ch odd�l� - %d:\n"
 
-#: fdisk/fdiskbsdlabel.c:324
-msgid "#        size   offset    fstype   [fsize bsize   cpg]\n"
-msgstr "#       velik  posun     typ ss   [fsize bsize   cpg]\n"
-
-#: fdisk/fdiskbsdlabel.c:380
-#, c-format
-msgid "Writing disklabel to %s%d.\n"
-msgstr "Ukl�d�m tabulku rozd�len� disku na %s%d.\n"
+#: fdisk/fdiskbsdlabel.c:348
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr "#       velik       konec    velikost sstyp    [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:383
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr "Ukl�d�m tabulku rozd�len� disku na %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:395
-#, c-format
-msgid "%s%d contains no disklabel.\n"
-msgstr "Na %s%d se nenach�z� ��dn� tabulka rozd�len� disku.\n"
+msgstr "Ukl�d�m popis disku na %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:398
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
-msgstr "Na %s se nenach�z� ��dn� tabulka rozd�len� disku.\n"
+msgstr "Na %s se nenach�z� ��dn� popis disku.\n"
 
-#: fdisk/fdiskbsdlabel.c:402
+#: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
-msgstr "Chcete vytvo�it tabulku rozd�len� disku? (y/n)"
+msgstr "Chcete vytvo�it popis disku? (y/n)"
 
-#: fdisk/fdiskbsdlabel.c:441
+#: fdisk/fdiskbsdlabel.c:458
 msgid "bytes/sector"
 msgstr "bajt�/sektor"
 
-#: fdisk/fdiskbsdlabel.c:442
+#: fdisk/fdiskbsdlabel.c:459
 msgid "sectors/track"
 msgstr "sektor�/stopu"
 
-#: fdisk/fdiskbsdlabel.c:443
+#: fdisk/fdiskbsdlabel.c:460
 msgid "tracks/cylinder"
 msgstr "stop/cylindr"
 
-#: fdisk/fdiskbsdlabel.c:451
+#: fdisk/fdiskbsdlabel.c:468
 msgid "sectors/cylinder"
 msgstr "sektor�/cylindr"
 
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr "Mus� b�t <= sektor�/stopu * stop/cylindr (implicitn�).\n"
 
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
 msgstr "otm"
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
 msgstr "interleave"
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
 msgstr "zak�iven� stopy"
 
-#: fdisk/fdiskbsdlabel.c:460
+#: fdisk/fdiskbsdlabel.c:477
 msgid "cylinderskew"
 msgstr "zak�iven� cylindru"
 
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
 msgstr "p�esun hlavy"
 
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
 msgstr "posun stopa-stopa"
 
-#: fdisk/fdiskbsdlabel.c:503
+#: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "Zavad��: %sstart -> start%s (%s): "
 
-#: fdisk/fdiskbsdlabel.c:529
+#: fdisk/fdiskbsdlabel.c:546
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr "Zavad�� p�esahuje do tabulky rozd�len� disku!\n"
 
-#: fdisk/fdiskbsdlabel.c:550
-#, c-format
-msgid "Bootstrap installed on %s%d.\n"
-msgstr "Zavad�� instalov�n na %s%d.\n"
-
-#: fdisk/fdiskbsdlabel.c:552
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr "Zavad�� instalov�n na %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:573
+#: fdisk/fdiskbsdlabel.c:591
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Diskov� odd�l (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:604
+#: fdisk/fdiskbsdlabel.c:622
 msgid "This partition already exists.\n"
 msgstr "Tento diskov� odd�l ji� existuje.\n"
 
-#: fdisk/fdiskbsdlabel.c:726
+#: fdisk/fdiskbsdlabel.c:742
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Varov�n�: p��li� mnoho diskov�ch odd�l� (%d, maximum %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:772
+#: fdisk/fdiskbsdlabel.c:789
 msgid ""
 "\n"
 "Syncing disks.\n"
@@ -3317,80 +3359,83 @@ msgstr ""
 "\n"
 "Synchronizuj� se disky.\n"
 
-#: fdisk/fdisksgilabel.c:56
+#: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
 msgstr "Hlavi�ka SGI svazku"
 
-#: fdisk/fdisksgilabel.c:57
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:58
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:59
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:60
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:61
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:62
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI volume"
 msgstr "SGI svazek"
 
-#: fdisk/fdisksgilabel.c:63
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:64
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:65
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:66
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:67
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xlvol"
 msgstr "SGI xlvol"
 
-#: fdisk/fdisksgilabel.c:68
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI rxlvol"
 msgstr "SGI rxlvol"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativn�"
 
-#: fdisk/fdisksgilabel.c:143
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:158
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
 "Podle MIPS Computer Systems, Inc jm�no nesm� obsahovat v�ce ne� 512 bajt�\n"
 
-#: fdisk/fdisksgilabel.c:162
+#: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
-msgstr ""
-"Nalezl jsem sgi tabulku rozd�len� disku s chybn�m kontroln�m sou�tem.\n"
+msgstr "Nalezl jsem sgi popis disku s chybn�m kontroln�m sou�tem.\n"
 
-#: fdisk/fdisksgilabel.c:186
+#: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
 "\n"
@@ -3409,7 +3454,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:199
+#: fdisk/fdisksgilabel.c:213
 #, c-format
 msgid ""
 "\n"
@@ -3422,7 +3467,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:205
+#: fdisk/fdisksgilabel.c:219
 #, c-format
 msgid ""
 "----- partitions -----\n"
@@ -3431,7 +3476,7 @@ msgstr ""
 "----- diskov� odd�ly -----\n"
 "%*s  Info      Za��tek     Konec Sektory  Id  Syst�m\n"
 
-#: fdisk/fdisksgilabel.c:227
+#: fdisk/fdisksgilabel.c:241
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3442,12 +3487,12 @@ msgstr ""
 "Startovac� soubor: %s\n"
 "----- adres��ov� polo�ky -----\n"
 
-#: fdisk/fdisksgilabel.c:237
+#: fdisk/fdisksgilabel.c:251
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u velikost%8u\n"
 
-#: fdisk/fdisksgilabel.c:298
+#: fdisk/fdisksgilabel.c:305
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3459,7 +3504,7 @@ msgstr ""
 "\tStartovac� soubor mus� b�t zad�n pln�m jm�nem, nap�.\n"
 "\t\"/unix\" �i \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:312
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3467,7 +3512,7 @@ msgstr ""
 "\n"
 "\tJm�no startovac�ho souboru je p��li� dlouh�: 16 bajt� je maximum.\n"
 
-#: fdisk/fdisksgilabel.c:310
+#: fdisk/fdisksgilabel.c:317
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3475,7 +3520,7 @@ msgstr ""
 "\n"
 "\tStartovac� soubor mus� b�t zad�n pln�m jm�nem.\n"
 
-#: fdisk/fdisksgilabel.c:315
+#: fdisk/fdisksgilabel.c:322
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3485,7 +3530,7 @@ msgstr ""
 "Uv�domte si, �e existence startovac�ho souboru nen� ov��ov�na.\n"
 "\tImplicitn� se pou�ije \"/unix\" a jako z�loha \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:343
+#: fdisk/fdisksgilabel.c:350
 #, c-format
 msgid ""
 "\n"
@@ -3498,7 +3543,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:456 fdisk/fdisksunlabel.c:455
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:478
 msgid "No partitions defined\n"
 msgstr "Nejsou definov�ny ��dn� diskov� odd�ly\n"
 
@@ -3595,23 +3640,23 @@ msgstr ""
 "jinak.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:621
+#: fdisk/fdisksgilabel.c:607
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "V�te, �e na Va�em disku se diskov� odd�ly p�ekr�vaj�?\n"
 
-#: fdisk/fdisksgilabel.c:691
+#: fdisk/fdisksgilabel.c:669
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Pokou��m se automaticky vytvo�it polo�ku pro cel� disk.\n"
 
-#: fdisk/fdisksgilabel.c:698
+#: fdisk/fdisksgilabel.c:676
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Diskov� odd�ly ji� zab�raj� cel� prostor disky.\n"
 
-#: fdisk/fdisksgilabel.c:703
+#: fdisk/fdisksgilabel.c:681
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "Diskov� odd�ly se p�ekr�vaj�. Nejprve to opravte!\n"
 
-#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3619,34 +3664,34 @@ msgstr ""
 "Doporu�uje se, aby jeden�ct� diskov� odd�l zauj�mal cel�\n"
 "prostor disku a byl typu `SGI svazek'\n"
 
-#: fdisk/fdisksgilabel.c:728
+#: fdisk/fdisksgilabel.c:706
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Takto se diskov� odd�ly budou navz�jem p�ekr�vat. Nejprve to opravte!\n"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:711
 #, c-format
 msgid " Last %s"
 msgstr " Posledn� %s"
 
-#: fdisk/fdisksgilabel.c:756
+#: fdisk/fdisksgilabel.c:733
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
-"content will be unrecoverable lost.\n"
+"content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Vytv���m novou SGI tabulku rozd�len� disku. Zm�ny budou ulo�eny pouze do\n"
-"pam�ti, dokud se nerozhodnete je ulo�it na disk. Pot� ji� nebudou star� "
-"data\n"
+"Vytv���m nov� SGI popis disku. Zm�ny budou ulo�eny pouze do pam�ti,\n"
+"dokud se nerozhodnete je ulo�it na disk. Pot� ji� nebudou star� data\n"
 "pochopiteln� dostupn�.\n"
+"\n"
 
-#: fdisk/fdisksgilabel.c:784
+#: fdisk/fdisksgilabel.c:761
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Pokou��m se zachovat parametry diskov�ho odd�lu %d.\n"
 
-#: fdisk/fdisksgilabel.c:786
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tZA��TEK=%d\tD�LKA=%d\n"
@@ -3683,36 +3728,35 @@ msgstr "SunOS var"
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:122
+#: fdisk/fdisksunlabel.c:129
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
 "e.g. heads, sectors, cylinders and partitions\n"
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
-"Nalezl jsem sun tabulku rozd�len� disku s chybn�ch kontroln�m sou�tem.\n"
+"Nalezl jsem sun popis disku s chybn�ch kontroln�m sou�tem.\n"
 "Pravd�podobn� budete muset nastavit v�echny hodnoty jako hlavy, sektory,\n"
 "cylindry a diskov� odd�ly, nebo vytvo�it novou tabulku (p��kaz s v hlavn�\n"
 "nab�dce)\n"
 
-#: fdisk/fdisksunlabel.c:215
+#: fdisk/fdisksunlabel.c:228
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Automatick� konfigurace nalezla %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:242
+#: fdisk/fdisksunlabel.c:255
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Vytv���m novou sun tabulku rozd�len� disku. Zm�ny budou ulo�eny pouze do\n"
-"pam�ti, dokud se nerozhodnete je ulo�it na disk. Pot� ji� nebudou star� "
-"data\n"
+"Vytv���m novou sun popis disku. Zm�ny budou ulo�eny pouze do pam�ti,\n"
+"dokud se nerozhodnete je ulo�it na disk. Pot� ji� nebudou star� data\n"
 "pochopiteln� dostupn�.\n"
 
-#: fdisk/fdisksunlabel.c:253
+#: fdisk/fdisksunlabel.c:266
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3722,71 +3766,71 @@ msgstr ""
 "   ?   automatick� konfigurace\n"
 "   0   u�ivatelsk� konfigurace (s detekovan�m implicitn�m nastaven�m)"
 
-#: fdisk/fdisksunlabel.c:263
+#: fdisk/fdisksunlabel.c:276
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Zadejte typ (? pro auto, 0 pro u�ivatelsk�): "
 
-#: fdisk/fdisksunlabel.c:275
+#: fdisk/fdisksunlabel.c:288
 msgid "Autoconfigure failed.\n"
 msgstr "Automatick� konfigurace selhala.\n"
 
-#: fdisk/fdisksunlabel.c:303
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sektor�/stopu"
 
-#: fdisk/fdisksunlabel.c:310
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Alternativn� cylindry"
 
-#: fdisk/fdisksunlabel.c:313
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Fyzick� cylindry"
 
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
 msgid "Rotation speed (rpm)"
 msgstr "Rychlost ot��en� (otm)"
 
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
 msgid "Interleave factor"
 msgstr "Interleave faktor"
 
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektory na cylindr"
 
-#: fdisk/fdisksunlabel.c:334
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "V�echny parametry disku m��ete zm�nit z nab�dky x"
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5\" pru�n� disk"
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux u�ivatelsk�"
 
-#: fdisk/fdisksunlabel.c:418
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Diskov� odd�l %d nekon�� na hranici cylindru.\n"
 
-#: fdisk/fdisksunlabel.c:438
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Diskov� odd�l %d p�esahuje do jin�ch v sektorech %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:460
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Nevyu��van� prostor - sektory 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nevyu��van� prostor - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:512
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3794,7 +3838,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:547
+#: fdisk/fdisksunlabel.c:570
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3804,7 +3848,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:567
+#: fdisk/fdisksunlabel.c:590
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3814,7 +3858,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:580
+#: fdisk/fdisksunlabel.c:603
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3828,7 +3872,7 @@ msgstr ""
 "Zadejte YES, pokud jste si jist, �e chcete tento diskov� odd�l ozna�it 82\n"
 "(odkl�dac� prostor pro Linux): "
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:634
 #, c-format
 msgid ""
 "\n"
@@ -3847,7 +3891,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:648
 #, c-format
 msgid ""
 "\n"
@@ -3860,16 +3904,16 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:653
 #, 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:655
+#: fdisk/fdisksunlabel.c:678
 msgid "Number of alternate cylinders"
 msgstr "Po�et alternativn�ch cylindr�"
 
-#: fdisk/fdisksunlabel.c:688
+#: fdisk/fdisksunlabel.c:711
 msgid "Number of physical cylinders"
 msgstr "Po�et fyzick�ch cylindr�"
 
@@ -3981,278 +4025,305 @@ msgid "NEC DOS"
 msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
 msgstr "PartitionMagic recovery"
 
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
 msgstr "Venix 80286"
 
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
 msgstr "PPC PReP Boot"
 
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:36
 msgid "SFS"
 msgstr "SFS"
 
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
 msgstr "QNX4.x"
 
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
 msgstr "QNX4.x 2. ��st"
 
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
 msgstr "QNX4.x 3. ��st"
 
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
 msgstr "OnTrack DM"
 
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
 #. (or Novell)
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
 #. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
 
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
 msgstr "OnTrackDM6"
 
-#: fdisk/i386_sys_types.c:44
+#: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
 msgstr "EZ-Drive"
 
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
 msgstr "Golden Bow"
 
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
-#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:82
+#: fdisk/i386_sys_types.c:85 fdisk/i386_sys_types.c:86
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD �i SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
 
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
 msgstr "Novell Netware 386"
 
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
 msgstr "DiskSecure Multi-Boot"
 
-#: fdisk/i386_sys_types.c:52
+#: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
 msgstr "PC/IX"
 
-#: fdisk/i386_sys_types.c:53
+#: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
 msgstr "Star� Minix"
 
 #. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / star� Linux"
 
-#: fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 skryt� C: disk"
 
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
 msgstr "Linux extended"
 
-#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
 msgstr "NTFS svazek"
 
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
 msgstr "Amoeba"
 
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
 #. (bad block table)
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:65
+msgid "BSD/OS"
+msgstr "BSD/OS"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad hibernation"
 
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
 msgstr "BSD/386"
 
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
 msgstr "NeXTSTEP"
 
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
 msgstr "BSDI ss"
 
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
 msgstr "BSDI swap"
 
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
 msgstr "DRDOS/sec (FAT-12)"
 
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr "DRDOS/sec (FAT-16 < 32M)"
 
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16)"
 msgstr "DRDOS/sec (FAT-16)"
 
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
 msgid "Syrinx"
 msgstr "Syrinx"
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:76
+msgid "Non-FS data"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:77
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:74
+#. CP/M or Concurrent CP/M or
+#. Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:79
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:75
+#. DOS access or SpeedStor 12-bit FAT
+#. extended partition
+#: fdisk/i386_sys_types.c:81
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:77
+#. SpeedStor 16-bit FAT extended
+#. partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:84
 msgid "BeOS fs"
 msgstr "BeOS ss"
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:80
+#: fdisk/i386_sys_types.c:87
 msgid "DOS secondary"
 msgstr "DOS sekund�rn�"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:88
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#. New (2.2.x) raid partition with autodetect
-#. using persistent superblock
-#: fdisk/i386_sys_types.c:83
+#. New (2.2.x) raid partition with
+#. autodetect using persistent
+#. superblock
+#: fdisk/i386_sys_types.c:91
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:92
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:147
+#: fdisk/sfdisk.c:152
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "chyba posunu ukazov�tka na %s - ukazov�tko nelze posunout na %lu\n"
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:157
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 "chyba p�i posunu ukazov�tka: po�adavek 0x%08x%08x, v�sledek 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:198
+#: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
 msgstr "nedostatek pam�ti - kon��m\n"
 
-#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "chyba �ten� na %s - sektor %lu nelze ��st\n"
 
-#: fdisk/sfdisk.c:218
+#: fdisk/sfdisk.c:224
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "CHYBA: sektor %lu nem� msdos podpis\n"
 
-#: fdisk/sfdisk.c:235
+#: fdisk/sfdisk.c:241
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "chyba z�pisu na %s - sektor %lu nelze zapsat\n"
 
-#: fdisk/sfdisk.c:273
+#: fdisk/sfdisk.c:279
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "soubor pro ulo�en� sektor� (%s) nelze otev��t\n"
 
-#: fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:297
 #, c-format
 msgid "write error on %s\n"
 msgstr "chyba z�pisu na %s\n"
 
-#: fdisk/sfdisk.c:309
+#: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "vol�n� stat pro soubor s ulo�en�mi sektory (%s) selhalo\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:320
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr "soubor s ulo�en�mi sektory m� chybnou velikost - nebude obnoven\n"
 
-#: fdisk/sfdisk.c:318
+#: fdisk/sfdisk.c:324
 msgid "out of memory?\n"
 msgstr "nedostatek pam�ti?\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "soubor s ulo�en�mi sektory (%s) nelze otev��t\n"
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:336
 #, c-format
 msgid "error reading %s\n"
 msgstr "chyba p�i �ten� %s\n"
 
-#: fdisk/sfdisk.c:337
+#: fdisk/sfdisk.c:343
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "za��zen� %s nelze otev��t pro z�pis\n"
 
-#: fdisk/sfdisk.c:349
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "chyba p�i z�pisu sektoru %lu na %s\n"
 
-#: fdisk/sfdisk.c:415
+#: fdisk/sfdisk.c:406
+#, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Disk %s: velikost nelze zjistit\n"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Disk %s: geometrii nelze zjistit\n"
+
+#: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
 "Warning: start=%d - this looks like a partition rather than\n"
@@ -4263,27 +4334,22 @@ msgstr ""
 "cel� disk. Pou�it� fdisku je v tom p��pad� pravd�podobn� zbyte�n�\n"
 "[Pou�ijte p�ep�na� --force pokud to opravdu chcete.]\n"
 
-#: fdisk/sfdisk.c:421
+#: fdisk/sfdisk.c:442
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
 msgstr "Varov�n�: dle HDIO_GETGEO je po�et hlav %d\n"
 
-#: fdisk/sfdisk.c:424
+#: fdisk/sfdisk.c:445
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
 msgstr "Varov�n�: dle HDIO_GETGEO je po�et sektor� %d\n"
 
-#: fdisk/sfdisk.c:427
+#: fdisk/sfdisk.c:449
 #, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
-msgstr "Varov�n�: dle HDIO_GETGEO je po�et cylindr� %d\n"
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
+msgstr "Varov�n�: dle BLKGETSIZE/HDIO_GETGEO je po�et cylindr� %d\n"
 
-#: fdisk/sfdisk.c:431
-#, c-format
-msgid "Disk %s: cannot get geometry\n"
-msgstr "Disk %s: geometrii nelze zjistit\n"
-
-#: fdisk/sfdisk.c:433
+#: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%d) - usually at most 63\n"
@@ -4292,7 +4358,7 @@ msgstr ""
 "Varov�n�: podivn� po�et sektor� (%d) - obvykle neb�v� v�ce ne� 63\n"
 "To zp�sob� probl�my v�em program�m, kter� pou��vaj� CHS adresov�n�.\n"
 
-#: fdisk/sfdisk.c:437
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid ""
 "\n"
@@ -4301,20 +4367,20 @@ msgstr ""
 "\n"
 "Disk %s: cylindr�: %lu, hlav: %lu, sektor�/stopu: %lu\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:539
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
 msgstr "%s diskov�ho odd�lu %s m� chybn� po�et hlav: %d (m�lo by b�t 0-%d)\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:544
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
 msgstr ""
 "%s diskov�ho odd�lu %s m� chybn� po�et sektor�: %d (m�lo by b�t 1-%d)\n"
 
-#: fdisk/sfdisk.c:527
+#: fdisk/sfdisk.c:549
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %d (should be in "
@@ -4322,17 +4388,17 @@ msgid ""
 msgstr ""
 "%s diskov�ho odd�lu %s m� chybn� po�et cylindr�: %d (m�lo by b�t 0-%d)\n"
 
-#: fdisk/sfdisk.c:566
+#: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr "Id  Jm�no\n"
 
-#: fdisk/sfdisk.c:719
+#: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
 msgstr "Na��t�m znovu tabulku rozd�len� disku ...\n"
 
-#: fdisk/sfdisk.c:725
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4340,31 +4406,31 @@ msgstr ""
 "Nepoda�ilo se znovu na��st tabulku rozd�len� disku.\n"
 "Restartujte nyn�, p�ed pou�it�m mkfs, syst�m.\n"
 
-#: fdisk/sfdisk.c:730
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Chyba p�i zav�r�n� %s\n"
 
-#: fdisk/sfdisk.c:768
+#: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "diskov� odd�l %s neexistuje\n"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
 msgstr "Nezn�m� form�t - pou��v�m sektory\n"
 
-#: fdisk/sfdisk.c:830
+#: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabulka rozd�len� disku pro %s\n"
 
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "nepou��van� form�t - pou��v�m %s\n"
 
-#: fdisk/sfdisk.c:845
+#: fdisk/sfdisk.c:867
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4373,11 +4439,11 @@ msgstr ""
 "Jednotky = cylindry po %lu bajtech, bloky po 1024 bajtech, po��t�no od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
 msgstr "   Za��z  Boot Za��tek   Konec #cylind #bloky    Id  Syst�m\n"
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:875
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4386,11 +4452,11 @@ msgstr ""
 "Jednotky = sektory po 512 bajtech, po��t�no od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:855
+#: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
 msgstr "   Za��z  Boot    Za��tek     Konec #sektory Id  Syst�m\n"
 
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4399,11 +4465,11 @@ msgstr ""
 "Jednotky = bloky po 1024 bajtech, po��t�no od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:860
+#: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
 msgstr "   Za��z  Boot   Za��tek     Konec #bloky   Id  Syst�m\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:885
 #, c-format
 msgid ""
 "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4413,30 +4479,30 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:865
+#: fdisk/sfdisk.c:887
 msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
 msgstr "   Za��z  Boot Za��tek Konec   MB   #bloky    Id  Syst�m\n"
 
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1019
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tza��tek: (c,h,s) p�edpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1004
+#: fdisk/sfdisk.c:1026
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tkonec: (c,h,s) p�edpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1007
+#: fdisk/sfdisk.c:1029
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "diskov� odd�l kon�� na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1018
+#: fdisk/sfdisk.c:1040
 msgid "No partitions found\n"
 msgstr "Nebyly nalezeny ��dn� diskov� odd�ly\n"
 
-#: fdisk/sfdisk.c:1025
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid ""
 "Warning: The first partition looks like it was made\n"
@@ -4447,94 +4513,94 @@ msgstr ""
 "pro C/H/S=*/%ld/%ld (m�sto %ld/%ld/%ld).\n"
 "Zobrazuji za pou�it� t�to geometrie.\n"
 
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1097
 msgid "no partition table present.\n"
 msgstr "Nebyla nalezena ��dn� tabulka rozd�len� disku.\n"
 
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Zvl�tn� - po�et definovan�ch diskov�ch odd�l� je pouze %d.\n"
 
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1108
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Varov�n�: diskov� odd�l %s m� velikost 0 a nen� ozna�en jako pr�zdn�.\n"
 
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1111
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varov�n�: diskov� odd�l %s m� velikost 0 a je startovac�.\n"
 
-#: fdisk/sfdisk.c:1092
+#: fdisk/sfdisk.c:1114
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varov�n�: diskov� odd�l %s m� velikost 0 a nenulov� za��tek.\n"
 
-#: fdisk/sfdisk.c:1103
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Varov�n�: diskov� odd�l %s "
 
-#: fdisk/sfdisk.c:1104
+#: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "nen� obsa�en v diskov�m odd�lu %s.\n"
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Varov�n�: diskov� odd�ly %s "
 
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
 msgstr "a %s se navz�jem p�ekr�vaj�.\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, c-format
 msgid "Warning: partition %s contains part of "
 msgstr "Varov�n�: diskov� odd�l %s obsahuje ��st "
 
-#: fdisk/sfdisk.c:1128
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "the partition table (sector %lu),\n"
 msgstr "tabulky rozd�len� disku (sektor %lu)\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
 msgstr "a zni�� ji, pokud bude obsazen\n"
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varov�n�: diskov� odd�l %s za��n� na sektoru 0\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1164
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varov�n�: diskov� odd�l %s p�esahuje za konec disku.\n"
 
-#: fdisk/sfdisk.c:1156
+#: fdisk/sfdisk.c:1178
 msgid "Among the primary partitions, at most one can be extended\n"
 msgstr "Pouze jeden z diskov�ch odd�l� m��e b�t roz���en�m.\n"
 
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
 msgstr " (a�koliv pod Linuxem to nep�edstavuje probl�m)\n"
 
-#: fdisk/sfdisk.c:1174
+#: fdisk/sfdisk.c:1196
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varov�n�: diskov� odd�l %s neza��n� na hranici cylindru.\n"
 
-#: fdisk/sfdisk.c:1180
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varov�n�: diskov� odd�l %s nekon�� na hranici cylindru.\n"
 
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1220
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4542,7 +4608,7 @@ msgstr ""
 "Varov�n�: v�ce ne� jeden prim�rn� diskov� odd�l je ozna�en jako startovac�.\n"
 "LILU to ne�in� probl�my, ale DOS MBR z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4550,7 +4616,7 @@ msgstr ""
 "Varov�n�: oby�ejn� je mo�n� startovat pouze z prim�rn�ch diskov�ch odd�l|�.\n"
 "LILO nebude br�t ohled na p��znak 'startovac�'.\n"
 
-#: fdisk/sfdisk.c:1211
+#: fdisk/sfdisk.c:1233
 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"
@@ -4558,7 +4624,7 @@ msgstr ""
 "Varov�n�: ��dn� prim�rn� diskov� odd�l nen� ozna�en jako startovac�.\n"
 "LILU to ne�in� probl�my, ale DOS z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1228
+#: fdisk/sfdisk.c:1250
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4566,144 +4632,163 @@ msgstr ""
 "diskov� odd�l %s: za��tek: (c,h,s) p�edpoklad (%ld,%ld,%ld), nalezeno\n"
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1237
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "diskov� odd�l %s: konec: (c,h,s) p�edpoklad (%ld,%ld,%ld), nalezeno\n"
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1240
+#: fdisk/sfdisk.c:1262
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "diskov� odd�l %s kon�� na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#: fdisk/sfdisk.c:1287
+#, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "Varov�n�: za��tek roz���en�ho diskov�ho odd�lu posunut z %ld na %ld.\n"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr "(Pouze pro tento v�pis. obsah nezm�n�n.)\n"
+
+#: fdisk/sfdisk.c:1291
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr "Varov�n�: roz���en� diskov� odd�l neza��n� na hranici cylindru.\n"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr "DOS a Linux budou obsah interpretovat r�zn�m zp�sobem.\n"
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "p��li� mnoho diskov�ch odd�l� - ignoruji > %d\n"
 
-#: fdisk/sfdisk.c:1288
+#: fdisk/sfdisk.c:1324
 msgid "tree of partitions?\n"
 msgstr "strom diskov�ch odd�l�?\n"
 
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "nalezen Disk Manager - s t�m neum�m pracovat\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
 msgstr "nalezen DM6 podpis - kon��m\n"
 
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "zvl�tn�..., roz���en� diskov� odd�l o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1426
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "zvl�tn�..., BSD diskov� odd�l o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1458
+#: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr " diskov� odd�l %s nen� zn�m\n"
 
-#: fdisk/sfdisk.c:1470
+#: fdisk/sfdisk.c:1536
 msgid "-n flag was given: Nothing changed\n"
 msgstr "byl zad�n p�ep�na� -n: Nic nebylo zm�n�no\n"
 
-#: fdisk/sfdisk.c:1483
+#: fdisk/sfdisk.c:1549
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Chyba p�i ukl�d�n� star�ch sektor� - kon��m\n"
 
-#: fdisk/sfdisk.c:1488
+#: fdisk/sfdisk.c:1554
 #, 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:1565
+#: fdisk/sfdisk.c:1631
 msgid "long or incomplete input line - quitting\n"
 msgstr "p��li� dlouh� �i ne�pln� ��dek - kon��m\n"
 
-#: fdisk/sfdisk.c:1601
+#: fdisk/sfdisk.c:1667
 #, 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:1608
+#: fdisk/sfdisk.c:1674
 #, 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:1614
+#: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nerozpoznan� vstup: %s\n"
 
-#: fdisk/sfdisk.c:1646
+#: fdisk/sfdisk.c:1712
 msgid "number too big\n"
 msgstr "��slo je p��li� velik�\n"
 
-#: fdisk/sfdisk.c:1650
+#: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
 msgstr "nesmysly za ��slem\n"
 
-#: fdisk/sfdisk.c:1766
+#: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
 msgstr "nen� m�sto pro popis diskov�ho odd�lu\n"
 
-#: fdisk/sfdisk.c:1799
+#: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
 msgstr "okoln� roz�i�uj�c� diskov� odd�l nelze vytvo�it\n"
 
-#: fdisk/sfdisk.c:1850
+#: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
 msgstr "p��li� mnoho vstupn�ch polo�ek\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1884
+#: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
 msgstr "Ji� nejsou voln� bloky\n"
 
-#: fdisk/sfdisk.c:1903
+#: fdisk/sfdisk.c:1969
 msgid "Illegal type\n"
 msgstr "Chybn� typ\n"
 
-#: fdisk/sfdisk.c:1935
+#: fdisk/sfdisk.c:2001
 #, c-format
-msgid "Warning: exceeds max allowable size (%lu)\n"
-msgstr "Varov�n�: p�ekro�en� maxim�ln� povolen� velikosti (%lu)\n"
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
+msgstr ""
+"Varov�n�: zadan� velikost(%ld) p�ekra�uje maxim�ln� povolenou velikost "
+"(%lu)\n"
 
-#: fdisk/sfdisk.c:1940
+#: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
 msgstr "Varov�n�: pr�zdn� diskov� odd�l\n"
 
-#: fdisk/sfdisk.c:1954
+#: fdisk/sfdisk.c:2021
 #, 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:1967
+#: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nerozpoznan� p��znak 'startovac�' - zvolte - �i *\n"
 
-#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
 msgstr "ne�pln� c,h,s specifikace?\n"
 
-#: fdisk/sfdisk.c:2008
+#: fdisk/sfdisk.c:2075
 msgid "Extended partition not where expected\n"
 msgstr "Roz���en� diskov� odd�l na neo�ek�van�m m�st�\n"
 
-#: fdisk/sfdisk.c:2040
+#: fdisk/sfdisk.c:2107
 msgid "bad input\n"
 msgstr "chybn� vstup\n"
 
-#: fdisk/sfdisk.c:2062
+#: fdisk/sfdisk.c:2129
 msgid "too many partitions\n"
 msgstr "p��li� mnoho diskov�ch odd�l�\n"
 
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2162
 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"
@@ -4715,100 +4800,100 @@ 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:2115
+#: fdisk/sfdisk.c:2182
 msgid "version"
 msgstr "verze"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2188
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Pou�it�: %s [p�ep�na�e] za��zen� ...\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2189
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "za��zen�: n�co jako /dev/hda �i /dev/sda"
 
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2190
 msgid "useful options:"
 msgstr "u�ite�n� p�ep�na�e:"
 
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2191
 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:2125
+#: fdisk/sfdisk.c:2192
 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:2126
+#: fdisk/sfdisk.c:2193
 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:2127
+#: fdisk/sfdisk.c:2194
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [�i --dump]:      idem, ale ve form�tu vhodn�m k dal��mu zpracov�n�"
 
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2195
 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:2129
+#: fdisk/sfdisk.c:2196
 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:2130
+#: fdisk/sfdisk.c:2197
 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:2131
+#: fdisk/sfdisk.c:2198
 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:2132
+#: fdisk/sfdisk.c:2199
 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:2133
+#: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                zm�n� pouze diskov� odd�l s ��slem #"
 
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ��dn� zm�ny nebudou ulo�eny na disk"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2202
 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:2136
+#: fdisk/sfdisk.c:2203
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I SOUBOR :            obnov� tyto sektory ze SOUBORU"
 
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [�i --version]:   vyp��e informace o verzi"
 
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [�i --help]:      vyp��e tuto n�pov�du"
 
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
 msgstr "nebezpe�n� p�ep�na�e:"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2207
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [�i --show-geometry]: vyp��e informace o geometrii, kter�\n"
 "                                    udr�uje j�dro"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4816,124 +4901,119 @@ msgstr ""
 "    -x [�i --show-extended]: vyp��e informace o roz���en�ch diskov�ch\n"
 "                             odd�lech a na vstupu bude o�ek�vat jejich popis"
 
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2210
 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:2144
+#: fdisk/sfdisk.c:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [�i --quiet]:      nebude vypisovat varovn� hl�ky"
 
-#: fdisk/sfdisk.c:2145
+#: fdisk/sfdisk.c:2212
 msgid "    You can override the detected geometry using:"
 msgstr "    Nalezenou geometrii m��ete p�epsat pomoc�:"
 
-#: fdisk/sfdisk.c:2146
+#: fdisk/sfdisk.c:2213
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [�i --cylinders #]:nastav� po�et cylindr�"
 
-#: fdisk/sfdisk.c:2147
+#: fdisk/sfdisk.c:2214
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [�i --heads #]:    nastav� po�et hlav"
 
-#: fdisk/sfdisk.c:2148
+#: fdisk/sfdisk.c:2215
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [�i --sectors #]:  nastav� po�et cylindr�"
 
-#: fdisk/sfdisk.c:2149
+#: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
 msgstr "Ov��ov�n� konzistence m��ete vypnout pomoc�:"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2217
 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:2156
+#: fdisk/sfdisk.c:2223
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: fdisk/sfdisk.c:2157
+#: fdisk/sfdisk.c:2224
 #, 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:2158
+#: fdisk/sfdisk.c:2225
 #, 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:2159
+#: fdisk/sfdisk.c:2226
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An za��zen�\t aktivuje diskov� odd�ly n ..., deaktivuje ostatn�\n"
 
-#: fdisk/sfdisk.c:2278
+#: fdisk/sfdisk.c:2346
 msgid "no command?\n"
 msgstr "��dn� p��kaz?\n"
 
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2471
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "celkov� po�et blok�: %d\n"
 
-#: fdisk/sfdisk.c:2438
+#: fdisk/sfdisk.c:2508
 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:2440
+#: fdisk/sfdisk.c:2510
 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:2442
+#: fdisk/sfdisk.c:2512
 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:2449
+#: fdisk/sfdisk.c:2519
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "m��ete zadat pouze jedno za��zen� (vyj�mkou jsou p�ep�na�e -l a -s)\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 #, c-format
 msgid "cannot open %s %s\n"
 msgstr "%s %s nelze otev��t\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "read-write"
 msgstr "pro �ten�/z�pis"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "for reading"
 msgstr "pro �ten�"
 
-#: fdisk/sfdisk.c:2499
+#: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2516
-#, c-format
-msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
-msgstr "%s: %d cylindr�, %d hlav, %d sektor�/stopu\n"
-
-#: fdisk/sfdisk.c:2519
+#: fdisk/sfdisk.c:2586
 #, c-format
-msgid "%s: unknown geometry\n"
-msgstr "%s: nezn�m� geometrie\n"
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
+msgstr "%s: %ld cylindr�, %ld hlav, %ld sektor�/stopu\n"
 
-#: fdisk/sfdisk.c:2535
+#: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "vol�n� BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/sfdisk.c:2612
+#: fdisk/sfdisk.c:2680
 #, 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:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
 msgid ""
 "Done\n"
 "\n"
@@ -4941,7 +5021,7 @@ msgstr ""
 "Hotovo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2638
+#: fdisk/sfdisk.c:2706
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4951,69 +5031,69 @@ msgstr ""
 "MBR\n"
 "nastartuje pouze z disku s jedn�m aktivn�m diskov�m odd�lem.\n"
 
-#: fdisk/sfdisk.c:2652
+#: fdisk/sfdisk.c:2720
 #, 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:2708
+#: fdisk/sfdisk.c:2777
 #, c-format
 msgid "Bad Id %x\n"
 msgstr "Id %x je chybn�\n"
 
-#: fdisk/sfdisk.c:2723
+#: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
 msgstr "Tento disk je pr�v� pou��v�n.\n"
 
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fat�ln� chyba: %s nelze nal�zt\n"
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2812
 #, 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:2749
+#: fdisk/sfdisk.c:2818
 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:2751
+#: fdisk/sfdisk.c:2820
 msgid ""
 "\n"
-"This disk is currently in use - repartitioning is probably a bad idea.Umount "
-"all file systems, and swapoff all swap partitions on this disk.Use the "
-"--no-reread flag to suppress this check.\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"Tento disk je pr�v� pou��v�n - vytv��en� diskov�ch odd�l� nen� dobr�m "
-"n�padem. Odpojte v�echny syst�my soubor� a pomoc� swapoff deaktivujte "
-"v�echny odkl�dac� prostory na tomto disku. K potla�en� t�to kontroly m��ete "
+"Tento disk je pr�v� pou��v�n - vytv��en� diskov�ch odd�l� nen� dobr�m\n"
+"n�padem. Odpojte v�echny syst�my soubor� a pomoc� swapoff deaktivujte\n"
+"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:2755
+#: fdisk/sfdisk.c:2824
 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:2759
-msgid "OK"
-msgstr "OK"
+#: fdisk/sfdisk.c:2828
+msgid "OK\n"
+msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2768
+#: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
 msgstr "Star� situace:\n"
 
-#: fdisk/sfdisk.c:2772
+#: fdisk/sfdisk.c:2841
 #, 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:2780
+#: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
 msgstr "Nov� situace:\n"
 
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2854
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5021,19 +5101,19 @@ 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:2788
+#: fdisk/sfdisk.c:2857
 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:2793
+#: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Vyhovuje V�m to? [ynq] "
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Ulo�it na disk? [ynq] "
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2869
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5041,15 +5121,15 @@ msgstr ""
 "\n"
 "sfdisk: p�ed�asn� konec vstupu\n"
 
-#: fdisk/sfdisk.c:2802
+#: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
 msgstr "Kon��m - nebyly u�in�ny ��dn� zm�ny\n"
 
-#: fdisk/sfdisk.c:2808
+#: fdisk/sfdisk.c:2877
 msgid "Please answer one of y,n,q\n"
 msgstr "Odpov�zte pros�m y,n �i q\n"
 
-#: fdisk/sfdisk.c:2816
+#: fdisk/sfdisk.c:2885
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5057,7 +5137,7 @@ msgstr ""
 "Nov� tabulka rozd�len� disku byla �sp�n� ulo�ena.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2891
 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"
@@ -5069,106 +5149,112 @@ msgstr ""
 "of=/dev/bla7\n"
 "bs=512 count=1' (viz fdisk(8)).\n"
 
-#: games/banner.c:1048
+#: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
 msgstr "Pou�it�: banner [-w ���ka]\n"
 
-#: games/banner.c:1068
+#: games/banner.c:1065
 msgid "Message: "
 msgstr "Zpr�va: "
 
-#: games/banner.c:1102
+#: games/banner.c:1099
 #, c-format
 msgid "The character '%c' is not in my character set"
 msgstr "Znak '%c' nen� sou��st� nen� sou��st� m� sady znak�."
 
-#: games/banner.c:1110
+#: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
 msgstr "Zpr�va '%s' je v po��dku\n"
 
-#: getopt-1.0.3b/getopt.c:229
+#: getopt-1.1.0a/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "V�ce informac� z�sk�te p��kazem `getopt --help'.\n"
 
-#: getopt-1.0.3b/getopt.c:295
+#: getopt-1.1.0a/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "pr�zdn� dlouh� volba po p�ep�na�i -l �i --long"
 
-#: getopt-1.0.3b/getopt.c:315
+#: getopt-1.1.0a/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "nezn�m� shell po p�ep�na�i -s �i --shell"
 
-#: getopt-1.0.3b/getopt.c:320
+#: getopt-1.1.0a/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Pou�it�: getopt �et�zec-s-volbami p�ep�na�e\n"
 
-#: getopt-1.0.3b/getopt.c:321
+#: getopt-1.1.0a/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [volby] [--] �et�zec-s-volbami p�ep�na�e\n"
 
-#: getopt-1.0.3b/getopt.c:322
+#: getopt-1.1.0a/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [volby] -o|--options �et�zec-s-volbami [volby] [--]\n"
 
-#: getopt-1.0.3b/getopt.c:323
+#: getopt-1.1.0a/getopt.c:327
 msgid "              parameters\n"
 msgstr "              argumenty\n"
 
-#: getopt-1.0.3b/getopt.c:324
+#: getopt-1.1.0a/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Akceptuje dlouh� volby za��naj�c� jedn�m -\n"
 
-#: getopt-1.0.3b/getopt.c:325
+#: getopt-1.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Vyp��e tuto n�pov�du\n"
 
-#: getopt-1.0.3b/getopt.c:326
+#: getopt-1.1.0a/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=dlouhvol   Rozpozn�van� dlouh� volby\n"
 
-#: getopt-1.0.3b/getopt.c:327
+#: getopt-1.1.0a/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=jm�noprog          Jm�no, pod kter�m jsou oznamov�ny chyby\n"
 
-#: getopt-1.0.3b/getopt.c:328
+#: getopt-1.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=kr�tvol        Rozpozn�van� kr�tk� volby\n"
 
-#: getopt-1.0.3b/getopt.c:329
+#: getopt-1.1.0a/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Vypne oznamov�n� chyb pomoc� getopt(3)\n"
 
-#: getopt-1.0.3b/getopt.c:330
+#: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           ��dn� norm�ln� v�stup\n"
 
-#: getopt-1.0.3b/getopt.c:331
+#: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            Nastav� konvence uzav�ran�\n"
 
-#: getopt-1.0.3b/getopt.c:332
+#: getopt-1.1.0a/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Testuje verzi getopt(1)\n"
 
-#: getopt-1.0.3b/getopt.c:333
+#: getopt-1.1.0a/getopt.c:337
+#, fuzzy
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -Q, --quiet-output           ��dn� norm�ln� v�stup\n"
+
+#: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Vyp��e informace o verzi\n"
 
-#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
 msgstr "chyb� �et�zec-s-volbami"
 
-#: getopt-1.0.3b/getopt.c:433
-msgid "getopt (enhanced) 1.0.3\n"
+#: getopt-1.1.0a/getopt.c:441
+#, fuzzy
+msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (roz���en�) 1.0.3\n"
 
-#: getopt-1.0.3b/getopt.c:439
+#: getopt-1.1.0a/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "Vnit�n� chyba, oznamte ji autorovi."
 
@@ -5226,70 +5312,70 @@ msgstr "po zpracov�n� argument� p��kazov� ��dky\n"
 msgid "exiting parseargs\n"
 msgstr "opou�t�m funkci parseargs\n"
 
-#: login-utils/agetty.c:505
+#: login-utils/agetty.c:504
 msgid "entered parse_speeds\n"
 msgstr "vstupuji do funkce parse_speeds\n"
 
-#: login-utils/agetty.c:508
+#: login-utils/agetty.c:507
 #, c-format
 msgid "bad speed: %s"
 msgstr "chybn� rychlost %s"
 
-#: login-utils/agetty.c:510
+#: login-utils/agetty.c:509
 msgid "too many alternate speeds"
 msgstr "p��li� mnoho alternativn�ch rychlost�"
 
-#: login-utils/agetty.c:512
+#: login-utils/agetty.c:511
 msgid "exiting parsespeeds\n"
 msgstr "opou�t�m funkci parsespeeds\n"
 
-#: login-utils/agetty.c:587
+#: login-utils/agetty.c:584
 #, c-format
 msgid "%s: open for update: %m"
 msgstr "%s: otev�en� za ��elem aktualizace: %m"
 
-#: login-utils/agetty.c:605
+#: login-utils/agetty.c:602
 #, c-format
 msgid "%s: no utmp entry"
 msgstr "��dn� utmp polo�ka pro %s"
 
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:631
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "/dev: vol�n� chdir() selhalo: %m"
 
-#: login-utils/agetty.c:638
+#: login-utils/agetty.c:635
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s nen� znakov�m za��zen�m"
 
 #. ignore close(2) errors
-#: login-utils/agetty.c:645
+#: login-utils/agetty.c:642
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:644
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s nelze otev��t jako standardn� vstup: %m"
 
-#: login-utils/agetty.c:657
+#: login-utils/agetty.c:654
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: nen� otev�eno pro �ten�/z�pis"
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:661
+#: login-utils/agetty.c:658
 msgid "duping\n"
 msgstr "vol�m dup\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:663
+#: login-utils/agetty.c:660
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: vol�n� dup selhalo: %m"
 
-#: login-utils/agetty.c:733
+#: login-utils/agetty.c:730
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
@@ -5324,31 +5410,31 @@ msgstr ""
 "�i\t[-hiLmw] [-l login_program] [-t �asov� limit] [-I inicializa�n� �et�zec] "
 "[-H po��ta�] linka baud_rate,... [typ termin�lu]\n"
 
-#: login-utils/checktty.c:46
+#: login-utils/checktty.c:41
 #, c-format
 msgid "badlogin: %s\n"
 msgstr "chybn� p�ihla�ovac� jm�no: %s\n"
 
 # ???
-#: login-utils/checktty.c:52
+#: login-utils/checktty.c:47
 #, c-format
 msgid "sleepexit %d\n"
 msgstr "sleepexit %d\n"
 
-#: login-utils/checktty.c:108 login-utils/checktty.c:130
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
 msgstr "login: nedostatek pam�ti, p�ihl�en� se nemus� zda�it\n"
 
-#: login-utils/checktty.c:109
+#: login-utils/checktty.c:104
 msgid "can't malloc for ttyclass"
 msgstr "pam� pro ttyclass nelze alokovat"
 
-#: login-utils/checktty.c:131
+#: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
 msgstr "pam� pro grplist nelze alokovat"
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:431
+#: login-utils/checktty.c:426
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "P�ihl�en� z %2$s na tty %1$s implicitn� odm�tnuto.\n"
@@ -5357,57 +5443,57 @@ msgstr "P�ihl�en� z %2$s na tty %1$s implicitn� odm�tnuto.\n"
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:442
+#: login-utils/checktty.c:437
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "P�ihl�en� z $2%s na $1%s odm�tnuto.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:117
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: vy (u�ivatel %d) neexistujete.\n"
 
-#: login-utils/chfn.c:141 login-utils/chsh.c:124
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: u�ivatel \"%s\" neexistuje.\n"
 
-#: login-utils/chfn.c:146 login-utils/chsh.c:129
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: m��e m�nit pouze m�stn� polo�ky; pou�ijte yp%s.\n"
 
-#: login-utils/chfn.c:158
+#: login-utils/chfn.c:145
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "M�n�m finger informace o %s.\n"
 
-#: login-utils/chfn.c:164 login-utils/chfn.c:168 login-utils/chfn.c:175
-#: login-utils/chfn.c:179 login-utils/chsh.c:153 login-utils/chsh.c:157
-#: login-utils/chsh.c:164 login-utils/chsh.c:168
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
 msgid "Password error."
 msgstr "Chybn� heslo."
 
-#: login-utils/chfn.c:188 login-utils/chsh.c:177 login-utils/login.c:684
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:266 mount/lomount.c:221
+#: mount/lomount.c:227
 msgid "Password: "
 msgstr "Heslo: "
 
-#: login-utils/chfn.c:191 login-utils/chsh.c:180
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "Chybn� heslo."
 
-#: login-utils/chfn.c:202
+#: login-utils/chfn.c:189
 msgid "Finger information not changed.\n"
 msgstr "Finger informace nebyly zm�n�ny.\n"
 
-#: login-utils/chfn.c:305
+#: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Pou�it�: %s [ -f pln�-jm�no ] [ -o kancel�� ] "
 
-#: login-utils/chfn.c:306
+#: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -5415,11 +5501,11 @@ msgstr ""
 "[ -p telefon-do-kancel��e ]\n"
 "\t[ -h telefon-dom� ] "
 
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ -- version ]\n"
 
-#: login-utils/chfn.c:376 login-utils/chsh.c:293
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
 msgid ""
 "\n"
 "Aborted.\n"
@@ -5427,153 +5513,153 @@ msgstr ""
 "\n"
 "Ukon�en.\n"
 
-#: login-utils/chfn.c:409
+#: login-utils/chfn.c:398
 msgid "field is too long.\n"
 msgstr "Polo�ka je p��li� dlouh�.\n"
 
-#: login-utils/chfn.c:417
+#: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' nen� povoleno.\n"
 
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
 msgstr "Kontroln� znaky nejsou povoleny.\n"
 
-#: login-utils/chfn.c:487
+#: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "Finger informace *NEBYLY* zm�n�ny. Zkuste to op�t pozd�ji.\n"
 
-#: login-utils/chfn.c:490
+#: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
 msgstr "Finger informace byly zm�n�ny.\n"
 
-#: login-utils/chfn.c:504 login-utils/chsh.c:411 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
 msgid "malloc failed"
 msgstr "vol�n� malloc selhalo"
 
-#: login-utils/chsh.c:140
+#: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: V� shell nen� v /etc/shells, zm�na shellu odm�tnuta\n"
 
-#: login-utils/chsh.c:147
+#: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "M�n�m shell pro %s.\n"
 
-#: login-utils/chsh.c:188
+#: login-utils/chsh.c:178
 msgid "New shell"
 msgstr "Nov� shell"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
 msgstr "Shell nebyl zm�n�n.\n"
 
-#: login-utils/chsh.c:202
+#: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell *NEBYL* zm�n�n. Zkuste to op�t pozd�ji.\n"
 
-#: login-utils/chsh.c:205
+#: login-utils/chsh.c:195
 msgid "Shell changed.\n"
 msgstr "Shell byl zm�n�n.\n"
 
-#: login-utils/chsh.c:273
+#: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
 msgstr "Pou�it�: %s [ -s shell ] "
 
-#: login-utils/chsh.c:274
+#: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:275
+#: login-utils/chsh.c:265
 msgid "       [ username ]\n"
 msgstr "       [ u�ivatelsk� jm�no ]\n"
 
-#: login-utils/chsh.c:319
+#: login-utils/chsh.c:309
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: shell mus� b�t zad�n �pln�m jm�nem cesty.\n"
 
-#: login-utils/chsh.c:323
+#: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" neexistuje.\n"
 
-#: login-utils/chsh.c:327
+#: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" nen� spustiteln�m souborem.\n"
 
-#: login-utils/chsh.c:334
+#: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' nen� povoleno.\n"
 
-#: login-utils/chsh.c:338
+#: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Kontroln� znaky nejsou povoleny.\n"
 
-#: login-utils/chsh.c:345
+#: login-utils/chsh.c:335
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Varov�n�: \"%s\" nen� v /etc/shells\n"
 
-#: login-utils/chsh.c:347
+#: login-utils/chsh.c:337
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" nen� v /etc/shells.\n"
 
-#: login-utils/chsh.c:349
+#: login-utils/chsh.c:339
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: pou�ijte p�ep�na� -l pro vyps�n� seznamu\n"
 
-#: login-utils/chsh.c:355
+#: login-utils/chsh.c:345
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Varov�n�: \"%s\" nen� v /etc/shells.\n"
 
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:346
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Pou�ijte %s -l pro vyps�n� seznamu\n"
 
-#: login-utils/chsh.c:377
+#: login-utils/chsh.c:367
 msgid "No known shells.\n"
 msgstr "Nen� zn�m ��dn� shell.\n"
 
-#: login-utils/cryptocard.c:70
+#: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
 msgstr "/dev/urandom nelze otev��t"
 
-#: login-utils/cryptocard.c:75
+#: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
 msgstr "n�hodn� data z /dev/urandom nelze ��st"
 
-#: login-utils/cryptocard.c:98
+#: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
 msgstr "%s pro �ten� nelze otev��t"
 
-#: login-utils/cryptocard.c:102
+#: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
 msgstr "vol�n� stat(%s) selhalo"
 
-#: login-utils/cryptocard.c:108
+#: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
 msgstr "%s m� chybn� p��stupov� pr�va"
 
-#: login-utils/cryptocard.c:113
+#: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
 msgstr "data z %s nelze ��st"
 
-#: login-utils/islocal.c:36
+#: login-utils/islocal.c:37
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "%s nelze ��st, kon��m."
@@ -5606,7 +5692,7 @@ msgid "last: gethostname"
 msgstr "last: gethostname"
 
 #: login-utils/last.c:469
-#, c-format
+#, c-format, ycp-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
@@ -5614,37 +5700,40 @@ msgstr ""
 "\n"
 "p�eru�en %10.10s %5.5s \n"
 
-#: login-utils/login.c:377
+#: login-utils/login.c:373
 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:402
+#: login-utils/login.c:398
 msgid "usage: login [-fp] [username]\n"
 msgstr "Pou�it�: login [fp] [u�ivatelsk� jm�no]\n"
 
-#: login-utils/login.c:504
+#: login-utils/login.c:501
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: chyba PAM, kon��m: %s\n"
 
-#: login-utils/login.c:506
+#: login-utils/login.c:503
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM nelze inicializovat: %s"
 
-#. Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. so that the "login: " prompt gets localized. Unfortunately,
-#. PAM doesn't have an interface to specify the "Password: " string (yet).
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
 #: login-utils/login.c:519
 msgid "login: "
 msgstr "P�ihla�ovac� jm�no:"
 
-#: login-utils/login.c:552
+#: login-utils/login.c:553
 #, 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:554
+#: login-utils/login.c:555
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -5652,17 +5741,17 @@ msgstr ""
 "Chybn� p�ihl�en�\n"
 "\n"
 
-#: login-utils/login.c:563
+#: login-utils/login.c:564
 #, 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:567
+#: login-utils/login.c:568
 #, 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:570
+#: login-utils/login.c:571
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -5670,30 +5759,30 @@ msgstr ""
 "\n"
 "Chybn� p�ihl�en�\n"
 
-#: login-utils/login.c:619
+#: login-utils/login.c:620
 msgid "Illegal username"
 msgstr "Chybn� u�ivatelsk� jm�no"
 
-#: login-utils/login.c:662
+#: login-utils/login.c:663
 #, 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:667
+#: login-utils/login.c:668
 #, 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:671
+#: login-utils/login.c:672
 #, 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:723
+#: login-utils/login.c:725
 msgid "Login incorrect\n"
 msgstr "Chybn� p�ihl�en�\n"
 
-#: login-utils/login.c:745
+#: login-utils/login.c:747
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5701,100 +5790,100 @@ msgstr ""
 "Ji� je p�ihl�eno p��li� mnoho u�ivatel�.\n"
 "Zkuste to op�t pozd�ji.\n"
 
-#: login-utils/login.c:749
+#: login-utils/login.c:751
 msgid "You have too many processes running.\n"
 msgstr "M�te spu�t�no p��li� mnoho proces�.\n"
 
-#: login-utils/login.c:795
+#: login-utils/login.c:797
 msgid "Warning: no Kerberos tickets issued\n"
 msgstr "Varov�n�: ��dn� Kerberos l�stky\n"
 
-#: login-utils/login.c:807
+#: login-utils/login.c:809
 msgid "Sorry -- your password has expired.\n"
 msgstr "Lituji -- platnost Va�eho hesla vypr�ela.\n"
 
-#: login-utils/login.c:813
+#: login-utils/login.c:815
 #, c-format
-msgid "Warning: your password expires on %s %d, %d\n"
-msgstr "Varov�n�: platnost Va�eho hesla vypr�� %s %d, %d\n"
+msgid "Warning: your password expires on %d %s %d.\n"
+msgstr "Varov�n�: platnost Va�eho hesla vypr�� %d %s %d.\n"
 
-#: login-utils/login.c:821
+#: login-utils/login.c:823
 msgid "Sorry -- your account has expired.\n"
 msgstr "Lituji -- platnost Va�eho ��tu vypr�ela.\n"
 
-#: login-utils/login.c:827
+#: login-utils/login.c:829
 #, c-format
-msgid "Warning: your account expires on %s %d, %d\n"
-msgstr "Varov�n�: platnost Va�eho ��tu vypr�� %s %d, %d\n"
+msgid "Warning: your account expires on %d %s %d.\n"
+msgstr "Varov�n�: platnost Va�eho ��tu vypr�� %d %s %d.\n"
 
-#: login-utils/login.c:1061
+#: login-utils/login.c:1066
 #, 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:1068
+#: login-utils/login.c:1073
 #, 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:1071
+#: login-utils/login.c:1076
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "P�IHL��EN� U�IVATELE ROOT NA TTY %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1079
 #, 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:1077
+#: login-utils/login.c:1082
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "P�IHL��EN� U�IVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1089
+#: login-utils/login.c:1094
 #, c-format
 msgid "You have %smail.\n"
 msgstr "M�te %spo�tu.\n"
 
-#: login-utils/login.c:1090
+#: login-utils/login.c:1095
 msgid "new "
 msgstr "novou "
 
 #. error in fork()
-#: login-utils/login.c:1108
+#: login-utils/login.c:1113
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: vol�n� fork selhalo: %s"
 
-#: login-utils/login.c:1123
+#: login-utils/login.c:1128
 msgid "setuid() failed"
 msgstr "vol�n� setuid() selhalo"
 
-#: login-utils/login.c:1129
+#: login-utils/login.c:1134
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Adres�� %s neexistuje!\n"
 
-#: login-utils/login.c:1133
+#: login-utils/login.c:1138
 msgid "Logging in with home = \"/\".\n"
 msgstr "P�ihla�uji s dom�c�m adres��em nastaven�m na \"/\".\n"
 
-#: login-utils/login.c:1141
+#: login-utils/login.c:1146
 msgid "login: no memory for shell script.\n"
 msgstr "login: nedostatek pam�ti pro skript shellu.\n"
 
-#: login-utils/login.c:1169
+#: login-utils/login.c:1174
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skript shellu %s nelze spustit.\n"
 
-#: login-utils/login.c:1172
+#: login-utils/login.c:1177
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ��dn� shell: %s.\n"
 
-#: login-utils/login.c:1188
+#: login-utils/login.c:1191
 #, c-format
 msgid ""
 "\n"
@@ -5803,62 +5892,62 @@ msgstr ""
 "\n"
 "P�ihla�ovac� jm�no na %s: "
 
-#: login-utils/login.c:1199
+#: login-utils/login.c:1202
 msgid "login name much too long.\n"
 msgstr "p�ihla�ovac� jm�no je p��li� dlouh�.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1203
 msgid "NAME too long"
 msgstr "JM�NO je p��li� dlouh�"
 
-#: login-utils/login.c:1207
+#: login-utils/login.c:1210
 msgid "login names may not start with '-'.\n"
 msgstr "p�ihla�ovac� jm�no nesm� za��nat '-'.\n"
 
-#: login-utils/login.c:1217
+#: login-utils/login.c:1220
 msgid "too many bare linefeeds.\n"
 msgstr "p��li� mnoho znak� LF\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1221
 msgid "EXCESSIVE linefeeds"
 msgstr "P��LI� mnoho znak� LF"
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1231
 #, 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:1329
+#: login-utils/login.c:1325
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Posledn� p�ihl�en�: %.*s "
 
-#: login-utils/login.c:1333
+#: login-utils/login.c:1329
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1336
+#: login-utils/login.c:1332
 #, c-format
 msgid "on %.*s\n"
 msgstr "%.*s\n"
 
-#: login-utils/login.c:1359
+#: login-utils/login.c:1355
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "CHYBN� P�IHL��EN� U�IVATELE %2$s Z %1$s"
 
-#: login-utils/login.c:1362
+#: login-utils/login.c:1358
 #, 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:1366
+#: login-utils/login.c:1362
 #, 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:1369
+#: login-utils/login.c:1365
 #, 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"
@@ -5899,181 +5988,181 @@ msgstr "newgrp: setuid"
 msgid "No shell"
 msgstr "��dn� shell"
 
-#: login-utils/passwd.c:161
+#: login-utils/passwd.c:159
 msgid "The password must have at least 6 characters, try again.\n"
 msgstr "Heslo mus� obsahovat alespo� 6 znak�, zkuste to znovu.\n"
 
-#: login-utils/passwd.c:174
+#: login-utils/passwd.c:172
 msgid "The password must contain characters out of two of the following\n"
 msgstr "Heslo mus� obsahovat znaky alespo� ze dvou z n�sleduj�c� skupin:\n"
 
-#: login-utils/passwd.c:175
+#: login-utils/passwd.c:173
 msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
 msgstr "velk� nebo mal� p�smena, ��slice a nealfanumerick� znaky.\n"
 
-#: login-utils/passwd.c:176
+#: login-utils/passwd.c:174
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "Viz passwd(1) pro v�ce informac�.\n"
 
-#: login-utils/passwd.c:181
+#: login-utils/passwd.c:179
 msgid "You cannot reuse the old password.\n"
 msgstr "Nem��ete op�t pou��t star� heslo.\n"
 
-#: login-utils/passwd.c:186
+#: login-utils/passwd.c:184
 msgid "Please don't use something like your username as password!\n"
 msgstr ""
 "Nepou��vejte, jako heslo Va�e u�ivatelsk� jm�no ani nic n�co podobn�ho.\n"
 
-#: login-utils/passwd.c:197 login-utils/passwd.c:204
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
 msgid "Please don't use something like your realname as password!\n"
 msgstr "Nepou��vejte, jako heslo Va�e skute�n� jm�no ani nic n�co podobn�ho.\n"
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:220
 msgid "Usage: passwd [username [password]]\n"
 msgstr "Pou�it�: password [u�ivatelsk� jm�no [heslo]]\n"
 
-#: login-utils/passwd.c:222
+#: login-utils/passwd.c:221
 msgid "Only root may use the one and two argument forms.\n"
 msgstr "Pouze superu�ivatel m��e pou��t argumenty.\n"
 
-#: login-utils/passwd.c:278
+#: login-utils/passwd.c:275
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "Pou�it�: passwd [foqsvV] [u�ivatel [heslo]]\n"
 
-#: login-utils/passwd.c:299
+#: login-utils/passwd.c:296
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "%s nelze spustit: %s\n"
 
-#: login-utils/passwd.c:310
+#: login-utils/passwd.c:307
 msgid "Cannot find login name"
 msgstr "P�ihla�ovac� jm�no nelze nal�zt"
 
-#: login-utils/passwd.c:317 login-utils/passwd.c:324
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
 msgid "Only root can change the password for others.\n"
 msgstr "Pouze superu�ivatel m��e zm�nit hesla jin�m u�ivatel�m.\n"
 
-#: login-utils/passwd.c:332
+#: login-utils/passwd.c:329
 msgid "Too many arguments.\n"
 msgstr "P��li� mnoho argument�.\n"
 
-#: login-utils/passwd.c:337
+#: login-utils/passwd.c:334
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
 msgstr "U�ivatelsk� jm�no nelze nal�zt. Je `%s' opravdu u�ivatelem?"
 
-#: login-utils/passwd.c:341
+#: login-utils/passwd.c:338
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr "Lituji, ale mohu zm�nit pouze m�stn� hesla. Pou�ijte yppasswd."
 
-#: login-utils/passwd.c:347
+#: login-utils/passwd.c:344
 msgid "UID and username does not match, imposter!"
 msgstr "UID a u�ivatelsk� jm�no se neshoduj�!"
 
-#: login-utils/passwd.c:352
+#: login-utils/passwd.c:349
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "M�n�m heslo u�ivatele %s\n"
 
-#: login-utils/passwd.c:356
+#: login-utils/passwd.c:353
 msgid "Enter old password: "
 msgstr "Zadejte star� heslo: "
 
-#: login-utils/passwd.c:358
+#: login-utils/passwd.c:355
 msgid "Illegal password, imposter."
 msgstr "Nepovolen� heslo."
 
-#: login-utils/passwd.c:370
+#: login-utils/passwd.c:367
 msgid "Enter new password: "
 msgstr "Zadejte nov� heslo: "
 
-#: login-utils/passwd.c:372
+#: login-utils/passwd.c:369
 msgid "Password not changed."
 msgstr "Heslo nebylo zm�n�no."
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:379
 msgid "Re-type new password: "
 msgstr "Potvr�te nov� heslo: "
 
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:382
 msgid "You misspelled it. Password not changed."
 msgstr "P�epsal jste se. Heslo nebylo zm�n�no."
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:397
 #, c-format
 msgid "password changed, user %s"
 msgstr "heslo bylo zm�n�no, u�ivatel %s"
 
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:400
 msgid "ROOT PASSWORD CHANGED"
 msgstr "HESLO U�IVATELE ROOT BYLO ZM�N�NO"
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:402
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "heslo zm�n�no u�ivatelem root, u�ivatel %s"
 
-#: login-utils/passwd.c:412
+#: login-utils/passwd.c:409
 msgid "calling setpwnam to set password.\n"
 msgstr "Vol�m setpwnam pro nastaven� hesla.\n"
 
-#: login-utils/passwd.c:416
+#: login-utils/passwd.c:413
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "Heslo *NEBYLO* zm�n�no. Zkuste to pozd�ji.\n"
 
-#: login-utils/passwd.c:422
+#: login-utils/passwd.c:419
 msgid "Password changed.\n"
 msgstr "Heslo bylo zm�n�no.\n"
 
-#: login-utils/shutdown.c:85
+#: login-utils/shutdown.c:87
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 msgstr "Pou�it�: shutdown [-h|-r] [-fqs] [now|hh:ss|+minuty]\n"
 
-#: login-utils/shutdown.c:103
+#: login-utils/shutdown.c:105
 msgid "Shutdown process aborted"
 msgstr "Proces shutdown ukon�en"
 
-#: login-utils/shutdown.c:125
+#: login-utils/shutdown.c:131
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
 msgstr "%s: Pouze superu�ivatel m��e vypnout syst�m.\n"
 
-#: login-utils/shutdown.c:219
+#: login-utils/shutdown.c:225
 msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr "To bude z�tra. To do t� doby nem��ete po�kat?\n"
 
-#: login-utils/shutdown.c:271
+#: login-utils/shutdown.c:277
 msgid "for maintenance; bounce, bounce"
 msgstr "kv�li �dr�b�"
 
-#: login-utils/shutdown.c:275
+#: login-utils/shutdown.c:281
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "�asov� limit = %d, klid = %d, restart = %d\n"
 
-#: login-utils/shutdown.c:300
+#: login-utils/shutdown.c:306
 msgid "The system is being shut down within 5 minutes"
 msgstr "Syst�m bude za 5 minut vypnut"
 
-#: login-utils/shutdown.c:304
+#: login-utils/shutdown.c:310
 msgid "Login is therefore prohibited."
 msgstr "P�ihla�ov�n� je tud�� zak�z�no."
 
-#: login-utils/shutdown.c:325
+#: login-utils/shutdown.c:331
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%s u�ivatelem %s: %s"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "rebooted"
 msgstr "restartov�n"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "halted"
 msgstr "vypnut"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:377
+#: login-utils/shutdown.c:387
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
@@ -6081,7 +6170,7 @@ msgstr ""
 "\n"
 "Pro� jsem po restartu st�le na�ivu?"
 
-#: login-utils/shutdown.c:379
+#: login-utils/shutdown.c:389
 msgid ""
 "\n"
 "Now you can turn off the power..."
@@ -6089,99 +6178,103 @@ msgstr ""
 "\n"
 "Nyn� m��ete vypnout proud..."
 
-#: login-utils/shutdown.c:394
+#: login-utils/shutdown.c:404
 msgid "Calling kernel power-off facility...\n"
 msgstr "Vol�m za��zen� j�dra pro vyp�n�n� proudu...\n"
 
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:407
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "Chyba p�i vyp�n�n� proudu\t%s\n"
 
-#: login-utils/shutdown.c:405
+#: login-utils/shutdown.c:415
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "Spou�t�m program \"%s\" ...\n"
 
-#: login-utils/shutdown.c:408
+#: login-utils/shutdown.c:418
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "Chyba p�i spu�t�n�\t%s\n"
 
-#: login-utils/shutdown.c:431
+#: login-utils/shutdown.c:441
 #, c-format
 msgid "URGENT: broadcast message from %s:"
 msgstr "NAL�HAV�: v�eobecn� zpr�va od %s:"
 
-#: login-utils/shutdown.c:437
+#: login-utils/shutdown.c:447
 msgid "System going down IMMEDIATELY!\n"
 msgstr "Syst�m bude OKAM�IT� vypnut!\n"
 
-#: login-utils/shutdown.c:440
+#: login-utils/shutdown.c:450
 #, c-format
 msgid "System going down in %d hour%s %d minutes"
 msgstr "Syst�m bude vypnut za %dh%s%dmin"
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
 msgid "s"
 msgstr " "
 
-#: login-utils/shutdown.c:443
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "System going down in %d minute%s\n"
 msgstr "Syst�m bude vypnut za %dmin%s\n"
 
-#: login-utils/shutdown.c:449
+#: login-utils/shutdown.c:459
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:506
+#: login-utils/shutdown.c:516
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "Swapoff nelze spustit - vol�n� fork selhalo."
 
-#: login-utils/shutdown.c:514
+#: login-utils/shutdown.c:524
 msgid "Cannot exec swapoff, hoping umount will do the trick."
 msgstr "Swapoff nelze spustit - vol�n� exec selhalo. Snad pom��e umount."
 
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:543
 msgid "Cannot fork for umount, trying manually."
 msgstr "Umount nelze spustit - vol�n� fork selhalo, zkou��m to ru�n�."
 
-#: login-utils/shutdown.c:542
+#: login-utils/shutdown.c:552
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr "%s nelze spustit - vol�n� exec selhalo, zkou��m umount.\n"
 
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:556
 msgid "Cannot exec umount, giving up on umount."
 msgstr ""
 "Umount nelze spustit - vol�n� exec selhalo, vzd�v�m snahu o spu�t�n� umount."
 
-#: login-utils/shutdown.c:551
+#: login-utils/shutdown.c:561
 msgid "Unmounting any remaining filesystems..."
 msgstr "Odpojuji v�echny zb�vaj�c� syst�my soubor�..."
 
-#: login-utils/shutdown.c:587
-#, c-format
-msgid "shutdown: Couldn't umount %s\n"
+#: login-utils/shutdown.c:595
+#, fuzzy, c-format
+msgid "shutdown: Couldn't umount %s: %s\n"
 msgstr "shutdown: %s nelze odpojit\n"
 
-#: login-utils/simpleinit.c:79
+#: login-utils/simpleinit.c:109
 msgid "Booting to single user mode.\n"
 msgstr "Startuji do re�imu pro jednoho u�ivatele.\n"
 
-#: login-utils/simpleinit.c:83
+#: login-utils/simpleinit.c:113
 msgid "exec of single user shell failed\n"
 msgstr ""
 "Spu�t�n� shellu pro jednoho u�ivatele se nezda�ilo - vol�n� exec selhalo.\n"
 
-#: login-utils/simpleinit.c:87
+#: login-utils/simpleinit.c:117
 msgid "fork of single user shell failed\n"
 msgstr ""
 "Spu�t�n� shellu pro jednoho u�ivatele se nezda�ilo - vol�n� fork selhalo.\n"
 
-#: login-utils/simpleinit.c:226
+#: login-utils/simpleinit.c:166
+msgid "error opening fifo\n"
+msgstr "Chyba p�i otev�r�n� pojmenovan� roury\n"
+
+#: login-utils/simpleinit.c:271
 msgid ""
 "\n"
 "Wrong password.\n"
@@ -6189,34 +6282,34 @@ msgstr ""
 "\n"
 "Chybn� heslo.\n"
 
-#: login-utils/simpleinit.c:252
-msgid "exec rc failed\n"
-msgstr "spu�t�n� rc se nezda�ilo - vol�n� exec selhalo\n"
+#: login-utils/simpleinit.c:341
+msgid "stat of path failed\n"
+msgstr "vol�n� stat pro cestu selhalo\n"
 
-#: login-utils/simpleinit.c:255
-msgid "open of rc file failed\n"
-msgstr "rc soubor nelze otev��t\n"
+#: login-utils/simpleinit.c:348
+msgid "open of directory failed\n"
+msgstr "adres�� nelze otev��t\n"
 
-#: login-utils/simpleinit.c:261
-msgid "fork of rc shell failed\n"
-msgstr "spu�t�n� rc se nezda�ilo - vol�n� fork selhalo\n"
-
-#: login-utils/simpleinit.c:273
+#: login-utils/simpleinit.c:415
 msgid "fork failed\n"
 msgstr "vol�n� fork selhalo\n"
 
-#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+#: login-utils/simpleinit.c:445 text-utils/more.c:1541
 msgid "exec failed\n"
 msgstr "vol�n� exec selhalo\n"
 
-#: login-utils/simpleinit.c:324
+#: login-utils/simpleinit.c:469
 msgid "cannot open inittab\n"
 msgstr "inittab nelze otev��t\n"
 
-#: login-utils/simpleinit.c:362
+#: login-utils/simpleinit.c:529
 msgid "no TERM or cannot stat tty\n"
 msgstr "��dn� TERM nebo selhalo vol�n� stat pro tty\n"
 
+#: login-utils/simpleinit.c:753 login-utils/simpleinit.c:854
+msgid "error running programme\n"
+msgstr "chyba p�i b�hu programu\n"
+
 #: login-utils/ttymsg.c:81
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr "p��li� mnoho iov (zm��te k�d v wall/ttymsg.c)"
@@ -6239,37 +6332,37 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: Z�VA�N� CHYBA"
 
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:145
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s: soubor %s je ji� pou��v�n.\n"
 
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: %s soubor je ji� pou��v�n (nalezen %s)\n"
 
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:167
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: vol�n� link pro %s selhalo: %s\n"
 
-#: login-utils/vipw.c:193
+#: login-utils/vipw.c:188
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: %s nelze odemknout: %s (Va�e zm�ny jsou st�le v %s)\n"
 
-#: login-utils/vipw.c:217
+#: login-utils/vipw.c:211
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: vol�n� fork selhalo\n"
 
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:251
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s nezm�n�no\n"
 
-#: login-utils/vipw.c:300
+#: login-utils/vipw.c:294
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: ��dn� zm�ny\n"
@@ -6304,77 +6397,77 @@ 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:189
+#: misc-utils/cal.c:186
 msgid "illegal month value: use 1-12"
 msgstr "chybn� hodnota pro m�s�c: pou�ijte 1-12"
 
-#: misc-utils/cal.c:193
+#: misc-utils/cal.c:190
 msgid "illegal year value: use 1-9999"
 msgstr "chybn� hodnota pro rok: pou�ijte 1-9999"
 
-#: misc-utils/cal.c:489
+#: misc-utils/cal.c:486
 msgid "usage: cal [-mjyV] [[month] year]\n"
 msgstr "Pou�it�: cal [mjyV] [[m�s�c] rok]\n"
 
-#: misc-utils/ddate.c:192
+#: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Pou�it�: %s [+form�t] [den m�s�c rok]\n"
 
 #. handle St. Tib's Day
-#: misc-utils/ddate.c:238
+#: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
 msgstr "Den svat�ho Tiba"
 
-#: misc-utils/kill.c:209
+#: misc-utils/kill.c:210
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: nezn�m� sign�l %s\n"
 
-#: misc-utils/kill.c:271
+#: misc-utils/kill.c:272
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr "%s: proces \"%s\" nelze nal�zt\n"
 
-#: misc-utils/kill.c:315
+#: misc-utils/kill.c:316
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: nezn�m� sign�l %s; platn� sign�ly:\n"
 
-#: misc-utils/kill.c:355
+#: misc-utils/kill.c:356
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Pou�it�: %s [ -s sign�l | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:356
+#: misc-utils/kill.c:357
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "         %s -l [ sign�l ]\n"
 
-#: misc-utils/logger.c:144
+#: misc-utils/logger.c:139
 #, c-format
 msgid "logger: %s: %s.\n"
 msgstr "logger: %s: %s.\n"
 
 # 'facility'? l�pe asi jako za��zen�, zle to by se pletlo s 'device' 
-#: misc-utils/logger.c:248
+#: misc-utils/logger.c:243
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr "logger: nezn�m� p��slu�enstv�: %s\n"
 
-#: misc-utils/logger.c:260
+#: misc-utils/logger.c:255
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr "logger: nezn�m� jm�no priority: %s\n"
 
-#: misc-utils/logger.c:287
+#: misc-utils/logger.c:282
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 "Pou�it�: logger [-is] [-f soubor] [-p pri] [-t zna�ka] [-u soket] [ zpr�va "
 "... ]\n"
 
-#: misc-utils/look.c:336
+#: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr "Pou�it�: look [-dfa] [-t znak] �et�zec [soubor]\n"
 
@@ -6388,62 +6481,63 @@ msgstr "%s nelze nal�zt\n"
 msgid "Got %d bytes from %s\n"
 msgstr "%db z %s\n"
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:100
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr "namei: aktu�ln� adres�� nelze zjistit - %s\n"
 
-#: misc-utils/namei.c:118
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr "namei: do adres��e %s nelze p�ej�t - %s (%d)\n"
 
-#: misc-utils/namei.c:128
+#: misc-utils/namei.c:120
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr "Pou�it�: namei [mx] jm�no cesty [jm�no cesty ...]\n"
 
-#: misc-utils/namei.c:157
+#: misc-utils/namei.c:145
 msgid "namei: could not chdir to root!\n"
 msgstr "namei: do adres��e root nelze p�ej�t!\n"
 
-#: misc-utils/namei.c:164
+#: misc-utils/namei.c:152
 msgid "namei: could not stat root!\n"
 msgstr "namei: vol�n� stat pro adres�� root selhalo!\n"
 
-#: misc-utils/namei.c:219
+#: misc-utils/namei.c:207
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr " ? do adres��e %s nelze p�ej�t - %s (%d)\n"
 
-#: misc-utils/namei.c:248
+#: misc-utils/namei.c:236
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr " ? probl�my p�i �ten� symbolick�ho odkazu %s - %s (%d)\n"
 
-#: misc-utils/namei.c:258
+#: misc-utils/namei.c:246
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr "  *** P�EKRO�EN UNIXOV� LIMIT PRO SYMBOLICK� ODKAZY ***\n"
 
-#: misc-utils/namei.c:295
+#: misc-utils/namei.c:283
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei: typ 0%06o souboru %s je nezn�m�\n"
 
-#: misc-utils/script.c:109
-msgid "usage: script [-a] [file]\n"
+#: misc-utils/script.c:118
+#, fuzzy
+msgid "usage: script [-a] [-f] [file]\n"
 msgstr "Pou�it�: script [-a] [soubor]\n"
 
-#: misc-utils/script.c:129
+#: misc-utils/script.c:139
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script spu�t�n. Soubor je %s.\n"
 
-#: misc-utils/script.c:198
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started on %s"
 msgstr "Script spu�t�n %s"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:269
 #, c-format
 msgid ""
 "\n"
@@ -6452,288 +6546,288 @@ msgstr ""
 "\n"
 "Script ukon�en %s"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script utils. Soubor je %s\n"
 
-#: misc-utils/script.c:281
+#: misc-utils/script.c:288
 msgid "openpty failed\n"
 msgstr "vol�n� openpty selhalo\n"
 
-#: misc-utils/script.c:315
+#: misc-utils/script.c:322
 msgid "Out of pty's\n"
 msgstr "Nejsou ��dn� dal�� voln� pty\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:713
+#: misc-utils/setterm.c:743
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Chybn� p�ep�na�, pou�it�\n"
 
-#: misc-utils/setterm.c:716
+#: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term jm�no termin�lu]\n"
 
-#: misc-utils/setterm.c:717
+#: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:718
+#: misc-utils/setterm.c:748
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:719
+#: misc-utils/setterm.c:749
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:721
+#: misc-utils/setterm.c:751
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:722
+#: misc-utils/setterm.c:752
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:724
+#: misc-utils/setterm.c:754
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:725
+#: misc-utils/setterm.c:755
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:726
+#: misc-utils/setterm.c:756
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:727
+#: misc-utils/setterm.c:757
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:728
+#: misc-utils/setterm.c:758
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:730
+#: misc-utils/setterm.c:760
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:732
+#: misc-utils/setterm.c:762
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
-#: misc-utils/setterm.c:739
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:734
+#: misc-utils/setterm.c:764
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:736
+#: misc-utils/setterm.c:766
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:738
+#: misc-utils/setterm.c:768
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:741
+#: misc-utils/setterm.c:771
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ atribut ] ]\n"
 
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:773
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:774
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:775
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:776
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:777
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:778
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:779
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:780
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:781
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:782
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:784
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file soubor pro ulo�en� ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:789
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:790
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:791
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:792
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:793
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekvence ]\n"
 
-#: misc-utils/setterm.c:831
+#: misc-utils/setterm.c:862
 msgid "snow.on"
 msgstr "sn�en� zapnuto"
 
-#: misc-utils/setterm.c:833
+#: misc-utils/setterm.c:864
 msgid "snow.off"
 msgstr "sn�en� vypnuto"
 
-#: misc-utils/setterm.c:839
+#: misc-utils/setterm.c:870
 msgid "softscroll.on"
 msgstr "softwarov� rolov�n� zapnuto"
 
-#: misc-utils/setterm.c:841
+#: misc-utils/setterm.c:872
 msgid "softscroll.off"
 msgstr "softwarov� rolov�n� vypnuto"
 
-#: misc-utils/setterm.c:1016
+#: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr "�et��c� re�im nelze vypnout/zapnout\n"
 
-#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "chyba klogctl: %s\n"
 
-#: misc-utils/setterm.c:1104
+#: misc-utils/setterm.c:1133
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Chyba p�i �ten� %s\n"
 
-#: misc-utils/setterm.c:1119
+#: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
 msgstr "Chyba p�i ukl�d�n� obrazu obrazovky\n"
 
-#: misc-utils/setterm.c:1133
+#: misc-utils/setterm.c:1162
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "nelze ��st %s a nelze prov�st dump pomoc� vol�n� ioctl\n"
 
-#: misc-utils/setterm.c:1198
+#: misc-utils/setterm.c:1227
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: prom�nn� TERM nen� nastavena.\n"
 
-#: misc-utils/tsort.c:120
+#: misc-utils/tsort.c:117
 msgid "usage: tsort [ inputfile ]\n"
 msgstr "Pou�it�: tsort [ soubor ]\n"
 
-#: misc-utils/tsort.c:157
+#: misc-utils/tsort.c:154
 msgid "tsort: odd data count.\n"
 msgstr "tsort: lich� po�et uzl�\n"
 
-#: misc-utils/tsort.c:320
+#: misc-utils/tsort.c:305
 msgid "tsort: cycle in data.\n"
 msgstr "tsort: smy�ka v datech.\n"
 
-#: misc-utils/tsort.c:333
+#: misc-utils/tsort.c:318
 msgid "tsort: internal error -- could not find cycle.\n"
 msgstr "tsort: vnit�n� chyba -- smy�ku nelze naj�t.\n"
 
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:155
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM adres�� ... -f ] jm�no...\n"
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:100
 msgid "write: can't find your tty's name\n"
 msgstr "write: jm�no Va�eho tty nelze zjistit\n"
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:111
 msgid "write: you have write permission turned off.\n"
 msgstr "write: m�te vypnut p��jem zpr�v.\n"
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:132
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr "write: u�ivatel %s nen� na %s p�ihl�en.\n"
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:140
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr "write: u�ivatel %s m� na %s vypnut p��jem zpr�v\n"
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:147
 msgid "usage: write user [tty]\n"
 msgstr "Pou�it�: write u�ivatel [tty]\n"
 
-#: misc-utils/write.c:245
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write: u�ivatel %s nen� p�ihl�en\n"
 
-#: misc-utils/write.c:254
+#: misc-utils/write.c:255
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr "write: u�ivatel %s m� vypnut p��jem zpr�v\n"
 
-#: misc-utils/write.c:258
+#: misc-utils/write.c:259
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr "writing: u�ivatel %s je p�ihl�en v�cekr�t; p��i na %s\n"
 
-#: misc-utils/write.c:325
+#: misc-utils/write.c:323
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Zpr�va od %s@%s na %s v %s ..."
@@ -6755,43 +6849,44 @@ msgstr "mount: %s nelze otev��t - pou��v�m %s\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system? Filesystem full?
-#: mount/fstab.c:375
+#. Too many files open in the system?
+#. Filesystem full?
+#: mount/fstab.c:376
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "zamykac� soubor %s nelze vytvo�it: %s\n"
 "(pou�ijte p�ep�na� -n pro vynech�n� z�pisu do mtab)"
 
-#: mount/fstab.c:387
+#: mount/fstab.c:388
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "vol�n� link pro zamykac� soubor %s selhalo: %s\n"
 "(pou�ijte p�ep�na� -n pro vynech�n� z�pisu do mtab)"
 
-#: mount/fstab.c:399
+#: mount/fstab.c:400
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "zamykac� soubor %s nelze otev��t: %s\n"
 "(pou�ijte p�ep�na� -n pro vynech�n� z�pisu do mtab)"
 
-#: mount/fstab.c:414
+#: mount/fstab.c:415
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Zamykac� soubor %s nelze zamknout: %s\n"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:428
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Zamykac� soubor %s nelze zamknout: %s"
 
-#: mount/fstab.c:429
+#: mount/fstab.c:430
 msgid "timed out"
 msgstr "vypr�el �as"
 
-#: mount/fstab.c:436
+#: mount/fstab.c:437
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -6800,30 +6895,30 @@ msgstr ""
 "Odkaz %s nelze vytvo�it.\n"
 "Nen� n�kde zastaral� zamykac� soubor?\n"
 
-#: mount/fstab.c:482 mount/fstab.c:490
+#: mount/fstab.c:483 mount/fstab.c:491
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "nelze otev��t %s (%s) - mtab nebyl aktualizov�n"
 
-#: mount/fstab.c:515
+#: mount/fstab.c:519
 msgid "mount: warning: cannot change mounted device with a remount\n"
 msgstr "mount: varov�n�: pomoc� nelze remount zm�nit p�ipojen� za��zen�\n"
 
-#: mount/fstab.c:520
+#: mount/fstab.c:524
 msgid "mount: warning: cannot change filesystem type with a remount\n"
 msgstr "mount: varov�n�: pomoc� nelze remount zm�nit typ syst�mu soubor�\n"
 
-#: mount/fstab.c:528 mount/fstab.c:534
+#: mount/fstab.c:533 mount/fstab.c:539
 #, c-format
 msgid "error writing %s: %s"
 msgstr "chyba p�i z�pisu %s: %s"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:546
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "chyba p�i zm�n� m�du %s: %s\n"
 
-#: mount/fstab.c:548
+#: mount/fstab.c:553
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nelze p�ejmenovat na %s: %s\n"
@@ -6838,16 +6933,16 @@ msgstr "loop: za��zen� %s nelze otev��t: %s\n"
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: informace o za��zen� %s nelze z�skat: %s\n"
 
-#: mount/lomount.c:89 mount/losetup.c:74
+#: mount/lomount.c:89
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 msgstr "%s: [%04x]:%ld (%s) posun %d, %s �ifra\n"
 
-#: mount/lomount.c:143
+#: mount/lomount.c:148
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: ��dn� za��zen� /dev/loop# nelze nal�zt"
 
-#: mount/lomount.c:147
+#: mount/lomount.c:152
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -6855,7 +6950,7 @@ msgstr ""
 "mount: ��dn� loop za��zen� nelze nal�zt.\n"
 "       Nem� /dev/loop# chybn� v�t�� ��slo za��zen�?"
 
-#: mount/lomount.c:151
+#: mount/lomount.c:156
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -6866,7 +6961,7 @@ msgstr ""
 "       nezn� loop za��zen�. Pokud je tomu tak, pak jej znovu p�elo�te,\n"
 "       �i zkuste `insmod loop.o'."
 
-#: mount/lomount.c:156
+#: mount/lomount.c:162
 msgid ""
 "mount: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
@@ -6878,53 +6973,53 @@ msgstr ""
 "m�\n"
 "       chybn� v�t�� ��slo?"
 
-#: mount/lomount.c:160
+#: mount/lomount.c:166
 msgid "mount: could not find any free loop device"
 msgstr "mount: ��dn� voln� loop za��zen� nelze naj�t"
 
-#: mount/lomount.c:191 mount/losetup.c:106
+#: mount/lomount.c:197
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Nepodporovan� �ifrovac� typ %s\n"
 
-#: mount/lomount.c:210 mount/losetup.c:126
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr "Nelze zamknout v pam�ti. Kon��m.\n"
+
+#: mount/lomount.c:231
 msgid "Init (up to 16 hex digits): "
 msgstr "Init (a� 16 �estn�ctkov�ch ��slic): "
 
-#: mount/lomount.c:217 mount/losetup.c:133
+#: mount/lomount.c:238
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Ne�estn�ctkov� ��slice '%c'.\n"
 
-#: mount/lomount.c:223 mount/losetup.c:140
+#: mount/lomount.c:245
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "Nev�m jak z�skat kl�� pro �ifrovac� syst�m %d\n"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:261
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d): �sp�ch\n"
 
-#: mount/lomount.c:250
+#: mount/lomount.c:272
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: za��zen� %s nelze smazat: %s\n"
 
-#: mount/lomount.c:260
+#: mount/lomount.c:282
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): �sp�ch\n"
 
-#: mount/lomount.c:268
+#: mount/lomount.c:290
 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/losetup.c:70
-msgid "Cannot get loop info"
-msgstr "Informace o loop nelze z�skat"
-
-#: mount/losetup.c:176
+#: mount/lomount.c:327
 #, c-format
 msgid ""
 "usage:\n"
@@ -6937,7 +7032,11 @@ msgstr ""
 "  %s -d loop za��zen�                                 # sma�e\n"
 "  %s [ -e �ifra ] [ -o posun ] loop za��zen� soubor   # nastav�\n"
 
-#: mount/losetup.c:234
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr "Nedostatek pam�ti"
+
+#: mount/lomount.c:416
 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"
 
@@ -6955,145 +7054,159 @@ msgstr "[mntent]: ��dek %d v %s je chybn�%s\n"
 msgid "; rest of file ignored"
 msgstr "; ignoruji zbytek souboru"
 
-#: mount/mount.c:333
+#: mount/mount.c:351
 #, 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:336
+#: mount/mount.c:354
 #, 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:357
+#: mount/mount.c:375
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s nelze otev��t pro z�pis: %s"
 
-#: mount/mount.c:372 mount/mount.c:654
+#: mount/mount.c:390 mount/mount.c:593
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: chyba p�i z�pisu %s: %s"
 
-#: mount/mount.c:379
+#: mount/mount.c:397
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: chyba p�i zm�n� m�du %s: %s"
 
-#: mount/mount.c:413
+#: mount/mount.c:442
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vypad� jako odkl�dac� prostor - nep�ipojeno"
 
-#: mount/mount.c:481
+#: mount/mount.c:485
 msgid "mount failed"
 msgstr "p�ipojen� se nezda�ilo"
 
-#: mount/mount.c:483
+#: mount/mount.c:487
 #, 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:511
+#: mount/mount.c:515
 msgid "mount: loop device specified twice"
 msgstr "mount: za��zen� loop bylo zad�no dvakr�t"
 
-#: mount/mount.c:517
+#: mount/mount.c:520
 msgid "mount: type specified twice"
 msgstr "mount: typ byl zad�n dvakr�t"
 
-#: mount/mount.c:529
+#: mount/mount.c:532
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: p�eskakuji nastaven� loop za��zen�\n"
 
-#: mount/mount.c:538
+#: mount/mount.c:541
 #, 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:542
+#: mount/mount.c:545
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: nepoda�ilo se nastavit za��zen� loop\n"
 
-#: mount/mount.c:546
+#: mount/mount.c:549
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: za��zen� loop bylo korektn� nastaveno\n"
 
-#: mount/mount.c:559
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: tato verze byla p�elo�ena bez podpory pro typ `nfs'"
+#: mount/mount.c:588
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: %s nelze otev��t: %s"
+
+#: mount/mount.c:611
+#, c-format
+msgid "mount: cannot not open %s for setting speed"
+msgstr "mount: %s nelze pro nastaven� rychlosti otev��t"
 
-#: mount/mount.c:610 mount/mount.c:1043
+#: mount/mount.c:614
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: rychlost nelze nastavit: %s"
+
+#: mount/mount.c:675 mount/mount.c:1202
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: vol�n� fork selhalo: %s"
 
-#: mount/mount.c:649
-#, c-format
-msgid "mount: can't open %s: %s"
-msgstr "mount: %s nelze otev��t: %s"
+#: mount/mount.c:749
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr "mount: tato verze byla p�elo�ena bez podpory pro typ `nfs'"
+
+#: mount/mount.c:789
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr "mount: chyba s nfs mount verze 4, zkou��m verzi 3..\n"
 
-#: mount/mount.c:678
+#: mount/mount.c:800
 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:681
+#: mount/mount.c:803
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: mus�te zadat typ syst�mu soubor�"
 
 #. should not happen
-#: mount/mount.c:684
+#: mount/mount.c:806
 msgid "mount: mount failed"
 msgstr "mount: p�ipojen� se nezda�ilo"
 
-#: mount/mount.c:690 mount/mount.c:725
+#: mount/mount.c:812 mount/mount.c:847
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: p��pojn� bod %s nen� adres��em"
 
-#: mount/mount.c:692
+#: mount/mount.c:814
 msgid "mount: permission denied"
 msgstr "mount: p��stup odm�tnut"
 
-#: mount/mount.c:694
+#: mount/mount.c:816
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount m��e pou��vat pouze superu�ivatel"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:698 mount/mount.c:702
+#: mount/mount.c:820 mount/mount.c:824
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je ji� p�ipojeno"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:704
+#: mount/mount.c:826
 msgid "mount: proc already mounted"
 msgstr "mount: proc je ji� p�ipojeno"
 
-#: mount/mount.c:706
+#: mount/mount.c:828
 #, 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:712
+#: mount/mount.c:834
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: p��pojn� bod %s neexistuje"
 
-#: mount/mount.c:714
+#: mount/mount.c:836
 #, 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:717
+#: mount/mount.c:839
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speci�ln� za��zen� %s neexistuje"
 
-#: mount/mount.c:727
+#: mount/mount.c:849
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7102,12 +7215,12 @@ msgstr ""
 "mount: speci�ln� za��zen� %s neexistuje\n"
 "              (n�zev cesty neza��n� adres��em)\n"
 
-#: mount/mount.c:739
+#: mount/mount.c:862
 #, 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:741
+#: mount/mount.c:864
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7116,46 +7229,46 @@ msgstr ""
 "mount: chybn� typ ss, chybn� p�ep�na�, chybn� superblok na %s\n"
 "       nebo p��li� mnoho p�ipojen�ch syst�m� soubor�"
 
-#: mount/mount.c:756
+#: mount/mount.c:898
 msgid "mount table full"
 msgstr "tabulka p�ipojen� je pln�"
 
-#: mount/mount.c:758
+#: mount/mount.c:900
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok nelze p�e��st"
 
-#: mount/mount.c:761
-#, c-format
-msgid "mount: %s has wrong major or minor number"
-msgstr "mount: %s m� chybn� v�t�� �i men�� ��slo za��zen�"
+#: mount/mount.c:904
+#, fuzzy, c-format
+msgid "mount: %s: unknown device"
+msgstr "umount: blokov� za��zen� %s je chybn�"
 
-#: mount/mount.c:766
+#: mount/mount.c:909
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: typ ss %s nen� podporov�n j�drem"
 
-#: mount/mount.c:778
+#: mount/mount.c:921
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: pravd�podobn� jste myslel %s"
 
-#: mount/mount.c:780
+#: mount/mount.c:923
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: mo�n� jste myslel iso9660 ?"
 
-#: mount/mount.c:783
+#: mount/mount.c:926
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr "mount: %s m� chybn� ��slo za��zen�, �i ss typ %s nen� podporov�n"
 
 #. strange ...
-#: mount/mount.c:788
+#: mount/mount.c:932
 #, 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:790
+#: mount/mount.c:934
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7163,234 +7276,250 @@ msgid ""
 msgstr ""
 "mount: j�dro nerozpoznalo %s jako blokov� za��zen� (mo�n� `insmod ovlada�'?)"
 
-#: mount/mount.c:793
+#: mount/mount.c:937
 #, 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:796
+#: mount/mount.c:940
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s nen� blokov�m za��zen�m"
 
-#: mount/mount.c:799
+#: mount/mount.c:943
 #, 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:803
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:946
+msgid "block device "
+msgstr "blokov� za��zen�"
+
+#: mount/mount.c:948
+#, fuzzy, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "umount: %s nelze znovu p�ipojit v re�imu pouze pro �ten�\n"
+
+#: mount/mount.c:952
 #, c-format
-msgid "mount: block device %s is not permitted on its filesystem"
-msgstr "mount: blokov� za��zen� %s nen� na tomto syst�mu soubor� povoleno"
+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:819
+#: mount/mount.c:968
 #, 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:820
-msgid "block device "
-msgstr "blokov� za��zen�"
-
-#: mount/mount.c:907
-#, c-format
-msgid "mount: consider mounting %s by %s\n"
+#: mount/mount.c:1057
+#, fuzzy, c-format
+msgid "mount: going to mount %s by %s\n"
 msgstr "mount: zva�te p�ipojen� %s dle %s\n"
 
-#: mount/mount.c:908
+#: mount/mount.c:1058
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:908
+#: mount/mount.c:1058
 msgid "label"
 msgstr "jm�no"
 
-#: mount/mount.c:910 mount/mount.c:1226
+#: mount/mount.c:1060 mount/mount.c:1430
 msgid "mount: no such partition found"
 msgstr "mount: ��dn� odpov�daj�c� diskov� odd�l nebyl nalezen"
 
-#: mount/mount.c:918
+#: mount/mount.c:1068
 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"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:934
+#: mount/mount.c:1084
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: pracuji na pozad� \"%s\"\n"
 
-#: mount/mount.c:945
+#: mount/mount.c:1095
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: kon��m \"%s\"\n"
 
-#: mount/mount.c:994
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je ji� p�ipojeno na %s\n"
 
-#: mount/mount.c:1105
-msgid ""
-"Usage: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       A special device can be indicated by  -L label  or  -U uuid .\n"
-msgstr ""
-"Pou�it�: mount [-hV]\n"
-"         mount -a [-nfFrsvw] [-tvfstypy]\n"
-"         mount [-nfrsvw] [-o volby] speci�ln� soubor | uzel\n"
-"         mount [-nfrsvw] [-t vfstyp] [-o volby] speci�ln� soubor uzel\n"
-"         Speci�ln� za��zen� m��e b�t ozna�eno pomoc� -L popiska �i -U uuid.\n"
-
-#: mount/mount.c:1211
+#: mount/mount.c:1270
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+
+#: mount/mount.c:1414
 msgid "mount: only root can do that"
 msgstr "mount: toto m��e prov�st pouze superu�ivatel"
 
-#: mount/mount.c:1216
+#: mount/mount.c:1419
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nebylo nalezeno - vytv���m jej..\n"
 
-#: mount/mount.c:1228
+#: mount/mount.c:1432
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: p�ipojuji %s\n"
 
-#: mount/mount.c:1237
+#: mount/mount.c:1441
 msgid "not mounted anything"
 msgstr "nic nebylo p�ipojeno"
 
-#: mount/mount.c:1250
+#: mount/mount.c:1456
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s nelze v %s nal�zt"
 
-#: mount/mount.c:1264
+#: mount/mount.c:1471
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s nelze nal�zt v %s ani %s"
 
-#: mount/mount_by_label.c:141
+#: mount/mount_by_label.c:99
+#, c-format
+msgid ""
+"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"mount: %s nelze otev��t,tak�e konverze UUID a LABEL nebude provedena.\n"
+
+#: mount/mount_by_label.c:201
 msgid "mount: bad UUID"
 msgstr "mount: chybn� UUID"
 
-#: mount/mount_guess_fstype.c:251
+#: mount/mount_guess_fstype.c:257
 #, 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_guess_fstype.c:254
+#: mount/mount_guess_fstype.c:260
 #, 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_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:263
 msgid "       and it looks like this is swapspace\n"
 msgstr "       a vypad� to, �e se jedn� o odkl�dac� prostor\n"
 
-#: mount/mount_guess_fstype.c:259
+#: mount/mount_guess_fstype.c:265
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Vyzkou��m typ %s\n"
 
-#: mount/mount_guess_fstype.c:321
+#: mount/mount_guess_fstype.c:329
 #, c-format
 msgid "Trying %s\n"
 msgstr "Pou��v�m %s.\n"
 
-#: mount/nfsmount.c:157
+#: mount/nfsmount.c:225
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: p��li� dlouh� argument pro po��ta�:adres��\n"
 
-#: mount/nfsmount.c:170
+#: mount/nfsmount.c:238
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: varov�n�: v�cen�sobn� jm�na po��ta�� nejsou podporov�na\n"
 
-#: mount/nfsmount.c:174
+#: mount/nfsmount.c:242
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: adres�� pro p�ipojen� nen� ve tvaru po��ta�:adres��\n"
 
-#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#: mount/nfsmount.c:253 mount/nfsmount.c:510
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount:  adresu %s nelze zjistit\n"
 
-#: mount/nfsmount.c:191
+#: mount/nfsmount.c:259
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: �patn� hp->h_length\n"
 
-#: mount/nfsmount.c:208
+#: mount/nfsmount.c:276
 msgid "mount: excessively long option argument\n"
 msgstr "mount: p��li� dlouh� argument pro volbu\n"
 
-#: mount/nfsmount.c:299
+#: mount/nfsmount.c:368
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Varov�n�: nezn�m� volba pro proto=.\n"
 
-#: mount/nfsmount.c:306
+#: mount/nfsmount.c:375
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Varov�n�: volba namlen nen� podporov�na.\n"
 
-#: mount/nfsmount.c:310
+#: mount/nfsmount.c:379
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "parametr %s=%d pro p�ipojen� nfs nen� zn�m\n"
 
-#: mount/nfsmount.c:345
+#: mount/nfsmount.c:414
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Varov�n�: volba nolock nen� podporov�na.\n"
 
-#: mount/nfsmount.c:348
+#: mount/nfsmount.c:419
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "volba %s%s pro p�ipojen� nfs je nezn�m�\n"
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:516
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: �patn� hp->h_length?\n"
 
-#: mount/nfsmount.c:528
-#, c-format
-msgid "mount: %s:%s failed, reason given by server: %s\n"
-msgstr "mount: %s:%s selhalo; p���ina udan� serverem: %s\n"
-
-#: mount/nfsmount.c:539
+#: mount/nfsmount.c:692
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS p�es TCP nen� podporov�no.\n"
 
-#: mount/nfsmount.c:546
+#: mount/nfsmount.c:699
 msgid "nfs socket"
 msgstr "nfs soket"
 
-#: mount/nfsmount.c:550
+#: mount/nfsmount.c:703
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:561
+#: mount/nfsmount.c:714
 msgid "used portmapper to find NFS port\n"
 msgstr "pro nalezen� NFS portu jsem pou�il portmapper\n"
 
-#: mount/nfsmount.c:565
+#: mount/nfsmount.c:718
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "pou��v�m port %d pro nfs server\n"
 
-#: mount/nfsmount.c:576
+#: mount/nfsmount.c:729
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:665
+#: mount/nfsmount.c:816
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "n�vratov� hodnota nfs status %d je nezn�m�"
 
-#: mount/sundries.c:41 mount/sundries.c:56
-msgid "not enough memory"
-msgstr "Nedostatek pam�ti"
-
 #: mount/sundries.c:66
 msgid "bug in xstrndup call"
 msgstr "chyba ve vol�n� xstrndup"
@@ -7504,27 +7633,27 @@ msgstr "nenalezl jsem umount2, zkou��m umount...\n"
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s nelze odpojit - zkou��m %s\n"
 
-#: mount/umount.c:270
+#: mount/umount.c:272
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 "umount: %s je ji� pou��v�no - znovu p�ipojeno v re�imu pro pouze �ten�\n"
 
-#: mount/umount.c:278
+#: mount/umount.c:282
 #, 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:286
+#: mount/umount.c:290
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s odpojeno\n"
 
-#: mount/umount.c:369
+#: mount/umount.c:374
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznam syst�m� soubor� na odpojen� nelze nal�zt"
 
-#: mount/umount.c:398
+#: mount/umount.c:403
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7534,46 +7663,46 @@ msgstr ""
 "         umount -a [-f] [-r] [-n] [-v] [-t typy vfs]\n"
 "         umount [-f] [-r] [-n] [-v] speci�ln� soubor | uzel...\n"
 
-#: mount/umount.c:459
+#: mount/umount.c:464
 msgid "umount: only root can do that"
 msgstr "umount: toto m��e prov�st pouze u�ivatel root"
 
-#: mount/umount.c:474
+#: mount/umount.c:479
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Zkou��m odpojit %s\n"
 
-#: mount/umount.c:478
+#: mount/umount.c:483
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s nelze v mtab naj�t\n"
 
-#: mount/umount.c:482
+#: mount/umount.c:487
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: podle mtab nen� %s p�ipojeno"
 
-#: mount/umount.c:484
+#: mount/umount.c:489
 #, 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:496
+#: mount/umount.c:501
 #, 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:499
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: p�ipojen� %s neodpov�d� fstab"
 
-#: mount/umount.c:520
+#: mount/umount.c:525
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "unmount: pouze u�ivatel root m��e odpojit %s ze %s"
 
-#: mount/umount.c:531
+#: mount/umount.c:536
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "unmount: pouze u�ivatel %s m��e odpojit %s ze %s"
@@ -7586,7 +7715,7 @@ msgstr "Pouze u�ivatel root m��e nastavit chov�n� Ctrl-Alt-Del.\n"
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "Pou�it�: ctrlaltdel hard|soft\n"
 
-#: sys-utils/cytune.c:118
+#: sys-utils/cytune.c:120
 #, c-format
 msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
@@ -7595,7 +7724,7 @@ msgstr ""
 "Soubor %s, pro prahovou hodnotu %lu, maxim�ln� po�et znak� ve fifo byl %d\n"
 "a maxim�ln� p�enosov� rychlost ve znac�ch za sekundu byla %f\n"
 
-#: sys-utils/cytune.c:129
+#: sys-utils/cytune.c:131
 #, c-format
 msgid ""
 "File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -7725,50 +7854,60 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f p�er/sek; %f p��j (znak/sek)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:37
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Pou�it�: %s [-c] [-n �rove�] [-s velikost bufferu]\n"
 
-#: sys-utils/ipcrm.c:46
+#: sys-utils/ipcrm.c:59
 #, c-format
-msgid "usage: %s [shm | msg | sem] id\n"
-msgstr "Pou�it�: %s [shm | msg | sem] id\n"
+msgid "invalid id: %s\n"
+msgstr "Chybn� id: %s\n"
 
-#: sys-utils/ipcrm.c:70
+#: sys-utils/ipcrm.c:77
 #, c-format
-msgid "usage: %s [-shm | -msg | -sem] id\n"
-msgstr "Pou�it�: %s [-shm | -msg | -sem] id\n"
+msgid "cannot remove id %s (%s)\n"
+msgstr "id %s nelze odstranit (%s)\n"
 
-#: sys-utils/ipcrm.c:73
-msgid "resource deleted\n"
-msgstr "prost�edek smaz�n\n"
+#: sys-utils/ipcrm.c:91
+#, c-format
+msgid "usage: %s {shm | msg | sem} id ...\n"
+msgstr "Pou�it�: %s [shm | msg | sem] id ...\n"
 
-#: sys-utils/ipcs.c:117
+#: sys-utils/ipcrm.c:124
+#, c-format
+msgid "unknown resource type: %s\n"
+msgstr "typ zdroje %s nen� zn�m\n"
+
+#: sys-utils/ipcrm.c:128
+msgid "resource(s) deleted\n"
+msgstr "prost�edky smaz�ny\n"
+
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
 msgstr "Pou�it� : %s -asmq -tclup \n"
 
-#: sys-utils/ipcs.c:118
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
 msgstr "\t%s [-s -m -q] -i id\n"
 
-#: sys-utils/ipcs.c:119
+#: sys-utils/ipcs.c:124
 #, c-format
 msgid "\t%s -h for help.\n"
 msgstr "\t%s -h pro n�pov�du.\n"
 
-#: sys-utils/ipcs.c:125
+#: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
 msgstr "%s poskytuje informace o ipc prost�edc�ch, "
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
 msgstr "je kter�m m�te p��stup pro �ten�.\n"
 
-#: sys-utils/ipcs.c:127
+#: sys-utils/ipcs.c:132
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
@@ -7778,7 +7917,7 @@ msgstr ""
 "\t-m : sd�len� pam�\n"
 "\t-q : zpr�vy\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
@@ -7786,7 +7925,7 @@ msgstr ""
 "\t-s : semafory\n"
 "\t-a : v�e (implicitn�)\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
@@ -7798,7 +7937,7 @@ msgstr ""
 "\t-p : pid\n"
 "\t-c : tv�rce\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
@@ -7806,368 +7945,368 @@ msgstr ""
 "\t-l : omezen�\n"
 "\t-u : shrnut�\n"
 
-#: sys-utils/ipcs.c:131
+#: sys-utils/ipcs.c:136
 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"
 
-#: sys-utils/ipcs.c:263 sys-utils/ipcs.c:465
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
 msgid "kernel not configured for shared memory\n"
 msgstr "j�dro nepodporuje sd�lenou pam�\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Omezen� pro sd�lenou pam� --------\n"
 
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:277
 #, c-format
 msgid "max number of segments = %d\n"
 msgstr "maxim�ln� po�et segment� = %d\n"
 
-#: sys-utils/ipcs.c:273
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max seg size (kbytes) = %d\n"
 msgstr "maxim�ln� velikost segmentu (v kilobajtech) = %d\n"
 
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max total shared memory (kbytes) = %d\n"
 msgstr "celkov� maximum pro sd�lenou pam� (v kilobajtech) = %d\n"
 
-#: sys-utils/ipcs.c:275
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "min seg size (bytes) = %d\n"
 msgstr "minim�ln� velikost segmentu (v bajtech) = %d\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:284
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Stav sd�len� pam�ti --------\n"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "alokovan� segmenty %d\n"
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:286
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "alokovan� str�nky %ld\n"
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:287
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "rezidentn� str�nky %ld\n"
 
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:288
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "str�nky v odkl�dac�m prostoru %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:289
 #, 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"
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:294
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Tv�rci/vlastn�ci segment� sd�len� pam�ti ------\n"
 
-#: sys-utils/ipcs.c:290 sys-utils/ipcs.c:396 sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:297 sys-utils/ipcs.c:302
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:302 sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:408
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:308 sys-utils/ipcs.c:397
-#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:489 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:494 sys-utils/ipcs.c:511
 msgid "perms"
 msgstr "pr�va"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ �asy p�ipojen�/odpojen�/zm�ny pro sd�lenou pam� --------\n"
 
-#: sys-utils/ipcs.c:296
+#: sys-utils/ipcs.c:301
 #, c-format
 msgid "%-10s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:297 sys-utils/ipcs.c:302 sys-utils/ipcs.c:308
-#: sys-utils/ipcs.c:403 sys-utils/ipcs.c:412 sys-utils/ipcs.c:495
-#: sys-utils/ipcs.c:500 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:307 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:417 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505 sys-utils/ipcs.c:511
 msgid "owner"
 msgstr "vlastn�k"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "attached"
 msgstr "p�ipojen�"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "detached"
 msgstr "odpojen�"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "changed"
 msgstr "zm�na"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "------ Tv�rce sd�len� pam�ti/posledn� operace --------\n"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:311
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segmenty sd�len� pam�ti --------\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:412 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
 msgid "key"
 msgstr "kl��"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "bytes"
 msgstr "bajty"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
 msgid "status"
 msgstr "stav"
 
-#: sys-utils/ipcs.c:328 sys-utils/ipcs.c:329 sys-utils/ipcs.c:330
-#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:434 sys-utils/ipcs.c:526
-#: sys-utils/ipcs.c:527 sys-utils/ipcs.c:528
+#: sys-utils/ipcs.c:333 sys-utils/ipcs.c:334 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:438 sys-utils/ipcs.c:439 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:533
 msgid "Not set"
 msgstr "Nenastaveno"
 
-#: sys-utils/ipcs.c:350
+#: sys-utils/ipcs.c:355
 msgid "dest"
 msgstr "c�l"
 
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:356
 msgid "locked"
 msgstr "zam�eno"
 
-#: sys-utils/ipcs.c:371
+#: sys-utils/ipcs.c:376
 msgid "kernel not configured for semaphores\n"
 msgstr "j�dro nepodporuje semafory\n"
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:382
 msgid "------ Semaphore Limits --------\n"
 msgstr "------Omezen� pro semafory --------\n"
 
-#: sys-utils/ipcs.c:381
+#: sys-utils/ipcs.c:386
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "maxim�ln� po�et pol� = %d\n"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:387
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "maxim�ln� po�et semafor� v poli = %d\n"
 
-#: sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:388
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "celkov� maxim�ln� po�et semafor� = %d\n"
 
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:389
 #, 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:385
+#: sys-utils/ipcs.c:390
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "maxim�ln� hodnota semaforu = %d\n"
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:394
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Stav semaforu --------\n"
 
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:395
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "pou�it� pole = %d\n"
 
-#: sys-utils/ipcs.c:391
+#: sys-utils/ipcs.c:396
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "alokovan� semafory = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:400
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Tv�rci/vlastn�ci pol� semafor� --------\n"
 
-#: sys-utils/ipcs.c:397 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:406
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "------ �asy operace/zm�ny sd�len� pam�ti --------\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-op"
 msgstr "posledn� operace"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-changed"
 msgstr "posledn� zm�na"
 
-#: sys-utils/ipcs.c:410
+#: sys-utils/ipcs.c:415
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Pole semafor� --------\n"
 
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:417
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:478
 msgid "------ Messages: Limits --------\n"
 msgstr "------ Zpr�vy: Omezen� --------\n"
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:479
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "celkov� maxim�ln� po�et front = %d\n"
 
-#: sys-utils/ipcs.c:475
+#: sys-utils/ipcs.c:480
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "maxim�ln� velikost zpr�vy (v bajtech) = %d\n"
 
-#: sys-utils/ipcs.c:476
+#: sys-utils/ipcs.c:481
 #, 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:480
+#: sys-utils/ipcs.c:485
 msgid "------ Messages: Status --------\n"
 msgstr "------ Zpr�vy: Stav --------\n"
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:486
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "alokovan� fronty = %d\n"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:487
 #, c-format
 msgid "used headers = %d\n"
 msgstr "pou�it� hlavi�ky = %d\n"
 
-#: sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:488
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "pou�it� prostor (v bajtech) = %d\n"
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:492
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr "------ Fronty zpr�v: Tv�rci/Vlastn�ci --------\n"
 
-#: sys-utils/ipcs.c:489 sys-utils/ipcs.c:495 sys-utils/ipcs.c:500
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:498
 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:494
+#: sys-utils/ipcs.c:499
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "send"
 msgstr "odesl�n�"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "recv"
 msgstr "p��jem"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "change"
 msgstr "zm�na"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:504
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID pro fronty zpr�v --------\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:509
 msgid "------ Message Queues --------\n"
 msgstr "------ Fronty zpr�v --------\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "used-bytes"
 msgstr "u�it� bajty"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "messages"
 msgstr "zpr�vy"
 
-#: sys-utils/ipcs.c:565
+#: sys-utils/ipcs.c:570
 #, c-format
 msgid ""
 "\n"
@@ -8176,41 +8315,41 @@ msgstr ""
 "\n"
 "shmid segmentu sd�len� pam�ti = %d\n"
 
-#: sys-utils/ipcs.c:566
+#: sys-utils/ipcs.c:571
 #, 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:568
+#: sys-utils/ipcs.c:573
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "m�d=%#o\tp��stupov� pr�va=%#o\n"
 
-#: sys-utils/ipcs.c:569
+#: sys-utils/ipcs.c:574
 #, c-format
 msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 msgstr "bajt�=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:577
 #, c-format
 msgid "att_time=%s"
 msgstr "p�ipoj_�as=%s"
 
-#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:575 sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
 msgid "Not set\n"
 msgstr "Nenastaveno\n"
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:579
 #, c-format
 msgid "det_time=%s"
 msgstr "odpoj_�as=%s"
 
-#: sys-utils/ipcs.c:576
+#: sys-utils/ipcs.c:581
 #, c-format
 msgid "change_time=%s"
 msgstr "�as_zm�ny=%s"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:597
 #, c-format
 msgid ""
 "\n"
@@ -8219,26 +8358,26 @@ msgstr ""
 "\n"
 "msgid fronty zpr�v=%d\n"
 
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:598
 #, 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:595
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "send_time=%srcv_time=%schange_time=%s"
 msgstr "send_time=%srcv_time=%schange_time=%s"
 
-#: sys-utils/ipcs.c:599 sys-utils/ipcs.c:600 sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:604 sys-utils/ipcs.c:605 sys-utils/ipcs.c:606
 msgid "Not Set\n"
 msgstr "Nenastaveno\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:623
 #, c-format
 msgid ""
 "\n"
@@ -8247,114 +8386,114 @@ msgstr ""
 "\n"
 "semid pole semafor� = %d\n"
 
-#: sys-utils/ipcs.c:619
+#: sys-utils/ipcs.c:624
 #, 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:621
+#: sys-utils/ipcs.c:626
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "m�d=%#o, p��stupov� pr�va=%#o\n"
 
-#: sys-utils/ipcs.c:622
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "nsems = %d\n"
 msgstr "nsems = %d\n"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "otime = %s"
 msgstr "�as posledn� operace = %s"
 
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:630
 #, c-format
 msgid "ctime = %s"
 msgstr "�as zm�ny = %s"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "value"
 msgstr "hodnota"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:67
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr "Pou�it�: rsv [ -rsv ] [ -o POSUN ] [ OBRAZ [ HODNOTA [ POSUN ] ] ]"
 
-#: sys-utils/rdev.c:69
+#: sys-utils/rdev.c:68
 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:70
+#: sys-utils/rdev.c:69
 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:71
+#: sys-utils/rdev.c:70
 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:72
+#: sys-utils/rdev.c:71
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
 msgstr ""
 "  rdev -s /dev/fd0 /dev/hda2      nastav� za��zen� pro odkl�dac� prostor"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:72
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
 msgstr "  rdev -r /dev/fd0 627            nastav� velikost RAMDISKU"
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:73
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr "  rdev -v /dev/fd0 1              nastav� startovac� VIDEOM�D"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:74
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   posun v bajtech"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:75
 msgid "  rootflags ...                   same as rdev -R"
 msgstr "  root p��znaky ...               stejn� jako rdev -R"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:76
 msgid "  swapdev ...                     same as rdev -s"
 msgstr "  odkl�dac� prostor ...           stejn� jako rdev -s"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr "  velikost ram ...                stejn� jako rdev -r"
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidm�d ...                      stejn� jako rdev -v"
 
-#: sys-utils/rdev.c:80
+#: sys-utils/rdev.c:79
 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:81
+#: sys-utils/rdev.c:80
 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."
 
@@ -8441,7 +8580,7 @@ msgstr "%d: p�vodn� priorita %d, nov� priorita %d\n"
 msgid "usage: %s program [arg ...]\n"
 msgstr "Pou�it�: %s program [arg ...]\n"
 
-#: sys-utils/tunelp.c:73
+#: sys-utils/tunelp.c:74
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8452,82 +8591,82 @@ msgstr ""
 "            -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s |\n"
 "            -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
 msgid "malloc error"
 msgstr "chyba malloc"
 
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:102
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s: chybn� hodnota\n"
 
-#: sys-utils/tunelp.c:237
+#: sys-utils/tunelp.c:241
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s nen� lp za��zen�m\n"
 
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:262
 #, c-format
 msgid "%s status is %d"
 msgstr "status %s je %d"
 
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:263
 msgid ", busy"
 msgstr ", zanepr�zdn�na"
 
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:264
 msgid ", ready"
 msgstr ", p�ipravena"
 
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:265
 msgid ", out of paper"
 msgstr ", do�el pap�r"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:266
 msgid ", on-line"
 msgstr ", zapnuta"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:267
 msgid ", error"
 msgstr ", chyba"
 
-#: sys-utils/tunelp.c:280
+#: sys-utils/tunelp.c:284
 msgid "LPGETIRQ error"
 msgstr "chyba LPGETIRQ"
 
-#: sys-utils/tunelp.c:286
+#: sys-utils/tunelp.c:290
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s pou��v� IRQ %d\n"
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:292
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s pou��v� poll\n"
 
-#: text-utils/col.c:153
+#: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col: chybn� argument %s pro p�ep�na� -l\n"
 
-#: text-utils/col.c:516
-msgid "usage: col [-bfx] [-l nline]\n"
-msgstr "Pou�it�: col [-bfx] [-l po�. ��dk�]\n"
+#: text-utils/col.c:521
+msgid "usage: col [-bfpx] [-l nline]\n"
+msgstr "Pou�it�: col [-bfpx] [-l po�. ��dk�]\n"
 
-#: text-utils/col.c:522
+#: text-utils/col.c:527
 msgid "col: write error.\n"
 msgstr "col: chyba p�i ukl�d�n�\n"
 
-#: text-utils/col.c:529
+#: text-utils/col.c:534
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr "col: varov�n�: %s nelze zaz�lohovat.\n"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "past first line"
 msgstr "jsem za prvn�m ��dkem"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "-- line already flushed"
 msgstr "-- ��dek ji� nen� v bufru"
 
@@ -8536,11 +8675,11 @@ msgstr "-- ��dek ji� nen� v bufru"
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "Pou�it�: %s [ - ] [-2 ] [ soubor ... ]\n"
 
-#: text-utils/column.c:302
+#: text-utils/column.c:300
 msgid "line too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: text-utils/column.c:379
+#: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
 msgstr "Pou�it�: column [-tx] [c sloupce] [soubor ...]\n"
 
@@ -8559,12 +8698,12 @@ msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_soubor] [-n d�lka] [-s vzd�lenost] "
 "[soubor ...]\n"
 
-#: text-utils/more.c:329
+#: text-utils/more.c:330
 #, c-format
 msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "Pou�it�: %s [-dfln] [+��slo ��dku | +/vzorek] jm�no1 jm�no2 ...\n"
 
-#: text-utils/more.c:504
+#: text-utils/more.c:505
 #, c-format
 msgid ""
 "\n"
@@ -8576,7 +8715,7 @@ msgstr ""
 "\n"
 
 #. simple ELF detection
-#: text-utils/more.c:543
+#: text-utils/more.c:544
 #, c-format
 msgid ""
 "\n"
@@ -8591,30 +8730,30 @@ msgstr ""
 msgid "[Use q or Q to quit]"
 msgstr "[Stiskn�te q �i Q pro ukon�en�]"
 
-#: text-utils/more.c:833
+#: text-utils/more.c:826
 msgid "--More--"
 msgstr "--V�ce--"
 
-#: text-utils/more.c:835
+#: text-utils/more.c:828
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Dal�� soubor: %s)"
 
-#: text-utils/more.c:841
+#: text-utils/more.c:834
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Stiskn�te mezern�k pro pokra�ov�n�, 'q' pro ukon�en�.]"
 
-#: text-utils/more.c:1139
+#: text-utils/more.c:1132
 #, c-format
 msgid "...back %d page"
 msgstr "...p�eskakuji zp�t o po�et stran: %d"
 
-#: text-utils/more.c:1185
+#: text-utils/more.c:1178
 #, c-format
 msgid "...skipping %d line"
 msgstr "...p�eskakuji o po�et ��dk�: %d"
 
-#: text-utils/more.c:1226
+#: text-utils/more.c:1219
 msgid ""
 "\n"
 "***Back***\n"
@@ -8623,37 +8762,37 @@ msgstr ""
 "\n"
 "***Zp�t***\n"
 
-#: text-utils/more.c:1264
+#: text-utils/more.c:1257
 msgid "Can't open help file"
 msgstr "Soubor s n�pov�dou nelze otev��t."
 
-#: text-utils/more.c:1285 text-utils/more.c:1289
+#: text-utils/more.c:1278 text-utils/more.c:1282
 msgid "[Press 'h' for instructions.]"
 msgstr "[Stiskn�te 'h' pro n�pov�du.]"
 
-#: text-utils/more.c:1324
+#: text-utils/more.c:1316
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" ��dek %d"
 
-#: text-utils/more.c:1326
+#: text-utils/more.c:1318
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Nejedn� se o soubor] ��dek %d"
 
-#: text-utils/more.c:1410
+#: text-utils/more.c:1402
 msgid "  Overflow\n"
 msgstr "  P�ete�en�\n"
 
-#: text-utils/more.c:1457
+#: text-utils/more.c:1449
 msgid "...skipping\n"
 msgstr "...vynech�v�m\n"
 
-#: text-utils/more.c:1487
+#: text-utils/more.c:1479
 msgid "Regular expression botch"
 msgstr "Chyba v regul�rn�m v�razu"
 
-#: text-utils/more.c:1499
+#: text-utils/more.c:1491
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -8661,15 +8800,15 @@ msgstr ""
 "\n"
 "Vzorek nebyl nalezen\n"
 
-#: text-utils/more.c:1502
+#: text-utils/more.c:1494
 msgid "Pattern not found"
 msgstr "Vzorek nebyl nalezen"
 
-#: text-utils/more.c:1563
+#: text-utils/more.c:1555
 msgid "can't fork\n"
 msgstr "vol�n� fork selhalo\n"
 
-#: text-utils/more.c:1602
+#: text-utils/more.c:1594
 msgid ""
 "\n"
 "...Skipping "
@@ -8677,23 +8816,23 @@ msgstr ""
 "\n"
 "...Vynech�v�m "
 
-#: text-utils/more.c:1606
+#: text-utils/more.c:1598
 msgid "...Skipping "
 msgstr "...P�ech�z�m "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "to file "
 msgstr "na soubor "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "back to file "
 msgstr "zp�t na soubor "
 
-#: text-utils/more.c:1846
+#: text-utils/more.c:1835
 msgid "Line too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: text-utils/more.c:1890
+#: text-utils/more.c:1878
 msgid "No previous command to substitute for"
 msgstr "Neexistuje ��dn� p��kaz, jen� by bylo mo�no nahradit"
 
@@ -8729,6 +8868,7 @@ msgid "hexdump: bad byte count for conversion character %s.\n"
 msgstr "hexdump: chybn� po�et bajt� pro konverzn� znak %s.\n"
 
 #: text-utils/parse.c:497
+#, ycp-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
 msgstr "hexdump: %%s vy�aduje uveden� p�esnosti �i po�tu bajt�.\n"
 
@@ -8741,11 +8881,11 @@ msgstr "hexdump: chybn� form�t {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: chybn� znak v konverzi %%%s.\n"
 
-#: text-utils/rev.c:114
+#: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
 msgstr "M�sto pro buffer nelze naalokovat.\n"
 
-#: text-utils/rev.c:173
+#: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
 msgstr "Pou�it�: rev [soubor ...]\n"
 
@@ -8767,11 +8907,11 @@ msgstr "Nezn�m� posloupnost ��d�c�ch znak� na vstupu: %o, %o\n"
 msgid "Unable to allocate buffer.\n"
 msgstr "Buffer nelze naalokovat.\n"
 
-#: text-utils/ul.c:555
+#: text-utils/ul.c:553
 msgid "Input line too long.\n"
 msgstr "Vstupn� ��dka je p��li� dlouh�.\n"
 
-#: text-utils/ul.c:568
+#: text-utils/ul.c:566
 msgid "Out of memory when growing buffer.\n"
 msgstr "Nedostatek pam�ti pro rostouc� buffer.\n"
 
@@ -8788,109 +8928,48 @@ msgstr "Pou�it�: kbdrate [-V] [-s] [-r rychlost] [-d prodleva]\n"
 msgid "Cannot open /dev/port"
 msgstr "/dev/port nelze otev��t"
 
-#~ msgid "sscanf error"
-#~ msgstr "chyba sscanf"
-
-#~ msgid "%s: %s, errno=%d: %s.\n"
-#~ msgstr "%s: %s, errno=%d: %s.\n"
+#~ msgid "mount: %s has wrong major or minor number"
+#~ msgstr "mount: %s m� chybn� v�t�� �i men�� ��slo za��zen�"
 
-#~ msgid "  [ -keyboard pc|olivetti|dutch|extended ]\n"
-#~ msgstr "  [ -keyboard pc|olivetti|dutch|extended ]\n"
-
-#~ msgid "keyboard.pc"
-#~ msgstr "keyboard.pc"
-
-#~ msgid "keyboard.olivetti"
-#~ msgstr "keyboard.olivetti"
-
-#~ msgid "keyboard.dutch"
-#~ msgstr "keyboard.dutch"
-
-#~ msgid "keyboard.extended"
-#~ msgstr "keyboard.extended"
-
-#~ msgid "A disk block device is needed.\n"
-#~ msgstr "Je t�eba blokov� za��zen� disku.\n"
-
-#~ msgid ""
-#~ "Given name does not refer to a partition,\n"
-#~ "or maybe not even to a block device.\n"
-#~ msgstr ""
-#~ "Zadan� jm�no neodpov�d� diskov�mu odd�lu,\n"
-#~ " a mo�n� ani blokov�mu za��zen�.\n"
+#~ msgid "mount: %s%s is not permitted on its filesystem"
+#~ msgstr "mount: %s%s nen� na sv�m syst�mu soubor� povoleno"
 
 #~ msgid ""
-#~ "unit: sectors\n"
-#~ "\n"
+#~ "Usage: mount [-lhV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
 #~ msgstr ""
-#~ "jednotky: sektory\n"
-#~ "\n"
-
-#~ msgid " start=%9lu"
-#~ msgstr " za��tek=%9lu"
-
-#~ msgid ", size=%8lu"
-#~ msgstr ", velikost=%lu"
-
-#~ msgid ", Id=%2x"
-#~ msgstr ", Id=%2x"
-
-#~ msgid ", bootable"
-#~ msgstr ", startovac�"
-
-#~ msgid "Cannot read disk drive geometry"
-#~ msgstr "Geometrii disku nelze zjistit"
-
-#~ msgid "Cannot derive a geometry from an empty partition table"
-#~ msgstr "Z pr�zdn� tabulky rozd�len� disku nelze odvodit geometrii."
-
-#~ msgid "Cannot derive a geometry from the partition table"
-#~ msgstr "Z tabulky rozd�len� disku nelze odvodit geometrii."
-
-#~ msgid "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
-#~ msgstr "Copyright (C) 1994-1998 Kevin E. Martin & aeb"
-
-#~ msgid "Using %s as default device!\n"
-#~ msgstr "Pou��v�m %s jako implicitn� za��zen�!\n"
-
-#~ msgid "last: %s: "
-#~ msgstr "last: %s: "
-
-#~ msgid "'/' in \"%s\""
-#~ msgstr "'/' v \"%s\""
-
-#~ msgid "wall: cannot read %s.\n"
-#~ msgstr "wall: %s nelze ��st.\n"
-
-#~ msgid "wall: %s\n"
-#~ msgstr "wall: %s\n"
-
-#~ msgid "look: "
-#~ msgstr "look: "
+#~ "Pou�it�: mount [-lhV]\n"
+#~ "         mount -a [-nfFrsvw] [-tvfstypy]\n"
+#~ "         mount [-nfrsvw] [-o volby] speci�ln� soubor | uzel\n"
+#~ "         mount [-nfrsvw] [-t vfstyp] [-o volby] speci�ln� soubor uzel\n"
+#~ "         Speci�ln� za��zen� m��e b�t ozna�eno pomoc� -L popiska �i -U uuid.\n"
 
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
+#~ msgid "Writing disklabel to %s%d.\n"
+#~ msgstr "Ukl�d�m popis disku na %s%d.\n"
 
-#~ msgid "[ [ -g ] pgrps ] [ [ -u ] users ]\n"
-#~ msgstr "[ [ -g ] PGRP ... ] [ [ -u ] u�ivatel ... ]\n"
+#~ msgid "%s%d contains no disklabel.\n"
+#~ msgstr "Na %s%d se nenach�z� ��dn� popis disku.\n"
 
-#~ msgid "usage: "
-#~ msgstr "Pou�it�: "
+#~ msgid "Bootstrap installed on %s%d.\n"
+#~ msgstr "Zavad�� instalov�n na %s%d.\n"
 
-#~ msgid "That must be tomorrow, "
-#~ msgstr "To bude z�tra, "
+#~ msgid "%s: unknown geometry\n"
+#~ msgstr "%s: nezn�m� geometrie\n"
 
-#~ msgid "Cannot exec swapoff, "
-#~ msgstr "Swapoff nelze spustit - vol�n� exec selhalo, "
+#~ msgid "Cannot get loop info"
+#~ msgstr "Informace o loop nelze z�skat"
 
-#~ msgid "Cannot exec "
-#~ msgstr "Vol�n� exec selhalo"
+#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
+#~ msgstr "mount: %s:%s selhalo; p���ina udan� serverem: %s\n"
 
-#~ msgid ", trying umount."
-#~ msgstr ", zkou��m umount."
+#~ msgid "exec rc failed\n"
+#~ msgstr "spu�t�n� rc se nezda�ilo - vol�n� exec selhalo\n"
 
-#~ msgid "can't open %s (%s) - mtab not updated"
-#~ msgstr "nelze otev��t %s (%s) - mtab nebyl aktualizov�n"
+#~ msgid "fork of rc shell failed\n"
+#~ msgstr "spu�t�n� rc se nezda�ilo - vol�n� fork selhalo\n"
 
-#~ msgid "util-linux kbdrate %s \n"
-#~ msgstr "util-linux kbdrate %s \n"
+#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
+#~ msgstr "Pou�it�: %s [-shm | -msg | -sem] id\n"
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 0000000000..edb08d16e3
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,9022 @@
+# Danske beskeder for util-linux.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Claus Hindsgaul <claus_h@image.dk>, 2001.
+# Claus S�rensen <cs@klid.dk>, 2000.
+# Keld J�rn Simonsen <keld@dkuug.dk>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.10r\n"
+"POT-Creation-Date: 2001-01-21 18:42+0100\n"
+"PO-Revision-Date: 2001-01-21 19:01+01:00\n"
+"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.7.1\n"
+
+#: clock/cmos.c:157
+msgid "booted from MILO\n"
+msgstr "startede op med MILO\n"
+
+#: clock/cmos.c:166
+msgid "Ruffian BCD clock\n"
+msgstr "'Ruffian' BCD-ur\n"
+
+#: clock/cmos.c:182
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr "urport justeret til 0x%x\n"
+
+#: clock/cmos.c:192
+msgid "funky TOY!\n"
+msgstr "'funky TOY' (tid-p�-�ret)!\n"
+
+#: clock/cmos.c:246
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr "%s: momentan %s mislykkedes i 1000 iterationer!"
+
+#: clock/cmos.c:570
+#, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "Kan ikke �bne /dev/port: %s"
+
+#: clock/cmos.c:577
+msgid "I failed to get permission because I didnt try.\n"
+msgstr "Jeg kunne ikke f� adgang fordi jeg ikke fors�gte.\n"
+
+#: clock/cmos.c:580
+#, c-format
+msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
+msgstr "%s kan ikke f� adgang til I/O-port: kaldet 'iopl(3)' mislykkedes.\n"
+
+#: clock/cmos.c:583
+msgid "Probably you need root privileges.\n"
+msgstr "Du beh�ver nok root-rettigheder.\n"
+
+#: clock/hwclock.c:219
+#, c-format
+msgid "Assuming hardware clock is kept in %s time.\n"
+msgstr "Antager at maskinuret holdes i %s tid.\n"
+
+#: clock/hwclock.c:220 clock/hwclock.c:309
+msgid "UTC"
+msgstr "UTC"
+
+#: clock/hwclock.c:220 clock/hwclock.c:308
+msgid "local"
+msgstr "lokal"
+
+#: clock/hwclock.c:292
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr "%s: Advarsel: ukendt tredie linie i adjtime-fil\n"
+
+#: clock/hwclock.c:294
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr "(Forventet: 'UTC', 'LOCAL' eller ingenting.)\n"
+
+#: clock/hwclock.c:303
+#, c-format
+msgid "Last drift adjustment done at %d seconds after 1969\n"
+msgstr "Sidste hastighedsjustering blev gjort %d sekunder efter 1969\n"
+
+#: clock/hwclock.c:305
+#, c-format
+msgid "Last calibration done at %d seconds after 1969\n"
+msgstr "Sidste kalibrering blev foretaget %d sekunder efter 1969\n"
+
+#: clock/hwclock.c:307
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr "Maskinuret er i %s-tid\n"
+
+#: clock/hwclock.c:309
+msgid "unknown"
+msgstr "ukendt"
+
+#. -----------------------------------------------------------------------------
+#. Wait until the falling edge of the Hardware Clock's update flag so
+#. that any time that is read from the clock immediately after we
+#. return will be exact.
+#.
+#. The clock only has 1 second precision, so it gives the exact time only
+#. once per second, right on the falling edge of the update flag.
+#.
+#. We wait (up to one second) either blocked waiting for an rtc device
+#. or in a CPU spin loop.  The former is probably not very accurate.
+#.
+#. Return *retcode_p == 0 if it worked, nonzero if it didn't.
+#.
+#. -----------------------------------------------------------------------------
+#: clock/hwclock.c:331
+msgid "Waiting for clock tick...\n"
+msgstr "Venter p� et ur-tik...\n"
+
+#: clock/hwclock.c:335
+msgid "...got clock tick\n"
+msgstr "...fangede ur-tik\n"
+
+#: clock/hwclock.c:386
+#, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr "Ugyldige v�rdier i maskinur: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+
+#: clock/hwclock.c:394
+#, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr "Maskinur-tid: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekunder siden 1969\n"
+
+#: clock/hwclock.c:422
+#, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Tid l�st fra maskinuret: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+
+#: clock/hwclock.c:449
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgstr "S�tter maskinuret til %.2d:%.2d:%.2d = %d sekunder siden 1969\n"
+
+#: clock/hwclock.c:455
+msgid "Clock not changed - testing only.\n"
+msgstr "Uret u�ndret - testede kun.\n"
+
+#: clock/hwclock.c:503
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+"Der er g�et %.6f sekunder siden referencetiden.\n"
+"Udskyder yderligere for at n� til n�ste hele sekund.\n"
+
+#: clock/hwclock.c:527
+msgid ""
+"The Hardware Clock registers contain values that are either invalid (e.g. "
+"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr ""
+"Maskinurets registre indeholder v�rdier, der enten er ugyldige (f.eks. 50. "
+"dag i m�neden) eller udenfor det omr�de, vi kan h�ndtere (f.eks. �r 2095).\n"
+
+#. Address of static storage containing time string
+#. For some strange reason, ctime() is designed to include a newline
+#. character at the end.  We have to remove that.
+#.
+#. Compute display value for time
+#. Cut off trailing newline
+#: clock/hwclock.c:539
+#, c-format
+msgid "%s  %.6f seconds\n"
+msgstr "%s  %.6f sekunder\n"
+
+#: clock/hwclock.c:573
+msgid "No --date option specified.\n"
+msgstr "Intet --date tilvalg angivet.\n"
+
+#. Quotation marks in date_opt would ruin the date command we construct.
+#.
+#: clock/hwclock.c:578
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+"V�rdien af --date tilvalget er ikke en gyldig dato.\n"
+"Mere specifikt, indeholder den anf�rselstegn.\n"
+
+#: clock/hwclock.c:584
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr "Udf�rer 'date'-kommandoen: %s\n"
+
+#: clock/hwclock.c:588
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr "Kunne ikke k�re 'date'-programmet i /bin/sh skallen. popen() mislykkedes"
+
+#: clock/hwclock.c:594
+#, c-format
+msgid "response from date command = %s\n"
+msgstr "svar fra 'date'-kommandoen = %s\n"
+
+#: clock/hwclock.c:596
+#, c-format
+msgid ""
+"The date command issued by %s returned unexpected results.\n"
+"The command was:\n"
+"  %s\n"
+"The response was:\n"
+"  %s\n"
+msgstr ""
+"'date'-kommandoen sendt af %s returnerede uventede resultater.\n"
+"Kommandoen var:\n"
+"  %s\n"
+"Svaret var:\n"
+"  %s\n"
+
+#: clock/hwclock.c:605
+#, c-format
+msgid ""
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
+"The command was:\n"
+"  %s\n"
+"The response was:\n"
+" %s\n"
+msgstr ""
+"'date'-kommandoen sendt af %s returnerede noget andet end et heltal, hvor "
+"den konverterede tid forventedes.\n"
+"Kommandoen var:\n"
+"  %s\n"
+"Svaret var:\n"
+"  %s\n"
+
+#: clock/hwclock.c:615
+#, c-format
+msgid "date string %s equates to %d seconds since 1969.\n"
+msgstr "Datoteksten %s svarer til %d sekunder siden 1969.\n"
+
+#: clock/hwclock.c:647
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"Maskinuret indeholder ikke en gyldig tid, s� vi kan ikke s�tte systemuret "
+"med det.\n"
+
+#: clock/hwclock.c:669
+msgid "Calling settimeofday:\n"
+msgstr "Kalder 'settimeofday':\n"
+
+#: clock/hwclock.c:670
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+
+#: clock/hwclock.c:672
+#, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
+
+#: clock/hwclock.c:675
+msgid "Not setting system clock because running in test mode.\n"
+msgstr "S�tter ikke systemuret, da der k�res i testtilstand.\n"
+
+#: clock/hwclock.c:683
+msgid "Must be superuser to set system clock.\n"
+msgstr "Skal v�re superbruger for at s�tte systemuret.\n"
+
+#: clock/hwclock.c:685
+msgid "settimeofday() failed"
+msgstr "settimeofday() mislykkedes"
+
+#: clock/hwclock.c:718
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+"Justerede ikke hastighedsfaktoren, da maskinuret tidligere havde en ugyldig "
+"v�rdi.\n"
+
+#: clock/hwclock.c:722
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"Justerede ikke hastighedsfaktoren, da det er mindre en et d�gn siden sidste "
+"kalibrering.\n"
+
+#: clock/hwclock.c:731
+#, c-format
+msgid ""
+"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
+"of %f seconds/day.\n"
+"Adjusting drift factor by %f seconds/day\n"
+msgstr ""
+"Uret drev %d sekunder i l�bet af de sidste %d sekunder p� trods af en "
+"hastighedsfaktor p� %f sekunder/d�gn.\n"
+"Justerer hastighedsfaktoren med %f sekunder/d�gn\n"
+
+#: clock/hwclock.c:782
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr "%d sekunder siden sidste justering\n"
+
+#: clock/hwclock.c:784
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr "Skal inds�tte %d sekunder og stille uret %.6f sekunder tilbage\n"
+
+#: clock/hwclock.c:813
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr "Opdaterer ikke adjtime-filen, da der k�res i testtilstand.\n"
+
+#: clock/hwclock.c:814
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+"Ville have skrevet f�lgende til %s:\n"
+"%s"
+
+#: clock/hwclock.c:838
+msgid "Drift adjustment parameters not updated.\n"
+msgstr "Hastighedsjusteringen blev ikke opdateret.\n"
+
+#: clock/hwclock.c:879
+msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr "Maskinuret indeholder ikke en gyldig tid, s� vi kan ikke justere det.\n"
+
+#: clock/hwclock.c:903
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr "Den kr�vede justering er mindre end eet sekund, s� vi s�tter ikke uret.\n"
+
+#: clock/hwclock.c:929
+#, c-format
+msgid "Using %s.\n"
+msgstr "Bruger %s.\n"
+
+#: clock/hwclock.c:931
+msgid "No usable clock interface found.\n"
+msgstr "Fandt ingen brugbare ur-gr�nseflader.\n"
+
+#: clock/hwclock.c:1026
+msgid "Unable to set system clock.\n"
+msgstr "Kunne ikke s�tte systemuret.\n"
+
+#: clock/hwclock.c:1055
+msgid ""
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
+"machine.\n"
+"This copy of hwclock was built for a machine other than Alpha\n"
+"(and thus is presumably not running on an Alpha now).  No action taken.\n"
+msgstr ""
+"Kernen holder en epokev�rdi for maskinuret p� Alpha-maskiner\n"
+"Denne kopi af hwclock blev kompileret til en anden maskine end Alpha\n"
+"(og k�rer derfor sansynligvis ikke p� en Alpha nu). Intet blev gjort.\n"
+
+#: clock/hwclock.c:1064
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr "Kunne ikke hente en epokev�rdi fra kernen.\n"
+
+#: clock/hwclock.c:1066
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr "Kernen g�r ud fra en epokev�rdi p� %lu\n"
+
+#: clock/hwclock.c:1069
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr ""
+"For at s�tte epokev�rdien, skal du bruge tilvalget 'epoch' for at angive "
+"hvilken v�rdi, den skal s�ttes til\n"
+
+#: clock/hwclock.c:1072
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr "S�tter IKKE epokev�rdien til %d - tester bare.\n"
+
+#: clock/hwclock.c:1075
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr "Kunne ikke s�tte epokev�rdien i kernen.\n"
+
+#: clock/hwclock.c:1104
+#, c-format
+msgid ""
+"hwclock - query and set the hardware clock (RTC)\n"
+"\n"
+"Usage: hwclock [function] [options...]\n"
+"\n"
+"Functions:\n"
+"  --help        show this help\n"
+"  --show        read hardware clock and print result\n"
+"  --set         set the rtc to the time given with --date\n"
+"  --hctosys     set the system time from the hardware clock\n"
+"  --systohc     set the hardware clock to the current system time\n"
+"  --adjust      adjust the rtc to account for systematic drift since \n"
+"                the clock was last set or adjusted\n"
+"  --getepoch    print out the kernel's hardware clock epoch value\n"
+"  --setepoch    set the kernel's hardware clock epoch value to the \n"
+"                value given with --epoch\n"
+"  --version     print out the version of hwclock to stdout\n"
+"\n"
+"Options: \n"
+"  --utc         the hardware clock is kept in coordinated universal time\n"
+"  --localtime   the hardware clock is kept in local time\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
+"  --badyear     ignore rtc's year because the bios is broken\n"
+"  --date        specifies the time to which to set the hardware clock\n"
+"  --epoch=year  specifies the year which is the beginning of the \n"
+"                hardware clock's epoch value\n"
+msgstr ""
+"hwclock - l�s og s�t maskinuret (RTC)\n"
+"\n"
+"Brug: hwclock [funktion] [tilvalg...]\n"
+"\n"
+"Funktioner:\n"
+"  --help        vis denne hj�lp\n"
+"  --show        afl�s maskinuret og vis resultatet\n"
+"  --set         s�t uret til tiden angivet med --date\n"
+"  --hctosys     s�t systemuret til maskinurets tid\n"
+"  --systohc     s�t maskinuret til systemurets tid\n"
+"  --adjust      kalibr�r systemuret, s� det tager h�jde for systematisk\n"
+"                hastighedsfejl siden uret sidst blev sat eller justeret\n"
+"  --getepoch    vis kernens epokev�rdi for maskinuret\n"
+"  --setepoch    s�t epokev�rdien for kernens maskinur til den v�rdi,\n"
+"                der angives med --epoch\n"
+"  --version     udl�s hwclock's version til standard-ud\n"
+"\n"
+"Tilvalg: \n"
+"  --utc         maskinuret holdes i koordineret universel tid\n"
+"  --localtime   maskinuret holdes i lokal tid\n"
+"  --directisa   tilg� ISA-bussen direkte i stedet for %s\n"
+"  --badyear     igor�r maskinurets �rstal, da bios'en er fejlbeh�ftet\n"
+"  --date        angiver tiden, som maskinuret skal s�ttes til\n"
+"  --epoch=�r    angiver det �r, som er begyndelsen p� maskinurets\n"
+"                epokev�rdi\n"
+
+#: clock/hwclock.c:1129
+msgid ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                tell hwclock the type of alpha you have (see hwclock(8))\n"
+msgstr ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                angiv hvilken slags alpha du har (se hwclock(8))\n"
+
+#: clock/hwclock.c:1227
+#, c-format
+msgid "%s takes no non-option arguments.  You supplied %d.\n"
+msgstr "%s accepterer ingen parametre. Du angav parametren %d.\n"
+
+#: clock/hwclock.c:1237
+msgid ""
+"You have specified multiple function options.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+"Du har angivet flere funktionstilvalg.\n"
+"Du kan kun udf�re �n funktion ad gangen.\n"
+
+#: clock/hwclock.c:1243
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr "%s: Tilvalgene --utc og --localtime udelukker hinanden. Du angav begge.\n"
+
+#: clock/hwclock.c:1256
+msgid "No usable set-to time.  Cannot set clock.\n"
+msgstr "Ingen brugbar set-til-tid. Kan ikke s�tte uret.\n"
+
+#: clock/hwclock.c:1271
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr "Beklager, kun superbrugeren kan �ndre maskinuret.\n"
+
+#: clock/hwclock.c:1275
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "Beklager, kun superbrugeren kan �ndre systemuret.\n"
+
+#: clock/hwclock.c:1279
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr "Beklager, kun superbrugeren kan �ndre maskinurets epokev�rdi i kernen.\n"
+
+#: clock/hwclock.c:1299
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr "Kan ikke tilg� maskinuret med nogen kendt metode.\n"
+
+#: clock/hwclock.c:1302
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr ""
+"Benyt tilvalget --debug for at se detaljerne fra vores s�gning efter en "
+"tilgangsmetode.\n"
+
+#: clock/kd.c:41
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr "Venter i en l�kke for at tiden fra KDGHWCLK �ndres\n"
+
+#: clock/kd.c:44
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr "KDGHWCLK ioctl for at afl�se tiden mislykkedes"
+
+#: clock/kd.c:65 clock/rtc.c:151
+msgid "Timed out waiting for time change.\n"
+msgstr "Tidsudl�b mens der ventedes p� tids�ndring.\n"
+
+#: clock/kd.c:69
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr "KDGHWCLK ioctl for at afl�se tiden mislykkedes i l�kke"
+
+#: clock/kd.c:91
+msgid "ioctl() failed to read time from  /dev/tty1"
+msgstr "ioctl() kunne ikke afl�se tiden fra /dev/tty1"
+
+#: clock/kd.c:127
+msgid "ioctl() to open /dev/tty1 failed"
+msgstr "ioctl() for at �bne /dev/tty1 mislykkedes"
+
+#: clock/kd.c:157
+msgid "KDGHWCLK ioctl failed"
+msgstr "KDGHWCLK ioctl mislykkedes"
+
+#: clock/kd.c:163
+msgid "Can't open /dev/tty1"
+msgstr "Kunne ikke �bne /dev/tty1"
+
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "ioctl() til %s for at afl�se tiden mislykkedes.\n"
+
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Venter i l�kke p� at tiden fra %s �ndres\n"
+
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() af %s mislykkedes"
+
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s har ingen interrupt-funktioner. "
+
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "read() af %s for at vente p� en ur-tik mislykkedes"
+
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "ioctl() til %s for at afbryde opdaterings-interrupts mislykkedes"
+
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
+msgstr "ioctl() til %s for at afbryde opdaterings-interrupts mislykkedes uventet"
+
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kunne ikke �bne %s"
+
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "ioctl() til %s for at s�tte tiden mislykkedes.\n"
+
+#: clock/rtc.c:279
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr "ioctl(%s) lykkedes.\n"
+
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "�bning af %s mislykkedes"
+
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
+msgid ""
+"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
+msgstr ""
+"For at manipulere epokev�rdien i kernen, skal vi have adgang til Linux's "
+"maskinursenhed via enhedsspecialfilen '%s'. Denne fil eksisterer ikke p� "
+"dette system.\n"
+
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "ioctl(RTC_EPOCH_READ) til %s mislykkedes"
+
+#: clock/rtc.c:344
+#, c-format
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "vi har afl�st epokev�rdi %ld fra %s med RTC_EPOCH_READ ioctl.\n"
+
+#. kernel would not accept this epoch value
+#. Hmm - bad habit, deciding not to do what the user asks
+#. just because one believes that the kernel might not like it.
+#: clock/rtc.c:364
+#, c-format
+msgid "The epoch value may not be less than 1900.  You requested %ld\n"
+msgstr "Epokev�rdien m� ikke v�re mindre end 1900. Du bad om %ld\n"
+
+#: clock/rtc.c:381
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "s�tter epokev�rdien til %ld med en RTC_EPOCH_SET ioctl til %s.\n"
+
+#: clock/rtc.c:386
+#, c-format
+msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "Kernens enheds-driver for %s har ikke en RTC_EPOCH_SET ioctl.\n"
+
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "ioctl(RTC_EPOCH_SET) til %s mislykkedes"
+
+#: clock/shhopt.c:255 clock/shhopt.c:281
+#, c-format
+msgid "invalid number `%s'\n"
+msgstr "Ugyldigt tal '%s'\n"
+
+#: clock/shhopt.c:258 clock/shhopt.c:284
+#, c-format
+msgid "number `%s' to `%s' out of range\n"
+msgstr "tallet '%s' til '%s' er ikke i det gyldige omr�de\n"
+
+#: clock/shhopt.c:398
+#, c-format
+msgid "unrecognized option `%s'\n"
+msgstr "ukendt tilvalg '%s'\n"
+
+#: clock/shhopt.c:411 clock/shhopt.c:449
+#, c-format
+msgid "option `%s' requires an argument\n"
+msgstr "tilvalget '%s' kr�ver en parameter\n"
+
+#: clock/shhopt.c:417
+#, c-format
+msgid "option `%s' doesn't allow an argument\n"
+msgstr "tilvalget '%s' tillader ikke en parameter\n"
+
+#: clock/shhopt.c:439
+#, c-format
+msgid "unrecognized option `-%c'\n"
+msgstr "ukendt tilvalg '-%c'\n"
+
+#: disk-utils/blockdev.c:47
+msgid "set read-only"
+msgstr "markerer skrivebeskyttet"
+
+#: disk-utils/blockdev.c:48
+msgid "set read-write"
+msgstr "markerer skrivbar"
+
+#: disk-utils/blockdev.c:51
+msgid "get read-only"
+msgstr "f� skrivebeskyttet"
+
+#: disk-utils/blockdev.c:54
+msgid "get sectorsize"
+msgstr "f� sektorst�rrelse"
+
+#: disk-utils/blockdev.c:57
+msgid "get size"
+msgstr "f� st�rrelse"
+
+#: disk-utils/blockdev.c:60
+msgid "set readahead"
+msgstr "s�t freml�sning ('readahead')"
+
+#: disk-utils/blockdev.c:63
+msgid "get readahead"
+msgstr "f� freml�sning ('readahead')"
+
+#: disk-utils/blockdev.c:66
+msgid "flush buffers"
+msgstr "t�m buffere"
+
+#: disk-utils/blockdev.c:70
+msgid "reread partition table"
+msgstr "genl�s partitionstabellen"
+
+#: disk-utils/blockdev.c:79
+#, c-format
+msgid "Usage: %s [-V] [-v|-q] commands devices\n"
+msgstr "Brug: %s [-V] [-v|-q] kommandoer enheder\n"
+
+#: disk-utils/blockdev.c:80
+msgid "Available commands:\n"
+msgstr "Tilg�ngelige kommandoer:\n"
+
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid "%s: Unknown command: %s\n"
+msgstr "%s: Ukendt kommando: %s\n"
+
+#: disk-utils/blockdev.c:191
+#, c-format
+msgid "%s requires an argument\n"
+msgstr "%s kr�ver en parameter\n"
+
+#: disk-utils/elvtune.c:46
+msgid "usage:\n"
+msgstr "Brug:\n"
+
+#: disk-utils/fdformat.c:36
+msgid "Formatting ... "
+msgstr "Formatterer ... "
+
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
+msgid "done\n"
+msgstr "f�rdig\n"
+
+#: disk-utils/fdformat.c:65
+msgid "Verifying ... "
+msgstr "Verificerer ... "
+
+#: disk-utils/fdformat.c:76
+msgid "Read: "
+msgstr "L�s: "
+
+#: disk-utils/fdformat.c:78
+#, c-format
+msgid "Problem reading cylinder %d, expected %d, read %d\n"
+msgstr "Problem ved l�sning af cylinder %d, ventede %d, l�ste %d\n"
+
+#: disk-utils/fdformat.c:84
+#, c-format
+msgid ""
+"bad data in cyl %d\n"
+"Continuing ... "
+msgstr ""
+"ugyldige data i cyl %d\n"
+"Forts�tter ... "
+
+#: disk-utils/fdformat.c:99
+#, c-format
+msgid "usage: %s [ -n ] device\n"
+msgstr "brug: %s [ -n ] enhed\n"
+
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248
+#: disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55 disk-utils/mkfs.minix.c:640
+#: disk-utils/mkswap.c:448 disk-utils/setfdprm.c:127 misc-utils/cal.c:203
+#: misc-utils/ddate.c:181 misc-utils/kill.c:192 misc-utils/rename.c:79
+#, c-format
+msgid "%s from %s\n"
+msgstr "%s fra %s\n"
+
+#: disk-utils/fdformat.c:134
+#, c-format
+msgid "%s: not a floppy device\n"
+msgstr "%s: ikke et diskettedrev\n"
+
+#: disk-utils/fdformat.c:140
+msgid "Could not determine current format type"
+msgstr "Kunne ikke bestemme det eksisterende format"
+
+#: disk-utils/fdformat.c:141
+#, c-format
+msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
+msgstr "%s-sidet, %d spor, %d sekt/spor. Samlet kapacitet %d kB.\n"
+
+#: disk-utils/fdformat.c:142
+msgid "Double"
+msgstr "Dobbelt"
+
+#: disk-utils/fdformat.c:142
+msgid "Single"
+msgstr "Enkelt"
+
+#: disk-utils/fsck.minix.c:197
+#, c-format
+msgid "Usage: %s [-larvsmf] /dev/name\n"
+msgstr "Brug: %s [-larvsmf] /dev/navn\n"
+
+#: disk-utils/fsck.minix.c:296
+#, c-format
+msgid "%s is mounted.\t "
+msgstr "%s er monteret.\t "
+
+#: disk-utils/fsck.minix.c:298
+msgid "Do you really want to continue"
+msgstr "Vil du virkelig forts�tte"
+
+#: disk-utils/fsck.minix.c:302
+msgid "check aborted.\n"
+msgstr "tjek afbrudt.\n"
+
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
+msgid "Zone nr < FIRSTZONE in file `"
+msgstr "Zone nr < FIRSTZONE i filen '"
+
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
+msgid "Zone nr >= ZONES in file `"
+msgstr "Zone nr >= ZONES i filen '"
+
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
+msgid "Remove block"
+msgstr "Fjern blok"
+
+#: disk-utils/fsck.minix.c:364
+msgid "Read error: unable to seek to block in file '"
+msgstr "L�sefejl: kunne ikke s�ge til blok i filen '"
+
+#: disk-utils/fsck.minix.c:370
+msgid "Read error: bad block in file '"
+msgstr "L�sefejl: ugyldig blok i filen '"
+
+#: disk-utils/fsck.minix.c:386
+msgid ""
+"Internal error: trying to write bad block\n"
+"Write request ignored\n"
+msgstr ""
+"Intern fejl: fors�ger at skrive ugyldig blok\n"
+"Skrivefors�g ignoreret\n"
+
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
+msgid "seek failed in write_block"
+msgstr "s�gning mislykkedes i write_blok"
+
+#: disk-utils/fsck.minix.c:394
+msgid "Write error: bad block in file '"
+msgstr "Skrivefejl: ugyldig blok i fil '"
+
+#: disk-utils/fsck.minix.c:513
+msgid "seek failed in write_super_block"
+msgstr "s�gning mislykkedes i write_super_block"
+
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
+msgid "unable to write super-block"
+msgstr "kunne ikke skrive super-blok"
+
+#: disk-utils/fsck.minix.c:525
+msgid "Unable to write inode map"
+msgstr "Kunne ikke skrive inode-oversigten"
+
+#: disk-utils/fsck.minix.c:527
+msgid "Unable to write zone map"
+msgstr "Kunne ikke skrive zone-oversigten"
+
+#: disk-utils/fsck.minix.c:529
+msgid "Unable to write inodes"
+msgstr "Kunne ikke skrive inodes"
+
+#: disk-utils/fsck.minix.c:558
+msgid "seek failed"
+msgstr "s�gning fejlede"
+
+#: disk-utils/fsck.minix.c:560
+msgid "unable to read super block"
+msgstr "kunne ikke l�se super-blok"
+
+#: disk-utils/fsck.minix.c:580
+msgid "bad magic number in super-block"
+msgstr "ugyldigt magisk nummer i super-blok"
+
+#: disk-utils/fsck.minix.c:582
+msgid "Only 1k blocks/zones supported"
+msgstr "Kun 1k blokke/zoner underst�ttes"
+
+#: disk-utils/fsck.minix.c:584
+msgid "bad s_imap_blocks field in super-block"
+msgstr "ugyldigt s_imap_blocks-felt i super-blok"
+
+#: disk-utils/fsck.minix.c:586
+msgid "bad s_zmap_blocks field in super-block"
+msgstr "ugyldigt s_zmap_blocks-felt i super-blok"
+
+#: disk-utils/fsck.minix.c:593
+msgid "Unable to allocate buffer for inode map"
+msgstr "Kunne ikke allokere buffer til inode-oversigt"
+
+#: disk-utils/fsck.minix.c:601
+msgid "Unable to allocate buffer for inodes"
+msgstr "Kunne ikke allokere buffer til inodes"
+
+#: disk-utils/fsck.minix.c:604
+msgid "Unable to allocate buffer for inode count"
+msgstr "Kunne ikke allokere buffer til inode-opt�lling"
+
+#: disk-utils/fsck.minix.c:607
+msgid "Unable to allocate buffer for zone count"
+msgstr "Kunne ikke allokere buffer til zoneopt�lling"
+
+#: disk-utils/fsck.minix.c:609
+msgid "Unable to read inode map"
+msgstr "Kunne ikke l�se inode-oversigt"
+
+#: disk-utils/fsck.minix.c:611
+msgid "Unable to read zone map"
+msgstr "Kunne ikke l�se zoneoversigt"
+
+#: disk-utils/fsck.minix.c:613
+msgid "Unable to read inodes"
+msgstr "Kunne ikke l�se inodes"
+
+#: disk-utils/fsck.minix.c:615
+msgid "Warning: Firstzone != Norm_firstzone\n"
+msgstr "Advarsel: Firstzone != Norm_firstzone\n"
+
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
+#, c-format
+msgid "%ld inodes\n"
+msgstr "%ld inodes\n"
+
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
+#, c-format
+msgid "%ld blocks\n"
+msgstr "%ld blokke\n"
+
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
+#, c-format
+msgid "Firstdatazone=%ld (%ld)\n"
+msgstr "Firstdatazone=%ld (%ld)\n"
+
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
+#, c-format
+msgid "Zonesize=%d\n"
+msgstr "Zonesize=%d\n"
+
+#: disk-utils/fsck.minix.c:624
+#, c-format
+msgid "Maxsize=%ld\n"
+msgstr "Maxsize=%ld\n"
+
+#: disk-utils/fsck.minix.c:625
+#, c-format
+msgid "Filesystem state=%d\n"
+msgstr "Filesystem state=%d\n"
+
+#: disk-utils/fsck.minix.c:626
+#, c-format
+msgid ""
+"namelen=%d\n"
+"\n"
+msgstr ""
+"namelen=%d\n"
+"\n"
+
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
+#, c-format
+msgid "Inode %d marked not used, but used for file '"
+msgstr "Inode %d er markeret som ubrugt, men bruges af filen '"
+
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
+msgid "Mark in use"
+msgstr "Mark�r i brug"
+
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
+#, c-format
+msgid " has mode %05o\n"
+msgstr " har modus %05o\n"
+
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
+msgid "Warning: inode count too big.\n"
+msgstr "Advarsel: inode-opt�lling for stor.\n"
+
+#: disk-utils/fsck.minix.c:733
+msgid "root inode isn't a directory"
+msgstr "rod-inode er ikke et katalog"
+
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
+msgid "Block has been used before. Now in file `"
+msgstr "Blokke blev brugt tidligere. Nu i filen '"
+
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
+msgid "Clear"
+msgstr "Slet"
+
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
+#, c-format
+msgid "Block %d in file `"
+msgstr "Blok %d i filen '"
+
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
+msgid "' is marked not in use."
+msgstr "' er markeret som ubrugt."
+
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
+msgid "Correct"
+msgstr "Korrig�r"
+
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
+msgid " contains a bad inode number for file '"
+msgstr " indeholder forkert inode-antal for filen '"
+
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
+msgid " Remove"
+msgstr " Fjern"
+
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
+msgid ": bad directory: '.' isn't first\n"
+msgstr ": ugyldigt katalog: '.' er ikke f�rst\n"
+
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
+msgid ": bad directory: '..' isn't second\n"
+msgstr ": ugyldigt katalog: ',.' er ikke nummer to\n"
+
+#: disk-utils/fsck.minix.c:1070
+msgid "internal error"
+msgstr "intern fejl"
+
+#: disk-utils/fsck.minix.c:1073
+msgid ": bad directory: size<32"
+msgstr ": ugyldigt katalog: st�rrelse < 32"
+
+#: disk-utils/fsck.minix.c:1091
+msgid ": bad directory: size < 32"
+msgstr ": ugyldigt katalog: st�rrelse < 32"
+
+#: disk-utils/fsck.minix.c:1104
+msgid "seek failed in bad_zone"
+msgstr "mislykket s�gning i bad_zone"
+
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
+#, c-format
+msgid "Inode %d mode not cleared."
+msgstr "Inode %d modus ikke slettet."
+
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
+#, c-format
+msgid "Inode %d not used, marked used in the bitmap."
+msgstr "Inode %d ikke brugt, markeret som brugt i bitoversigten."
+
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
+#, c-format
+msgid "Inode %d used, marked unused in the bitmap."
+msgstr "Inode %d i brug, markeret som ubrugt i bitoversigten."
+
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
+#, c-format
+msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgstr "Inode %d (modus = %07o), i_nlinks=%d, optalt=%d."
+
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
+msgid "Set i_nlinks to count"
+msgstr "S�t i_nlinks til det optalte"
+
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
+#, c-format
+msgid "Zone %d: marked in use, no file uses it."
+msgstr "Zone %d: markeret som brugt, ingen filer bruger den."
+
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
+msgid "Unmark"
+msgstr "Afmark�r"
+
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
+#, c-format
+msgid "Zone %d: %sin use, counted=%d\n"
+msgstr "Zone %d: %si brug, optalt=%d\n"
+
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
+msgid "not "
+msgstr "ikke "
+
+#: disk-utils/fsck.minix.c:1182
+msgid "Set"
+msgstr "S�t"
+
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
+msgid "bad inode size"
+msgstr "ugyldig inode-st�rrelse"
+
+#: disk-utils/fsck.minix.c:1256
+msgid "bad v2 inode size"
+msgstr "ugyldig v2 inode-st�rrelse"
+
+#: disk-utils/fsck.minix.c:1282
+msgid "need terminal for interactive repairs"
+msgstr "kr�ver terminal til interaktive reperationer"
+
+#: disk-utils/fsck.minix.c:1286
+#, c-format
+msgid "unable to open '%s'"
+msgstr "kunne ikke �bne '%s'"
+
+#: disk-utils/fsck.minix.c:1301
+#, c-format
+msgid "%s is clean, no check.\n"
+msgstr "%s er i orden, tjekkes ikke.\n"
+
+#: disk-utils/fsck.minix.c:1305
+#, c-format
+msgid "Forcing filesystem check on %s.\n"
+msgstr "Gennemtvinger tjek af filsystem p� %s.\n"
+
+#: disk-utils/fsck.minix.c:1307
+#, c-format
+msgid "Filesystem on %s is dirty, needs checking.\n"
+msgstr "Filsystem p� %s er m�ske ikke i orden, kr�ver et tjek.\n"
+
+#: disk-utils/fsck.minix.c:1336
+msgid ""
+"\n"
+"%6ld inodes used (%ld%%)\n"
+msgstr ""
+"\n"
+"%6ld inodes brugt (%ld%%)\n"
+
+#: disk-utils/fsck.minix.c:1341
+msgid "%6ld zones used (%ld%%)\n"
+msgstr "%6ld zoner brugt (%ld%%)\n"
+
+#: disk-utils/fsck.minix.c:1343
+#, c-format
+msgid ""
+"\n"
+"%6d regular files\n"
+"%6d directories\n"
+"%6d character device files\n"
+"%6d block device files\n"
+"%6d links\n"
+"%6d symbolic links\n"
+"------\n"
+"%6d files\n"
+msgstr ""
+"\n"
+"%6d regul�re filer\n"
+"%6d kataloger\n"
+"%6d tegn-enheds filer\n"
+"%6d blok-enheds filer\n"
+"%6d l�nker\n"
+"%6d symbolske l�nker\n"
+"------\n"
+"%6d filer\n"
+
+#: disk-utils/fsck.minix.c:1356
+msgid ""
+"----------------------------\n"
+"FILE SYSTEM HAS BEEN CHANGED\n"
+"----------------------------\n"
+msgstr ""
+"--------------------------\n"
+"FILSYSTEM BLEV MODIFICERET\n"
+"--------------------------\n"
+
+#: disk-utils/mkfs.bfs.c:88
+#, c-format
+msgid ""
+"Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n"
+"       [-F fsname] device [block-count]\n"
+msgstr ""
+"Brug: %s [-v] [-N antal-inode] [-V bind-navn]\n"
+"       [-F fsnavn] enhed [antal-blokke]\n"
+
+#: disk-utils/mkfs.bfs.c:135
+msgid "volume name too long"
+msgstr "for langt bind-navn"
+
+#: disk-utils/mkfs.bfs.c:142
+msgid "fsname name too long"
+msgstr "for langt filsystem-navn"
+
+#: disk-utils/mkfs.bfs.c:167
+#, c-format
+msgid "cannot stat device %s"
+msgstr "kunne ikke finde enhed %s"
+
+#: disk-utils/mkfs.bfs.c:171
+#, c-format
+msgid "%s is not a block special device"
+msgstr "%s er ikke en blokenhed"
+
+#: disk-utils/mkfs.bfs.c:176
+#, c-format
+msgid "cannot open %s"
+msgstr "kunne ikke �bne %s"
+
+#: disk-utils/mkfs.bfs.c:187
+#, c-format
+msgid "cannot get size of %s"
+msgstr "Kan ikke f� st�rrelsen af %s"
+
+#: disk-utils/mkfs.bfs.c:192
+#, c-format
+msgid "blocks argument too large, max is %d"
+msgstr "parameteret antal-blokke er for stort. Maksimum er %d"
+
+#: disk-utils/mkfs.bfs.c:207
+msgid "too many inodes - max is 512"
+msgstr "for mange inode"
+
+#: disk-utils/mkfs.bfs.c:216
+#, c-format
+msgid "not enough space, need at least %d blocks"
+msgstr "ikke nok plads. Mangler mindst %d blokke"
+
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:1913
+#, c-format
+msgid "Device: %s\n"
+msgstr "Enhed: %s\n"
+
+#: disk-utils/mkfs.bfs.c:229
+#, c-format
+msgid "Volume: <%-6s>\n"
+msgstr "Bind:   <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:230
+#, c-format
+msgid "FSname: <%-6s>\n"
+msgstr "FSnavn: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:231
+#, c-format
+msgid "BlockSize: %d\n"
+msgstr "BlokSt�rr: %d\n"
+
+#: disk-utils/mkfs.bfs.c:233
+#, c-format
+msgid "Inodes: %d (in 1 block)\n"
+msgstr "Inodes: %d (i 1 blok)\n"
+
+#: disk-utils/mkfs.bfs.c:236
+#, c-format
+msgid "Inodes: %d (in %ld blocks)\n"
+msgstr "Inodes: %d (i %ld blokke)\n"
+
+#: disk-utils/mkfs.bfs.c:238
+#, c-format
+msgid "Blocks: %ld\n"
+msgstr "Blokke: %ld\n"
+
+#: disk-utils/mkfs.bfs.c:239
+#, c-format
+msgid "Inode end: %d, Data end: %d\n"
+msgstr "Inode-slut: %d, Data-slut: %d\n"
+
+#: disk-utils/mkfs.bfs.c:244
+msgid "error writing superblock"
+msgstr "kunne ikke skrive superblok"
+
+#: disk-utils/mkfs.bfs.c:264
+msgid "error writing root inode"
+msgstr "fejl ved skrivning af rod-inode"
+
+#: disk-utils/mkfs.bfs.c:269
+msgid "error writing inode"
+msgstr "fejl ved skrivning af inode"
+
+#: disk-utils/mkfs.bfs.c:272
+msgid "seek error"
+msgstr "s�gefejl"
+
+#: disk-utils/mkfs.bfs.c:278
+msgid "error writing . entry"
+msgstr "fejl ved skrivning af '.'-indgang"
+
+#: disk-utils/mkfs.bfs.c:282
+msgid "error writing .. entry"
+msgstr "fejl ved skrivning af '..'-indgang"
+
+#: disk-utils/mkfs.bfs.c:286
+#, c-format
+msgid "error closing %s"
+msgstr "Fejl ved lukning af %s"
+
+#: disk-utils/mkfs.c:76
+msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
+msgstr "Brug: mkfs [-V] [-t fstype] [fs-tilvalg] enhed [st�rrelse]\n"
+
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:227 mount/sundries.c:196
+#, c-format
+msgid "%s: Out of memory!\n"
+msgstr "%s: Hukommelse opbrugt!\n"
+
+#: disk-utils/mkfs.c:99
+#, c-format
+msgid "mkfs version %s (%s)\n"
+msgstr "mkfs version %s (%s)\n"
+
+#: disk-utils/mkfs.minix.c:179
+#, c-format
+msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
+msgstr "Brug: %s [-c | -l filnavn] [-nXX] [-iXX] /dev/navn [blokke]\n"
+
+#: disk-utils/mkfs.minix.c:203
+#, c-format
+msgid "%s is mounted; will not make a filesystem here!"
+msgstr "%s er monteret; vil ikke oprette et filsystem her!"
+
+#: disk-utils/mkfs.minix.c:264
+msgid "seek to boot block failed in write_tables"
+msgstr "mislykket s�gning til opstartsblok i write_tables"
+
+#: disk-utils/mkfs.minix.c:266
+msgid "unable to clear boot sector"
+msgstr "kunne ikke slette opstartssektor"
+
+#: disk-utils/mkfs.minix.c:268
+msgid "seek failed in write_tables"
+msgstr "s�gning mislykkedes i write_tables"
+
+#: disk-utils/mkfs.minix.c:272
+msgid "unable to write inode map"
+msgstr "kunne ikke skrive inode-oversigt"
+
+#: disk-utils/mkfs.minix.c:274
+msgid "unable to write zone map"
+msgstr "kunne ikke skrive zoneoversigt"
+
+#: disk-utils/mkfs.minix.c:276
+msgid "unable to write inodes"
+msgstr "kunne ikke skrive inodes"
+
+#: disk-utils/mkfs.minix.c:285
+msgid "write failed in write_block"
+msgstr "mislykked skrivning i write_block"
+
+#. Could make triple indirect block here
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
+msgid "too many bad blocks"
+msgstr "for mange ugyldige blokke"
+
+#: disk-utils/mkfs.minix.c:301
+msgid "not enough good blocks"
+msgstr "ikke nok gyldige blokke"
+
+#: disk-utils/mkfs.minix.c:513
+msgid "unable to allocate buffers for maps"
+msgstr "kunne ikke allokere buffere til oversigter"
+
+#: disk-utils/mkfs.minix.c:522
+msgid "unable to allocate buffer for inodes"
+msgstr "kunne ikke allokere buffere til inodes"
+
+#: disk-utils/mkfs.minix.c:528
+#, c-format
+msgid ""
+"Maxsize=%ld\n"
+"\n"
+msgstr ""
+"Maxsize=%ld\n"
+"\n"
+
+#: disk-utils/mkfs.minix.c:542
+msgid "seek failed during testing of blocks"
+msgstr "s�gning fejlede under test af blokke"
+
+#: disk-utils/mkfs.minix.c:550
+msgid "Weird values in do_check: probably bugs\n"
+msgstr "Mystiske v�rdier i do_check: sansynligvis programfejl\n"
+
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
+msgid "seek failed in check_blocks"
+msgstr "s�gning mislykkedes i check_blocks"
+
+#: disk-utils/mkfs.minix.c:590
+msgid "bad blocks before data-area: cannot make fs"
+msgstr "ugyldige blokke f�r dataomr�de: kan ikke oprette filsystem"
+
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
+#, c-format
+msgid "%d bad blocks\n"
+msgstr "%d ugyldige blokke\n"
+
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
+msgid "one bad block\n"
+msgstr "en ugyldig blok\n"
+
+#: disk-utils/mkfs.minix.c:608
+msgid "can't open file of bad blocks"
+msgstr "kan ikke �bne fil med ugyldige blokke"
+
+#: disk-utils/mkfs.minix.c:677
+#, c-format
+msgid "%s: not compiled with minix v2 support\n"
+msgstr "%s: ikke oversat med underst�ttelse for minix v2\n"
+
+#: disk-utils/mkfs.minix.c:693
+msgid "strtol error: number of blocks not specified"
+msgstr "strtol-fejl: antallet af blokke ikke angivet"
+
+#: disk-utils/mkfs.minix.c:725
+#, c-format
+msgid "unable to open %s"
+msgstr "kunne ikke �bne %s"
+
+#: disk-utils/mkfs.minix.c:727
+#, c-format
+msgid "unable to stat %s"
+msgstr "kunne ikke finde %s"
+
+#: disk-utils/mkfs.minix.c:731
+#, c-format
+msgid "will not try to make filesystem on '%s'"
+msgstr "vil ikke fors�ge at oprette filsystem p� '%s'"
+
+#: disk-utils/mkswap.c:174
+#, c-format
+msgid "Bad user-specified page size %d\n"
+msgstr "Ugyldig sidest�rrelse '%d' angivet af bruger\n"
+
+#: disk-utils/mkswap.c:183
+#, c-format
+msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
+msgstr "Benytter bruger-bestemt sidest�rrelse %d i stedet for systemv�rdierne %d/%d\n"
+
+#: disk-utils/mkswap.c:187
+#, c-format
+msgid "Assuming pages of size %d (not %d)\n"
+msgstr "Antager sider med st�rrelsen %d (ikke %d)\n"
+
+#: disk-utils/mkswap.c:312
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
+msgstr "Brug: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/navn [blokke]\n"
+
+#: disk-utils/mkswap.c:335
+msgid "too many bad pages"
+msgstr "for mange ugyldige sider"
+
+#: disk-utils/mkswap.c:349 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1931 text-utils/more.c:1942
+msgid "Out of memory"
+msgstr "Hukommelse opbrugt"
+
+#: disk-utils/mkswap.c:366
+msgid "one bad page\n"
+msgstr "en ugyldig side\n"
+
+#: disk-utils/mkswap.c:368
+#, c-format
+msgid "%d bad pages\n"
+msgstr "%d ugyldige sider\n"
+
+#: disk-utils/mkswap.c:488
+#, 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:506
+#, c-format
+msgid "%s: error: size %ld is larger than device size %d\n"
+msgstr "%s: fejl: st�rrelsen %ld er st�rre end enhedsst�rrelsen %d\n"
+
+#: disk-utils/mkswap.c:525
+#, c-format
+msgid "%s: error: unknown version %d\n"
+msgstr "%s: fejl: ukendt version %d\n"
+
+#: disk-utils/mkswap.c:531
+#, c-format
+msgid "%s: error: swap area needs to be at least %ldkB\n"
+msgstr "%s: fejl: swap-omr�de skal mindst v�re p� %ldkB\n"
+
+#: disk-utils/mkswap.c:550
+#, c-format
+msgid "%s: warning: truncating swap area to %ldkB\n"
+msgstr "%s: fejl: afkorter swap-omr�det til %ldkB\n"
+
+#: disk-utils/mkswap.c:562
+#, c-format
+msgid "Will not try to make swapdevice on '%s'"
+msgstr "Vil ikke fors�ge at oprette swap-enhed p� '%s'"
+
+#: disk-utils/mkswap.c:571 disk-utils/mkswap.c:592
+msgid "fatal: first page unreadable"
+msgstr "fatalt: f�rste side kan ikke l�ses"
+
+#: disk-utils/mkswap.c:577
+#, c-format
+msgid ""
+"%s: Device '%s' contains a valid Sun disklabel.\n"
+"This probably means creating v0 swap would destroy your partition table\n"
+"No swap created. If you really want to create swap v0 on that device, use\n"
+"the -f option to force it.\n"
+msgstr ""
+"%s: Enhed '%s' undeholder en gyldig Sun diskmark�r.\n"
+"Det betyder sikkert at det ville �del�gge din partitionstabel, hvis du\n"
+"opretter en v0 swap. Ingen swap oprettet. Hvis du virkelig vil oprette en\n"
+"v0 swap p� denne enhed, kan du gennemtvinge det med tilvalget -f.\n"
+
+#: disk-utils/mkswap.c:601
+msgid "Unable to set up swap-space: unreadable"
+msgstr "Kunne ikke klarg�re swap-omr�de: ul�seligt"
+
+#: disk-utils/mkswap.c:602
+#, c-format
+msgid "Setting up swapspace version %d, size = %ld bytes\n"
+msgstr "Klarg�rer swap-omr�de version %d, st�rrelse = %ld byte\n"
+
+#: disk-utils/mkswap.c:608
+msgid "unable to rewind swap-device"
+msgstr "kunne ikke spole tilbage p� swap-enheden"
+
+#: disk-utils/mkswap.c:611
+msgid "unable to write signature page"
+msgstr "kunne ikke skrive signatur-side"
+
+#: disk-utils/mkswap.c:619
+msgid "fsync failed"
+msgstr "fsync mislykkedes"
+
+#: disk-utils/setfdprm.c:31
+#, c-format
+msgid "Invalid number: %s\n"
+msgstr "Ugyldigt tal: %s\n"
+
+#: disk-utils/setfdprm.c:81
+#, c-format
+msgid "Syntax error: '%s'\n"
+msgstr "Syntaksfejl: '%s'\n"
+
+#: disk-utils/setfdprm.c:91
+#, c-format
+msgid "No such parameter set: '%s'\n"
+msgstr "Ingen s�dan parameter sat: '%s'\n"
+
+#: disk-utils/setfdprm.c:100
+#, c-format
+msgid "usage: %s [ -p ] dev name\n"
+msgstr "brug: %s [ -p ] enh navn\n"
+
+#: disk-utils/setfdprm.c:101
+#, c-format
+msgid "       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+msgstr "       %s [ -p ] enh str sekt hoveder spor str�k gab rate spec1 fmt_gab\n"
+
+#: disk-utils/setfdprm.c:104
+#, c-format
+msgid "       %s [ -c | -y | -n | -d ] dev\n"
+msgstr "       %s [ -c | -y | -n | -d ] enh\n"
+
+#: disk-utils/setfdprm.c:106
+#, c-format
+msgid "       %s [ -c | -y | -n ] dev\n"
+msgstr "       %s [ -c | -y | -n ] enh\n"
+
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
+msgid "Unusable"
+msgstr "Ubrugelig"
+
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
+msgid "Free Space"
+msgstr "Frit omr�de"
+
+#: fdisk/cfdisk.c:398
+msgid "Linux ext2"
+msgstr "Linux ext2"
+
+#. also Solaris
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
+msgid "Linux"
+msgstr "Linux"
+
+#: fdisk/cfdisk.c:403
+msgid "OS/2 HPFS"
+msgstr "OS/2 HPFS"
+
+#: fdisk/cfdisk.c:405
+msgid "OS/2 IFS"
+msgstr "OS/2 IFS"
+
+#: fdisk/cfdisk.c:409
+msgid "NTFS"
+msgstr "NTFS"
+
+#: fdisk/cfdisk.c:420
+msgid "Disk has been changed.\n"
+msgstr "Disken er blevet udskiftet.\n"
+
+#: fdisk/cfdisk.c:421
+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:424
+msgid ""
+"\n"
+"WARNING: If you have created or modified any\n"
+"DOS 6.x partitions, please see the cfdisk manual\n"
+"page for additional information.\n"
+msgstr ""
+"\n"
+"ADVARSEL: L�s venligst cfdisk manual-siden for\n"
+"yderligere information, hvis du har oprettet eller\n"
+"�ndret DOS 6.x partitioner.\n"
+
+#: fdisk/cfdisk.c:519
+msgid "FATAL ERROR"
+msgstr "FATAL FEJL"
+
+#: fdisk/cfdisk.c:528
+msgid "Press any key to exit cfdisk"
+msgstr "Tryk en tast for at afslutte cfdisk"
+
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+msgid "Cannot seek on disk drive"
+msgstr "Kan ikke s�ge p� drev"
+
+#: fdisk/cfdisk.c:566
+msgid "Cannot read disk drive"
+msgstr "Kan ikke l�se drev"
+
+#: fdisk/cfdisk.c:574
+msgid "Cannot write disk drive"
+msgstr "Kan ikke skrive p� drev"
+
+#: fdisk/cfdisk.c:814
+msgid "Too many partitions"
+msgstr "For mange partitioner"
+
+#: fdisk/cfdisk.c:819
+msgid "Partition begins before sector 0"
+msgstr "Partition starter f�r sektor 0"
+
+#: fdisk/cfdisk.c:824
+msgid "Partition ends before sector 0"
+msgstr "Partition slutter f�r sektor 0"
+
+#: fdisk/cfdisk.c:829
+msgid "Partition begins after end-of-disk"
+msgstr "Partition starter efter slut-p�-disk"
+
+#: fdisk/cfdisk.c:834
+msgid "Partition ends after end-of-disk"
+msgstr "Partition slutter efter slut-p�-disk"
+
+#: fdisk/cfdisk.c:858
+msgid "logical partitions not in disk order"
+msgstr "logiske partitioner ikke i disk-r�kkef�lge"
+
+#: fdisk/cfdisk.c:861
+msgid "logical partitions overlap"
+msgstr "logisk partitions-overlap"
+
+#: fdisk/cfdisk.c:863
+msgid "enlarged logical partitions overlap"
+msgstr "forst�rret logisk partitions-overlap"
+
+#: fdisk/cfdisk.c:893
+msgid "!!!! Internal error creating logical drive with no extended partition !!!!"
+msgstr "!!!! Intern fejl ved oprettelse af logisk drev uden udvidet partition !!!!"
+
+#: fdisk/cfdisk.c:904 fdisk/cfdisk.c:916
+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:1066
+msgid "Menu item too long. Menu may look odd."
+msgstr "Menupunkt for langt. Menu ser muligvis m�rkeligt ud."
+
+#: fdisk/cfdisk.c:1122
+msgid "Menu without direction. Defaulting horizontal."
+msgstr "Menu uden retning. V�lger standarden horisontal."
+
+#: fdisk/cfdisk.c:1252
+msgid "Illegal key"
+msgstr "Ugyldig tast"
+
+#: fdisk/cfdisk.c:1275
+msgid "Press a key to continue"
+msgstr "Tryk en tast for at forts�tte"
+
+#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2400
+#: fdisk/cfdisk.c:2402
+msgid "Primary"
+msgstr "Prim�r"
+
+#: fdisk/cfdisk.c:1322
+msgid "Create a new primary partition"
+msgstr "Opret en ny prim�r partition"
+
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2399
+#: fdisk/cfdisk.c:2402
+msgid "Logical"
+msgstr "Logisk"
+
+#: fdisk/cfdisk.c:1323
+msgid "Create a new logical partition"
+msgstr "Opret en ny logisk partition"
+
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2074
+msgid "Cancel"
+msgstr "Fortryd"
+
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379
+msgid "Don't create a partition"
+msgstr "Opret ikke partition"
+
+#: fdisk/cfdisk.c:1340
+msgid "!!! Internal error !!!"
+msgstr "!!! Intern fejl !!!"
+
+#: fdisk/cfdisk.c:1343
+msgid "Size (in MB): "
+msgstr "St�rrelse (i MB): "
+
+#: fdisk/cfdisk.c:1377
+msgid "Beginning"
+msgstr "Begyndelse"
+
+#: fdisk/cfdisk.c:1377
+msgid "Add partition at beginning of free space"
+msgstr "Tilf�j partition i starten af det frie omr�de"
+
+#: fdisk/cfdisk.c:1378
+msgid "End"
+msgstr "Slut"
+
+#: fdisk/cfdisk.c:1378
+msgid "Add partition at end of free space"
+msgstr "Tilf�j partition i slutningen af det frie omr�de"
+
+#: fdisk/cfdisk.c:1396
+msgid "No room to create the extended partition"
+msgstr "Ikke plads til at oprette udvidet partition"
+
+#: fdisk/cfdisk.c:1435
+msgid "Bad signature on partition table"
+msgstr "Ugyldig signatur p� partitionstabellen"
+
+#: fdisk/cfdisk.c:1473
+msgid "You specified more cylinders than fit on disk"
+msgstr "Du angav flere cylindre end der kan v�re p� disken"
+
+#: fdisk/cfdisk.c:1503
+msgid "Cannot open disk drive"
+msgstr "Kan ikke �bne drev"
+
+#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1686
+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:1526
+msgid "Cannot get disk size"
+msgstr "Kan ikke f� diskst�rrelsen"
+
+#. avoid snprintf - it does not exist on ancient systems
+#: fdisk/cfdisk.c:1552
+msgid "Bad primary partition"
+msgstr "Ugyldig prim�rpartition"
+
+#. avoid snprintf
+#: fdisk/cfdisk.c:1583
+msgid "Bad logical partition"
+msgstr "Ugyldig logisk partition"
+
+#: fdisk/cfdisk.c:1698
+msgid "Warning!!  This may destroy data on your disk!"
+msgstr "Advarsel!! Dette �del�gger muligvis data p� din disk!"
+
+#: fdisk/cfdisk.c:1702
+msgid "Are you sure you want write the partition table to disk? (yes or no): "
+msgstr ""
+"Er du sikke p�, at du vil skrive partitionstabellen til disken? (ja eller "
+"nej): "
+
+#: fdisk/cfdisk.c:1708
+msgid "no"
+msgstr "nej"
+
+#: fdisk/cfdisk.c:1709
+msgid "Did not write partition table to disk"
+msgstr "Skrev ikke partitionstabellen til disken"
+
+#: fdisk/cfdisk.c:1711
+msgid "yes"
+msgstr "ja"
+
+#: fdisk/cfdisk.c:1714
+msgid "Please enter `yes' or `no'"
+msgstr "Skriv venligst 'ja' eller 'nej'"
+
+#: fdisk/cfdisk.c:1718
+msgid "Writing partition table to disk..."
+msgstr "Skriver partitionstabel til disken..."
+
+#: fdisk/cfdisk.c:1743 fdisk/cfdisk.c:1747
+msgid "Wrote partition table to disk"
+msgstr "Skrev partitionstabel til disken"
+
+#: fdisk/cfdisk.c:1745
+msgid "Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr ""
+"Skrev partitionstabel, men genindl�sning mislykkedes. Genstart for at "
+"opdatere tabellen."
+
+#: fdisk/cfdisk.c:1755
+msgid "Not precisely one primary partition is bootable. DOS MBR cannot boot this."
+msgstr ""
+"Da ikke n�jagtig �n prim�rpartition er opstartbar, vil DOS MBR ikke kunne "
+"starte op."
+
+#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1931 fdisk/cfdisk.c:2015
+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:1821 fdisk/cfdisk.c:1939 fdisk/cfdisk.c:2023
+#, c-format
+msgid "Cannot open file '%s'"
+msgstr "Kan ikke �bne filen '%s'"
+
+#: fdisk/cfdisk.c:1832
+#, c-format
+msgid "Disk Drive: %s\n"
+msgstr "Drev: %s\n"
+
+#: fdisk/cfdisk.c:1834
+msgid "Sector 0:\n"
+msgstr "Sektor 0:\n"
+
+#: fdisk/cfdisk.c:1841
+#, c-format
+msgid "Sector %d:\n"
+msgstr "Sektor %d:\n"
+
+#: fdisk/cfdisk.c:1861
+msgid "   None   "
+msgstr "   Ingen  "
+
+#: fdisk/cfdisk.c:1863
+msgid "   Pri/Log"
+msgstr "   Pri/Log"
+
+#: fdisk/cfdisk.c:1865
+msgid "   Primary"
+msgstr "   Prim�r"
+
+#: fdisk/cfdisk.c:1867
+msgid "   Logical"
+msgstr "   Logisk "
+
+#. odd flag on end
+#. type id
+#. type name
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1234 fdisk/fdisk.c:1458
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: fdisk/cfdisk.c:1911
+#, c-format
+msgid "Boot (%02X)"
+msgstr "Opstart (%02X)"
+
+#: fdisk/cfdisk.c:1913 fdisk/cfdisk.c:2408
+#, c-format
+msgid "Unknown (%02X)"
+msgstr "Ukendt (%02X)"
+
+#: fdisk/cfdisk.c:1915
+#, c-format
+msgid "None (%02X)"
+msgstr "Ingen (%02X)"
+
+#: fdisk/cfdisk.c:1950 fdisk/cfdisk.c:2034
+#, c-format
+msgid "Partition Table for %s\n"
+msgstr "Partitionstabel for %s\n"
+
+#: fdisk/cfdisk.c:1952
+msgid "            First    Last\n"
+msgstr "            F�rste   Sidste\n"
+
+#: fdisk/cfdisk.c:1953
+msgid " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+msgstr " # Type     Sektor   Sektor   Forskyd L�ngde   Filsystem type (ID)    Flag\n"
+
+#: fdisk/cfdisk.c:1954
+msgid ""
+"-- ------- -------- --------- ------ --------- ---------------------- "
+"---------\n"
+msgstr ""
+"-- ------- -------- --------- ------ --------- ---------------------- "
+"---------\n"
+
+#: fdisk/cfdisk.c:2036
+msgid "         ---Starting---      ----Ending----    Start Number of\n"
+msgstr "         --- Start-----      -----Slut-----    Start antal af\n"
+
+#: fdisk/cfdisk.c:2037
+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:2038
+msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
+
+#: fdisk/cfdisk.c:2071
+msgid "Raw"
+msgstr "R�"
+
+#: fdisk/cfdisk.c:2071
+msgid "Print the table using raw data format"
+msgstr "Vis tabellen i r�tdata format"
+
+#: fdisk/cfdisk.c:2072 fdisk/cfdisk.c:2174
+msgid "Sectors"
+msgstr "Sektorer"
+
+#: fdisk/cfdisk.c:2072
+msgid "Print the table ordered by sectors"
+msgstr "Vis tabellen ordnet efter sektorer"
+
+#: fdisk/cfdisk.c:2073
+msgid "Table"
+msgstr "Tabel"
+
+#: fdisk/cfdisk.c:2073
+msgid "Just print the partition table"
+msgstr "Vis kun partitionstabellen"
+
+#: fdisk/cfdisk.c:2074
+msgid "Don't print the table"
+msgstr "Vis ikke tabellen"
+
+#: fdisk/cfdisk.c:2102
+msgid "Help Screen for cfdisk"
+msgstr "Hj�lpesk�rm for cfdisk"
+
+#: fdisk/cfdisk.c:2104
+msgid "This is cfdisk, a curses based disk partitioning program, which"
+msgstr "Dette er cfdisk, et curses-baseret diskpartitionerings-program, som"
+
+#: fdisk/cfdisk.c:2105
+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:2106
+msgid "disk drive."
+msgstr "harddisk."
+
+#: fdisk/cfdisk.c:2108
+msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
+
+#: fdisk/cfdisk.c:2110
+msgid "Command      Meaning"
+msgstr "Kommando     Betydning"
+
+#: fdisk/cfdisk.c:2111
+msgid "-------      -------"
+msgstr "-------      -------"
+
+#: fdisk/cfdisk.c:2112
+msgid "  b          Toggle bootable flag of the current partition"
+msgstr "  b          Skift opstartbar-flaget for partitionen ('bootable')"
+
+#: fdisk/cfdisk.c:2113
+msgid "  d          Delete the current partition"
+msgstr "  d          Slet partitionen"
+
+#: fdisk/cfdisk.c:2114
+msgid "  g          Change cylinders, heads, sectors-per-track parameters"
+msgstr "  g          Ret cylinder, hoved, sektorer-per-spor parametre"
+
+#: fdisk/cfdisk.c:2115
+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:2116
+msgid "             know what they are doing."
+msgstr "             er klar over, hvad de g�r."
+
+#: fdisk/cfdisk.c:2117
+msgid "  h          Print this screen"
+msgstr "  h          Vis denne sk�rm"
+
+#: fdisk/cfdisk.c:2118
+msgid "  m          Maximize disk usage of the current partition"
+msgstr "  m          Maksim�r partitionens diskforbrug"
+
+#: fdisk/cfdisk.c:2119
+msgid "             Note: This may make the partition incompatible with"
+msgstr "             Bem�rk: Dette kan g�re partitionen inkompatibel med"
+
+#: fdisk/cfdisk.c:2120
+msgid "             DOS, OS/2, ..."
+msgstr "             DOS, OS/2, ..."
+
+#: fdisk/cfdisk.c:2121
+msgid "  n          Create new partition from free space"
+msgstr "  n          Opret ny partition i frit omr�de"
+
+#: fdisk/cfdisk.c:2122
+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:2123
+msgid "             There are several different formats for the partition"
+msgstr "             Der er flere forskellige formater p� partitionen,"
+
+#: fdisk/cfdisk.c:2124
+msgid "             that you can choose from:"
+msgstr "             som du kan v�lge mellem:"
+
+#: fdisk/cfdisk.c:2125
+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:2126
+msgid "                s - Table ordered by sectors"
+msgstr "                s - Tabel ordnet efter sektorer"
+
+#: fdisk/cfdisk.c:2127
+msgid "                t - Table in raw format"
+msgstr "                t - Tabel i r�data format"
+
+#: fdisk/cfdisk.c:2128
+msgid "  q          Quit program without writing partition table"
+msgstr "  q          Afslut program uden at skrive partitionstabellen"
+
+#: fdisk/cfdisk.c:2129
+msgid "  t          Change the filesystem type"
+msgstr "  t          Skift filsystem type"
+
+#: fdisk/cfdisk.c:2130
+msgid "  u          Change units of the partition size display"
+msgstr "  u          Skift enhed for visning af partitionsst�rrelser"
+
+#: fdisk/cfdisk.c:2131
+msgid "             Rotates through MB, sectors and cylinders"
+msgstr "             Skifter mellem MB, sektorer og cylindrer"
+
+#: fdisk/cfdisk.c:2132
+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:2133
+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:2134
+msgid "             either confirm or deny the write by entering `yes' or"
+msgstr "             bekr�fte eller afvise ved at skrive henholdsvis 'ja'"
+
+#: fdisk/cfdisk.c:2135
+msgid "             `no'"
+msgstr "             eller 'nej'"
+
+#: fdisk/cfdisk.c:2136
+msgid "Up Arrow     Move cursor to the previous partition"
+msgstr "Pil op       Flyt mark�ren til forrige partition"
+
+#: fdisk/cfdisk.c:2137
+msgid "Down Arrow   Move cursor to the next partition"
+msgstr "Pil ned      Flyt mark�ren til n�ste partition"
+
+#: fdisk/cfdisk.c:2138
+msgid "CTRL-L       Redraws the screen"
+msgstr "CTRL-L       Gentegner sk�rmen"
+
+#: fdisk/cfdisk.c:2139
+msgid "  ?          Print this screen"
+msgstr "  ?          Vis denne sk�rm"
+
+#: fdisk/cfdisk.c:2141
+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:2142
+msgid "case letters (except for Writes)."
+msgstr "bogstaver (undtagen W)."
+
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
+msgid "Cylinders"
+msgstr "Cylindre"
+
+#: fdisk/cfdisk.c:2172
+msgid "Change cylinder geometry"
+msgstr "Skift cylindergeometri"
+
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
+msgid "Heads"
+msgstr "Hoveder"
+
+#: fdisk/cfdisk.c:2173
+msgid "Change head geometry"
+msgstr "Skift hovedgeometri"
+
+#: fdisk/cfdisk.c:2174
+msgid "Change sector geometry"
+msgstr "Skift sektorgeometri"
+
+#: fdisk/cfdisk.c:2175
+msgid "Done"
+msgstr "F�rdig"
+
+#: fdisk/cfdisk.c:2175
+msgid "Done with changing geometry"
+msgstr "F�rdig med geometri�ndring"
+
+#: fdisk/cfdisk.c:2188
+msgid "Enter the number of cylinders: "
+msgstr "Angiv antallet af cylindre: "
+
+#: fdisk/cfdisk.c:2200 fdisk/cfdisk.c:2762
+msgid "Illegal cylinders value"
+msgstr "Ugyldigt cylinderantal"
+
+#: fdisk/cfdisk.c:2206
+msgid "Enter the number of heads: "
+msgstr "Angiv antallet af hoveder: "
+
+#: fdisk/cfdisk.c:2213 fdisk/cfdisk.c:2772
+msgid "Illegal heads value"
+msgstr "Ugyldig hovedantal"
+
+#: fdisk/cfdisk.c:2219
+msgid "Enter the number of sectors per track: "
+msgstr "Angiv antallet af sektorer per spor: "
+
+#: fdisk/cfdisk.c:2226 fdisk/cfdisk.c:2779
+msgid "Illegal sectors value"
+msgstr "Ugyldig sektorantal"
+
+#: fdisk/cfdisk.c:2329
+msgid "Enter filesystem type: "
+msgstr "Angiv filsystemtype: "
+
+#: fdisk/cfdisk.c:2347
+msgid "Cannot change FS Type to empty"
+msgstr "Kn ikke �ndre FS type til tom"
+
+#: fdisk/cfdisk.c:2349
+msgid "Cannot change FS Type to extended"
+msgstr "Kan ikke �ndre FS type til udvidet"
+
+#: fdisk/cfdisk.c:2377 fdisk/fdisksunlabel.c:44
+msgid "Boot"
+msgstr "Opstart"
+
+#: fdisk/cfdisk.c:2379
+#, c-format
+msgid "Unk(%02X)"
+msgstr "Ukt(%02X)"
+
+#: fdisk/cfdisk.c:2382 fdisk/cfdisk.c:2385
+msgid ", NC"
+msgstr ", NC"
+
+#: fdisk/cfdisk.c:2390 fdisk/cfdisk.c:2393
+msgid "NC"
+msgstr "NC"
+
+#: fdisk/cfdisk.c:2401
+msgid "Pri/Log"
+msgstr "Pri/Log"
+
+#: fdisk/cfdisk.c:2477
+#, c-format
+msgid "Disk Drive: %s"
+msgstr "Drev: %s"
+
+#: fdisk/cfdisk.c:2480
+#, c-format
+msgid "Size: %lld bytes"
+msgstr "St�rrelse: %lld byte"
+
+#: fdisk/cfdisk.c:2482
+#, c-format
+msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
+msgstr "Hoveder: %d   Sektorer per spor: %d   Cylindre: %d"
+
+#: fdisk/cfdisk.c:2486
+msgid "Name"
+msgstr "Navn"
+
+#: fdisk/cfdisk.c:2487
+msgid "Flags"
+msgstr "Flag"
+
+#: fdisk/cfdisk.c:2488
+msgid "Part Type"
+msgstr "Part-type"
+
+#: fdisk/cfdisk.c:2489
+msgid "FS Type"
+msgstr "FS-type"
+
+#: fdisk/cfdisk.c:2490
+msgid "[Label]"
+msgstr "[M�rkat]"
+
+#: fdisk/cfdisk.c:2492
+msgid "  Sectors"
+msgstr "  Sektorer"
+
+#: fdisk/cfdisk.c:2496
+msgid "Size (MB)"
+msgstr "St�rrelse (MB)"
+
+#: fdisk/cfdisk.c:2498
+msgid "Size (GB)"
+msgstr "St�rrelse (GB)"
+
+#: fdisk/cfdisk.c:2553
+msgid "Bootable"
+msgstr "Opstartbar"
+
+#: fdisk/cfdisk.c:2553
+msgid "Toggle bootable flag of the current partition"
+msgstr "Skift opstartbar-flaget for partitionen ('bootable')"
+
+#: fdisk/cfdisk.c:2554
+msgid "Delete"
+msgstr "Slet"
+
+#: fdisk/cfdisk.c:2554
+msgid "Delete the current partition"
+msgstr "Slet partitionen"
+
+#: fdisk/cfdisk.c:2555
+msgid "Geometry"
+msgstr "Geometri"
+
+#: fdisk/cfdisk.c:2555
+msgid "Change disk geometry (experts only)"
+msgstr "Skift diskgeometri (kun for eksperter)"
+
+#: fdisk/cfdisk.c:2556
+msgid "Help"
+msgstr "Hj�lp"
+
+#: fdisk/cfdisk.c:2556
+msgid "Print help screen"
+msgstr "Vis hj�lpesk�rm"
+
+#: fdisk/cfdisk.c:2557
+msgid "Maximize"
+msgstr "Maksim�r"
+
+#: fdisk/cfdisk.c:2557
+msgid "Maximize disk usage of the current partition (experts only)"
+msgstr "Maxim�r diskforbruget for partitionen (kun for eksperter)"
+
+#: fdisk/cfdisk.c:2558
+msgid "New"
+msgstr "Ny"
+
+#: fdisk/cfdisk.c:2558
+msgid "Create new partition from free space"
+msgstr "Opret ny partition i frit omr�de"
+
+#: fdisk/cfdisk.c:2559
+msgid "Print"
+msgstr "Udl�s"
+
+#: fdisk/cfdisk.c:2559
+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:2560
+msgid "Quit"
+msgstr "Afslut"
+
+#: fdisk/cfdisk.c:2560
+msgid "Quit program without writing partition table"
+msgstr "Afslut program uden at �ndre partitionstabellen"
+
+#: fdisk/cfdisk.c:2561
+msgid "Type"
+msgstr "Type"
+
+#: fdisk/cfdisk.c:2561
+msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
+msgstr "Skift filsystemtype (DOS, Linux, OS/2 osv.)"
+
+#: fdisk/cfdisk.c:2562
+msgid "Units"
+msgstr "Enheder"
+
+#: fdisk/cfdisk.c:2562
+msgid "Change units of the partition size display (MB, sect, cyl)"
+msgstr "Skift enheder for visning af partitionstabellen (MB, sekt, cyl)"
+
+#: fdisk/cfdisk.c:2563
+msgid "Write"
+msgstr "Skriv"
+
+#: fdisk/cfdisk.c:2563
+msgid "Write partition table to disk (this might destroy data)"
+msgstr "Skriv partitionstabellen til disk (dette kan �del�gge data)"
+
+#: fdisk/cfdisk.c:2609
+msgid "Cannot make this partition bootable"
+msgstr "Kan ikke g�re denne partition opstartbar"
+
+#: fdisk/cfdisk.c:2619
+msgid "Cannot delete an empty partition"
+msgstr "Kan ikke slette en tom partition"
+
+#: fdisk/cfdisk.c:2639 fdisk/cfdisk.c:2641
+msgid "Cannot maximize this partition"
+msgstr "Kan ikke maksimere denne partition"
+
+#: fdisk/cfdisk.c:2649
+msgid "This partition is unusable"
+msgstr "Denne partition er ubrugelig"
+
+#: fdisk/cfdisk.c:2651
+msgid "This partition is already in use"
+msgstr "Denne partition er allerede i brug"
+
+#: fdisk/cfdisk.c:2668
+msgid "Cannot change the type of an empty partition"
+msgstr "Kan ikke �ndre en tom partitions type"
+
+#: fdisk/cfdisk.c:2695 fdisk/cfdisk.c:2701
+msgid "No more partitions"
+msgstr "Ikke flere partitioner"
+
+#: fdisk/cfdisk.c:2708
+msgid "Illegal command"
+msgstr "Ugyldig kommando"
+
+#: fdisk/cfdisk.c:2718
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
+
+#. Unfortunately, xgettext does not handle multi-line strings
+#. so, let's use explicit \n's instead
+#: fdisk/cfdisk.c:2725
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+"Print version:\n"
+"        %s -v\n"
+"Print partition table:\n"
+"        %s -P {r|s|t} [options] device\n"
+"Interactive use:\n"
+"        %s [options] device\n"
+"\n"
+"Options:\n"
+"-a: Use arrow instead of highlighting;\n"
+"-z: Start with a zero partition table, instead of reading the pt from disk;\n"
+"-c C -h H -s S: Override the kernel's idea of the number of cylinders,\n"
+"                the number of heads and the number of sectors/track.\n"
+"\n"
+msgstr ""
+"\n"
+"Brug:\n"
+"Vis version:\n"
+"        %s -v\n"
+"Vi partitionstabellen:\n"
+"        %s -P {r|s|t} [tilvalg] enhed\n"
+"Interaktivt brug:\n"
+"        %s [tilvalg] enhed\n"
+"\n"
+"Tilvalg:\n"
+"-a: Brug pil i stedet for baggrundsfyld;\n"
+"-z: Ster med en tom partitionstabel i stedet for at l�se diskens;\n"
+"-c C -h H -s S: Underkend kernens ide om antallet af cylindre,\n"
+"                hoveder og sektorer/spor.\n"
+"\n"
+
+#: fdisk/fdiskaixlabel.c:28
+msgid ""
+"\n"
+"\tThere is a valid AIX label on this disk.\n"
+"\tUnfortunately Linux cannot handle these\n"
+"\tdisks at the moment.  Nevertheless some\n"
+"\tadvice:\n"
+"\t1. fdisk will destroy its contents on write.\n"
+"\t2. Be sure that this disk is NOT a still vital\n"
+"\t   part of a volume group. (Otherwise you may\n"
+"\t   erase the other disks as well, if unmirrored.)\n"
+"\t3. Before deleting this physical volume be sure\n"
+"\t   to remove the disk logically from your AIX\n"
+"\t   machine.  (Otherwise you become an AIXpert)."
+msgstr ""
+"\n"
+"\tDer er et gyldig AIX-m�rkat p� denne disk.\n"
+"\tDesv�rre kan Linux endnu ikke arbejde med disse\n"
+"\tdiske. Alligevel er her nogle gode r�d:\n"
+"\t1. fdisk vil �del�gge dens indhold n�r du gemmer.\n"
+"\t2. V�r sikker p� at denne disk IKKE er en vital\n"
+"\t   del af en bind-gruppe. (Ellers kan du ogs� slette\n"
+"\t   de andre diske, hvis de ikke er spejlede.)\n"
+"\t3. F�r du sletter dette fysiske bind, v�r sikker p�\n"
+"\t   at du fjerne disken logisk fra din AIX maskine.\n"
+"\t   (Ellers bliver du en AIXpert)."
+
+#: fdisk/fdiskbsdlabel.c:117
+#, c-format
+msgid ""
+"\n"
+"BSD label for device: %s\n"
+msgstr ""
+"\n"
+"BSD-m�rkat for enhed: %s\n"
+
+#: fdisk/fdisk.c:312 fdisk/fdisk.c:331 fdisk/fdisk.c:349 fdisk/fdisk.c:356
+#: fdisk/fdisk.c:379 fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
+#: fdisk/fdiskbsdlabel.c:124
+msgid "Command action"
+msgstr "Kommando beskrivelse"
+
+#: fdisk/fdiskbsdlabel.c:125
+msgid "   d   delete a BSD partition"
+msgstr "   d    slet en BSD-partition"
+
+#: fdisk/fdiskbsdlabel.c:126
+msgid "   e   edit drive data"
+msgstr "   e    redig�r drev-data"
+
+#: fdisk/fdiskbsdlabel.c:127
+msgid "   i   install bootstrap"
+msgstr "   i    installer opstarts-igangs�tter ('bootstrap')"
+
+#: fdisk/fdiskbsdlabel.c:128
+msgid "   l   list known filesystem types"
+msgstr "   l    vis liste over filsystemtyper"
+
+#. sun
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:350 fdisk/fdisk.c:362
+#: fdisk/fdisk.c:387 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
+#: fdisk/fdiskbsdlabel.c:129
+msgid "   m   print this menu"
+msgstr "   m    vis denne menu"
+
+#: fdisk/fdiskbsdlabel.c:130
+msgid "   n   add a new BSD partition"
+msgstr "   n    tilf�j en ny BSD-partition"
+
+#: fdisk/fdiskbsdlabel.c:131
+msgid "   p   print BSD partition table"
+msgstr "   p    vis BSD-partitionstabel"
+
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   q   quit without saving changes"
+msgstr "   q    afslut uden at gemme �ndringerne"
+
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   r   return to main menu"
+msgstr "   r    return�r til hovedmenuen"
+
+#: fdisk/fdiskbsdlabel.c:134
+msgid "   s   show complete disklabel"
+msgstr "   s    vis hele diskm�rkatet"
+
+#: fdisk/fdiskbsdlabel.c:135
+msgid "   t   change a partition's filesystem id"
+msgstr "   t    �ndr filsystem-id for en partition"
+
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u    skift enheder (cylindre/sektorer)"
+
+#: fdisk/fdiskbsdlabel.c:137
+msgid "   w   write disklabel to disk"
+msgstr "   w    skriv diskm�rkatet til disken"
+
+#: fdisk/fdiskbsdlabel.c:139
+msgid "   x   link BSD partition to non-BSD partition"
+msgstr "   x   l�nk en BSD-partition til en ikke-BSD-partition"
+
+#: fdisk/fdiskbsdlabel.c:168
+#, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "Partition %s har en ugyldig startsektor 0.\n"
+
+#: fdisk/fdiskbsdlabel.c:172
+#, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "L�ser diskm�rkat for %s fra sektor %d.\n"
+
+#: fdisk/fdiskbsdlabel.c:182
+#, c-format
+msgid "There is no *BSD partition on %s.\n"
+msgstr "Der er ingen *BSD-partitioner p� %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:196
+msgid "BSD disklabel command (m for help): "
+msgstr "BSD-diskm�rkat kommando (m for hj�lp): "
+
+#: fdisk/fdisk.c:1644 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:517
+#, c-format
+msgid "First %s"
+msgstr "F�rste %s"
+
+#: fdisk/fdisk.c:1703 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "Sidste %s eller +st�rrelse eller +st�rrelseM eller +st�rrelseK"
+
+#: fdisk/fdiskbsdlabel.c:310
+#, c-format
+msgid "type: %s\n"
+msgstr "type: %s\n"
+
+#: fdisk/fdiskbsdlabel.c:312
+#, c-format
+msgid "type: %d\n"
+msgstr "type: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:313
+#, c-format
+msgid "disk: %.*s\n"
+msgstr "disk: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:314
+#, c-format
+msgid "label: %.*s\n"
+msgstr "m�rkat: %.*s\n"
+
+#: fdisk/fdiskbsdlabel.c:315
+msgid "flags:"
+msgstr "flag:"
+
+#: fdisk/fdiskbsdlabel.c:317
+msgid " removable"
+msgstr " flytbar"
+
+#: fdisk/fdiskbsdlabel.c:319
+msgid " ecc"
+msgstr " ecc"
+
+#: fdisk/fdiskbsdlabel.c:321
+msgid " badsect"
+msgstr " fjlsekt"
+
+#. On various machines the fields of *lp are short/int/long
+#. In order to avoid problems, we cast them all to long.
+#: fdisk/fdiskbsdlabel.c:325
+#, c-format
+msgid "bytes/sector: %ld\n"
+msgstr "byte/sektor: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:326
+#, c-format
+msgid "sectors/track: %ld\n"
+msgstr "sektorer/spor: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:327
+#, c-format
+msgid "tracks/cylinder: %ld\n"
+msgstr "spor/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:328
+#, c-format
+msgid "sectors/cylinder: %ld\n"
+msgstr "sektorer/cylinder: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:329
+#, c-format
+msgid "cylinders: %ld\n"
+msgstr "cylindre: %ld\n"
+
+#: fdisk/fdiskbsdlabel.c:330
+#, c-format
+msgid "rpm: %d\n"
+msgstr "omdr. per minut: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:331
+#, c-format
+msgid "interleave: %d\n"
+msgstr "interleave: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:332
+#, c-format
+msgid "trackskew: %d\n"
+msgstr "sporafvigelse: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:333
+#, c-format
+msgid "cylinderskew: %d\n"
+msgstr "cylinderafvigelse: %d\n"
+
+#: fdisk/fdiskbsdlabel.c:334
+#, c-format
+msgid "headswitch: %ld\t\t# milliseconds\n"
+msgstr "hovedskift: %ld\t\t# millisekunder\n"
+
+#: fdisk/fdiskbsdlabel.c:336
+#, c-format
+msgid "track-to-track seek: %ld\t# milliseconds\n"
+msgstr "spor-til-spor s�gning: %ld\t# millisekunder\n"
+
+#: fdisk/fdiskbsdlabel.c:338
+msgid "drivedata: "
+msgstr "drevdata: "
+
+#: fdisk/fdiskbsdlabel.c:347
+#, c-format
+msgid ""
+"\n"
+"%d partitions:\n"
+msgstr ""
+"\n"
+"%d partitioner:\n"
+
+#: fdisk/fdiskbsdlabel.c:348
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr "#       start       slut     st�rr.   fstype   [fstr. bstr.   cpg]\n"
+
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
+#, c-format
+msgid "Writing disklabel to %s.\n"
+msgstr "Skiver diskm�rkat til %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
+#, c-format
+msgid "%s contains no disklabel.\n"
+msgstr "%s har intet diskm�rkat.\n"
+
+#: fdisk/fdiskbsdlabel.c:419
+msgid "Do you want to create a disklabel? (y/n) "
+msgstr "Vil du oprette et diskm�rkat? (j/n) "
+
+#: fdisk/fdiskbsdlabel.c:458
+msgid "bytes/sector"
+msgstr "byte/sektor"
+
+#: fdisk/fdiskbsdlabel.c:459
+msgid "sectors/track"
+msgstr "sektorer/spor"
+
+#: fdisk/fdiskbsdlabel.c:460
+msgid "tracks/cylinder"
+msgstr "spor/cylinder"
+
+#: fdisk/fdisk.c:551 fdisk/fdisk.c:1067 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
+msgid "cylinders"
+msgstr "cylindre"
+
+#: fdisk/fdiskbsdlabel.c:468
+msgid "sectors/cylinder"
+msgstr "sektorer/cylinder"
+
+#: fdisk/fdiskbsdlabel.c:472
+msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
+msgstr "Skal v�re <= sektorer/spor * spor/cylinder (standard).\n"
+
+#: fdisk/fdiskbsdlabel.c:474
+msgid "rpm"
+msgstr "omdr. per minut"
+
+#: fdisk/fdiskbsdlabel.c:475
+msgid "interleave"
+msgstr "interleave"
+
+#: fdisk/fdiskbsdlabel.c:476
+msgid "trackskew"
+msgstr "sporafvigelse"
+
+#: fdisk/fdiskbsdlabel.c:477
+msgid "cylinderskew"
+msgstr "cylinderafvigelse"
+
+#: fdisk/fdiskbsdlabel.c:478
+msgid "headswitch"
+msgstr "hovedskift"
+
+#: fdisk/fdiskbsdlabel.c:479
+msgid "track-to-track seek"
+msgstr "spor-til-spor s�gning"
+
+#: fdisk/fdiskbsdlabel.c:520
+#, c-format
+msgid "Bootstrap: %sboot -> boot%s (%s): "
+msgstr "Opstarts-igangs�tter: %sopstart -> opstart%s (%s): "
+
+#: fdisk/fdiskbsdlabel.c:546
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Opstarts-igangs�tter overlapper med diskm�rkatet!\n"
+
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Opstarts-igangs�tter installeret p� %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:591
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "Partition (a-%c): "
+
+#: fdisk/fdisk.c:1776 fdisk/fdiskbsdlabel.c:611
+msgid "The maximum number of partitions has been created\n"
+msgstr "Det maksimale antal partitioner er blevet oprettet\n"
+
+#: fdisk/fdiskbsdlabel.c:622
+msgid "This partition already exists.\n"
+msgstr "Denne partition eksisterer allerede.\n"
+
+#: fdisk/fdiskbsdlabel.c:742
+#, c-format
+msgid "Warning: too many partitions (%d, maximum is %d).\n"
+msgstr "Advarsel: for mange partitioner (%d, maksimum er %d).\n"
+
+#: fdisk/fdiskbsdlabel.c:789
+msgid ""
+"\n"
+"Syncing disks.\n"
+msgstr ""
+"\n"
+"Syncing disks.\n"
+
+#: fdisk/fdisk.c:205
+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 drives) 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:217
+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:225
+#, c-format
+msgid "Unable to open %s\n"
+msgstr "Kunne ikke �bne %s\n"
+
+#: fdisk/fdisk.c:228
+#, c-format
+msgid "Unable to read %s\n"
+msgstr "Kunne ikke l�se %s\n"
+
+#: fdisk/fdisk.c:231
+#, c-format
+msgid "Unable to seek on %s\n"
+msgstr "Kunne ikke s�ge til %s\n"
+
+#: fdisk/fdisk.c:234
+#, c-format
+msgid "Unable to write %s\n"
+msgstr "Kunne ikke skrive %s\n"
+
+#: fdisk/fdisk.c:237
+#, c-format
+msgid "BLKGETSIZE ioctl failed on %s\n"
+msgstr "BLKGETSIZE ioctl mislykkedes p� %s\n"
+
+#: fdisk/fdisk.c:241
+msgid "Unable to allocate any more memory\n"
+msgstr "Kunne ikke allokere mere hukommelse\n"
+
+#: fdisk/fdisk.c:243
+msgid "Fatal error\n"
+msgstr "Fatal fejl\n"
+
+#: fdisk/fdisk.c:313
+msgid "   a   toggle a read only flag"
+msgstr "   a    skift et skrivebeskyttelses-flag"
+
+#. sun
+#: fdisk/fdisk.c:314 fdisk/fdisk.c:358
+msgid "   b   edit bsd disklabel"
+msgstr "   b    skift bsd-diskm�rkat"
+
+#: fdisk/fdisk.c:315
+msgid "   c   toggle the mountable flag"
+msgstr "   c    skift mont�rbart-flag"
+
+#. sun
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
+msgid "   d   delete a partition"
+msgstr "   d    slet en partition"
+
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:361
+msgid "   l   list known partition types"
+msgstr "   l    vis liste over kendte partitionstyper"
+
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:363
+msgid "   n   add a new partition"
+msgstr "   n    tilf�j en ny partition"
+
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:351 fdisk/fdisk.c:364
+msgid "   o   create a new empty DOS partition table"
+msgstr "   o    opret en ny, tom DOS-partitionstabel"
+
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365 fdisk/fdisk.c:388
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
+msgid "   p   print the partition table"
+msgstr "   p    vis partitionstabellen"
+
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:353 fdisk/fdisk.c:367
+msgid "   s   create a new empty Sun disklabel"
+msgstr "   s    opret en ny, tom Sun-diskm�rkat"
+
+#. sun
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
+msgid "   t   change a partition's system id"
+msgstr "   t    skift system-id for en partition"
+
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369
+msgid "   u   change display/entry units"
+msgstr "   u    skift enheder for visning/indtastning"
+
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
+msgid "   v   verify the partition table"
+msgstr "   v    verific�r partitionstabellen"
+
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371 fdisk/fdisk.c:393
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
+msgid "   w   write table to disk and exit"
+msgstr "   w    skriv partitionstabel til disk og afslut"
+
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:372
+msgid "   x   extra functionality (experts only)"
+msgstr "   x    ekstra funktionalitet (kun for eksperter)"
+
+#: fdisk/fdisk.c:332
+msgid "   a   select bootable partition"
+msgstr "   a    v�lg en opstartbar partition"
+
+#. sgi flavour
+#: fdisk/fdisk.c:333
+msgid "   b   edit bootfile entry"
+msgstr "   b    redig�r indgang i opstartsfil"
+
+#. sgi
+#: fdisk/fdisk.c:334
+msgid "   c   select sgi swap partition"
+msgstr "   c    v�lg sgi swap-partition"
+
+#: fdisk/fdisk.c:357
+msgid "   a   toggle a bootable flag"
+msgstr "   a    skift opstartbar-flaget"
+
+#: fdisk/fdisk.c:359
+msgid "   c   toggle the dos compatibility flag"
+msgstr "   c    skift DOS-kompatilitets-flaget"
+
+#: fdisk/fdisk.c:380
+msgid "   a   change number of alternate cylinders"
+msgstr "   a    �ndr antallet af alternative cylindre"
+
+#. sun
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
+msgid "   c   change number of cylinders"
+msgstr "   c    �ndr antallet af cylindre"
+
+#: fdisk/fdisk.c:382 fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
+msgid "   d   print the raw data in the partition table"
+msgstr "   d    vis r�dataene fra partitionstabellen"
+
+#: fdisk/fdisk.c:383
+msgid "   e   change number of extra sectors per cylinder"
+msgstr "   e    �ndr antallet af ekstra sektorer per cylinder"
+
+#. sun
+#: fdisk/fdisk.c:384 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+msgid "   h   change number of heads"
+msgstr "   h    �ndr antallet af hoveder"
+
+#: fdisk/fdisk.c:385
+msgid "   i   change interleave factor"
+msgstr "   i   �ndr interleavefaktor"
+
+#. sun
+#: fdisk/fdisk.c:386
+msgid "   o   change rotation speed (rpm)"
+msgstr "   o    �ndr rotationshastighed (omdr. per minut)"
+
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
+msgid "   s   change number of sectors/track"
+msgstr "   s    �ndr antallet af sektorer/spor"
+
+#: fdisk/fdisk.c:394
+msgid "   y   change number of physical cylinders"
+msgstr "   y   �ndr antallet af fysiske cylindre"
+
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
+msgid "   b   move beginning of data in a partition"
+msgstr "   b    flyt starten p� data i en partition"
+
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
+msgid "   e   list extended partitions"
+msgstr "   e    vis udvidede partitioner"
+
+#. !sun
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
+msgid "   g   create an IRIX partition table"
+msgstr "   g    opret en IRIX partitionstabel"
+
+#. !sun
+#: fdisk/fdisk.c:434
+msgid "   f   fix partition order"
+msgstr "   f    ordn partitionsr�kkef�lgen"
+
+#: fdisk/fdisk.c:533
+msgid "You must set"
+msgstr "Du skal angive"
+
+#: fdisk/fdisk.c:547
+msgid "heads"
+msgstr "hoveder"
+
+#: fdisk/fdisk.c:549 fdisk/fdisk.c:1067 fdisk/sfdisk.c:864
+msgid "sectors"
+msgstr "sektorer"
+
+#: fdisk/fdisk.c:555
+#, c-format
+msgid ""
+"%s%s.\n"
+"You can do this from the extra functions menu.\n"
+msgstr ""
+"%s%s.\n"
+"Dette kan du g�re fra menuen 'Ekstra funktioner'.\n"
+
+#: fdisk/fdisk.c:556
+msgid " and "
+msgstr " og "
+
+#: fdisk/fdisk.c:596
+msgid "Bad offset in primary extended partition\n"
+msgstr "Ugyldig forskydning i prim�r udvidet partition\n"
+
+#: fdisk/fdisk.c:610
+#, c-format
+msgid "Warning: deleting partitions after %d\n"
+msgstr "Advarsel: sleter partitioner efter %d\n"
+
+#: fdisk/fdisk.c:626
+#, 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:634
+#, c-format
+msgid "Warning: ignoring extra data in partition table %d\n"
+msgstr "Advarsel: ignorerer ekstra data i partitionstabel %d\n"
+
+#: fdisk/fdisk.c:678
+msgid ""
+"Building a new DOS disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content won't be recoverable.\n"
+"\n"
+msgstr ""
+"Opretter et ny DOS diskm�rkat. �ndringer vil holdes i hukommelsen,\n"
+"indtil du bestemmer dig for at gemme dem. Derefter kan det tidligere\n"
+"indhold naturligvis ikke genskabes\n"
+"\n"
+
+#: fdisk/fdisk.c:721
+#, c-format
+msgid "Note: sector size is %d (not %d)\n"
+msgstr "Bem�rk: sektorst�rrelsen er %d (ikke %d)\n"
+
+#: fdisk/fdisk.c:804
+msgid "You will not be able to write the partition table.\n"
+msgstr "Du vil ikke kunne gemme partitionstabellen.\n"
+
+#: fdisk/fdisk.c:832
+msgid ""
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
+"disklabel\n"
+msgstr ""
+"Enheden indeholder hverken en gyldig DOS-partitionstabel eller et Sun-, SGI- "
+"eller OSF-diskm�rkat.\n"
+
+#: fdisk/fdisk.c:848
+msgid "Internal error\n"
+msgstr "Intern fejl\n"
+
+#: fdisk/fdisk.c:870
+#, c-format
+msgid "Ignoring extra extended partition %d\n"
+msgstr "Ignorerer ekstra udvidet partition %d\n"
+
+#: fdisk/fdisk.c:882
+#, c-format
+msgid ""
+"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
+"w(rite)\n"
+msgstr ""
+"Advarsel: ugyldigt flag 0x%04x for partitionstabel %d vil blive rettet med "
+"'w' (skriv)\n"
+
+#: fdisk/fdisk.c:904
+msgid ""
+"\n"
+"got EOF thrice - exiting..\n"
+msgstr ""
+"\n"
+"fik filslut (EOF) tre gange - afslutter..\n"
+
+#: fdisk/fdisk.c:942
+msgid "Hex code (type L to list codes): "
+msgstr "Hex-kode (tryk L for en liste over koderne): "
+
+#: fdisk/fdisk.c:981
+#, c-format
+msgid "%s (%d-%d, default %d): "
+msgstr "%s (%d-%d, standard %d): "
+
+#: fdisk/fdisk.c:1035
+#, c-format
+msgid "Using default value %d\n"
+msgstr "Bruger standard-v�rdi %d\n"
+
+#: fdisk/fdisk.c:1039
+msgid "Value out of range.\n"
+msgstr "V�rdi udenfor omr�det.\n"
+
+#: fdisk/fdisk.c:1049
+msgid "Partition number"
+msgstr "Partitionsnummer"
+
+#: fdisk/fdisk.c:1058
+#, c-format
+msgid "Warning: partition %d has empty type\n"
+msgstr "Advarsel: partition %d er af typen 'tom'\n"
+
+#: fdisk/fdisk.c:1065
+msgid "cylinder"
+msgstr "cylinder"
+
+#: fdisk/fdisk.c:1065
+msgid "sector"
+msgstr "sektor"
+
+#: fdisk/fdisk.c:1074
+#, c-format
+msgid "Changing display/entry units to %s\n"
+msgstr "Skifter enheder for visning/indtastning til %s\n"
+
+#: fdisk/fdisk.c:1085
+#, c-format
+msgid "WARNING: Partition %d is an extended partition\n"
+msgstr "ADVARSEL: Partition %d er en udvidet partition\n"
+
+#: fdisk/fdisk.c:1096
+msgid "DOS Compatibility flag is set\n"
+msgstr "DOS-kompatilitetsflag er sat\n"
+
+#: fdisk/fdisk.c:1100
+msgid "DOS Compatibility flag is not set\n"
+msgstr "DOS-kompatilitetsflag er ikke sat\n"
+
+#: fdisk/fdisk.c:1188
+#, c-format
+msgid "Partition %d does not exist yet!\n"
+msgstr "Partition %d eksisterer ikke endnu!\n"
+
+#: fdisk/fdisk.c:1193
+msgid ""
+"Type 0 means free space to many systems\n"
+"(but not to Linux). Having partitions of\n"
+"type 0 is probably unwise. You can delete\n"
+"a partition using the `d' command.\n"
+msgstr ""
+"Type 0 betyder frit omr�de for mange systemer\n"
+"(men ikke for Linux). At have type 0 partitioner\n"
+"er nok uklogt. Du kan slette en partition med\n"
+"'d'-kommandoen.\n"
+
+#: fdisk/fdisk.c:1202
+msgid ""
+"You cannot change a partition into an extended one or vice versa\n"
+"Delete it first.\n"
+msgstr ""
+"Du kan ikke �ndre en partition mellem at v�re udvidet eller ikke-udvidet\n"
+"Slet den f�rst.\n"
+
+#: fdisk/fdisk.c:1211
+msgid ""
+"Consider leaving partition 3 as Whole disk (5),\n"
+"as SunOS/Solaris expects it and even Linux likes it.\n"
+"\n"
+msgstr ""
+"Overvej at lade partition 3 v�re 'Hel disk' (5), da\n"
+"SunOS/Solaris forventer det og selv Linux foretr�kker det.\n"
+"\n"
+
+#: fdisk/fdisk.c:1217
+msgid ""
+"Consider leaving partition 9 as volume header (0),\n"
+"and partition 11 as entire volume (6)as IRIX expects it.\n"
+"\n"
+msgstr ""
+"Overvej at lade partition 9 v�re disk-hovede ('volume header') (0),\n"
+"og partition 11 som 'entire volume' (6), da IRIX forventer det.\n"
+"\n"
+
+#: fdisk/fdisk.c:1231
+#, 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:1282
+#, 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:1284 fdisk/fdisk.c:1292 fdisk/fdisk.c:1301 fdisk/fdisk.c:1310
+#, c-format
+msgid "     phys=(%d, %d, %d) "
+msgstr "     fys=(%d, %d, %d) "
+
+#: fdisk/fdisk.c:1285 fdisk/fdisk.c:1293
+#, c-format
+msgid "logical=(%d, %d, %d)\n"
+msgstr "logisk=(%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1290
+#, c-format
+msgid "Partition %d has different physical/logical endings:\n"
+msgstr "Partition %d har forskellig fysisk/logisk endelse:\n"
+
+#: fdisk/fdisk.c:1299
+#, 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:1302
+#, c-format
+msgid "should be (%d, %d, 1)\n"
+msgstr "burde v�re (%d, %d, 1)\n"
+
+#: fdisk/fdisk.c:1308
+#, c-format
+msgid "Partition %i does not end on cylinder boundary:\n"
+msgstr "Partition %i slutter ikke p� en cylinder-gr�nse:\n"
+
+#: fdisk/fdisk.c:1311
+#, c-format
+msgid "should be (%d, %d, %d)\n"
+msgstr "burde v�re (%d, %d, %d)\n"
+
+#: fdisk/fdisk.c:1318
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * %d bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Disk %s: %d hoveder, %d sektorer, %d cylindre\n"
+"Enheder = %s � %d * %d byte\n"
+"\n"
+
+#: fdisk/fdisk.c:1363
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+"Intet at g�re. R�kkef�lgen er allerede korrekt.\n"
+"\n"
+
+#: fdisk/fdisk.c:1429
+#, c-format
+msgid "%*s Boot    Start       End    Blocks   Id  System\n"
+msgstr "%*s Opstart Start       Slut   Blokke   Id  System\n"
+
+#: fdisk/fdisk.c:1430 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
+msgid "Device"
+msgstr "Enhed"
+
+#: fdisk/fdisk.c:1467
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr ""
+"\n"
+"Partitionstabellens indgange er ikke i disk-r�kkef�lge\n"
+
+#: fdisk/fdisk.c:1477
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %d heads, %d sectors, %d cylinders\n"
+"\n"
+msgstr ""
+"\n"
+"Disk %s: %d hoveder, %d sektorer, %d cylindre\n"
+"\n"
+
+#: fdisk/fdisk.c:1479
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
+msgstr "Nr AF Hvd Sekt Cyl Hvd Sekt Cyl    Start     Str. ID\n"
+
+#: fdisk/fdisk.c:1523
+#, c-format
+msgid "Warning: partition %d contains sector 0\n"
+msgstr "Advarsel: partition %d indeholder sektor 0\n"
+
+#: fdisk/fdisk.c:1526
+#, 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:1529
+#, c-format
+msgid "Partition %d: sector %d greater than maximum %d\n"
+msgstr "Partition %d: sektor %d er st�rre end de maksimale %d\n"
+
+#: fdisk/fdisk.c:1532
+#, 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:1536
+#, 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:1568
+#, 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:1576
+#, c-format
+msgid "Warning: partition %d overlaps partition %d.\n"
+msgstr "Advarsel: partition %d overlapper med partition %d.\n"
+
+#: fdisk/fdisk.c:1596
+#, c-format
+msgid "Warning: partition %d is empty\n"
+msgstr "Advarsel: partition %d er tom\n"
+
+#: fdisk/fdisk.c:1601
+#, 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:1607
+#, c-format
+msgid "Total allocated sectors %d greater than the maximum %d\n"
+msgstr "Allokerede sektorer i alt %d er st�rre end de maksimale %d\n"
+
+#: fdisk/fdisk.c:1610
+#, c-format
+msgid "%d unallocated sectors\n"
+msgstr "%d ikke-allokerede sektorer\n"
+
+#: fdisk/fdisk.c:1623 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
+#, c-format
+msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
+msgstr "Partition %d er allerede defineret. Slet den f�r du tilf�jer den igen.\n"
+
+#: fdisk/fdisk.c:1659 fdisk/fdisksunlabel.c:542
+#, c-format
+msgid "Sector %d is already allocated\n"
+msgstr "Sektor %d er allerede allokeret\n"
+
+#: fdisk/fdisk.c:1695
+msgid "No free sectors available\n"
+msgstr "Ingen tilg�ngelige frie sektorer\n"
+
+#: fdisk/fdisk.c:1736
+#, c-format
+msgid "Warning: partition %d has an odd number of sectors.\n"
+msgstr "Advarsel: partition %d har et ulige antal sektorer.\n"
+
+#: fdisk/fdisk.c:1786
+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:1790
+#, c-format
+msgid ""
+"Command action\n"
+"   %s\n"
+"   p   primary partition (1-4)\n"
+msgstr ""
+"Kommando beskrivelse\n"
+"   %s\n"
+"   p    prim�r partition (1-4)\n"
+
+#: fdisk/fdisk.c:1792
+msgid "l   logical (5 or over)"
+msgstr "l    logisk (5 eller derover)"
+
+#: fdisk/fdisk.c:1792
+msgid "e   extended"
+msgstr "e    udvidet"
+
+#: fdisk/fdisk.c:1809
+#, c-format
+msgid "Invalid partition number for type `%c'\n"
+msgstr "Ugyldigt partitionsnummer for type '%c'\n"
+
+#: fdisk/fdisk.c:1844
+msgid ""
+"The partition table has been altered!\n"
+"\n"
+msgstr ""
+"Partitionstabellen er �ndret!\n"
+"\n"
+
+#: fdisk/fdisk.c:1853
+msgid "Calling ioctl() to re-read partition table.\n"
+msgstr "Kalder ioctl() for at genindl�se partitionstabellen.\n"
+
+#: fdisk/fdisk.c:1869
+#, c-format
+msgid ""
+"Re-read table failed with error %d: %s.\n"
+"Reboot your system to ensure the partition table is updated.\n"
+msgstr ""
+"Genindl�sning af tabellen mislykkedes med fejl %d: %s.\n"
+"Genstart dit system for at sikre at partitionstabellen er opdateret.\n"
+
+#: fdisk/fdisk.c:1875
+msgid ""
+"\n"
+"WARNING: If you have created or modified any DOS 6.x\n"
+"partitions, please see the fdisk manual page for additional\n"
+"information.\n"
+msgstr ""
+"\n"
+"ADVARSEL: L�s venligst fdisk manual-siden for\n"
+"yderligere information, hvis du har oprettet eller\n"
+"�ndret DOS 6.x partitioner.\n"
+
+#: fdisk/fdisk.c:1882
+msgid "Syncing disks.\n"
+msgstr "Synkroniserer diske.\n"
+
+#: fdisk/fdisk.c:1929
+#, c-format
+msgid "Partition %d has no data area\n"
+msgstr "Partition %d har intet dataomr�de\n"
+
+#: fdisk/fdisk.c:1934
+msgid "New beginning of data"
+msgstr "Ny begyndelse p� data"
+
+#: fdisk/fdisk.c:1950
+msgid "Expert command (m for help): "
+msgstr "Ekspert kommando (m for hj�lp): "
+
+#: fdisk/fdisk.c:1963
+msgid "Number of cylinders"
+msgstr "Antal cylindre"
+
+#: fdisk/fdisk.c:1989
+msgid "Number of heads"
+msgstr "Antal hoveder"
+
+#: fdisk/fdisk.c:2014
+msgid "Number of sectors"
+msgstr "Antal sektorer"
+
+#: fdisk/fdisk.c:2017
+msgid "Warning: setting sector offset for DOS compatiblity\n"
+msgstr "Advarsel: s�tter sektorforskydning for DOS-kompatilitet\n"
+
+#: fdisk/fdisk.c:2081
+#, 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:2095
+#, c-format
+msgid "Cannot open %s\n"
+msgstr "Kunne ikke �bne %s\n"
+
+#: fdisk/fdisk.c:2112
+#, c-format
+msgid "cannot open %s\n"
+msgstr "kunne ikke �bne %s\n"
+
+#: fdisk/fdisk.c:2133
+#, c-format
+msgid "%c: unknown command\n"
+msgstr "%c: ukendt kommando\n"
+
+#: fdisk/fdisk.c:2183
+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:2186
+msgid ""
+"Warning: the -b (set sector size) option should be used with one specified "
+"device\n"
+msgstr ""
+"Advarsel: tilvalget -b (angiv sektorst�rrelse) kr�ver angivelse af "
+"disk-enhed\n"
+
+#: fdisk/fdisk.c:2251
+#, c-format
+msgid ""
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
+msgstr ""
+"Detekterede et OSF/1 diskm�rkat p� %s. G�r i diskm�rkat-tilstand.\n"
+"Brug 'r'-kommandoen for at returnere til DOS-partitionstabel-tilstand.\n"
+
+#: fdisk/fdisk.c:2260
+msgid "Command (m for help): "
+msgstr "Kommando (m for hj�lp): "
+
+#: fdisk/fdisk.c:2276
+#, c-format
+msgid ""
+"\n"
+"The current boot file is: %s\n"
+msgstr ""
+"\n"
+"Den nuv�rende opstartfil er: %s\n"
+
+#: fdisk/fdisk.c:2278
+msgid "Please enter the name of the new boot file: "
+msgstr "Angiv venligt navnet p� den ny opstartsfil: "
+
+#: fdisk/fdisk.c:2280
+msgid "Boot file unchanged\n"
+msgstr "Opstartsfil u�ndret\n"
+
+#: fdisk/fdisk.c:2344
+msgid ""
+"\n"
+"\tSorry, no experts menu for SGI partition tables available.\n"
+"\n"
+msgstr ""
+"\n"
+"\tBeklager, der er ingen ekspertmenu for SGI-partitionstabeller.\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:79
+msgid "SGI volhdr"
+msgstr "SGI bndhvd"
+
+#: fdisk/fdisksgilabel.c:80
+msgid "SGI trkrepl"
+msgstr "SGI sprrepl"
+
+#: fdisk/fdisksgilabel.c:81
+msgid "SGI secrepl"
+msgstr "SGI sekrepl"
+
+#: fdisk/fdisksgilabel.c:82
+msgid "SGI raw"
+msgstr "SGI raw"
+
+#: fdisk/fdisksgilabel.c:83
+msgid "SGI bsd"
+msgstr "SGI bsd"
+
+#: fdisk/fdisksgilabel.c:84
+msgid "SGI sysv"
+msgstr "SGI sysv"
+
+#: fdisk/fdisksgilabel.c:85
+msgid "SGI volume"
+msgstr "SGI bind"
+
+#: fdisk/fdisksgilabel.c:86
+msgid "SGI efs"
+msgstr "SGI efs"
+
+#: fdisk/fdisksgilabel.c:87
+msgid "SGI lvol"
+msgstr "SGI lvol"
+
+#: fdisk/fdisksgilabel.c:88
+msgid "SGI rlvol"
+msgstr "SGI rlvol"
+
+#: fdisk/fdisksgilabel.c:89
+msgid "SGI xfs"
+msgstr "SGI xfs"
+
+#: fdisk/fdisksgilabel.c:90
+msgid "SGI xlvol"
+msgstr "SGI xlvol"
+
+#: fdisk/fdisksgilabel.c:91
+msgid "SGI rxlvol"
+msgstr "SGI rxlvol"
+
+#. Minix 1.4b and later
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
+msgid "Linux swap"
+msgstr "Linux swap"
+
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
+msgid "Linux native"
+msgstr "Linux's egen"
+
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:158
+msgid ""
+"According to MIPS Computer Systems, Inc the Label must not contain more than "
+"512 bytes\n"
+msgstr "If�lge MIPS Computer Systems. Inc, m� m�rkatet ikke fylde mere end 512 byte\n"
+
+#: fdisk/fdisksgilabel.c:177
+msgid "Detected sgi disklabel with wrong checksum.\n"
+msgstr "Detekterede SGI diskm�rkat med forkert checksum.\n"
+
+#: fdisk/fdisksgilabel.c:200
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors\n"
+"%d cylinders, %d physical cylinders\n"
+"%d extra sects/cyl, interleave %d:1\n"
+"%s\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Disk %s (SGI diskm�rkat): %d hoveder, %d sektorer\n"
+"%d cylindre, %d fysiske cylindre\n"
+"%d ekstra sekt/cyl, interleave %d:1\n"
+"%s\n"
+"Enheder = %s � %d * 512 bytes\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:213
+#, c-format
+msgid ""
+"\n"
+"Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Disk %s (SGI disk label): %d hoveder, %d sektorer, %d cylindre\n"
+"Enheder = %s � %d * 512 bytes\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:219
+#, c-format
+msgid ""
+"----- partitions -----\n"
+"%*s  Info      Start       End   Sectors  Id  System\n"
+msgstr ""
+"----- partitioner -----\n"
+"%*s  Info      Start       Slut  Sektorer Id  System\n"
+
+#: fdisk/fdisksgilabel.c:241
+#, c-format
+msgid ""
+"----- bootinfo -----\n"
+"Bootfile: %s\n"
+"----- directory entries -----\n"
+msgstr ""
+"----- opstartsinfo -----\n"
+"Opstartsfil: %s\n"
+"----- katalogindgange -----\n"
+
+#: fdisk/fdisksgilabel.c:251
+#, c-format
+msgid "%2d: %-10s sector%5u size%8u\n"
+msgstr "%2d: %-10s sektor%5u st�rrelse%8u\n"
+
+#: fdisk/fdisksgilabel.c:305
+msgid ""
+"\n"
+"Invalid Bootfile!\n"
+"\tThe bootfile must be an absolute non-zero pathname,\n"
+"\te.g. \"/unix\" or \"/unix.save\".\n"
+msgstr ""
+"\n"
+"Ugyldig opstartsfil!\n"
+"\tOpstartsfilen skal v�re et absolut, ikke-tomt stinavn,\n"
+"\tf.eks. \"/unix\" eller \"/unix.save\".\n"
+
+#: fdisk/fdisksgilabel.c:312
+msgid ""
+"\n"
+"\tName of Bootfile too long:  16 bytes maximum.\n"
+msgstr ""
+"\n"
+"\tFor langt navn p� opstartsfil: h�jst 16 byte.\n"
+
+#: fdisk/fdisksgilabel.c:317
+msgid ""
+"\n"
+"\tBootfile must have a fully qualified pathname.\n"
+msgstr ""
+"\n"
+"\tOpstartsfil skal have et komplet stinavn.\n"
+
+#: fdisk/fdisksgilabel.c:322
+msgid ""
+"\n"
+"\tBe aware, that the bootfile is not checked for existence.\n"
+"\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n"
+msgstr ""
+"\n"
+"\tBem�rk, at der ikke tjekkes for opstartsfilens eksistens.\n"
+"\tSGI's standard er \"/unix\" og som backup \"/unix.save\".\n"
+
+#: fdisk/fdisksgilabel.c:350
+#, c-format
+msgid ""
+"\n"
+"\tBootfile is changed to \"%s\".\n"
+msgstr ""
+"\n"
+"\tOpstartsfil er �ndret til \"%s\".\n"
+
+#: fdisk/fdisksgilabel.c:448
+msgid "More than one entire disk entry present.\n"
+msgstr "Der er mere end �n fuldst�ndig diskindgang.\n"
+
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:478
+msgid "No partitions defined\n"
+msgstr "Ingen partitioner defineret\n"
+
+#: fdisk/fdisksgilabel.c:463
+msgid "IRIX likes when Partition 11 covers the entire disk.\n"
+msgstr "IRIX kan lide, n�r partition 11 fylder hele disken.\n"
+
+#: fdisk/fdisksgilabel.c:465
+#, c-format
+msgid ""
+"The entire disk partition should start at block 0,\n"
+"not at diskblock %d.\n"
+msgstr ""
+"Hele diskpartitionen b�r starte ved blok 0,\n"
+"ikke ved diskblok %d.\n"
+
+#: fdisk/fdisksgilabel.c:469
+#, c-format
+msgid ""
+"The entire disk partition is only %d diskblock large,\n"
+"but the disk is %d diskblocks long.\n"
+msgstr ""
+"Hele diskpartitionen er kun %d diskblokke stor,\n"
+"men disken er p� %d diskblokke.\n"
+
+#: fdisk/fdisksgilabel.c:476
+msgid "One Partition (#11) should cover the entire disk.\n"
+msgstr "En partition (#11) b�r fylde hele disken.\n"
+
+#: fdisk/fdisksgilabel.c:488
+#, c-format
+msgid "Partition %d does not start on cylinder boundary.\n"
+msgstr "Partition %d starter ikke p� en cylindergr�nse.\n"
+
+#: fdisk/fdisksgilabel.c:495
+#, c-format
+msgid "Partition %d does not end on cylinder boundary.\n"
+msgstr "Partition %d slutter ikke p� en cylindergr�nse.\n"
+
+#: fdisk/fdisksgilabel.c:503
+#, c-format
+msgid "The Partition %d and %d overlap by %d sectors.\n"
+msgstr "Partition %d pg %d overlapper hinanden i %d sektorer.\n"
+
+#: fdisk/fdisksgilabel.c:512 fdisk/fdisksgilabel.c:532
+#, c-format
+msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
+msgstr "Ubenyttet hul p� %8d sektorer - sektor %8d-%d\n"
+
+#: fdisk/fdisksgilabel.c:545
+msgid ""
+"\n"
+"The boot partition does not exist.\n"
+msgstr ""
+"\n"
+"Opstartpartitionen eksisterer ikke.\n"
+
+#: fdisk/fdisksgilabel.c:549
+msgid ""
+"\n"
+"The swap partition does not exist.\n"
+msgstr ""
+"\n"
+"Swappartitionen eksisterer ikke.\n"
+
+#: fdisk/fdisksgilabel.c:554
+msgid ""
+"\n"
+"The swap partition has no swap type.\n"
+msgstr ""
+"\n"
+"Swappartitionen har ikke nogen swaptype.\n"
+
+#: fdisk/fdisksgilabel.c:558
+msgid "\tYou have chosen an unusual boot file name.\n"
+msgstr "\tDu har valgt et ikke-standard navn p� opstartsfilen.\n"
+
+#: fdisk/fdisksgilabel.c:569
+msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgstr "Beklager. Du m� �ndre m�rket (tag) p� ikke-tomme partitioner.\n"
+
+#: fdisk/fdisksgilabel.c:576
+msgid ""
+"It is highly recommended that the partition at offset 0\n"
+"is of type \"SGI volhdr\", the IRIX system will rely on it to\n"
+"retrieve from its directory standalone tools like sash and fx.\n"
+"Only the \"SGI volume\" entire disk section may violate this.\n"
+"Type YES if you are sure about tagging this partition differently.\n"
+msgstr ""
+"Det anbefales kraftigt at partitionen p� forskydning 0\n"
+"er en \"SGI volhdr\"-type. IRIX-systemet vil bruge den til\bat hente fra "
+"dets katalogv�rkt�jer som sash og fx.\n"
+"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"
+
+#. rebuild freelist
+#: fdisk/fdisksgilabel.c:607
+msgid "Do You know, You got a partition overlap on the disk?\n"
+msgstr "Ved du, at du har overlappende partitioner p� disken?\n"
+
+#: fdisk/fdisksgilabel.c:669
+msgid "Attempting to generate entire disk entry automatically.\n"
+msgstr "Fors�ger at genere hele-disk-indgang automatisk.\n"
+
+#: fdisk/fdisksgilabel.c:676
+msgid "The entire disk is already covered with partitions.\n"
+msgstr "Hele disken er allerede fyldt med partitioner.\n"
+
+#: fdisk/fdisksgilabel.c:681
+msgid "You got a partition overlap on the disk. Fix it first!\n"
+msgstr "Du har overlappende partitioner p� disken. Ret det f�rst!\n"
+
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
+msgid ""
+"It is highly recommended that eleventh partition\n"
+"covers the entire disk and is of type `SGI volume'\n"
+msgstr ""
+"Det anbefales kraftigt at den ellevte partition\bfylder hele disken og er af "
+"typen 'SGI volume'\n"
+
+#: fdisk/fdisksgilabel.c:706
+msgid "You will get a partition overlap on the disk. Fix it first!\n"
+msgstr "Du vil f� overlappende partitioner p� disken. Ret dette f�rst!\n"
+
+#: fdisk/fdisksgilabel.c:711
+#, c-format
+msgid " Last %s"
+msgstr " Sidste %s"
+
+#: fdisk/fdisksgilabel.c:733
+msgid ""
+"Building a new SGI disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content will be unrecoverably lost.\n"
+"\n"
+msgstr ""
+"Opbygger et nyt SGI-diskm�rkat. �ndringer vil holdes i hukommelsen\n"
+"indtil du beslutter at gemme dem. Derfter vil det tidligere indhold\n"
+"naturligvis ikke kunne genskabes.\n"
+"\n"
+
+#: fdisk/fdisksgilabel.c:761
+#, c-format
+msgid "Trying to keep parameters of partition %d.\n"
+msgstr "Fors�ger at bibeholde parametrene for partition %d.\n"
+
+#: fdisk/fdisksgilabel.c:763
+#, c-format
+msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
+msgstr "ID=%02x\tSTART=%d\tL�NGDE=%d\n"
+
+#: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
+msgid "Empty"
+msgstr "Tom"
+
+#: fdisk/fdisksunlabel.c:45
+msgid "SunOS root"
+msgstr "SunOS root"
+
+#: fdisk/fdisksunlabel.c:46
+msgid "SunOS swap"
+msgstr "SunOS swap"
+
+#: fdisk/fdisksunlabel.c:47
+msgid "SunOS usr"
+msgstr "SunOS usr"
+
+#: fdisk/fdisksunlabel.c:48
+msgid "Whole disk"
+msgstr "Whole disk"
+
+#: fdisk/fdisksunlabel.c:49
+msgid "SunOS stand"
+msgstr "SunOS stand"
+
+#: fdisk/fdisksunlabel.c:50
+msgid "SunOS var"
+msgstr "SunOS var"
+
+#: fdisk/fdisksunlabel.c:51
+msgid "SunOS home"
+msgstr "SunOS home"
+
+#: fdisk/fdisksunlabel.c:129
+msgid ""
+"Detected sun disklabel with wrong checksum.\n"
+"Probably you'll have to set all the values,\n"
+"e.g. heads, sectors, cylinders and partitions\n"
+"or force a fresh label (s command in main menu)\n"
+msgstr ""
+"Opdatede SUN-diskm�rkat med forkert checksum.\n"
+"Du er nok n�dt til at angive alle v�rdierne\n"
+"dvs. hoveder, sektorer, cylindre og partitioner\n"
+"eller gennemtvinge et helt nyt m�rkat.\n"
+"(s-kommandoen i hovedmenuen\n"
+
+#: fdisk/fdisksunlabel.c:228
+#, c-format
+msgid "Autoconfigure found a %s%s%s\n"
+msgstr "Autokonfigurering fandt en %s%s%s\n"
+
+#: fdisk/fdisksunlabel.c:255
+msgid ""
+"Building a new sun disklabel. Changes will remain in memory only,\n"
+"until you decide to write them. After that, of course, the previous\n"
+"content won't be recoverable.\n"
+"\n"
+msgstr ""
+"Opbygger et nyt SUN-diskm�rkat. �ndringer vil holdes i hukommelsen\n"
+"indtil du beslutter at gemme dem. Derfter vil det tidligere indhold\n"
+"naturligvis ikke kunne genskabes.\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:266
+msgid ""
+"Drive type\n"
+"   ?   auto configure\n"
+"   0   custom (with hardware detected defaults)"
+msgstr ""
+"Drevtype\n"
+"   ?   autokonfigurering\n"
+"   0   brugerangivet (med maskinens fundne standardv�rdier)"
+
+#: fdisk/fdisksunlabel.c:276
+msgid "Select type (? for auto, 0 for custom): "
+msgstr "V�lg type (? for auto.�0 for brugerangivet): "
+
+#: fdisk/fdisksunlabel.c:288
+msgid "Autoconfigure failed.\n"
+msgstr "Autokonfigurering mislykkedes.\n"
+
+#: fdisk/fdisksunlabel.c:316
+msgid "Sectors/track"
+msgstr "Sektorer/spor"
+
+#: fdisk/fdisksunlabel.c:323
+msgid "Alternate cylinders"
+msgstr "Alternative cylindre"
+
+#: fdisk/fdisksunlabel.c:326
+msgid "Physical cylinders"
+msgstr "Fysiske cylindre"
+
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
+msgid "Rotation speed (rpm)"
+msgstr "Rotationshastighed (omdr. per minut)"
+
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
+msgid "Interleave factor"
+msgstr "Interleavefaktor"
+
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
+msgid "Extra sectors per cylinder"
+msgstr "Ekstra sektorer per cylinder"
+
+#: fdisk/fdisksunlabel.c:348
+msgid "You may change all the disk params from the x menu"
+msgstr "Du kan �ndre alle diskparametrene fra x-menuen"
+
+#: fdisk/fdisksunlabel.c:354
+msgid "3,5\" floppy"
+msgstr "3,5\" diskette"
+
+#: fdisk/fdisksunlabel.c:354
+msgid "Linux custom"
+msgstr "Linux's egen"
+
+#: fdisk/fdisksunlabel.c:441
+#, c-format
+msgid "Partition %d doesn't end on cylinder boundary\n"
+msgstr "Partition %d slutter ikke p� en cylinder-gr�nse\n"
+
+#: fdisk/fdisksunlabel.c:461
+#, c-format
+msgid "Partition %d overlaps with others in sectors %d-%d\n"
+msgstr "Partition %d overlapper med andre i sektorerne %d-%d\n"
+
+#: fdisk/fdisksunlabel.c:483
+#, c-format
+msgid "Unused gap - sectors 0-%d\n"
+msgstr "Ubenyttet hul - sektorerne 0�%d\n"
+
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
+#, c-format
+msgid "Unused gap - sectors %d-%d\n"
+msgstr "Ubenyttet hul - sektorerne %d�%d\n"
+
+#: fdisk/fdisksunlabel.c:512
+msgid ""
+"Other partitions already cover the whole disk.\n"
+"Delete some/shrink them before retry.\n"
+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:570
+#, c-format
+msgid ""
+"You haven't covered the whole disk with the 3rd partition, but your value\n"
+"%d %s covers some other partition. Your entry has been changed\n"
+"to %d %s\n"
+msgstr ""
+"Du har ikke udfyldt hele disken med tredie partition, men din v�rdi\n"
+"%d %s d�kker en anden partition. Din indgang er blevet �ndret til\n"
+"%d %s \n"
+
+#: fdisk/fdisksunlabel.c:590
+#, 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 ""
+"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:603
+msgid ""
+"It is highly recommended that the partition at offset 0\n"
+"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
+"there may destroy your partition table and bootblock.\n"
+"Type YES if you're very sure you would like that partition\n"
+"tagged with 82 (Linux swap): "
+msgstr ""
+"Det anbefales kraftigt at partitionen med forskydningen 0\n"
+"er et UFS-, EXT2FS-filsystem eller en SunOS swap. Ved at\n"
+"l�gge en Linux swap der, kan du �del�gge din partitionstabel\n"
+"og opstartsblok. Skriv JA hvis du er helt sikker p�, at du vil\n"
+"markere den partition som Linux swap (82): "
+
+#: fdisk/fdisksunlabel.c:634
+#, c-format
+msgid ""
+"\n"
+"Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n"
+"%d cylinders, %d alternate cylinders, %d physical cylinders\n"
+"%d extra sects/cyl, interleave %d:1\n"
+"%s\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Disk %s (Sun-diskm�rkat): %d hoveder, %d sektorer, %d omdr. per minut\n"
+"%d cylindre, %d alternative cylindre, %d fysiske cylindre\n"
+"%d ekstra sekt/cyl, interleave %d:1\n"
+"%s\n"
+"Enheder = %s � %d * 512 byte\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:648
+#, c-format
+msgid ""
+"\n"
+"Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
+"Units = %s of %d * 512 bytes\n"
+"\n"
+msgstr ""
+"\n"
+"Disk %s (Sun-diskm�rkat): %d hoveder, %d sektorer, %d cylindre\n"
+"Enheder = %s � %d * 512 byte\n"
+"\n"
+
+#: fdisk/fdisksunlabel.c:653
+#, c-format
+msgid "%*s Flag    Start       End    Blocks   Id  System\n"
+msgstr "%*s Flag    Start       Slut   Blokke   Id  System\n"
+
+#: fdisk/fdisksunlabel.c:678
+msgid "Number of alternate cylinders"
+msgstr "Antal alternative cylindre"
+
+#: fdisk/fdisksunlabel.c:711
+msgid "Number of physical cylinders"
+msgstr "Antal fysiske cylindre"
+
+#: fdisk/i386_sys_types.c:7
+msgid "FAT12"
+msgstr "FAT12"
+
+#: fdisk/i386_sys_types.c:8
+msgid "XENIX root"
+msgstr "XENIX root"
+
+#: fdisk/i386_sys_types.c:9
+msgid "XENIX usr"
+msgstr "XENIX usr"
+
+#: fdisk/i386_sys_types.c:10
+msgid "FAT16 <32M"
+msgstr "FAT16 <32M"
+
+#: fdisk/i386_sys_types.c:11
+msgid "Extended"
+msgstr "Udvidet"
+
+#. DOS 3.3+ extended partition
+#: fdisk/i386_sys_types.c:12
+msgid "FAT16"
+msgstr "FAT16"
+
+#. DOS 16-bit >=32M
+#: fdisk/i386_sys_types.c:13
+msgid "HPFS/NTFS"
+msgstr "HPFS/NTFS"
+
+#. OS/2 IFS, eg, HPFS or NTFS or QNX
+#: fdisk/i386_sys_types.c:14
+msgid "AIX"
+msgstr "AIX"
+
+#. AIX boot (AIX -- PS/2 port) or SplitDrive
+#: fdisk/i386_sys_types.c:15
+msgid "AIX bootable"
+msgstr "AIX opstartbar"
+
+#. AIX data or Coherent
+#: fdisk/i386_sys_types.c:16
+msgid "OS/2 Boot Manager"
+msgstr "OS/2 Opstartsh�ndtering"
+
+#. OS/2 Boot Manager
+#: fdisk/i386_sys_types.c:17
+msgid "Win95 FAT32"
+msgstr "Win95 FAT32"
+
+#: fdisk/i386_sys_types.c:18
+msgid "Win95 FAT32 (LBA)"
+msgstr "Win95 FAT32 (LBA)"
+
+#. LBA really is `Extended Int 13h'
+#: fdisk/i386_sys_types.c:19
+msgid "Win95 FAT16 (LBA)"
+msgstr "Win95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:20
+msgid "Win95 Ext'd (LBA)"
+msgstr "Win95 udvidet (LBA)"
+
+#: fdisk/i386_sys_types.c:21
+msgid "OPUS"
+msgstr "OPUS"
+
+#: fdisk/i386_sys_types.c:22
+msgid "Hidden FAT12"
+msgstr "Skjult FAT12"
+
+#: fdisk/i386_sys_types.c:23
+msgid "Compaq diagnostics"
+msgstr "Compaq diagnosticering"
+
+#: fdisk/i386_sys_types.c:24
+msgid "Hidden FAT16 <32M"
+msgstr "Skjult FAT16 <32M"
+
+#: fdisk/i386_sys_types.c:25
+msgid "Hidden FAT16"
+msgstr "Skjult FAT16"
+
+#: fdisk/i386_sys_types.c:26
+msgid "Hidden HPFS/NTFS"
+msgstr "Skjult HPFS/NTFS"
+
+#: fdisk/i386_sys_types.c:27
+msgid "AST Windows swapfile"
+msgstr "AST Windows swapfil"
+
+#: fdisk/i386_sys_types.c:28
+msgid "Hidden Win95 FAT32"
+msgstr "Skjult Win95 FAT32"
+
+#: fdisk/i386_sys_types.c:29
+msgid "Hidden Win95 FAT32 (LBA)"
+msgstr "Skjult Win95 FAT32 (LBA)"
+
+#: fdisk/i386_sys_types.c:30
+msgid "Hidden Win95 FAT16 (LBA)"
+msgstr "Skjult Win95 FAT16 (LBA)"
+
+#: fdisk/i386_sys_types.c:31
+msgid "NEC DOS"
+msgstr "NEC DOS"
+
+#: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr "Plan 9"
+
+#: fdisk/i386_sys_types.c:33
+msgid "PartitionMagic recovery"
+msgstr "PartitionMagic redning"
+
+#: fdisk/i386_sys_types.c:34
+msgid "Venix 80286"
+msgstr "Venix 80286"
+
+#: fdisk/i386_sys_types.c:35
+msgid "PPC PReP Boot"
+msgstr "PPC PReP Opstart"
+
+#: fdisk/i386_sys_types.c:36
+msgid "SFS"
+msgstr "SFS"
+
+#: fdisk/i386_sys_types.c:37
+msgid "QNX4.x"
+msgstr "QNX4.x"
+
+#: fdisk/i386_sys_types.c:38
+msgid "QNX4.x 2nd part"
+msgstr "QNX4.x 2. part"
+
+#: fdisk/i386_sys_types.c:39
+msgid "QNX4.x 3rd part"
+msgstr "QNX4.x 3. part"
+
+#: fdisk/i386_sys_types.c:40
+msgid "OnTrack DM"
+msgstr "OnTrack DM"
+
+#: fdisk/i386_sys_types.c:41
+msgid "OnTrack DM6 Aux1"
+msgstr "OnTrack DM6 Aux1"
+
+#. (or Novell)
+#: fdisk/i386_sys_types.c:42
+msgid "CP/M"
+msgstr "CP/M"
+
+#. CP/M or Microport SysV/AT
+#: fdisk/i386_sys_types.c:43
+msgid "OnTrack DM6 Aux3"
+msgstr "OnTrack DM6 Aux3"
+
+#: fdisk/i386_sys_types.c:44
+msgid "OnTrackDM6"
+msgstr "OnTrackDM6"
+
+#: fdisk/i386_sys_types.c:45
+msgid "EZ-Drive"
+msgstr "EZ-Drev"
+
+#: fdisk/i386_sys_types.c:46
+msgid "Golden Bow"
+msgstr "Golden Bow"
+
+#: fdisk/i386_sys_types.c:47
+msgid "Priam Edisk"
+msgstr "Priam Edisk"
+
+#. DOS R/O or SpeedStor
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:82
+#: fdisk/i386_sys_types.c:85 fdisk/i386_sys_types.c:86
+msgid "SpeedStor"
+msgstr "SpeedStor"
+
+#: fdisk/i386_sys_types.c:49
+msgid "GNU HURD or SysV"
+msgstr "GNU HURD eller SysV"
+
+#. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
+#: fdisk/i386_sys_types.c:50
+msgid "Novell Netware 286"
+msgstr "Novell Netware 286"
+
+#: fdisk/i386_sys_types.c:51
+msgid "Novell Netware 386"
+msgstr "Novell Netware 386"
+
+#: fdisk/i386_sys_types.c:52
+msgid "DiskSecure Multi-Boot"
+msgstr "DiskSecure Multi-Boot"
+
+#: fdisk/i386_sys_types.c:53
+msgid "PC/IX"
+msgstr "PC/IX"
+
+#: fdisk/i386_sys_types.c:54
+msgid "Old Minix"
+msgstr "Gammel Minix"
+
+#. Minix 1.4a and earlier
+#: fdisk/i386_sys_types.c:55
+msgid "Minix / old Linux"
+msgstr "Minix / gammel Linux"
+
+#: fdisk/i386_sys_types.c:58
+msgid "OS/2 hidden C: drive"
+msgstr "OS/2 skjult C-drev"
+
+#: fdisk/i386_sys_types.c:59
+msgid "Linux extended"
+msgstr "Linux udvidet"
+
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
+msgid "NTFS volume set"
+msgstr "NTFS bind-s�t"
+
+#: fdisk/i386_sys_types.c:63
+msgid "Amoeba"
+msgstr "Amoeba"
+
+#: fdisk/i386_sys_types.c:64
+msgid "Amoeba BBT"
+msgstr "Amoeba BBT"
+
+#. (bad block table)
+#: fdisk/i386_sys_types.c:65
+msgid "BSD/OS"
+msgstr "BSD/OS"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
+msgid "IBM Thinkpad hibernation"
+msgstr "IBM Thinkpad dvale"
+
+#: fdisk/i386_sys_types.c:67
+msgid "BSD/386"
+msgstr "BSD/386"
+
+#: fdisk/i386_sys_types.c:68
+msgid "OpenBSD"
+msgstr "OpenBSD"
+
+#: fdisk/i386_sys_types.c:69
+msgid "NeXTSTEP"
+msgstr "NeXTSTEP"
+
+#: fdisk/i386_sys_types.c:70
+msgid "BSDI fs"
+msgstr "BSDI fs"
+
+#: fdisk/i386_sys_types.c:71
+msgid "BSDI swap"
+msgstr "BSDI swap"
+
+#: fdisk/i386_sys_types.c:72
+msgid "DRDOS/sec (FAT-12)"
+msgstr "DRDOS/sec (FAT-12)"
+
+#: fdisk/i386_sys_types.c:73
+msgid "DRDOS/sec (FAT-16 < 32M)"
+msgstr "DRDOS/sec (FAT-16 < 32M)"
+
+#: fdisk/i386_sys_types.c:74
+msgid "DRDOS/sec (FAT-16)"
+msgstr "DRDOS/sec (FAT-16)"
+
+#: fdisk/i386_sys_types.c:75
+msgid "Syrinx"
+msgstr "Syrinx"
+
+#: fdisk/i386_sys_types.c:76
+msgid "Non-FS data"
+msgstr "Ikke-FS data"
+
+#: fdisk/i386_sys_types.c:77
+msgid "CP/M / CTOS / ..."
+msgstr "CP/M / CTOS / ..."
+
+#. CP/M or Concurrent CP/M or
+#. Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:79
+msgid "DOS access"
+msgstr "DOS access"
+
+#. DOS access or SpeedStor 12-bit FAT
+#. extended partition
+#: fdisk/i386_sys_types.c:81
+msgid "DOS R/O"
+msgstr "DOS R/O"
+
+#. SpeedStor 16-bit FAT extended
+#. partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:84
+msgid "BeOS fs"
+msgstr "BeOS fs"
+
+#. SpeedStor large partition
+#: fdisk/i386_sys_types.c:87
+msgid "DOS secondary"
+msgstr "DOS sekund�r"
+
+#. DOS 3.3+ secondary
+#: fdisk/i386_sys_types.c:88
+msgid "Linux raid autodetect"
+msgstr "Linux raid autodetekt"
+
+#. New (2.2.x) raid partition with
+#. autodetect using persistent
+#. superblock
+#: fdisk/i386_sys_types.c:91
+msgid "LANstep"
+msgstr "LANstep"
+
+#. SpeedStor >1024 cyl. or LANstep
+#: fdisk/i386_sys_types.c:92
+msgid "BBT"
+msgstr "BBT"
+
+#: fdisk/sfdisk.c:152
+#, c-format
+msgid "seek error on %s - cannot seek to %lu\n"
+msgstr "s�gefejl p� %s - kunne ikke s�ge til %lu\n"
+
+#: fdisk/sfdisk.c:157
+#, c-format
+msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
+msgstr "s�gefejl: �nskede 0x%08x%08x, fik 0x%08x%08x\n"
+
+#: fdisk/sfdisk.c:203
+msgid "out of memory - giving up\n"
+msgstr "l�bet t�r for hukommelse - opgiver\n"
+
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
+#, c-format
+msgid "read error on %s - cannot read sector %lu\n"
+msgstr "l�sefejl p� %s - kunne ikke l�se sektor %lu\n"
+
+#: fdisk/sfdisk.c:224
+#, c-format
+msgid "ERROR: sector %lu does not have an msdos signature\n"
+msgstr "FEJL: sektor %lu har ikke en MSDOS-signatur\n"
+
+#: fdisk/sfdisk.c:241
+#, c-format
+msgid "write error on %s - cannot write sector %lu\n"
+msgstr "skrivefejl p� %s - kan ikke skrive sektor %lu\n"
+
+#: fdisk/sfdisk.c:279
+#, c-format
+msgid "cannot open partition sector save file (%s)\n"
+msgstr "kunne ikke �bne partitionssektor-redningsfil (%s)\n"
+
+#: fdisk/sfdisk.c:297
+#, c-format
+msgid "write error on %s\n"
+msgstr "skrivefejl p� %s\n"
+
+#: fdisk/sfdisk.c:315
+#, c-format
+msgid "cannot stat partition restore file (%s)\n"
+msgstr "kunne ikke finde partitions-genskabelsesfil (%s)\n"
+
+#: fdisk/sfdisk.c:320
+msgid "partition restore file has wrong size - not restoring\n"
+msgstr "partitions-genskabelsesfil har forkert st�rrelse - genskaber ikke\n"
+
+#: fdisk/sfdisk.c:324
+msgid "out of memory?\n"
+msgstr "l�bet t�r for hukommelse?\n"
+
+#: fdisk/sfdisk.c:330
+#, c-format
+msgid "cannot open partition restore file (%s)\n"
+msgstr "kan ikke �bne partitions-genskabelsesfilen (%s)\n"
+
+#: fdisk/sfdisk.c:336
+#, c-format
+msgid "error reading %s\n"
+msgstr "fejl ved l�sning af %s\n"
+
+#: fdisk/sfdisk.c:343
+#, c-format
+msgid "cannot open device %s for writing\n"
+msgstr "kan ikke �bne enheden %s for skrivning\n"
+
+#: fdisk/sfdisk.c:355
+#, c-format
+msgid "error writing sector %lu on %s\n"
+msgstr "fejl ved skrivning af sektor %lu p� %s\n"
+
+#: fdisk/sfdisk.c:406
+#, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Disk %s: kan ikke bestemme st�rrelsen\n"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Disk %s: kan ikke bestemme geometrien\n"
+
+#: fdisk/sfdisk.c:435
+#, c-format
+msgid ""
+"Warning: start=%d - this looks like a partition rather than\n"
+"the entire disk. Using fdisk on it is probably meaningless.\n"
+"[Use the --force option if you really want this]\n"
+msgstr ""
+"Advarsel: start=%d - dette ligner mere en partition end en\n"
+"hel disk. Brug af fdisk p� den er sikkert meningsl�st.\n"
+"[Brug tilvalget --force hvis du virkelig gerne vil]\n"
+
+#: fdisk/sfdisk.c:442
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
+msgstr "Advarsel: HDIO_GETGEO siger,at der er %d hoveder\n"
+
+#: fdisk/sfdisk.c:445
+#, c-format
+msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
+msgstr "Advarsel: HDIO_GETGEO siger, at der er %d sektorer\n"
+
+#: fdisk/sfdisk.c:449
+#, c-format
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
+msgstr "Advarsel: BLKGETSIZE/HDIO_GETGEO siger, at der er  %d cylindre\n"
+
+#: fdisk/sfdisk.c:453
+#, c-format
+msgid ""
+"Warning: unlikely number of sectors (%d) - usually at most 63\n"
+"This will give problems with all software that uses C/H/S addressing.\n"
+msgstr ""
+"Advarsel: usandsynligt antal sektorer (%d) - normalt h�jst 63\n"
+"Dette vil give problemer med al programmel, der bruger C/H/S-adressering.\n"
+
+#: fdisk/sfdisk.c:457
+#, c-format
+msgid ""
+"\n"
+"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
+msgstr ""
+"\n"
+"Disk %s: %lu cylindre, %lu hoveder, %lu sektorer/spor\n"
+
+#: fdisk/sfdisk.c:539
+#, c-format
+msgid "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
+msgstr "%s for partition %s har umulig hoved-v�rdi: %d (burde v�re mellem 0-%d)\n"
+
+#: fdisk/sfdisk.c:544
+#, c-format
+msgid "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
+msgstr "%s for partition %s har umulig sektor-v�rdi: %d (burde v�re mellem 1-%d)\n"
+
+#: fdisk/sfdisk.c:549
+#, c-format
+msgid ""
+"%s of partition %s has impossible value for cylinders: %d (should be in "
+"0-%d)\n"
+msgstr "%s for partition %s har umulig cylinder-v�rdi: %d (burde v�re mellem 0-%d)\n"
+
+#: fdisk/sfdisk.c:588
+msgid ""
+"Id  Name\n"
+"\n"
+msgstr ""
+"Id  Navn\n"
+"\n"
+
+#: fdisk/sfdisk.c:741
+msgid "Re-reading the partition table ...\n"
+msgstr "Genindl�ser partitionstabel ...\n"
+
+#: fdisk/sfdisk.c:747
+msgid ""
+"The command to re-read the partition table failed\n"
+"Reboot your system now, before using mkfs\n"
+msgstr ""
+"Kommandoen for genindl�sning af partitionstabellen mislykkedes\n"
+"Genstart dit system nu, f�r du formatterer med mkfs\n"
+
+#: fdisk/sfdisk.c:752
+#, c-format
+msgid "Error closing %s\n"
+msgstr "Fejl ved lukning af %s\n"
+
+#: fdisk/sfdisk.c:790
+#, c-format
+msgid "%s: no such partition\n"
+msgstr "%s: ingen s�dan partition\n"
+
+#: fdisk/sfdisk.c:813
+msgid "unrecognized format - using sectors\n"
+msgstr "ukendt format - benyttet sektorer\n"
+
+#: fdisk/sfdisk.c:852
+#, c-format
+msgid "# partition table of %s\n"
+msgstr "# partitionstabel for %s\n"
+
+#: fdisk/sfdisk.c:863
+#, c-format
+msgid "unimplemented format - using %s\n"
+msgstr "ikke-implementeret format - benytter %s\n"
+
+#: fdisk/sfdisk.c:867
+#, c-format
+msgid ""
+"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Enheder = cylindre � %lu byte, blokke � 1024 byte, t�ller fra %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:870
+msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
+msgstr "   Enhed  Opst Start     Slut  #cyldr. #blokke   Id  System\n"
+
+#: fdisk/sfdisk.c:875
+#, c-format
+msgid ""
+"Units = sectors of 512 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Enheder = sektorer � 512 byte, t�ller fra %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:877
+msgid "   Device Boot    Start       End  #sectors  Id  System\n"
+msgstr "   Enhed  Opstart Start       Slut #sektorer Id  System\n"
+
+#: fdisk/sfdisk.c:880
+#, c-format
+msgid ""
+"Units = blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Enheder = blokke � 1024 byte, t�ller fra %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:882
+msgid "   Device Boot   Start       End   #blocks   Id  System\n"
+msgstr "   Enhed  Opstrt Start       Slut  #blokke   Id  System\n"
+
+#: fdisk/sfdisk.c:885
+#, c-format
+msgid ""
+"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
+"\n"
+msgstr ""
+"Enheder = megabyte � 1048576 byte, blokke � 1024 byte, t�ller fra %d\n"
+"\n"
+
+#: fdisk/sfdisk.c:887
+msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
+msgstr "   Enhed  Opst Start   End     MB   #blokke   Id  System\n"
+
+#: fdisk/sfdisk.c:1019
+#, c-format
+msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "\t\tstart: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1026
+#, c-format
+msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "\t\tslut: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1029
+#, c-format
+msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
+msgstr "partitionen slutter p� cylinder %ld, efter diskens slutning\n"
+
+#: fdisk/sfdisk.c:1040
+msgid "No partitions found\n"
+msgstr "Fandt ingen partitioner\n"
+
+#: fdisk/sfdisk.c:1047
+#, c-format
+msgid ""
+"Warning: The first partition looks like it was made\n"
+"  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
+"For this listing I'll assume that geometry.\n"
+msgstr ""
+"Advarsel: Den f�rste partition ser ud som om den var lavet\n"
+"   til C/H/S=*/%ld/%ld (i stedet for %ld/%ld/%ld).\n"
+"I denne visning vil jeg g� ud fra denne geometri.\n"
+
+#: fdisk/sfdisk.c:1097
+msgid "no partition table present.\n"
+msgstr "der er ingen partitionstabel.\n"
+
+#: fdisk/sfdisk.c:1099
+#, c-format
+msgid "strange, only %d partitions defined.\n"
+msgstr "m�rkeligt, kun %d partitioner er defineret.\n"
+
+#: fdisk/sfdisk.c:1108
+#, c-format
+msgid "Warning: partition %s has size 0 but is not marked Empty\n"
+msgstr "Advarsel: partition %s har st�rrelsen 0, men er ikke markeret tom\n"
+
+#: fdisk/sfdisk.c:1111
+#, c-format
+msgid "Warning: partition %s has size 0 and is bootable\n"
+msgstr "Advarsel: partition %s har st�rrelsen 0, men er opstartbar\n"
+
+#: fdisk/sfdisk.c:1114
+#, c-format
+msgid "Warning: partition %s has size 0 and nonzero start\n"
+msgstr "Advarsel: partition %s har st�rrelsen 0, men starter ikke i 0\n"
+
+#: fdisk/sfdisk.c:1125
+#, c-format
+msgid "Warning: partition %s "
+msgstr "Advarsel: partition %s "
+
+#: fdisk/sfdisk.c:1126
+#, c-format
+msgid "is not contained in partition %s\n"
+msgstr "indeholdes ikke i partition %s\n"
+
+#: fdisk/sfdisk.c:1137
+#, c-format
+msgid "Warning: partitions %s "
+msgstr "Advarsel: partitionerne %s "
+
+#: fdisk/sfdisk.c:1138
+#, c-format
+msgid "and %s overlap\n"
+msgstr "og %s overlapper hinanden\n"
+
+#: fdisk/sfdisk.c:1149
+#, c-format
+msgid "Warning: partition %s contains part of "
+msgstr "Advarsel: partition %s indeholder noget af "
+
+#: fdisk/sfdisk.c:1150
+#, c-format
+msgid "the partition table (sector %lu),\n"
+msgstr "partitionstabellen (sektor %lu),\n"
+
+#: fdisk/sfdisk.c:1151
+msgid "and will destroy it when filled\n"
+msgstr "og vil �del�gge denne, n�r den fyldes\n"
+
+#: fdisk/sfdisk.c:1160
+#, c-format
+msgid "Warning: partition %s starts at sector 0\n"
+msgstr "Advarsel: partition %s starter i sektor 0\n"
+
+#: fdisk/sfdisk.c:1164
+#, c-format
+msgid "Warning: partition %s extends past end of disk\n"
+msgstr "Advarsel: partition %s n�r ud over diskens slutning\n"
+
+#: fdisk/sfdisk.c:1178
+msgid "Among the primary partitions, at most one can be extended\n"
+msgstr "H�jst �n af prim�rpartitionerne m� v�re udvidet\n"
+
+#: fdisk/sfdisk.c:1179
+msgid " (although this is not a problem under Linux)\n"
+msgstr " (selvom det nok ikke vil v�re et problem under Linux)\n"
+
+#: fdisk/sfdisk.c:1196
+#, c-format
+msgid "Warning: partition %s does not start at a cylinder boundary\n"
+msgstr "Advarsel: partition %s starter ikke p� en cylindergr�nse\n"
+
+#: fdisk/sfdisk.c:1202
+#, c-format
+msgid "Warning: partition %s does not end at a cylinder boundary\n"
+msgstr "Advarsel: partition %s slutter ikke p� en cylindergr�nse\n"
+
+#: fdisk/sfdisk.c:1220
+msgid ""
+"Warning: more than one primary partition is marked bootable (active)\n"
+"This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
+msgstr ""
+"Advarsel: adskillige prim�rpartitioner er markeret opstartbare (aktive)\n"
+"Dette generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne "
+"disk.\n"
+
+#: fdisk/sfdisk.c:1227
+msgid ""
+"Warning: usually one can boot from primary partitions only\n"
+"LILO disregards the `bootable' flag.\n"
+msgstr ""
+"Advarsel: normalt kan man kun starte op fra prim�rpartitioner\n"
+"LILO ignorerer opstartbar flaget.\n"
+
+#: fdisk/sfdisk.c:1233
+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 ""
+"Advarsel: ingen prim�rpartition er markeret opstartbar (aktiv)\n"
+"Det generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne disk.\n"
+
+#: fdisk/sfdisk.c:1250
+#, c-format
+msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "partition %s: start: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1259
+#, c-format
+msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "partition %s: end: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
+
+#: fdisk/sfdisk.c:1262
+#, c-format
+msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
+msgstr "partition %s slutter p� cylinder %ld, efter diskens slutning\n"
+
+#: fdisk/sfdisk.c:1287
+#, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "Advarsel: �ndrede starten p� udvidet partition fra %ld til %ld\n"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr "(Kun til visning. Redig�r ikke indholdet.)\n"
+
+#: fdisk/sfdisk.c:1291
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr "Advarsel: udvidet partition starter ikke p� en cylindergr�nse.\n"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr "DOS og Linux vil fortolke indholdet forskelligt.\n"
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
+#, c-format
+msgid "too many partitions - ignoring those past nr (%d)\n"
+msgstr "for mange partitioner - ignorerer dem efter nr. (%d)\n"
+
+#: fdisk/sfdisk.c:1324
+msgid "tree of partitions?\n"
+msgstr "tr� med partitioner?\n"
+
+#: fdisk/sfdisk.c:1445
+msgid "detected Disk Manager - unable to handle that\n"
+msgstr "fandt Disk Manager - kan ikke h�ndtere s�dan en\n"
+
+#: fdisk/sfdisk.c:1452
+msgid "DM6 signature found - giving up\n"
+msgstr "fandt DM6 signatur - opgiver\n"
+
+#: fdisk/sfdisk.c:1472
+msgid "strange..., an extended partition of size 0?\n"
+msgstr "m�rkeligt... en udvidet partition med st�rrelsen 0?\n"
+
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
+msgid "strange..., a BSD partition of size 0?\n"
+msgstr "m�rkeligt..., en BSD-partition med st�rrelsen 0?\n"
+
+#: fdisk/sfdisk.c:1524
+#, c-format
+msgid " %s: unrecognized partition\n"
+msgstr " %s: ukendt partition\n"
+
+#: fdisk/sfdisk.c:1536
+msgid "-n flag was given: Nothing changed\n"
+msgstr "flaget -n blev givet: Intet �ndret\n"
+
+#: fdisk/sfdisk.c:1549
+msgid "Failed saving the old sectors - aborting\n"
+msgstr "Kunne ikke gemme de gamle sektorer- afbryder\n"
+
+#: fdisk/sfdisk.c:1554
+#, c-format
+msgid "Failed writing the partition on %s\n"
+msgstr "Mislykket skrivning af partition p� %s\n"
+
+#: fdisk/sfdisk.c:1631
+msgid "long or incomplete input line - quitting\n"
+msgstr "lang eller uafsluttet inddatalinie - afbryder\n"
+
+#: fdisk/sfdisk.c:1667
+#, c-format
+msgid "input error: `=' expected after %s field\n"
+msgstr "inddatafejl: forventer '=' efter %s-felt\n"
+
+#: fdisk/sfdisk.c:1674
+#, c-format
+msgid "input error: unexpected character %c after %s field\n"
+msgstr "inddatafejl: uventet tegn %c efter %s-felt\n"
+
+#: fdisk/sfdisk.c:1680
+#, c-format
+msgid "unrecognized input: %s\n"
+msgstr "ukendt inddata: %s\n"
+
+#: fdisk/sfdisk.c:1712
+msgid "number too big\n"
+msgstr "tal for stort\n"
+
+#: fdisk/sfdisk.c:1716
+msgid "trailing junk after number\n"
+msgstr "trailing junk after number\n"
+
+#: fdisk/sfdisk.c:1832
+msgid "no room for partition descriptor\n"
+msgstr "ikke plads til partitionsbeskrivelse\n"
+
+#: fdisk/sfdisk.c:1865
+msgid "cannot build surrounding extended partition\n"
+msgstr "kunne ikke opbygge den omgivende udvidede partition\n"
+
+#: fdisk/sfdisk.c:1916
+msgid "too many input fields\n"
+msgstr "for mange inddatafelter\n"
+
+#. no free blocks left - don't read any further
+#: fdisk/sfdisk.c:1950
+msgid "No room for more\n"
+msgstr "Ikke plads til mere\n"
+
+#: fdisk/sfdisk.c:1969
+msgid "Illegal type\n"
+msgstr "Ugyldig type\n"
+
+#: fdisk/sfdisk.c:2001
+#, 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:2007
+msgid "Warning: empty partition\n"
+msgstr "Advarsel: tom partition\n"
+
+#: fdisk/sfdisk.c:2021
+#, c-format
+msgid "Warning: bad partition start (earliest %lu)\n"
+msgstr "Advarsel: ugyldigt partitionsbegyndelse (tidligst %lu)\n"
+
+#: fdisk/sfdisk.c:2034
+msgid "unrecognized bootable flag - choose - or *\n"
+msgstr "ukendt opstartbar-flag,  v�lg - eller *\n"
+
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
+msgid "partial c,h,s specification?\n"
+msgstr "delvis c,h,s-specifikation?\n"
+
+#: fdisk/sfdisk.c:2075
+msgid "Extended partition not where expected\n"
+msgstr "Udvidet partition ikke hvor den forventedes\n"
+
+#: fdisk/sfdisk.c:2107
+msgid "bad input\n"
+msgstr "ugyldige inddata\n"
+
+#: fdisk/sfdisk.c:2129
+msgid "too many partitions\n"
+msgstr "for mange partitioner\n"
+
+#: fdisk/sfdisk.c:2162
+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 ""
+"Inddata i f�lgende format; udeladte felter tildeles standardv�rdi.\n"
+"<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:2182
+msgid "version"
+msgstr "version"
+
+#: fdisk/sfdisk.c:2188
+#, c-format
+msgid "Usage: %s [options] device ...\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
+
+#: fdisk/sfdisk.c:2189
+msgid "device: something like /dev/hda or /dev/sda"
+msgstr "enhed: noget lignende /dev/hda eller /dev/sda"
+
+#: fdisk/sfdisk.c:2190
+msgid "useful options:"
+msgstr "nyttige tilvalg:"
+
+#: fdisk/sfdisk.c:2191
+msgid "    -s [or --show-size]: list size of a partition"
+msgstr "    -s [eller --show-size]: vis partitionens st�rrelse"
+
+#: fdisk/sfdisk.c:2192
+msgid "    -c [or --id]:        print or change partition Id"
+msgstr "    -c [eller --id]:        vis eller �ndr partitions-id"
+
+#: fdisk/sfdisk.c:2193
+msgid "    -l [or --list]:      list partitions of each device"
+msgstr "    -l [eller --list]:      vis hver enheds partitioner"
+
+#: fdisk/sfdisk.c:2194
+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:2195
+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:2196
+msgid ""
+"    -uS, -uB, -uC, -uM:  accept/report in units of "
+"sectors/blocks/cylinders/MB"
+msgstr ""
+"    -uS, -uB, -uC, -uM:     indl�s/vis i enhederne "
+"sektorer/blokke/cylindre/MB"
+
+#: fdisk/sfdisk.c:2197
+msgid "    -T [or --list-types]:list the known partition types"
+msgstr "    -T [eller --list-types]:vis kendte partitionstyper"
+
+#: fdisk/sfdisk.c:2198
+msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
+msgstr "    -D [eller --DOS]:       DOS-kompatibilitet: spilder lidt plads"
+
+#: fdisk/sfdisk.c:2199
+msgid "    -R [or --re-read]:   make kernel reread partition table"
+msgstr "    -R [eller --re-read]:   lad kernen genindl�se partitionstabellen"
+
+#: fdisk/sfdisk.c:2200
+msgid "    -N# :                change only the partition with number #"
+msgstr "    -N# :                   ret kun partitionen med nummer #"
+
+#: fdisk/sfdisk.c:2201
+msgid "    -n :                 do not actually write to disk"
+msgstr "    -n :                    undlad at skrive �ndringerne til disken"
+
+#: fdisk/sfdisk.c:2202
+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:2203
+msgid "    -I file :            restore these sectors again"
+msgstr "    -I fil :                genskab disse sektorer"
+
+#: fdisk/sfdisk.c:2204
+msgid "    -v [or --version]:   print version"
+msgstr "    -v [eller --version]:   vis version"
+
+#: fdisk/sfdisk.c:2205
+msgid "    -? [or --help]:      print this message"
+msgstr "    -? [eller --help]:      vis denne besked"
+
+#: fdisk/sfdisk.c:2206
+msgid "dangerous options:"
+msgstr "farlige tilvalg:"
+
+#: fdisk/sfdisk.c:2207
+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:2208
+msgid ""
+"    -x [or --show-extended]: also list extended partitions on output\n"
+"                             or expect descriptors for them on input"
+msgstr ""
+"    -x [eller --show-extended]: medtag udvidede partitioner i uddata\n"
+"                                eller forvent beskrivelser af dem i inddata"
+
+#: fdisk/sfdisk.c:2210
+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:2211
+msgid "    -q  [or --quiet]:      suppress warning messages"
+msgstr "    -q  [eller --quiet]:      undertryk advarsler"
+
+#: fdisk/sfdisk.c:2212
+msgid "    You can override the detected geometry using:"
+msgstr "    Du kan tilsides�tte den detekterede geometri med:"
+
+#: fdisk/sfdisk.c:2213
+msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
+msgstr "    -C# [eller --cylinders #]:angiv det cylinderantal, der skal bruges"
+
+#: fdisk/sfdisk.c:2214
+msgid "    -H# [or --heads #]:    set the number of heads to use"
+msgstr "    -H# [eller --heads #]:    angiv det hovedantal, der skal bruges"
+
+#: fdisk/sfdisk.c:2215
+msgid "    -S# [or --sectors #]:  set the number of sectors to use"
+msgstr "    -S# [eller --sectors #]:  angiv det sektorantal, der skal bruges"
+
+#: fdisk/sfdisk.c:2216
+msgid "You can disable all consistency checking with:"
+msgstr "Du kan undertrykke alle forenelighedstjek med:"
+
+#: fdisk/sfdisk.c:2217
+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:2223
+msgid "Usage:"
+msgstr "Brug:"
+
+#: fdisk/sfdisk.c:2224
+#, 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:2225
+#, 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:2226
+#, 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:2346
+msgid "no command?\n"
+msgstr "ingen kommando?\n"
+
+#: fdisk/sfdisk.c:2471
+#, c-format
+msgid "total: %d blocks\n"
+msgstr "i alt: %d blokke\n"
+
+#: fdisk/sfdisk.c:2508
+msgid "usage: sfdisk --print-id device partition-number\n"
+msgstr "brug: sfdisk --print-id enhed partitionsnummer\n"
+
+#: fdisk/sfdisk.c:2510
+msgid "usage: sfdisk --change-id device partition-number Id\n"
+msgstr "brug: sfdisk --change-id enhed partitionsnummer id\n"
+
+#: fdisk/sfdisk.c:2512
+msgid "usage: sfdisk --id device partition-number [Id]\n"
+msgstr "brug: sfdisk --id enhed partitionsnummer [id]\n"
+
+#: fdisk/sfdisk.c:2519
+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:2544
+#, c-format
+msgid "cannot open %s %s\n"
+msgstr "kunne ikke �bne %s %s\n"
+
+#: fdisk/sfdisk.c:2544
+msgid "read-write"
+msgstr "for skrivning"
+
+#: fdisk/sfdisk.c:2544
+msgid "for reading"
+msgstr "for l�sning"
+
+#: fdisk/sfdisk.c:2569
+#, c-format
+msgid "%s: OK\n"
+msgstr "%s: OK\n"
+
+#: fdisk/sfdisk.c:2586
+#, 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:2603
+#, c-format
+msgid "BLKGETSIZE ioctl failed for %s\n"
+msgstr "BLKGETSIZE ioctl mislykkedes for %s\n"
+
+#: fdisk/sfdisk.c:2680
+#, 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:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
+msgid ""
+"Done\n"
+"\n"
+msgstr ""
+"F�rdig\n"
+"\n"
+
+#: fdisk/sfdisk.c:2706
+#, 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 ""
+"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:2720
+#, 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:2777
+#, c-format
+msgid "Bad Id %x\n"
+msgstr "Ugyldig id %x\n"
+
+#: fdisk/sfdisk.c:2792
+msgid "This disk is currently in use.\n"
+msgstr "Denne disk er i brug for �jeblikket.\n"
+
+#: fdisk/sfdisk.c:2809
+#, c-format
+msgid "Fatal error: cannot find %s\n"
+msgstr "Fatal fejl: kunne ikke finde %s\n"
+
+#: fdisk/sfdisk.c:2812
+#, c-format
+msgid "Warning: %s is not a block device\n"
+msgstr "Advarsel: %s er ikke en blokenhed\n"
+
+#: fdisk/sfdisk.c:2818
+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:2820
+msgid ""
+"\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
+msgstr ""
+"\n"
+"Denne disk er for �jeblikket i brug - genpartitionering er nok i d�rlig "
+"id�.\n"
+"Afmonter alle filsystemer og 'swapoff' alle swappartitioner p� denne disk.\n"
+"Brug flaget --no-reread for at undertrykke dette tjek.\n"
+
+#: fdisk/sfdisk.c:2824
+msgid "Use the --force flag to overrule all checks.\n"
+msgstr "Brug flaget --force for at undertrykke alle tjek.\n"
+
+#: fdisk/sfdisk.c:2828
+msgid "OK\n"
+msgstr "OK\n"
+
+#: fdisk/sfdisk.c:2837
+msgid "Old situation:\n"
+msgstr "Gammel situation:\n"
+
+#: fdisk/sfdisk.c:2841
+#, 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:2849
+msgid "New situation:\n"
+msgstr "Ny situation:\n"
+
+#: fdisk/sfdisk.c:2854
+msgid ""
+"I don't like these partitions - nothing changed.\n"
+"(If you really want this, use the --force option.)\n"
+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:2857
+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:2862
+msgid "Are you satisfied with this? [ynq] "
+msgstr "Er du tilfreds med dette? [jna] "
+
+#: fdisk/sfdisk.c:2864
+msgid "Do you want to write this to disk? [ynq] "
+msgstr "Vil du virkelig skrive dette til disken? [jna] "
+
+#: fdisk/sfdisk.c:2869
+msgid ""
+"\n"
+"sfdisk: premature end of input\n"
+msgstr ""
+"\n"
+"sfdisk: inddata sluttede for tidligt\n"
+
+#: fdisk/sfdisk.c:2871
+msgid "Quitting - nothing changed\n"
+msgstr "Afslutter - intet blev �ndret\n"
+
+#: fdisk/sfdisk.c:2877
+msgid "Please answer one of y,n,q\n"
+msgstr "Svar venligst j,n,a\n"
+
+#: fdisk/sfdisk.c:2885
+msgid ""
+"Successfully wrote the new partition table\n"
+"\n"
+msgstr ""
+"Skrivning af ny partitionstabel lykkedes\n"
+"\n"
+
+#: fdisk/sfdisk.c:2891
+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 ""
+"Hvis du oprettede eller �ndrede en DOS-partition, f.eks. /dev/xxx7, s� brug\n"
+"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"
+
+#: games/banner.c:1045
+msgid "usage: banner [-w width]\n"
+msgstr "brug: banner [-w bredde]\n"
+
+#: games/banner.c:1065
+msgid "Message: "
+msgstr "Besked: "
+
+#: games/banner.c:1099
+#, c-format
+msgid "The character '%c' is not in my character set"
+msgstr "Tegnet '%c' findes ikke i mit tegns�t"
+
+#: games/banner.c:1107
+#, c-format
+msgid "Message '%s' is OK\n"
+msgstr "Beskeden '%s' er OK\n"
+
+#: getopt-1.1.0a/getopt.c:233
+msgid "Try `getopt --help' for more information.\n"
+msgstr "Brug 'getopt --help' for flere detaljer.\n"
+
+#: getopt-1.1.0a/getopt.c:299
+msgid "empty long option after -l or --long argument"
+msgstr "tomt 'long'�tilvalg efter -l eller --long"
+
+#: getopt-1.1.0a/getopt.c:319
+msgid "unknown shell after -s or --shell argument"
+msgstr "ukendt skal efter -s eller --shell"
+
+#: getopt-1.1.0a/getopt.c:324
+msgid "Usage: getopt optstring parameters\n"
+msgstr "Brug: getopt tilvalgsstreng parametre\n"
+
+#: getopt-1.1.0a/getopt.c:325
+msgid "       getopt [options] [--] optstring parameters\n"
+msgstr "       getopt [tilvalg] [--] tilvalgsstreng parametre\n"
+
+#: getopt-1.1.0a/getopt.c:326
+msgid "       getopt [options] -o|--options optstring [options] [--]\n"
+msgstr "       getopt [tilvalg] -o|--options tilvalgsstreng [tilvalg] [--]\n"
+
+#: getopt-1.1.0a/getopt.c:327
+msgid "              parameters\n"
+msgstr "              parametre\n"
+
+#: getopt-1.1.0a/getopt.c:328
+msgid "  -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative            Tillad lange tilvalg med enkelt -\n"
+
+#: getopt-1.1.0a/getopt.c:329
+msgid "  -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Denne lille brugsmanual\n"
+
+#: getopt-1.1.0a/getopt.c:330
+msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
+msgstr "  -l, --longoptions=langtilvalg  Lange tilvalg, der skal genkendes\n"
+
+#: getopt-1.1.0a/getopt.c:331
+msgid "  -n, --name=progname          The name under which errors are reported\n"
+msgstr "  -n, --name=prognavn          Navnet som fejl skal rapporteres under\n"
+
+#: getopt-1.1.0a/getopt.c:332
+msgid "  -o, --options=optstring      Short options to be recognized\n"
+msgstr "  -o, --options=tilvalgsstreng Korte tilvalg, der skal genkendes\n"
+
+#: getopt-1.1.0a/getopt.c:333
+msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  Undertryk fejlrapportering fra getopt(3)\n"
+
+#: getopt-1.1.0a/getopt.c:334
+msgid "  -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Ingen normale uddata\n"
+
+#: getopt-1.1.0a/getopt.c:335
+msgid "  -s, --shell=shell            Set shell quoting conventions\n"
+msgstr "  -s, --shell=skal             Angiv konventioner for anf�rselstegn\n"
+
+#: getopt-1.1.0a/getopt.c:336
+msgid "  -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Tjek getopt(1) version\n"
+
+#: getopt-1.1.0a/getopt.c:337
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -u, --unqote                 Indskyd ikke anf�rselstegn i uddata\n"
+
+#: getopt-1.1.0a/getopt.c:338
+msgid "  -V, --version                Output version information\n"
+msgstr "  -V, --version                Vis versionsinformation\n"
+
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
+msgid "missing optstring argument"
+msgstr "mangler tilvalgstreng-parameter"
+
+#: getopt-1.1.0a/getopt.c:441
+msgid "getopt (enhanced) 1.1.0\n"
+msgstr "getopt (udvidet) 1.1.0\n"
+
+#: getopt-1.1.0a/getopt.c:447
+msgid "internal error, contact the author."
+msgstr "intern fejl, kontakt programm�ren."
+
+#: kbd/kbdrate.c:138 kbd/kbdrate.c:276
+#, c-format
+msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
+msgstr "Tastaturhastighed sat til %.1f tps (pause = %d ms)\n"
+
+#: kbd/kbdrate.c:222
+msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
+msgstr "Brug: kbdrate [-V] [-s] [-r hastighed] [-d pause]\n"
+
+#: kbd/kbdrate.c:252
+msgid "Cannot open /dev/port"
+msgstr "Kunne ikke �bne /dev/port"
+
+#: login-utils/agetty.c:306
+msgid "calling open_tty\n"
+msgstr "kalder 'open_tty'\n"
+
+#. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
+#: login-utils/agetty.c:319
+msgid "calling termio_init\n"
+msgstr "kalder 'termio_init'\n"
+
+#: login-utils/agetty.c:324
+msgid "writing init string\n"
+msgstr "skriver init-streng\n"
+
+#. Optionally detect the baud rate from the modem status message.
+#: login-utils/agetty.c:334
+msgid "before autobaud\n"
+msgstr "f�r 'autobaud'\n"
+
+#: login-utils/agetty.c:346
+msgid "waiting for cr-lf\n"
+msgstr "venter p� cr-lf\n"
+
+#: login-utils/agetty.c:350
+#, c-format
+msgid "read %c\n"
+msgstr "l�s %c\n"
+
+#. Read the login name.
+#: login-utils/agetty.c:359
+msgid "reading login name\n"
+msgstr "l�ser loginnavn\n"
+
+#: login-utils/agetty.c:380
+#, c-format
+msgid "%s: can't exec %s: %m"
+msgstr "%s: kunne ikke udf�re %s: %m"
+
+#: login-utils/agetty.c:400
+msgid "can't malloc initstring"
+msgstr "kunne ikke allokere plads til inittekst (malloc)"
+
+#: login-utils/agetty.c:465
+#, c-format
+msgid "bad timeout value: %s"
+msgstr "ugyldig v�rdi for tidsudl�b: %s"
+
+#: login-utils/agetty.c:474
+msgid "after getopt loop\n"
+msgstr "efter 'getopt'-l�kke\n"
+
+#: login-utils/agetty.c:524
+msgid "exiting parseargs\n"
+msgstr "afslutter 'parseargs'\n"
+
+#: login-utils/agetty.c:536
+msgid "entered parse_speeds\n"
+msgstr "kom til 'parse_speeds'\n"
+
+#: login-utils/agetty.c:539
+#, c-format
+msgid "bad speed: %s"
+msgstr "ugyldig hastighed: %s"
+
+#: login-utils/agetty.c:541
+msgid "too many alternate speeds"
+msgstr "for mange forskellige hastigheder"
+
+#: login-utils/agetty.c:543
+msgid "exiting parsespeeds\n"
+msgstr "afslutter 'parsespeeds'\n"
+
+#: login-utils/agetty.c:616
+#, c-format
+msgid "%s: open for update: %m"
+msgstr "%s: �ben for opdatering: %m"
+
+#: login-utils/agetty.c:634
+#, c-format
+msgid "%s: no utmp entry"
+msgstr "%s: ingen utmp-indgang"
+
+#: login-utils/agetty.c:663
+#, c-format
+msgid "/dev: chdir() failed: %m"
+msgstr "/dev: chdir() mislykkedes: %m"
+
+#: login-utils/agetty.c:667
+#, c-format
+msgid "/dev/%s: not a character device"
+msgstr "/dev/%s: ikke en tegnenhed"
+
+#. ignore close(2) errors
+#: login-utils/agetty.c:674
+msgid "open(2)\n"
+msgstr "open(2)\n"
+
+#: login-utils/agetty.c:676
+#, c-format
+msgid "/dev/%s: cannot open as standard input: %m"
+msgstr "/dev/%s: kan ikke �bne som standard-ind: %m"
+
+#: login-utils/agetty.c:686
+#, c-format
+msgid "%s: not open for read/write"
+msgstr "%s: ikke �ben for l�sning/skrivning"
+
+#. Set up standard output and standard error file descriptors.
+#: login-utils/agetty.c:690
+msgid "duping\n"
+msgstr "duplikerer\n"
+
+#. set up stdout and stderr
+#: login-utils/agetty.c:692
+#, c-format
+msgid "%s: dup problem: %m"
+msgstr "%s: dup problem: %m"
+
+#: login-utils/agetty.c:762
+msgid "term_io 2\n"
+msgstr "term_io 2\n"
+
+#: login-utils/agetty.c:947
+msgid "user"
+msgstr "bruger"
+
+#: login-utils/agetty.c:947
+msgid "users"
+msgstr "brugere"
+
+#: login-utils/agetty.c:1035
+#, c-format
+msgid "%s: read: %m"
+msgstr "%s: l�st: %m"
+
+#: login-utils/agetty.c:1081
+#, c-format
+msgid "%s: input overrun"
+msgstr "%s: inddataoverl�b"
+
+#: login-utils/agetty.c:1205
+#, c-format
+msgid ""
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
+msgstr ""
+"Brug: %s [-hiLmw] [-l login_program] [-t tidsudl�b] [-I initstreng] [-H "
+"login_v�rt] baud_rate,... linie [termtype]\n"
+"eller\t[-hiLmw] [-l login_program] [-t tidsudl�b] [-I initstreng] [-H "
+"login_v�rt] linie baud_rate,... [termtype]\n"
+
+#: login-utils/checktty.c:41
+#, c-format
+msgid "badlogin: %s\n"
+msgstr "badlogin: %s\n"
+
+#: login-utils/checktty.c:47
+#, c-format
+msgid "sleepexit %d\n"
+msgstr "sleepexit %d\n"
+
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
+msgid "login: memory low, login may fail\n"
+msgstr "login: ikke megen hukommelse, login kan mislykkes\n"
+
+#: login-utils/checktty.c:104
+msgid "can't malloc for ttyclass"
+msgstr "kunne ikke allokere hukommelse for ttyclass (malloc)"
+
+#: login-utils/checktty.c:126
+msgid "can't malloc for grplist"
+msgstr "kunne ikke allokere hukommelse for grplist (malloc)"
+
+#. there was a default rule, but user didn't match, reject!
+#: login-utils/checktty.c:426
+#, c-format
+msgid "Login on %s from %s denied by default.\n"
+msgstr "Login p� %s fra %s afvises som standard.\n"
+
+#. if we get here, /etc/usertty exists, there's a line
+#. matching our username, but it doesn't contain the
+#. name of the tty where the user is trying to log in.
+#. So deny access!
+#: login-utils/checktty.c:437
+#, c-format
+msgid "Login on %s from %s denied.\n"
+msgstr "Login p� %s fra %s afvist.\n"
+
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
+#, c-format
+msgid "%s: you (user %d) don't exist.\n"
+msgstr "%s: du (bruger %d) eksisterer ikke.\n"
+
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
+#, c-format
+msgid "%s: user \"%s\" does not exist.\n"
+msgstr "%s: bruger \"%s\" eksisterer ikke.\n"
+
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
+#, c-format
+msgid "%s: can only change local entries; use yp%s instead.\n"
+msgstr "%s: kan kun �ndre lokale indgange; brug yp%s i stedet\n"
+
+#: login-utils/chfn.c:145
+#, c-format
+msgid "Changing finger information for %s.\n"
+msgstr "�ndrer finger-information for %s.\n"
+
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
+msgid "Password error."
+msgstr "Fejl i adgangskode."
+
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:290 mount/lomount.c:221
+#: mount/lomount.c:227
+msgid "Password: "
+msgstr "Adgangskode: "
+
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
+msgid "Incorrect password."
+msgstr "Ugyldig adgangskode."
+
+#: login-utils/chfn.c:189
+msgid "Finger information not changed.\n"
+msgstr "Finger-informationer ikke �ndret.\n"
+
+#: login-utils/chfn.c:292
+#, c-format
+msgid "Usage: %s [ -f full-name ] [ -o office ] "
+msgstr "Brug: %s [ -f fulde-navn ] [ -o kontor ] "
+
+#: login-utils/chfn.c:293
+msgid ""
+"[ -p office-phone ]\n"
+"\t[ -h home-phone ] "
+msgstr ""
+"[ -p kontor-telefon ]\n"
+"\t[ -h privat-telefon ] "
+
+#: login-utils/chfn.c:294
+msgid "[ --help ] [ --version ]\n"
+msgstr "[ --help ] [ --version ]\n"
+
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
+msgid ""
+"\n"
+"Aborted.\n"
+msgstr ""
+"\n"
+"Afbrudt.\n"
+
+#: login-utils/chfn.c:398
+msgid "field is too long.\n"
+msgstr "felt er for langt.\n"
+
+#: login-utils/chfn.c:406
+#, c-format
+msgid "'%c' is not allowed.\n"
+msgstr "'%c' er ikke tilladt.\n"
+
+#: login-utils/chfn.c:411
+msgid "Control characters are not allowed.\n"
+msgstr "Kontroltegn er ikke tilladte.\n"
+
+#: login-utils/chfn.c:476
+msgid "Finger information *NOT* changed.  Try again later.\n"
+msgstr "Finger-informationer *IKKE* �ndret. Pr�v igen senere.\n"
+
+#: login-utils/chfn.c:479
+msgid "Finger information changed.\n"
+msgstr "Finger-informationer �ndret.\n"
+
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
+msgid "malloc failed"
+msgstr "hukommelsesallokering mislykkedes (malloc)"
+
+#: login-utils/chsh.c:130
+#, c-format
+msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
+msgstr "%s: Din skal er ikke i /etc/shells, udskiftning af skal afvist\n"
+
+#: login-utils/chsh.c:137
+#, c-format
+msgid "Changing shell for %s.\n"
+msgstr "Udskifter skal for %s.\n"
+
+#: login-utils/chsh.c:178
+msgid "New shell"
+msgstr "Ny skal"
+
+#: login-utils/chsh.c:185
+msgid "Shell not changed.\n"
+msgstr "Skal ikke udskiftet.\n"
+
+#: login-utils/chsh.c:192
+msgid "Shell *NOT* changed.  Try again later.\n"
+msgstr "Skal *IKKE* udskiftet. Pr�v igen senere.\n"
+
+#: login-utils/chsh.c:195
+msgid "Shell changed.\n"
+msgstr "Skal udskiftet.\n"
+
+#: login-utils/chsh.c:263
+#, c-format
+msgid "Usage: %s [ -s shell ] "
+msgstr "Brug: %s [ -s skal ] "
+
+#: login-utils/chsh.c:264
+msgid "[ --list-shells ] [ --help ] [ --version ]\n"
+msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
+
+#: login-utils/chsh.c:265
+msgid "       [ username ]\n"
+msgstr "       [ brugernavn ]\n"
+
+#: login-utils/chsh.c:309
+#, c-format
+msgid "%s: shell must be a full path name.\n"
+msgstr "%s: skallen skal angives med hel sti.\n"
+
+#: login-utils/chsh.c:313
+#, c-format
+msgid "%s: \"%s\" does not exist.\n"
+msgstr "%s: \"%s\" eksisterer ikke.\n"
+
+#: login-utils/chsh.c:317
+#, c-format
+msgid "%s: \"%s\" is not executable.\n"
+msgstr "%s: \"%s\" er ikke k�rbar.\n"
+
+#: login-utils/chsh.c:324
+#, c-format
+msgid "%s: '%c' is not allowed.\n"
+msgstr "%s: '%c' er ikke tilladt.\n"
+
+#: login-utils/chsh.c:328
+#, c-format
+msgid "%s: Control characters are not allowed.\n"
+msgstr "%s: Kontroltegn er ikke tilladt.\n"
+
+#: login-utils/chsh.c:335
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells\n"
+msgstr "Advarsel: \"%s\" er ikke med i /etc/shells\n"
+
+#: login-utils/chsh.c:337
+#, c-format
+msgid "%s: \"%s\" is not listed in /etc/shells.\n"
+msgstr "%s: \"%s\" er ikke med i /etc/shells.\n"
+
+#: login-utils/chsh.c:339
+#, c-format
+msgid "%s: use -l option to see list\n"
+msgstr "%s: brug tilvalget -l for at se en liste\n"
+
+#: login-utils/chsh.c:345
+#, c-format
+msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
+msgstr "Advarsel: \"%s\" ikke med i /etc/shells.\n"
+
+#: login-utils/chsh.c:346
+#, c-format
+msgid "Use %s -l to see list.\n"
+msgstr "Brug %s -l for at se en liste.\n"
+
+#: login-utils/chsh.c:367
+msgid "No known shells.\n"
+msgstr "Ingen kendte skaller.\n"
+
+#: login-utils/cryptocard.c:68
+msgid "couldn't open /dev/urandom"
+msgstr "kunne ikke �bne /dev/urandom"
+
+#: login-utils/cryptocard.c:73
+msgid "couldn't read random data from /dev/urandom"
+msgstr "kunne ikke l�se tilf�ldige data fra /dev/urandom"
+
+#: login-utils/cryptocard.c:96
+#, c-format
+msgid "can't open %s for reading"
+msgstr "kunne ikke �bne for l�sning af %s"
+
+#: login-utils/cryptocard.c:100
+#, c-format
+msgid "can't stat(%s)"
+msgstr "kunne ikke stat(%s)"
+
+#: login-utils/cryptocard.c:106
+#, c-format
+msgid "%s doesn't have the correct filemodes"
+msgstr "%s har ikke de korrekte filmodi"
+
+#: login-utils/cryptocard.c:111
+#, c-format
+msgid "can't read data from %s"
+msgstr "kunne ikke l�se data fra %s"
+
+#: login-utils/islocal.c:37
+#, c-format
+msgid "Can't read %s, exiting."
+msgstr "Kunne ikke l�se %s, afbryder."
+
+#: login-utils/last.c:143
+msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
+msgstr "brug: last [-#] [-f fil] [-t tty] [-h tjerner] [bruger ...]\n"
+
+#: login-utils/last.c:279
+msgid "  still logged in"
+msgstr "  stadig logget p�"
+
+#: login-utils/last.c:301
+#, c-format
+msgid ""
+"\n"
+"wtmp begins %s"
+msgstr ""
+"\n"
+"wtmp starter %s"
+
+#: login-utils/last.c:357 login-utils/last.c:375 login-utils/last.c:426
+msgid "last: malloc failure.\n"
+msgstr "last: hukommelsesallokerings-fejl (malloc).\n"
+
+#: login-utils/last.c:402
+msgid "last: gethostname"
+msgstr "last: gethostname"
+
+#: login-utils/last.c:451
+#, c-format
+msgid ""
+"\n"
+"interrupted %10.10s %5.5s \n"
+msgstr ""
+"\n"
+"afbrudt %10.10s %5.5s \n"
+
+#: login-utils/login.c:373
+msgid "login: -h for super-user only.\n"
+msgstr "login: -h er kun for superbrugeren.\n"
+
+#: login-utils/login.c:398
+msgid "usage: login [-fp] [username]\n"
+msgstr "brug: login [-fp] [brugernavn]\n"
+
+#: login-utils/login.c:501
+#, c-format
+msgid "login: PAM Failure, aborting: %s\n"
+msgstr "login: PAM-fejl, afbryder: %s\n"
+
+#: login-utils/login.c:503
+#, c-format
+msgid "Couldn't initialize PAM: %s"
+msgstr "Kunne ikke klarg�re PAM: %s"
+
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
+#: login-utils/login.c:519
+msgid "login: "
+msgstr "login: "
+
+#: login-utils/login.c:553
+#, c-format
+msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
+msgstr "MISLYKKET LOGIN %d FRA %s FOR %s, %s"
+
+#: login-utils/login.c:555
+msgid ""
+"Login incorrect\n"
+"\n"
+msgstr ""
+"Login ugyldigt\n"
+"\n"
+
+#: login-utils/login.c:564
+#, 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:568
+#, c-format
+msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
+msgstr "MISLYKKET LOGINSESSION FRA %s FOR %s, %s"
+
+#: login-utils/login.c:571
+msgid ""
+"\n"
+"Login incorrect\n"
+msgstr ""
+"\n"
+"Login ugyldigt\n"
+
+#: login-utils/login.c:620
+msgid "Illegal username"
+msgstr "Ugyldigt brugernavn"
+
+#: login-utils/login.c:663
+#, c-format
+msgid "%s login refused on this terminal.\n"
+msgstr "%s login afvist p� denne terminal.\n"
+
+#: login-utils/login.c:668
+#, c-format
+msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
+msgstr "LOGIN %s AFVIST FRA %s P� TTY %s"
+
+#: login-utils/login.c:672
+#, c-format
+msgid "LOGIN %s REFUSED ON TTY %s"
+msgstr "LOGIN %s AFVIST P� TTY %s"
+
+#: login-utils/login.c:725
+msgid "Login incorrect\n"
+msgstr "Login ugyldigt\n"
+
+#: login-utils/login.c:747
+msgid ""
+"Too many users logged on already.\n"
+"Try again later.\n"
+msgstr ""
+"For mange brugere er allerede logget p�.\n"
+"Pr�v igen senere.\n"
+
+#: login-utils/login.c:751
+msgid "You have too many processes running.\n"
+msgstr "Du har for mange processer k�rende.\n"
+
+#: login-utils/login.c:797
+msgid "Warning: no Kerberos tickets issued\n"
+msgstr "Advarsel: ingen Kerberos-billetter udstedt\n"
+
+#: login-utils/login.c:809
+msgid "Sorry -- your password has expired.\n"
+msgstr "Beklager -- din adgangskode er udl�bet.\n"
+
+#: login-utils/login.c:815
+#, c-format
+msgid "Warning: your password expires on %d %s, %d.\n"
+msgstr "Advarsel: din adgangskode udl�ber den %d %s, %d.\n"
+
+#: login-utils/login.c:823
+msgid "Sorry -- your account has expired.\n"
+msgstr "Beklager -- din konto er udl�bet.\n"
+
+#: login-utils/login.c:829
+#, c-format
+msgid "Warning: your account expires on %d %s, %d.\n"
+msgstr "Advarsel: din konto udl�ber p� %d %s, %d.\n"
+
+#: login-utils/login.c:1066
+#, c-format
+msgid "DIALUP AT %s BY %s"
+msgstr "OPRINGNING KLOKKEN %s AF %s"
+
+#: login-utils/login.c:1073
+#, c-format
+msgid "ROOT LOGIN ON %s FROM %s"
+msgstr "ROOT LOGIN P� %s FRA %s"
+
+#: login-utils/login.c:1076
+#, c-format
+msgid "ROOT LOGIN ON %s"
+msgstr "ROOT LOGIN P� %s"
+
+#: login-utils/login.c:1079
+#, c-format
+msgid "LOGIN ON %s BY %s FROM %s"
+msgstr "LOGIN P� %s AF %s FRA %s"
+
+#: login-utils/login.c:1082
+#, c-format
+msgid "LOGIN ON %s BY %s"
+msgstr "LOGIN P� %s AF %s"
+
+#: login-utils/login.c:1094
+#, c-format
+msgid "You have %smail.\n"
+msgstr "Du har %sepost.\n"
+
+#: login-utils/login.c:1095
+msgid "new "
+msgstr "ny "
+
+#. error in fork()
+#: login-utils/login.c:1113
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "login: mislykket forgrening: %s"
+
+#: login-utils/login.c:1128
+msgid "setuid() failed"
+msgstr "setuid() mislykkedes"
+
+#: login-utils/login.c:1134
+#, c-format
+msgid "No directory %s!\n"
+msgstr "Intet katalog %s!\n"
+
+#: login-utils/login.c:1138
+msgid "Logging in with home = \"/\".\n"
+msgstr "Logger ind med hjemmekatalog = \"/\".\n"
+
+#: login-utils/login.c:1146
+msgid "login: no memory for shell script.\n"
+msgstr "login: ingen hukommelse for skal-skript.\n"
+
+#: login-utils/login.c:1174
+#, 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:1177
+#, c-format
+msgid "login: no shell: %s.\n"
+msgstr "login: ingen skal: %s.\n"
+
+#: login-utils/login.c:1191
+#, c-format
+msgid ""
+"\n"
+"%s login: "
+msgstr ""
+"\n"
+"%s login: "
+
+#: login-utils/login.c:1202
+msgid "login name much too long.\n"
+msgstr "loginnavn alt for langt.\n"
+
+#: login-utils/login.c:1203
+msgid "NAME too long"
+msgstr "for langt NAVN"
+
+#: login-utils/login.c:1210
+msgid "login names may not start with '-'.\n"
+msgstr "loginnavne m� ikke starte med '-'.\n"
+
+#: login-utils/login.c:1220
+msgid "too many bare linefeeds.\n"
+msgstr "for mange tomme linieskift,\n"
+
+#: login-utils/login.c:1221
+msgid "EXCESSIVE linefeeds"
+msgstr "VOLDSOMT MANGE linieskift"
+
+#: login-utils/login.c:1231
+#, c-format
+msgid "Login timed out after %d seconds\n"
+msgstr "Login udl�b efter %d sekunder\n"
+
+#: login-utils/login.c:1325
+#, c-format
+msgid "Last login: %.*s "
+msgstr "Sidste login: %.*s "
+
+#: login-utils/login.c:1329
+#, c-format
+msgid "from %.*s\n"
+msgstr "fra %.*s\n"
+
+#: login-utils/login.c:1332
+#, c-format
+msgid "on %.*s\n"
+msgstr "p� %.*s\n"
+
+#: login-utils/login.c:1355
+#, c-format
+msgid "LOGIN FAILURE FROM %s, %s"
+msgstr "LOGINFEJL FRA %s, %s"
+
+#: login-utils/login.c:1358
+#, c-format
+msgid "LOGIN FAILURE ON %s, %s"
+msgstr "LOGINFEJL p� %s, %s"
+
+#: login-utils/login.c:1362
+#, c-format
+msgid "%d LOGIN FAILURES FROM %s, %s"
+msgstr "%d LOGINFEJL fra %s, %s"
+
+#: login-utils/login.c:1365
+#, c-format
+msgid "%d LOGIN FAILURES ON %s, %s"
+msgstr "%d LOGINFEJL P� %s, %s"
+
+#: login-utils/mesg.c:89
+msgid "is y\n"
+msgstr "er j\n"
+
+#: login-utils/mesg.c:92
+msgid "is n\n"
+msgstr "er n\n"
+
+#: login-utils/mesg.c:112
+msgid "usage: mesg [y | n]\n"
+msgstr "usage: mesg [j | n]\n"
+
+#: login-utils/newgrp.c:67
+msgid "newgrp: Who are you?"
+msgstr "newgrp: Hvem er du?"
+
+#: login-utils/newgrp.c:75 login-utils/newgrp.c:85
+msgid "newgrp: setgid"
+msgstr "newgrp: setgid"
+
+#: login-utils/newgrp.c:80
+msgid "newgrp: No such group."
+msgstr "newgrp: Ingen s�dan gruppe."
+
+#: login-utils/newgrp.c:89
+msgid "newgrp: Permission denied"
+msgstr "newgrp: N�gtet adgang"
+
+#: login-utils/newgrp.c:96
+msgid "newgrp: setuid"
+msgstr "newgrp: setuid"
+
+#: login-utils/newgrp.c:102
+msgid "No shell"
+msgstr "Ingen skal"
+
+#: login-utils/passwd.c:159
+msgid "The password must have at least 6 characters, try again.\n"
+msgstr "Adgangskoden skal best� af mindst 6 tegn. Pr�v igen.\n"
+
+#: login-utils/passwd.c:172
+msgid "The password must contain characters out of two of the following\n"
+msgstr "Adgangskoden skal indeholde tegn fra de f�lgende to klasser:\n"
+
+#: login-utils/passwd.c:173
+msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
+msgstr "Store og sm� bogstaver, cifre og ikke-alfanumeriske tegn.\n"
+
+#: login-utils/passwd.c:174
+msgid "characters. See passwd(1) for more information.\n"
+msgstr "Se passwd(1) for flere detaljer.\n"
+
+#: login-utils/passwd.c:179
+msgid "You cannot reuse the old password.\n"
+msgstr "Du kan ikke genbruge den gamle adgangskode.\n"
+
+#: login-utils/passwd.c:184
+msgid "Please don't use something like your username as password!\n"
+msgstr "Brug venligst ikke brugernavn og lignende som adgangskode!\n"
+
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
+msgid "Please don't use something like your realname as password!\n"
+msgstr "Brug venligst ikke dit rigtige navn og lignende som adgangskode!\n"
+
+#: login-utils/passwd.c:220
+msgid "Usage: passwd [username [password]]\n"
+msgstr "Brug: passwd [brugernavn [adgangskode]]\n"
+
+#: login-utils/passwd.c:221
+msgid "Only root may use the one and two argument forms.\n"
+msgstr "Kun root kan bruge et- og to-parameter formater.\n"
+
+#: login-utils/passwd.c:275
+msgid "Usage: passwd [-foqsvV] [user [password]]\n"
+msgstr "Brug: passwd [-foqsvV] [bruger [adgangskode]]\n"
+
+#: login-utils/passwd.c:296
+#, c-format
+msgid "Can't exec %s: %s\n"
+msgstr "Kunne ikke udf�re %s: %s\n"
+
+#: login-utils/passwd.c:307
+msgid "Cannot find login name"
+msgstr "Kunne ikke finde loginnavn"
+
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
+msgid "Only root can change the password for others.\n"
+msgstr "Kun root kan �ndre adgangskoder for andre.\n"
+
+#: login-utils/passwd.c:329
+msgid "Too many arguments.\n"
+msgstr "For mange parametre.\n"
+
+#: login-utils/passwd.c:334
+#, c-format
+msgid "Can't find username anywhere. Is `%s' really a user?"
+msgstr "Kan ikke finde brugernavnet nogen steder. Er '%s' virkelig en bruger?"
+
+#: login-utils/passwd.c:338
+msgid "Sorry, I can only change local passwords. Use yppasswd instead."
+msgstr "Beklager, jeg kan kun �ndre lokale adgangskoder. Brug 'yppasswd' i stedet."
+
+#: login-utils/passwd.c:344
+msgid "UID and username does not match, imposter!"
+msgstr "UID og brugernavn passer ikke sammen."
+
+#: login-utils/passwd.c:349
+#, c-format
+msgid "Changing password for %s\n"
+msgstr "�ndrer adgangskode for %s\n"
+
+#: login-utils/passwd.c:353
+msgid "Enter old password: "
+msgstr "Indtast gammel adgangskode: "
+
+#: login-utils/passwd.c:355
+msgid "Illegal password, imposter."
+msgstr "Ugyldig adgangskode."
+
+#: login-utils/passwd.c:367
+msgid "Enter new password: "
+msgstr "Indtast ny adgangskode: "
+
+#: login-utils/passwd.c:369
+msgid "Password not changed."
+msgstr "Adgangskode ikke �ndret."
+
+#: login-utils/passwd.c:379
+msgid "Re-type new password: "
+msgstr "Gentag ny adgangskode: "
+
+#: login-utils/passwd.c:382
+msgid "You misspelled it. Password not changed."
+msgstr "Du stavede forkert. Adgangskoden blev ikke �ndret."
+
+#: login-utils/passwd.c:397
+#, c-format
+msgid "password changed, user %s"
+msgstr "adgangskode �ndret, bruger %s"
+
+#: login-utils/passwd.c:400
+msgid "ROOT PASSWORD CHANGED"
+msgstr "ROOT-ADGANGSKODE �NDRET"
+
+#: login-utils/passwd.c:402
+#, c-format
+msgid "password changed by root, user %s"
+msgstr "adgangskoden �ndret af root, bruger %s"
+
+#: login-utils/passwd.c:409
+msgid "calling setpwnam to set password.\n"
+msgstr "kalder setpwnam for at �ndre adgangskoden.\n"
+
+#: login-utils/passwd.c:413
+msgid "Password *NOT* changed.  Try again later.\n"
+msgstr "Adgangskode *IKKE* �ndret. Pr�v igen senere.\n"
+
+#: login-utils/passwd.c:419
+msgid "Password changed.\n"
+msgstr "Adgangskode �ndret.\n"
+
+#: login-utils/shutdown.c:109
+msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+msgstr "Brug: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
+
+#: login-utils/shutdown.c:127
+msgid "Shutdown process aborted"
+msgstr "Nedlukningsproces afbrudt"
+
+#: login-utils/shutdown.c:153
+#, c-format
+msgid "%s: Only root can shut a system down.\n"
+msgstr "%s: Kun root kan lukke systemet ned.\n"
+
+#: login-utils/shutdown.c:247
+msgid "That must be tomorrow, can't you wait till then?\n"
+msgstr "Det m� v�re i morgen. Kan du ikke vente s� l�nge?\n"
+
+#: login-utils/shutdown.c:299
+msgid "for maintenance; bounce, bounce"
+msgstr "for vedligeholdelse; hop af, hop af"
+
+#: login-utils/shutdown.c:303
+#, c-format
+msgid "timeout = %d, quiet = %d, reboot = %d\n"
+msgstr "tidsudl�b = %d, stille = %d, genstart = %d\n"
+
+#: login-utils/shutdown.c:328
+msgid "The system is being shut down within 5 minutes"
+msgstr "Systemet lukkes indenfor 5 minutter"
+
+#: login-utils/shutdown.c:332
+msgid "Login is therefore prohibited."
+msgstr "Derfor er login sp�rret."
+
+#: login-utils/shutdown.c:353
+#, c-format
+msgid "%s by %s: %s"
+msgstr "%s ved %s: %s"
+
+#: login-utils/shutdown.c:354
+msgid "rebooted"
+msgstr "genstartet"
+
+#: login-utils/shutdown.c:354
+msgid "halted"
+msgstr "stoppet helt"
+
+#. RB_AUTOBOOT
+#: login-utils/shutdown.c:417
+msgid ""
+"\n"
+"Why am I still alive after reboot?"
+msgstr ""
+"\n"
+"Hvorfor k�rer jeg stadig efter genstart?"
+
+#: login-utils/shutdown.c:419
+msgid ""
+"\n"
+"Now you can turn off the power..."
+msgstr ""
+"\n"
+"Du kan nu slukke for str�mmen..."
+
+#: login-utils/shutdown.c:435
+msgid "Calling kernel power-off facility...\n"
+msgstr "Kalder kernens sluknings-facilitet...\n"
+
+#: login-utils/shutdown.c:438
+#, c-format
+msgid "Error powering off\t%s\n"
+msgstr "Fejl ved slukning\t%s\n"
+
+#: login-utils/shutdown.c:446
+#, c-format
+msgid "Executing the program \"%s\" ...\n"
+msgstr "K�rer programmet \"%s\" ...\n"
+
+#: login-utils/shutdown.c:449
+#, c-format
+msgid "Error executing\t%s\n"
+msgstr "Fejl ved k�rsel af\t%s\n"
+
+#: login-utils/shutdown.c:472
+#, c-format
+msgid "URGENT: broadcast message from %s:"
+msgstr "HASTER: rundsendt besked fra %s"
+
+#: login-utils/shutdown.c:478
+msgid "System going down IMMEDIATELY!\n"
+msgstr "Systemet lukkes ned �JEBLIKKELIGT!\n"
+
+#: login-utils/shutdown.c:481
+#, c-format
+msgid "System going down in %d hour%s %d minutes"
+msgstr "Systemet lukkes ned om %d time%s %d minutter"
+
+#: login-utils/shutdown.c:482 login-utils/shutdown.c:485
+msgid "s"
+msgstr "r"
+
+#: login-utils/shutdown.c:484
+#, c-format
+msgid "System going down in %d minute%s\n"
+msgstr "Systemet lukkes ned om %d minutte%s\n"
+
+#: login-utils/shutdown.c:490
+#, c-format
+msgid "\t... %s ...\n"
+msgstr "\t... %s ...\n"
+
+#: login-utils/shutdown.c:547
+msgid "Cannot fork for swapoff. Shrug!"
+msgstr "Kunne ikke forgrene for swapoff. Suk!"
+
+#: login-utils/shutdown.c:555
+msgid "Cannot exec swapoff, hoping umount will do the trick."
+msgstr "Kunne ikke udf�re swapoff. H�ber, at umount vil klare det."
+
+#: login-utils/shutdown.c:574
+msgid "Cannot fork for umount, trying manually."
+msgstr "Kunne ikke forgrene umount, fors�ger selv."
+
+#: login-utils/shutdown.c:583
+#, c-format
+msgid "Cannot exec %s, trying umount.\n"
+msgstr "Kan ikke udf�re %s, fors�ger afmontering med umount.\n"
+
+#: login-utils/shutdown.c:587
+msgid "Cannot exec umount, giving up on umount."
+msgstr "Kunne ikke udf�re umount, opgiver afmontering."
+
+#: login-utils/shutdown.c:592
+msgid "Unmounting any remaining filesystems..."
+msgstr "Afmonterer resterende filsystemer..."
+
+#: login-utils/shutdown.c:628
+#, c-format
+msgid "shutdown: Couldn't umount %s: %s\n"
+msgstr "shutdown: Kunne ikke afmontere %s: %s\n"
+
+#: login-utils/simpleinit.c:114
+msgid "Booting to single user mode.\n"
+msgstr "Starter op i enkeltbrugertilstand.\n"
+
+#: login-utils/simpleinit.c:118
+msgid "exec of single user shell failed\n"
+msgstr "udf�relse af enkeltbruger-skal mislykkedes\n"
+
+#: login-utils/simpleinit.c:122
+msgid "fork of single user shell failed\n"
+msgstr "forgrening af enkeltbruger-skal mislykkedes\n"
+
+#: login-utils/simpleinit.c:174
+msgid "error opening fifo\n"
+msgstr "fejl ved �bning af fifo\n"
+
+#: login-utils/simpleinit.c:212
+msgid "error running finalprog\n"
+msgstr "fejl ved k�rsel af finalprog\n"
+
+#. Error
+#: login-utils/simpleinit.c:216
+msgid "error forking finalprog\n"
+msgstr "fejl ved fors�g p� at spalte processen finalprog\n"
+
+#: login-utils/simpleinit.c:295
+msgid ""
+"\n"
+"Wrong password.\n"
+msgstr ""
+"\n"
+"Forkert password.\n"
+
+#: login-utils/simpleinit.c:367
+msgid "stat of path failed\n"
+msgstr "kunne ikke finde sti\n"
+
+#: login-utils/simpleinit.c:374
+msgid "open of directory failed\n"
+msgstr "kunne ikke �bne katalog\n"
+
+#: login-utils/simpleinit.c:441
+msgid "fork failed\n"
+msgstr "forgrening mislykkedes\n"
+
+#: login-utils/simpleinit.c:472 text-utils/more.c:1621
+msgid "exec failed\n"
+msgstr "programk�rsel mislykkedes\n"
+
+#: login-utils/simpleinit.c:496
+msgid "cannot open inittab\n"
+msgstr "kunne ikke �bne inittab\n"
+
+#: login-utils/simpleinit.c:566
+msgid "no TERM or cannot stat tty\n"
+msgstr "ingen TERM eller kunne ikke finde tty\n"
+
+#: login-utils/simpleinit.c:875
+msgid "error running programme\n"
+msgstr "fejl ved k�rsel af program\n"
+
+#: login-utils/ttymsg.c:75
+msgid "too many iov's (change code in wall/ttymsg.c)"
+msgstr "for mange iov'er (�ndr kode i wall/ttymsg.c)"
+
+#: login-utils/ttymsg.c:85
+msgid "excessively long line arg"
+msgstr "utroligt lang linieparameter"
+
+#: login-utils/ttymsg.c:139
+msgid "cannot fork"
+msgstr "kunne ikke forgrene (fork)"
+
+#: login-utils/ttymsg.c:143
+#, c-format
+msgid "fork: %s"
+msgstr "fork: %s"
+
+#: login-utils/ttymsg.c:171
+#, c-format
+msgid "%s: BAD ERROR"
+msgstr "%s: UGYLDIG FEJL"
+
+#: login-utils/vipw.c:145
+#, c-format
+msgid "%s: the %s file is busy.\n"
+msgstr "%s: filen %s er optaget.\n"
+
+#: login-utils/vipw.c:161
+#, c-format
+msgid "%s: the %s file is busy (%s present)\n"
+msgstr "%s: filen %s er optaget. (%s eksisterer)\n"
+
+#: login-utils/vipw.c:167
+#, c-format
+msgid "%s: can't link %s: %s\n"
+msgstr "%s: kunne ikke l�nke %s: %s\n"
+
+#: login-utils/vipw.c:188
+#, c-format
+msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
+msgstr "%s: kunne ikke fjerne l�sen p� %s: %s (dine �ndringer er stadig i %s)\n"
+
+#: login-utils/vipw.c:211
+#, c-format
+msgid "%s: Cannot fork\n"
+msgstr "%s: Kunne ikke forgrene (fork)\n"
+
+#: login-utils/vipw.c:251
+#, c-format
+msgid "%s: %s unchanged\n"
+msgstr "%s: %s u�ndret\n"
+
+#: login-utils/vipw.c:294
+#, c-format
+msgid "%s: no changes made\n"
+msgstr "%s: intet �ndret\n"
+
+#: login-utils/wall.c:102
+#, c-format
+msgid "usage: %s [file]\n"
+msgstr "brug: %s [fil]\n"
+
+#: login-utils/wall.c:150
+#, c-format
+msgid "%s: can't open temporary file.\n"
+msgstr "%s: kunne ikke �bne midlertidig fil.\n"
+
+#: login-utils/wall.c:177
+#, c-format
+msgid "Broadcast Message from %s@%s"
+msgstr "Rundsendt meddelelse fra %s@%s"
+
+#: login-utils/wall.c:195
+#, c-format
+msgid "%s: will not read %s - use stdin.\n"
+msgstr "%s: kan ikke l�se %s - brug standard-inddata.\n"
+
+#: login-utils/wall.c:200
+#, c-format
+msgid "%s: can't read %s.\n"
+msgstr "%s: kunne ikke l�se %s.\n"
+
+#: login-utils/wall.c:222
+#, c-format
+msgid "%s: can't stat temporary file.\n"
+msgstr "%s: kunne ikke finde midlertidig fil.\n"
+
+#: login-utils/wall.c:231
+#, c-format
+msgid "%s: can't read temporary file.\n"
+msgstr "%s: kunne ikke l�se midlertidig fil.\n"
+
+#: misc-utils/cal.c:217
+msgid "illegal month value: use 1-12"
+msgstr "ugyldig m�nedsv�rdi: brug 1-12"
+
+#: misc-utils/cal.c:221
+msgid "illegal year value: use 1-9999"
+msgstr "ugyldig �rsv�rdi: brug 1-9999"
+
+#: misc-utils/cal.c:581
+msgid "usage: cal [-mjyV] [[month] year]\n"
+msgstr "brug: cal [-mjyV] [[m�ned] �r]\n"
+
+#: misc-utils/ddate.c:205
+#, c-format
+msgid "usage: %s [+format] [day month year]\n"
+msgstr "brug: %s [+format] [dag m�ned �r]\n"
+
+#. handle St. Tib's Day
+#: misc-utils/ddate.c:252
+msgid "St. Tib's Day"
+msgstr "St. Tibs-dag"
+
+#: misc-utils/kill.c:210
+#, c-format
+msgid "%s: unknown signal %s\n"
+msgstr "%s: ukendt signal %s\n"
+
+#: misc-utils/kill.c:272
+#, c-format
+msgid "%s: can't find process \"%s\"\n"
+msgstr "%s: kunne ikke finde processen \"%s\"\n"
+
+#: misc-utils/kill.c:316
+#, c-format
+msgid "%s: unknown signal %s; valid signals:\n"
+msgstr "%s: ukendt signal %s; gyldige signaler:\n"
+
+#: misc-utils/kill.c:356
+#, c-format
+msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
+msgstr "brug: %s [ -s signal | -p ] [ -a ] pid ...\n"
+
+#: misc-utils/kill.c:357
+#, c-format
+msgid "       %s -l [ signal ]\n"
+msgstr "       %s -l [ signal ]\n"
+
+#: misc-utils/logger.c:140
+#, c-format
+msgid "logger: %s: %s.\n"
+msgstr "logger: %s: %s.\n"
+
+#: misc-utils/logger.c:247
+#, c-format
+msgid "logger: unknown facility name: %s.\n"
+msgstr "logger: ukendt facilitetsnavn: %s.\n"
+
+#: misc-utils/logger.c:259
+#, c-format
+msgid "logger: unknown priority name: %s.\n"
+msgstr "logger: ukendt prioritetsnavn: %s.\n"
+
+#: misc-utils/logger.c:286
+msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr "brug: logger [-is] [-f fil] [-p pri] [-t m�rke] [-u sokkel] [ besked ... ]\n"
+
+#: misc-utils/look.c:348
+msgid "usage: look [-dfa] [-t char] string [file]\n"
+msgstr "brug: look [-dfa] [-t tegn] streng [fil]\n"
+
+#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
+#, c-format
+msgid "Could not open %s\n"
+msgstr "Kunne ikke �bne %s\n"
+
+#: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
+#, c-format
+msgid "Got %d bytes from %s\n"
+msgstr "Fik %d byte fra %s\n"
+
+#: misc-utils/namei.c:100
+#, c-format
+msgid "namei: unable to get current directory - %s\n"
+msgstr "namei: kunne ikke bestemme aktuelle katalog - %s\n"
+
+#: misc-utils/namei.c:111
+#, c-format
+msgid "namei: unable to chdir to %s - %s (%d)\n"
+msgstr "namei: kunne ikke skifte til kataloget %s - %s (%d)\n"
+
+#: misc-utils/namei.c:120
+msgid "usage: namei [-mx] pathname [pathname ...]\n"
+msgstr "brug: namei [-mx] sti [sti ...]\n"
+
+#: misc-utils/namei.c:145
+msgid "namei: could not chdir to root!\n"
+msgstr "namei: kunne ikke skifte til rodkataloget!\n"
+
+#: misc-utils/namei.c:152
+msgid "namei: could not stat root!\n"
+msgstr "namei: kunne ikke finde rodkataloget!\n"
+
+#: misc-utils/namei.c:207
+#, c-format
+msgid " ? could not chdir into %s - %s (%d)\n"
+msgstr " ? kunne ikke skifte til kataloget %s - %s (%d)\n"
+
+#: misc-utils/namei.c:236
+#, c-format
+msgid " ? problems reading symlink %s - %s (%d)\n"
+msgstr " ? problem ved l�sning af symbolsk l�nke %s - %s (%d)\n"
+
+#: misc-utils/namei.c:246
+msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
+msgstr "  *** OVERSKRED UNIX'S GR�NSE FOR ANTALLET AF SYMBOLSKE L�NKER ***\n"
+
+#: misc-utils/namei.c:283
+#, c-format
+msgid "namei: unknown file type 0%06o on file %s\n"
+msgstr "namei: ukendt filtype 0%06o for fil %s\n"
+
+#: misc-utils/rename.c:38
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: Hukommelse opbrugt\n"
+
+#: misc-utils/rename.c:56
+#, c-format
+msgid "%s: renaming %s to %s failed: %s\n"
+msgstr "%s: kunne ikke omd�be %s til %s: %s\n"
+
+#: misc-utils/rename.c:86
+#, c-format
+msgid "call: %s from to files...\n"
+msgstr "kald: %s fra-streng til-streng filer...\n"
+
+#: misc-utils/script.c:119
+msgid "usage: script [-a] [-f] [-q] [file]\n"
+msgstr "brug: script [-a] [-f] [-q] [fil]\n"
+
+#: misc-utils/script.c:140
+#, c-format
+msgid "Script started, file is %s\n"
+msgstr "'script' startet, filen er %s\n"
+
+#: misc-utils/script.c:206
+#, c-format
+msgid "Script started on %s"
+msgstr "'script' startet %s"
+
+#: misc-utils/script.c:270
+#, c-format
+msgid ""
+"\n"
+"Script done on %s"
+msgstr ""
+"\n"
+"'script' f�rdig %s"
+
+#: misc-utils/script.c:278
+#, c-format
+msgid "Script done, file is %s\n"
+msgstr "'script' f�rdig, filen er %s\n"
+
+#: misc-utils/script.c:289
+msgid "openpty failed\n"
+msgstr "openpty mislykkedes\n"
+
+#: misc-utils/script.c:323
+msgid "Out of pty's\n"
+msgstr "L�bet t�r for pty-er\n"
+
+#. Print error message about arguments, and the command's syntax.
+#: misc-utils/setterm.c:743
+#, c-format
+msgid "%s: Argument error, usage\n"
+msgstr "%s: Parameterfejl, brug\n"
+
+#: misc-utils/setterm.c:746
+msgid "  [ -term terminal_name ]\n"
+msgstr "  [ -term terminal_navn ]\n"
+
+#: misc-utils/setterm.c:747
+msgid "  [ -reset ]\n"
+msgstr "  [ -reset ]\n"
+
+#: misc-utils/setterm.c:748
+msgid "  [ -initialize ]\n"
+msgstr "  [ -initialize ]\n"
+
+#: misc-utils/setterm.c:749
+msgid "  [ -cursor [on|off] ]\n"
+msgstr "  [ -cursor [on|off] ]\n"
+
+#: misc-utils/setterm.c:751
+msgid "  [ -snow [on|off] ]\n"
+msgstr "  [ -snow [on|off] ]\n"
+
+#: misc-utils/setterm.c:752
+msgid "  [ -softscroll [on|off] ]\n"
+msgstr "  [ -softscroll [on|off] ]\n"
+
+#: misc-utils/setterm.c:754
+msgid "  [ -repeat [on|off] ]\n"
+msgstr "  [ -repeat [on|off] ]\n"
+
+#: misc-utils/setterm.c:755
+msgid "  [ -appcursorkeys [on|off] ]\n"
+msgstr "  [ -appcursorkeys [on|off] ]\n"
+
+#: misc-utils/setterm.c:756
+msgid "  [ -linewrap [on|off] ]\n"
+msgstr "  [ -linewrap [on|off] ]\n"
+
+#: misc-utils/setterm.c:757
+msgid "  [ -default ]\n"
+msgstr "  [ -default ]\n"
+
+#: misc-utils/setterm.c:758
+msgid "  [ -foreground black|blue|green|cyan"
+msgstr "  [ -foreground black|blue|green|cyan"
+
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
+msgid "|red|magenta|yellow|white|default ]\n"
+msgstr "|red|magenta|yellow|white|default ]\n"
+
+#: misc-utils/setterm.c:760
+msgid "  [ -background black|blue|green|cyan"
+msgstr "  [ -background black|blue|green|cyan"
+
+#: misc-utils/setterm.c:762
+msgid "  [ -ulcolor black|grey|blue|green|cyan"
+msgstr "  [ -ulcolor black|grey|blue|green|cyan"
+
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
+msgid "|red|magenta|yellow|white ]\n"
+msgstr "|red|magenta|yellow|white ]\n"
+
+#: misc-utils/setterm.c:764
+msgid "  [ -ulcolor bright blue|green|cyan"
+msgstr "  [ -ulcolor bright blue|green|cyan"
+
+#: misc-utils/setterm.c:766
+msgid "  [ -hbcolor black|grey|blue|green|cyan"
+msgstr "  [ -hbcolor black|grey|blue|green|cyan"
+
+#: misc-utils/setterm.c:768
+msgid "  [ -hbcolor bright blue|green|cyan"
+msgstr "  [ -hbcolor bright blue|green|cyan"
+
+#: misc-utils/setterm.c:771
+msgid "  [ -standout [ attr ] ]\n"
+msgstr "  [ -standout [ attr ] ]\n"
+
+#: misc-utils/setterm.c:773
+msgid "  [ -inversescreen [on|off] ]\n"
+msgstr "  [ -inversescreen [on|off] ]\n"
+
+#: misc-utils/setterm.c:774
+msgid "  [ -bold [on|off] ]\n"
+msgstr "  [ -bold [on|off] ]\n"
+
+#: misc-utils/setterm.c:775
+msgid "  [ -half-bright [on|off] ]\n"
+msgstr "  [ -half-bright [on|off] ]\n"
+
+#: misc-utils/setterm.c:776
+msgid "  [ -blink [on|off] ]\n"
+msgstr "  [ -blink [on|off] ]\n"
+
+#: misc-utils/setterm.c:777
+msgid "  [ -reverse [on|off] ]\n"
+msgstr "  [ -reverse [on|off] ]\n"
+
+#: misc-utils/setterm.c:778
+msgid "  [ -underline [on|off] ]\n"
+msgstr "  [ -underline [on|off] ]\n"
+
+#: misc-utils/setterm.c:779
+msgid "  [ -store ]\n"
+msgstr "  [ -store ]\n"
+
+#: misc-utils/setterm.c:780
+msgid "  [ -clear [all|rest] ]\n"
+msgstr "  [ -clear [all|rest] ]\n"
+
+#: misc-utils/setterm.c:781
+msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
+msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
+
+#: misc-utils/setterm.c:782
+msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
+msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
+
+#: misc-utils/setterm.c:783
+msgid "  [ -regtabs [1-160] ]\n"
+msgstr "  [ -regtabs [1-160] ]\n"
+
+#: misc-utils/setterm.c:784
+msgid "  [ -blank [0-60] ]\n"
+msgstr "  [ -blank [0-60] ]\n"
+
+#: misc-utils/setterm.c:785
+msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
+msgstr "  [ -dump   [1-ANTAL_KONSOLLER] ]\n"
+
+#: misc-utils/setterm.c:786
+msgid "  [ -append [1-NR_CONSOLES] ]\n"
+msgstr "  [ -append [1-ANTAL_KONSOLLER] ]\n"
+
+#: misc-utils/setterm.c:787
+msgid "  [ -file dumpfilename ]\n"
+msgstr "  [ -file dumpfilnavn ]\n"
+
+#: misc-utils/setterm.c:788
+msgid "  [ -msg [on|off] ]\n"
+msgstr "  [ -msg [on|off] ]\n"
+
+#: misc-utils/setterm.c:789
+msgid "  [ -msglevel [0-8] ]\n"
+msgstr "  [ -msglevel [0-8] ]\n"
+
+#: misc-utils/setterm.c:790
+msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
+
+#: misc-utils/setterm.c:791
+msgid "  [ -powerdown [0-60] ]\n"
+msgstr "  [ -powerdown [0-60] ]\n"
+
+#: misc-utils/setterm.c:792
+msgid "  [ -blength [0-2000] ]\n"
+msgstr "  [ -blength [0-2000] ]\n"
+
+#: misc-utils/setterm.c:793
+msgid "  [ -bfreq freqnumber ]\n"
+msgstr "  [ -bfreq freqnumber ]\n"
+
+#: misc-utils/setterm.c:862
+msgid "snow.on"
+msgstr "snow.on"
+
+#: misc-utils/setterm.c:864
+msgid "snow.off"
+msgstr "snow.off"
+
+#: misc-utils/setterm.c:870
+msgid "softscroll.on"
+msgstr "softscroll.on"
+
+#: misc-utils/setterm.c:872
+msgid "softscroll.off"
+msgstr "softscroll.off"
+
+#: misc-utils/setterm.c:1047
+msgid "cannot (un)set powersave mode\n"
+msgstr "kan ikke �ndre str�msparetilstand\n"
+
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
+#, c-format
+msgid "klogctl error: %s\n"
+msgstr "klogctl fejl: %s\n"
+
+#: misc-utils/setterm.c:1133
+#, c-format
+msgid "Error reading %s\n"
+msgstr "Fejl ved l�sning af %s\n"
+
+#: misc-utils/setterm.c:1148
+msgid "Error writing screendump\n"
+msgstr "Fejl ved skrivning af sk�rmkopi\n"
+
+#: misc-utils/setterm.c:1162
+#, c-format
+msgid "couldn't read %s, and cannot ioctl dump\n"
+msgstr "kunne hverken l�se %s eller udf�re ioctl dump\n"
+
+#: misc-utils/setterm.c:1227
+#, c-format
+msgid "%s: $TERM is not defined.\n"
+msgstr "%s: $TERM er ikke defineret.\n"
+
+#: misc-utils/tsort.c:117
+msgid "usage: tsort [ inputfile ]\n"
+msgstr "brug: tsort [ indfil ]\n"
+
+#: misc-utils/tsort.c:154
+msgid "tsort: odd data count.\n"
+msgstr "tsort: ulige dataantal.\n"
+
+#: misc-utils/tsort.c:305
+msgid "tsort: cycle in data.\n"
+msgstr "tsort: cykliske data.\n"
+
+#: misc-utils/tsort.c:318
+msgid "tsort: internal error -- could not find cycle.\n"
+msgstr "tsort: intern fejl -- kunne ikke finde cyklus.\n"
+
+#: misc-utils/whereis.c:155
+msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
+msgstr "whereis [ -sbmu ] [ -SBM katalog ... -f ] navn...\n"
+
+#: misc-utils/write.c:98
+msgid "write: can't find your tty's name\n"
+msgstr "write: kunne ikke finde din tty's navn\n"
+
+#: misc-utils/write.c:109
+msgid "write: you have write permission turned off.\n"
+msgstr "write: du har sl�et skriveadgang fra.\n"
+
+#: misc-utils/write.c:130
+#, c-format
+msgid "write: %s is not logged in on %s.\n"
+msgstr "write: %s er ikke logget ind p� %s.\n"
+
+#: misc-utils/write.c:138
+#, c-format
+msgid "write: %s has messages disabled on %s\n"
+msgstr "write: %s har deaktiveret beskeder p� %s\n"
+
+#: misc-utils/write.c:145
+msgid "usage: write user [tty]\n"
+msgstr "brug: write bruger [tty]\n"
+
+#: misc-utils/write.c:244
+#, c-format
+msgid "write: %s is not logged in\n"
+msgstr "write: %s er ikke logget p�\n"
+
+#: misc-utils/write.c:253
+#, c-format
+msgid "write: %s has messages disabled\n"
+msgstr "write: %s har deaktiveret beskeder\n"
+
+#: misc-utils/write.c:257
+#, c-format
+msgid "write: %s is logged in more than once; writing to %s\n"
+msgstr "write: %s er logget p� flere gange; skriver til %s\n"
+
+#: misc-utils/write.c:323
+#, c-format
+msgid "Message from %s@%s (as %s) on %s at %s ..."
+msgstr "Besked fra %s@%s (som %s) p� %s klokken %s ..."
+
+#: misc-utils/write.c:326
+#, c-format
+msgid "Message from %s@%s on %s at %s ..."
+msgstr "Besked fra %s@%s p� %s klokken %s ..."
+
+#: mount/fstab.c:113
+#, c-format
+msgid "warning: error reading %s: %s"
+msgstr "advarsel: fejl ved l�sning af %s: %s"
+
+#: mount/fstab.c:141 mount/fstab.c:164
+#, c-format
+msgid "warning: can't open %s: %s"
+msgstr "advarsel: kunne ikke �bne %s: %s"
+
+#: mount/fstab.c:145
+#, c-format
+msgid "mount: could not open %s - using %s instead\n"
+msgstr "mount: kunne ikke �bne %s - bruger %s i stedet\n"
+
+#. linktargetfile does not exist (as a file)
+#. and we cannot create it. Read-only filesystem?
+#. Too many files open in the system?
+#. Filesystem full?
+#: mount/fstab.c:374
+#, c-format
+msgid "can't create lock file %s: %s (use -n flag to override)"
+msgstr "kunne ikke oprette l�sefil %s: %s (gennemtving med flaget -n)"
+
+#: mount/fstab.c:386
+#, c-format
+msgid "can't link lock file %s: %s (use -n flag to override)"
+msgstr "kunne ikke l�nke l�sefilen %s: %s (gennemtving med flaget -n)"
+
+#: mount/fstab.c:398
+#, c-format
+msgid "can't open lock file %s: %s (use -n flag to override)"
+msgstr "kunne ikke �bne l�sefilen %s: %s (gennemtving med flaget -n)"
+
+#: mount/fstab.c:413
+#, c-format
+msgid "Can't lock lock file %s: %s\n"
+msgstr "Kunne ikke l�se l�sefilen %s: %s\n"
+
+#: mount/fstab.c:426
+#, c-format
+msgid "can't lock lock file %s: %s"
+msgstr "kunne ikke l�se l�sefilen %s: %s"
+
+#: mount/fstab.c:428
+msgid "timed out"
+msgstr "tidsoverl�b"
+
+#: mount/fstab.c:435
+#, c-format
+msgid ""
+"Cannot create link %s\n"
+"Perhaps there is a stale lock file?\n"
+msgstr ""
+"Kunne ikke oprette l�nken %s\n"
+"M�ske er der en efterladt l�sefil?\n"
+
+#: mount/fstab.c:484 mount/fstab.c:520
+#, c-format
+msgid "cannot open %s (%s) - mtab not updated"
+msgstr "kunne ikke �bne %s (%s) - mtab ikke opdateret"
+
+#: mount/fstab.c:528
+#, c-format
+msgid "error writing %s: %s"
+msgstr "fejl ved skrivning af %s: %s"
+
+#: mount/fstab.c:536
+#, c-format
+msgid "error changing mode of %s: %s\n"
+msgstr "fejl ved �ndring af filmodus for %s: %s\n"
+
+#: mount/fstab.c:544
+#, c-format
+msgid "can't rename %s to %s: %s\n"
+msgstr "kunne ikke omd�be %s til %s: %s\n"
+
+#: mount/lomount.c:78
+#, c-format
+msgid "loop: can't open device %s: %s\n"
+msgstr "loop: kunne ikke �bne enheden %s: %s\n"
+
+#: mount/lomount.c:84
+#, c-format
+msgid "loop: can't get info on device %s: %s\n"
+msgstr "loop: kunne ikke f� oplysninger om enheden %s: %s\n"
+
+#: mount/lomount.c:89
+#, c-format
+msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+msgstr "%s: [%04x]:%ld (%s) forskydning %d, %s kryptering\n"
+
+#: mount/lomount.c:148
+msgid "mount: could not find any device /dev/loop#"
+msgstr "mount: kunne ikke finde nogen /dev/loop# enhed"
+
+#: mount/lomount.c:152
+msgid ""
+"mount: Could not find any loop device.\n"
+"       Maybe /dev/loop# has a wrong major number?"
+msgstr ""
+"mount: Kunne ikke finde nogen loop-enhed.\n"
+"       M�ske har /dev/loop# forkert hovednummer?"
+
+#: mount/lomount.c:156
+#, c-format
+msgid ""
+"mount: Could not find any loop device, and, according to %s,\n"
+"       this kernel does not know about the loop device.\n"
+"       (If so, then recompile or `insmod loop.o'.)"
+msgstr ""
+"mount: Kunne ikke finde nogen loop-enhed, og if�lge %s\n"
+"       kender denne kerne ikke til loop-enheder.\n"
+"       (Hvis det er rigtigt, genovers�t kernen, eller 'insmod loop.o'.)"
+
+#: mount/lomount.c:162
+msgid ""
+"mount: Could not find any loop device. Maybe this kernel does not know\n"
+"       about the loop device (then recompile or `insmod loop.o'), or\n"
+"       maybe /dev/loop# has the wrong major number?"
+msgstr ""
+"mount: Kunne ikke finde nogen loop-enheder. M�ske kender denne kerne ikke\n"
+"       til loop-enheder (i s� fald genovers�t kernen, eller 'insmod "
+"loop.o'),\n"
+"       eller har /dev/loop# bare et forkert hovednummer?"
+
+#: mount/lomount.c:166
+msgid "mount: could not find any free loop device"
+msgstr "mount: kunne ikke finde nogen ledig loop-enhed"
+
+#: mount/lomount.c:197
+#, c-format
+msgid "Unsupported encryption type %s\n"
+msgstr "Ikke-underst�ttet krypteringstype %s\n"
+
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr "Kunne ikke l�se ind i hukommelsen, afslutter.\n"
+
+#: mount/lomount.c:231
+msgid "Init (up to 16 hex digits): "
+msgstr "Init (op til 16 hex-cifre): "
+
+#: mount/lomount.c:238
+#, c-format
+msgid "Non-hex digit '%c'.\n"
+msgstr "Ikke-hex ciffer '%c'.\n"
+
+#: mount/lomount.c:245
+#, c-format
+msgid "Don't know how to get key for encryption system %d\n"
+msgstr "Ved ikke, hvordan man f�r en n�gle til krypteringssystem %d\n"
+
+#: mount/lomount.c:261
+#, c-format
+msgid "set_loop(%s,%s,%d): success\n"
+msgstr "set_loop(%s,%s,%d): lykkedes\n"
+
+#: mount/lomount.c:272
+#, c-format
+msgid "loop: can't delete device %s: %s\n"
+msgstr "loop: kunne ikke slette enheden %s: %s\n"
+
+#: mount/lomount.c:282
+#, c-format
+msgid "del_loop(%s): success\n"
+msgstr "del_loop(%s): lykkedes\n"
+
+#: mount/lomount.c:290
+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:327
+#, c-format
+msgid ""
+"usage:\n"
+"  %s loop_device                                      # give info\n"
+"  %s -d loop_device                                   # delete\n"
+"  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
+msgstr ""
+"brug:\n"
+"  %s loop_enhed                                          # vis info\n"
+"  %s -d loop_enhed                                       # slet\n"
+"  %s [ -e kryptering ] [ -o forskydning ] loop_enhed fil # klarg�r\n"
+
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr "ikke nok hukommelse"
+
+#: mount/lomount.c:416
+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/mntent.c:165
+#, c-format
+msgid "[mntent]: warning: no final newline at the end of %s\n"
+msgstr "[mntent]: advarsel: intet afsluttende linieskift ved slutningen af %s\n"
+
+#: mount/mntent.c:216
+#, c-format
+msgid "[mntent]: line %d in %s is bad%s\n"
+msgstr "[mntent]: linie %d i %s er ugyldig%s\n"
+
+#: mount/mntent.c:219
+msgid "; rest of file ignored"
+msgstr "; resten af filen blev ignoreret"
+
+#: mount/mount_by_label.c:110
+#, c-format
+msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"mount: kunne ikke �bne %s, s� UUID- og M�RKE�konvertering kan ikke "
+"gennemf�res.\n"
+
+#: mount/mount_by_label.c:212
+msgid "mount: bad UUID"
+msgstr "mount: ugyldig UUID"
+
+#: mount/mount.c:383
+#, 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:387
+#, 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:408
+#, c-format
+msgid "mount: can't open %s for writing: %s"
+msgstr "mount: kunne ikke �bne %s for skrivning: %s"
+
+#: mount/mount.c:423 mount/mount.c:624
+#, c-format
+msgid "mount: error writing %s: %s"
+msgstr "mount: fejl ved skrivning til %s: %s"
+
+#: mount/mount.c:430
+#, c-format
+msgid "mount: error changing mode of %s: %s"
+msgstr "mount: fejl ved �ndring af filmodus for %s: %s"
+
+#: mount/mount.c:475
+#, c-format
+msgid "%s looks like swapspace - not mounted"
+msgstr "%s ligner et swap-omr�de - ikke monteret"
+
+#: mount/mount.c:518
+msgid "mount failed"
+msgstr "montering mislykkedes"
+
+#: mount/mount.c:520
+#, c-format
+msgid "mount: only root can mount %s on %s"
+msgstr "mount: kun root kan montere %s som %s"
+
+#: mount/mount.c:548
+msgid "mount: loop device specified twice"
+msgstr "mount: loop-enheden angivet to gange"
+
+#: mount/mount.c:553
+msgid "mount: type specified twice"
+msgstr "mount: type angivet to gange"
+
+#: mount/mount.c:565
+msgid "mount: skipping the setup of a loop device\n"
+msgstr "mount: dropper ops�tning af loop-enhed\n"
+
+#: mount/mount.c:574
+#, 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:578
+msgid "mount: failed setting up loop device\n"
+msgstr "mount: klarg�ring af loop-enhed mislykkedes\n"
+
+#: mount/mount.c:582
+msgid "mount: setup loop device successfully\n"
+msgstr "mount: klarg�ringen af loop-enhed lykkedes\n"
+
+#: mount/mount.c:619
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: kunne ikke �bne %s: %s"
+
+#: mount/mount.c:642
+#, c-format
+msgid "mount: cannot not open %s for setting speed"
+msgstr "mount: kunne ikke �bne %s for at s�tte hastigheden"
+
+#: mount/mount.c:645
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: kunne ikke s�tte hastigheden: %s"
+
+#: mount/mount.c:706 mount/mount.c:1235
+#, c-format
+msgid "mount: cannot fork: %s"
+msgstr "mount: kunne ikke forgrene: %s"
+
+#: mount/mount.c:780
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr "mount: denne version blev oversat uden underst�ttelse for 'nfs'-typen"
+
+#: mount/mount.c:820
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr "mount: montering af nfs version 4 mislykkedes, pr�ver version 3..\n"
+
+#: mount/mount.c:831
+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:834
+msgid "mount: you must specify the filesystem type"
+msgstr "mount: du skal angive filsystemtypen"
+
+#. should not happen
+#: mount/mount.c:837
+msgid "mount: mount failed"
+msgstr "mount: montering mislykkedes"
+
+#: mount/mount.c:843 mount/mount.c:878
+#, c-format
+msgid "mount: mount point %s is not a directory"
+msgstr "mount: monteringspunkt %s er ikke et katalog"
+
+#: mount/mount.c:845
+msgid "mount: permission denied"
+msgstr "mount: adgang n�gtet"
+
+#: mount/mount.c:847
+msgid "mount: must be superuser to use mount"
+msgstr "mount: skal v�re superbruger for at bruge 'mount'"
+
+#. heuristic: if /proc/version exists, then probably proc is mounted
+#. proc mounted?
+#: mount/mount.c:851 mount/mount.c:855
+#, c-format
+msgid "mount: %s is busy"
+msgstr "mount: %s er optaget"
+
+#. no
+#. yes, don't mention it
+#: mount/mount.c:857
+msgid "mount: proc already mounted"
+msgstr "mount: proc er allerede monteret"
+
+#: mount/mount.c:859
+#, c-format
+msgid "mount: %s already mounted or %s busy"
+msgstr "mount: enten er %s allerede monteret eller %s optaget"
+
+#: mount/mount.c:865
+#, c-format
+msgid "mount: mount point %s does not exist"
+msgstr "mount: monteringspunkt %s eksisterer ikke"
+
+#: mount/mount.c:867
+#, 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:870
+#, c-format
+msgid "mount: special device %s does not exist"
+msgstr "mount: specialenhed %s eksisterer ikke"
+
+#: mount/mount.c:880
+#, c-format
+msgid ""
+"mount: special device %s does not exist\n"
+"       (a path prefix is not a directory)\n"
+msgstr ""
+"mount: specialenhed %s eksisterer ikke\n"
+"       (en sti er ikke et katalog)\n"
+
+#: mount/mount.c:893
+#, c-format
+msgid "mount: %s not mounted already, or bad option"
+msgstr "mount: %s ikke allerede monteret, eller forkert tilvalg"
+
+#: mount/mount.c:895
+#, c-format
+msgid ""
+"mount: wrong fs type, bad option, bad superblock on %s,\n"
+"       or too many mounted file systems"
+msgstr ""
+"mount: forkert fs-type, forkert tilvalg, ugyldig superblok p� %s,\n"
+"       eller for mange monterede filsystemer"
+
+#: mount/mount.c:929
+msgid "mount table full"
+msgstr "monteringstabellen er fuld"
+
+#: mount/mount.c:931
+#, c-format
+msgid "mount: %s: can't read superblock"
+msgstr "mount: %s: kunne ikke l�se superblokken"
+
+#: mount/mount.c:935
+#, c-format
+msgid "mount: %s: unknown device"
+msgstr "mount: %s: ukendt enhed"
+
+#: mount/mount.c:940
+#, c-format
+msgid "mount: fs type %s not supported by kernel"
+msgstr "mount: fs-type %s underst�ttes ikke af kernen"
+
+#: mount/mount.c:952
+#, c-format
+msgid "mount: probably you meant %s"
+msgstr "mount: du mente sikkert %s"
+
+#: mount/mount.c:954
+msgid "mount: maybe you meant iso9660 ?"
+msgstr "mount: du mente m�ske iso9660 ?"
+
+#: mount/mount.c:957
+#, c-format
+msgid "mount: %s has wrong device number or fs type %s not supported"
+msgstr "mount: %s har forkert enhedsnummer eller fs-typen %s underst�ttes ikke"
+
+#. strange ...
+#: mount/mount.c:963
+#, 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:965
+#, c-format
+msgid ""
+"mount: the kernel does not recognize %s as a block device\n"
+"       (maybe `insmod driver'?)"
+msgstr ""
+"mount: kernen genkender ikke %s som en blokenhed\n"
+"       (m�ske hj�lper 'insmod enheds-driver'?)"
+
+#: mount/mount.c:968
+#, 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:971
+#, c-format
+msgid "mount: %s is not a block device"
+msgstr "mount: %s er ikke en blokenhed"
+
+#: mount/mount.c:974
+#, c-format
+msgid "mount: %s is not a valid block device"
+msgstr "mount: %s er ikke en gyldig blokenhed"
+
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:977
+msgid "block device "
+msgstr "blokenhed "
+
+#: mount/mount.c:979
+#, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount: kunne ikke montere %s%s skrivebeskyttet"
+
+#: mount/mount.c:983
+#, 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:999
+#, c-format
+msgid "mount: %s%s is write-protected, mounting read-only"
+msgstr "mount: %s%s er skrivebeskyttet, monterer skrivebeskyttet"
+
+#: mount/mount.c:1088
+#, c-format
+msgid "mount: going to mount %s by %s\n"
+msgstr "mount: vil montere %s som %s\n"
+
+#: mount/mount.c:1089
+msgid "UUID"
+msgstr "UUID"
+
+#: mount/mount.c:1089
+msgid "label"
+msgstr "m�rke"
+
+#: mount/mount.c:1091 mount/mount.c:1463
+msgid "mount: no such partition found"
+msgstr "mount: fandt ingen s�dan partition"
+
+#: mount/mount.c:1099
+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"
+
+#.
+#. * Retry in the background.
+#.
+#: mount/mount.c:1115
+#, c-format
+msgid "mount: backgrounding \"%s\"\n"
+msgstr "mount: k�rer \"%s\" i baggrunden\n"
+
+#: mount/mount.c:1126
+#, c-format
+msgid "mount: giving up \"%s\"\n"
+msgstr "mount: opgiver \"%s\"\n"
+
+#: mount/mount.c:1186
+#, c-format
+msgid "mount: %s already mounted on %s\n"
+msgstr "mount: %s er allerede monteret som %s\n"
+
+#: mount/mount.c:1303
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+"Brug:  mount -V                 : vis version\n"
+"       mount -h                 : vis denne hj�lp\n"
+"       mount                    : vis monterede filsystemer\n"
+"       mount -l                 : det samme, incl. m�rkater\n"
+"Tilvalgene ovenfor viser kun data. De n�ste er vedr�rer montering.\n"
+"Kommandoen lyder 'mount [-t fstype] noget et-sted'.\n"
+"Detaljer, der st�r i /etc/fstab, kan udelades.\n"
+"       mount -a                 : mont�r alt, som beskrives i /etc/fstab\n"
+"       mount enhed              : mont�r enhed p� dets standardplads\n"
+"       mount katalog            : mont�r enheden, tilh�rende katalog\n"
+"       mount -t type enh kat    : almindelig mount-kommando\n"
+"Bem�rk, at man i virkeligheden ikke monterer en enhed. Man monterer\n"
+"det filsystem (af en given type), som findes p� enheden.\n"
+"Man kan godt montere et allerede synligt katalog et andet sted:\n"
+"       mount --bind glkat nytkat\n"
+"En enhed kan angives ved navn, f.eks. /dev/hda1 eller /dev/cdrom,\n"
+"eller ved m�rkat med -L m�rkat, eller ved uuid med -U uuid .\n"
+"Samlede monteringer eller stak-montering angives med �n af:\n"
+"       --replace, --after, --before, --over\n"
+"       (udskift)  (efter)   (f�r)    (ovenp�)\n"
+"Andre tilvalg: [-nfFrsvw] [-o tilvalg].\n"
+"L�s mange flere detaljer med 'man 8 mount'.\n"
+
+#: mount/mount.c:1447
+msgid "mount: only root can do that"
+msgstr "mount: dette kan kun root g�re"
+
+#: mount/mount.c:1452
+#, c-format
+msgid "mount: no %s found - creating it..\n"
+msgstr "mount: ingen %s fundet - opretter den..\n"
+
+#: mount/mount.c:1465
+#, c-format
+msgid "mount: mounting %s\n"
+msgstr "mount: monterer %s\n"
+
+#: mount/mount.c:1474
+msgid "not mounted anything"
+msgstr "intet er monteret"
+
+#: mount/mount.c:1489
+#, c-format
+msgid "mount: cannot find %s in %s"
+msgstr "mount: kunne ikke finde %s i %s"
+
+#: mount/mount.c:1504
+#, c-format
+msgid "mount: can't find %s in %s or %s"
+msgstr "mount: kunne ikke finde %s i %s eller %s"
+
+#: mount/mount_guess_fstype.c:314
+#, 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_guess_fstype.c:317
+#, 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_guess_fstype.c:320
+msgid "       and it looks like this is swapspace\n"
+msgstr "       og det ser ud til, at dette er swapomr�de\n"
+
+#: mount/mount_guess_fstype.c:322
+#, c-format
+msgid "       I will try type %s\n"
+msgstr "       Jeg vil fors�ge type %s\n"
+
+#: mount/mount_guess_fstype.c:386
+#, c-format
+msgid "Trying %s\n"
+msgstr "Fors�ger %s\n"
+
+#: mount/nfsmount.c:232
+msgid "mount: excessively long host:dir argument\n"
+msgstr "mount: voldsomt langt 'v�rt:katalog'-parameter\n"
+
+#: mount/nfsmount.c:245
+msgid "mount: warning: multiple hostnames not supported\n"
+msgstr "mount: advarsel: angivelse af flere v�rtsnavne underst�ttes ikke\n"
+
+#: mount/nfsmount.c:249
+msgid "mount: directory to mount not in host:dir format\n"
+msgstr "mount: katalog, der monteres er ikke i formatet 'v�rt:katalog'\n"
+
+#: mount/nfsmount.c:260 mount/nfsmount.c:517
+#, c-format
+msgid "mount: can't get address for %s\n"
+msgstr "mount: kunne ikke f� adressen p� %s\n"
+
+#: mount/nfsmount.c:266
+msgid "mount: got bad hp->h_length\n"
+msgstr "mount: fik ugyldig hp->h_length\n"
+
+#: mount/nfsmount.c:283
+msgid "mount: excessively long option argument\n"
+msgstr "mount: voldsomt langt tilvalgsparameter\n"
+
+#: mount/nfsmount.c:375
+msgid "Warning: Unrecognized proto= option.\n"
+msgstr "Warning: Ukendt proto= tilvalg.\n"
+
+#: mount/nfsmount.c:382
+msgid "Warning: Option namlen is not supported.\n"
+msgstr "Warning: Tilvalget 'namlen' underst�ttes ikke.\n"
+
+#: mount/nfsmount.c:386
+#, c-format
+msgid "unknown nfs mount parameter: %s=%d\n"
+msgstr "ukendt nfs-montageparameter: %s=%d\n"
+
+#: mount/nfsmount.c:421
+msgid "Warning: option nolock is not supported.\n"
+msgstr "Advarsel: tilvalget 'nolock' underst�ttes ikke.\n"
+
+#: mount/nfsmount.c:426
+#, c-format
+msgid "unknown nfs mount option: %s%s\n"
+msgstr "ukendt nfs-montageparameter: %s%s\n"
+
+#: mount/nfsmount.c:523
+msgid "mount: got bad hp->h_length?\n"
+msgstr "mount: fik ugyldig hp->h_length?\n"
+
+#: mount/nfsmount.c:699
+msgid "NFS over TCP is not supported.\n"
+msgstr "NFS via TCP underst�ttes ikke.\n"
+
+#: mount/nfsmount.c:706
+msgid "nfs socket"
+msgstr "nfs-sokkel"
+
+#: mount/nfsmount.c:710
+msgid "nfs bindresvport"
+msgstr "nfs bindresvport"
+
+#: mount/nfsmount.c:721
+msgid "used portmapper to find NFS port\n"
+msgstr "benyttede portmapper til at finde NFS-port\n"
+
+#: mount/nfsmount.c:725
+#, c-format
+msgid "using port %d for nfs deamon\n"
+msgstr "bruger port %d til nfs-d�monen\n"
+
+#: mount/nfsmount.c:736
+msgid "nfs connect"
+msgstr "nfs-forbindelse"
+
+#: mount/nfsmount.c:823
+#, c-format
+msgid "unknown nfs status return value: %d"
+msgstr "ukendt nfs-statusv�rdi: %d"
+
+#: mount/sundries.c:66
+msgid "bug in xstrndup call"
+msgstr "programfejl i xstrndup-kald"
+
+#: mount/swapon.c:51
+#, c-format
+msgid ""
+"usage: %s [-hV]\n"
+"       %s -a [-v]\n"
+"       %s [-v] [-p priority] special ...\n"
+"       %s [-s]\n"
+msgstr ""
+"brug: %s [-hV]\n"
+"      %s -a [-v]\n"
+"      %s [-v] [-p prioritet] speciel ...\n"
+"      %s [-s]\n"
+
+#: mount/swapon.c:88
+#, c-format
+msgid "%s on %s\n"
+msgstr "%s p� %s\n"
+
+#: mount/swapon.c:93
+#, c-format
+msgid "swapon: cannot stat %s: %s\n"
+msgstr "swapon: kan ikke finde %s: %s\n"
+
+#: mount/swapon.c:100
+#, c-format
+msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
+msgstr "swapon: advarsel: %s har usikre filrettigheder %04o, 0600 anbefales\n"
+
+#: mount/swapon.c:108
+#, c-format
+msgid "swapon: Skipping file %s - it appears to have holes.\n"
+msgstr "swapon: Dropper filen %s - den lader til at v�re fragmenteret.\n"
+
+#: mount/swapon.c:213
+#, c-format
+msgid "%s: cannot open %s: %s\n"
+msgstr "%s: kunne ikke �bne %s: %s\n"
+
+#: mount/umount.c:72
+msgid "umount: compiled without support for -f\n"
+msgstr "umount: oversat uden underst�ttelse af tilvalget -f\n"
+
+#: mount/umount.c:125
+#, c-format
+msgid "host: %s, directory: %s\n"
+msgstr "v�rt: %s, katalog: %s\n"
+
+#: mount/umount.c:145
+#, c-format
+msgid "umount: can't get address for %s\n"
+msgstr "umount: kunne ikke f� adressen p� %s\n"
+
+#: mount/umount.c:150
+msgid "umount: got bad hostp->h_length\n"
+msgstr "umount: fik ugyldig hostp->h_length\n"
+
+#: mount/umount.c:188
+#, c-format
+msgid "umount: %s: invalid block device"
+msgstr "umount: %s: ugyldig blokenhed"
+
+#: mount/umount.c:190
+#, c-format
+msgid "umount: %s: not mounted"
+msgstr "umount: %s: ikke monteret"
+
+#: mount/umount.c:192
+#, c-format
+msgid "umount: %s: can't write superblock"
+msgstr "umount: %s: kunne ikke skrive superblok"
+
+#. Let us hope fstab has a line "proc /proc ..."
+#. and not "none /proc ..."
+#: mount/umount.c:196
+#, c-format
+msgid "umount: %s: device is busy"
+msgstr "umount: %s: enhed optaget"
+
+#: mount/umount.c:198
+#, c-format
+msgid "umount: %s: not found"
+msgstr "umount: %s: ikke fundet"
+
+#: mount/umount.c:200
+#, c-format
+msgid "umount: %s: must be superuser to umount"
+msgstr "umount: %s: skal v�re superbruger for at afmontere"
+
+#: mount/umount.c:202
+#, c-format
+msgid "umount: %s: block devices not permitted on fs"
+msgstr "umount: %s: blokenheder tillades ikke p� dette fs"
+
+#: mount/umount.c:204
+#, c-format
+msgid "umount: %s: %s"
+msgstr "umount: %s: %s"
+
+#: mount/umount.c:248
+msgid "no umount2, trying umount...\n"
+msgstr "ingen umount2, fors�ger umount...\n"
+
+#: mount/umount.c:261
+#, c-format
+msgid "could not umount %s - trying %s instead\n"
+msgstr "kunne ikke afmontere %s med umount - fors�ger %s i stedet\n"
+
+#: mount/umount.c:279
+#, c-format
+msgid "umount: %s busy - remounted read-only\n"
+msgstr "umount: %s optaget - genmonteret skrivebeskyttet\n"
+
+#: mount/umount.c:289
+#, c-format
+msgid "umount: could not remount %s read-only\n"
+msgstr "umount: kunne ikke montere %s skrivebeskyttet\n"
+
+#: mount/umount.c:297
+#, c-format
+msgid "%s umounted\n"
+msgstr "%s afmonteret\n"
+
+#: mount/umount.c:381
+msgid "umount: cannot find list of filesystems to unmount"
+msgstr "umount: kunne ikke finde listen over filsystemer, der skulle afmonteres"
+
+#: mount/umount.c:410
+msgid ""
+"Usage: umount [-hV]\n"
+"       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
+"       umount [-f] [-r] [-n] [-v] special | node...\n"
+msgstr ""
+"Brug: umount [-hV]\n"
+"      umount -a [-f] [-r] [-n] [-v] [-t vfstyper]\n"
+"      umount [-f] [-r] [-n] [-v] speciel | node...\n"
+
+#: mount/umount.c:471
+msgid "umount: only root can do that"
+msgstr "umount: dette kan kun root g�re"
+
+#: mount/umount.c:486
+#, c-format
+msgid "Trying to umount %s\n"
+msgstr "Fors�ger at afmontere %s\n"
+
+#: mount/umount.c:490
+#, c-format
+msgid "Could not find %s in mtab\n"
+msgstr "Kunne ikke finde %s i mtab\n"
+
+#: mount/umount.c:494
+#, c-format
+msgid "umount: %s is not mounted (according to mtab)"
+msgstr "umount: %s er ikke monteret (if�lge mtab)"
+
+#: mount/umount.c:496
+#, 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:508
+#, 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:511
+#, c-format
+msgid "umount: %s mount disagrees with the fstab"
+msgstr "umount: %s montering stemmer ikke med fstab"
+
+#: mount/umount.c:532
+#, c-format
+msgid "umount: only root can unmount %s from %s"
+msgstr "umount: kun root kan afmontere %s fra %s"
+
+#: mount/umount.c:543
+#, c-format
+msgid "umount: only %s can unmount %s from %s"
+msgstr "umount: kun %s kan afmontere %s fra %s"
+
+#: sys-utils/ctrlaltdel.c:26
+msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
+msgstr "Du skal v�re root for at s�tte Ctrl-Alt-Del-opf�rslen.\n"
+
+#: sys-utils/ctrlaltdel.c:41
+msgid "Usage: ctrlaltdel hard|soft\n"
+msgstr "Brug: ctrlaltdel hard|soft\n"
+
+#: sys-utils/cytune.c:120
+#, c-format
+msgid ""
+"File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
+"and the maximum transfer rate in characters/second was %f\n"
+msgstr ""
+"Filen %s, For gr�nsev�rdi %lu, Maksimale antal tegn i fifo var %d,\n"
+"og den maksimale overf�rselshastighed var %f tegn/sekund\n"
+
+#: sys-utils/cytune.c:131
+#, c-format
+msgid ""
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
+"in fifo were %d,\n"
+"and the maximum transfer rate in characters/second was %f\n"
+msgstr ""
+"Filen %s, For gr�nsev�rdi %lu og tidsoverl�bsv�rdi %lu, Maksimale antal tegn "
+"i fifo var %d,\n"
+"og den maksimale overf�rsleshastighed var %f tegn/sekund\n"
+
+#: sys-utils/cytune.c:196
+#, c-format
+msgid "Invalid interval value: %s\n"
+msgstr "Ugyldig intervalv�rdi: %s\n"
+
+#: sys-utils/cytune.c:204
+#, c-format
+msgid "Invalid set value: %s\n"
+msgstr "Ugyldig sat v�rdi: %s\n"
+
+#: sys-utils/cytune.c:212
+#, c-format
+msgid "Invalid default value: %s\n"
+msgstr "Ugyldig standardv�rdi: %s\n"
+
+#: sys-utils/cytune.c:220
+#, c-format
+msgid "Invalid set time value: %s\n"
+msgstr "Ugyldig sat tidsv�rdi: %s\n"
+
+#: sys-utils/cytune.c:228
+#, c-format
+msgid "Invalid default time value: %s\n"
+msgstr "Ugyldig standard tidsv�rdi: %s\n"
+
+#: sys-utils/cytune.c:245
+#, c-format
+msgid ""
+"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
+"[-g|-G] file [file...]\n"
+msgstr ""
+"Brug: %s [-q [-i interval]] ([-s v�rdi]|[-S v�rdi]) ([-t v�rdi]|[-T v�rdi]) "
+"[-g|-G] fil [fil...]\n"
+
+#: sys-utils/cytune.c:257 sys-utils/cytune.c:275 sys-utils/cytune.c:294
+#: sys-utils/cytune.c:342
+#, c-format
+msgid "Can't open %s: %s\n"
+msgstr "Kunne ikke �bne %s: %s\n"
+
+#: sys-utils/cytune.c:264
+#, c-format
+msgid "Can't set %s to threshold %d: %s\n"
+msgstr "Kunne ikke s�tte %s til gr�nsen %d: %s\n"
+
+#: sys-utils/cytune.c:282
+#, c-format
+msgid "Can't set %s to time threshold %d: %s\n"
+msgstr "Kunne ikke s�tte %s til tidsgr�nsen %d: %s\n"
+
+#: sys-utils/cytune.c:299 sys-utils/cytune.c:354 sys-utils/cytune.c:385
+#, c-format
+msgid "Can't get threshold for %s: %s\n"
+msgstr "Kunne ikke f� gr�nsen for %s: %s\n"
+
+#: sys-utils/cytune.c:305 sys-utils/cytune.c:360 sys-utils/cytune.c:391
+#, c-format
+msgid "Can't get timeout for %s: %s\n"
+msgstr "Kunne ikke f� tidsoverl�bet for %s: %s\n"
+
+#: sys-utils/cytune.c:309
+#, c-format
+msgid "%s: %ld %s threshold and %ld %s timeout\n"
+msgstr "%s: %ld %s gr�nse og %ld %s tidsoverl�b\n"
+
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
+msgid "current"
+msgstr "nuv�rende"
+
+#: sys-utils/cytune.c:311 sys-utils/cytune.c:313
+msgid "default"
+msgstr "standard"
+
+#: sys-utils/cytune.c:330
+msgid "Can't set signal handler"
+msgstr "Kunne ikke s�tte signalh�ndteringen"
+
+#: sys-utils/cytune.c:334 sys-utils/cytune.c:369
+msgid "gettimeofday failed"
+msgstr "gettimeofday (afl�sning af ur) mislykkedes"
+
+#: sys-utils/cytune.c:347 sys-utils/cytune.c:379
+#, c-format
+msgid "Can't issue CYGETMON on %s: %s\n"
+msgstr "Kunne ikke udf�re CYGETMON p� %s: %s\n"
+
+#: sys-utils/cytune.c:421
+#, c-format
+msgid "%s: %lu ints, %lu/%lu chars; "
+msgstr "%s: %lu heltal, %lu/%lu tegn; "
+
+#: sys-utils/cytune.c:422
+#, c-format
+msgid "fifo: %lu thresh, %lu tmout, "
+msgstr "fifo: %lu gr�nse, %lu t-ovl, "
+
+#: sys-utils/cytune.c:423
+#, c-format
+msgid "%lu max, %lu now\n"
+msgstr "%lu maks, %lu nu\n"
+
+#: sys-utils/cytune.c:428
+#, c-format
+msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
+msgstr "   %f tal/sek; %f flt, %f send (tegn/sek)\n"
+
+#: sys-utils/cytune.c:433
+#, c-format
+msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu htal, %lu tegn; fifo: %lu gr�nse, %lu t-ovl, %lu maks, %lu nu\n"
+
+#: sys-utils/cytune.c:438
+#, c-format
+msgid "   %f int/sec; %f rec (char/sec)\n"
+msgstr "   %f tal/sek; %f flt (tegn/sek)\n"
+
+#: sys-utils/dmesg.c:37
+#, c-format
+msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
+msgstr "Brug: %s [-c] [-n level] [-s bufstr.]\n"
+
+#: sys-utils/ipcrm.c:59
+#, c-format
+msgid "invalid id: %s\n"
+msgstr "ugyldigt id: %s\n"
+
+#: sys-utils/ipcrm.c:77
+#, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "kunne ikke fjerne id %s (%s)\n"
+
+#: sys-utils/ipcrm.c:91
+#, c-format
+msgid "usage: %s {shm | msg | sem} id ...\n"
+msgstr "brug: %s {shm | msg | sem} id ...\n"
+
+#: sys-utils/ipcrm.c:124
+#, c-format
+msgid "unknown resource type: %s\n"
+msgstr "ukendt ressourcetype %s\n"
+
+#: sys-utils/ipcrm.c:128
+msgid "resource(s) deleted\n"
+msgstr "ressource(r) slettet\n"
+
+#: sys-utils/ipcs.c:122
+#, c-format
+msgid "usage : %s -asmq -tclup \n"
+msgstr "brug : %s -asmq -tclup \n"
+
+#: sys-utils/ipcs.c:123
+#, c-format
+msgid "\t%s [-s -m -q] -i id\n"
+msgstr "\t%s [-s -m -q] -i id\n"
+
+#: sys-utils/ipcs.c:124
+#, c-format
+msgid "\t%s -h for help.\n"
+msgstr "\t%s -h for hj�lp.\n"
+
+#: sys-utils/ipcs.c:130
+#, c-format
+msgid "%s provides information on ipc facilities for"
+msgstr "%s viser information om de ipc-faciliteter,"
+
+#: sys-utils/ipcs.c:131
+msgid " which you have read access.\n"
+msgstr " du har l�seadgang til.\n"
+
+#: sys-utils/ipcs.c:132
+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"
+
+#: sys-utils/ipcs.c:133
+msgid ""
+"\t-s : semaphores\n"
+"\t-a : all (default)\n"
+msgstr ""
+"\t-s : semaforer\n"
+"\t-a : alle (standard)\n"
+
+#: sys-utils/ipcs.c:134
+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"
+
+#: sys-utils/ipcs.c:135
+msgid ""
+"\t-l : limits\n"
+"\t-u : summary\n"
+msgstr ""
+"\t-l : gr�nser\n"
+"\t-u : sammendrag\n"
+
+#: sys-utils/ipcs.c:136
+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"
+
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:487
+msgid "kernel not configured for shared memory\n"
+msgstr "kernen er ikke konfigureret til brug af delt hukommelse\n"
+
+#: sys-utils/ipcs.c:274
+msgid "------ Shared Memory Limits --------\n"
+msgstr "---- Gr�nser for delt hukommelse ---\n"
+
+#. glibc 2.1.3 and all earlier libc's have ints as fields
+#. of struct shminfo; glibc 2.1.91 has unsigned long; ach
+#: sys-utils/ipcs.c:279
+#, c-format
+msgid "max number of segments = %ld\n"
+msgstr "maks antal segmenter= %ld\n"
+
+#: sys-utils/ipcs.c:281
+#, c-format
+msgid "max seg size (kbytes) = %ld\n"
+msgstr "maks seg-st�r. (kbyte) = %ld\n"
+
+#: sys-utils/ipcs.c:283
+#, c-format
+msgid "max total shared memory (kbytes) = %ld\n"
+msgstr "maks total delt hukommelse (kbyte) = %ld\n"
+
+#: sys-utils/ipcs.c:285
+#, c-format
+msgid "min seg size (bytes) = %ld\n"
+msgstr "min seg-st�r. (byte) = %ld\n"
+
+#: sys-utils/ipcs.c:290
+msgid "------ Shared Memory Status --------\n"
+msgstr "---- Status for delt hukommelse ----\n"
+
+#: sys-utils/ipcs.c:291
+#, c-format
+msgid "segments allocated %d\n"
+msgstr "allokerede segmenter %d\n"
+
+#: sys-utils/ipcs.c:292
+#, c-format
+msgid "pages allocated %ld\n"
+msgstr "allokerede sider %ld\n"
+
+#: sys-utils/ipcs.c:293
+#, c-format
+msgid "pages resident  %ld\n"
+msgstr "sider i ram     %ld\n"
+
+#: sys-utils/ipcs.c:294
+#, c-format
+msgid "pages swapped   %ld\n"
+msgstr "sider i swap'et %ld\n"
+
+#: sys-utils/ipcs.c:295
+#, c-format
+msgid "Swap performance: %ld attempts\t %ld successes\n"
+msgstr "Swap pr�station: %ld fors�g\t %ld successer\n"
+
+#: sys-utils/ipcs.c:300
+msgid "------ Shared Memory Segment Creators/Owners --------\n"
+msgstr "---- Delte hukommelsessgementers skabere/ejere ------\n"
+
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:412 sys-utils/ipcs.c:510
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
+
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:318 sys-utils/ipcs.c:419
+msgid "shmid"
+msgstr "dthid"
+
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:319 sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:428 sys-utils/ipcs.c:511 sys-utils/ipcs.c:528
+msgid "perms"
+msgstr "rtghd"
+
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:413 sys-utils/ipcs.c:511
+msgid "cuid"
+msgstr "cuid"
+
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:413 sys-utils/ipcs.c:511
+msgid "cgid"
+msgstr "cgid"
+
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:413 sys-utils/ipcs.c:511
+msgid "uid"
+msgstr "uid"
+
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:511
+msgid "gid"
+msgstr "gid"
+
+#: sys-utils/ipcs.c:306
+msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
+msgstr "--- Delt hukommelse Til-/afkoblings-/�ndringstider -----\n"
+
+#: sys-utils/ipcs.c:307
+#, c-format
+msgid "%-10s%-10s  %-20s%-20s%-20s\n"
+msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
+
+#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:313 sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:428 sys-utils/ipcs.c:517
+#: sys-utils/ipcs.c:522 sys-utils/ipcs.c:528
+msgid "owner"
+msgstr "ejer"
+
+#: sys-utils/ipcs.c:308
+msgid "attached"
+msgstr "tilkoblet"
+
+#: sys-utils/ipcs.c:308
+msgid "detached"
+msgstr "afkoblet"
+
+#: sys-utils/ipcs.c:308
+msgid "changed"
+msgstr "�ndret"
+
+#: sys-utils/ipcs.c:312
+msgid "------ Shared Memory Creator/Last-op --------\n"
+msgstr "----- Delt hukommelse skaber/Sidste-op ------\n"
+
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:522
+#, c-format
+msgid "%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s%-10s%-10s%-10s\n"
+
+#: sys-utils/ipcs.c:313
+msgid "cpid"
+msgstr "cpid"
+
+#: sys-utils/ipcs.c:313
+msgid "lpid"
+msgstr "lpid"
+
+#: sys-utils/ipcs.c:317
+msgid "------ Shared Memory Segments --------\n"
+msgstr "----- Delte hukommelsessegmenter -----\n"
+
+#: sys-utils/ipcs.c:318
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
+
+#: sys-utils/ipcs.c:318 sys-utils/ipcs.c:428 sys-utils/ipcs.c:527
+msgid "key"
+msgstr "n�gle"
+
+#: sys-utils/ipcs.c:319
+msgid "bytes"
+msgstr "byte"
+
+#: sys-utils/ipcs.c:319
+msgid "nattch"
+msgstr "atlkbl"
+
+#: sys-utils/ipcs.c:319 sys-utils/ipcs.c:428
+msgid "status"
+msgstr "status"
+
+#: sys-utils/ipcs.c:339 sys-utils/ipcs.c:340 sys-utils/ipcs.c:341
+#: sys-utils/ipcs.c:449 sys-utils/ipcs.c:450 sys-utils/ipcs.c:548
+#: sys-utils/ipcs.c:549 sys-utils/ipcs.c:550
+msgid "Not set"
+msgstr "Ej sat"
+
+#: sys-utils/ipcs.c:366
+msgid "dest"
+msgstr "m�l"
+
+#: sys-utils/ipcs.c:367
+msgid "locked"
+msgstr "l�st"
+
+#: sys-utils/ipcs.c:387
+msgid "kernel not configured for semaphores\n"
+msgstr "kernen ikke konfigureret til semaforer\n"
+
+#: sys-utils/ipcs.c:393
+msgid "------ Semaphore Limits --------\n"
+msgstr "-------- Semaforgr�nser  -------\n"
+
+#: sys-utils/ipcs.c:397
+#, c-format
+msgid "max number of arrays = %d\n"
+msgstr "maks antal tabeller = %d\n"
+
+#: sys-utils/ipcs.c:398
+#, c-format
+msgid "max semaphores per array = %d\n"
+msgstr "maks semaforer per tabel = %d\n"
+
+#: sys-utils/ipcs.c:399
+#, c-format
+msgid "max semaphores system wide = %d\n"
+msgstr "maks semaforer i hele systemet = %d\n"
+
+#: sys-utils/ipcs.c:400
+#, c-format
+msgid "max ops per semop call = %d\n"
+msgstr "maks ops per semop-kald = %d\n"
+
+#: sys-utils/ipcs.c:401
+#, c-format
+msgid "semaphore max value = %d\n"
+msgstr "semafor maksv�rdi = %d\n"
+
+#: sys-utils/ipcs.c:405
+msgid "------ Semaphore Status --------\n"
+msgstr "-------- Semaforstatus  --------\n"
+
+#: sys-utils/ipcs.c:406
+#, c-format
+msgid "used arrays = %d\n"
+msgstr "brugte tabeller = %d\n"
+
+#: sys-utils/ipcs.c:407
+#, c-format
+msgid "allocated semaphores = %d\n"
+msgstr "allokerede semaforer = %d\n"
+
+#: sys-utils/ipcs.c:411
+msgid "------ Semaphore Arrays Creators/Owners --------\n"
+msgstr "------- Semafortabellers skabere/ejere ---------\n"
+
+#: sys-utils/ipcs.c:413 sys-utils/ipcs.c:428
+msgid "semid"
+msgstr "semid"
+
+#: sys-utils/ipcs.c:417
+msgid "------ Shared Memory Operation/Change Times --------\n"
+msgstr "---- Delt hukommelse operations-/�ndringstider -----\n"
+
+#: sys-utils/ipcs.c:418
+#, c-format
+msgid "%-8s%-10s  %-26.24s %-26.24s\n"
+msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
+
+#: sys-utils/ipcs.c:419
+msgid "last-op"
+msgstr "sidstop"
+
+#: sys-utils/ipcs.c:419
+msgid "last-changed"
+msgstr "sidst-�ndret"
+
+#: sys-utils/ipcs.c:426
+msgid "------ Semaphore Arrays --------\n"
+msgstr "-------- Semafortabeller --------\n"
+
+#: sys-utils/ipcs.c:427
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+
+#: sys-utils/ipcs.c:428
+msgid "nsems"
+msgstr "nsemf"
+
+#: sys-utils/ipcs.c:495
+msgid "------ Messages: Limits --------\n"
+msgstr "------ Beskeder: Gr�nser -------\n"
+
+#: sys-utils/ipcs.c:496
+#, c-format
+msgid "max queues system wide = %d\n"
+msgstr "maks k�er p� systemet = %d\n"
+
+#: sys-utils/ipcs.c:497
+#, c-format
+msgid "max size of message (bytes) = %d\n"
+msgstr "maks-st�rrelse af besked (byte) = %d\n"
+
+#: sys-utils/ipcs.c:498
+#, 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:502
+msgid "------ Messages: Status --------\n"
+msgstr "------ Beskeder: Status --------\n"
+
+#: sys-utils/ipcs.c:503
+#, c-format
+msgid "allocated queues = %d\n"
+msgstr "allokerede k�er= %d\n"
+
+#: sys-utils/ipcs.c:504
+#, c-format
+msgid "used headers = %d\n"
+msgstr "brugte hoveder = %d\n"
+
+#: sys-utils/ipcs.c:505
+#, c-format
+msgid "used space = %d bytes\n"
+msgstr "brugt plads = %d byte\n"
+
+#: sys-utils/ipcs.c:509
+msgid "------ Message Queues: Creators/Owners --------\n"
+msgstr "--------- Beskedk�er: skabere/ejere  ----------\n"
+
+#: sys-utils/ipcs.c:511 sys-utils/ipcs.c:517 sys-utils/ipcs.c:522
+#: sys-utils/ipcs.c:527
+msgid "msqid"
+msgstr "bk�id"
+
+#: sys-utils/ipcs.c:515
+msgid "------ Message Queues Send/Recv/Change Times --------\n"
+msgstr "------ Beskedk�er send/modtag/�ndrings-tider --------\n"
+
+#: sys-utils/ipcs.c:516
+#, c-format
+msgid "%-8s%-10s  %-20s%-20s%-20s\n"
+msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
+
+#: sys-utils/ipcs.c:517
+msgid "send"
+msgstr "send"
+
+#: sys-utils/ipcs.c:517
+msgid "recv"
+msgstr "modt"
+
+#: sys-utils/ipcs.c:517
+msgid "change"
+msgstr "�ndrng"
+
+#: sys-utils/ipcs.c:521
+msgid "------ Message Queues PIDs --------\n"
+msgstr "------ Beskedk�ers PIDer  ---------\n"
+
+#: sys-utils/ipcs.c:522
+msgid "lspid"
+msgstr "lspid"
+
+#: sys-utils/ipcs.c:522
+msgid "lrpid"
+msgstr "lrpid"
+
+#: sys-utils/ipcs.c:526
+msgid "------ Message Queues --------\n"
+msgstr "-------- Beskedk�er ----------\n"
+
+#: sys-utils/ipcs.c:527
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
+msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
+
+#: sys-utils/ipcs.c:528
+msgid "used-bytes"
+msgstr "brugte-byte"
+
+#: sys-utils/ipcs.c:528
+msgid "messages"
+msgstr "beskeder"
+
+#: sys-utils/ipcs.c:594
+#, c-format
+msgid ""
+"\n"
+"Shared memory Segment shmid=%d\n"
+msgstr ""
+"\n"
+"Delt hukommelsessegment dhsid=%d\n"
+
+#: sys-utils/ipcs.c:595
+#, 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:597
+#, c-format
+msgid "mode=%#o\taccess_perms=%#o\n"
+msgstr "modus=%#o\tadgangs_rett=%#o\n"
+
+#: sys-utils/ipcs.c:599
+#, c-format
+msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "byte=%d\tlpid=%d\tcpid=%d\tatilkbl=%ld\n"
+
+#: sys-utils/ipcs.c:602
+#, c-format
+msgid "att_time=%s"
+msgstr "tilk_tid=%s"
+
+#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:605 sys-utils/ipcs.c:661
+msgid "Not set\n"
+msgstr "Ikke sat\n"
+
+#: sys-utils/ipcs.c:604
+#, c-format
+msgid "det_time=%s"
+msgstr "frak_tid=%s"
+
+#: sys-utils/ipcs.c:606
+#, c-format
+msgid "change_time=%s"
+msgstr "�ndrings_tid=%s"
+
+#: sys-utils/ipcs.c:622
+#, c-format
+msgid ""
+"\n"
+"Message Queue msqid=%d\n"
+msgstr ""
+"\n"
+"Beskedk� bk�id=%d\n"
+
+#: sys-utils/ipcs.c:623
+#, c-format
+msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmodus=%#o\n"
+
+#: sys-utils/ipcs.c:625
+#, 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:634
+#, c-format
+msgid "send_time=%srcv_time=%schange_time=%s"
+msgstr "send_tid=%smodt_tid=%s�ndrings_tid=%s"
+
+#: sys-utils/ipcs.c:635 sys-utils/ipcs.c:636 sys-utils/ipcs.c:637
+msgid "Not Set\n"
+msgstr "Ikke sat\n"
+
+#: sys-utils/ipcs.c:654
+#, c-format
+msgid ""
+"\n"
+"Semaphore Array semid=%d\n"
+msgstr ""
+"\n"
+"Semafortabel semid=%d\n"
+
+#: sys-utils/ipcs.c:655
+#, 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:657
+#, c-format
+msgid "mode=%#o, access_perms=%#o\n"
+msgstr "modus=%#o, adgangs_rett=%#o\n"
+
+#: sys-utils/ipcs.c:659
+#, c-format
+msgid "nsems = %ld\n"
+msgstr "nsign = %ld\n"
+
+#: sys-utils/ipcs.c:660
+#, c-format
+msgid "otime = %s"
+msgstr "otid  = %s"
+
+#: sys-utils/ipcs.c:662
+#, c-format
+msgid "ctime = %s"
+msgstr "�tid  = %s"
+
+#: sys-utils/ipcs.c:664
+#, c-format
+msgid "%-10s%-10s%-10s%-10s%-10s\n"
+msgstr "%-10s%-10s%-10s%-10s%-10s\n"
+
+#: sys-utils/ipcs.c:665
+msgid "semnum"
+msgstr "sigant"
+
+#: sys-utils/ipcs.c:665
+msgid "value"
+msgstr "v�rdi"
+
+#: sys-utils/ipcs.c:665
+msgid "ncount"
+msgstr "nantal"
+
+#: sys-utils/ipcs.c:665
+msgid "zcount"
+msgstr "zantal"
+
+#: sys-utils/ipcs.c:665
+msgid "pid"
+msgstr "pid"
+
+#: sys-utils/rdev.c:67
+msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+msgstr "brug: rdev [ -rsv ] [ -o FORSKYDNING ] [ BILLEDE [ V�RDI [ FORSKYDNING ] ] ]"
+
+#: sys-utils/rdev.c:68
+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:69
+msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
+msgstr "  rdev /dev/fd0 /dev/hda2         s�tter fs-roden til /dev/hda2"
+
+#: sys-utils/rdev.c:70
+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:71
+msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
+msgstr "  rdev -s /dev/fd0 /dev/hda2      angiv SWAP-enhed"
+
+#: sys-utils/rdev.c:72
+msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
+msgstr "  rdev -r /dev/fd0 627            angiv RAMDISK-st�rrelsen"
+
+#: sys-utils/rdev.c:73
+msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
+msgstr "  rdev -v /dev/fd0 1              angiv opstarts-sk�rmtilstand"
+
+#: sys-utils/rdev.c:74
+msgid "  rdev -o N ...                   use the byte offset N"
+msgstr "  rdev -o N ...                   brug byteforskydning N"
+
+#: sys-utils/rdev.c:75
+msgid "  rootflags ...                   same as rdev -R"
+msgstr "  rootflags ...                   samme som rdev -R"
+
+#: sys-utils/rdev.c:76
+msgid "  swapdev ...                     same as rdev -s"
+msgstr "  swapdev ...                     samme som rdev -s"
+
+#: sys-utils/rdev.c:77
+msgid "  ramsize ...                     same as rdev -r"
+msgstr "  ramsize ...                     samme som rdev -r"
+
+#: sys-utils/rdev.c:78
+msgid "  vidmode ...                     same as rdev -v"
+msgstr "  vidmode ...                     samme som rdev -v"
+
+#: sys-utils/rdev.c:79
+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:80
+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/readprofile.c:52
+#, c-format
+msgid ""
+"%s: Usage: \"%s [options]\n"
+"\t -m <mapfile>  (default = \"%s\")\n"
+"\t -p <pro-file> (default = \"%s\")\n"
+"\t -i            print only info about the sampling step\n"
+"\t -v            print verbose data\n"
+"\t -a            print all symbols, even if count is 0\n"
+"\t -r            reset all the counters (root only)\n"
+"\t -V            print version and exit\n"
+msgstr ""
+"%s: Brug: \"%s [tilvalg]\n"
+"\t -m <oversigtsfil> (standard = \"%s\")\n"
+"\t -p <pro-file>     (standard = \"%s\")\n"
+"\t -i                vis kun sample-skridt oplysninger\n"
+"\t -v                medtag flere detaljer\n"
+"\t -a                vis alle symboler selvom t�lleren er 0\n"
+"\t -r                nulstil alle t�llere (kun root)\n"
+"\t -V                vis version og afslut\n"
+
+#: sys-utils/readprofile.c:116
+#, c-format
+msgid "%s Version %s\n"
+msgstr "%s Version %s\n"
+
+#: sys-utils/readprofile.c:128
+msgid "anything\n"
+msgstr "hvad som helst\n"
+
+#: sys-utils/readprofile.c:157
+#, c-format
+msgid "Sampling_step: %i\n"
+msgstr "Sampling_step: %i\n"
+
+#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
+#, c-format
+msgid "%s: %s(%i): wrong map line\n"
+msgstr "%s: %s(%i): forkert oversigtlinie\n"
+
+#: sys-utils/readprofile.c:183
+#, c-format
+msgid "%s: can't find \"_stext\" in %s\n"
+msgstr "%s: kunne ikke finde \"_stext\" i %s\n"
+
+#: sys-utils/readprofile.c:226
+msgid "total"
+msgstr "total"
+
+#: sys-utils/renice.c:67
+msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr "brug: renice prioritet [ [ -p ] pids ] [ [ -g ] pgrpr ] [ [ -u ] brugere ]\n"
+
+#: sys-utils/renice.c:94
+#, c-format
+msgid "renice: %s: unknown user\n"
+msgstr "renice: %s: ukendt bruger\n"
+
+#: sys-utils/renice.c:102
+#, c-format
+msgid "renice: %s: bad value\n"
+msgstr "renice: %s: ugyldig v�rdi\n"
+
+#: sys-utils/renice.c:121
+msgid "getpriority"
+msgstr "l�sprioritet"
+
+#: sys-utils/renice.c:126
+msgid "setpriority"
+msgstr "s�tprioritet"
+
+#: sys-utils/renice.c:129
+#, c-format
+msgid "%d: old priority %d, new priority %d\n"
+msgstr "%d: gammel prioritet %d, ny prioritet %d\n"
+
+#: sys-utils/setsid.c:23
+#, c-format
+msgid "usage: %s program [arg ...]\n"
+msgstr "brug: %s program [parametre ...]\n"
+
+#: sys-utils/tunelp.c:74
+#, c-format
+msgid ""
+"Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
+msgstr ""
+"Brug: %s <enhed> [ -i <IRQ> | -t <TID> | -c <TEGN> | -w <VENT> | \n"
+"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
+"          -T [on|off] ]\n"
+
+#: sys-utils/tunelp.c:90
+msgid "malloc error"
+msgstr "fejl ved hukommelsallokering (malloc)"
+
+#: sys-utils/tunelp.c:102
+#, c-format
+msgid "%s: bad value\n"
+msgstr "%s: ugyldig v�rdi\n"
+
+#: sys-utils/tunelp.c:241
+#, c-format
+msgid "%s: %s not an lp device.\n"
+msgstr "%s: %s ikke en printerenhed.\n"
+
+#: sys-utils/tunelp.c:262
+#, c-format
+msgid "%s status is %d"
+msgstr "%s status er %d"
+
+#: sys-utils/tunelp.c:263
+msgid ", busy"
+msgstr ", optaget"
+
+#: sys-utils/tunelp.c:264
+msgid ", ready"
+msgstr ", klar"
+
+#: sys-utils/tunelp.c:265
+msgid ", out of paper"
+msgstr ", ikke mere papir"
+
+#: sys-utils/tunelp.c:266
+msgid ", on-line"
+msgstr ", klar"
+
+#: sys-utils/tunelp.c:267
+msgid ", error"
+msgstr ", fejl"
+
+#: sys-utils/tunelp.c:284
+msgid "LPGETIRQ error"
+msgstr "LPGETIRQ fejl"
+
+#: sys-utils/tunelp.c:290
+#, c-format
+msgid "%s using IRQ %d\n"
+msgstr "%s ved brug af IRQ %d\n"
+
+#: sys-utils/tunelp.c:292
+#, c-format
+msgid "%s using polling\n"
+msgstr "%s bruger overv�gning (polling)\n"
+
+#: text-utils/col.c:155
+#, c-format
+msgid "col: bad -l argument %s.\n"
+msgstr "col: ugyldigt -l parameter %s.\n"
+
+#: text-utils/col.c:537
+msgid "usage: col [-bfpx] [-l nline]\n"
+msgstr "brug: col [-bfpx] [-l antlinier]\n"
+
+#: text-utils/col.c:543
+msgid "col: write error.\n"
+msgstr "col: skrivefejl.\n"
+
+#: text-utils/col.c:550
+#, c-format
+msgid "col: warning: can't back up %s.\n"
+msgstr "col: advarsel: kan ikke sikkerhedskopiere %s.\n"
+
+#: text-utils/col.c:551
+msgid "past first line"
+msgstr "forbi f�rste linie"
+
+#: text-utils/col.c:551
+msgid "-- line already flushed"
+msgstr "-- linie allerede skrevet ud"
+
+#: text-utils/colcrt.c:96
+#, c-format
+msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
+msgstr "brug: %s [ - ] [ -2 ] [ fil ... ]\n"
+
+#: text-utils/column.c:300
+msgid "line too long"
+msgstr "for lang linie"
+
+#: text-utils/column.c:377
+msgid "usage: column [-tx] [-c columns] [file ...]\n"
+msgstr "brug: column [-tx] [-c s�jler] [fil ...]\n"
+
+#: text-utils/hexsyntax.c:80
+msgid "hexdump: bad length value.\n"
+msgstr "hexdump: forkert l�ngdev�rdi.\n"
+
+#: text-utils/hexsyntax.c:91
+msgid "hexdump: bad skip value.\n"
+msgstr "hexdump: ugyldig oversprings-v�rdi.\n"
+
+#: text-utils/hexsyntax.c:129
+msgid "hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr ""
+"hexdump: [-bcdovx] [-e fmt] [-f fmt_fil] [-n l�ngde] [-s overspring] [fil "
+"...]\n"
+
+#: text-utils/more.c:262
+#, c-format
+msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "brug: %s [-dflpcsu] [+linieantal | +/m�nster] navn1 navn2 ...\n"
+
+#: text-utils/more.c:520
+#, c-format
+msgid ""
+"\n"
+"*** %s: directory ***\n"
+"\n"
+msgstr ""
+"\n"
+"*** %s: katalog ***\n"
+"\n"
+
+#. simple ELF detection
+#: text-utils/more.c:559
+#, c-format
+msgid ""
+"\n"
+"******** %s: Not a text file ********\n"
+"\n"
+msgstr ""
+"\n"
+"******** %s: Ikke en tekstfil ********\n"
+"\n"
+
+#: text-utils/more.c:662
+msgid "[Use q or Q to quit]"
+msgstr "[Brug q eller Q for at afslutte]"
+
+#: text-utils/more.c:842
+msgid "--More--"
+msgstr "--Mere--"
+
+#: text-utils/more.c:844
+#, c-format
+msgid "(Next file: %s)"
+msgstr "(N�ste fil: %s)"
+
+#: text-utils/more.c:850
+msgid "[Press space to continue, 'q' to quit.]"
+msgstr "[Tryk mellemrum for at forts�tte, 'q' for at afslutte.]"
+
+#: text-utils/more.c:1184
+#, c-format
+msgid "...back %d page"
+msgstr "...bak %d sider"
+
+#: text-utils/more.c:1230
+#, c-format
+msgid "...skipping %d line"
+msgstr "...overspringer %d linie"
+
+#: text-utils/more.c:1271
+msgid ""
+"\n"
+"***Back***\n"
+"\n"
+msgstr ""
+"\n"
+"***Tilbage***\n"
+"\n"
+
+#: text-utils/more.c:1328
+msgid "Can't open help file"
+msgstr "Kunne ikke �bne hj�lpefilen"
+
+#: text-utils/more.c:1358 text-utils/more.c:1362
+msgid "[Press 'h' for instructions.]"
+msgstr "[Tryk 'h' for instruktioner.]"
+
+#: text-utils/more.c:1396
+#, c-format
+msgid "\"%s\" line %d"
+msgstr "\"%s\" linie %d"
+
+#: text-utils/more.c:1398
+#, c-format
+msgid "[Not a file] line %d"
+msgstr "[Ikke en fil] linie %d"
+
+#: text-utils/more.c:1482
+msgid "  Overflow\n"
+msgstr "  Overl�b\n"
+
+#: text-utils/more.c:1529
+msgid "...skipping\n"
+msgstr "...overspringer\n"
+
+#: text-utils/more.c:1559
+msgid "Regular expression botch"
+msgstr "Forkludret regul�rt udtryk"
+
+#: text-utils/more.c:1571
+msgid ""
+"\n"
+"Pattern not found\n"
+msgstr ""
+"\n"
+"M�nster ikke fundet\n"
+
+#: text-utils/more.c:1574
+msgid "Pattern not found"
+msgstr "M�nster ikke fundet"
+
+#: text-utils/more.c:1635
+msgid "can't fork\n"
+msgstr "kunne ikke forgrene (fork)\n"
+
+#: text-utils/more.c:1674
+msgid ""
+"\n"
+"...Skipping "
+msgstr ""
+"\n"
+"...Overspringer "
+
+#: text-utils/more.c:1678
+msgid "...Skipping "
+msgstr "...Overspringer "
+
+#: text-utils/more.c:1679
+msgid "to file "
+msgstr "til fil "
+
+#: text-utils/more.c:1679
+msgid "back to file "
+msgstr "tilbage til fil "
+
+#: text-utils/more.c:1915
+msgid "Line too long"
+msgstr "For lang linie"
+
+#: text-utils/more.c:1958
+msgid "No previous command to substitute for"
+msgstr "Ingen tidligere kommando at erstatte med"
+
+#: text-utils/odsyntax.c:133
+msgid "od: od(1) has been deprecated for hexdump(1).\n"
+msgstr "od: od(1) er blevet erstattet af hexdump(1).\n"
+
+#: text-utils/odsyntax.c:136
+#, c-format
+msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
+msgstr "od: hexdump(1) kompabilitet underst�tter ikke -%c tilvalg%s\n"
+
+#: text-utils/odsyntax.c:137
+msgid "; see strings(1)."
+msgstr "; se strings(1)."
+
+#: text-utils/parse.c:63
+#, c-format
+msgid "hexdump: can't read %s.\n"
+msgstr "hexdump: kunne ikke l�se %s.\n"
+
+#: text-utils/parse.c:68
+msgid "hexdump: line too long.\n"
+msgstr "hexdump: for lang linie.\n"
+
+#: text-utils/parse.c:406
+msgid "hexdump: byte count with multiple conversion characters.\n"
+msgstr "hexdump: byteantal med flere konverteringstegn.\n"
+
+#: text-utils/parse.c:490
+#, c-format
+msgid "hexdump: bad byte count for conversion character %s.\n"
+msgstr "hexdump: ugyldig byteantal til konverteringstegn %s.\n"
+
+#: text-utils/parse.c:497
+msgid "hexdump: %%s requires a precision or a byte count.\n"
+msgstr "hexdump: %%s kr�ver en pr�cision eller et byteantal.\n"
+
+#: text-utils/parse.c:503
+#, c-format
+msgid "hexdump: bad format {%s}\n"
+msgstr "hexdump: ugyldigt format {%s}\n"
+
+#: text-utils/parse.c:509
+msgid "hexdump: bad conversion character %%%s.\n"
+msgstr "hexdump: ugyldig konverteringstegn %%%s.\n"
+
+#: text-utils/rev.c:113
+msgid "Unable to allocate bufferspace\n"
+msgstr "Kunne ikke allokere bufferplads\n"
+
+#: text-utils/rev.c:156
+msgid "usage: rev [file ...]\n"
+msgstr "brug: rev [fil ...]\n"
+
+#: text-utils/ul.c:142
+#, c-format
+msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
+msgstr "brug: %s [ -i ] [ -tTerm ] fil...\n"
+
+#: text-utils/ul.c:153
+msgid "trouble reading terminfo"
+msgstr "problemer ved l�sning af 'terminfo'"
+
+#: text-utils/ul.c:243
+#, c-format
+msgid "Unknown escape sequence in input: %o, %o\n"
+msgstr "Ukendt undvigelsessekvens i inddata: %o, %o\n"
+
+#: text-utils/ul.c:425
+msgid "Unable to allocate buffer.\n"
+msgstr "Kunne ikke allokere buffer.\n"
+
+#: text-utils/ul.c:584
+msgid "Input line too long.\n"
+msgstr "For lang inddatalinie.\n"
+
+#: text-utils/ul.c:597
+msgid "Out of memory when growing buffer.\n"
+msgstr "L�b t�r for hukommelse under forst�rring af buffer.\n"
+
diff --git a/po/de.po b/po/de.po
index 22c9f20242..a03dcfd685 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.10\n"
-"POT-Creation-Date: 2000-03-21 14:47-0800\n"
+"POT-Creation-Date: 2000-10-16 16:44+0200\n"
 "PO-Revision-Date: 2000-03-30 11:08+0100\n"
 "Last-Translator: Elrond <Elrond@Wunder-Nett.org>\n"
 "Language-Team: Elrond <Elrond@Wunder-Nett.org>\n"
@@ -25,39 +25,39 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:146
+#: clock/cmos.c:157
 msgid "booted from MILO\n"
 msgstr "Gebootet von MILO\n"
 
-#: clock/cmos.c:155
+#: clock/cmos.c:166
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian-BCD-Uhr\n"
 
-#: clock/cmos.c:171
+#: clock/cmos.c:182
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "Uhranschluss eingestellt auf 0x%x\n"
 
-#: clock/cmos.c:181
+#: clock/cmos.c:192
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: clock/cmos.c:235
+#: clock/cmos.c:246
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: atomisches %s war 1000 Durchl�ufe lang nicht erfolgreich!"
 
-#: clock/cmos.c:559
+#: clock/cmos.c:570
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port konnte nicht ge�ffnet werden: %s"
 
 # typo in the english version: didn't
-#: clock/cmos.c:566
+#: clock/cmos.c:577
 msgid "I failed to get permission because I didnt try.\n"
 msgstr "Keine Erlaubnis, da sie nicht angefordert wurde.\n"
 
-#: clock/cmos.c:569
+#: clock/cmos.c:580
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
@@ -65,48 +65,48 @@ msgstr ""
 "war nicht erfolgreich.\n"
 
 # Oh well.
-#: clock/cmos.c:572
+#: clock/cmos.c:583
 msgid "Probably you need root privileges.\n"
 msgstr "M�glicherweise ben�tigen Sie root-Rechte.\n"
 
-#: clock/hwclock.c:213
+#: clock/hwclock.c:219
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Hardware-Uhr weiterhin in %s.\n"
 
-#: clock/hwclock.c:214 clock/hwclock.c:303
+#: clock/hwclock.c:220 clock/hwclock.c:309
 msgid "UTC"
 msgstr "Universalzeit (UTC)"
 
-#: clock/hwclock.c:214 clock/hwclock.c:302
+#: clock/hwclock.c:220 clock/hwclock.c:308
 msgid "local"
 msgstr "Ortszeit (LOCAL)"
 
-#: clock/hwclock.c:286
+#: clock/hwclock.c:292
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Warnung: 3. Zeile der Datei 'adjtime' nicht lesbar.\n"
 
-#: clock/hwclock.c:288
+#: clock/hwclock.c:294
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Erwartet: 'UTC' oder 'LOCAL' oder nichts.)\n"
 
-#: clock/hwclock.c:297
+#: clock/hwclock.c:303
 #, c-format
 msgid "Last drift adjustment done at %d seconds after 1969\n"
 msgstr "Letzte Zeitabweichungsjustierung erfolgte %d Sekunden nach 1969.\n"
 
-#: clock/hwclock.c:299
+#: clock/hwclock.c:305
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
 msgstr "Letzte Kalibrierung erfolgte %d Sekunden nach 1969.\n"
 
-#: clock/hwclock.c:301
+#: clock/hwclock.c:307
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Die Hardware-Uhr ist auf %s eingestellt.\n"
 
-#: clock/hwclock.c:303
+#: clock/hwclock.c:309
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -124,39 +124,40 @@ msgstr "unbekannt"
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:325
+#: clock/hwclock.c:331
 msgid "Waiting for clock tick...\n"
 msgstr "Warte auf Uhrsignal...\n"
 
-#: clock/hwclock.c:329
+#: clock/hwclock.c:335
 msgid "...got clock tick\n"
 msgstr "...Uhrsignal erhalten\n"
 
-#: clock/hwclock.c:380
-#, c-format
-msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+#: clock/hwclock.c:386
+#, fuzzy, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "Ung�ltige Werte in der Hardware-Uhr: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: clock/hwclock.c:389
-#, c-format
-msgid "Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d seconds since 1969\n"
-msgstr "Zeit der Hardware-Uhr: %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d Sekunden seit 1969\n"
+#: clock/hwclock.c:394
+#, fuzzy, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr ""
+"Zeit der Hardware-Uhr: %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d Sekunden seit 1969\n"
 
-#: clock/hwclock.c:417
-#, c-format
-msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+#: clock/hwclock.c:422
+#, fuzzy, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Von der Hardware-Uhr gelesene Zeit: %02d:%02d:%02d\n"
 
-#: clock/hwclock.c:443
+#: clock/hwclock.c:449
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
 msgstr "Hardware-Uhr auf %.2d:%.2d:%.2d eingestellt (%d Sekunden seit 1969).\n"
 
-#: clock/hwclock.c:449
+#: clock/hwclock.c:455
 msgid "Clock not changed - testing only.\n"
 msgstr "Uhr nicht ge�ndert, nur gepr�ft.\n"
 
-#: clock/hwclock.c:497
+#: clock/hwclock.c:503
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -165,7 +166,7 @@ msgstr ""
 "Verstrichene Zeit seit Bezugszeit: %.6f Sekunden.\n"
 "Es erfolgt eine Verz�gerung bis zur n�chsten vollen Sekunde.\n"
 
-#: clock/hwclock.c:521
+#: clock/hwclock.c:527
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
@@ -180,18 +181,18 @@ msgstr ""
 #.
 #. Compute display value for time
 #. Cut off trailing newline
-#: clock/hwclock.c:533
+#: clock/hwclock.c:539
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f Sekunden\n"
 
-#: clock/hwclock.c:567
+#: clock/hwclock.c:573
 msgid "No --date option specified.\n"
 msgstr "Die Option --date wurde nicht angegeben.\n"
 
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:572
+#: clock/hwclock.c:578
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
@@ -199,23 +200,23 @@ msgstr ""
 "Der Wert der Option --date ist kein g�ltiges Datum.\n"
 "Er enth�lt Anf�hrungszeichen.\n"
 
-#: clock/hwclock.c:578
+#: clock/hwclock.c:584
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Der Befehl 'date' wird erteilt: %s\n"
 
-#: clock/hwclock.c:582
+#: clock/hwclock.c:588
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Das Programm 'date' in /bin/sh shell kann nicht ausgef�hrt werden. Die "
 "Funktion popen() war nicht erfolgreich."
 
-#: clock/hwclock.c:588
+#: clock/hwclock.c:594
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "Antwort auf den Befehl 'date' = %s\n"
 
-#: clock/hwclock.c:590
+#: clock/hwclock.c:596
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -230,11 +231,11 @@ msgstr ""
 "Die Antwort war:\n"
 "  %s\n"
 
-#: clock/hwclock.c:599
-#, c-format
+#: clock/hwclock.c:605
+#, fuzzy, c-format
 msgid ""
-"The date command issued by %s returnedsomething other than an integer where "
-"the convertedtime value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
@@ -247,12 +248,12 @@ msgstr ""
 "Die Antwort war:\n"
 " %s\n"
 
-#: clock/hwclock.c:609
+#: clock/hwclock.c:615
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr "Die Datumszeichenfolge %s entspricht %d Sekunden seit 1969.\n"
 
-#: clock/hwclock.c:641
+#: clock/hwclock.c:647
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
@@ -261,37 +262,37 @@ msgstr ""
 "von ihr abgeleitet werden.\n"
 
 # debug
-#: clock/hwclock.c:654
+#: clock/hwclock.c:669
 msgid "Calling settimeofday:\n"
 msgstr "settimeofday() wird aufgerufen:\n"
 
 # not much to translate
 # debug
-#: clock/hwclock.c:655
+#: clock/hwclock.c:670
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
 # not much to translate
 # debug
-#: clock/hwclock.c:657
-#, c-format
-msgid "\ttz.tz_minuteswest = %ld\n"
+#: clock/hwclock.c:672
+#, fuzzy, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %ld\n"
 
-#: clock/hwclock.c:660
+#: clock/hwclock.c:675
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "Ausf�hrung im Testmodus, die Systemuhr wird daher nicht gestellt.\n"
 
-#: clock/hwclock.c:673
+#: clock/hwclock.c:683
 msgid "Must be superuser to set system clock.\n"
 msgstr "Die Systemuhr kann nur vom Superuser eingestellt werden.\n"
 
-#: clock/hwclock.c:675
+#: clock/hwclock.c:685
 msgid "settimeofday() failed"
 msgstr "settimeofday() nicht erfolgreich."
 
-#: clock/hwclock.c:708
+#: clock/hwclock.c:718
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
@@ -299,7 +300,7 @@ msgstr ""
 "Der Abweichungsfaktor wird nicht eingestellt, da die Hardware-Uhr zuvor "
 "ung�ltige Werte enthielt.\n"
 
-#: clock/hwclock.c:712
+#: clock/hwclock.c:722
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
@@ -307,7 +308,7 @@ msgstr ""
 "Der Abweichungsfaktor wird nicht eingestellt, da seit der letzten "
 "Kalibrierung weniger als ein Tag verstrichen ist.\n"
 
-#: clock/hwclock.c:721
+#: clock/hwclock.c:731
 #, c-format
 msgid ""
 "Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
@@ -318,24 +319,24 @@ msgstr ""
 "eines Abweichungsfaktors von %f Sekunden/Tag.\n"
 "Der Abweichungsfaktor wird um %f Sekunden/Tag ge�ndert.\n"
 
-#: clock/hwclock.c:772
+#: clock/hwclock.c:782
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Zeit seit der letzten Einstellung: %d Sekunden\n"
 
-#: clock/hwclock.c:774
+#: clock/hwclock.c:784
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "%d Sekunden m�ssen eingef�gt werden, und die Zeit muss %.6f Sekunden "
 "zur�ckbezogen werden.\n"
 
-#: clock/hwclock.c:803
+#: clock/hwclock.c:813
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr ""
 "'adjtime' wird nicht aktualisiert, da Sie sich im Testmodus befinden.\n"
 
-#: clock/hwclock.c:804
+#: clock/hwclock.c:814
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -344,37 +345,37 @@ msgstr ""
 "In die Datei %s w�re der folgende Wert geschrieben worden:\n"
 "%s"
 
-#: clock/hwclock.c:828
+#: clock/hwclock.c:838
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Die Zeitabweichungsparameter wurden nicht aktualisiert.\n"
 
-#: clock/hwclock.c:869
+#: clock/hwclock.c:879
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "Die Hardware-Uhr enth�lt keine g�ltige Zeit und kann somit nicht "
 "aktualisiert werden.\n"
 
-#: clock/hwclock.c:893
+#: clock/hwclock.c:903
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "Die erforderliche Justierung betr�gt weniger als eine Sekunde. Die Uhr wird "
 "daher nicht eingestellt.\n"
 
-#: clock/hwclock.c:919
+#: clock/hwclock.c:929
 #, c-format
 msgid "Using %s.\n"
 msgstr "Es wird %s verwendet.\n"
 
-#: clock/hwclock.c:921
+#: clock/hwclock.c:931
 msgid "No usable clock interface found.\n"
 msgstr "Es wurde keine verwendbare Uhrschnittstelle gefunden.\n"
 
-#: clock/hwclock.c:1016
+#: clock/hwclock.c:1026
 msgid "Unable to set system clock.\n"
 msgstr "Die Systemuhr konnte nicht eingestellt werden.\n"
 
-#: clock/hwclock.c:1045
+#: clock/hwclock.c:1055
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
 "machine.\n"
@@ -387,16 +388,16 @@ msgstr ""
 "(und wird daher wohl auch nicht auf einem Alpha-Rechner ausgef�hrt). Es wird "
 "nichts durchgef�hrt.\n"
 
-#: clock/hwclock.c:1054
+#: clock/hwclock.c:1064
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Der Epochenwert kann nicht aus dem Kernel abgerufen werden.\n"
 
-#: clock/hwclock.c:1056
+#: clock/hwclock.c:1066
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Der Kernel geht vom Epochenwert %lu aus.\n"
 
-#: clock/hwclock.c:1059
+#: clock/hwclock.c:1069
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
@@ -404,17 +405,18 @@ msgstr ""
 "Wenn Sie den Epochenwert festlegen m�chten, verwenden Sie die Option "
 "'epoch', um den einzustellenden Wert anzugeben.\n"
 
-#: clock/hwclock.c:1062
+#: clock/hwclock.c:1072
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 "Die Epoche wird nicht auf %d eingestellt - Sie befinden sich im Testmodus.\n"
 
-#: clock/hwclock.c:1065
+#: clock/hwclock.c:1075
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Der Epochenwert im Kernel kann nicht eingestellt werden.\n"
 
-#: clock/hwclock.c:1088
+#: clock/hwclock.c:1104
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -436,27 +438,27 @@ msgid ""
 "Options: \n"
 "  --utc         the hardware clock is kept in coordinated universal time\n"
 "  --localtime   the hardware clock is kept in local time\n"
-"  --directisa   access the ISA bus directly instead of /dev/rtc\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
 "  --badyear     ignore rtc's year because the bios is broken\n"
 "  --date        specifies the time to which to set the hardware clock\n"
 "  --epoch=year  specifies the year which is the beginning of the \n"
 "                hardware clock's epoch value\n"
 msgstr ""
 
-#: clock/hwclock.c:1113
+#: clock/hwclock.c:1129
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 
-#: clock/hwclock.c:1209
+#: clock/hwclock.c:1227
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s kann keine Argumente annehmen, die keine Optionsform haben. Sie haben %d "
 "angegeben.\n"
 
-#: clock/hwclock.c:1219
+#: clock/hwclock.c:1237
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
@@ -464,7 +466,7 @@ msgstr ""
 "Sie haben mehrere Funktionoptionen angegeben.\n"
 "Es kann immer nur eine Funktion durchgef�hrt werden.\n"
 
-#: clock/hwclock.c:1225
+#: clock/hwclock.c:1243
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -473,17 +475,22 @@ msgstr ""
 "%s: Die Optionen --utc und --localtime schlie�en sich gegenseitig aus. Sie "
 "haben beide angegeben.\n"
 
-#: clock/hwclock.c:1238
+#: clock/hwclock.c:1256
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "Die einzustellende Uhrzeit ist nicht verwendbar. Die Uhr wird nicht "
 "eingestellt.\n"
 
-#: clock/hwclock.c:1253
+#: clock/hwclock.c:1271
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Die Hardware-Uhr kann nur vom Superuser ge�ndert werden.\n"
 
-#: clock/hwclock.c:1257
+#: clock/hwclock.c:1275
+#, fuzzy
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "Die Hardware-Uhr kann nur vom Superuser ge�ndert werden.\n"
+
+#: clock/hwclock.c:1279
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
@@ -491,10 +498,15 @@ msgstr ""
 "Die Epoche der Hardware-Uhr im Kernel kann nur vom Superuser ge�ndert "
 "werden.\n"
 
-#: clock/hwclock.c:1275
+#: clock/hwclock.c:1299
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr ""
+
+#: clock/hwclock.c:1302
+#, fuzzy
 msgid ""
-"Cannot access the Hardware Clock via any known method.  Use --debug option "
-"to see the details of our search for an access method.\n"
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
 msgstr ""
 "Zugriff auf die Hardware-Uhr ist nicht m�glich. Verwenden Sie die Option "
 "--debug, um Details �ber die Suche einer Zugriffsmethode anzuzeigen.\n"
@@ -507,7 +519,7 @@ msgstr "Warteschleife f�r die Zeit�nderung von KDGHWCLK im Gange...\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK ioctl konnte die Zeit nicht lesen."
 
-#: clock/kd.c:65 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
 msgstr "Zeit�berschreitung beim Warten auf die Zeit�nderung.\n"
 
@@ -527,116 +539,121 @@ msgstr "ioctl() konnte /dev/tty1 nicht �ffnen."
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl nicht erfolgreich."
 
-#: clock/kd.c:161
+#: clock/kd.c:163
 msgid "Can't open /dev/tty1"
 msgstr "/dev/tty1 konnte nicht ge�ffnet werden."
 
-#: clock/rtc.c:98
-msgid "ioctl() to /dev/rtc to read the time failed.\n"
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
 msgstr ""
-"Funktionsaufruf ioctl() an /dev/rtc f�r das Lesen der Uhr war nicht "
-"erfolgreich.\n"
+"Funktionsaufruf ioctl() an %s f�r das Lesen der Uhr war nicht erfolgreich.\n"
 
-#: clock/rtc.c:129
-msgid "Waiting in loop for time from /dev/rtc to change\n"
-msgstr "Warteschleife f�r Zeit�nderung von /dev/rtc im Gange...\n"
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Warteschleife f�r Zeit�nderung von %s im Gange...\n"
 
-#: clock/rtc.c:165 clock/rtc.c:222
-msgid "open() of /dev/rtc failed"
-msgstr "/dev/rtc konnte nicht ge�ffnet werden."
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "%s konnte nicht ge�ffnet werden."
 
-#. This rtc device doesn't have interrupt functions.  This is typical
-#. on an Alpha, where the Hardware Clock interrupts are used by the
-#. kernel for the system clock, so aren't at the user's disposal.
-#.
-#: clock/rtc.c:182
-msgid "/dev/rtc does not have interrupt functions. "
-msgstr "/dev/rtc enth�lt keine Interrupt-Funktionen. "
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s enth�lt keine Interrupt-Funktionen. "
 
-#: clock/rtc.c:191
-msgid "read() to /dev/rtc to wait for clock tick failed"
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
 msgstr ""
-"Der Funktionsaufruf read() an /dev/rtc f�r das Warten auf ein Uhrsignal war "
-"nicht erfolgreich."
+"Der Funktionsaufruf read() an %s f�r das Warten auf ein Uhrsignal war nicht "
+"erfolgreich."
 
-#: clock/rtc.c:199
-msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
-"Der Funktionsaufruf ioctl() an /dev/rtc f�r das Ausschalten des "
+"Der Funktionsaufruf ioctl() an %s f�r das Ausschalten des "
 "Aktualisierungs-Interrupts war nicht erfolgreich."
 
-#: clock/rtc.c:202
-msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"Der Funktionsaufruf ioctl() an /dev/rtc f�r das Einschalten des "
+"Der Funktionsaufruf ioctl() an %s f�r das Einschalten des "
 "Aktualisierungs-Interrupts war nicht erfolgreich."
 
-#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
-msgid "Unable to open /dev/rtc"
-msgstr "/dev/rtc konnte nicht ge�ffnet werden."
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s konnte nicht ge�ffnet werden."
 
-#: clock/rtc.c:268
-msgid "ioctl() to /dev/rtc to set the time failed.\n"
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
 msgstr ""
-"Der Funktionsaufruf ioctl() an /dev/rtc f�r das Einstellen der Zeit war "
-"nicht erfolgreich.\n"
+"Der Funktionsaufruf ioctl() an %s f�r das Einstellen der Zeit war nicht "
+"erfolgreich.\n"
 
-#: clock/rtc.c:272
+#: clock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) war erfolgreich.\n"
 
-#: clock/rtc.c:302
-msgid "Open of /dev/rtc failed"
-msgstr "/dev/rtc konnte nicht ge�ffnet werden."
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "%s konnte nicht ge�ffnet werden."
 
-#: clock/rtc.c:320 clock/rtc.c:365
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file /dev/rtc.  This file does not "
-"exist on this system.\n"
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
 msgstr ""
 "Um den Epochenwert im Kernel bearbeiten zu k�nnen, ist der Zugriff auf den "
-"Linux-Ger�tetreiber 'rtc' �ber die Ger�tedatei /dev/rtc erforderlich. Diese "
-"Datei ist in diesem System nicht vorhanden.\n"
+"Linux-Ger�tetreiber 'rtc' �ber die Ger�tedatei %s erforderlich. Diese Datei "
+"ist in diesem System nicht vorhanden.\n"
 
-#: clock/rtc.c:331
-msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
-msgstr ""
-"Der Funktionsaufruf ioctl(RTC_EPOCH_READ) an /dev/rtc war nicht erfolgreich."
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "Der Funktionsaufruf ioctl(RTC_EPOCH_READ) an %s war nicht erfolgreich."
 
-#: clock/rtc.c:337
+#: clock/rtc.c:344
 #, c-format
-msgid "we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n"
-msgstr "Epoche %ld wurde aus /dev/rtc mit RTC_EPOCH_READ ioctl gelesen.\n"
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "Epoche %ld wurde aus %s mit RTC_EPOCH_READ ioctl gelesen.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: clock/rtc.c:357
+#: clock/rtc.c:364
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 "Der Epochenwert darf nicht kleiner als 1900 sein. Sie haben %ld "
 "angefordert.\n"
 
-#: clock/rtc.c:374
+#: clock/rtc.c:381
 #, c-format
-msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
-msgstr "Epoche wird auf %ld mit RTC_EPOCH_SET ioctl in /dev/rtc eingestellt.\n"
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "Epoche wird auf %ld mit RTC_EPOCH_SET ioctl in %s eingestellt.\n"
 
-#: clock/rtc.c:379
+#: clock/rtc.c:386
+#, c-format
 msgid ""
-"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
-"ioctl.\n"
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
-"RTC_EPOCH_SET ioctl ist im Kernel-Ger�tetreiber f�r /dev/rtc nicht "
-"enthalten.\n"
+"RTC_EPOCH_SET ioctl ist im Kernel-Ger�tetreiber f�r %s nicht enthalten.\n"
 
-#: clock/rtc.c:382
-msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
-msgstr ""
-"Funktionsaufruf ioctl(RTC_EPOCH_SET) an /dev/rtc war nicht erfolgreich."
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "Funktionsaufruf ioctl(RTC_EPOCH_SET) an %s war nicht erfolgreich."
 
 #: clock/shhopt.c:255 clock/shhopt.c:281
 #, c-format
@@ -668,86 +685,86 @@ msgstr "Option '%s' erwartet kein Argument.\n"
 msgid "unrecognized option `-%c'\n"
 msgstr "Unbekannte Option '-%c'\n"
 
-#: disk-utils/blockdev.c:34
+#: disk-utils/blockdev.c:47
 msgid "set read-only"
 msgstr ""
 
-#: disk-utils/blockdev.c:35
+#: disk-utils/blockdev.c:48
 msgid "set read-write"
 msgstr ""
 
-#: disk-utils/blockdev.c:38
+#: disk-utils/blockdev.c:51
 msgid "get read-only"
 msgstr ""
 
-#: disk-utils/blockdev.c:41
+#: disk-utils/blockdev.c:54
 msgid "get sectorsize"
 msgstr ""
 
-#: disk-utils/blockdev.c:44
+#: disk-utils/blockdev.c:57
 msgid "get size"
 msgstr ""
 
-#: disk-utils/blockdev.c:47
+#: disk-utils/blockdev.c:60
 msgid "set readahead"
 msgstr ""
 
-#: disk-utils/blockdev.c:50
+#: disk-utils/blockdev.c:63
 msgid "get readahead"
 msgstr ""
 
-#: disk-utils/blockdev.c:53
+#: disk-utils/blockdev.c:66
 msgid "flush buffers"
 msgstr ""
 
-#: disk-utils/blockdev.c:57
+#: disk-utils/blockdev.c:70
 msgid "reread partition table"
 msgstr ""
 
-#: disk-utils/blockdev.c:66
+#: disk-utils/blockdev.c:79
 #, c-format
 msgid "Usage: %s [-V] [-v|-q] commands devices\n"
 msgstr ""
 
 # "Ung�ltige Taste"
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:80
 msgid "Available commands:\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:167
+#: disk-utils/blockdev.c:180
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:178
+#: disk-utils/blockdev.c:191
 #, c-format
 msgid "%s requires an argument\n"
 msgstr ""
 
-#: disk-utils/fdformat.c:33
+#: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Formatieren im Gange... "
 
-#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
 msgstr "Beendet\n"
 
-#: disk-utils/fdformat.c:62
+#: disk-utils/fdformat.c:65
 msgid "Verifying ... "
 msgstr "�berpr�fen ... "
 
 # This is from a perror()
-#: disk-utils/fdformat.c:73
+#: disk-utils/fdformat.c:76
 msgid "Read: "
 msgstr "Lesen: "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:78
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
 msgstr ""
 "Fehler beim Lesen von Zylinder %d. Es wurde %d erwartet, aber %d gelesen.\n"
 
-#: disk-utils/fdformat.c:81
+#: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
@@ -756,81 +773,81 @@ msgstr ""
 "Ung�ltige Daten in Zylinder %d.\n"
 "Operation wird fortgesetzt ... "
 
-#: disk-utils/fdformat.c:96
+#: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
 msgstr "Verwendung: %s [ -n ] Ger�t\n"
 
 # The first %s is swapon/swapoff
-#: disk-utils/fdformat.c:117 disk-utils/fsck.minix.c:1255 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:650 disk-utils/mkswap.c:351
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:175 misc-utils/ddate.c:172
-#: misc-utils/kill.c:191
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:448
+#: disk-utils/setfdprm.c:128 misc-utils/cal.c:172 misc-utils/ddate.c:181
+#: misc-utils/kill.c:192
 #, c-format
 msgid "%s from %s\n"
 msgstr ""
 
-#: disk-utils/fdformat.c:131
+#: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
 msgstr "%s ist kein Diskettenlaufwerk.\n"
 
-#: disk-utils/fdformat.c:137
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
 msgstr "Das aktuelle Format konnte nicht ermittelt werden."
 
-#: disk-utils/fdformat.c:138
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "%s Seiten, %d Spuren, %d Sektoren/Spur. Gesamtkapazit�t: %d KB.\n"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Double"
 msgstr "Doppel"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Single"
 msgstr "Einfach"
 
-#: disk-utils/fsck.minix.c:196
+#: disk-utils/fsck.minix.c:197
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Verwendung: %s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:296
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s ist gemounted.\t "
 
-#: disk-utils/fsck.minix.c:296
+#: disk-utils/fsck.minix.c:298
 msgid "Do you really want to continue"
 msgstr "M�chten Sie wirklich fortfahren?"
 
-#: disk-utils/fsck.minix.c:300
+#: disk-utils/fsck.minix.c:302
 msgid "check aborted.\n"
 msgstr "Pr�fung abgebrochen.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:337
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
 msgid "Zone nr < FIRSTZONE in file `"
 msgstr "Zonennummer < FIRSTZONE in Datei '"
 
-#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
 msgid "Zone nr >= ZONES in file `"
 msgstr "Zonennummer >= ZONES in Datei '"
 
-#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
 msgid "Remove block"
 msgstr "Block entfernen"
 
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:364
 msgid "Read error: unable to seek to block in file '"
 msgstr "Lesefehler: Suchvorgang nicht m�glich zum Block in Datei '"
 
-#: disk-utils/fsck.minix.c:368
+#: disk-utils/fsck.minix.c:370
 msgid "Read error: bad block in file '"
 msgstr "Lesefehler: Ung�ltiger Block in Datei '"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:386
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -838,121 +855,121 @@ msgstr ""
 "Interner Fehler: Es wurde versucht, einen ung�ltigen Block zu schreiben.\n"
 "Die Schreibanforderung wird ignoriert.\n"
 
-#: disk-utils/fsck.minix.c:390 disk-utils/mkfs.minix.c:289
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
 msgid "seek failed in write_block"
 msgstr "Fehler bei der Suche in write_block"
 
-#: disk-utils/fsck.minix.c:392
+#: disk-utils/fsck.minix.c:394
 msgid "Write error: bad block in file '"
 msgstr "Fehler beim Schreiben: Ung�ltiger Block in Datei '"
 
-#: disk-utils/fsck.minix.c:511
+#: disk-utils/fsck.minix.c:513
 msgid "seek failed in write_super_block"
 msgstr "Fehler bei der Suche in write_super_block"
 
-#: disk-utils/fsck.minix.c:513 disk-utils/mkfs.minix.c:276
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr "Schreiben des Super-Blocks nicht m�glich."
 
-#: disk-utils/fsck.minix.c:523
+#: disk-utils/fsck.minix.c:525
 msgid "Unable to write inode map"
 msgstr "Inode-Zuordnung konnte nicht geschrieben werden."
 
-#: disk-utils/fsck.minix.c:525
+#: disk-utils/fsck.minix.c:527
 msgid "Unable to write zone map"
 msgstr "Zonenzuordnung konnte nicht geschrieben werden."
 
-#: disk-utils/fsck.minix.c:527
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inodes"
 msgstr "Inodes konnte nicht geschrieben werden."
 
-#: disk-utils/fsck.minix.c:556
+#: disk-utils/fsck.minix.c:558
 msgid "seek failed"
 msgstr "Suchvorgang nicht erfolgreich"
 
-#: disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.minix.c:560
 msgid "unable to read super block"
 msgstr "Superblock konnte nicht gelesen werden"
 
-#: disk-utils/fsck.minix.c:578
+#: disk-utils/fsck.minix.c:580
 msgid "bad magic number in super-block"
 msgstr "Ung�ltige 'Magic Number' im Superblock."
 
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:582
 msgid "Only 1k blocks/zones supported"
 msgstr "Es werden nur Bl�cke und Zonen mit 1 KB unterst�tzt."
 
-#: disk-utils/fsck.minix.c:582
+#: disk-utils/fsck.minix.c:584
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Ung�ltiges Feld 's_imap_blocks' im Superblock."
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:586
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Ung�ltiges Feld 's_zmap_blocks' im Superblock."
 
-#: disk-utils/fsck.minix.c:591
+#: disk-utils/fsck.minix.c:593
 msgid "Unable to allocate buffer for inode map"
 msgstr "Puffer f�r inode-Zuordnung kann nicht zugewiesen werden."
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inodes"
 msgstr "Puffer f�r inodes kann nicht zugewiesen werden."
 
-#: disk-utils/fsck.minix.c:602
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for inode count"
 msgstr "Puffer f�r inode-Z�hlung kann nicht zugewiesen werden."
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:607
 msgid "Unable to allocate buffer for zone count"
 msgstr "Puffer f�r Zonenz�hlung kann nicht zugewiesen werden."
 
-#: disk-utils/fsck.minix.c:607
+#: disk-utils/fsck.minix.c:609
 msgid "Unable to read inode map"
 msgstr "Inode-Zuordnung kann nicht gelesen werden."
 
-#: disk-utils/fsck.minix.c:609
+#: disk-utils/fsck.minix.c:611
 msgid "Unable to read zone map"
 msgstr "Zonenzuordnung kann nicht gelesen werden."
 
-#: disk-utils/fsck.minix.c:611
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to read inodes"
 msgstr "Inodes kann nicht gelesen werden."
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:615
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Warnung: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:532
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:533
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld Bl�cke\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Erste Datenzone = %ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonengr��e = %d\n"
 
-#: disk-utils/fsck.minix.c:622
+#: disk-utils/fsck.minix.c:624
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maximalgr��e = %ld\n"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:625
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Status des Dateisystems = %d\n"
 
-#: disk-utils/fsck.minix.c:624
+#: disk-utils/fsck.minix.c:626
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -961,165 +978,165 @@ msgstr ""
 "Namensl�nge = %d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:690
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
 msgid "Inode %d marked not used, but used for file '"
 msgstr ""
 "Inode %d ist als 'nicht verwendet' markiert, wird aber verwendet von Datei '"
 
-#: disk-utils/fsck.minix.c:643 disk-utils/fsck.minix.c:694
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
 msgstr "Markierung in Gebrauch"
 
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:714
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
 msgstr " hat Modus %05o\n"
 
-#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
 msgid "Warning: inode count too big.\n"
 msgstr "Warnung: ionode-Z�hlung zu hoch.\n"
 
-#: disk-utils/fsck.minix.c:732
+#: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
 msgstr "'root inode' ist kein Verzeichnis."
 
-#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:789
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
 msgid "Block has been used before. Now in file `"
 msgstr "Der Block wurde zuvor bereits verwendet und ist nun in Datei '"
 
-#: disk-utils/fsck.minix.c:758 disk-utils/fsck.minix.c:792
-#: disk-utils/fsck.minix.c:1120 disk-utils/fsck.minix.c:1129
-#: disk-utils/fsck.minix.c:1173 disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
 msgid "Clear"
 msgstr "L�schen"
 
-#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:801
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
 msgstr "Block %d in Datei '"
 
-#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
 msgstr "' ist als 'nicht verwendet' markiert."
 
-#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
 msgstr "Korrekt"
 
-#: disk-utils/fsck.minix.c:954 disk-utils/fsck.minix.c:1018
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
 msgid " contains a bad inode number for file '"
 msgstr " enth�lt eine ung�ltige inode-Nummer f�r Datei '"
 
-#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
 msgstr " Entfernen"
 
-#: disk-utils/fsck.minix.c:970 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
 msgid ": bad directory: '.' isn't first\n"
 msgstr ": ung�ltiges Verzeichnis: '.' ist nicht an erster Stelle\n"
 
-#: disk-utils/fsck.minix.c:977 disk-utils/fsck.minix.c:1042
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
 msgid ": bad directory: '..' isn't second\n"
 msgstr ": ung�ltiges Verzeichnis: '..' ist nicht an zweiter Stelle\n"
 
-#: disk-utils/fsck.minix.c:1074
+#: disk-utils/fsck.minix.c:1070
 msgid "internal error"
 msgstr "Interner Fehler"
 
-#: disk-utils/fsck.minix.c:1077
+#: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
 msgstr ": ung�ltiges Verzeichnis: Gr��e<32"
 
-#: disk-utils/fsck.minix.c:1096
+#: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
 msgstr ": ung�ltiges Verzeichnis: Gr��e < 32"
 
-#: disk-utils/fsck.minix.c:1109
+#: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
 msgstr "Suchvorgang in bad_zone nicht erfolgreich."
 
-#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1172
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Inode-Modus %d nicht gel�scht."
 
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "Inode %d nicht verwendet, aber in der Bitmap als 'verwendet' markiert."
 
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1187
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "Inode %d verwendet, aber in der Bitmap als 'nicht verwendet' markiert."
 
-#: disk-utils/fsck.minix.c:1140 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (Modus = %07o), i_nlinks=%d, Z�hlwert=%d."
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks auf den Z�hlwert setzen"
 
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr ""
 "Zone %d: als 'verwendet' markiert, wird jedoch von keiner Datei verwendet."
 
-#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1207
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Markierung aufheben"
 
-#: disk-utils/fsck.minix.c:1159 disk-utils/fsck.minix.c:1211
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
 #, c-format
 msgid "Zone %d: %sin use, counted=%d\n"
 msgstr "Zone %d: %s verwendet, Z�hlwert=%d\n"
 
-#: disk-utils/fsck.minix.c:1160 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
 msgstr "nicht "
 
-#: disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1182
 msgid "Set"
 msgstr "Setzen"
 
-#: disk-utils/fsck.minix.c:1260 disk-utils/mkfs.minix.c:655
-#: disk-utils/mkfs.minix.c:658
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
 msgid "bad inode size"
 msgstr "ung�ltige inode-Gr��e"
 
-#: disk-utils/fsck.minix.c:1263
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "ung�ltige v2-inode-Gr��e"
 
-#: disk-utils/fsck.minix.c:1289
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "F�r interaktive Reparaturen ist ein Terminal erforderlich."
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "%s konnte nicht ge�ffnet werden."
 
-#: disk-utils/fsck.minix.c:1308
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s erfordert keine Pr�fung.\n"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Dateisystempr�fung f�r %s wird erzwungen.\n"
 
-#: disk-utils/fsck.minix.c:1314
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Dateisystem auf %s muss gepr�ft werden.\n"
 
-#: disk-utils/fsck.minix.c:1343
+#: disk-utils/fsck.minix.c:1336
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
@@ -1127,12 +1144,12 @@ msgstr ""
 "\n"
 "%6ld inodes verwendet (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld Zonen verwendet (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1350
-#, c-format
+#: disk-utils/fsck.minix.c:1343
+#, c-format, ycp-format
 msgid ""
 "\n"
 "%6d regular files\n"
@@ -1154,7 +1171,7 @@ msgstr ""
 "------\n"
 "%6d Dateien\n"
 
-#: disk-utils/fsck.minix.c:1363
+#: disk-utils/fsck.minix.c:1356
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -1168,8 +1185,8 @@ msgstr ""
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Verwendung: mkfs [-V] [-t FS-Typ] [FS-Optionen] Ger�t [Gr��e]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Kein Speicher mehr frei!\n"
@@ -1179,63 +1196,63 @@ msgstr "%s: Kein Speicher mehr frei!\n"
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs, Version %s (%s)\n"
 
-#: disk-utils/mkfs.minix.c:185
+#: disk-utils/mkfs.minix.c:179
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Verwendung: %s [-c | -l Dateiname] [-nXX] [-iXX] /dev/name [Bl�cke]\n"
 
-#: disk-utils/mkfs.minix.c:209
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s ist gemountet. An dieser Stelle wird kein Dateisystem erstellt!"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
 msgstr "Suchvorgang nach Bootblock in write_tables nicht erfolgreich."
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
 msgstr "Bootsektor kann nicht gel�scht werden."
 
-#: disk-utils/mkfs.minix.c:274
+#: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
 msgstr "Suchvorgang in write_tables nicht erfolgreich."
 
-#: disk-utils/mkfs.minix.c:278
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
 msgstr "Inode-Zuordnung kann nicht geschrieben werden."
 
-#: disk-utils/mkfs.minix.c:280
+#: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
 msgstr "Zonenzuordnung kann nicht geschrieben werden."
 
-#: disk-utils/mkfs.minix.c:282
+#: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
 msgstr "Inodes kann nicht geschrieben werden."
 
-#: disk-utils/mkfs.minix.c:291
+#: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
 msgstr "Schreiben in write_block nicht erfolgreich."
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:299 disk-utils/mkfs.minix.c:373
-#: disk-utils/mkfs.minix.c:424
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
 msgid "too many bad blocks"
 msgstr "Zu viele besch�digte Bl�cke vorhanden."
 
-#: disk-utils/mkfs.minix.c:307
+#: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
 msgstr "Nicht gen�gend unbesch�digte Bl�cke vorhanden."
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
 msgstr "Puffer f�r Zuordnungen kann nicht zugewiesen werden."
 
-#: disk-utils/mkfs.minix.c:530
+#: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
 msgstr "Puffer f�r inodes kann nicht zugewiesen werden."
 
-#: disk-utils/mkfs.minix.c:536
+#: disk-utils/mkfs.minix.c:528
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1244,137 +1261,138 @@ msgstr ""
 "Maxsize=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:550
+#: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
 msgstr "Suchvorgang beim Testen der Bl�cke nicht erfolgreich."
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:550
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Ung�ltige Werte in do_check: Programmfehler.\n"
 
-#: disk-utils/mkfs.minix.c:589 disk-utils/mkswap.c:261
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
 msgid "seek failed in check_blocks"
 msgstr "Suchvorgang in check_blocks nicht erfolgreich."
 
-#: disk-utils/mkfs.minix.c:598
+#: disk-utils/mkfs.minix.c:590
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 "Ung�ltige Bl�cke vor Datenbereich: Dateisystem kann nicht erstellt werden."
 
-#: disk-utils/mkfs.minix.c:604 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d ung�ltige Bl�cke.\n"
 
-#: disk-utils/mkfs.minix.c:606 disk-utils/mkfs.minix.c:628
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
 msgstr "Ein ung�ltiger Block.\n"
 
-#: disk-utils/mkfs.minix.c:618
+#: disk-utils/mkfs.minix.c:608
 msgid "can't open file of bad blocks"
 msgstr "Datei mit ung�ltigen Bl�cken kann nicht ge�ffnet werden."
 
-#: disk-utils/mkfs.minix.c:687
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
 msgstr "%s: Unterst�tzung f�r Minix V. 2 wurde nicht einkompiliert.\n"
 
-#: disk-utils/mkfs.minix.c:703
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "Strtol-Fehler: Blockanzahl wurde nicht angegeben."
 
-#: disk-utils/mkfs.minix.c:735
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
 msgstr "%s konnte nicht ge�ffnet werden."
 
-#: disk-utils/mkfs.minix.c:737
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
 msgstr "'stat' konnte nicht auf %s angewandt werden."
 
-#: disk-utils/mkfs.minix.c:741
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "Auf '%s' wird kein Dateisystem erstellt."
 
-#: disk-utils/mkswap.c:117
+#: disk-utils/mkswap.c:174
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:126
+#: disk-utils/mkswap.c:183
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:130
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Es wird eine Seitengr��e von %d (nicht %d) angenommen.\n"
 
-#: disk-utils/mkswap.c:215
+#: disk-utils/mkswap.c:312
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
-msgstr "Verwendung: %s [-c] [-v0|-v1] [-pSeitengr��e] /dev/name [Gr��e in Bl�cken]\n"
+msgstr ""
+"Verwendung: %s [-c] [-v0|-v1] [-pSeitengr��e] /dev/name [Gr��e in Bl�cken]\n"
 
-#: disk-utils/mkswap.c:238
+#: disk-utils/mkswap.c:335
 msgid "too many bad pages"
 msgstr "Zu viele besch�digte Seiten."
 
-#: disk-utils/mkswap.c:252 misc-utils/look.c:170 misc-utils/setterm.c:1100
-#: text-utils/more.c:1863 text-utils/more.c:1874
+#: disk-utils/mkswap.c:349 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1851 text-utils/more.c:1862
 msgid "Out of memory"
 msgstr "Kein Speicher mehr frei."
 
-#: disk-utils/mkswap.c:269
+#: disk-utils/mkswap.c:366
 msgid "one bad page\n"
 msgstr "Eine besch�digte Seite.\n"
 
-#: disk-utils/mkswap.c:271
+#: disk-utils/mkswap.c:368
 #, c-format
 msgid "%d bad pages\n"
 msgstr "%d besch�digte Seiten.\n"
 
-#: disk-utils/mkswap.c:391
+#: disk-utils/mkswap.c:488
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 "%s: Fehler: Es wurde nicht angegeben, wo der Auslagerungsbereich angelegt "
 "werden soll.\n"
 
-#: disk-utils/mkswap.c:409
+#: disk-utils/mkswap.c:506
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
 msgstr ""
 "%s: Fehler: Die angegebene Gr��e %ld ist gr��er als die des Ger�ts: %d\n"
 
-#: disk-utils/mkswap.c:427
+#: disk-utils/mkswap.c:525
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: Fehler: unbekannte Version %d\n"
 
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:531
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: Fehler: Der Auslagerungsbereich muss mindestens %ld KB umfassen.\n"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:550
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr ""
 "%s: Warnung: Der Auslagerungsbereich wird auf die Gr��e %ld KB beschr�nkt.\n"
 
-#: disk-utils/mkswap.c:464
+#: disk-utils/mkswap.c:562
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Es wird kein Auslagerungsbereich auf '%s' angelegt."
 
-#: disk-utils/mkswap.c:473 disk-utils/mkswap.c:494
+#: disk-utils/mkswap.c:571 disk-utils/mkswap.c:592
 msgid "fatal: first page unreadable"
 msgstr "Nicht behebbarer Fehler: die erste Seite kann nicht gelesen werden."
 
-#: disk-utils/mkswap.c:479
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1388,25 +1406,25 @@ msgstr ""
 "Es wird kein Auslagerungsbereich erstellt. Wenn Sie wirklich einen \n"
 "Auslagerungsbereich anlegen m�chten, verwenden Sie die Option -f.\n"
 
-#: disk-utils/mkswap.c:503
+#: disk-utils/mkswap.c:601
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Auslagerungsbereich kann nicht erstellt werden: nicht lesbar."
 
-#: disk-utils/mkswap.c:504
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "Setting up swapspace version %d, size = %ld bytes\n"
 msgstr ""
 "Auslagerungsbereich Version %d mit einer Gr��e von %ld Bytes wird angelegt.\n"
 
-#: disk-utils/mkswap.c:510
+#: disk-utils/mkswap.c:608
 msgid "unable to rewind swap-device"
 msgstr "Auslagerungsger�t kann nicht zur�ckgespult werden."
 
-#: disk-utils/mkswap.c:513
+#: disk-utils/mkswap.c:611
 msgid "unable to write signature page"
 msgstr "Signaturseite kann nicht geschrieben werden."
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:619
 msgid "fsync failed"
 msgstr "fsync war nicht erfolgreich."
 
@@ -1448,46 +1466,46 @@ msgstr "       %s [ -c | -y | -n | -d ] Ger�t\n"
 msgid "       %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] Ger�t\n"
 
-#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
 msgid "Unusable"
 msgstr "Nicht verwendbar"
 
-#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
 msgid "Free Space"
 msgstr "Freier Platz"
 
-#: fdisk/cfdisk.c:399
+#: fdisk/cfdisk.c:398
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:403
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:405
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:410
+#: fdisk/cfdisk.c:409
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:420
 msgid "Disk has been changed.\n"
 msgstr "Die Festplatte wurde ver�ndert.\n"
 
-#: fdisk/cfdisk.c:422
+#: fdisk/cfdisk.c:421
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Starten Sie das System neu, um sicherzustellen, dass die Partitionstabelle "
 "korrekt aktualisiert wird.\n"
 
-#: fdisk/cfdisk.c:425
+#: fdisk/cfdisk.c:424
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1499,23 +1517,23 @@ msgstr ""
 "ge�ndert haben, finden Sie weitere Informationen in\n"
 "der Handbuchseite zu cfdisk (Befehl: 'man cfdisk').\n"
 
-#: fdisk/cfdisk.c:520
+#: fdisk/cfdisk.c:519
 msgid "FATAL ERROR"
 msgstr "NICHT BEHEBBARER FEHLER"
 
-#: fdisk/cfdisk.c:529
+#: fdisk/cfdisk.c:528
 msgid "Press any key to exit cfdisk"
 msgstr "Dr�cken Sie eine beliebige Taste, um cfdisk zu beenden."
 
-#: fdisk/cfdisk.c:565 fdisk/cfdisk.c:573
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
 msgid "Cannot seek on disk drive"
 msgstr "Suchvorgang auf der Festplatte nicht m�glich."
 
-#: fdisk/cfdisk.c:567
+#: fdisk/cfdisk.c:566
 msgid "Cannot read disk drive"
 msgstr "Lesen von der Festplatte nicht m�glich."
 
-#: fdisk/cfdisk.c:575
+#: fdisk/cfdisk.c:574
 msgid "Cannot write disk drive"
 msgstr "Schreiben auf die Festplatte nicht m�glich."
 
@@ -1758,8 +1776,8 @@ msgstr "  Logische"
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1071 fdisk/fdisk.c:1220
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1213 fdisk/fdisk.c:1437
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -2001,8 +2019,8 @@ msgstr "Hinweis: Alle Befehle k�nnen sowohl als Klein- oder Gro�buchstaben"
 msgid "case letters (except for Writes)."
 msgstr "eingegeben werden (au�er W f�r den Schreibvorgang)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:305
-#: fdisk/fdisksunlabel.c:307
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr " Zylinder"
 
@@ -2010,7 +2028,7 @@ msgstr " Zylinder"
 msgid "Change cylinder geometry"
 msgstr "Die Anzahl der Zylinder �ndern"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "K�pfe"
 
@@ -2263,7 +2281,8 @@ msgid "Illegal command"
 msgstr "Unzul�ssiger Befehl."
 
 #: fdisk/cfdisk.c:2718
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+#, fuzzy
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
@@ -2304,7 +2323,7 @@ msgstr ""
 "                K�pfe und Sektoren pro Spur au�er Kraft setzen.\n"
 "\n"
 
-#: fdisk/fdisk.c:246
+#: fdisk/fdisk.c:204
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2327,7 +2346,7 @@ msgstr ""
 "-u: Anfang und Ende werden in Sektoren statt in Zylindern angegeben\n"
 "-b 2048 (bei bestimmten MO-Ger�ten): Sektoren mit 2048 Bytes verwenden\n"
 
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:216
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2344,215 +2363,225 @@ msgstr ""
 "        oder: fdisk /dev/ida/c0d0  (RAID-Festplatten)\n"
 "        ...\n"
 
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:224
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s konnte nicht ge�ffnet werden.\n"
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s konnte nicht gelesen werden.\n"
 
-#: fdisk/fdisk.c:272
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Suchvorgang in %s nicht erfolgreich.\n"
 
-#: fdisk/fdisk.c:275
+#: fdisk/fdisk.c:233
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Schreibvorgang an %s nicht erfolgreich.\n"
 
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:236
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl: Fehler bei %s\n"
 
-#: fdisk/fdisk.c:282
+#: fdisk/fdisk.c:240
 msgid "Unable to allocate any more memory\n"
 msgstr "Es konnte kein weiterer Speicher zugewiesen werden.\n"
 
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:242
 msgid "Fatal error\n"
 msgstr "Nicht behebbarer Fehler.\n"
 
-#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:332 fdisk/fdisk.c:339
-#: fdisk/fdisk.c:362 fdisk/fdisk.c:380 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:348 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:378 fdisk/fdisk.c:396 fdisk/fdisk.c:412 fdisk/fdisk.c:428
+#: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
 msgstr "Befehl  Bedeutung"
 
-#: fdisk/fdisk.c:296
+#: fdisk/fdisk.c:312
 msgid "   a   toggle a read only flag"
 msgstr "   a   Das Schreibschutz-Flag umschalten"
 
 #. sun
-#: fdisk/fdisk.c:297 fdisk/fdisk.c:341
+#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
 msgid "   b   edit bsd disklabel"
 msgstr "   b   Die bsd-Datentr�gerkennung bearbeiten"
 
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:314
 msgid "   c   toggle the mountable flag"
 msgstr "   c   Das Mountf�hig-Flag umschalten"
 
 #. sun
-#: fdisk/fdisk.c:299 fdisk/fdisk.c:318 fdisk/fdisk.c:343
+#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
 msgid "   d   delete a partition"
 msgstr "   d   Eine Partition l�schen"
 
-#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
 msgid "   l   list known partition types"
 msgstr "   l   Bekannte Dateisystemtypen anzeigen"
 
 #. sun
-#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:333 fdisk/fdisk.c:345
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:387 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:349 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   Dieses Men� anzeigen"
 
-#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
 msgid "   n   add a new partition"
 msgstr "   n   Eine neue Partition anlegen"
 
-#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:334 fdisk/fdisk.c:347
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Eine neue, leere DOS-Partitionstabelle anlegen"
 
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:348 fdisk/fdisk.c:371
-#: fdisk/fdisk.c:388
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
 msgid "   p   print the partition table"
 msgstr "   p   Die Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:335 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:372 fdisk/fdisk.c:389 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:351 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr "   q   Beenden, ohne die �nderungen zu speichern"
 
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Eine neue, leere Sun-Datentr�gerkennung anlegen"
 
 #. sun
-#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   t   change a partition's system id"
 msgstr "   t   Den Dateisystemtyp einer Partition �ndern"
 
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
 msgid "   u   change display/entry units"
 msgstr "   u   Die Einheit f�r die Anzeige/Eingabe �ndern"
 
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:392
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   v   verify the partition table"
 msgstr "   v   Die Partitionstabelle �berpr�fen"
 
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   w   write table to disk and exit"
 msgstr "   w   Tabelle auf die Festplatte schreiben und Programm beenden"
 
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Zus�tzliche Funktionen (nur f�r Experten)"
 
-#: fdisk/fdisk.c:315
+#: fdisk/fdisk.c:331
 msgid "   a   select bootable partition"
 msgstr "   a   Die bootf�hige Partition ausw�hlen"
 
 #. sgi flavour
-#: fdisk/fdisk.c:316
+#: fdisk/fdisk.c:332
 msgid "   b   edit bootfile entry"
 msgstr "   b   Den 'bootfile'-Eintrag bearbeiten"
 
 #. sgi
-#: fdisk/fdisk.c:317
+#: fdisk/fdisk.c:333
 msgid "   c   select sgi swap partition"
 msgstr "   c   Die sgi-Auslagerungspartition ausw�hlen"
 
-#: fdisk/fdisk.c:340
+#: fdisk/fdisk.c:356
 msgid "   a   toggle a bootable flag"
 msgstr "   a   Ein 'Bootf�hig'-Flag umschalten"
 
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:358
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   Ein DOS-Kompatibilit�tsflag umschalten"
 
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:379
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Die Anzahl alternativer Zylinder �ndern"
 
 #. sun
-#: fdisk/fdisk.c:364 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
 msgid "   c   change number of cylinders"
 msgstr "   c   Die Anzahl der Zylinder �ndern"
 
 # XXX
-#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Reine Daten in der Partitionstabelle anzeigen"
 
-#: fdisk/fdisk.c:366
+#: fdisk/fdisk.c:382
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Die Anzahl zus�tzlicher Sektoren pro Zylinder �ndern"
 
 #. sun
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
 msgid "   h   change number of heads"
 msgstr "   h   Die Anzahl der K�pfe �ndern"
 
-#: fdisk/fdisk.c:368
+#: fdisk/fdisk.c:384
 msgid "   i   change interleave factor"
 msgstr "   i   Den Interleave-Faktor �ndern"
 
 #. sun
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:385
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Die Drehzahl �ndern (U/min)"
 
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   Zur�ck zum Hauptmen�"
 
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   s   change number of sectors/track"
 msgstr "   s   Die Anzahl der Sektoren pro Spur �ndern"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:393
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Die Anzahl physischer Zylinder �ndern"
 
-#: fdisk/fdisk.c:381
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
 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:384
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
 msgid "   e   list extended partitions"
 msgstr "   e   Erweiterte Partitionen anzeigen"
 
 #. !sun
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
 msgid "   g   create an IRIX partition table"
 msgstr "   g   Eine IRIX-Partitionstabelle anlegen"
 
-#: fdisk/fdisk.c:481
+#. !sun
+#: fdisk/fdisk.c:433
+#, fuzzy
+msgid "   f   fix partition order"
+msgstr "   p   Die Partitionstabelle anzeigen"
+
+#: fdisk/fdisk.c:532
 msgid "You must set"
 msgstr "W�hlen Sie"
 
-#: fdisk/fdisk.c:495
+#: fdisk/fdisk.c:546
 msgid "heads"
 msgstr "K�pfe"
 
-#: fdisk/fdisk.c:497 fdisk/fdisk.c:905 fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:548 fdisk/fdisk.c:1046 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "Sektoren"
 
-#: fdisk/fdisk.c:499 fdisk/fdisk.c:905 fdisk/fdiskbsdlabel.c:444
-#: fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:550 fdisk/fdisk.c:1046 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:503
+#: fdisk/fdisk.c:554
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2561,31 +2590,31 @@ msgstr ""
 "%s%s.\n"
 "Verwenden Sie hierzu das Men� 'zus�tzliche Funktionen'.\n"
 
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:555
 msgid " and "
 msgstr " und "
 
-#: fdisk/fdisk.c:538
+#: fdisk/fdisk.c:595
 msgid "Bad offset in primary extended partition\n"
 msgstr "Ung�ltiger Offset-Wert in der prim�ren erweiterten Partition.\n"
 
-#: fdisk/fdisk.c:545
+#: fdisk/fdisk.c:609
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Warnung: Partitionen werden gel�scht nach %d\n"
 
-#: fdisk/fdisk.c:566
+#: fdisk/fdisk.c:625
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Warnung: Zus�tzlicher Verkn�pfungszeiger in Partitionstabelle %d\n"
 
-#: fdisk/fdisk.c:574
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Warnung: Zus�tzliche Daten in der Partitionstabelle %d werden ignoriert.\n"
 
-#: fdisk/fdisk.c:600
+#: fdisk/fdisk.c:677
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -2597,34 +2626,35 @@ msgstr ""
 "Danach kann der vorherige Inhalt nicht mehr wiederhergestellt werden.\n"
 "\n"
 
-# XXX
-#: fdisk/fdisk.c:636
-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:645
+#: fdisk/fdisk.c:701
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Hinweis: Die Sektorgr��e ist %d (nicht %d)\n"
 
-#: fdisk/fdisk.c:693
+# XXX
+#: fdisk/fdisk.c:783
+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:811
+#, fuzzy
 msgid ""
-"Device contains neither a valid DOS partition table, nor Sun or SGI "
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 "Das Ger�t enth�lt weder eine g�ltige DOS-Partitionstabelle\n"
 "noch eine Sun- oder SGI-Datentr�gerkennung.\n"
 
-#: fdisk/fdisk.c:709
+#: fdisk/fdisk.c:827
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: fdisk/fdisk.c:719
+#: fdisk/fdisk.c:849
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Die zus�tzliche erweiterte Partition %d wird ignoriert.\n"
 
-#: fdisk/fdisk.c:726
+#: fdisk/fdisk.c:861
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2633,7 +2663,7 @@ msgstr ""
 "Warnung: Ung�ltiges Flag 0x%04x der Partitionstabelle %d wird durch w "
 "(schreiben) ersetzt.\n"
 
-#: fdisk/fdisk.c:747
+#: fdisk/fdisk.c:883
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2641,65 +2671,65 @@ msgstr ""
 "\n"
 "Dateiende (EOF) dreimal erhalten - Programm wird beendet.\n"
 
-#: fdisk/fdisk.c:784
+#: fdisk/fdisk.c:921
 msgid "Hex code (type L to list codes): "
 msgstr "Hexadezimalcode (L eingeben, um eine Liste anzuzeigen): "
 
-#: fdisk/fdisk.c:823
+#: fdisk/fdisk.c:960
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d) [Standardwert: %d]: "
 
-#: fdisk/fdisk.c:877
+#: fdisk/fdisk.c:1014
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Standardwert %d wird verwendet.\n"
 
-#: fdisk/fdisk.c:881
+#: fdisk/fdisk.c:1018
 msgid "Value out of range.\n"
 msgstr "Wert au�erhalb des g�ltigen Bereichs.\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:1028
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:896
+#: fdisk/fdisk.c:1037
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Warnung: Typ der Partition %d ist leer.\n"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1044
 msgid "cylinder"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1044
 msgid "sector"
 msgstr "Sektor"
 
-#: fdisk/fdisk.c:912
+#: fdisk/fdisk.c:1053
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Die Einheit f�r die Anzeige/Eingabe ist nun %s\n"
 
-#: fdisk/fdisk.c:922
+#: fdisk/fdisk.c:1064
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "WARNUNG: Partition %d ist eine erweiterte Partition.\n"
 
-#: fdisk/fdisk.c:935
+#: fdisk/fdisk.c:1075
 msgid "DOS Compatibility flag is set\n"
 msgstr "Das DOS-Kompatibilit�tsflag ist gesetzt.\n"
 
-#: fdisk/fdisk.c:939
+#: fdisk/fdisk.c:1079
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Das DOS-Kompatibilit�tsflag ist nicht gesetzt.\n"
 
-#: fdisk/fdisk.c:1025
+#: fdisk/fdisk.c:1167
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Die Partition %d existiert noch nicht!\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1172
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2711,7 +2741,7 @@ msgstr ""
 "daher nicht empfohlen. Sie k�nnen die Partition mit dem\n"
 "Befehl 'd' l�schen.\n"
 
-#: fdisk/fdisk.c:1039
+#: fdisk/fdisk.c:1181
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2719,7 +2749,7 @@ msgstr ""
 "Es ist nicht m�glich, aus einer Partition eine erweiterte\n"
 "Partition zu machen (oder umgekehrt). L�schen Sie sie zuerst.\n"
 
-#: fdisk/fdisk.c:1048
+#: fdisk/fdisk.c:1190
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2729,7 +2759,7 @@ msgstr ""
 "w�hlen, da SunOS/Solaris dies erwartet und auch Linux es bevorzugt.\n"
 "\n"
 
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1196
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2740,54 +2770,54 @@ msgstr ""
 "wie IRIX dies erwartet.\n"
 "\n"
 
-#: fdisk/fdisk.c:1068
+#: fdisk/fdisk.c:1210
 #, 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:1121
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 "Physischer und logischer Anfang von Partition %d sind nicht identisch (keine "
 "Linux-Partition?):\n"
 
-#: fdisk/fdisk.c:1123 fdisk/fdisk.c:1131 fdisk/fdisk.c:1140 fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1263 fdisk/fdisk.c:1271 fdisk/fdisk.c:1280 fdisk/fdisk.c:1289
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     physisch=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132
+#: fdisk/fdisk.c:1264 fdisk/fdisk.c:1272
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisch=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1129
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Physisches und logisches Ende von Partition %d sind nicht identisch:\n"
 
-#: fdisk/fdisk.c:1138
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1141
+#: fdisk/fdisk.c:1281
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "sollte (%d, %d, 1) lauten.\n"
 
-#: fdisk/fdisk.c:1147
+#: fdisk/fdisk.c:1287
 #, c-format
 msgid "Partition %i does not end on cylinder boundary:\n"
 msgstr "Partition %i endet nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1290
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "sollte (%d, %d, %d) lauten.\n"
 
-#: fdisk/fdisk.c:1157
+#: fdisk/fdisk.c:1297
 #, c-format
 msgid ""
 "\n"
@@ -2800,18 +2830,30 @@ msgstr ""
 "Einheiten: %s mit %d * %d Bytes\n"
 "\n"
 
-#. FIXME! let's see how this shows up with other languagues
-#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1342
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1408
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Booten  Anfang      Ende   Bl�cke   ID  Dateisystemtyp\n"
 
-#: fdisk/fdisk.c:1195 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1409 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
 msgid "Device"
 msgstr "Ger�t"
 
-#: fdisk/fdisk.c:1235
+#: fdisk/fdisk.c:1446
+#, fuzzy
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr ""
+"Logische Partitionen befinden sich nicht in der Festplattenreihenfolge."
+
+#: fdisk/fdisk.c:1456
 #, c-format
 msgid ""
 "\n"
@@ -2822,69 +2864,69 @@ msgstr ""
 "Festplatte %s: %d K�pfe, %d Sektoren, %d Zylinder\n"
 "\n"
 
-#: fdisk/fdisk.c:1237
+#: fdisk/fdisk.c:1458
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
 msgstr "Nr AF Kpf Sek  Zyl Kpf Sek  Zyl   Anfang   Gr��e ID\n"
 
-#: fdisk/fdisk.c:1276
+#: fdisk/fdisk.c:1502
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Warnung: Partition %d enth�lt Sektor 0\n"
 
-#: fdisk/fdisk.c:1279
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d: Kopf %d gr��er als H�chstwert %d\n"
 
-#: fdisk/fdisk.c:1282
+#: fdisk/fdisk.c:1508
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d: Sektor %d gr��er als H�chstwert %d\n"
 
-#: fdisk/fdisk.c:1285
+#: fdisk/fdisk.c:1511
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partition %d: Zylinder %d gr��er als H�chstwert %d\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1515
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d: vorherige Sektoren %d stimmen nicht mit Gesamtwert %d "
 "�berein.\n"
 
-#: fdisk/fdisk.c:1319
+#: fdisk/fdisk.c:1547
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Warnung: Ung�ltiger Datenanfang in Partition %d\n"
 
-#: fdisk/fdisk.c:1327
+#: fdisk/fdisk.c:1555
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Warnung: Partition %d �berlappt sich mit Partition %d.\n"
 
-#: fdisk/fdisk.c:1345
+#: fdisk/fdisk.c:1575
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Warnung: Partition %d ist leer.\n"
 
-#: fdisk/fdisk.c:1350
+#: fdisk/fdisk.c:1580
 #, 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:1356
+#: fdisk/fdisk.c:1586
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Gesamtzahl zugewiesener Sektoren %d ist gr��er als der H�chstwert %d\n"
 
-#: fdisk/fdisk.c:1359
+#: fdisk/fdisk.c:1589
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d nicht zugewiesene Sektoren\n"
 
-#: fdisk/fdisk.c:1371 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1602 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -2892,42 +2934,42 @@ msgstr ""
 "hinzuf�gen.\n"
 
 # %s can be "Sektor" or "Zylinder".
-#: fdisk/fdisk.c:1392 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
-#: fdisk/fdisksunlabel.c:494
+#: fdisk/fdisk.c:1623 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Erster %s"
 
-#: fdisk/fdisk.c:1407 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1638 fdisk/fdisksunlabel.c:542
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d ist bereits zugewiesen.\n"
 
-#: fdisk/fdisk.c:1439
+#: fdisk/fdisk.c:1674
 msgid "No free sectors available\n"
 msgstr "Es sind keine freien Sektoren verf�gbar.\n"
 
-#: fdisk/fdisk.c:1449 fdisk/fdiskbsdlabel.c:259 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1682 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Letzter %s oder +Gr��e, +Gr��eK oder +Gr��eM"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1715
 #, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
 msgstr "Warnung: Partition %d hat eine ungerade Anzahl Sektoren.\n"
 
-#: fdisk/fdisk.c:1516 fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdisk.c:1755 fdisk/fdiskbsdlabel.c:611
 msgid "The maximum number of partitions has been created\n"
 msgstr "Die maximale Anzahl von Partitionen wurde erstellt.\n"
 
-#: fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1765
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "L�schen Sie zun�chst eine Partition und f�gen Sie eine erweiterte Partition "
 "hinzu.\n"
 
-#: fdisk/fdisk.c:1530
+#: fdisk/fdisk.c:1769
 #, c-format
 msgid ""
 "Command action\n"
@@ -2938,20 +2980,20 @@ msgstr ""
 "   %s\n"
 "   p      Prim�re Partition (1-4)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1771
 msgid "l   logical (5 or over)"
 msgstr "l      Logische Partition (5 oder gr��er)"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1771
 msgid "e   extended"
 msgstr "e      Erweiterte Partition"
 
-#: fdisk/fdisk.c:1549
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ung�ltige Partitionsnummer f�r den Typ '%c'\n"
 
-#: fdisk/fdisk.c:1581
+#: fdisk/fdisk.c:1823
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2959,11 +3001,11 @@ msgstr ""
 "Die Partitionstabelle wurde ge�ndert!\n"
 "\n"
 
-#: fdisk/fdisk.c:1590
+#: fdisk/fdisk.c:1832
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "ioctl() wird aufgerufen, um die Partitionstabelle erneut zu lesen.\n"
 
-#: fdisk/fdisk.c:1606
+#: fdisk/fdisk.c:1848
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2973,7 +3015,7 @@ msgstr ""
 "Starten Sie das System neu, um sicherzustellen, dass die Partitionstabelle "
 "aktualisiert wird.\n"
 
-#: fdisk/fdisk.c:1612
+#: fdisk/fdisk.c:1854
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2985,66 +3027,71 @@ msgstr ""
 "ge�ndert haben, finden Sie weitere Informationen in\n"
 "der Handbuchseite f�r fdisk (Befehl: 'man fdisk').\n"
 
-#: fdisk/fdisk.c:1619
+#: fdisk/fdisk.c:1861
 msgid "Syncing disks.\n"
 msgstr "Datentr�ger werden synchronisiert.\n"
 
-#: fdisk/fdisk.c:1650
+#: fdisk/fdisk.c:1892
 #, c-format
 msgid "Device: %s\n"
 msgstr "Ger�t: %s\n"
 
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1908
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d hat keinen Datenbereich.\n"
 
-#: fdisk/fdisk.c:1671
+#: fdisk/fdisk.c:1913
 msgid "New beginning of data"
 msgstr "Neuer Datenanfang"
 
 # That sounds pretty ummm...
-#: fdisk/fdisk.c:1685
+#: fdisk/fdisk.c:1929
 msgid "Expert command (m for help): "
 msgstr "Expertenbefehl (m f�r Hilfe): "
 
-#: fdisk/fdisk.c:1696
+#: fdisk/fdisk.c:1942
 msgid "Number of cylinders"
 msgstr "Anzahl der Zylinder"
 
-#: fdisk/fdisk.c:1717
+#: fdisk/fdisk.c:1968
 msgid "Number of heads"
 msgstr "Anzahl der K�pfe"
 
-#: fdisk/fdisk.c:1742
+#: fdisk/fdisk.c:1993
 msgid "Number of sectors"
 msgstr "Anzahl der Sektoren"
 
-#: fdisk/fdisk.c:1745
+#: fdisk/fdisk.c:1996
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Warnung: Sektoroffset wird f�r DOS-Kompatibilit�t festgelegt.\n"
 
-#: fdisk/fdisk.c:1807
+#: fdisk/fdisk.c:2058
 #, 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:1821
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s konnte nicht ge�ffnet werden.\n"
 
-#: fdisk/fdisk.c:1838
+#: fdisk/fdisk.c:2089
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s konnte nicht ge�ffnet werden.\n"
 
-#: fdisk/fdisk.c:1911
+#: fdisk/fdisk.c:2110
+#, fuzzy, c-format
+msgid "%c: unknown command\n"
+msgstr "Kein Befehl?\n"
+
+#: fdisk/fdisk.c:2161
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Dieser Kernel erkennt die Sektorgr��e selbst. Die Option -b wird ignoriert.\n"
 
-#: fdisk/fdisk.c:1914
+#: fdisk/fdisk.c:2164
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -3052,11 +3099,18 @@ msgstr ""
 "Warnung: die Option -b (Sektorgr��e festlegen) muss mit einem angegebenen "
 "Ger�t verwendet werden.\n"
 
-#: fdisk/fdisk.c:1973
+#: fdisk/fdisk.c:2227
+#, c-format
+msgid ""
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:2236
 msgid "Command (m for help): "
 msgstr "Befehl (m f�r Hilfe): "
 
-#: fdisk/fdisk.c:1987
+#: fdisk/fdisk.c:2252
 #, c-format
 msgid ""
 "\n"
@@ -3065,15 +3119,15 @@ msgstr ""
 "\n"
 "Die aktuelle Bootdatei ist: %s\n"
 
-#: fdisk/fdisk.c:1989
+#: fdisk/fdisk.c:2254
 msgid "Please enter the name of the new boot file: "
 msgstr "Geben Sie den Namen der neuen Bootdatei ein: "
 
-#: fdisk/fdisk.c:1991
+#: fdisk/fdisk.c:2256
 msgid "Boot file unchanged\n"
 msgstr "Bootdatei wurde nicht ge�ndert.\n"
 
-#: fdisk/fdisk.c:2051
+#: fdisk/fdisk.c:2320
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3083,7 +3137,7 @@ msgstr ""
 "\tKein Expertenmen� f�r SGI-Partitionstabellen verf�gbar.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:29
+#: fdisk/fdiskaixlabel.c:28
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3111,7 +3165,7 @@ msgstr ""
 "\t   des physischen Datentr�gers aus dem AIX-Rechner.\n"
 "\t   (Anderenfalls werden Sie zu einem AIXperten.)"
 
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:117
 #, c-format
 msgid ""
 "\n"
@@ -3120,164 +3174,169 @@ msgstr ""
 "\n"
 "BSD-Datentr�gerkennung von %s\n"
 
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:125
 msgid "   d   delete a BSD partition"
 msgstr "   d   Eine BSD-Partition l�schen"
 
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
 msgstr "   e   Laufwerksdaten bearbeiten"
 
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
 msgstr "   i   Bootinformationen installieren"
 
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
 msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   n   add a new BSD partition"
 msgstr "   n   Eine neue BSD-Partition hinzuf�gen"
 
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   p   print BSD partition table"
 msgstr "   p   Die BSD-Partitionstabelle ausgeben"
 
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
 msgstr "   s   Die vollst�ndige Datentr�gerkennung anzeigen"
 
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
 msgstr "   t   Die Dateisystemkennung einer Partition �ndern"
 
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:136
+#, fuzzy
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   c   Die Anzahl der Zylinder �ndern"
+
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
 msgstr "   w   Die Datentr�gerkennung auf die Festplatte schreiben"
 
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   Die BSD-Partition mit einer Nicht-BSD-Partition verkn�pfen"
 
-#: fdisk/fdiskbsdlabel.c:146
-#, c-format
-msgid "Partition %s%d has invalid starting sector 0.\n"
+#: fdisk/fdiskbsdlabel.c:168
+#, fuzzy, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
 msgstr "Die Partition %s%d enth�lt einen ung�ltigen Startsektor 0.\n"
 
-#: fdisk/fdiskbsdlabel.c:150
-#, c-format
-msgid "Reading disklabel of %s%d at sector %d.\n"
+#: fdisk/fdiskbsdlabel.c:172
+#, fuzzy, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
 msgstr "Datentr�gerkennung von %s%d bei Sektor %d wird gelesen.\n"
 
-#: fdisk/fdiskbsdlabel.c:159
+#: fdisk/fdiskbsdlabel.c:182
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
 msgstr "%s enth�lt keine *BSD-Partition.\n"
 
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
 msgstr "Befehl 'BSD disklabel' (m f�r Hilfe): "
 
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:310
 #, c-format
 msgid "type: %s\n"
 msgstr "Typ: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:312
 #, c-format
 msgid "type: %d\n"
 msgstr "Typ: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:313
 #, c-format
 msgid "disk: %.*s\n"
 msgstr "Festplatte: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:292
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
 msgstr "Kennung: %.*s\n"
 
 # I currently don't know a better translation
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:315
 msgid "flags:"
 msgstr "Flags:"
 
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:317
 msgid " removable"
 msgstr " removable"
 
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
 msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:299
+#: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
 msgstr " badsect"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr "Bytes/Sektor: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr "Sektoren/Spur: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr "Spuren/Zylinder: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr "Sektoren/Zylinder: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:329
 #, c-format
 msgid "cylinders: %ld\n"
 msgstr "Zylinder: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
 msgstr "Drehzahl: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
 msgstr "Interleave-Faktor: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "Trackskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "cylinderskew: %d\n"
 msgstr "Cylinderskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr "Kopfwechsel: %ld\t\t ms\n"
 
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr "Spurensuchzeit: %ld\t ms\n"
 
-#: fdisk/fdiskbsdlabel.c:314
+#: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
 msgstr "Laufwerksdaten: "
 
-#: fdisk/fdiskbsdlabel.c:323
+#: fdisk/fdiskbsdlabel.c:347
 #, c-format
 msgid ""
 "\n"
@@ -3286,112 +3345,98 @@ msgstr ""
 "\n"
 "%d Partitionen:\n"
 
-#: fdisk/fdiskbsdlabel.c:324
-msgid "#        size   offset    fstype   [fsize bsize   cpg]\n"
+#: fdisk/fdiskbsdlabel.c:348
+#, fuzzy
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
 msgstr "#        Gr��e  Offset    Dateisys [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:380
-#, c-format
-msgid "Writing disklabel to %s%d.\n"
-msgstr "Datentr�gerkennung wird auf %s%d geschrieben.\n"
-
-#: fdisk/fdiskbsdlabel.c:383
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, c-format
 msgid "Writing disklabel to %s.\n"
 msgstr "Datentr�gerkennung wird auf %s geschrieben.\n"
 
-#: fdisk/fdiskbsdlabel.c:395
-#, c-format
-msgid "%s%d contains no disklabel.\n"
-msgstr "%s%d enth�lt keine Datentr�gerkennung.\n"
-
-#: fdisk/fdiskbsdlabel.c:398
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
 msgstr "%s enth�lt keine Datentr�gerkennung.\n"
 
-#: fdisk/fdiskbsdlabel.c:402
+#: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
 msgstr "M�chten Sie eine Datentr�gerkennung anlegen (j/n)? "
 
-#: fdisk/fdiskbsdlabel.c:441
+#: fdisk/fdiskbsdlabel.c:458
 msgid "bytes/sector"
 msgstr "Bytes/Sektor"
 
-#: fdisk/fdiskbsdlabel.c:442
+#: fdisk/fdiskbsdlabel.c:459
 msgid "sectors/track"
 msgstr "Sektoren/Spur"
 
-#: fdisk/fdiskbsdlabel.c:443
+#: fdisk/fdiskbsdlabel.c:460
 msgid "tracks/cylinder"
 msgstr "Spuren/Zylinder"
 
-#: fdisk/fdiskbsdlabel.c:451
+#: fdisk/fdiskbsdlabel.c:468
 msgid "sectors/cylinder"
 msgstr "Sektoren/Zylinder"
 
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr "Muss <= Sektoren/Spur * Spuren/Zylinder sein (Standard).\n"
 
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
 msgstr "U/min"
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
 msgstr "Interleave-Faktor"
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
 msgstr "Trackskew"
 
-#: fdisk/fdiskbsdlabel.c:460
+#: fdisk/fdiskbsdlabel.c:477
 msgid "cylinderskew"
 msgstr "Cylinderskew"
 
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
 msgstr "Kopfwechsel"
 
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
 msgstr "Spurensuchzeit"
 
-#: fdisk/fdiskbsdlabel.c:503
+#: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "Bootinformationen: %sboot -> boot%s (%s): "
 
-#: fdisk/fdiskbsdlabel.c:529
+#: fdisk/fdiskbsdlabel.c:546
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr "Bootinformationen �berlappen sich mit Datentr�gerkennung!\n"
 
-#: fdisk/fdiskbsdlabel.c:550
-#, c-format
-msgid "Bootstrap installed on %s%d.\n"
-msgstr "Bootinformationen installiert auf %s%d.\n"
-
-#: fdisk/fdiskbsdlabel.c:552
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr "Bootinformationen installiert auf %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:573
+#: fdisk/fdiskbsdlabel.c:591
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:604
+#: fdisk/fdiskbsdlabel.c:622
 msgid "This partition already exists.\n"
 msgstr "Diese Partition existiert bereits.\n"
 
-#: fdisk/fdiskbsdlabel.c:726
+#: fdisk/fdiskbsdlabel.c:742
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Warnung: zu viele Partitionen (%d, H�chstzahl ist %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:772
+#: fdisk/fdiskbsdlabel.c:789
 msgid ""
 "\n"
 "Syncing disks.\n"
@@ -3399,68 +3444,73 @@ msgstr ""
 "\n"
 "Festplatten werden synchronisiert.\n"
 
-#: fdisk/fdisksgilabel.c:56
+#: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:57
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:58
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:59
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:60
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:61
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:62
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:63
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:64
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:65
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:66
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:67
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xlvol"
 msgstr "SGI xlvol"
 
-#: fdisk/fdisksgilabel.c:68
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI rxlvol"
 msgstr "SGI rxlvol"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux (Auslagerung)"
 
-#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux (systemeigen)"
 
-#: fdisk/fdisksgilabel.c:143
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+#, fuzzy
+msgid "Linux LVM"
+msgstr "Linux"
+
+#: fdisk/fdisksgilabel.c:158
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3468,11 +3518,11 @@ msgstr ""
 "Gem�� MIPS Computer Systems, Inc. darf die Datentr�gerkennung maximal 512 "
 "Byte umfassen.\n"
 
-#: fdisk/fdisksgilabel.c:162
+#: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "sgi-Datentr�gerkennung mit fehlerhafter Pr�fsumme vorhanden.\n"
 
-#: fdisk/fdisksgilabel.c:186
+#: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
 "\n"
@@ -3491,7 +3541,7 @@ msgstr ""
 "Einheiten = %s mit %d * 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:199
+#: fdisk/fdisksgilabel.c:213
 #, c-format
 msgid ""
 "\n"
@@ -3504,7 +3554,7 @@ msgstr ""
 "Einheiten: %s mit %d * 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:205
+#: fdisk/fdisksgilabel.c:219
 #, c-format
 msgid ""
 "----- partitions -----\n"
@@ -3513,7 +3563,7 @@ msgstr ""
 "----- Partitionen -----\n"
 "%*s  Info      Start       Ende  Sektoren ID  System\n"
 
-#: fdisk/fdisksgilabel.c:227
+#: fdisk/fdisksgilabel.c:241
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3524,12 +3574,12 @@ msgstr ""
 "Boot-Datei: %s\n"
 "---- Verzeichniseintr�ge ----\n"
 
-#: fdisk/fdisksgilabel.c:237
+#: fdisk/fdisksgilabel.c:251
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s Sektor%5u Gr��e%8u\n"
 
-#: fdisk/fdisksgilabel.c:298
+#: fdisk/fdisksgilabel.c:305
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3542,7 +3592,7 @@ msgstr ""
 "\tnicht-leeren Pfadbezeichnung angegeben werden,\n"
 "\tz. B. '/unix' oder '/unix.save'.\n"
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:312
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3550,7 +3600,7 @@ msgstr ""
 "\n"
 "\tDer Name der Boot-Datei ist zu lang (max. 16 Byte zul�ssig).\n"
 
-#: fdisk/fdisksgilabel.c:310
+#: fdisk/fdisksgilabel.c:317
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3558,7 +3608,7 @@ msgstr ""
 "\n"
 "\tDie Boot-Datei muss als vollqualifizierter Pfadname angegeben werden.\n"
 
-#: fdisk/fdisksgilabel.c:315
+#: fdisk/fdisksgilabel.c:322
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3568,7 +3618,7 @@ msgstr ""
 "\tAchtung: Es wird nicht gepr�ft, ob die Boot-Datei vorhanden ist.\n"
 "\tDer SGI-Standardpfad ist '/unix' bzw. '/unix.save' (Sicherung).\n"
 
-#: fdisk/fdisksgilabel.c:343
+#: fdisk/fdisksgilabel.c:350
 #, c-format
 msgid ""
 "\n"
@@ -3581,7 +3631,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Es sind mehrere vollst�ndige Festplatteneintr�ge vorhanden.\n"
 
-#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:478
 msgid "No partitions defined\n"
 msgstr "Es wurden keine Partitionen definiert.\n"
 
@@ -3680,27 +3730,27 @@ msgstr ""
 "Sie sicher sind, dass Sie diese Partition anders markieren m�chten.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:621
+#: fdisk/fdisksgilabel.c:607
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Partitionen auf der Festplatte �berlappen einander.\n"
 
-#: fdisk/fdisksgilabel.c:691
+#: fdisk/fdisksgilabel.c:669
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr ""
 "Es wird versucht, den gesamten Festplatteneintrag automatisch zu "
 "generieren.\n"
 
-#: fdisk/fdisksgilabel.c:698
+#: fdisk/fdisksgilabel.c:676
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Die gesamte Festplatte ist bereits partitioniert.\n"
 
-#: fdisk/fdisksgilabel.c:703
+#: fdisk/fdisksgilabel.c:681
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Partitionen auf der Festplatte �berlappen einander. Beheben Sie dies "
 "zuerst!\n"
 
-#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3709,22 +3759,23 @@ msgstr ""
 "konfigurieren, dass sie die gesamte Festplatte umfasst\n"
 "und den Typ 'SGI volume' aufweist.\n"
 
-#: fdisk/fdisksgilabel.c:728
+#: fdisk/fdisksgilabel.c:706
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Dies f�hrt zu �berlappenden Partitionen auf der Festplatte. Beheben Sie dies "
 "zun�chst!\n"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:711
 #, c-format
 msgid " Last %s"
 msgstr "Letzter %s"
 
-#: fdisk/fdisksgilabel.c:756
+#: fdisk/fdisksgilabel.c:733
+#, fuzzy
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
-"content will be unrecoverable lost.\n"
+"content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
 "Neue SGI-Datentr�gerkennung wird erstellt. Die �nderungen befinden\n"
@@ -3732,12 +3783,12 @@ msgstr ""
 "ist der vorherige Inhalt unwiderruflich verloren.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:784
+#: fdisk/fdisksgilabel.c:761
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Es wird versucht, die Parameter der Partition %d beizubehalten.\n"
 
-#: fdisk/fdisksgilabel.c:786
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tL�NGE=%d\n"
@@ -3774,7 +3825,7 @@ msgstr "SunOS var"
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:122
+#: fdisk/fdisksunlabel.c:129
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
@@ -3786,12 +3837,12 @@ msgstr ""
 "(K�pfe, Sektoren, Zylinder, Partitionen usw.) angeben\n"
 "oder eine neue Kennung forcieren (Befehl s im Hauptmen�).\n"
 
-#: fdisk/fdisksunlabel.c:215
+#: fdisk/fdisksunlabel.c:228
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Die automatische Konfiguration fand ein %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:242
+#: fdisk/fdisksunlabel.c:255
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -3803,7 +3854,7 @@ msgstr ""
 "ist der vorherige Inhalt unwiderruflich verloren.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:253
+#: fdisk/fdisksunlabel.c:266
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3813,72 +3864,72 @@ msgstr ""
 "   ?   automatisch konfigurieren\n"
 "   0   benutzerspezifisch (mit den Standardwerten der Hardware-Erkennung)"
 
-#: fdisk/fdisksunlabel.c:263
+#: fdisk/fdisksunlabel.c:276
 msgid "Select type (? for auto, 0 for custom): "
 msgstr ""
 "W�hlen Sie einen Typ (? f�r 'automatisch', 0 f�r 'benutzerspezifisch'): "
 
-#: fdisk/fdisksunlabel.c:275
+#: fdisk/fdisksunlabel.c:288
 msgid "Autoconfigure failed.\n"
 msgstr "Automatische Konfiguration nicht erfolgreich.\n"
 
-#: fdisk/fdisksunlabel.c:303
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sektoren/Spur"
 
-#: fdisk/fdisksunlabel.c:310
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Alternative Zylinder"
 
-#: fdisk/fdisksunlabel.c:313
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Physische Zylinder"
 
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
 msgid "Rotation speed (rpm)"
 msgstr "Drehzahl (U/min)"
 
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
 msgid "Interleave factor"
 msgstr "Interleave-Faktor"
 
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
 msgid "Extra sectors per cylinder"
 msgstr "Zus�tzliche Sektoren pro Zylinder"
 
-#: fdisk/fdisksunlabel.c:334
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Alle Festplattenparameter k�nnen im Men� 'x' ge�ndert werden."
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "3,5-Zoll-Diskette"
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux benutzerspezifisch"
 
-#: fdisk/fdisksunlabel.c:418
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/fdisksunlabel.c:438
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partition %d �berlappt sich mit anderen Partitionen in Sektor %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:460
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Unbenutzter Bereich - Sektor 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Unbenutzter Bereich - Sektor %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:512
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3886,7 +3937,7 @@ msgstr ""
 "Andere Partitionen erstrecken sich bereits �ber die ganze Festplatte.\n"
 "L�schen oder verkleinern Sie diese, und wiederholen Sie den Vorgang.\n"
 
-#: fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksunlabel.c:570
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3897,7 +3948,7 @@ msgstr ""
 "%d %s greift auf eine andere Partition �ber. Ihre Eingabe wurde in\n"
 "%d %s ge�ndert.\n"
 
-#: fdisk/fdisksunlabel.c:567
+#: fdisk/fdisksunlabel.c:590
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3907,7 +3958,7 @@ msgstr ""
 "Partition die Einstellung 'Ganze Festplatte' (5) mit dem Anfangswert\n"
 "0 und %u Sektoren bei.\n"
 
-#: fdisk/fdisksunlabel.c:580
+#: fdisk/fdisksunlabel.c:603
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3922,7 +3973,7 @@ msgstr ""
 "Geben Sie nur dann 'JA' ein, wenn Sie absolut sicher sind, dass\n"
 "diese Partition als 82 (Linux-Auslagerung) markiert werden soll: "
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:634
 #, c-format
 msgid ""
 "\n"
@@ -3941,7 +3992,7 @@ msgstr ""
 "Einheiten = %s mit %d * 512 Byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:648
 #, c-format
 msgid ""
 "\n"
@@ -3954,16 +4005,16 @@ msgstr ""
 "Einheiten: %s mit %d * 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Start       Ende   Bl�cke   ID  System\n"
 
-#: fdisk/fdisksunlabel.c:655
+#: fdisk/fdisksunlabel.c:678
 msgid "Number of alternate cylinders"
 msgstr "Anzahl alternativer Zylinder"
 
-#: fdisk/fdisksunlabel.c:688
+#: fdisk/fdisksunlabel.c:711
 msgid "Number of physical cylinders"
 msgstr "Anzahl physischer Zylinder"
 
@@ -4076,280 +4127,308 @@ msgid "NEC DOS"
 msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
 msgstr "PartitionMagic-Wiederherstellung"
 
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
 msgstr "Venix 80286"
 
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
 msgstr "PPC PReP Boot"
 
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:36
 msgid "SFS"
 msgstr "SFS"
 
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
 msgstr "QNX4.x"
 
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
 msgstr "QNX4.x Teil 2"
 
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
 msgstr "QNX4.x Teil 3"
 
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
 msgstr "OnTrack DM"
 
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
 #. (or Novell)
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
 #. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
 
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
 msgstr "OnTrackDM6"
 
-#: fdisk/i386_sys_types.c:44
+#: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
 msgstr "EZ-Drive"
 
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
 msgstr "Golden Bow"
 
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
-#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:82
+#: fdisk/i386_sys_types.c:85 fdisk/i386_sys_types.c:86
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD / SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
 
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
 msgstr "Novell Netware 386"
 
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
 msgstr "DiskSecure Multi-Boot"
 
-#: fdisk/i386_sys_types.c:52
+#: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
 msgstr "PC/IX"
 
-#: fdisk/i386_sys_types.c:53
+#: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
 msgstr "Altes Minix"
 
 #. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / altes Linux"
 
-#: fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 verst. Laufwerk C:"
 
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
 msgstr "Linux erweitert"
 
-#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
 msgstr "NTFS-Datentr�gersatz"
 
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
 msgstr "Amoeba"
 
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
 #. (bad block table)
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:65
+#, fuzzy
+msgid "BSD/OS"
+msgstr "BSD/386"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad-Schlafmodus"
 
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
 msgstr "BSD/386"
 
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
 msgstr "NeXTSTEP"
 
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
 msgstr "BSDI-Dateisystem"
 
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
 msgstr "BSDI-Auslagerung"
 
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
 msgstr "DRDOS/sec (FAT-12)"
 
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr "DRDOS/sec (FAT-16 < 32M)"
 
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16)"
 msgstr "DRDOS/sec (FAT-16)"
 
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
 msgid "Syrinx"
 msgstr "Syrinx"
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:76
+msgid "Non-FS data"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:77
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:74
+#. CP/M or Concurrent CP/M or
+#. Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:79
 msgid "DOS access"
 msgstr "DOS-Zugriff"
 
-#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:75
+#. DOS access or SpeedStor 12-bit FAT
+#. extended partition
+#: fdisk/i386_sys_types.c:81
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:77
+#. SpeedStor 16-bit FAT extended
+#. partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:84
 msgid "BeOS fs"
 msgstr "BeOS-Dateisystem"
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:80
+#: fdisk/i386_sys_types.c:87
 msgid "DOS secondary"
 msgstr "DOS sekund�r"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:88
 msgid "Linux raid autodetect"
 msgstr "Linux-RAID, autom. Erkennung"
 
-#. New (2.2.x) raid partition with autodetect
-#. using persistent superblock
-#: fdisk/i386_sys_types.c:83
+#. New (2.2.x) raid partition with
+#. autodetect using persistent
+#. superblock
+#: fdisk/i386_sys_types.c:91
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:92
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:147
+#: fdisk/sfdisk.c:152
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Fehler bei der Suche in %s - Suchvorgang zu %lu nicht m�glich.\n"
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:157
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Fehler bei der Suche: gesucht 0x%08x%08x, gefunden 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:198
+#: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
 msgstr "Kein Speicher mehr frei - Vorgang wird abgebrochen.\n"
 
-#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Fehler beim Lesen in %s - Sektor %lu kann nicht gelesen werden.\n"
 
-#: fdisk/sfdisk.c:218
+#: fdisk/sfdisk.c:224
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "FEHLER: Sektor %lu enth�lt keine MS-DOS-Signatur.\n"
 
-#: fdisk/sfdisk.c:235
+#: fdisk/sfdisk.c:241
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 "Fehler beim Schreiben in %s - Sektor %lu kann nicht geschrieben werden.\n"
 
-#: fdisk/sfdisk.c:273
+#: fdisk/sfdisk.c:279
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "Partitionssektor-Speicherungsdatei (%s) kann nicht ge�ffnet werden.\n"
 
-#: fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:297
 #, c-format
 msgid "write error on %s\n"
 msgstr "Fehler beim Schreiben auf %s\n"
 
-#: fdisk/sfdisk.c:309
+#: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "'stat' zur Partitionswiederherstellungsdatei (%s) nicht m�glich.\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:320
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "Partitionswiederherstellungsdatei weist die falsche Gr��e auf - es findet "
 "keine Wiederherstellung statt.\n"
 
-#: fdisk/sfdisk.c:318
+#: fdisk/sfdisk.c:324
 msgid "out of memory?\n"
 msgstr "Kein Speicher mehr frei?\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "Partitionswiederherstellungsdatei (%s) kann nicht ge�ffnet werden.\n"
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:336
 #, c-format
 msgid "error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: fdisk/sfdisk.c:337
+#: fdisk/sfdisk.c:343
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "Ger�t %s konnte nicht zum Schreiben ge�ffnet werden.\n"
 
-#: fdisk/sfdisk.c:349
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Fehler beim Schreiben von Sektor %lu auf %s\n"
 
-#: fdisk/sfdisk.c:415
+#: fdisk/sfdisk.c:406
+#, fuzzy, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Festplatte %s: Geometrie ist nicht verf�gbar.\n"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Festplatte %s: Geometrie ist nicht verf�gbar.\n"
+
+#: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
 "Warning: start=%d - this looks like a partition rather than\n"
@@ -4360,27 +4439,22 @@ msgstr ""
 "Festplatte. fdisk hat hier keine Wirkung. Verwenden Sie die\n"
 "Option --force, wenn Sie dies tats�chlich durchf�hren m�chten.\n"
 
-#: fdisk/sfdisk.c:421
+#: fdisk/sfdisk.c:442
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
 msgstr "Warnung: Laut HDIO_GETGEO sind %d K�pfe vorhanden.\n"
 
-#: fdisk/sfdisk.c:424
+#: fdisk/sfdisk.c:445
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
 msgstr "Warnung: Laut HDIO_GETGEO sind %d Sektoren vorhanden.\n"
 
-#: fdisk/sfdisk.c:427
-#, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
+#: fdisk/sfdisk.c:449
+#, fuzzy, c-format
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
 msgstr "Warnung: Laut HDIO_GETGEO sind %d Zylinder vorhanden.\n"
 
-#: fdisk/sfdisk.c:431
-#, c-format
-msgid "Disk %s: cannot get geometry\n"
-msgstr "Festplatte %s: Geometrie ist nicht verf�gbar.\n"
-
-#: fdisk/sfdisk.c:433
+#: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%d) - usually at most 63\n"
@@ -4390,7 +4464,7 @@ msgstr ""
 "maximal 63 vorhanden. Dies f�hrt zu Problemen bei allen Softwareprogrammen,\n"
 "die Z/K/S-Adressierung verwenden.\n"
 
-#: fdisk/sfdisk.c:437
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid ""
 "\n"
@@ -4400,7 +4474,7 @@ msgstr ""
 "Festplatte %s: %lu Zylinder, %lu K�pfe, %lu Sektoren/Spur\n"
 "\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:539
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
@@ -4408,7 +4482,7 @@ msgstr ""
 "%s von Partition %s hat einen nicht m�glichen Wert f�r die Anzahl der K�pfe: "
 "%d (sollte zwischen 0 und %d liegen).\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:544
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
@@ -4416,7 +4490,7 @@ msgstr ""
 "%s von Partition %s hat einen nicht m�glichen Wert f�r die Anzahl der "
 "Sektoren: %d (sollte zwischen 1 und %d liegen).\n"
 
-#: fdisk/sfdisk.c:527
+#: fdisk/sfdisk.c:549
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %d (should be in "
@@ -4425,7 +4499,7 @@ msgstr ""
 "%s von Partition %s hat einen nicht m�glichen Wert f�r die Anzahl der "
 "Zylinder: %d (sollte zwischen 0 und %d liegen).\n"
 
-#: fdisk/sfdisk.c:566
+#: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4433,11 +4507,11 @@ msgstr ""
 "ID  Name\n"
 "\n"
 
-#: fdisk/sfdisk.c:719
+#: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
 msgstr "Die Partitionstabelle wird erneut gelesen ...\n"
 
-#: fdisk/sfdisk.c:725
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4445,31 +4519,31 @@ msgstr ""
 "Der Befehl zum erneuten Lesen der Partitionstabelle war nicht erfolgreich.\n"
 "Starten Sie das System jetzt neu, bevor Sie mkfs verwenden.\n"
 
-#: fdisk/sfdisk.c:730
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fehler beim Schlie�en von %s\n"
 
-#: fdisk/sfdisk.c:768
+#: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: Diese Partition ist nicht vorhanden.\n"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
 msgstr "Unbekanntes Format - es werden Sektoren verwendet.\n"
 
-#: fdisk/sfdisk.c:830
+#: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# Partitionstabelle von %s\n"
 
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "Nicht verwendbares Format - es wird %s verwendet.\n"
 
-#: fdisk/sfdisk.c:845
+#: fdisk/sfdisk.c:867
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4478,11 +4552,11 @@ msgstr ""
 "Einheiten = Zylinder mit %lu Bytes, Bl�cke mit 1024 Bytes, Z�hlung ab %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
 msgstr "   Ger�t  Boot Start     Ende  Zylind. Bl�cke    ID  System\n"
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:875
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4491,11 +4565,11 @@ msgstr ""
 "Einheiten = Sektoren mit 512 Bytes, Z�hlung ab %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:855
+#: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
 msgstr "   Ger�t  Boot    Start       Ende Sektoren  ID  System\n"
 
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4504,11 +4578,11 @@ msgstr ""
 "Einheiten = Bl�cke mit 1024 Bytes, Z�hlung von %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:860
+#: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
 msgstr "   Ger�t  Boot   Start       Ende  Bl�cke    ID  System\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:885
 #, c-format
 msgid ""
 "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4517,30 +4591,30 @@ msgstr ""
 "Einheiten = Megabyte mit 1048576 Bytes, Bl�cke mit 1024 Byte, Z�hlung ab %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:865
+#: fdisk/sfdisk.c:887
 msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
 msgstr "   Ger�t  Boot Start   Ende    MB   Bl�cke    ID  System\n"
 
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1019
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tStart: (Z,K,S) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1004
+#: fdisk/sfdisk.c:1026
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tEnde: (Z,K,S) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1007
+#: fdisk/sfdisk.c:1029
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partition ended bei Zylinder %ld, hinter dem Ende der Festplatte.\n"
 
-#: fdisk/sfdisk.c:1018
+#: fdisk/sfdisk.c:1040
 msgid "No partitions found\n"
 msgstr "Keine Partitionen gefunden.\n"
 
-#: fdisk/sfdisk.c:1025
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid ""
 "Warning: The first partition looks like it was made\n"
@@ -4551,97 +4625,97 @@ msgstr ""
 "Z/K/S=*/%ld/%ld (statt %ld/%ld/%ld) erstellt.\n"
 "Diese Auflistung basiert auf dieser Geometrie.\n"
 
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1097
 msgid "no partition table present.\n"
 msgstr "Keine Partitionstabelle vorhanden.\n"
 
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Es sind nur %d Partitionen definiert.\n"
 
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1108
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Warnung: Partition %s hat die Gr��e 0, ist aber nicht als 'leer' "
 "gekennzeichnet.\n"
 
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1111
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Warnung: Partition %s hat die Gr��e 0 und ist bootf�hig.\n"
 
-#: fdisk/sfdisk.c:1092
+#: fdisk/sfdisk.c:1114
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Warnung: Partition %s hat die Gr��e 0 und einen Startwert ungleich 0.\n"
 
-#: fdisk/sfdisk.c:1103
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Warnung: Partition %s "
 
-#: fdisk/sfdisk.c:1104
+#: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "befindet sich nicht in Partition %s\n"
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Warnung: Partitionen %s "
 
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
 msgstr "und %s �berlappen einander.\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, c-format
 msgid "Warning: partition %s contains part of "
 msgstr "Warnung: Partition %s enth�lt einen Teil der"
 
-#: fdisk/sfdisk.c:1128
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "the partition table (sector %lu),\n"
 msgstr "Partitionstabelle (Sektor %lu) und l�scht die\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
 msgstr "Tabelle, wenn Daten in die Partition geschrieben werden.\n"
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
-msgstr "Warnung: Partition %d beginnt bei Sektor 0.\n"
+msgstr "Warnung: Partition %s beginnt bei Sektor 0.\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1164
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 "Warnung: Partition %s erstreckt sich �ber das Ende der Festplatte hinaus.\n"
 
-#: fdisk/sfdisk.c:1156
+#: fdisk/sfdisk.c:1178
 msgid "Among the primary partitions, at most one can be extended\n"
 msgstr "H�chstens eine der prim�ren Partitionen kann erweitert werden;\n"
 
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
 msgstr "dies ist unter Linux kein Problem.\n"
 
-#: fdisk/sfdisk.c:1174
+#: fdisk/sfdisk.c:1196
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Warnung: Partition %s beginnt nicht an einer Zylindergrenze.\n"
 
-#: fdisk/sfdisk.c:1180
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Warnung: Partition %s endet nicht an einer Zylindergrenze.\n"
 
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1220
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4650,7 +4724,7 @@ msgstr ""
 "Dies hat keinen Einfluss auf LILO, aber der DOS-MBR kann diese\n"
 "Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4658,7 +4732,7 @@ msgstr ""
 "Warnung: Normalerweise ist das Booten nur von prim�ren Partitionen\n"
 "aus m�glich. LILO ignoriert das Flag 'bootf�hig'.\n"
 
-#: fdisk/sfdisk.c:1211
+#: fdisk/sfdisk.c:1233
 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"
@@ -4667,151 +4741,169 @@ msgstr ""
 "Dies hat keinen Einfluss auf LILO, aber der DOS-MBR kann diese\n"
 "Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1228
+#: fdisk/sfdisk.c:1250
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Start: (Z,K,S) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1237
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Ende: (Z,K,S) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1240
+#: fdisk/sfdisk.c:1262
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partition %s endet bei Zylinder %ld, hinter dem Ende der Festplatte.\n"
 
-#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#: fdisk/sfdisk.c:1287
+#, fuzzy, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "Warnung: Ung�ltiger Datenanfang in Partition %d\n"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1291
+#, fuzzy
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr "Warnung: Partition %s beginnt nicht an einer Zylindergrenze.\n"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "Zu viele Partitionen - alle Partitionen nach %d werden ignoriert.\n"
 
-#: fdisk/sfdisk.c:1288
+#: fdisk/sfdisk.c:1324
 msgid "tree of partitions?\n"
 msgstr "Partitionsstruktur?\n"
 
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager wurde erkannt - dieser ist nicht verwendbar.\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-Signatur gefunden - Vorgang wird beendet.\n"
 
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "Erweiterte Partition der Gr��e 0?\n"
 
-#: fdisk/sfdisk.c:1426
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "BSD-Partition der Gr��e 0?\n"
 
-#: fdisk/sfdisk.c:1458
+#: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr " %s: unbekannte Partition\n"
 
-#: fdisk/sfdisk.c:1470
+#: fdisk/sfdisk.c:1536
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Das Flag -n wurde angegeben: keine �nderungen vorgenommen.\n"
 
-#: fdisk/sfdisk.c:1483
+#: fdisk/sfdisk.c:1549
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 "Alte Sektoren konnten nicht gespeichert werden - Vorgang wird beendet.\n"
 
-#: fdisk/sfdisk.c:1488
+#: fdisk/sfdisk.c:1554
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Fehler beim Schreiben der Partition auf %s\n"
 
-#: fdisk/sfdisk.c:1565
+#: fdisk/sfdisk.c:1631
 msgid "long or incomplete input line - quitting\n"
 msgstr "Eingabezeile zu lang oder unvollst�ndig - Vorgang wird abgebrochen.\n"
 
-#: fdisk/sfdisk.c:1601
+#: fdisk/sfdisk.c:1667
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "Eingabefehler: '=' erwartet nach dem %s-Feld.\n"
 
-#: fdisk/sfdisk.c:1608
+#: fdisk/sfdisk.c:1674
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "Eingabefehler: Unerwartetes Zeichen %c nach dem %s-Feld.\n"
 
-#: fdisk/sfdisk.c:1614
+#: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Unbekannte Eingabe: %s\n"
 
-#: fdisk/sfdisk.c:1646
+#: fdisk/sfdisk.c:1712
 msgid "number too big\n"
 msgstr "Wert zu gro�.\n"
 
-#: fdisk/sfdisk.c:1650
+#: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
 msgstr "Unbekannte Zeichen nach dem Wert.\n"
 
-#: fdisk/sfdisk.c:1766
+#: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
 msgstr "Kein Platz f�r Partitionsbeschreibung.\n"
 
-#: fdisk/sfdisk.c:1799
+#: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
 msgstr "Die umgebende erweiterte Partition kann nicht erstellt werden.\n"
 
-#: fdisk/sfdisk.c:1850
+#: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
 msgstr "Zu viele Eingabefelder.\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1884
+#: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
 msgstr "Kein zus�tzlicher freier Bereich vorhanden.\n"
 
-#: fdisk/sfdisk.c:1903
+#: fdisk/sfdisk.c:1969
 msgid "Illegal type\n"
 msgstr "Ung�ltiger Typ\n"
 
-#: fdisk/sfdisk.c:1935
-#, c-format
-msgid "Warning: exceeds max allowable size (%lu)\n"
+#: fdisk/sfdisk.c:2001
+#, fuzzy, c-format
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Warnung: Die Maximalgr��e (%lu) wird �berschritten.\n"
 
-#: fdisk/sfdisk.c:1940
+#: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
 msgstr "Warnung: leere Partition.\n"
 
-#: fdisk/sfdisk.c:1954
+#: fdisk/sfdisk.c:2021
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Warnung: Ung�ltiger Partitionsanfang (kleinstm�glicher Wert: %lu).\n"
 
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Unbekanntes 'bootf�hig'-Flag: W�hlen Sie - oder *\n"
 
-#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
 msgstr "Partielle Z/K/S-Spezifikation?\n"
 
-#: fdisk/sfdisk.c:2008
+#: fdisk/sfdisk.c:2075
 msgid "Extended partition not where expected\n"
 msgstr "Erweiterte Partition nicht am erwarteten Ort.\n"
 
-#: fdisk/sfdisk.c:2040
+#: fdisk/sfdisk.c:2107
 msgid "bad input\n"
 msgstr "Ung�ltige Eingabe\n"
 
-#: fdisk/sfdisk.c:2062
+#: fdisk/sfdisk.c:2129
 msgid "too many partitions\n"
 msgstr "Zu viele Partitionen\n"
 
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2162
 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"
@@ -4823,48 +4915,48 @@ msgstr ""
 "Normalerweise brauchen nur <Start> und <Gr��e> (und m�glicherweise\n"
 "<Typ>) angegeben zu werden.\n"
 
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2182
 msgid "version"
 msgstr "Version"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2188
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Verwendung: %s [Optionen] Ger�t ...\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2189
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "Ger�t: ein Ger�t wie /dev/hda oder /dev/sda"
 
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2190
 msgid "useful options:"
 msgstr "N�tzliche Optionen:"
 
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2191
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [oder --show-size]: Partitionsgr��e anzeigen"
 
-#: fdisk/sfdisk.c:2125
+#: fdisk/sfdisk.c:2192
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [oder --id]:        Partitions-ID ausgeben oder �ndern"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2193
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [oder --list]:      Partitionen jedes Ger�ts ausgeben"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2194
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [oder --dump]:      Wie oben, doch in einem Format, das f�r die\n"
 "                           sp�tere Eingabe verwendet werden kann"
 
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2195
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [oder --increment]: Anzahl Zylinder usw. ausgehend von 1\n"
 "                           statt von 0"
 
-#: fdisk/sfdisk.c:2129
+#: fdisk/sfdisk.c:2196
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of "
 "sectors/blocks/cylinders/MB"
@@ -4872,56 +4964,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Werte in den Einheiten Sektoren/Bl�cke/Zylinder/MB "
 "ein-/ausgeben"
 
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2197
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [oder --list-types]:bekannte Partitionstypen auflisten"
 
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2198
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [oder --DOS]:       DOS-Kompatibilit�t: etwas Platz verschwenden"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2199
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [oder --re-read]:   Partitionstabelle erneut lesen"
 
-#: fdisk/sfdisk.c:2133
+#: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                  nur die Partition der Nummer # �ndern"
 
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                   nicht auf die Festplatte schreiben"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2202
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O Datei :             Sektoren, die �berschrieben werden, in\n"
 "                           'Datei' speichern"
 
-#: fdisk/sfdisk.c:2136
+#: fdisk/sfdisk.c:2203
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I Datei :           diese Sektoren wiederherstellen"
 
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [oder --version]:   Version ausgeben"
 
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [oder --help]:      diese Informationen anzeigen"
 
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
 msgstr "Gef�hrliche Optionen:"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2207
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [oder --show-geometry]: Kernelinformationen der Geometrie ausgeben"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4930,129 +5022,124 @@ msgstr ""
 "                               ausgeben oder Beschreibungen f�r sie in der\n"
 "                               Eingabe erwarten"
 
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2210
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [oder --Linux]:      keine Meldungen �ber Dinge anzeigen,\n"
 "                               die sich nicht auf Linux auswirken"
 
-#: fdisk/sfdisk.c:2144
+#: fdisk/sfdisk.c:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [oder --quiet]:      Warnmeldungen unterdr�cken"
 
-#: fdisk/sfdisk.c:2145
+#: fdisk/sfdisk.c:2212
 msgid "    You can override the detected geometry using:"
 msgstr ""
 "    Die erkannte Geometrie kann mit den folgenden Optionen au�er Kraft "
 "gesetzt werden:"
 
-#: fdisk/sfdisk.c:2146
+#: fdisk/sfdisk.c:2213
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [oder --cylinders #]:Anzahl der zu verwendenden Zylinder"
 
-#: fdisk/sfdisk.c:2147
+#: fdisk/sfdisk.c:2214
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [oder --heads #]:    Anzahl der zu verwendenden K�pfe"
 
-#: fdisk/sfdisk.c:2148
+#: fdisk/sfdisk.c:2215
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [oder --sectors #]:  Anzahl der zu verwendenden Sektoren"
 
-#: fdisk/sfdisk.c:2149
+#: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
 msgstr "Konsistenzpr�fungen werden mit der folgenden Option deaktiviert:"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2217
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [oder --force]:      immer die Eingabe befolgen, auch wenn\n"
 "                               es unsinnig ist"
 
-#: fdisk/sfdisk.c:2156
+#: fdisk/sfdisk.c:2223
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: fdisk/sfdisk.c:2157
+#: fdisk/sfdisk.c:2224
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s Ger�t\t\t zeigt aktive Partitionen im Ger�t an\n"
 
-#: fdisk/sfdisk.c:2158
+#: fdisk/sfdisk.c:2225
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s Ger�t n1 n2 ... Partitionen n1 ... aktivieren, die anderen deaktivieren\n"
 
-#: fdisk/sfdisk.c:2159
+#: fdisk/sfdisk.c:2226
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An Ger�t\t Partition n aktivieren, die anderen deaktivieren\n"
 
-#: fdisk/sfdisk.c:2278
+#: fdisk/sfdisk.c:2346
 msgid "no command?\n"
 msgstr "Kein Befehl?\n"
 
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2471
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "Gesamt: %d Bl�cke\n"
 
-#: fdisk/sfdisk.c:2438
+#: fdisk/sfdisk.c:2508
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Verwendung: sfdisk --print-id Ger�t Partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2440
+#: fdisk/sfdisk.c:2510
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Verwendung: sfdisk --change-id Ger�t Partitionsnummer ID\n"
 
-#: fdisk/sfdisk.c:2442
+#: fdisk/sfdisk.c:2512
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Verwendung: sfdisk --id Ger�t Partitionsnummer [ID]\n"
 
-#: fdisk/sfdisk.c:2449
+#: fdisk/sfdisk.c:2519
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "Es kann immer nur ein Ger�t angegeben werden (au�er bei -l oder -s)\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 #, c-format
 msgid "cannot open %s %s\n"
 msgstr "%s %s kann nicht ge�ffnet werden.\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "read-write"
 msgstr "lesen-schreiben"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "for reading"
 msgstr "zum Lesen"
 
-#: fdisk/sfdisk.c:2499
+#: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2516
-#, c-format
-msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
+#: fdisk/sfdisk.c:2586
+#, fuzzy, c-format
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %d Zylinder, %d K�pfe, %d Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:2519
-#, c-format
-msgid "%s: unknown geometry\n"
-msgstr "%s: Unbekannte Geometrie\n"
-
-#: fdisk/sfdisk.c:2535
+#: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl nicht erfolgreich f�r %s\n"
 
-#: fdisk/sfdisk.c:2612
+#: fdisk/sfdisk.c:2680
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "Ung�ltiges aktives Byte: 0x%x statt 0x80\n"
 
-#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
 msgid ""
 "Done\n"
 "\n"
@@ -5060,7 +5147,7 @@ msgstr ""
 "Beendet\n"
 "\n"
 
-#: fdisk/sfdisk.c:2638
+#: fdisk/sfdisk.c:2706
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5069,42 +5156,43 @@ msgstr ""
 "%d aktive prim�re Partitionen vorhanden. F�r LILO ist dies kein Problem,\n"
 "doch der DOS-MBR kann nur Datentr�ger booten, die 1 aktive Partition haben.\n"
 
-#: fdisk/sfdisk.c:2652
+#: fdisk/sfdisk.c:2720
 #, 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:2708
+#: fdisk/sfdisk.c:2777
 #, c-format
 msgid "Bad Id %x\n"
 msgstr "Die ID %x ist ung�ltig.\n"
 
-#: fdisk/sfdisk.c:2723
+#: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
 msgstr "Dieser Datentr�ger wird derzeit verwendet.\n"
 
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Nicht behebbarer Fehler: %s wurde nicht gefunden.\n"
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2812
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Warnung: %s ist kein blockorientiertes Ger�t.\n"
 
-#: fdisk/sfdisk.c:2749
+#: fdisk/sfdisk.c:2818
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "Es wird gepr�ft, ob dieser Datentr�ger derzeit anderweitig verwendet "
 "wird...\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2820
+#, fuzzy
 msgid ""
 "\n"
-"This disk is currently in use - repartitioning is probably a bad idea.Umount "
-"all file systems, and swapoff all swap partitions on this disk.Use the "
-"--no-reread flag to suppress this check.\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
 "Dieser Datentr�ger wird derzeit verwendet - es wird nicht empfohlen, ihn neu "
@@ -5112,28 +5200,29 @@ msgstr ""
 "alle Auslagerungspartitionen dieses Datentr�gers mit dem Befehl 'swapoff'. "
 "Verwenden Sie das Flag '--no-reread', um diese Pr�fung zu unterdr�cken.\n"
 
-#: fdisk/sfdisk.c:2755
+#: fdisk/sfdisk.c:2824
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Verwenden Sie das Flag '--force', um alle Pr�fungen zu �bersteuern.\n"
 
-#: fdisk/sfdisk.c:2759
-msgid "OK"
+#: fdisk/sfdisk.c:2828
+#, fuzzy
+msgid "OK\n"
 msgstr "OK"
 
-#: fdisk/sfdisk.c:2768
+#: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
 msgstr "Alte Situation:\n"
 
-#: fdisk/sfdisk.c:2772
+#: fdisk/sfdisk.c:2841
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partition %d ist nicht vorhanden, kann nicht ge�ndert werden.\n"
 
-#: fdisk/sfdisk.c:2780
+#: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
 msgstr "Neue Situation:\n"
 
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2854
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5141,19 +5230,19 @@ msgstr ""
 "Diese Partitionen werden nicht empfohlen - kein �nderung vorgenommen.\n"
 "(Wenn Sie dies wirklich w�nschen, verwenden Sie die Option --force.)\n"
 
-#: fdisk/sfdisk.c:2788
+#: fdisk/sfdisk.c:2857
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Wird nicht empfohlen - w�hlen Sie 'Nein'.\n"
 
-#: fdisk/sfdisk.c:2793
+#: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Sind Sie mit diesen Einstellungen zufrieden? [jnq]"
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "M�chten Sie dies auf die Festplatte schreiben? [jnq] "
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2869
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5161,15 +5250,15 @@ msgstr ""
 "\n"
 "sfdisk: Vorzeitiges Ende der Eingabe.\n"
 
-#: fdisk/sfdisk.c:2802
+#: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
 msgstr "Beenden - Es wurden keine �nderungen vorgenommen.\n"
 
-#: fdisk/sfdisk.c:2808
+#: fdisk/sfdisk.c:2877
 msgid "Please answer one of y,n,q\n"
 msgstr "Antworten Sie mit j, n oder b.\n"
 
-#: fdisk/sfdisk.c:2816
+#: fdisk/sfdisk.c:2885
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5177,7 +5266,7 @@ msgstr ""
 "Die neue Partitionstabelle wurde erfolgreich geschrieben.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2891
 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"
@@ -5188,107 +5277,113 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Siehe fdisk(8).)\n"
 
-#: games/banner.c:1048
+#: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
 msgstr "Verwendung: banner [-w Breite]\n"
 
 # "Meldung"
-#: games/banner.c:1068
+#: games/banner.c:1065
 msgid "Message: "
 msgstr "Meldung: "
 
-#: games/banner.c:1102
+#: games/banner.c:1099
 #, c-format
 msgid "The character '%c' is not in my character set"
 msgstr "Das Zeichen '%c' ist nicht im Zeichensatz vorhanden."
 
-#: games/banner.c:1110
+#: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
 msgstr "Meldung '%s' ist in Ordnung.\n"
 
-#: getopt-1.0.3b/getopt.c:229
+#: getopt-1.1.0a/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Mit 'getopt --help' zeigen Sie weitere Informationen an.\n"
 
-#: getopt-1.0.3b/getopt.c:295
+#: getopt-1.1.0a/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "Leere long-Option nach dem Argument -l oder --long"
 
-#: getopt-1.0.3b/getopt.c:315
+#: getopt-1.1.0a/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "Unbekannte Shell als Argument von -s oder --shell"
 
-#: getopt-1.0.3b/getopt.c:320
+#: getopt-1.1.0a/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Verwendung: getopt Optionszeichenfolge Parameter\n"
 
-#: getopt-1.0.3b/getopt.c:321
+#: getopt-1.1.0a/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [Optionen] [--] Optionszeichenfolge Parameter\n"
 
-#: getopt-1.0.3b/getopt.c:322
+#: getopt-1.1.0a/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 "       getopt [Optionen] -o|--options Optionszeichenfolge [Optionen] [--]\n"
 
-#: getopt-1.0.3b/getopt.c:323
+#: getopt-1.1.0a/getopt.c:327
 msgid "              parameters\n"
 msgstr "              Parameter\n"
 
-#: getopt-1.0.3b/getopt.c:324
+#: getopt-1.1.0a/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Lange Optionen mit einfachem - zulassen\n"
 
-#: getopt-1.0.3b/getopt.c:325
+#: getopt-1.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Diese Informationen anzeigen\n"
 
-#: getopt-1.0.3b/getopt.c:326
+#: getopt-1.1.0a/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   Lange Optionen werden erkannt\n"
 
-#: getopt-1.0.3b/getopt.c:327
+#: getopt-1.1.0a/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=progname          Der Name, unter dem Fehler ausgegeben werden\n"
 
-#: getopt-1.0.3b/getopt.c:328
+#: getopt-1.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      Kurze Optionen werden erkannt\n"
 
-#: getopt-1.0.3b/getopt.c:329
+#: getopt-1.1.0a/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr "  -q, --quiet                  Keine Fehleranzeige durch getopt(3)\n"
 
-#: getopt-1.0.3b/getopt.c:330
+#: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Keine normale Ausgabe\n"
 
-#: getopt-1.0.3b/getopt.c:331
+#: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            Shell-Schreibweisen festlegen\n"
 
-#: getopt-1.0.3b/getopt.c:332
+#: getopt-1.1.0a/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Version von getopt(1) pr�fen\n"
 
-#: getopt-1.0.3b/getopt.c:333
+#: getopt-1.1.0a/getopt.c:337
+#, fuzzy
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -Q, --quiet-output           Keine normale Ausgabe\n"
+
+#: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Versionsinformationen anzeigen\n"
 
-#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
 msgstr "Argument f�r 'optstring' fehlt"
 
-#: getopt-1.0.3b/getopt.c:433
-msgid "getopt (enhanced) 1.0.3\n"
+#: getopt-1.1.0a/getopt.c:441
+#, fuzzy
+msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (enhanced) 1.0.3\n"
 
-#: getopt-1.0.3b/getopt.c:439
+#: getopt-1.1.0a/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "Interner Fehler, treten Sie mit dem Autor in Verbindung."
 
@@ -5346,71 +5441,71 @@ msgstr "after getopt loop\n"
 msgid "exiting parseargs\n"
 msgstr "exiting parseargs\n"
 
-#: login-utils/agetty.c:505
+#: login-utils/agetty.c:504
 msgid "entered parse_speeds\n"
 msgstr "entered parse_speeds\n"
 
-#: login-utils/agetty.c:508
+#: login-utils/agetty.c:507
 #, c-format
 msgid "bad speed: %s"
 msgstr "Falsche Geschwindigkeit: %s"
 
-#: login-utils/agetty.c:510
+#: login-utils/agetty.c:509
 msgid "too many alternate speeds"
 msgstr "Zu viele alternative Geschwindigkeiten"
 
-#: login-utils/agetty.c:512
+#: login-utils/agetty.c:511
 msgid "exiting parsespeeds\n"
 msgstr "parsespeeds beendet\n"
 
-#: login-utils/agetty.c:587
+#: login-utils/agetty.c:584
 #, c-format
 msgid "%s: open for update: %m"
 msgstr "%s: �ffnen zur Aktualisierung: %m"
 
-#: login-utils/agetty.c:605
+#: login-utils/agetty.c:602
 #, c-format
 msgid "%s: no utmp entry"
 msgstr "%s: kein utmp-Eintrag"
 
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:631
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "Wechseln in das Verzeichnis /dev nicht m�glich: %m"
 
-#: login-utils/agetty.c:638
+#: login-utils/agetty.c:635
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s ist kein zeichenorientiertes Ger�t."
 
 # debug
 #. ignore close(2) errors
-#: login-utils/agetty.c:645
+#: login-utils/agetty.c:642
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:644
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s konnte nicht als Standardeingabe ge�ffnet werden: %m"
 
-#: login-utils/agetty.c:657
+#: login-utils/agetty.c:654
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: nicht zum Lesen/Schreiben ge�ffnet"
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:661
+#: login-utils/agetty.c:658
 msgid "duping\n"
 msgstr "Duping\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:663
+#: login-utils/agetty.c:660
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: Duping-Problem: %m"
 
-#: login-utils/agetty.c:733
+#: login-utils/agetty.c:730
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
@@ -5445,34 +5540,34 @@ msgstr ""
 "oder\t[-hiLmw] [-l Anmeldeprogramm] [-t Timeout] [-I Initstring] [-H "
 "Anmeldehost] line Baudrate,... [Terminaltyp]\n"
 
-#: login-utils/checktty.c:46
+#: login-utils/checktty.c:41
 #, c-format
 msgid "badlogin: %s\n"
 msgstr "badlogin: %s\n"
 
-#: login-utils/checktty.c:52
+#: login-utils/checktty.c:47
 #, c-format
 msgid "sleepexit %d\n"
 msgstr "sleepexit %d\n"
 
-#: login-utils/checktty.c:108 login-utils/checktty.c:130
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
 msgstr ""
 "login: Es ist wenig Speicher frei, der Anmeldevorgang ist m�glicherweise "
 "nicht erfolgreich.\n"
 
 # This ends up in the syslog. Translate it?
-#: login-utils/checktty.c:109
+#: login-utils/checktty.c:104
 msgid "can't malloc for ttyclass"
 msgstr "Speicher f�r 'ttyclass' konnte nicht reserviert werden."
 
 # This ends up in the syslog. Translate it?
-#: login-utils/checktty.c:131
+#: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
 msgstr "Speicher f�r den 'grplist' konnte nicht reserviert werden."
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:431
+#: login-utils/checktty.c:426
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Anmeldung bei %s von %s ist standardm��ig nicht gestattet.\n"
@@ -5481,57 +5576,57 @@ msgstr "Anmeldung bei %s von %s ist standardm��ig nicht gestattet.\n"
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:442
+#: login-utils/checktty.c:437
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Anmeldung bei %s von %s verweigert.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:117
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: Ihre Benutzerkennung (%d) ist nicht vorhanden.\n"
 
-#: login-utils/chfn.c:141 login-utils/chsh.c:124
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: Benutzer '%s' ist nicht vorhanden.\n"
 
-#: login-utils/chfn.c:146 login-utils/chsh.c:129
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: nur lokale Eintr�ge k�nnen ge�ndert werden. Verwenden Sie yp%s.\n"
 
-#: login-utils/chfn.c:158
+#: login-utils/chfn.c:145
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Finger-Informationen f�r %s werden ge�ndert.\n"
 
-#: login-utils/chfn.c:164 login-utils/chfn.c:168 login-utils/chfn.c:175
-#: login-utils/chfn.c:179 login-utils/chsh.c:153 login-utils/chsh.c:157
-#: login-utils/chsh.c:164 login-utils/chsh.c:168
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
 msgid "Password error."
 msgstr "Kennwortfehler."
 
-#: login-utils/chfn.c:188 login-utils/chsh.c:177 login-utils/login.c:684
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:266 mount/lomount.c:221
+#: mount/lomount.c:227
 msgid "Password: "
 msgstr "Kennwort: "
 
-#: login-utils/chfn.c:191 login-utils/chsh.c:180
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "Ung�ltiges Kennwort."
 
-#: login-utils/chfn.c:202
+#: login-utils/chfn.c:189
 msgid "Finger information not changed.\n"
 msgstr "Finger-Informationen wurden nicht ge�ndert.\n"
 
-#: login-utils/chfn.c:305
+#: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Verwendung: %s [ -f vollst�ndiger_Name ] [ -o Arbeitsstelle ] "
 
-#: login-utils/chfn.c:306
+#: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -5539,11 +5634,11 @@ msgstr ""
 "[ -p Telefon_Arbeit ]\n"
 "\t[ -h Telefon_Zuhause ] "
 
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:376 login-utils/chsh.c:293
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
 msgid ""
 "\n"
 "Aborted.\n"
@@ -5551,156 +5646,156 @@ msgstr ""
 "\n"
 "Abgebrochen.\n"
 
-#: login-utils/chfn.c:409
+#: login-utils/chfn.c:398
 msgid "field is too long.\n"
 msgstr "Das Feld ist zu lang.\n"
 
-#: login-utils/chfn.c:417
+#: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' ist nicht zul�ssig.\n"
 
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
 msgstr "Steuerzeichen sind nicht zul�ssig.\n"
 
-#: login-utils/chfn.c:487
+#: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "Finger-Informationen wurden *NICHT* ge�ndert. Sp�ter erneut versuchen.\n"
 
-#: login-utils/chfn.c:490
+#: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
 msgstr "Finger-Informationen wurden ge�ndert.\n"
 
-#: login-utils/chfn.c:504 login-utils/chsh.c:411 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
 msgid "malloc failed"
 msgstr "'malloc' war nicht erfolgreich."
 
-#: login-utils/chsh.c:140
+#: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 "%s: Ihre Shell befindet sich nicht in /etc/shells, das Wechseln der Shell "
 "ist nicht gestattet.\n"
 
-#: login-utils/chsh.c:147
+#: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Shell f�r %s wird ge�ndert.\n"
 
-#: login-utils/chsh.c:188
+#: login-utils/chsh.c:178
 msgid "New shell"
 msgstr "Neue Shell"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
 msgstr "Shell wurde nicht ge�ndert.\n"
 
-#: login-utils/chsh.c:202
+#: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell wurde *NICHT* ge�ndert. Sp�ter erneut versuchen.\n"
 
-#: login-utils/chsh.c:205
+#: login-utils/chsh.c:195
 msgid "Shell changed.\n"
 msgstr "Shell wurde ge�ndert.\n"
 
-#: login-utils/chsh.c:273
+#: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
 msgstr "Verwendung: %s [ -s Shell ] "
 
-#: login-utils/chsh.c:274
+#: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:275
+#: login-utils/chsh.c:265
 msgid "       [ username ]\n"
 msgstr "       [ Benutzername ]\n"
 
-#: login-utils/chsh.c:319
+#: login-utils/chsh.c:309
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: Shell muss ein vollst�ndiger Pfadname sein.\n"
 
-#: login-utils/chsh.c:323
+#: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: '%s' ist nicht vorhanden.\n"
 
-#: login-utils/chsh.c:327
+#: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: '%s' ist nicht ausf�hrbar.\n"
 
-#: login-utils/chsh.c:334
+#: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' ist nicht zul�ssig.\n"
 
-#: login-utils/chsh.c:338
+#: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Steuerzeichen sind nicht zul�ssig.\n"
 
-#: login-utils/chsh.c:345
+#: login-utils/chsh.c:335
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Warnung: '%s' ist nicht in /etc/shells enthalten.\n"
 
-#: login-utils/chsh.c:347
+#: login-utils/chsh.c:337
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: '%s' ist nicht in /etc/shells enthalten.\n"
 
-#: login-utils/chsh.c:349
+#: login-utils/chsh.c:339
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: Verwenden Sie die Option -l, um die Liste anzuzeigen.\n"
 
-#: login-utils/chsh.c:355
+#: login-utils/chsh.c:345
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Warnung: '%s' ist nicht in /etc/shells enthalten.\n"
 
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:346
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Verwenden Sie %s -l, um die Liste anzuzeigen.\n"
 
-#: login-utils/chsh.c:377
+#: login-utils/chsh.c:367
 msgid "No known shells.\n"
 msgstr "Keine bekannten Shells.\n"
 
-#: login-utils/cryptocard.c:70
+#: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
 msgstr "/dev/urandom konnte nicht ge�ffnet werden."
 
-#: login-utils/cryptocard.c:75
+#: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
 msgstr "Zufallsdaten konnten nicht aus /dev/urandom gelesen werden."
 
-#: login-utils/cryptocard.c:98
+#: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
 msgstr "Konnte %s nicht zum Lesen �ffnen"
 
-#: login-utils/cryptocard.c:102
+#: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
 msgstr "stat(%s) nicht m�glich."
 
-#: login-utils/cryptocard.c:108
+#: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
 msgstr "%s weist nicht die korrekten Dateimodi auf."
 
-#: login-utils/cryptocard.c:113
+#: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
 msgstr "Daten von %s k�nnen nicht gelesen werden."
 
-#: login-utils/islocal.c:36
+#: login-utils/islocal.c:37
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "%s kann nicht gelesen werden, Vorgang wird beendet."
@@ -5732,7 +5827,7 @@ msgid "last: gethostname"
 msgstr "last: gethostname"
 
 #: login-utils/last.c:469
-#, c-format
+#, c-format, ycp-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
@@ -5740,37 +5835,40 @@ msgstr ""
 "\n"
 "Unbrochen %10.10s %5.5s \n"
 
-#: login-utils/login.c:377
+#: login-utils/login.c:373
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h kann nur vom Super-User verwendet werden.\n"
 
-#: login-utils/login.c:402
+#: login-utils/login.c:398
 msgid "usage: login [-fp] [username]\n"
 msgstr "Verwendung: login [-fp] [Benutzername]\n"
 
-#: login-utils/login.c:504
+#: login-utils/login.c:501
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM-Fehler, Abbruch: %s\n"
 
-#: login-utils/login.c:506
+#: login-utils/login.c:503
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM konnte nicht initialisiert werden: %s"
 
-#. Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. so that the "login: " prompt gets localized. Unfortunately,
-#. PAM doesn't have an interface to specify the "Password: " string (yet).
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
 #: login-utils/login.c:519
 msgid "login: "
 msgstr "Anmeldung: "
 
-#: login-utils/login.c:552
+#: login-utils/login.c:553
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "ANMELDUNG %d VON %s F�R %s NICHT ERFOLGREICH, %s"
 
-#: login-utils/login.c:554
+#: login-utils/login.c:555
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -5778,17 +5876,17 @@ msgstr ""
 "Anmeldung nicht korrekt.\n"
 "\n"
 
-#: login-utils/login.c:563
+#: login-utils/login.c:564
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "ZU VIELE ANMELDEVERSUCHE (%d) VON %s  F�R %s, %s"
 
-#: login-utils/login.c:567
+#: login-utils/login.c:568
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "ANMELDESITZUNG VON %s F�R %s NICHT ERFOLGREICH, %s"
 
-#: login-utils/login.c:570
+#: login-utils/login.c:571
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -5796,30 +5894,30 @@ msgstr ""
 "\n"
 "Anmeldung nicht korrekt.\n"
 
-#: login-utils/login.c:619
+#: login-utils/login.c:620
 msgid "Illegal username"
 msgstr "Benutzername unzul�ssig"
 
-#: login-utils/login.c:662
+#: login-utils/login.c:663
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s Anmeldung bei diesem Terminal verweigert.\n"
 
-#: login-utils/login.c:667
+#: login-utils/login.c:668
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "ANMELDUNG %s VON %s AUF TTY %s VERWEIGERT."
 
-#: login-utils/login.c:671
+#: login-utils/login.c:672
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "ANMELDUNG %s AUF TTY %s VERWEIGERT."
 
-#: login-utils/login.c:723
+#: login-utils/login.c:725
 msgid "Login incorrect\n"
 msgstr "Ung�ltige Anmeldung.\n"
 
-#: login-utils/login.c:745
+#: login-utils/login.c:747
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5827,100 +5925,100 @@ msgstr ""
 "Es sind bereits zu viele Benutzer angemeldet.\n"
 "Versuchen Sie es sp�ter erneut.\n"
 
-#: login-utils/login.c:749
+#: login-utils/login.c:751
 msgid "You have too many processes running.\n"
 msgstr "Es werden zu viele Prozesse ausgef�hrt.\n"
 
-#: login-utils/login.c:795
+#: login-utils/login.c:797
 msgid "Warning: no Kerberos tickets issued\n"
 msgstr "Warnung: Keine Kerberos-Tickets erteilt.\n"
 
-#: login-utils/login.c:807
+#: login-utils/login.c:809
 msgid "Sorry -- your password has expired.\n"
 msgstr "Das Kennwort ist nicht mehr g�ltig.\n"
 
-#: login-utils/login.c:813
+#: login-utils/login.c:815
 #, c-format
-msgid "Warning: your password expires on %s %d, %d\n"
+msgid "Warning: your password expires on %d %s %d.\n"
 msgstr "Warnung: Das Kennwort wird am %d. %s %d ung�ltig.\n"
 
-#: login-utils/login.c:821
+#: login-utils/login.c:823
 msgid "Sorry -- your account has expired.\n"
 msgstr "Das Konto ist nicht mehr g�ltig.\n"
 
-#: login-utils/login.c:827
+#: login-utils/login.c:829
 #, c-format
-msgid "Warning: your account expires on %s %d, %d\n"
+msgid "Warning: your account expires on %d %s %d.\n"
 msgstr "Warnung: Das Konto wird am %d. %s %d ung�ltig.\n"
 
-#: login-utils/login.c:1061
+#: login-utils/login.c:1066
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DF� MIT %s DURCH %s"
 
-#: login-utils/login.c:1068
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "ROOT-ANMELDUNG BEI %s VON %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1076
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "ROOT-ANMELDUNG BEI %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "ANMELDUNG BEI %s DURCH %s VON %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1082
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "ROOT-ANMELDUNG BEI %s DURCH %s"
 
-#: login-utils/login.c:1089
+#: login-utils/login.c:1094
 #, c-format
 msgid "You have %smail.\n"
 msgstr "Sie haben %sE-Mail.\n"
 
-#: login-utils/login.c:1090
+#: login-utils/login.c:1095
 msgid "new "
 msgstr "neue "
 
 #. error in fork()
-#: login-utils/login.c:1108
+#: login-utils/login.c:1113
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: Es kann kein neuer Prozess erzeugt werden: %s"
 
-#: login-utils/login.c:1123
+#: login-utils/login.c:1128
 msgid "setuid() failed"
 msgstr "setuid() nicht erfolgreich."
 
-#: login-utils/login.c:1129
+#: login-utils/login.c:1134
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Verzeichnis %s ist nicht vorhanden!\n"
 
-#: login-utils/login.c:1133
+#: login-utils/login.c:1138
 msgid "Logging in with home = \"/\".\n"
 msgstr "Anmeldung erfolgt, home-Verzeichnis = '/'.\n"
 
-#: login-utils/login.c:1141
+#: login-utils/login.c:1146
 msgid "login: no memory for shell script.\n"
 msgstr "login: Kein Speicher f�r Shell-Skript verf�gbar.\n"
 
-#: login-utils/login.c:1169
+#: login-utils/login.c:1174
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: Shell-Skript konnte nicht ausgef�hrt werden: %s.\n"
 
-#: login-utils/login.c:1172
+#: login-utils/login.c:1177
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: Keine Shell: %s.\n"
 
-#: login-utils/login.c:1188
+#: login-utils/login.c:1191
 #, c-format
 msgid ""
 "\n"
@@ -5929,66 +6027,66 @@ msgstr ""
 "\n"
 "%s Anmeldung: "
 
-#: login-utils/login.c:1199
+#: login-utils/login.c:1202
 msgid "login name much too long.\n"
 msgstr "Der Benutzername ist viel zu lang.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1203
 msgid "NAME too long"
 msgstr "NAME ist zu lang."
 
-#: login-utils/login.c:1207
+#: login-utils/login.c:1210
 msgid "login names may not start with '-'.\n"
 msgstr "Benutzernamen d�rfen nicht mit einem '-' anfangen.\n"
 
-#: login-utils/login.c:1217
+#: login-utils/login.c:1220
 msgid "too many bare linefeeds.\n"
 msgstr "zu viele leere Zeilenvorschubzeichen.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1221
 msgid "EXCESSIVE linefeeds"
 msgstr "ZU VIELE Zeilenvorschubzeichen"
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1231
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Zeitablauf bei der Anmeldung nach %d Sekunden.\n"
 
-#: login-utils/login.c:1329
+#: login-utils/login.c:1325
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Letzte Anmeldung: %.*s "
 
-#: login-utils/login.c:1333
+#: login-utils/login.c:1329
 #, c-format
 msgid "from %.*s\n"
 msgstr "von %.*s\n"
 
-#: login-utils/login.c:1336
+#: login-utils/login.c:1332
 #, c-format
 msgid "on %.*s\n"
 msgstr "auf %.*s\n"
 
 # This ends up in the syslog. Translate it?
-#: login-utils/login.c:1359
+#: login-utils/login.c:1355
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ANMELDEFEHLER VON %s, %s"
 
 # This ends up in the syslog. Translate it?
-#: login-utils/login.c:1362
+#: login-utils/login.c:1358
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ANMELDEFEHLER AUF %s, %s"
 
 # This ends up in the syslog. Translate it?
-#: login-utils/login.c:1366
+#: login-utils/login.c:1362
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ANMELDEFEHLER VON %s, %s"
 
 # This ends up in the syslog. Translate it?
-#: login-utils/login.c:1369
+#: login-utils/login.c:1365
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ANMELDEFEHLER AUF %s, %s"
@@ -6029,188 +6127,188 @@ msgstr "newgrp: setuid"
 msgid "No shell"
 msgstr "Keine Shell"
 
-#: login-utils/passwd.c:161
+#: login-utils/passwd.c:159
 msgid "The password must have at least 6 characters, try again.\n"
 msgstr ""
 "Das Kennwort muss mindestens 6 Zeichen umfassen. Versuchen Sie es erneut.\n"
 
-#: login-utils/passwd.c:174
+#: login-utils/passwd.c:172
 msgid "The password must contain characters out of two of the following\n"
 msgstr ""
 "Das Kennwort muss Zeichen aus zwei der folgenden Kategorien enthalten:\n"
 
-#: login-utils/passwd.c:175
+#: login-utils/passwd.c:173
 msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
 msgstr ""
 "Gro�- und Kleinbuchstaben, Ziffern und nicht-alphanumerische Zeichen.\n"
 
-#: login-utils/passwd.c:176
+#: login-utils/passwd.c:174
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "Weitere Informationen finden Sie in passwd(1).\n"
 
-#: login-utils/passwd.c:181
+#: login-utils/passwd.c:179
 msgid "You cannot reuse the old password.\n"
 msgstr "Das alte Kennwort kann nicht erneut verwendet werden.\n"
 
-#: login-utils/passwd.c:186
+#: login-utils/passwd.c:184
 msgid "Please don't use something like your username as password!\n"
 msgstr "Verwenden Sie nicht Ihren Benutzernamen als Kennwort!\n"
 
-#: login-utils/passwd.c:197 login-utils/passwd.c:204
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
 msgid "Please don't use something like your realname as password!\n"
 msgstr "Verwenden Sie nicht Ihren Personennamen als Kennwort!\n"
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:220
 msgid "Usage: passwd [username [password]]\n"
 msgstr "Verwendung: passwd [Benutzername [Kennwort]]\n"
 
-#: login-utils/passwd.c:222
+#: login-utils/passwd.c:221
 msgid "Only root may use the one and two argument forms.\n"
 msgstr ""
 "Das Format mit einem und zwei Argumenten kann nur von 'root' verwendet "
 "werden.\n"
 
-#: login-utils/passwd.c:278
+#: login-utils/passwd.c:275
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "Verwendung: passwd [-foqsvV] [Benutzer [Kennwort]]\n"
 
-#: login-utils/passwd.c:299
+#: login-utils/passwd.c:296
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "Ausf�hrung von %s nicht m�glich: %s\n"
 
-#: login-utils/passwd.c:310
+#: login-utils/passwd.c:307
 msgid "Cannot find login name"
 msgstr "Benutzername wurde nicht gefunden."
 
-#: login-utils/passwd.c:317 login-utils/passwd.c:324
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
 msgid "Only root can change the password for others.\n"
 msgstr "Nur 'root' kann das Kennwort von anderen Personen �ndern.\n"
 
-#: login-utils/passwd.c:332
+#: login-utils/passwd.c:329
 msgid "Too many arguments.\n"
 msgstr "Zu viele Argumente.\n"
 
-#: login-utils/passwd.c:337
+#: login-utils/passwd.c:334
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
 msgstr "Benutzername wurde nicht gefunden. Ist '%s' tats�chlich ein Benutzer?"
 
-#: login-utils/passwd.c:341
+#: login-utils/passwd.c:338
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr "Nur lokale Kennw�rter k�nnen ge�ndert werden. Verwenden Sie yppasswd."
 
-#: login-utils/passwd.c:347
+#: login-utils/passwd.c:344
 msgid "UID and username does not match, imposter!"
 msgstr "UID und Benutzername stimmen nicht �berein!"
 
-#: login-utils/passwd.c:352
+#: login-utils/passwd.c:349
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "Kennwort f�r %s wird ge�ndert.\n"
 
-#: login-utils/passwd.c:356
+#: login-utils/passwd.c:353
 msgid "Enter old password: "
 msgstr "Geben Sie das alte Kennwort ein: "
 
-#: login-utils/passwd.c:358
+#: login-utils/passwd.c:355
 msgid "Illegal password, imposter."
 msgstr "Ung�ltiges Kennwort!"
 
-#: login-utils/passwd.c:370
+#: login-utils/passwd.c:367
 msgid "Enter new password: "
 msgstr "Geben Sie das neue Kennwort ein: "
 
-#: login-utils/passwd.c:372
+#: login-utils/passwd.c:369
 msgid "Password not changed."
 msgstr "Kennwort wurde nicht ge�ndert."
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:379
 msgid "Re-type new password: "
 msgstr "Geben Sie das neue Kennwort erneut ein: "
 
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:382
 msgid "You misspelled it. Password not changed."
 msgstr "Eingabefehler. Kennwort wurde nicht ge�ndert."
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:397
 #, c-format
 msgid "password changed, user %s"
 msgstr "Kennwort ge�ndert, Benutzer %s"
 
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:400
 msgid "ROOT PASSWORD CHANGED"
 msgstr "ROOT-KENNWORT GE�NDERT"
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:402
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "Kennwort von root ge�ndert, Benutzer %s"
 
-#: login-utils/passwd.c:412
+#: login-utils/passwd.c:409
 msgid "calling setpwnam to set password.\n"
 msgstr "setpwnam wird aufgerufen, um das Kennwort festzulegen.\n"
 
-#: login-utils/passwd.c:416
+#: login-utils/passwd.c:413
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "Kennwort *NICHT* ge�ndert. Versuchen Sie es sp�ter erneut.\n"
 
-#: login-utils/passwd.c:422
+#: login-utils/passwd.c:419
 msgid "Password changed.\n"
 msgstr "Kennwort ge�ndert.\n"
 
-#: login-utils/shutdown.c:85
+#: login-utils/shutdown.c:87
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 msgstr "Verwendung: shutdown [-h|-r] [-fqs] [now|hh:ss|+Minuten]\n"
 
-#: login-utils/shutdown.c:103
+#: login-utils/shutdown.c:105
 msgid "Shutdown process aborted"
 msgstr "Herunterfahren wurde abgebrochen."
 
-#: login-utils/shutdown.c:125
+#: login-utils/shutdown.c:131
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
 msgstr "%s: Das System kann nur von 'root' heruntergefahren werden.\n"
 
-#: login-utils/shutdown.c:219
+#: login-utils/shutdown.c:225
 msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr "Dies muss morgen erfolgen. K�nnen Sie so lange warten?\n"
 
-#: login-utils/shutdown.c:271
+#: login-utils/shutdown.c:277
 msgid "for maintenance; bounce, bounce"
 msgstr "f�r Wartungsarbeiten; bounce, bounce"
 
-#: login-utils/shutdown.c:275
+#: login-utils/shutdown.c:281
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#: login-utils/shutdown.c:300
+#: login-utils/shutdown.c:306
 msgid "The system is being shut down within 5 minutes"
 msgstr "Das System wird in den n�chsten 5 Minuten heruntergefahren."
 
-#: login-utils/shutdown.c:304
+#: login-utils/shutdown.c:310
 msgid "Login is therefore prohibited."
 msgstr "Die Anmeldung ist daher nicht m�glich."
 
 # This ends up in the syslog. Translate it?
-#: login-utils/shutdown.c:325
+#: login-utils/shutdown.c:331
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%s von %s: %s"
 
 # This ends up in the syslog. Translate it?
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "rebooted"
 msgstr "Neustart"
 
 # This ends up in the syslog. Translate it?
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "halted"
 msgstr "Angehalten"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:377
+#: login-utils/shutdown.c:387
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
@@ -6218,7 +6316,7 @@ msgstr ""
 "\n"
 "Nach Neustart immer noch aktiv?"
 
-#: login-utils/shutdown.c:379
+#: login-utils/shutdown.c:389
 msgid ""
 "\n"
 "Now you can turn off the power..."
@@ -6226,97 +6324,102 @@ msgstr ""
 "\n"
 "Sie k�nnen den Computer jetzt ausschalten..."
 
-#: login-utils/shutdown.c:394
+#: login-utils/shutdown.c:404
 msgid "Calling kernel power-off facility...\n"
 msgstr "Kernel-Ausschaltfunktion wird aufgerufen...\n"
 
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:407
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "Fehler beim Ausschalten\t%s\n"
 
-#: login-utils/shutdown.c:405
+#: login-utils/shutdown.c:415
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "Programm '%s' wird ausgef�hrt...\n"
 
-#: login-utils/shutdown.c:408
+#: login-utils/shutdown.c:418
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "Fehler bei der Ausf�hrung von\t%s\n"
 
-#: login-utils/shutdown.c:431
+#: login-utils/shutdown.c:441
 #, c-format
 msgid "URGENT: broadcast message from %s:"
 msgstr "DRINGEND: Broadcast-Nachricht von %s:"
 
-#: login-utils/shutdown.c:437
+#: login-utils/shutdown.c:447
 msgid "System going down IMMEDIATELY!\n"
 msgstr "Das System wird SOFORT heruntergefahren!\n"
 
-#: login-utils/shutdown.c:440
+#: login-utils/shutdown.c:450
 #, c-format
 msgid "System going down in %d hour%s %d minutes"
-msgstr "Das System wird in %d Stunde%n, %d Minuten heruntergefahren."
+msgstr "Das System wird in %d Stunde%s, %d Minuten heruntergefahren."
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
 msgid "s"
 msgstr "n"
 
-#: login-utils/shutdown.c:443
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "System going down in %d minute%s\n"
 msgstr "Das System wird in %d Minute%s heruntergefahren.\n"
 
-#: login-utils/shutdown.c:449
+#: login-utils/shutdown.c:459
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:506
+#: login-utils/shutdown.c:516
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "Prozess f�r swapoff kann nicht erzeugt werden."
 
-#: login-utils/shutdown.c:514
+#: login-utils/shutdown.c:524
 msgid "Cannot exec swapoff, hoping umount will do the trick."
 msgstr ""
 "swapoff kann nicht ausgef�hrt werden. Statt dessen wird umount ausgef�hrt."
 
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:543
 msgid "Cannot fork for umount, trying manually."
 msgstr "Prozess f�r umount kann nicht erzeugt werden, manuell versuchen."
 
-#: login-utils/shutdown.c:542
+#: login-utils/shutdown.c:552
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr "%s kann nicht ausgef�hrt werden, statt dessen wird umount versucht.\n"
 
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:556
 msgid "Cannot exec umount, giving up on umount."
 msgstr "umount kann nicht ausgef�hrt werden, Versuch wird aufgegeben."
 
-#: login-utils/shutdown.c:551
+#: login-utils/shutdown.c:561
 msgid "Unmounting any remaining filesystems..."
 msgstr "Unmounten aller restlichen Dateisysteme im Gange..."
 
-#: login-utils/shutdown.c:587
-#, c-format
-msgid "shutdown: Couldn't umount %s\n"
-msgstr "shutdown: umount f�r %s nicht erfolgreich.\n"
+#: login-utils/shutdown.c:595
+#, fuzzy, c-format
+msgid "shutdown: Couldn't umount %s: %s\n"
+msgstr "shutdown: umount f�r %d nicht erfolgreich: %s\n"
 
-#: login-utils/simpleinit.c:79
+#: login-utils/simpleinit.c:109
 msgid "Booting to single user mode.\n"
 msgstr "Booten f�r Einzelbenutzermodus.\n"
 
-#: login-utils/simpleinit.c:83
+#: login-utils/simpleinit.c:113
 msgid "exec of single user shell failed\n"
 msgstr "Ausf�hrung der Einzelbenutzer-Shell nicht erfolgreich.\n"
 
-#: login-utils/simpleinit.c:87
+#: login-utils/simpleinit.c:117
 msgid "fork of single user shell failed\n"
 msgstr "Prozesserzeugung f�r Einzelbenutzer-Shell nicht erfolgreich.\n"
 
-#: login-utils/simpleinit.c:226
+#: login-utils/simpleinit.c:166
+#, fuzzy
+msgid "error opening fifo\n"
+msgstr "Fehler beim Ausschalten\t%s\n"
+
+#: login-utils/simpleinit.c:271
 msgid ""
 "\n"
 "Wrong password.\n"
@@ -6324,36 +6427,38 @@ msgstr ""
 "\n"
 "Falsches Kennwort.\n"
 
-#: login-utils/simpleinit.c:252
-msgid "exec rc failed\n"
-msgstr "Ausf�hrung der rc-Datei nicht erfolgreich.\n"
+#: login-utils/simpleinit.c:341
+#, fuzzy
+msgid "stat of path failed\n"
+msgstr "settimeofday() nicht erfolgreich."
 
-#: login-utils/simpleinit.c:255
-msgid "open of rc file failed\n"
+#: login-utils/simpleinit.c:348
+#, fuzzy
+msgid "open of directory failed\n"
 msgstr "�ffnen der rc-Datei nicht erfolgreich.\n"
 
-#: login-utils/simpleinit.c:261
-msgid "fork of rc shell failed\n"
-msgstr "Prozesserzeugung f�r rc-Shell nicht erfolgreich.\n"
-
-#: login-utils/simpleinit.c:273
+#: login-utils/simpleinit.c:415
 msgid "fork failed\n"
 msgstr "Prozesserzeugung nicht erfolgreich.\n"
 
 # 
-#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+#: login-utils/simpleinit.c:445 text-utils/more.c:1541
 msgid "exec failed\n"
 msgstr "Ausf�hrung nicht erfolgreich.\n"
 
-#: login-utils/simpleinit.c:324
+#: login-utils/simpleinit.c:469
 msgid "cannot open inittab\n"
 msgstr "inittab kann nicht ge�ffnet werden.\n"
 
-#: login-utils/simpleinit.c:362
+#: login-utils/simpleinit.c:529
 msgid "no TERM or cannot stat tty\n"
 msgstr ""
 "Kein Terminal vorhanden oder Anwendung von 'stat' auf tty nicht m�glich.\n"
 
+#: login-utils/simpleinit.c:753 login-utils/simpleinit.c:854
+msgid "error running programme\n"
+msgstr ""
+
 #: login-utils/ttymsg.c:81
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr "Zu viele IOV-Verweise (Code in wall/ttymsg.c bearbeiten)"
@@ -6378,38 +6483,38 @@ msgstr "Prozesserzeugung: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: FEHLER"
 
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:145
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s: die %s-Datei ist in Gebrauch.\n"
 
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: die %s-Datei ist in Gebrauch (gegenw�rtig %s)\n"
 
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:167
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: keine Verkn�pfung m�glich f�r %s: %s\n"
 
-#: login-utils/vipw.c:193
+#: login-utils/vipw.c:188
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: Freigabe von %s nicht m�glich: %s (Ihre �nderungen verbleiben in %s)\n"
 
-#: login-utils/vipw.c:217
+#: login-utils/vipw.c:211
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: Prozesserzeugung nicht m�glich\n"
 
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:251
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s wurde nicht ge�ndert\n"
 
-#: login-utils/vipw.c:300
+#: login-utils/vipw.c:294
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: keine �nderungen vorgenommen\n"
@@ -6444,76 +6549,76 @@ msgstr "%s: 'stat' konnte nicht auf die tempor�re Datei angewandt werden.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: Tempor�re Datei konnte nicht gelesen werden.\n"
 
-#: misc-utils/cal.c:189
+#: misc-utils/cal.c:186
 msgid "illegal month value: use 1-12"
 msgstr "Monatsangabe ung�ltig. G�ltige Werte: 1-12"
 
-#: misc-utils/cal.c:193
+#: misc-utils/cal.c:190
 msgid "illegal year value: use 1-9999"
 msgstr "Jahresangabe ung�ltig. G�ltige Werte: 1-9999"
 
-#: misc-utils/cal.c:489
+#: misc-utils/cal.c:486
 msgid "usage: cal [-mjyV] [[month] year]\n"
 msgstr "Verwendung: cal [-mjyV] [[Monat] Jahr]\n"
 
-#: misc-utils/ddate.c:192
+#: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Verwendung: %s [+Format] [Tag Monat Jahr]\n"
 
 #. handle St. Tib's Day
-#: misc-utils/ddate.c:238
+#: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
 msgstr "St.-Tib-Tag"
 
-#: misc-utils/kill.c:209
+#: misc-utils/kill.c:210
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: Unbekanntes Signal %s\n"
 
-#: misc-utils/kill.c:271
+#: misc-utils/kill.c:272
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr "%s: Prozess '%s' wurde nicht gefunden.\n"
 
-#: misc-utils/kill.c:315
+#: misc-utils/kill.c:316
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: Unbekanntes Signal %s; g�ltige Signale:\n"
 
-#: misc-utils/kill.c:355
+#: misc-utils/kill.c:356
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Verwendung: %s [ -s Signal | -p ] [ -a ] PID ...\n"
 
-#: misc-utils/kill.c:356
+#: misc-utils/kill.c:357
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "        %s -l [ Signal ]\n"
 
-#: misc-utils/logger.c:144
+#: misc-utils/logger.c:139
 #, c-format
 msgid "logger: %s: %s.\n"
 msgstr "logger: %s: %s.\n"
 
-#: misc-utils/logger.c:248
+#: misc-utils/logger.c:243
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr "logger: Unbekannter 'Facility'-Name: %s.\n"
 
-#: misc-utils/logger.c:260
+#: misc-utils/logger.c:255
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr "logger: Unbekannter Priorit�tsname: %s.\n"
 
-#: misc-utils/logger.c:287
+#: misc-utils/logger.c:282
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 "Verwendung: logger [-is] [-f Datei] [-p Pri] [-t Tag] [-u Socket] [ Meldung "
 "... ]\n"
 
-#: misc-utils/look.c:336
+#: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr "Verwendung: look [-dfa] [-t Endzeichen] Zeichenfolge [Datei]\n"
 
@@ -6527,65 +6632,66 @@ msgstr "%s konnte nicht ge�ffnet werden.\n"
 msgid "Got %d bytes from %s\n"
 msgstr "%d Bytes aus %s gelesen\n"
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:100
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr "namei: Das aktuelle Verzeichnis konnte nicht ermittelt werden: %s\n"
 
-#: misc-utils/namei.c:118
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr "namei: Wechseln in das Verzeichnis %s nicht m�glich - %s (%d)\n"
 
-#: misc-utils/namei.c:128
+#: misc-utils/namei.c:120
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr "Verwendung: namei [-mx] Pfad [Pfad ...]\n"
 
-#: misc-utils/namei.c:157
+#: misc-utils/namei.c:145
 msgid "namei: could not chdir to root!\n"
 msgstr "namei: Wechseln in das root-Verzeichnis nicht m�glich!\n"
 
 # XXX
-#: misc-utils/namei.c:164
+#: misc-utils/namei.c:152
 msgid "namei: could not stat root!\n"
 msgstr "namei: 'stat' konnte nicht auf 'root' angewandt werden!\n"
 
-#: misc-utils/namei.c:219
+#: misc-utils/namei.c:207
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr " ? Wechseln in das Verzeichnis %s nicht m�glich - %s (%d)\n"
 
-#: misc-utils/namei.c:248
+#: misc-utils/namei.c:236
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr " ? Fehler beim Lesen der symbolischen Verkn�pfung %s - %s (%d)\n"
 
-#: misc-utils/namei.c:258
+#: misc-utils/namei.c:246
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr "  *** H�CHSTZAHL SYMBOLISCHER VERKN�PFUNGEN �BERSCHRITTEN ***\n"
 
-#: misc-utils/namei.c:295
+#: misc-utils/namei.c:283
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei: Unbekannter Dateityp 0%06o der Datei %s\n"
 
-#: misc-utils/script.c:109
-msgid "usage: script [-a] [file]\n"
+#: misc-utils/script.c:118
+#, fuzzy
+msgid "usage: script [-a] [-f] [file]\n"
 msgstr "Verwendung: script [-a] [Datei]\n"
 
 # Not realy nice...
-#: misc-utils/script.c:129
+#: misc-utils/script.c:139
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "'Script' wurde gestartet, die Datei ist %s\n"
 
 # The %s must be at the end, cause it contains the \n
-#: misc-utils/script.c:198
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started on %s"
 msgstr "'Script' wurde gestartet: %s"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:269
 #, c-format
 msgid ""
 "\n"
@@ -6594,288 +6700,288 @@ msgstr ""
 "\n"
 "'Script' beendet: %s"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "'Script' wurde beendet, die Datei ist %s\n"
 
-#: misc-utils/script.c:281
+#: misc-utils/script.c:288
 msgid "openpty failed\n"
 msgstr "'openpty' nicht erfolgreich\n"
 
-#: misc-utils/script.c:315
+#: misc-utils/script.c:322
 msgid "Out of pty's\n"
 msgstr "Keine PTYs mehr.\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:713
+#: misc-utils/setterm.c:743
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: Fehler bei den Argumenten. Verwendung:\n"
 
-#: misc-utils/setterm.c:716
+#: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term Terminalname ]\n"
 
-#: misc-utils/setterm.c:717
+#: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:718
+#: misc-utils/setterm.c:748
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:719
+#: misc-utils/setterm.c:749
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:721
+#: misc-utils/setterm.c:751
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:722
+#: misc-utils/setterm.c:752
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:724
+#: misc-utils/setterm.c:754
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:725
+#: misc-utils/setterm.c:755
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:726
+#: misc-utils/setterm.c:756
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:727
+#: misc-utils/setterm.c:757
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:728
+#: misc-utils/setterm.c:758
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:730
+#: misc-utils/setterm.c:760
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:732
+#: misc-utils/setterm.c:762
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
-#: misc-utils/setterm.c:739
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:734
+#: misc-utils/setterm.c:764
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:736
+#: misc-utils/setterm.c:766
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:738
+#: misc-utils/setterm.c:768
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:741
+#: misc-utils/setterm.c:771
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ Attribut ] ]\n"
 
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:773
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:774
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:775
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:776
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:777
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:778
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:779
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:780
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:781
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ Tab1 Tab2 Tab3 ... ] ]      (Tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:782
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ Tab1 Tab2 Tab3 ... ] ]   (Tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:784
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-Konsolenanzahl] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-Konsolenanzahl] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file Ausgabedateiname ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:789
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:790
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:791
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:792
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:793
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq Frequenz ]\n"
 
-#: misc-utils/setterm.c:831
+#: misc-utils/setterm.c:862
 msgid "snow.on"
 msgstr "snow.on"
 
-#: misc-utils/setterm.c:833
+#: misc-utils/setterm.c:864
 msgid "snow.off"
 msgstr "snow.off"
 
-#: misc-utils/setterm.c:839
+#: misc-utils/setterm.c:870
 msgid "softscroll.on"
 msgstr "softscroll.on"
 
-#: misc-utils/setterm.c:841
+#: misc-utils/setterm.c:872
 msgid "softscroll.off"
 msgstr "softscroll.off"
 
-#: misc-utils/setterm.c:1016
+#: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr "Stromsparmodus kann nicht (zur�ck)gesetzt werden\n"
 
-#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl-Fehler: %s\n"
 
-#: misc-utils/setterm.c:1104
+#: misc-utils/setterm.c:1133
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: misc-utils/setterm.c:1119
+#: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
 msgstr "Fehler beim Schreiben der Bildschirmausgabe.\n"
 
-#: misc-utils/setterm.c:1133
+#: misc-utils/setterm.c:1162
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "Lesen von %s und Ausgabe von ioctl nicht m�glich.\n"
 
-#: misc-utils/setterm.c:1198
+#: misc-utils/setterm.c:1227
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: Die Umgebungsvariable $TERM ist nicht definiert.\n"
 
-#: misc-utils/tsort.c:120
+#: misc-utils/tsort.c:117
 msgid "usage: tsort [ inputfile ]\n"
 msgstr "Verwendung: tsort [ Eingabedatei ]\n"
 
-#: misc-utils/tsort.c:157
+#: misc-utils/tsort.c:154
 msgid "tsort: odd data count.\n"
 msgstr "tsort: ungew�hnliche Datenz�hlung.\n"
 
-#: misc-utils/tsort.c:320
+#: misc-utils/tsort.c:305
 msgid "tsort: cycle in data.\n"
 msgstr "tsort: Zyklus in den Daten.\n"
 
-#: misc-utils/tsort.c:333
+#: misc-utils/tsort.c:318
 msgid "tsort: internal error -- could not find cycle.\n"
 msgstr "tsort: Interner Fehler -- Zyklus wurde nicht gefunden.\n"
 
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:155
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM-Verzeichnis ... -f ] Name...\n"
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:100
 msgid "write: can't find your tty's name\n"
 msgstr "write: Name des tty-Ger�ts wurde nicht gefunden.\n"
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:111
 msgid "write: you have write permission turned off.\n"
 msgstr "write: Schreibzugriff ist deaktiviert.\n"
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:132
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr "write: %s ist bei %s nicht angemeldet.\n"
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:140
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr "write: %s hat Nachrichten deaktiviert auf %s\n"
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:147
 msgid "usage: write user [tty]\n"
 msgstr "Verwendung: write Benutzer [tty]\n"
 
-#: misc-utils/write.c:245
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write: %s ist nicht angemeldet.\n"
 
-#: misc-utils/write.c:254
+#: misc-utils/write.c:255
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr "write: %s hat Nachrichten deaktiviert\n"
 
-#: misc-utils/write.c:258
+#: misc-utils/write.c:259
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr "write: %s ist mehrmals angemeldet; Schreibvorgang erfolgt an %s\n"
 
-#: misc-utils/write.c:325
+#: misc-utils/write.c:323
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Nachricht von %s@%s auf %s bei %s ..."
@@ -6897,22 +7003,23 @@ msgstr "mount: %s konnte nicht ge�ffnet werden - %s wird verwendet.\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system? Filesystem full?
-#: mount/fstab.c:375
+#. Too many files open in the system?
+#. Filesystem full?
+#: mount/fstab.c:376
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "Lock-Datei %s konnte nicht erstellt werden: %s (verwenden Sie die Option -n, "
 "um dies zu umgehen)."
 
-#: mount/fstab.c:387
+#: mount/fstab.c:388
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "Verkn�pfung f�r die Lock-Datei %s konnte nicht erstellt werden: %s "
 "(verwenden Sie die Option -n, um dies zu umgehen)."
 
-#: mount/fstab.c:399
+#: mount/fstab.c:400
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
@@ -6921,55 +7028,55 @@ msgstr ""
 
 # This one should be merged with the next one by using
 # error() instead of printf()
-#: mount/fstab.c:414
+#: mount/fstab.c:415
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Lock-Datei %s kann nicht gesperrt werden: %s\n"
 
 # sperren
-#: mount/fstab.c:427
+#: mount/fstab.c:428
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Lock-Datei %s kann nicht gesperrt werden: %s"
 
-#: mount/fstab.c:429
+#: mount/fstab.c:430
 msgid "timed out"
 msgstr "Zeit�berschreitung"
 
-#: mount/fstab.c:436
+#: mount/fstab.c:437
 #, c-format
 msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
 
-#: mount/fstab.c:482 mount/fstab.c:490
+#: mount/fstab.c:483 mount/fstab.c:491
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s kann nicht ge�ffnet werden (%s) - mtab nicht aktualisiert."
 
-#: mount/fstab.c:515
+#: mount/fstab.c:519
 msgid "mount: warning: cannot change mounted device with a remount\n"
 msgstr ""
 "mount: Warnung: Das gemountete Ger�t kann nicht durch 'remount' ge�ndert "
 "werden.\n"
 
-#: mount/fstab.c:520
+#: mount/fstab.c:524
 msgid "mount: warning: cannot change filesystem type with a remount\n"
 msgstr ""
 "mount: Der Dateisystemtyp kann nicht durch 'remount' ge�ndert werden.\n"
 
-#: mount/fstab.c:528 mount/fstab.c:534
+#: mount/fstab.c:533 mount/fstab.c:539
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:546
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Fehler beim �ndern des Modus von %s: %s\n"
 
-#: mount/fstab.c:548
+#: mount/fstab.c:553
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s kann nicht in %s umbenannt werden: %s\n"
@@ -6984,17 +7091,17 @@ msgstr "loop: Ger�t %s kann nicht ge�ffnet werden: %s\n"
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: Keine Informationen �ber das Ger�t %s erh�ltlich: %s\n"
 
-#: mount/lomount.c:89 mount/losetup.c:74
+#: mount/lomount.c:89
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 msgstr "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 
 # XXX - pretty dumb
-#: mount/lomount.c:143
+#: mount/lomount.c:148
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: Ger�t /dev/loop# wurde nicht gefunden."
 
-#: mount/lomount.c:147
+#: mount/lomount.c:152
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -7002,7 +7109,7 @@ msgstr ""
 "mount: Es wurde kein 'loop'-Ger�t gefunden.\n"
 "       /dev/loop# hat m�glicherweise eine falsche Major-Nummer."
 
-#: mount/lomount.c:151
+#: mount/lomount.c:156
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -7013,7 +7120,7 @@ msgstr ""
 "       unterst�tzt dieser Kernel keine 'loop'-Ger�te. (Kompilieren Sie\n"
 "       in diesem Fall den Kernel neu, oder f�hren Sie 'insmod loop.o' aus.)"
 
-#: mount/lomount.c:156
+#: mount/lomount.c:162
 msgid ""
 "mount: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
@@ -7024,59 +7131,59 @@ msgstr ""
 "       in diesem Fall den Kernel neu, oder f�hren Sie 'insmod loop.o'\n"
 "       aus.) M�glicherweise hat /dev/loop# eine falsche Major-Nummer."
 
-#: mount/lomount.c:160
+#: mount/lomount.c:166
 msgid "mount: could not find any free loop device"
 msgstr "mount: Es wurde kein freies 'loop'-Ger�t gefunden."
 
 # Verschl�sselungstyp
-#: mount/lomount.c:191 mount/losetup.c:106
+#: mount/lomount.c:197
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Die Verschl�sselungsmethode %s wird nicht unterst�tzt\n"
 
-#: mount/lomount.c:210 mount/losetup.c:126
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr ""
+
+#: mount/lomount.c:231
 msgid "Init (up to 16 hex digits): "
 msgstr "Inititalisierung (bis zu 16 Hexadezimalziffern): "
 
 # "Ziffer" ?
-#: mount/lomount.c:217 mount/losetup.c:133
+#: mount/lomount.c:238
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Das Zeichen '%c' ist keine hexadezimale Ziffer.\n"
 
-#: mount/lomount.c:223 mount/losetup.c:140
+#: mount/lomount.c:245
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "Schl�ssel f�r Verschl�sselungssystem %d ist nicht verf�gbar.\n"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:261
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s, %s, %d): Erfolg\n"
 
 # this is actually an open()...
-#: mount/lomount.c:250
+#: mount/lomount.c:272
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: Ger�t %s konnte nicht gel�scht werden: %s\n"
 
-#: mount/lomount.c:260
+#: mount/lomount.c:282
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): Erfolg\n"
 
-#: mount/lomount.c:268
+#: mount/lomount.c:290
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Diese Mount-Kompilierung enth�lt keine Unterst�tztung f�r 'loop'. "
 "Wiederholen Sie die Kompilierung.\n"
 
-#: mount/losetup.c:70
-msgid "Cannot get loop info"
-msgstr "Keine Informationen �ber das 'loop'-Ger�t verf�gbar."
-
 # Setup
-#: mount/losetup.c:176
+#: mount/lomount.c:327
 #, c-format
 msgid ""
 "usage:\n"
@@ -7092,7 +7199,11 @@ msgstr ""
 "  # Setup:\n"
 "    %s [ -e Verschl�sselungsmethode ] [ -o Offset ] loop-Ger�t Datei\n"
 
-#: mount/losetup.c:234
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr "Nicht gen�gend Speicher"
+
+#: mount/lomount.c:416
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Bei der Kompilierung war keine Unterst�tzung f�r 'loop' verf�gbar. "
@@ -7114,153 +7225,167 @@ msgstr "[mntent]: Zeile %d in %s ist fehlerhaft%s\n"
 msgid "; rest of file ignored"
 msgstr "; der Rest der Datei wurde ignoriert."
 
-#: mount/mount.c:333
+#: mount/mount.c:351
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: Laut mtab ist %s bereits auf %s gemountet."
 
-#: mount/mount.c:336
+#: mount/mount.c:354
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: Laut mtab ist %s auf %s gemountet."
 
-#: mount/mount.c:357
+#: mount/mount.c:375
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s konnte nicht zum Schreiben ge�ffnet werden: %s"
 
-#: mount/mount.c:372 mount/mount.c:654
+#: mount/mount.c:390 mount/mount.c:593
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: Fehler beim Schreiben von %s: %s"
 
 # "Modus"
-#: mount/mount.c:379
+#: mount/mount.c:397
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: Fehler beim �ndern der Zugriffsrechte von %s: %s"
 
-#: mount/mount.c:413
+#: mount/mount.c:442
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:481
+#: mount/mount.c:485
 msgid "mount failed"
 msgstr "Der mount-Befehl war nicht erfolgreich."
 
-#: mount/mount.c:483
+#: mount/mount.c:487
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: Nur 'root' kann %s auf %s mounten."
 
-#: mount/mount.c:511
+#: mount/mount.c:515
 msgid "mount: loop device specified twice"
 msgstr "mount: Das loop-Ger�t wurde zweimal angegeben."
 
-#: mount/mount.c:517
+#: mount/mount.c:520
 msgid "mount: type specified twice"
 msgstr "mount: Der Typ wurde doppelt angegeben."
 
-#: mount/mount.c:529
+#: mount/mount.c:532
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: Die Einrichtung eines 'loop'-Ger�ts wird �bergangen.\n"
 
-#: mount/mount.c:538
+#: mount/mount.c:541
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: Das 'loop'-Ger�t %s wird verwendet.\n"
 
-#: mount/mount.c:542
+#: mount/mount.c:545
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: Es konnte kein 'loop'-Ger�t eingerichtet werden.\n"
 
-#: mount/mount.c:546
+#: mount/mount.c:549
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: 'loop'-Ger�t wurde erfolgreich eingerichtet.\n"
 
-#: mount/mount.c:559
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: Diese Version wurde ohne Unterst�tzung f�r den Typ 'nfs' kompiliert."
+#: mount/mount.c:588
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: %s konnte nicht ge�ffnet werden: %s"
+
+#: mount/mount.c:611
+#, fuzzy, c-format
+msgid "mount: cannot not open %s for setting speed"
+msgstr "mount: %s konnte nicht zum Schreiben ge�ffnet werden: %s"
+
+#: mount/mount.c:614
+#, fuzzy, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: %s konnte nicht ge�ffnet werden: %s"
 
-#: mount/mount.c:610 mount/mount.c:1043
+#: mount/mount.c:675 mount/mount.c:1202
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: Es kann kein neuer Prozess erzeugt werden: %s"
 
-#: mount/mount.c:649
-#, c-format
-msgid "mount: can't open %s: %s"
-msgstr "mount: %s konnte nicht ge�ffnet werden: %s"
+#: mount/mount.c:749
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr ""
+"mount: Diese Version wurde ohne Unterst�tzung f�r den Typ 'nfs' kompiliert."
+
+#: mount/mount.c:789
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr ""
 
-#: mount/mount.c:678
+#: mount/mount.c:800
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: Der Dateisystemtyp konnte nicht festgestellt werden,\n"
 "       und es wurde keiner angegeben."
 
-#: mount/mount.c:681
+#: mount/mount.c:803
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: Der Dateisystemtyp muss angegeben werden."
 
 #. should not happen
-#: mount/mount.c:684
+#: mount/mount.c:806
 msgid "mount: mount failed"
 msgstr "mount: Der mount-Befehl war nicht erfolgreich."
 
-#: mount/mount.c:690 mount/mount.c:725
+#: mount/mount.c:812 mount/mount.c:847
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: Mountpunkt %s ist kein Verzeichnis."
 
 # Look in libc.po
 # I guess "Zugriff verweigert"
-#: mount/mount.c:692
+#: mount/mount.c:814
 msgid "mount: permission denied"
 msgstr "mount: Zugriff verweigert."
 
-#: mount/mount.c:694
+#: mount/mount.c:816
 msgid "mount: must be superuser to use mount"
 msgstr "mount: Der Befehl 'mount' kann nur vom Superuser ausgef�hrt werden."
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:698 mount/mount.c:702
+#: mount/mount.c:820 mount/mount.c:824
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s ist in Gebrauch."
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:704
+#: mount/mount.c:826
 msgid "mount: proc already mounted"
 msgstr "mount: proc ist bereits gemountet."
 
-#: mount/mount.c:706
+#: mount/mount.c:828
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ist bereits gemountet oder %s ist in Gebrauch."
 
-#: mount/mount.c:712
+#: mount/mount.c:834
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: Mountpunkt %s existiert nicht."
 
-#: mount/mount.c:714
+#: mount/mount.c:836
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 "mount: Mountpunkt %s ist eine symbolische Verkn�pfung,\n"
 "       deren Ziel nicht existiert."
 
-#: mount/mount.c:717
+#: mount/mount.c:839
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: Ger�tedatei %s existiert nicht."
 
-#: mount/mount.c:727
+#: mount/mount.c:849
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7269,14 +7394,14 @@ msgstr ""
 "mount: Ger�tedatei %s existiert nicht\n"
 "       (ein Pfad-Pr�fix ist kein Verzeichnis).\n"
 
-#: mount/mount.c:739
+#: mount/mount.c:862
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 "mount: %s ist noch nicht gemountet, oder es wurden\n"
 "       ung�ltige Optionen angegeben."
 
-#: mount/mount.c:741
+#: mount/mount.c:864
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7286,35 +7411,35 @@ msgstr ""
 "       M�glicherweise ist auch der 'Superblock' von %s besch�digt,\n"
 "       oder es sind zu viele Dateisysteme gemountet."
 
-#: mount/mount.c:756
+#: mount/mount.c:898
 msgid "mount table full"
 msgstr "Die Mount-Tabelle ist voll."
 
-#: mount/mount.c:758
+#: mount/mount.c:900
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: Superblock konnte nicht gelesen werden."
 
-#: mount/mount.c:761
-#, c-format
-msgid "mount: %s has wrong major or minor number"
-msgstr "mount: %s hat eine falsche Major- oder Minor-Ger�tenummer."
+#: mount/mount.c:904
+#, fuzzy, c-format
+msgid "mount: %s: unknown device"
+msgstr "umount: %s ist kein g�ltiges blockorientiertes Ger�t."
 
-#: mount/mount.c:766
+#: mount/mount.c:909
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: Der Dateisystemtyp %s wird vom Kernel nicht unterst�tzt."
 
-#: mount/mount.c:778
+#: mount/mount.c:921
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: Wahrscheinlich meinten Sie '%s'"
 
-#: mount/mount.c:780
+#: mount/mount.c:923
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: Vielleicht meinten Sie 'iso9660'?"
 
-#: mount/mount.c:783
+#: mount/mount.c:926
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7322,13 +7447,13 @@ msgstr ""
 "nicht unterst�tzt."
 
 #. strange ...
-#: mount/mount.c:788
+#: mount/mount.c:932
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 "mount: %s ist kein blockorientiertes Ger�t, und 'stat' war nicht erfolgreich?"
 
-#: mount/mount.c:790
+#: mount/mount.c:934
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7338,60 +7463,68 @@ msgstr ""
 "       Ger�t. (M�glicherweise hilft der 'insmod-Treiber'.)"
 
 # "versuchen"
-#: mount/mount.c:793
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s ist kein blockorientiertes Ger�t.\n"
 "       Versuchen Sie '-o loop'."
 
-#: mount/mount.c:796
+#: mount/mount.c:940
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s ist kein blockorientiertes Ger�t."
 
-#: mount/mount.c:799
+#: mount/mount.c:943
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ist kein g�ltiges blockorientiertes Ger�t."
 
-#: mount/mount.c:803
-#, c-format
-msgid "mount: block device %s is not permitted on its filesystem"
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:946
+msgid "block device "
+msgstr "Blockorientiertes Ger�t "
+
+#: mount/mount.c:948
+#, fuzzy, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "umount: Erneutes Mounten nicht m�glich, %s ist schreibgesch�tzt.\n"
+
+# That sounds somehow dumb.
+#: mount/mount.c:952
+#, fuzzy, c-format
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount: Das blockorientierte Ger�t %s ist in seinem\n"
-"       Dateisystem nicht zul�ssig."
+"mount: %s%s ist schreibgesch�tzt, es wird im \n"
+"       Nur-Lese-Modus gemountet."
 
 # That sounds somehow dumb.
-#: mount/mount.c:819
+#: mount/mount.c:968
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s ist schreibgesch�tzt, es wird im \n"
 "       Nur-Lese-Modus gemountet."
 
-#: mount/mount.c:820
-msgid "block device "
-msgstr "Blockorientiertes Ger�t "
-
-#: mount/mount.c:907
-#, c-format
-msgid "mount: consider mounting %s by %s\n"
+#: mount/mount.c:1057
+#, fuzzy, c-format
+msgid "mount: going to mount %s by %s\n"
 msgstr "mount: Mounten Sie %s mit Hilfe von '%s'\n"
 
-#: mount/mount.c:908
+#: mount/mount.c:1058
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:908
+#: mount/mount.c:1058
 msgid "label"
 msgstr "label"
 
-#: mount/mount.c:910 mount/mount.c:1226
+#: mount/mount.c:1060 mount/mount.c:1430
 msgid "mount: no such partition found"
 msgstr "mount: Diese Partition wurde nicht gefunden."
 
-#: mount/mount.c:918
+#: mount/mount.c:1068
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 "mount: Es wurde kein Typ angegeben - Aufgrund des \n"
@@ -7400,186 +7533,193 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:934
+#: mount/mount.c:1084
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: '%s' wird im Hintergrund fortgesetzt.\n"
 
-#: mount/mount.c:945
+#: mount/mount.c:1095
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: '%s' nicht erfolgreich.\n"
 
-#: mount/mount.c:994
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ist bereits auf %s gemountet\n"
 
-#: mount/mount.c:1105
-msgid ""
-"Usage: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       A special device can be indicated by  -L label  or  -U uuid .\n"
-msgstr ""
-"Verwendung: mount [-hV]\n"
-"        mount -a [-nfFrsvw] [-t VFS-Typen]\n"
-"        mount [-nfrsvw] [-o Optionen] special | node\n"
-"        mount [-nfrsvw] [-t VFS-Typ] [-o Optionen] special node\n"
-"        Das Ger�t kann auch durch -L Label oder -U UUID angegeben werden.\n"
-
-#: mount/mount.c:1211
+#: mount/mount.c:1270
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+
+#: mount/mount.c:1414
 msgid "mount: only root can do that"
 msgstr "mount: Die Befehlsausf�hrung ist nur 'root' gestattet."
 
-#: mount/mount.c:1216
+#: mount/mount.c:1419
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nicht gefunden - wird erstellt...\n"
 
-#: mount/mount.c:1228
+#: mount/mount.c:1432
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s wird gemountet.\n"
 
-#: mount/mount.c:1237
+#: mount/mount.c:1441
 msgid "not mounted anything"
 msgstr "Es wurde nichts gemountet."
 
-#: mount/mount.c:1250
+#: mount/mount.c:1456
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s wurde in %s nicht gefunden."
 
-#: mount/mount.c:1264
+#: mount/mount.c:1471
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %s wurde in %s oder %s nicht gefunden."
 
-#: mount/mount_by_label.c:141
+#: mount/mount_by_label.c:99
+#, fuzzy, c-format
+msgid ""
+"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr "mount: %s konnte nicht ge�ffnet werden - %s wird verwendet.\n"
+
+#: mount/mount_by_label.c:201
 msgid "mount: bad UUID"
 msgstr "mount: ung�ltige UUID."
 
-#: mount/mount_guess_fstype.c:251
+#: mount/mount_guess_fstype.c:257
 #, 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"
 
-#: mount/mount_guess_fstype.c:254
+#: mount/mount_guess_fstype.c:260
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr ""
 "       Es werden alle Dateisystemtypen versucht, die in %s oder %s angegeben "
 "sind.\n"
 
-#: mount/mount_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:263
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:259
+#: mount/mount_guess_fstype.c:265
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Typ %s wird versucht.\n"
 
-#: mount/mount_guess_fstype.c:321
+#: mount/mount_guess_fstype.c:329
 #, c-format
 msgid "Trying %s\n"
 msgstr "Probiere %s\n"
 
-#: mount/nfsmount.c:157
+#: mount/nfsmount.c:225
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: Host:Verzeichnis-Argument zu lang.\n"
 
-#: mount/nfsmount.c:170
+#: mount/nfsmount.c:238
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: Warnung: Mehrere Rechnernamen werden nicht unterst�tzt.\n"
 
-#: mount/nfsmount.c:174
+#: mount/nfsmount.c:242
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 "mount: Das zu mountende Verzeichnis weist nicht das Format Host:Verzeichnis "
 "auf.\n"
 
-#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#: mount/nfsmount.c:253 mount/nfsmount.c:510
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: Adresse von %s konnte nicht ermittelt werden.\n"
 
-#: mount/nfsmount.c:191
+#: mount/nfsmount.c:259
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: hp->h_length ung�ltig.\n"
 
-#: mount/nfsmount.c:208
+#: mount/nfsmount.c:276
 msgid "mount: excessively long option argument\n"
 msgstr "mount: Optionsargument zu lang.\n"
 
-#: mount/nfsmount.c:299
+#: mount/nfsmount.c:368
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Warnung: Unbekannte Option 'proto='.\n"
 
-#: mount/nfsmount.c:306
+#: mount/nfsmount.c:375
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Warnung: Option 'namlen' wird nicht unterst�tzt.\n"
 
-#: mount/nfsmount.c:310
+#: mount/nfsmount.c:379
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "Unbekannter nfs-Mount-Parameter: %s=%d\n"
 
-#: mount/nfsmount.c:345
+#: mount/nfsmount.c:414
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Warnung: Option 'nolock' wird nicht unterst�tzt.\n"
 
-#: mount/nfsmount.c:348
+#: mount/nfsmount.c:419
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "Unbekannte nfs-Mount-Option: %s%s\n"
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:516
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: hp->h_length ung�ltig?\n"
 
-#: mount/nfsmount.c:528
-#, c-format
-msgid "mount: %s:%s failed, reason given by server: %s\n"
-msgstr ""
-"mount: %s:%s nicht erfolgreich. Der Server meldet folgende Ursache: %s\n"
-
-#: mount/nfsmount.c:539
+#: mount/nfsmount.c:692
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS �ber TCP wird nicht unterst�tzt.\n"
 
-#: mount/nfsmount.c:546
+#: mount/nfsmount.c:699
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:550
+#: mount/nfsmount.c:703
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:561
+#: mount/nfsmount.c:714
 msgid "used portmapper to find NFS port\n"
 msgstr "NFS-Post mit Portmapper gefunden.\n"
 
-#: mount/nfsmount.c:565
+#: mount/nfsmount.c:718
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "Port %d wird f�r nfs-D�mon verwendet.\n"
 
-#: mount/nfsmount.c:576
+#: mount/nfsmount.c:729
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:665
+#: mount/nfsmount.c:816
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "Unbekannter R�ckgabewert f�r nfs-Status: %d"
 
-#: mount/sundries.c:41 mount/sundries.c:56
-msgid "not enough memory"
-msgstr "Nicht gen�gend Speicher"
-
 #: mount/sundries.c:66
 msgid "bug in xstrndup call"
 msgstr "Fehler beim Aufruf von xstrndup"
@@ -7614,7 +7754,7 @@ msgstr "swapon: 'stat' konnte nicht auf %s angewandt werden: %s\n"
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
 msgstr ""
-"swapon: Warnung: Die Zugriffsrechte (%04o) von %s sind nicht sicher,\n"
+"swapon: Warnung: %s hat unsichere Zugriffsrechte (%04o),\n"
 "        0600 wird empfohlen.\n"
 
 # holes
@@ -7679,7 +7819,7 @@ msgstr "umount: %s: Nicht gefunden"
 #: mount/umount.c:193
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: Der Befehl 'umount' kann nur vom Superuser ausgef�hrt werden."
+msgstr "umount: %s: Der Befehl 'umount' kann nur vom Superuser ausgef�hrt werden."
 
 #: mount/umount.c:195
 #, c-format
@@ -7701,26 +7841,26 @@ msgstr "umount2 nicht vorhanden, umount wird versucht.\n"
 msgid "could not umount %s - trying %s instead\n"
 msgstr "umount %s war nicht m�glich - stattdessen wird %s versucht.\n"
 
-#: mount/umount.c:270
+#: mount/umount.c:272
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s ist in Gebrauch - mit Schreibschutz erneut gemountet.\n"
 
-#: mount/umount.c:278
+#: mount/umount.c:282
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: Erneutes Mounten nicht m�glich, %s ist schreibgesch�tzt.\n"
 
-#: mount/umount.c:286
+#: mount/umount.c:290
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s nicht gemountet\n"
 
-#: mount/umount.c:369
+#: mount/umount.c:374
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: Dateisystemliste f�r Unmount-Vorgang wurde nicht gefunden."
 
-#: mount/umount.c:398
+#: mount/umount.c:403
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7730,46 +7870,46 @@ msgstr ""
 "        umoumt -a [-f] [-r] [-n] [-v] [-t VFS-Typen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis ...\n"
 
-#: mount/umount.c:459
+#: mount/umount.c:464
 msgid "umount: only root can do that"
 msgstr "umount: Kann nur von 'root' ausgef�hrt werden"
 
-#: mount/umount.c:474
+#: mount/umount.c:479
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Es wird versucht, %s zu unmounten.\n"
 
-#: mount/umount.c:478
+#: mount/umount.c:483
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s wurde nicht in mtab gefunden.\n"
 
-#: mount/umount.c:482
+#: mount/umount.c:487
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s ist laut 'mtab' nicht gemountet."
 
-#: mount/umount.c:484
+#: mount/umount.c:489
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s ist mehrfach gemountet."
 
-#: mount/umount.c:496
+#: mount/umount.c:501
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s befindet sich nicht in fstab (und Sie sind nicht 'root')"
 
-#: mount/umount.c:499
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount stimmt nicht mit fstab �berein."
 
-#: mount/umount.c:520
+#: mount/umount.c:525
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: Nur 'root' kann %s von %s unmounten."
 
-#: mount/umount.c:531
+#: mount/umount.c:536
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: Nur %s kann %s von %s unmounten."
@@ -7782,7 +7922,7 @@ msgstr "Nur 'root' kann das Verhalten von Strg-Alt-Entf �ndern.\n"
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "Verwendung: ctrlaltdel hard|soft\n"
 
-#: sys-utils/cytune.c:118
+#: sys-utils/cytune.c:120
 #, c-format
 msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
@@ -7791,7 +7931,7 @@ msgstr ""
 "Datei %s: F�r den Schwellenwert %lu betrug die H�chstzahl im\n"
 "FIFO %d Zeichen, und die maximale �bertragungsrate betrug %f Zeichen/s.\n"
 
-#: sys-utils/cytune.c:129
+#: sys-utils/cytune.c:131
 #, c-format
 msgid ""
 "File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -7922,50 +8062,61 @@ msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f Int/s; %f Empfang (Zeichen/s)\n"
 
 # "Level"
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:37
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Verwendung: %s [-c] [-n Level] [-s Puffergr��e]\n"
 
-#: sys-utils/ipcrm.c:46
-#, c-format
-msgid "usage: %s [shm | msg | sem] id\n"
+#: sys-utils/ipcrm.c:59
+#, fuzzy, c-format
+msgid "invalid id: %s\n"
+msgstr "Ung�ltiger Wert: %s\n"
+
+#: sys-utils/ipcrm.c:77
+#, fuzzy, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "%s %s kann nicht ge�ffnet werden.\n"
+
+#: sys-utils/ipcrm.c:91
+#, fuzzy, c-format
+msgid "usage: %s {shm | msg | sem} id ...\n"
 msgstr "Verwendung: %s [shm | msg | sem] id\n"
 
-#: sys-utils/ipcrm.c:70
-#, c-format
-msgid "usage: %s [-shm | -msg | -sem] id\n"
-msgstr "Verwendung: %s [-shm | -msg | -sem] id\n"
+#: sys-utils/ipcrm.c:124
+#, fuzzy, c-format
+msgid "unknown resource type: %s\n"
+msgstr "Unbekannter nfs-Mount-Parameter: %s=%d\n"
 
-#: sys-utils/ipcrm.c:73
-msgid "resource deleted\n"
+#: sys-utils/ipcrm.c:128
+#, fuzzy
+msgid "resource(s) deleted\n"
 msgstr "Ressource gel�scht\n"
 
-#: sys-utils/ipcs.c:117
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
 msgstr "Verwendung: %s -asmq -tclup \n"
 
-#: sys-utils/ipcs.c:118
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
 msgstr "\t%s [-s -m -q] -i id\n"
 
-#: sys-utils/ipcs.c:119
+#: sys-utils/ipcs.c:124
 #, c-format
 msgid "\t%s -h for help.\n"
 msgstr "\t%s -h f�r Hilfe.\n"
 
-#: sys-utils/ipcs.c:125
+#: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
 msgstr "%s zeigt Informationen �ber IPC-Einrichtungen an,"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
 msgstr "f�r die Sie Lesezugriff haben.\n"
 
-#: sys-utils/ipcs.c:127
+#: sys-utils/ipcs.c:132
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
@@ -7975,7 +8126,7 @@ msgstr ""
 "\t-m : gem. Speicher\n"
 "\t-q : Nachrichten\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
@@ -7983,7 +8134,7 @@ msgstr ""
 "\t-s : Semaphores\n"
 "\t-a : alle (Standardwert)\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
@@ -7995,7 +8146,7 @@ msgstr ""
 "\t-p : PID\n"
 "\t-c : Ersteller\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
@@ -8003,370 +8154,370 @@ msgstr ""
 "\t-l : Limit\n"
 "\t-u : �bersicht\n"
 
-#: sys-utils/ipcs.c:131
+#: sys-utils/ipcs.c:136
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
 msgstr ""
 "-i id [-s -q -m] : Details der Ressource werden durch 'id' identifiziert\n"
 
-#: sys-utils/ipcs.c:263 sys-utils/ipcs.c:465
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
 msgid "kernel not configured for shared memory\n"
 msgstr ""
 "Der Kernel ist nicht f�r gemeinsam verwendeten Speicher konfiguriert.\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
 msgstr "Grenzwerte f�r gemeinsamen Speicher \n"
 
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:277
 #, c-format
 msgid "max number of segments = %d\n"
 msgstr "Max. Anzahl Segmente = %d\n"
 
-#: sys-utils/ipcs.c:273
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max seg size (kbytes) = %d\n"
 msgstr "Max. Segmentgr��e (KB) = %d\n"
 
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max total shared memory (kbytes) = %d\n"
 msgstr "Max. Gr��e f�r gemeinsamen Speicher (KB) = %d\n"
 
-#: sys-utils/ipcs.c:275
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "min seg size (bytes) = %d\n"
 msgstr "Min. Segmentgr��e (KB) = %d\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:284
 msgid "------ Shared Memory Status --------\n"
 msgstr "- Status des gemeinsamen Speichers -\n"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "Zugeordnete Segmente %d\n"
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:286
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "Zugeordnete Seiten %ld\n"
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:287
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "Speicherresidente Seiten %ld\n"
 
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:288
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "Ausgelagerte Seiten %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:289
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
 msgstr "Auslagerungsleistung: %ld Versuche\t %ld Erfolge\n"
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:294
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "- Gemeinsame Speichersegmente: Ersteller/Eigent�mer -\n"
 
-#: sys-utils/ipcs.c:290 sys-utils/ipcs.c:396 sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:297 sys-utils/ipcs.c:302
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:302 sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:408
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:308 sys-utils/ipcs.c:397
-#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:489 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:494 sys-utils/ipcs.c:511
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "- Gemeinsamer Speicher: Anf�ge-/Trenn-/�nderungszeiten -\n"
 
-#: sys-utils/ipcs.c:296
+#: sys-utils/ipcs.c:301
 #, c-format
 msgid "%-10s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:297 sys-utils/ipcs.c:302 sys-utils/ipcs.c:308
-#: sys-utils/ipcs.c:403 sys-utils/ipcs.c:412 sys-utils/ipcs.c:495
-#: sys-utils/ipcs.c:500 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:307 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:417 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505 sys-utils/ipcs.c:511
 msgid "owner"
 msgstr "Eigent�mer"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "attached"
 msgstr "Angef�gt"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "detached"
 msgstr "Getrennt"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "changed"
 msgstr "Ge�ndert"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "Gemeinsamer Speicher: Ersteller/Letzte Oper. \n"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:311
 msgid "------ Shared Memory Segments --------\n"
 msgstr "---- Gemeinsame Speichersegmente -----\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:412 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
 msgid "key"
 msgstr "Schl�ssel"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "bytes"
 msgstr "Byte"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "nattch"
 msgstr "nattach"
 
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
 msgid "status"
 msgstr "Status"
 
-#: sys-utils/ipcs.c:328 sys-utils/ipcs.c:329 sys-utils/ipcs.c:330
-#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:434 sys-utils/ipcs.c:526
-#: sys-utils/ipcs.c:527 sys-utils/ipcs.c:528
+#: sys-utils/ipcs.c:333 sys-utils/ipcs.c:334 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:438 sys-utils/ipcs.c:439 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:533
 msgid "Not set"
 msgstr "Nicht festgelegt"
 
-#: sys-utils/ipcs.c:350
+#: sys-utils/ipcs.c:355
 msgid "dest"
 msgstr "Ziel"
 
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:356
 msgid "locked"
 msgstr "Gesperrt"
 
-#: sys-utils/ipcs.c:371
+#: sys-utils/ipcs.c:376
 msgid "kernel not configured for semaphores\n"
 msgstr "Kernel ist nicht f�r Semaphores konfiguriert.\n"
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:382
 msgid "------ Semaphore Limits --------\n"
 msgstr "----- Semaphore-Grenzwerte -----\n"
 
-#: sys-utils/ipcs.c:381
+#: sys-utils/ipcs.c:386
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "H�chstzahl Datenfelder = %d\n"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:387
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "H�chstzahl Semaphores pro Datenfeld = %d\n"
 
-#: sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:388
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "H�chstzahl Semaphores im System = %d\n"
 
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:389
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "H�chstzahl Operationen pro Semaphore-Aufruf = %d\n"
 
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:390
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "Semaphore-H�chstwert = %d\n"
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:394
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Semaphore-Status --------\n"
 
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:395
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "Verwendete Datenfelder = %d\n"
 
-#: sys-utils/ipcs.c:391
+#: sys-utils/ipcs.c:396
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "Zugewiesene Semaphores = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:400
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "- Semaphore-Datenfelder: Ersteller/Eigent�mer --\n"
 
-#: sys-utils/ipcs.c:397 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:406
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "- Gemeinsamer Speicher: Operations-/�nderungszeit --\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-op"
 msgstr "last-op"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-changed"
 msgstr "last-changed"
 
-#: sys-utils/ipcs.c:410
+#: sys-utils/ipcs.c:415
 msgid "------ Semaphore Arrays --------\n"
 msgstr "---- Semaphore-Datenfelder -----\n"
 
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:417
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:478
 msgid "------ Messages: Limits --------\n"
 msgstr "---- Nachrichten: Grenzwerte ---\n"
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:479
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "H�chstzahl Warteschlangen im = %d\n"
 
-#: sys-utils/ipcs.c:475
+#: sys-utils/ipcs.c:480
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "H�chstzahl Nachrichten (Byte) = %d\n"
 
-#: sys-utils/ipcs.c:476
+#: sys-utils/ipcs.c:481
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "Standard-Maximalgr��e der Warteschlange (Byte) = %d\n"
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:485
 msgid "------ Messages: Status --------\n"
 msgstr "----- Nachrichten: Status ------\n"
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:486
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "Zugewiesene Warteschlangen = %d\n"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:487
 #, c-format
 msgid "used headers = %d\n"
 msgstr "Verwendete Kopfzeilen = %d\n"
 
-#: sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:488
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "Verwendeter Speicherplatz = %d Byte\n"
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:492
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr "- Nachr.-Warteschlangen: Ersteller/Eigent�mer -\n"
 
-#: sys-utils/ipcs.c:489 sys-utils/ipcs.c:495 sys-utils/ipcs.c:500
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:498
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "Nachr.-Warteschlangen: Sende-/Empfangs-/�nderungszeit\n"
 
-#: sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:499
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "send"
 msgstr "Senden"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "recv"
 msgstr "Empfangen"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "change"
 msgstr "�ndern"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:504
 msgid "------ Message Queues PIDs --------\n"
 msgstr "- Nachrichtenwarteschlangen-PIDs --\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:509
 msgid "------ Message Queues --------\n"
 msgstr "-- Nachrichtenwarteschlagen --\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "used-bytes"
 msgstr "used-bytes"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "messages"
 msgstr "Nachrichten"
 
-#: sys-utils/ipcs.c:565
+#: sys-utils/ipcs.c:570
 #, c-format
 msgid ""
 "\n"
@@ -8375,41 +8526,41 @@ msgstr ""
 "\n"
 "Gemeinsames Speichersegment shmid=%d\n"
 
-#: sys-utils/ipcs.c:566
+#: sys-utils/ipcs.c:571
 #, 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:568
+#: sys-utils/ipcs.c:573
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "Modus=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:569
+#: sys-utils/ipcs.c:574
 #, c-format
 msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 msgstr "Byte=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:577
 #, c-format
 msgid "att_time=%s"
 msgstr "att_time=%s"
 
-#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:575 sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
 msgid "Not set\n"
 msgstr "Nicht festgelegt\n"
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:579
 #, c-format
 msgid "det_time=%s"
 msgstr "det_time=%s"
 
-#: sys-utils/ipcs.c:576
+#: sys-utils/ipcs.c:581
 #, c-format
 msgid "change_time=%s"
 msgstr "change_time=%s"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:597
 #, c-format
 msgid ""
 "\n"
@@ -8418,26 +8569,26 @@ msgstr ""
 "\n"
 "Nachrichtenwarteschlange msqid=%d\n"
 
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:598
 #, 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:595
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "send_time=%srcv_time=%schange_time=%s"
 msgstr "Sendezeit=%sEmpfangszeit=%s�nderungszeit=%s"
 
-#: sys-utils/ipcs.c:599 sys-utils/ipcs.c:600 sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:604 sys-utils/ipcs.c:605 sys-utils/ipcs.c:606
 msgid "Not Set\n"
 msgstr "Nicht gesetzt\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:623
 #, c-format
 msgid ""
 "\n"
@@ -8446,115 +8597,115 @@ msgstr ""
 "\n"
 "Semaphore-Datenfeld semid=%d\n"
 
-#: sys-utils/ipcs.c:619
+#: sys-utils/ipcs.c:624
 #, 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:621
+#: sys-utils/ipcs.c:626
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "Modus=%#o, Zugriffsrechte=%#o\n"
 
-#: sys-utils/ipcs.c:622
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "nsems = %d\n"
 msgstr "nsems = %d\n"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "otime = %s"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:630
 #, c-format
 msgid "ctime = %s"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "value"
 msgstr "Wert"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:67
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr "Verwendung: rdev [ -rsv ] [ -o OFFSET ] [ BILD [ WERT [ OFFSET ] ] ]"
 
-#: sys-utils/rdev.c:69
+#: sys-utils/rdev.c:68
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
 msgstr ""
 "  rdev /dev/fd0  (oder rdev /linux usw.) zeigt das aktuelle ROOT-Ger�t an"
 
-#: sys-utils/rdev.c:70
+#: sys-utils/rdev.c:69
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
 msgstr "  rdev /dev/fd0 /dev/hda2         setzt ROOT auf /dev/hda2"
 
-#: sys-utils/rdev.c:71
+#: sys-utils/rdev.c:70
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr ""
 "  rdev -R /dev/fd0 1              legt ROOTFLAGS fest(schreibgesch�tzt)"
 
-#: sys-utils/rdev.c:72
+#: sys-utils/rdev.c:71
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
 msgstr "  rdev -s /dev/fd0 /dev/hda2      legt SWAP-Ger�t fest"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:72
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
 msgstr "  rdev -r /dev/fd0 627            legt Gr��e der RAMDISK fest"
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:73
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr "  rdev -v /dev/fd0 1              legt VIDEOMODUS f�r Bootvorgang fest"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:74
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   verwendet Byteoffset N"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:75
 msgid "  rootflags ...                   same as rdev -R"
 msgstr "  rootflags ...                   identisch mit rdev -R"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:76
 msgid "  swapdev ...                     same as rdev -s"
 msgstr "  swapdev ...                     identisch mit rdev -s"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr "  ramsize ...                     identisch mit rdev -r"
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     identisch mit rdev -v"
 
-#: sys-utils/rdev.c:80
+#: sys-utils/rdev.c:79
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
 "Hinweis: Videomodi sind: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
 "2=key2,..."
 
-#: sys-utils/rdev.c:81
+#: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr ""
 "      mit -R 1 wird 'root' schreibgesch�tzt gemountet, mit -R 0 erh�lt "
@@ -8644,7 +8795,7 @@ msgstr "%d: Alte Priorit�t: %d, neue Priorit�t: %d\n"
 msgid "usage: %s program [arg ...]\n"
 msgstr "Verwendung: %s Programm [Argument ...]\n"
 
-#: sys-utils/tunelp.c:73
+#: sys-utils/tunelp.c:74
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8656,82 +8807,83 @@ msgstr ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
 msgid "malloc error"
 msgstr "malloc-Fehler"
 
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:102
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s: Ung�ltiger Wert\n"
 
-#: sys-utils/tunelp.c:237
+#: sys-utils/tunelp.c:241
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s ist kein lp-Ger�t.\n"
 
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:262
 #, c-format
 msgid "%s status is %d"
 msgstr "Der Status von %s ist %d"
 
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:263
 msgid ", busy"
 msgstr ", Drucken im Gange"
 
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:264
 msgid ", ready"
 msgstr ", bereit"
 
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:265
 msgid ", out of paper"
 msgstr ", kein Papier vorhanden"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:266
 msgid ", on-line"
 msgstr ", betriebsbereit"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:267
 msgid ", error"
 msgstr ", Fehler"
 
-#: sys-utils/tunelp.c:280
+#: sys-utils/tunelp.c:284
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ-Fehler"
 
-#: sys-utils/tunelp.c:286
+#: sys-utils/tunelp.c:290
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s bei Verwendung von IRQ %d\n"
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:292
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s bei Verwendung von Abfragen\n"
 
-#: text-utils/col.c:153
+#: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col: Ung�ltiges Argument '-l' %s.\n"
 
-#: text-utils/col.c:516
-msgid "usage: col [-bfx] [-l nline]\n"
+#: text-utils/col.c:521
+#, fuzzy
+msgid "usage: col [-bfpx] [-l nline]\n"
 msgstr "Verwendung: col [-bfx] [-l nZeile]\n"
 
-#: text-utils/col.c:522
+#: text-utils/col.c:527
 msgid "col: write error.\n"
 msgstr "col: Fehler beim Schreiben.\n"
 
-#: text-utils/col.c:529
+#: text-utils/col.c:534
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr "col: Warnung: %s kann nicht gesichert werden.\n"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "past first line"
 msgstr "�ber die erste Zeile hinaus"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "-- line already flushed"
 msgstr "-- Zeile bereits geleert"
 
@@ -8740,11 +8892,11 @@ msgstr "-- Zeile bereits geleert"
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "Verwendung: %s [ - ] [ -2 ] [ Datei ... ]\n"
 
-#: text-utils/column.c:302
+#: text-utils/column.c:300
 msgid "line too long"
 msgstr "Zeile ist zu lang"
 
-#: text-utils/column.c:379
+#: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
 msgstr "Verwendung: column [-tx] [-c Spalten] [Datei ...]\n"
 
@@ -8763,13 +8915,13 @@ msgstr ""
 "hexdump: [-bcdovx] [-e Format] [-f Formatdatei] [-n L�nge] [-s �berspringen] "
 "[Datei ...]\n"
 
-#: text-utils/more.c:329
+#: text-utils/more.c:330
 #, c-format
 msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 "Verwendung: %s [-dfln] [+Zeilennummer | +/Muster] Dateiname1 Dateiname2 ...\n"
 
-#: text-utils/more.c:504
+#: text-utils/more.c:505
 #, c-format
 msgid ""
 "\n"
@@ -8781,7 +8933,7 @@ msgstr ""
 "\n"
 
 #. simple ELF detection
-#: text-utils/more.c:543
+#: text-utils/more.c:544
 #, c-format
 msgid ""
 "\n"
@@ -8796,30 +8948,30 @@ msgstr ""
 msgid "[Use q or Q to quit]"
 msgstr "[Dr�cken Sie q oder Q, um den Vorgang zu beenden]"
 
-#: text-utils/more.c:833
+#: text-utils/more.c:826
 msgid "--More--"
 msgstr "--Weiter--"
 
-#: text-utils/more.c:835
+#: text-utils/more.c:828
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(N�chste Datei: %s)"
 
-#: text-utils/more.c:841
+#: text-utils/more.c:834
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Leertaste = Fortfahren, 'q' = Beenden.]"
 
-#: text-utils/more.c:1139
+#: text-utils/more.c:1132
 #, c-format
 msgid "...back %d page"
 msgstr "... %d Seiten zur�ck"
 
-#: text-utils/more.c:1185
+#: text-utils/more.c:1178
 #, c-format
 msgid "...skipping %d line"
 msgstr "... %d Zeilen werden �bersprungen."
 
-#: text-utils/more.c:1226
+#: text-utils/more.c:1219
 msgid ""
 "\n"
 "***Back***\n"
@@ -8829,37 +8981,37 @@ msgstr ""
 "***Zur�ck***\n"
 "\n"
 
-#: text-utils/more.c:1264
+#: text-utils/more.c:1257
 msgid "Can't open help file"
 msgstr "Die Hilfedatei konnte nicht ge�ffnet werden."
 
-#: text-utils/more.c:1285 text-utils/more.c:1289
+#: text-utils/more.c:1278 text-utils/more.c:1282
 msgid "[Press 'h' for instructions.]"
 msgstr "[Dr�cken Sie 'h' f�r Hilfe.]"
 
-#: text-utils/more.c:1324
+#: text-utils/more.c:1316
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "'%s' Zeile %d"
 
-#: text-utils/more.c:1326
+#: text-utils/more.c:1318
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Keine Datei] Zeile %d"
 
-#: text-utils/more.c:1410
+#: text-utils/more.c:1402
 msgid "  Overflow\n"
 msgstr "  �berlauf\n"
 
-#: text-utils/more.c:1457
+#: text-utils/more.c:1449
 msgid "...skipping\n"
 msgstr "...�berspringen\n"
 
-#: text-utils/more.c:1487
+#: text-utils/more.c:1479
 msgid "Regular expression botch"
 msgstr "Fehler beim Ausf�hren von 're_exec()'"
 
-#: text-utils/more.c:1499
+#: text-utils/more.c:1491
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -8867,15 +9019,15 @@ msgstr ""
 "\n"
 "Muster wurde nicht gefunden\n"
 
-#: text-utils/more.c:1502
+#: text-utils/more.c:1494
 msgid "Pattern not found"
 msgstr "Muster wurde nicht gefunden"
 
-#: text-utils/more.c:1563
+#: text-utils/more.c:1555
 msgid "can't fork\n"
 msgstr "kann keinen neuen Prozess erzeugen\n"
 
-#: text-utils/more.c:1602
+#: text-utils/more.c:1594
 msgid ""
 "\n"
 "...Skipping "
@@ -8883,23 +9035,23 @@ msgstr ""
 "\n"
 "...Sprung "
 
-#: text-utils/more.c:1606
+#: text-utils/more.c:1598
 msgid "...Skipping "
 msgstr "...Sprung "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "to file "
 msgstr "zur Datei "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "back to file "
 msgstr "zur�ck zur Datei "
 
-#: text-utils/more.c:1846
+#: text-utils/more.c:1835
 msgid "Line too long"
 msgstr "Zeile ist zu lang"
 
-#: text-utils/more.c:1890
+#: text-utils/more.c:1878
 msgid "No previous command to substitute for"
 msgstr "Kein vorheriger Befehl, der ersetzt werden kann"
 
@@ -8937,6 +9089,7 @@ msgid "hexdump: bad byte count for conversion character %s.\n"
 msgstr "hexdump: Ung�ltige Byteanzahl f�r Umwandlungszeichen %s.\n"
 
 #: text-utils/parse.c:497
+#, ycp-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
 msgstr "hexdump: %%s erfordert Pr�zision oder Byteanzahl.\n"
 
@@ -8949,11 +9102,11 @@ msgstr "hexdump: Ung�ltiges Format (%s)\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: Ung�ltiges Umwandlungszeichen %%%s.\n"
 
-#: text-utils/rev.c:114
+#: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
 msgstr "Es konnte kein Speicher f�r den Puffer reserviert werden.\n"
 
-#: text-utils/rev.c:173
+#: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
 msgstr "Verwendung: rev [Datei ...]\n"
 
@@ -8975,11 +9128,11 @@ msgstr "Unbekannte Escape-Folge in der Eingabe: %o, %o\n"
 msgid "Unable to allocate buffer.\n"
 msgstr "Es konnte kein Speicher f�r den Puffer reserviert werden.\n"
 
-#: text-utils/ul.c:555
+#: text-utils/ul.c:553
 msgid "Input line too long.\n"
 msgstr "Die Eingabezeile ist zu lang.\n"
 
-#: text-utils/ul.c:568
+#: text-utils/ul.c:566
 msgid "Out of memory when growing buffer.\n"
 msgstr "Kein Speicher mehr frei beim Vergr��ern eines Puffers.\n"
 
@@ -8998,6 +9151,55 @@ msgstr ""
 msgid "Cannot open /dev/port"
 msgstr "/dev/port konnte nicht ge�ffnet werden."
 
+#~ msgid "Writing disklabel to %s%d.\n"
+#~ msgstr "Datentr�gerkennung wird auf %s%d geschrieben.\n"
+
+#~ msgid "%s%d contains no disklabel.\n"
+#~ msgstr "%s%d enth�lt keine Datentr�gerkennung.\n"
+
+#~ msgid "Bootstrap installed on %s%d.\n"
+#~ msgstr "Bootinformationen installiert auf %s%d.\n"
+
+#~ msgid "%s: unknown geometry\n"
+#~ msgstr "%s: Unbekannte Geometrie\n"
+
+#~ msgid "exec rc failed\n"
+#~ msgstr "Ausf�hrung der rc-Datei nicht erfolgreich.\n"
+
+#~ msgid "fork of rc shell failed\n"
+#~ msgstr "Prozesserzeugung f�r rc-Shell nicht erfolgreich.\n"
+
+#~ msgid "Cannot get loop info"
+#~ msgstr "Keine Informationen �ber das 'loop'-Ger�t verf�gbar."
+
+#~ msgid "mount: %s has wrong major or minor number"
+#~ msgstr "mount: %s hat eine falsche Major- oder Minor-Ger�tenummer."
+
+#~ msgid "mount: block device %s is not permitted on its filesystem"
+#~ msgstr ""
+#~ "mount: Das blockorientierte Ger�t %s ist in seinem\n"
+#~ "       Dateisystem nicht zul�ssig."
+
+#~ msgid ""
+#~ "Usage: mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
+#~ msgstr ""
+#~ "Verwendung: mount [-hV]\n"
+#~ "        mount -a [-nfFrsvw] [-t VFS-Typen]\n"
+#~ "        mount [-nfrsvw] [-o Optionen] special | node\n"
+#~ "        mount [-nfrsvw] [-t VFS-Typ] [-o Optionen] special node\n"
+#~ "        Das Ger�t kann auch durch -L Label oder -U UUID angegeben werden.\n"
+
+#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
+#~ msgstr ""
+#~ "mount: %s:%s nicht erfolgreich. Der Server meldet folgende Ursache: %s\n"
+
+#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
+#~ msgstr "Verwendung: %s [-shm | -msg | -sem] id\n"
+
 # This one is for Debian
 #~ msgid "not mounting anything"
 #~ msgstr "Es wird nichts gemountet."
diff --git a/po/es.po b/po/es.po
index 7b06918cc3..f79234da90 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.10f\n"
-"POT-Creation-Date: 2000-03-21 14:47-0800\n"
+"POT-Creation-Date: 2000-10-16 16:44+0200\n"
 "PO-Revision-Date: 2000-03-28 21:52-0800\n"
 "Last-Translator: Beth Powell <bpowell@turbolinux.com>\n"
 "Language-Team: <support@turbolinux.com>\n"
@@ -12,85 +12,85 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:146
+#: clock/cmos.c:157
 msgid "booted from MILO\n"
 msgstr "iniciado desde MILO\n"
 
-#: clock/cmos.c:155
+#: clock/cmos.c:166
 msgid "Ruffian BCD clock\n"
 msgstr "Reloj BCD Ruffian\n"
 
-#: clock/cmos.c:171
+#: clock/cmos.c:182
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "puerto de reloj ajustado a 0x%x\n"
 
-#: clock/cmos.c:181
+#: clock/cmos.c:192
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: clock/cmos.c:235
+#: clock/cmos.c:246
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: %s at�mico ha fallado para 1000 iteraciones."
 
-#: clock/cmos.c:559
+#: clock/cmos.c:570
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "No es posible abrir /dev/port: %s"
 
-#: clock/cmos.c:566
+#: clock/cmos.c:577
 msgid "I failed to get permission because I didnt try.\n"
 msgstr "No se ha podido obtener permiso porque no se ha intentado.\n"
 
-#: clock/cmos.c:569
+#: clock/cmos.c:580
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s no puede obtener acceso al puerto de E/S: la llamada iopl(3) ha fallado.\n"
 
-#: clock/cmos.c:572
+#: clock/cmos.c:583
 msgid "Probably you need root privileges.\n"
 msgstr "Probablemente son necesarios los privilegios de usuario root.\n"
 
-#: clock/hwclock.c:213
+#: clock/hwclock.c:219
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Se presupone que el reloj de hardware tiene la hora %s.\n"
 
-#: clock/hwclock.c:214 clock/hwclock.c:303
+#: clock/hwclock.c:220 clock/hwclock.c:309
 msgid "UTC"
 msgstr "UTC"
 
-#: clock/hwclock.c:214 clock/hwclock.c:302
+#: clock/hwclock.c:220 clock/hwclock.c:308
 msgid "local"
 msgstr "local"
 
-#: clock/hwclock.c:286
+#: clock/hwclock.c:292
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: advertencia: tercera l�nea no reconocida en archivo adjtime\n"
 
-#: clock/hwclock.c:288
+#: clock/hwclock.c:294
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Se esperaba: `UTC', `LOCAL' o nada.)\n"
 
-#: clock/hwclock.c:297
+#: clock/hwclock.c:303
 #, c-format
 msgid "Last drift adjustment done at %d seconds after 1969\n"
 msgstr "�ltimo ajuste de defase realizado %d segundos despu�s de 1969\n"
 
-#: clock/hwclock.c:299
+#: clock/hwclock.c:305
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
 msgstr "�ltima calibraci�n realizada %d segundos despu�s de 1969\n"
 
-#: clock/hwclock.c:301
+#: clock/hwclock.c:307
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "El reloj de hardware tiene la hora %s\n"
 
-#: clock/hwclock.c:303
+#: clock/hwclock.c:309
 msgid "unknown"
 msgstr "desconocido"
 
@@ -108,43 +108,43 @@ msgstr "desconocido"
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:325
+#: clock/hwclock.c:331
 msgid "Waiting for clock tick...\n"
 msgstr "Esperando se�al de reloj...\n"
 
-#: clock/hwclock.c:329
+#: clock/hwclock.c:335
 msgid "...got clock tick\n"
 msgstr "...recibida se�al de reloj\n"
 
-#: clock/hwclock.c:380
-#, c-format
-msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+#: clock/hwclock.c:386
+#, fuzzy, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 "Valores no v�lidos en reloj de hardware: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: clock/hwclock.c:389
-#, c-format
-msgid "Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d seconds since 1969\n"
+#: clock/hwclock.c:394
+#, fuzzy, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 "Hora del reloj de hardware: %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d segundos desde "
 "1969\n"
 
-#: clock/hwclock.c:417
-#, c-format
-msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+#: clock/hwclock.c:422
+#, fuzzy, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "Hora le�da del reloj de hardware: %02d:%02d:%02d\n"
 
-#: clock/hwclock.c:443
+#: clock/hwclock.c:449
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
 msgstr ""
 "Estableciendo reloj de hardware en %.2d:%.2d:%.2d = %d segundos desde 1969\n"
 
-#: clock/hwclock.c:449
+#: clock/hwclock.c:455
 msgid "Clock not changed - testing only.\n"
 msgstr "El reloj no se ha modificado; s�lo se est� probando.\n"
 
-#: clock/hwclock.c:497
+#: clock/hwclock.c:503
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -153,7 +153,7 @@ msgstr ""
 "El tiempo transcurrido desde la hora de referencia es de %.6f segundos.\n"
 "Aumentando el retardo hasta el siguiente segundo completo.\n"
 
-#: clock/hwclock.c:521
+#: clock/hwclock.c:527
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
@@ -168,18 +168,18 @@ msgstr ""
 #.
 #. Compute display value for time
 #. Cut off trailing newline
-#: clock/hwclock.c:533
+#: clock/hwclock.c:539
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f segundos\n"
 
-#: clock/hwclock.c:567
+#: clock/hwclock.c:573
 msgid "No --date option specified.\n"
 msgstr "No se ha especificado la opci�n --date.\n"
 
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:572
+#: clock/hwclock.c:578
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
@@ -187,23 +187,23 @@ msgstr ""
 "El valor de la opci�n --date no es una fecha v�lida.\n"
 "En concreto, contiene comillas.\n"
 
-#: clock/hwclock.c:578
+#: clock/hwclock.c:584
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Ejecutando comando date: %s\n"
 
-#: clock/hwclock.c:582
+#: clock/hwclock.c:588
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "No es posible ejecutar el programa 'date' en int�rprete de comandos /bin/sh. "
 "popen() ha fallado"
 
-#: clock/hwclock.c:588
+#: clock/hwclock.c:594
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "respuesta del comando date = %s\n"
 
-#: clock/hwclock.c:590
+#: clock/hwclock.c:596
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -218,11 +218,11 @@ msgstr ""
 "La respuesta fue:\n"
 "%s\n"
 
-#: clock/hwclock.c:599
-#, c-format
+#: clock/hwclock.c:605
+#, fuzzy, c-format
 msgid ""
-"The date command issued by %s returnedsomething other than an integer where "
-"the convertedtime value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
@@ -235,12 +235,12 @@ msgstr ""
 "La respuesta fue:\n"
 "%s\n"
 
-#: clock/hwclock.c:609
+#: clock/hwclock.c:615
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr "La cadena de date %s equivale a %d segundos desde 1969.\n"
 
-#: clock/hwclock.c:641
+#: clock/hwclock.c:647
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
@@ -248,35 +248,35 @@ msgstr ""
 "El reloj de hardware no contiene una hora v�lida, por lo que no se puede "
 "establecer la hora del sistema a partir de ese valor.\n"
 
-#: clock/hwclock.c:654
+#: clock/hwclock.c:669
 msgid "Calling settimeofday:\n"
 msgstr "Se est� llamando settimeofday:\n"
 
-#: clock/hwclock.c:655
+#: clock/hwclock.c:670
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: clock/hwclock.c:657
-#, c-format
-msgid "\ttz.tz_minuteswest = %ld\n"
+#: clock/hwclock.c:672
+#, fuzzy, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %ld\n"
 
-#: clock/hwclock.c:660
+#: clock/hwclock.c:675
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "No se establece el reloj del sistema ya que la ejecuci�n es en modo de "
 "prueba.\n"
 
-#: clock/hwclock.c:673
+#: clock/hwclock.c:683
 msgid "Must be superuser to set system clock.\n"
 msgstr "Debe ser superusuario para establecer el reloj del sistema.\n"
 
-#: clock/hwclock.c:675
+#: clock/hwclock.c:685
 msgid "settimeofday() failed"
 msgstr "settimeofday() ha fallado"
 
-#: clock/hwclock.c:708
+#: clock/hwclock.c:718
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
@@ -284,7 +284,7 @@ msgstr ""
 "No se est� ajustando el factor de defase debido a que el reloj de hardware "
 "conten�a anteriormente datos extra�os.\n"
 
-#: clock/hwclock.c:712
+#: clock/hwclock.c:722
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
@@ -292,7 +292,7 @@ msgstr ""
 "No se est� ajustando el factor de defase debido a que hace menos de un d�a "
 "que se realiz� la �ltima calibraci�n.\n"
 
-#: clock/hwclock.c:721
+#: clock/hwclock.c:731
 #, c-format
 msgid ""
 "Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
@@ -303,23 +303,23 @@ msgstr ""
 "utilizar un factor de defase de %f segundos por d�a.\n"
 "Se est� ajustando el factor de defase en %f segundos por d�a\n"
 
-#: clock/hwclock.c:772
+#: clock/hwclock.c:782
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "El tiempo transcurrido desde el �ltimo ajuste es de %d segundos\n"
 
-#: clock/hwclock.c:774
+#: clock/hwclock.c:784
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Es preciso insertar %d segundos y establecer como referencia la hora %.6f "
 "segundos hacia atr�s\n"
 
-#: clock/hwclock.c:803
+#: clock/hwclock.c:813
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "No se est� actualizando el archivo adjtime debido al modo de prueba.\n"
 
-#: clock/hwclock.c:804
+#: clock/hwclock.c:814
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -328,37 +328,37 @@ msgstr ""
 "Se habr�a escrito lo siguiente en %s:\n"
 "%s"
 
-#: clock/hwclock.c:828
+#: clock/hwclock.c:838
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Par�metros de ajuste del defase no actualizados.\n"
 
-#: clock/hwclock.c:869
+#: clock/hwclock.c:879
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "El reloj de hardware no contiene una hora v�lida, por lo que no se puede "
 "ajustar.\n"
 
-#: clock/hwclock.c:893
+#: clock/hwclock.c:903
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "El ajuste necesario es inferior a un segundo, por lo que no se establece el "
 "reloj.\n"
 
-#: clock/hwclock.c:919
+#: clock/hwclock.c:929
 #, c-format
 msgid "Using %s.\n"
 msgstr "Utilizando %s.\n"
 
-#: clock/hwclock.c:921
+#: clock/hwclock.c:931
 msgid "No usable clock interface found.\n"
 msgstr "No se ha encontrado ninguna interfaz de reloj utilizable.\n"
 
-#: clock/hwclock.c:1016
+#: clock/hwclock.c:1026
 msgid "Unable to set system clock.\n"
 msgstr "No es posible establecer el reloj del sistema.\n"
 
-#: clock/hwclock.c:1045
+#: clock/hwclock.c:1055
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
 "machine.\n"
@@ -371,16 +371,16 @@ msgstr ""
 "(por lo que posiblemente no se est� ejecutando en una m�quina Alpha). No se "
 "efect�a ninguna acci�n.\n"
 
-#: clock/hwclock.c:1054
+#: clock/hwclock.c:1064
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "No es posible obtener el valor de epoch del kernel.\n"
 
-#: clock/hwclock.c:1056
+#: clock/hwclock.c:1066
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "El kernel presupone el valor de epoch %lu\n"
 
-#: clock/hwclock.c:1059
+#: clock/hwclock.c:1069
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
@@ -388,17 +388,18 @@ msgstr ""
 "Para establecer el valor de epoch, debe utilizar la opci�n 'epoch' para "
 "indicar en qu� valor debe definirse.\n"
 
-#: clock/hwclock.c:1062
+#: clock/hwclock.c:1072
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 "No se est� estableciendo el valor de epoch en %d; s�lo se est� probando.\n"
 
-#: clock/hwclock.c:1065
+#: clock/hwclock.c:1075
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "No es posible establecer el valor de epoch en el kernel.\n"
 
-#: clock/hwclock.c:1088
+#: clock/hwclock.c:1104
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -420,7 +421,7 @@ msgid ""
 "Options: \n"
 "  --utc         the hardware clock is kept in coordinated universal time\n"
 "  --localtime   the hardware clock is kept in local time\n"
-"  --directisa   access the ISA bus directly instead of /dev/rtc\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
 "  --badyear     ignore rtc's year because the bios is broken\n"
 "  --date        specifies the time to which to set the hardware clock\n"
 "  --epoch=year  specifies the year which is the beginning of the \n"
@@ -449,14 +450,14 @@ msgstr ""
 "Opciones: \n"
 "  --utc         El reloj de hardware tiene la hora UCT\n"
 "  --localtime   El reloj de hardware tiene la hora local\n"
-"  --directisa   Acceder al bus ISA directamente en lugar de a /dev/rtc\n"
+"  --directisa   Acceder al bus ISA directamente en lugar de a %s\n"
 "  --badyear     Hacer caso omiso del a�o del RTC ya que el BIOS no funciona\n"
 "  --date        Especifica la hora en que se desea establecer el reloj de "
 "hardware\n"
 "  --epoch=a�o   Especifica el a�o que corresponde al principio del valor de\n"
 "                �poca del reloj de hardware\n"
 
-#: clock/hwclock.c:1113
+#: clock/hwclock.c:1129
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -465,12 +466,12 @@ msgstr ""
 "                Indicar al reloj de hardware el tipo de Alpha (ver "
 "hwclock(8))\n"
 
-#: clock/hwclock.c:1209
+#: clock/hwclock.c:1227
 #, 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"
 
-#: clock/hwclock.c:1219
+#: clock/hwclock.c:1237
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
@@ -478,7 +479,7 @@ msgstr ""
 "Ha especificado varias opciones de funciones.\n"
 "S�lo puede llevar a cabo una funci�n a la vez.\n"
 
-#: clock/hwclock.c:1225
+#: clock/hwclock.c:1243
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -487,15 +488,20 @@ msgstr ""
 "%s: las opciones --utc y --localtime se excluyen mutuamente. Ha especificado "
 "ambas.\n"
 
-#: clock/hwclock.c:1238
+#: clock/hwclock.c:1256
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Hora no utilizable. No es posible establecer el reloj.\n"
 
-#: clock/hwclock.c:1253
+#: clock/hwclock.c:1271
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "�nicamente el superusuario puede cambiar el reloj de hardware.\n"
 
-#: clock/hwclock.c:1257
+#: clock/hwclock.c:1275
+#, fuzzy
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "�nicamente el superusuario puede cambiar el reloj de hardware.\n"
+
+#: clock/hwclock.c:1279
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
@@ -503,10 +509,15 @@ msgstr ""
 "S�lo el superusuario puede cambiar el valor de epoch del reloj de hardware "
 "del kernel.\n"
 
-#: clock/hwclock.c:1275
+#: clock/hwclock.c:1299
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr ""
+
+#: clock/hwclock.c:1302
+#, fuzzy
 msgid ""
-"Cannot access the Hardware Clock via any known method.  Use --debug option "
-"to see the details of our search for an access method.\n"
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
 msgstr ""
 "No es posible acceder al reloj de hardware mediante los m�todos conocidos. "
 "Utilice --debugpara ver los detalles de la b�squeda para un m�todo de "
@@ -520,7 +531,7 @@ msgstr "Esperando en bucle que cambie la hora de KDGHWCLK\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Error de ioctl KDGHWCLK al leer la hora"
 
-#: clock/kd.c:65 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
 msgstr "Se ha excedido el tiempo de espera del cambio de hora.\n"
 
@@ -540,106 +551,112 @@ msgstr "ioctl() no ha podido abrir /dev/tty1"
 msgid "KDGHWCLK ioctl failed"
 msgstr "Error de ioctl KDGHWCLK"
 
-#: clock/kd.c:161
+#: clock/kd.c:163
 msgid "Can't open /dev/tty1"
 msgstr "No se puede abrir /dev/tty1"
 
-#: clock/rtc.c:98
-msgid "ioctl() to /dev/rtc to read the time failed.\n"
-msgstr "Error de ioctl() con /dev/rtc al leer la hora.\n"
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "Error de ioctl() con %s al leer la hora.\n"
 
-#: clock/rtc.c:129
-msgid "Waiting in loop for time from /dev/rtc to change\n"
-msgstr "Esperando en bucle que cambie la hora de /dev/rtc\n"
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Esperando en bucle que cambie la hora de %s\n"
 
-#: clock/rtc.c:165 clock/rtc.c:222
-msgid "open() of /dev/rtc failed"
-msgstr "Error de open() de /dev/rtc"
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "Error de open() de %s"
 
-#. This rtc device doesn't have interrupt functions.  This is typical
-#. on an Alpha, where the Hardware Clock interrupts are used by the
-#. kernel for the system clock, so aren't at the user's disposal.
-#.
-#: clock/rtc.c:182
-msgid "/dev/rtc does not have interrupt functions. "
-msgstr "/dev/rtc no tiene funciones de interrupci�n. "
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s no tiene funciones de interrupci�n. "
 
-#: clock/rtc.c:191
-msgid "read() to /dev/rtc to wait for clock tick failed"
-msgstr "Error de read() de /dev/rtc al esperar se�al de reloj"
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "Error de read() de %s al esperar se�al de reloj"
 
-#: clock/rtc.c:199
-msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
-msgstr ""
-"Error de ioctl() con /dev/rtc al desactivar interrupciones de actualizaci�n"
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "Error de ioctl() con %s al desactivar interrupciones de actualizaci�n"
 
-#: clock/rtc.c:202
-msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"Error inesperado de ioctl() con /dev/rtc al activar interrupciones de "
-"actualizaci�n"
+"Error inesperado de ioctl() con %s al activar interrupciones de actualizaci�n"
 
-#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
-msgid "Unable to open /dev/rtc"
-msgstr "No es posible abrir /dev/rtc"
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "No es posible abrir %s"
 
-#: clock/rtc.c:268
-msgid "ioctl() to /dev/rtc to set the time failed.\n"
-msgstr "Error de ioctl() con /dev/rtc al establecer la hora.\n"
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "Error de ioctl() con %s al establecer la hora.\n"
 
-#: clock/rtc.c:272
+#: clock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) ha finalizado correctamente.\n"
 
-#: clock/rtc.c:302
-msgid "Open of /dev/rtc failed"
-msgstr "Error al abrir /dev/rtc"
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "Error al abrir %s"
 
-#: clock/rtc.c:320 clock/rtc.c:365
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file /dev/rtc.  This file does not "
-"exist on this system.\n"
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
 msgstr ""
 "Para modificar el valor de epoch del kernel, se debe acceder al controlador "
 "de dispositivo 'rtc' de Linux mediante el archivo especial de dispositivo "
-"/dev/rtc. Este archivo no existe en este sistema.\n"
+"%s. Este archivo no existe en este sistema.\n"
 
-#: clock/rtc.c:331
-msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
-msgstr "Error de ioctl(RTC_EPOCH_READ) con /dev/rtc"
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "Error de ioctl(RTC_EPOCH_READ) con %s"
 
-#: clock/rtc.c:337
+#: clock/rtc.c:344
 #, c-format
-msgid "we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
-"Se ha le�do el valor de epoch %ld de /dev/rtc con ioctl RTC_EPOCH_READ.\n"
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "Se ha le�do el valor de epoch %ld de %s con ioctl RTC_EPOCH_READ.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: clock/rtc.c:357
+#: clock/rtc.c:364
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "El valor de epoch no puede ser inferior a 1900. Ha solicitado %ld\n"
 
-#: clock/rtc.c:374
+#: clock/rtc.c:381
 #, c-format
-msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
-msgstr "Estableciendo epoch en %ld con ioctl RTC_EPOCH_SET en /dev/rtc.\n"
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "Estableciendo epoch en %ld con ioctl RTC_EPOCH_SET en %s.\n"
 
-#: clock/rtc.c:379
+#: clock/rtc.c:386
+#, c-format
 msgid ""
-"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
-"ioctl.\n"
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
-"El controlador de dispositivo del kernel para /dev/rtc no tiene la ioctl "
+"El controlador de dispositivo del kernel para %s no tiene la ioctl "
 "RTC_EPOCH_SET.\n"
 
-#: clock/rtc.c:382
-msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
-msgstr "Error de ioctl(RTC_EPOCH_SET) de /dev/rtc"
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "Error de ioctl(RTC_EPOCH_SET) de %s"
 
 #: clock/shhopt.c:255 clock/shhopt.c:281
 #, c-format
@@ -671,83 +688,83 @@ msgstr "La opci�n `%s' no admite un argumento\n"
 msgid "unrecognized option `-%c'\n"
 msgstr "Opci�n `-%c' no reconocida\n"
 
-#: disk-utils/blockdev.c:34
+#: disk-utils/blockdev.c:47
 msgid "set read-only"
 msgstr "establecer s�lo lectura"
 
-#: disk-utils/blockdev.c:35
+#: disk-utils/blockdev.c:48
 msgid "set read-write"
 msgstr "establecer lectura/escritura"
 
-#: disk-utils/blockdev.c:38
+#: disk-utils/blockdev.c:51
 msgid "get read-only"
 msgstr "obtener s�lo lectura"
 
-#: disk-utils/blockdev.c:41
+#: disk-utils/blockdev.c:54
 msgid "get sectorsize"
 msgstr "obtener tama�o de sector"
 
-#: disk-utils/blockdev.c:44
+#: disk-utils/blockdev.c:57
 msgid "get size"
 msgstr "obtener tama�o"
 
-#: disk-utils/blockdev.c:47
+#: disk-utils/blockdev.c:60
 msgid "set readahead"
 msgstr "establecer readahead"
 
-#: disk-utils/blockdev.c:50
+#: disk-utils/blockdev.c:63
 msgid "get readahead"
 msgstr "obtener readahead"
 
-#: disk-utils/blockdev.c:53
+#: disk-utils/blockdev.c:66
 msgid "flush buffers"
 msgstr "vaciar b�feres"
 
-#: disk-utils/blockdev.c:57
+#: disk-utils/blockdev.c:70
 msgid "reread partition table"
 msgstr "volver a leer tabla de particiones"
 
-#: disk-utils/blockdev.c:66
+#: disk-utils/blockdev.c:79
 #, c-format
 msgid "Usage: %s [-V] [-v|-q] commands devices\n"
 msgstr "Uso: %s [-V] [-v|-q] comandos dispositivos\n"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:80
 msgid "Available commands:\n"
 msgstr "Comandos disponibles:\n"
 
-#: disk-utils/blockdev.c:167
+#: disk-utils/blockdev.c:180
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: comando desconocido: %s\n"
 
-#: disk-utils/blockdev.c:178
+#: disk-utils/blockdev.c:191
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s necesita un argumento\n"
 
-#: disk-utils/fdformat.c:33
+#: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Formateando... "
 
-#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
 msgstr "Finalizado\n"
 
-#: disk-utils/fdformat.c:62
+#: disk-utils/fdformat.c:65
 msgid "Verifying ... "
 msgstr "Verificando... "
 
-#: disk-utils/fdformat.c:73
+#: disk-utils/fdformat.c:76
 msgid "Read: "
 msgstr "Leer: "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:78
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
 msgstr "Problema de lectura del cilindro %d, esperado %d, le�do %d\n"
 
-#: disk-utils/fdformat.c:81
+#: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
@@ -756,80 +773,80 @@ msgstr ""
 "Datos incorrectos en cilindro %d\n"
 "Continuando... "
 
-#: disk-utils/fdformat.c:96
+#: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
 msgstr "uso: %s [ -n ] dispositivo\n"
 
-#: disk-utils/fdformat.c:117 disk-utils/fsck.minix.c:1255 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:650 disk-utils/mkswap.c:351
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:175 misc-utils/ddate.c:172
-#: misc-utils/kill.c:191
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:448
+#: disk-utils/setfdprm.c:128 misc-utils/cal.c:172 misc-utils/ddate.c:181
+#: misc-utils/kill.c:192
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
 
-#: disk-utils/fdformat.c:131
+#: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
 msgstr "%s: no es un dispositivo de disquete\n"
 
-#: disk-utils/fdformat.c:137
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
 msgstr "No es posible determinar el tipo de formato actual"
 
-#: disk-utils/fdformat.c:138
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "%s caras, %d pistas, %d segundos/pista. Capacidad total %d kB.\n"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Double"
 msgstr "Doble"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Single"
 msgstr "Simple"
 
-#: disk-utils/fsck.minix.c:196
+#: disk-utils/fsck.minix.c:197
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uso: %s [-larvsmf] /dev/nombre\n"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:296
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s est� montado.\t "
 
-#: disk-utils/fsck.minix.c:296
+#: disk-utils/fsck.minix.c:298
 msgid "Do you really want to continue"
 msgstr "�Est� seguro de que desea continuar?"
 
-#: disk-utils/fsck.minix.c:300
+#: disk-utils/fsck.minix.c:302
 msgid "check aborted.\n"
 msgstr "Comprobaci�n anulada.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:337
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
 msgid "Zone nr < FIRSTZONE in file `"
 msgstr "N�mero de zona < FIRSTZONE en archivo `"
 
-#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
 msgid "Zone nr >= ZONES in file `"
 msgstr "N�mero de zona >= ZONES en archivo `"
 
-#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
 msgid "Remove block"
 msgstr "Eliminar bloque"
 
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:364
 msgid "Read error: unable to seek to block in file '"
 msgstr "Error de lectura: no es posible buscar en bloque de archivo '"
 
-#: disk-utils/fsck.minix.c:368
+#: disk-utils/fsck.minix.c:370
 msgid "Read error: bad block in file '"
 msgstr "Error de lectura: bloque incorrecto en archivo '"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:386
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -837,121 +854,121 @@ msgstr ""
 "Error interno: se est� intentando escribir un bloque incorrecto\n"
 "La petici�n de escritura no se tiene en cuenta\n"
 
-#: disk-utils/fsck.minix.c:390 disk-utils/mkfs.minix.c:289
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
 msgid "seek failed in write_block"
 msgstr "Error de b�squeda en write_block"
 
-#: disk-utils/fsck.minix.c:392
+#: disk-utils/fsck.minix.c:394
 msgid "Write error: bad block in file '"
 msgstr "Error de escritura: bloque incorrecto en archivo '"
 
-#: disk-utils/fsck.minix.c:511
+#: disk-utils/fsck.minix.c:513
 msgid "seek failed in write_super_block"
 msgstr "Error de b�squeda en write_super_block"
 
-#: disk-utils/fsck.minix.c:513 disk-utils/mkfs.minix.c:276
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr "No es posible escribir superbloque"
 
-#: disk-utils/fsck.minix.c:523
+#: disk-utils/fsck.minix.c:525
 msgid "Unable to write inode map"
 msgstr "No es posible escribir mapa de inodos"
 
-#: disk-utils/fsck.minix.c:525
+#: disk-utils/fsck.minix.c:527
 msgid "Unable to write zone map"
 msgstr "No es posible escribir mapa de zonas"
 
-#: disk-utils/fsck.minix.c:527
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inodes"
 msgstr "No es posible escribir inodos"
 
-#: disk-utils/fsck.minix.c:556
+#: disk-utils/fsck.minix.c:558
 msgid "seek failed"
 msgstr "Error de b�squeda"
 
-#: disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.minix.c:560
 msgid "unable to read super block"
 msgstr "No es posible leer superbloque"
 
-#: disk-utils/fsck.minix.c:578
+#: disk-utils/fsck.minix.c:580
 msgid "bad magic number in super-block"
 msgstr "N�mero m�gico incorrecto en superbloque"
 
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:582
 msgid "Only 1k blocks/zones supported"
 msgstr "S�lo se da soporte a bloques o zonas de 1k"
 
-#: disk-utils/fsck.minix.c:582
+#: disk-utils/fsck.minix.c:584
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Campo s_imap_blocks incorrecto en superbloque"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:586
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Campo s_zmap_blocks incorrecto en superbloque"
 
-#: disk-utils/fsck.minix.c:591
+#: disk-utils/fsck.minix.c:593
 msgid "Unable to allocate buffer for inode map"
 msgstr "No es posible asignar b�fer para mapa de inodos"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inodes"
 msgstr "No es posible asignar b�fer para inodos"
 
-#: disk-utils/fsck.minix.c:602
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for inode count"
 msgstr "No es posible asignar b�fer para n�mero de inodos"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:607
 msgid "Unable to allocate buffer for zone count"
 msgstr "No es posible asignar b�fer para n�mero de zonas"
 
-#: disk-utils/fsck.minix.c:607
+#: disk-utils/fsck.minix.c:609
 msgid "Unable to read inode map"
 msgstr "No es posible leer mapa de inodos"
 
-#: disk-utils/fsck.minix.c:609
+#: disk-utils/fsck.minix.c:611
 msgid "Unable to read zone map"
 msgstr "No es posible leer mapa de zonas"
 
-#: disk-utils/fsck.minix.c:611
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to read inodes"
 msgstr "No es posible leer inodos"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:615
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Advertencia: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:532
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodos\n"
 
-#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:533
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld bloques\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primera zona de datos=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tama�o de zona=%d\n"
 
-#: disk-utils/fsck.minix.c:622
+#: disk-utils/fsck.minix.c:624
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Tama�o m�ximo=%ld\n"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:625
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estado del sistema de archivos=%d\n"
 
-#: disk-utils/fsck.minix.c:624
+#: disk-utils/fsck.minix.c:626
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -960,166 +977,166 @@ msgstr ""
 "Longitud de nombre=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:690
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
 msgid "Inode %d marked not used, but used for file '"
 msgstr ""
 "El inodo %d se ha marcado como no utilizado, pero se utiliza para el archivo "
 "'"
 
-#: disk-utils/fsck.minix.c:643 disk-utils/fsck.minix.c:694
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
 msgstr "Marcar en uso"
 
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:714
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
 msgstr " tiene el modo %05o\n"
 
-#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
 msgid "Warning: inode count too big.\n"
 msgstr "Advertencia: n�mero de inodos demasiado elevado.\n"
 
-#: disk-utils/fsck.minix.c:732
+#: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
 msgstr "El inodo ra�z no es un directorio"
 
-#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:789
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
 msgid "Block has been used before. Now in file `"
 msgstr "El bloque ya se ha utilizado anteriormente. Ahora en archivo `"
 
-#: disk-utils/fsck.minix.c:758 disk-utils/fsck.minix.c:792
-#: disk-utils/fsck.minix.c:1120 disk-utils/fsck.minix.c:1129
-#: disk-utils/fsck.minix.c:1173 disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
 msgid "Clear"
 msgstr "Borrar"
 
-#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:801
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
 msgstr "Bloque %d de archivo `"
 
-#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
 msgstr "' marcado como no utilizado."
 
-#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
 msgstr "Correcto"
 
-#: disk-utils/fsck.minix.c:954 disk-utils/fsck.minix.c:1018
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
 msgid " contains a bad inode number for file '"
 msgstr " contiene un n�mero de inodos incorrecto para archivo '"
 
-#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
 msgstr " Eliminar"
 
-#: disk-utils/fsck.minix.c:970 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
 msgid ": bad directory: '.' isn't first\n"
 msgstr ": directorio incorrecto: '.' no es el primero\n"
 
-#: disk-utils/fsck.minix.c:977 disk-utils/fsck.minix.c:1042
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
 msgid ": bad directory: '..' isn't second\n"
 msgstr ": directorio incorrecto: '..' no es el segundo\n"
 
-#: disk-utils/fsck.minix.c:1074
+#: disk-utils/fsck.minix.c:1070
 msgid "internal error"
 msgstr "Error interno"
 
-#: disk-utils/fsck.minix.c:1077
+#: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
 msgstr ": directorio incorrecto: tama�o < 32"
 
-#: disk-utils/fsck.minix.c:1096
+#: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
 msgstr ": directorio incorrecto: tama�o < 32"
 
-#: disk-utils/fsck.minix.c:1109
+#: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
 msgstr "Error de b�squeda en bad_zone"
 
-#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1172
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "No se ha borrado el modo del inodo %d."
 
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "El inodo %d no est� en uso; marcado como en uso en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1187
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "El inodo %d est� en uso; marcado como no en uso en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1140 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inodo %d (modo = %07o), i_nlinks=%d, contados=%d."
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 msgid "Set i_nlinks to count"
 msgstr "Establecer i_nlinks en n�mero contado"
 
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zona %d: marcada como en uso; ning�n archivo la utiliza."
 
-#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1207
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Eliminar marca"
 
-#: disk-utils/fsck.minix.c:1159 disk-utils/fsck.minix.c:1211
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
 #, c-format
 msgid "Zone %d: %sin use, counted=%d\n"
 msgstr "Zona %d: %sen uso, contados=%d\n"
 
-#: disk-utils/fsck.minix.c:1160 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
 msgstr "no "
 
-#: disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1182
 msgid "Set"
 msgstr "Establecer"
 
-#: disk-utils/fsck.minix.c:1260 disk-utils/mkfs.minix.c:655
-#: disk-utils/mkfs.minix.c:658
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
 msgid "bad inode size"
 msgstr "tama�o de inodo incorrecto"
 
-#: disk-utils/fsck.minix.c:1263
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "tama�o de inodo v2 incorrecto"
 
-#: disk-utils/fsck.minix.c:1289
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "Se necesita terminal para reparaciones interactivas"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "No es posible abrir '%s'"
 
-#: disk-utils/fsck.minix.c:1308
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s est� limpio; no se comprueba.\n"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forzando comprobaci�n de sistema de archivos en %s.\n"
 
-#: disk-utils/fsck.minix.c:1314
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 "El sistema de archivos en %s contiene elementos extra�os; debe comprobarse.\n"
 
-#: disk-utils/fsck.minix.c:1343
+#: disk-utils/fsck.minix.c:1336
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
@@ -1127,12 +1144,12 @@ msgstr ""
 "\n"
 "%6ld inodos utilizados (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zonas utilizadas (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1350
-#, c-format
+#: disk-utils/fsck.minix.c:1343
+#, c-format, ycp-format
 msgid ""
 "\n"
 "%6d regular files\n"
@@ -1154,7 +1171,7 @@ msgstr ""
 "------\n"
 "%6d archivos\n"
 
-#: disk-utils/fsck.minix.c:1363
+#: disk-utils/fsck.minix.c:1356
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -1168,8 +1185,8 @@ msgstr ""
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Uso: mkfs [-V] [-t tipo_sa] [opciones_sa] dispositivo [tama�o]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: No queda memoria\n"
@@ -1179,63 +1196,63 @@ msgstr "%s: No queda memoria\n"
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versi�n %s (%s)\n"
 
-#: disk-utils/mkfs.minix.c:185
+#: disk-utils/mkfs.minix.c:179
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c | -l nombrearchivo] [-nXX] [-iXX] /dev/nombre [bloques]\n"
 
-#: disk-utils/mkfs.minix.c:209
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s est� montado; no se crear� un sistema de archivos aqu�"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
 msgstr "Error de b�squeda de bloque de inicio en write_tables"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
 msgstr "No es posible borrar el sector de inicio"
 
-#: disk-utils/mkfs.minix.c:274
+#: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
 msgstr "Error de b�squeda en write_tables"
 
-#: disk-utils/mkfs.minix.c:278
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
 msgstr "No es posible escribir el mapa de inodos"
 
-#: disk-utils/mkfs.minix.c:280
+#: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
 msgstr "No es posible escribir el mapa de zonas"
 
-#: disk-utils/mkfs.minix.c:282
+#: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
 msgstr "No es posible escribir inodos"
 
-#: disk-utils/mkfs.minix.c:291
+#: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
 msgstr "Error de escritura en write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:299 disk-utils/mkfs.minix.c:373
-#: disk-utils/mkfs.minix.c:424
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
 msgid "too many bad blocks"
 msgstr "Hay demasiados bloques incorrectos"
 
-#: disk-utils/mkfs.minix.c:307
+#: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
 msgstr "No hay suficientes bloques correctos"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
 msgstr "No es posible asignar b�feres para mapas"
 
-#: disk-utils/mkfs.minix.c:530
+#: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
 msgstr "No es posible asignar b�fer para inodos"
 
-#: disk-utils/mkfs.minix.c:536
+#: disk-utils/mkfs.minix.c:528
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1244,137 +1261,137 @@ msgstr ""
 "Tama�o m�ximo=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:550
+#: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
 msgstr "Error de b�squeda durante comprobaci�n de bloques"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:550
 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:589 disk-utils/mkswap.c:261
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
 msgid "seek failed in check_blocks"
 msgstr "Error de b�squeda en check_blocks"
 
-#: disk-utils/mkfs.minix.c:598
+#: disk-utils/mkfs.minix.c:590
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 "Bloques incorrectos antes de �rea de datos: no es posible crear el sistema "
 "de archivos"
 
-#: disk-utils/mkfs.minix.c:604 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d bloques incorrectos\n"
 
-#: disk-utils/mkfs.minix.c:606 disk-utils/mkfs.minix.c:628
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
 msgstr "Un bloque incorrecto\n"
 
-#: disk-utils/mkfs.minix.c:618
+#: disk-utils/mkfs.minix.c:608
 msgid "can't open file of bad blocks"
 msgstr "No es posible abrir el archivo de bloques incorrectos"
 
-#: disk-utils/mkfs.minix.c:687
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
 msgstr "%s: no se ha compilado con soporte para minix v2\n"
 
-#: disk-utils/mkfs.minix.c:703
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "error de strtol: no se ha especificado el n�mero de bloques"
 
-#: disk-utils/mkfs.minix.c:735
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
 msgstr "No es posible abrir %s"
 
-#: disk-utils/mkfs.minix.c:737
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
 msgstr "No es posible ejecutar stat para %s"
 
-#: disk-utils/mkfs.minix.c:741
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "No se intentar� crear el sistema de archivos en '%s'"
 
-#: disk-utils/mkswap.c:117
+#: disk-utils/mkswap.c:174
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "El tama�o de p�gina %d especificado por el usuario es incorrecto\n"
 
-#: disk-utils/mkswap.c:126
+#: disk-utils/mkswap.c:183
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Se utiliza el tama�o de p�gina %d especificado por el usuario, en lugar de "
 "los valores del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:130
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Presuponiendo p�ginas de tama�o %d (no %d)\n"
 
-#: disk-utils/mkswap.c:215
+#: disk-utils/mkswap.c:312
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/nombre [bloques]\n"
 
-#: disk-utils/mkswap.c:238
+#: disk-utils/mkswap.c:335
 msgid "too many bad pages"
 msgstr "Hay demasiadas p�ginas incorrectas"
 
-#: disk-utils/mkswap.c:252 misc-utils/look.c:170 misc-utils/setterm.c:1100
-#: text-utils/more.c:1863 text-utils/more.c:1874
+#: disk-utils/mkswap.c:349 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1851 text-utils/more.c:1862
 msgid "Out of memory"
 msgstr "No queda memoria"
 
-#: disk-utils/mkswap.c:269
+#: disk-utils/mkswap.c:366
 msgid "one bad page\n"
 msgstr "Una p�gina incorrecta\n"
 
-#: disk-utils/mkswap.c:271
+#: disk-utils/mkswap.c:368
 #, c-format
 msgid "%d bad pages\n"
 msgstr "%d p�ginas incorrectas\n"
 
-#: disk-utils/mkswap.c:391
+#: disk-utils/mkswap.c:488
 #, 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:409
+#: disk-utils/mkswap.c:506
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
 msgstr "%s: error: el tama�o %ld es superior al tama�o de dispositivo %d\n"
 
-#: disk-utils/mkswap.c:427
+#: disk-utils/mkswap.c:525
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: error: versi�n desconocida %d\n"
 
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:531
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: error: el �rea de intercambio debe tener como m�nimo %ldkB\n"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:550
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: advertencia: el �rea de intercambio se trunca en %ldkB\n"
 
-#: disk-utils/mkswap.c:464
+#: disk-utils/mkswap.c:562
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "No se intentar� crear el dispositivo de intercambio en '%s'"
 
-#: disk-utils/mkswap.c:473 disk-utils/mkswap.c:494
+#: disk-utils/mkswap.c:571 disk-utils/mkswap.c:592
 msgid "fatal: first page unreadable"
 msgstr "muy grave: no es posible leer la primera p�gina"
 
-#: disk-utils/mkswap.c:479
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1389,24 +1406,24 @@ msgstr ""
 "espacio de intercambio swap v0 en dicho dispositivo, \n"
 "utilice la opci�n -f para forzar la operaci�n.\n"
 
-#: disk-utils/mkswap.c:503
+#: disk-utils/mkswap.c:601
 msgid "Unable to set up swap-space: unreadable"
 msgstr "No es posible configurar el espacio de intercambio: no se puede leer"
 
-#: disk-utils/mkswap.c:504
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "Setting up swapspace version %d, size = %ld bytes\n"
 msgstr "Configurando espacio de intercambio versi�n %d, tama�o = %ld bytes\n"
 
-#: disk-utils/mkswap.c:510
+#: disk-utils/mkswap.c:608
 msgid "unable to rewind swap-device"
 msgstr "No es posible rebobinar el dispositivo de intercambio"
 
-#: disk-utils/mkswap.c:513
+#: disk-utils/mkswap.c:611
 msgid "unable to write signature page"
 msgstr "No es posible escribir p�gina de signatura"
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:619
 msgid "fsync failed"
 msgstr "fsync ha fallado"
 
@@ -1448,46 +1465,46 @@ msgstr "       %s [ -c | -y | -n | -d ] dispositivo\n"
 msgid "       %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] dispositivo\n"
 
-#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
 msgid "Unusable"
 msgstr "Inutilizable"
 
-#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
 msgid "Free Space"
 msgstr "Espacio libre"
 
-#: fdisk/cfdisk.c:399
+#: fdisk/cfdisk.c:398
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:403
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:405
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:410
+#: fdisk/cfdisk.c:409
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:420
 msgid "Disk has been changed.\n"
 msgstr "Se ha modificado el disco.\n"
 
-#: fdisk/cfdisk.c:422
+#: fdisk/cfdisk.c:421
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Reinicie el sistema para asegurarse de que la tabla de particiones est� bien "
 "actualizada.\n"
 
-#: fdisk/cfdisk.c:425
+#: fdisk/cfdisk.c:424
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1499,23 +1516,23 @@ msgstr ""
 "particiones DOS 6.x, consulte la p�gina man de cfdisk\n"
 "para obtener m�s informaci�n.\n"
 
-#: fdisk/cfdisk.c:520
+#: fdisk/cfdisk.c:519
 msgid "FATAL ERROR"
 msgstr "ERROR MUY GRAVE"
 
-#: fdisk/cfdisk.c:529
+#: fdisk/cfdisk.c:528
 msgid "Press any key to exit cfdisk"
 msgstr "Presione una tecla para salir de cfdisk"
 
-#: fdisk/cfdisk.c:565 fdisk/cfdisk.c:573
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
 msgid "Cannot seek on disk drive"
 msgstr "No es posible buscar en unidad de disco"
 
-#: fdisk/cfdisk.c:567
+#: fdisk/cfdisk.c:566
 msgid "Cannot read disk drive"
 msgstr "No es posible leer unidad de disco"
 
-#: fdisk/cfdisk.c:575
+#: fdisk/cfdisk.c:574
 msgid "Cannot write disk drive"
 msgstr "No es posible escribir en unidad de disco"
 
@@ -1672,8 +1689,8 @@ msgstr "Advertencia: esta operaci�n puede destruir datos del disco"
 #: fdisk/cfdisk.c:1702
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
-"�Est� seguro de que desea escribir la tabla de particiones en el disco? "
-"(si o no): "
+"�Est� seguro de que desea escribir la tabla de particiones en el disco? (si "
+"o no): "
 
 #: fdisk/cfdisk.c:1708
 msgid "no"
@@ -1756,8 +1773,8 @@ msgstr "   L�gica"
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1071 fdisk/fdisk.c:1220
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1213 fdisk/fdisk.c:1437
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1996,8 +2013,8 @@ msgstr "Nota: todos los comandos pueden escribirse en may�sculas o min�sculas"
 msgid "case letters (except for Writes)."
 msgstr "(salvo W para operaciones de escritura)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:305
-#: fdisk/fdisksunlabel.c:307
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindros"
 
@@ -2005,7 +2022,7 @@ msgstr "Cilindros"
 msgid "Change cylinder geometry"
 msgstr "Cambiar geometr�a de cilindros"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Cabezales"
 
@@ -2253,7 +2270,8 @@ msgid "Illegal command"
 msgstr "Comando no permitido"
 
 #: fdisk/cfdisk.c:2718
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+#, fuzzy
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
@@ -2293,7 +2311,7 @@ msgstr ""
 "                el n�mero de cabezales y el n�mero de sectores por pista.\n"
 "\n"
 
-#: fdisk/fdisk.c:246
+#: fdisk/fdisk.c:204
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2314,7 +2332,7 @@ msgstr ""
 "-u: Obtener Principio y Final en sectores (en lugar de cilindros)\n"
 "-b 2048: (Para algunas unidades MO) Utilizar sectores de 2048 bytes\n"
 
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:216
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2330,213 +2348,223 @@ msgstr ""
 "  o:  fdisk /dev/rd/c0d0  o fdisk /dev/ida/c0d0  (para dispositivos RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:224
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "No es posible abrir %s\n"
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "No es posible leer %s\n"
 
-#: fdisk/fdisk.c:272
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "No es posible buscar en %s\n"
 
-#: fdisk/fdisk.c:275
+#: fdisk/fdisk.c:233
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "No es posible escribir %s\n"
 
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:236
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE ha fallado en %s\n"
 
-#: fdisk/fdisk.c:282
+#: fdisk/fdisk.c:240
 msgid "Unable to allocate any more memory\n"
 msgstr "No es posible asignar m�s memoria\n"
 
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:242
 msgid "Fatal error\n"
 msgstr "Error muy grave\n"
 
-#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:332 fdisk/fdisk.c:339
-#: fdisk/fdisk.c:362 fdisk/fdisk.c:380 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:348 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:378 fdisk/fdisk.c:396 fdisk/fdisk.c:412 fdisk/fdisk.c:428
+#: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
 msgstr "Acci�n del comando"
 
-#: fdisk/fdisk.c:296
+#: fdisk/fdisk.c:312
 msgid "   a   toggle a read only flag"
 msgstr "   a   Conmutar un indicador de s�lo lectura"
 
 #. sun
-#: fdisk/fdisk.c:297 fdisk/fdisk.c:341
+#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
 msgid "   b   edit bsd disklabel"
 msgstr "   b   Modificar etiqueta de disco bsd"
 
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:314
 msgid "   c   toggle the mountable flag"
 msgstr "   c   Conmutar indicador de montable"
 
 #. sun
-#: fdisk/fdisk.c:299 fdisk/fdisk.c:318 fdisk/fdisk.c:343
+#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
 msgid "   d   delete a partition"
 msgstr "   d   Suprimir una partici�n"
 
-#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
 msgid "   l   list known partition types"
 msgstr "   l   Listar tipos de particiones conocidos"
 
 #. sun
-#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:333 fdisk/fdisk.c:345
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:387 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:349 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   Imprimir este men�"
 
-#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
 msgid "   n   add a new partition"
 msgstr "   n   Agregar una nueva partici�n"
 
-#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:334 fdisk/fdisk.c:347
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Crear una nueva tabla de particiones DOS vac�a"
 
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:348 fdisk/fdisk.c:371
-#: fdisk/fdisk.c:388
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
 msgid "   p   print the partition table"
 msgstr "   p   Imprimir la tabla de particiones"
 
-#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:335 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:372 fdisk/fdisk.c:389 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:351 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr "   q   Salir sin guardar los cambios"
 
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Crear una nueva etiqueta de disco Sun"
 
 #. sun
-#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   t   change a partition's system id"
 msgstr "   t   Cambiar el identificador de sistema de una partici�n"
 
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
 msgid "   u   change display/entry units"
 msgstr "   u   Cambiar las unidades de visualizaci�n/entrada"
 
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:392
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   v   verify the partition table"
 msgstr "   v   Verificar la tabla de particiones"
 
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   w   write table to disk and exit"
 msgstr "   w   Escribir la tabla en el disco y salir"
 
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Funciones adicionales (s�lo usuarios avanzados)"
 
-#: fdisk/fdisk.c:315
+#: fdisk/fdisk.c:331
 msgid "   a   select bootable partition"
 msgstr "   a   Seleccionar partici�n iniciable"
 
 #. sgi flavour
-#: fdisk/fdisk.c:316
+#: fdisk/fdisk.c:332
 msgid "   b   edit bootfile entry"
 msgstr "   b   Modificar entrada de archivo de inicio"
 
 #. sgi
-#: fdisk/fdisk.c:317
+#: fdisk/fdisk.c:333
 msgid "   c   select sgi swap partition"
 msgstr "   c   Seleccionar partici�n de intercambio sgi"
 
-#: fdisk/fdisk.c:340
+#: fdisk/fdisk.c:356
 msgid "   a   toggle a bootable flag"
 msgstr "   a   Conmutar un indicador de iniciable"
 
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:358
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   Conmutar el indicador de compatibilidad con DOS"
 
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:379
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Cambiar el n�mero de cilindros alternativos"
 
 #. sun
-#: fdisk/fdisk.c:364 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
 msgid "   c   change number of cylinders"
 msgstr "   c   Cambiar el n�mero de cilindros"
 
-#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Imprimir los datos en bruto en la tabla de particiones"
 
-#: fdisk/fdisk.c:366
+#: fdisk/fdisk.c:382
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Cambiar el n�mero de sectores adicionales por cilindro"
 
 #. sun
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
 msgid "   h   change number of heads"
 msgstr "   h   Cambiar el n�mero de cabezales"
 
-#: fdisk/fdisk.c:368
+#: fdisk/fdisk.c:384
 msgid "   i   change interleave factor"
 msgstr "   i   Cambiar factor de interleave"
 
 #. sun
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:385
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Cambiar velocidad de rotaci�n (r.p.m.)"
 
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   Volver al men� principal"
 
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   s   change number of sectors/track"
 msgstr "   s   Cambiar el n�mero de sectores por pista"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:393
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Cambiar el n�mero de cilindros f�sicos"
 
-#: fdisk/fdisk.c:381
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   Desplazarse al principio de los datos de una partici�n"
 
-#: fdisk/fdisk.c:384
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
 msgid "   e   list extended partitions"
 msgstr "   e   Listar particiones ampliadas"
 
 #. !sun
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
 msgid "   g   create an IRIX partition table"
 msgstr "   g   Crear una tabla de particiones IRIX"
 
-#: fdisk/fdisk.c:481
+#. !sun
+#: fdisk/fdisk.c:433
+#, fuzzy
+msgid "   f   fix partition order"
+msgstr "   p   Imprimir la tabla de particiones"
+
+#: fdisk/fdisk.c:532
 msgid "You must set"
 msgstr "Debe establecer"
 
-#: fdisk/fdisk.c:495
+#: fdisk/fdisk.c:546
 msgid "heads"
 msgstr "cabezales"
 
-#: fdisk/fdisk.c:497 fdisk/fdisk.c:905 fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:548 fdisk/fdisk.c:1046 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sectores"
 
-#: fdisk/fdisk.c:499 fdisk/fdisk.c:905 fdisk/fdiskbsdlabel.c:444
-#: fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:550 fdisk/fdisk.c:1046 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cilindros"
 
-#: fdisk/fdisk.c:503
+#: fdisk/fdisk.c:554
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2545,32 +2573,32 @@ msgstr ""
 "%s%s.\n"
 "Puede efectuar esta operaci�n desde el men� de funciones adicionales.\n"
 
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:555
 msgid " and "
 msgstr " y "
 
-#: fdisk/fdisk.c:538
+#: fdisk/fdisk.c:595
 msgid "Bad offset in primary extended partition\n"
 msgstr "Desplazamiento incorrecto en particiones ampliadas primarias\n"
 
-#: fdisk/fdisk.c:545
+#: fdisk/fdisk.c:609
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Advertencia: se est�n suprimiendo las particiones despu�s de %d\n"
 
-#: fdisk/fdisk.c:566
+#: fdisk/fdisk.c:625
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Advertencia: puntero de enlace adicional en tabla de particiones %d\n"
 
-#: fdisk/fdisk.c:574
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Advertencia: no se tienen en cuenta los datos adicionales de la tabla de "
 "particiones %d\n"
 
-#: fdisk/fdisk.c:600
+#: fdisk/fdisk.c:677
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -2582,33 +2610,34 @@ msgstr ""
 "operaci�n, el contenido anterior no se podr� recuperar.\n"
 "\n"
 
-#: fdisk/fdisk.c:636
-msgid "You will not be able to write the partition table.\n"
-msgstr "No podr� escribir la tabla de particiones.\n"
-
-#: fdisk/fdisk.c:645
+#: fdisk/fdisk.c:701
 #, 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:693
+#: fdisk/fdisk.c:783
+msgid "You will not be able to write the partition table.\n"
+msgstr "No podr� escribir la tabla de particiones.\n"
+
+#: fdisk/fdisk.c:811
+#, fuzzy
 msgid ""
-"Device contains neither a valid DOS partition table, nor Sun or SGI "
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 "El dispositivo no contiene una tabla de particiones DOS v�lida ni una "
 "etiqueta de disco Sun o SGI\n"
 
-#: fdisk/fdisk.c:709
+#: fdisk/fdisk.c:827
 msgid "Internal error\n"
 msgstr "Error interno\n"
 
-#: fdisk/fdisk.c:719
+#: fdisk/fdisk.c:849
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "No se tiene en cuenta la partici�n ampliada adicional %d\n"
 
-#: fdisk/fdisk.c:726
+#: fdisk/fdisk.c:861
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2617,7 +2646,7 @@ msgstr ""
 "Advertencia: el indicador 0x%04x no v�lido de la tabla de particiones %d se "
 "corregir� mediante w(rite)\n"
 
-#: fdisk/fdisk.c:747
+#: fdisk/fdisk.c:883
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2625,65 +2654,65 @@ msgstr ""
 "\n"
 "se ha detectado EOF tres veces - saliendo...\n"
 
-#: fdisk/fdisk.c:784
+#: fdisk/fdisk.c:921
 msgid "Hex code (type L to list codes): "
 msgstr "C�digo hexadecimal (escriba L para ver los c�digos): "
 
-#: fdisk/fdisk.c:823
+#: fdisk/fdisk.c:960
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, valor predeterminado %d): "
 
-#: fdisk/fdisk.c:877
+#: fdisk/fdisk.c:1014
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Se est� utilizando el valor predeterminado %d\n"
 
-#: fdisk/fdisk.c:881
+#: fdisk/fdisk.c:1018
 msgid "Value out of range.\n"
 msgstr "El valor est� fuera del rango.\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:1028
 msgid "Partition number"
 msgstr "N�mero de partici�n"
 
-#: fdisk/fdisk.c:896
+#: fdisk/fdisk.c:1037
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Advertencia: la partici�n %d es de tipo vac�o\n"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1044
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1044
 msgid "sector"
 msgstr "sector"
 
-#: fdisk/fdisk.c:912
+#: fdisk/fdisk.c:1053
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Se cambian las unidades de visualizaci�n/entrada a %s\n"
 
-#: fdisk/fdisk.c:922
+#: fdisk/fdisk.c:1064
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ADVERTENCIA: la partici�n %d es una partici�n ampliada\n"
 
-#: fdisk/fdisk.c:935
+#: fdisk/fdisk.c:1075
 msgid "DOS Compatibility flag is set\n"
 msgstr "El indicador de compatibilidad con DOS est� establecido\n"
 
-#: fdisk/fdisk.c:939
+#: fdisk/fdisk.c:1079
 msgid "DOS Compatibility flag is not set\n"
 msgstr "El indicador de compatibilidad con DOS no est� establecido\n"
 
-#: fdisk/fdisk.c:1025
+#: fdisk/fdisk.c:1167
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partici�n %d todav�a no existe\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1172
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2695,7 +2724,7 @@ msgstr ""
 "tener particiones de tipo 0. Puede suprimir una\n"
 "partici�n con el comando `d'.\n"
 
-#: fdisk/fdisk.c:1039
+#: fdisk/fdisk.c:1181
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2703,7 +2732,7 @@ msgstr ""
 "No puede convertir una partici�n en ampliada ni viceversa.\n"
 "Primero debe suprimirla.\n"
 
-#: fdisk/fdisk.c:1048
+#: fdisk/fdisk.c:1190
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2713,7 +2742,7 @@ msgstr ""
 "ya que as� lo prev� SunOS/Solaris e incluso es adecuado para Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1196
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2723,53 +2752,53 @@ msgstr ""
 "y la partici�n 11 como volumen completo (6) ya que IRIX as� lo espera.\n"
 "\n"
 
-#: fdisk/fdisk.c:1068
+#: fdisk/fdisk.c:1210
 #, 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:1121
+#: fdisk/fdisk.c:1261
 #, 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:1123 fdisk/fdisk.c:1131 fdisk/fdisk.c:1140 fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1263 fdisk/fdisk.c:1271 fdisk/fdisk.c:1280 fdisk/fdisk.c:1289
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr " f�sicos=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132
+#: fdisk/fdisk.c:1264 fdisk/fdisk.c:1272
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "l�gicos=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1129
+#: fdisk/fdisk.c:1269
 #, 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:1138
+#: fdisk/fdisk.c:1278
 #, 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:1141
+#: fdisk/fdisk.c:1281
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "debe ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1147
+#: fdisk/fdisk.c:1287
 #, c-format
 msgid "Partition %i does not end on cylinder boundary:\n"
 msgstr "La partici�n %i no termina en el l�mite del cilindro:\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1290
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "debe ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1157
+#: fdisk/fdisk.c:1297
 #, c-format
 msgid ""
 "\n"
@@ -2782,18 +2811,29 @@ msgstr ""
 "Unidades = %s de %d * %d bytes\n"
 "\n"
 
-#. FIXME! let's see how this shows up with other languagues
-#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1342
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1408
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Inicio  Principio   Fin    Bloques  Id  Sistema\n"
 
-#: fdisk/fdisk.c:1195 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1409 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1235
+#: fdisk/fdisk.c:1446
+#, fuzzy
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr "Las particiones l�gicas no est�n en orden de disco"
+
+#: fdisk/fdisk.c:1456
 #, c-format
 msgid ""
 "\n"
@@ -2804,106 +2844,106 @@ msgstr ""
 "Disco %s: %d cabezales, %d sectores, %d cilindros\n"
 "\n"
 
-#: fdisk/fdisk.c:1237
+#: fdisk/fdisk.c:1458
 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:1276
+#: fdisk/fdisk.c:1502
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Advertencia: la partici�n %d contiene el sector 0\n"
 
-#: fdisk/fdisk.c:1279
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partici�n %d: el cabezal %d supera el m�ximo %d\n"
 
-#: fdisk/fdisk.c:1282
+#: fdisk/fdisk.c:1508
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partici�n %d: el sector %d supera el m�ximo %d\n"
 
-#: fdisk/fdisk.c:1285
+#: fdisk/fdisk.c:1511
 #, 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:1289
+#: fdisk/fdisk.c:1515
 #, 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:1319
+#: fdisk/fdisk.c:1547
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Advertencia: inicio de datos incorrecto en partici�n %d\n"
 
-#: fdisk/fdisk.c:1327
+#: fdisk/fdisk.c:1555
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Advertencia: la partici�n %d se solapa con la partici�n %d.\n"
 
-#: fdisk/fdisk.c:1345
+#: fdisk/fdisk.c:1575
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Advertencia: la partici�n %d est� vac�a\n"
 
-#: fdisk/fdisk.c:1350
+#: fdisk/fdisk.c:1580
 #, 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:1356
+#: fdisk/fdisk.c:1586
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "El total de sectores asignados %d supera el m�ximo %d\n"
 
-#: fdisk/fdisk.c:1359
+#: fdisk/fdisk.c:1589
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d sectores no asignados\n"
 
-#: fdisk/fdisk.c:1371 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1602 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partici�n %d ya est� definida. Supr�mala antes de volver a agregarla.\n"
 
-#: fdisk/fdisk.c:1392 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
-#: fdisk/fdisksunlabel.c:494
+#: fdisk/fdisk.c:1623 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primer %s"
 
-#: fdisk/fdisk.c:1407 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1638 fdisk/fdisksunlabel.c:542
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ya est� asignado\n"
 
-#: fdisk/fdisk.c:1439
+#: fdisk/fdisk.c:1674
 msgid "No free sectors available\n"
 msgstr "No hay disponible ning�n sector libre\n"
 
-#: fdisk/fdisk.c:1449 fdisk/fdiskbsdlabel.c:259 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1682 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "�ltimo %s o +tama�o o +tama�oM o +tama�oK"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1715
 #, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
 msgstr "Advertencia: la partici�n %d tiene un n�mero de sectores impar.\n"
 
-#: fdisk/fdisk.c:1516 fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdisk.c:1755 fdisk/fdiskbsdlabel.c:611
 msgid "The maximum number of partitions has been created\n"
 msgstr "Se ha creado el n�mero m�ximo de particiones\n"
 
-#: fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1765
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Primero debe suprimir alguna partici�n y agregar una partici�n ampliada\n"
 
-#: fdisk/fdisk.c:1530
+#: fdisk/fdisk.c:1769
 #, c-format
 msgid ""
 "Command action\n"
@@ -2914,20 +2954,20 @@ msgstr ""
 "%s\n"
 "   p   Partici�n primaria (1-4)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1771
 msgid "l   logical (5 or over)"
 msgstr "l   Partici�n l�gica (5 o superior)"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1771
 msgid "e   extended"
 msgstr "e   Partici�n ampliada"
 
-#: fdisk/fdisk.c:1549
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "N�mero de partici�n no v�lido para el tipo `%c'\n"
 
-#: fdisk/fdisk.c:1581
+#: fdisk/fdisk.c:1823
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2935,11 +2975,11 @@ msgstr ""
 "Ya se ha modificado la tabla de particiones\n"
 "\n"
 
-#: fdisk/fdisk.c:1590
+#: fdisk/fdisk.c:1832
 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:1606
+#: fdisk/fdisk.c:1848
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2949,7 +2989,7 @@ msgstr ""
 "Reinicie el sistema para asegurarse de que la tabla de particiones se "
 "actualice.\n"
 
-#: fdisk/fdisk.c:1612
+#: fdisk/fdisk.c:1854
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2961,68 +3001,73 @@ msgstr ""
 "particiones DOS 6.x, consulte la p�gina man de fdisk\n"
 "para ver informaci�n adicional.\n"
 
-#: fdisk/fdisk.c:1619
+#: fdisk/fdisk.c:1861
 msgid "Syncing disks.\n"
 msgstr "Se est�n sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:1650
+#: fdisk/fdisk.c:1892
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
 
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1908
 #, 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:1671
+#: fdisk/fdisk.c:1913
 msgid "New beginning of data"
 msgstr "Nuevo principio de datos"
 
-#: fdisk/fdisk.c:1685
+#: fdisk/fdisk.c:1929
 msgid "Expert command (m for help): "
 msgstr "Comando avanzado (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:1696
+#: fdisk/fdisk.c:1942
 msgid "Number of cylinders"
 msgstr "N�mero de cilindros"
 
-#: fdisk/fdisk.c:1717
+#: fdisk/fdisk.c:1968
 msgid "Number of heads"
 msgstr "N�mero de cabezales"
 
-#: fdisk/fdisk.c:1742
+#: fdisk/fdisk.c:1993
 msgid "Number of sectors"
 msgstr "N�mero de sectores"
 
-#: fdisk/fdisk.c:1745
+#: fdisk/fdisk.c:1996
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Advertencia: estableciendo desplazamiento de sector para compatibilidad con "
 "DOS\n"
 
-#: fdisk/fdisk.c:1807
+#: fdisk/fdisk.c:2058
 #, 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:1821
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No es posible abrir %s\n"
 
-#: fdisk/fdisk.c:1838
+#: fdisk/fdisk.c:2089
 #, c-format
 msgid "cannot open %s\n"
 msgstr "No es posible abrir %s\n"
 
-#: fdisk/fdisk.c:1911
+#: fdisk/fdisk.c:2110
+#, fuzzy, c-format
+msgid "%c: unknown command\n"
+msgstr "%s: comando desconocido: %s\n"
+
+#: fdisk/fdisk.c:2161
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Este kernel encuentra el tama�o del sector por s� mismo; no se tiene en "
 "cuenta la opci�n -b\n"
 
-#: fdisk/fdisk.c:1914
+#: fdisk/fdisk.c:2164
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -3030,11 +3075,18 @@ msgstr ""
 "Advertencia: la opci�n -b (establecer tama�o de sector) debe utilizarse con "
 "un dispositivo especificado\n"
 
-#: fdisk/fdisk.c:1973
+#: fdisk/fdisk.c:2227
+#, c-format
+msgid ""
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:2236
 msgid "Command (m for help): "
 msgstr "Comando (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:1987
+#: fdisk/fdisk.c:2252
 #, c-format
 msgid ""
 "\n"
@@ -3043,15 +3095,15 @@ msgstr ""
 "\n"
 "El archivo de inicio actual es: %s\n"
 
-#: fdisk/fdisk.c:1989
+#: fdisk/fdisk.c:2254
 msgid "Please enter the name of the new boot file: "
 msgstr "Escriba el nombre del nuevo archivo de inicio: "
 
-#: fdisk/fdisk.c:1991
+#: fdisk/fdisk.c:2256
 msgid "Boot file unchanged\n"
 msgstr "No se ha modificado el archivo de inicio\n"
 
-#: fdisk/fdisk.c:2051
+#: fdisk/fdisk.c:2320
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3061,7 +3113,7 @@ msgstr ""
 "\tNo hay men� para usuarios avanzados para las tablas de particiones SGI.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:29
+#: fdisk/fdiskaixlabel.c:28
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3089,7 +3141,7 @@ msgstr ""
 "\t   el disco l�gicamente de la m�quina AIX.\n"
 "\t   (O se tendr� que convertir en un AIXperto)."
 
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:117
 #, c-format
 msgid ""
 "\n"
@@ -3098,164 +3150,169 @@ msgstr ""
 "\n"
 "Etiqueta BSD para dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:125
 msgid "   d   delete a BSD partition"
 msgstr "   d   Suprimir una partici�n BSD"
 
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
 msgstr "   e   Modificar datos de unidad"
 
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
 msgstr "   i   Instalar secuencia de inicio"
 
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
 msgstr "   l   Listar tipos de sistemas de archivos conocidos"
 
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   n   add a new BSD partition"
 msgstr "   n   Agregar una nueva partici�n BSD"
 
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   p   print BSD partition table"
 msgstr "   p   Imprimir tabla de particiones BSD"
 
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
 msgstr "   s   Mostrar etiqueta de disco completa"
 
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
 msgstr ""
 "   t   Cambiar el identificador de sistema de archivos de una partici�n"
 
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:136
+#, fuzzy
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   c   Cambiar el n�mero de cilindros"
+
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
 msgstr "   w   Escribir la etiqueta de disco en el disco"
 
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   Enlazar la partici�n BSD con una partici�n no BSD"
 
-#: fdisk/fdiskbsdlabel.c:146
-#, c-format
-msgid "Partition %s%d has invalid starting sector 0.\n"
+#: fdisk/fdiskbsdlabel.c:168
+#, fuzzy, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
 msgstr "La partici�n %s%d tiene un sector 0 de inicio no v�lido.\n"
 
-#: fdisk/fdiskbsdlabel.c:150
-#, c-format
-msgid "Reading disklabel of %s%d at sector %d.\n"
+#: fdisk/fdiskbsdlabel.c:172
+#, fuzzy, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
 msgstr "Leyendo etiqueta de disco de %s%d en sector %d.\n"
 
-#: fdisk/fdiskbsdlabel.c:159
+#: fdisk/fdiskbsdlabel.c:182
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
 msgstr "No hay ninguna partici�n *BSD en %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
 msgstr "Comando de etiqueta de disco BSD (m para obtener ayuda): "
 
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:310
 #, c-format
 msgid "type: %s\n"
 msgstr "tipo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:312
 #, c-format
 msgid "type: %d\n"
 msgstr "tipo: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:313
 #, c-format
 msgid "disk: %.*s\n"
 msgstr "disco: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:292
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
 msgstr "etiqueta: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:315
 msgid "flags:"
 msgstr "indicadores:"
 
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:317
 msgid " removable"
 msgstr " removable"
 
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
 msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:299
+#: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
 msgstr " badsect"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr "bytes por sector: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr "sectores por pista: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr "pistas por cilindro: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr "sectores por cilindro: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:329
 #, c-format
 msgid "cylinders: %ld\n"
 msgstr "cilindros: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
 msgstr "r.p.m.: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
 msgstr "interleave: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "trackskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "cylinderskew: %d\n"
 msgstr "cylinderskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr "headswitch: %ld\t\t# milisegundos\n"
 
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr "b�squeda pista a pista: %ld\t# milisegundos\n"
 
-#: fdisk/fdiskbsdlabel.c:314
+#: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
 msgstr "drivedata: "
 
-#: fdisk/fdiskbsdlabel.c:323
+#: fdisk/fdiskbsdlabel.c:347
 #, c-format
 msgid ""
 "\n"
@@ -3264,112 +3321,98 @@ msgstr ""
 "\n"
 "%d particiones:\n"
 
-#: fdisk/fdiskbsdlabel.c:324
-msgid "#        size   offset    fstype   [fsize bsize   cpg]\n"
+#: fdisk/fdiskbsdlabel.c:348
+#, fuzzy
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
 msgstr "#        size   offset    fstype   [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:380
-#, c-format
-msgid "Writing disklabel to %s%d.\n"
-msgstr "Escribiendo etiqueta de disco en %s%d.\n"
-
-#: fdisk/fdiskbsdlabel.c:383
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, c-format
 msgid "Writing disklabel to %s.\n"
 msgstr "Escribiendo etiqueta de disco en %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:395
-#, c-format
-msgid "%s%d contains no disklabel.\n"
-msgstr "%s%d no contiene ninguna etiqueta de disco.\n"
-
-#: fdisk/fdiskbsdlabel.c:398
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
 msgstr "%s no contiene ninguna etiqueta de disco.\n"
 
-#: fdisk/fdiskbsdlabel.c:402
+#: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
 msgstr "�Desea crear una etiqueta de disco? (y/n) "
 
-#: fdisk/fdiskbsdlabel.c:441
+#: fdisk/fdiskbsdlabel.c:458
 msgid "bytes/sector"
 msgstr "bytes/sector"
 
-#: fdisk/fdiskbsdlabel.c:442
+#: fdisk/fdiskbsdlabel.c:459
 msgid "sectors/track"
 msgstr "sectores/pista"
 
-#: fdisk/fdiskbsdlabel.c:443
+#: fdisk/fdiskbsdlabel.c:460
 msgid "tracks/cylinder"
 msgstr "pistas/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:451
+#: fdisk/fdiskbsdlabel.c:468
 msgid "sectors/cylinder"
 msgstr "sectores/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr "Debe ser <= sectores/pista * pistas/cilindro (valor predeterminado).\n"
 
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
 msgstr "r.p.m."
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
 msgstr "interleave"
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
 msgstr "trackskew"
 
-#: fdisk/fdiskbsdlabel.c:460
+#: fdisk/fdiskbsdlabel.c:477
 msgid "cylinderskew"
 msgstr "cylinderskew"
 
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
 msgstr "headswitch"
 
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
 msgstr "b�squeda pista a pista"
 
-#: fdisk/fdiskbsdlabel.c:503
+#: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "Secuencia de inicio: %sboot -> boot%s (%s): "
 
-#: fdisk/fdiskbsdlabel.c:529
+#: fdisk/fdiskbsdlabel.c:546
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr "Solapamientos de secuencia de inicio con etiqueta de disco\n"
 
-#: fdisk/fdiskbsdlabel.c:550
-#, c-format
-msgid "Bootstrap installed on %s%d.\n"
-msgstr "Secuencia de inicio instalada en %s%d.\n"
-
-#: fdisk/fdiskbsdlabel.c:552
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr "Secuencia de inicio instalada en %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:573
+#: fdisk/fdiskbsdlabel.c:591
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Partici�n (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:604
+#: fdisk/fdiskbsdlabel.c:622
 msgid "This partition already exists.\n"
 msgstr "Esta partici�n ya existe.\n"
 
-#: fdisk/fdiskbsdlabel.c:726
+#: fdisk/fdiskbsdlabel.c:742
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Advertencia: demasiadas particiones (%d, el valor m�ximo es %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:772
+#: fdisk/fdiskbsdlabel.c:789
 msgid ""
 "\n"
 "Syncing disks.\n"
@@ -3377,68 +3420,73 @@ msgstr ""
 "\n"
 "Se est�n sincronizando los discos.\n"
 
-#: fdisk/fdisksgilabel.c:56
+#: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:57
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:58
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:59
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:60
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:61
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:62
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:63
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:64
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:65
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:66
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:67
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xlvol"
 msgstr "SGI xlvol"
 
-#: fdisk/fdisksgilabel.c:68
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI rxlvol"
 msgstr "SGI rxlvol"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:143
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+#, fuzzy
+msgid "Linux LVM"
+msgstr "Linux"
+
+#: fdisk/fdisksgilabel.c:158
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3446,13 +3494,13 @@ msgstr ""
 "Seg�n MIPS Computer Systems, Inc. la etiqueta puede contener como m�ximo 512 "
 "bytes\n"
 
-#: fdisk/fdisksgilabel.c:162
+#: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco sgi con suma de comprobaci�n "
 "incorrecta.\n"
 
-#: fdisk/fdisksgilabel.c:186
+#: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
 "\n"
@@ -3471,7 +3519,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:199
+#: fdisk/fdisksgilabel.c:213
 #, c-format
 msgid ""
 "\n"
@@ -3484,7 +3532,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:205
+#: fdisk/fdisksgilabel.c:219
 #, c-format
 msgid ""
 "----- partitions -----\n"
@@ -3493,7 +3541,7 @@ msgstr ""
 "----- particiones -----\n"
 "%*s  Info      Principio   Fin   Sectores Id  Sistema\n"
 
-#: fdisk/fdisksgilabel.c:227
+#: fdisk/fdisksgilabel.c:241
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3504,12 +3552,12 @@ msgstr ""
 "Archivo de inicio: %s\n"
 "----- entradas de directorio -----\n"
 
-#: fdisk/fdisksgilabel.c:237
+#: fdisk/fdisksgilabel.c:251
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sector%5u tama�o%8u\n"
 
-#: fdisk/fdisksgilabel.c:298
+#: fdisk/fdisksgilabel.c:305
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3521,7 +3569,7 @@ msgstr ""
 "\tEl archivo de inicio debe ser un nombre de ruta absoluto\n"
 "\tdistinto de cero, como por ejemplo \"/unix\" o \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:312
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3529,7 +3577,7 @@ msgstr ""
 "\n"
 "\tNombre del archivo de inicio demasiado largo: 16 bytes como m�ximo.\n"
 
-#: fdisk/fdisksgilabel.c:310
+#: fdisk/fdisksgilabel.c:317
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3537,7 +3585,7 @@ msgstr ""
 "\n"
 "\tEl archivo de inicio debe tener un nombre de ruta totalmente calificado.\n"
 
-#: fdisk/fdisksgilabel.c:315
+#: fdisk/fdisksgilabel.c:322
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3548,7 +3596,7 @@ msgstr ""
 "\tEl valor predeterminado de SGI es \"/unix\" y para la copia de seguridad "
 "\"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:343
+#: fdisk/fdisksgilabel.c:350
 #, c-format
 msgid ""
 "\n"
@@ -3561,7 +3609,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:456 fdisk/fdisksunlabel.c:455
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:478
 msgid "No partitions defined\n"
 msgstr "No hay ninguna partici�n definida\n"
 
@@ -3661,26 +3709,26 @@ msgstr ""
 "partici�n.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:621
+#: fdisk/fdisksgilabel.c:607
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Se ha producido un solapamiento de partici�n en el disco.\n"
 
-#: fdisk/fdisksgilabel.c:691
+#: fdisk/fdisksgilabel.c:669
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr ""
 "Se est� intentando generar una entrada de disco completo autom�ticamente.\n"
 
-#: fdisk/fdisksgilabel.c:698
+#: fdisk/fdisksgilabel.c:676
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Ya existen particiones que abarcan el disco completo.\n"
 
-#: fdisk/fdisksgilabel.c:703
+#: fdisk/fdisksgilabel.c:681
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Se ha producido un solapamiento de particiones en el disco. Corr�jalo antes "
 "de continuar.\n"
 
-#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3688,22 +3736,23 @@ msgstr ""
 "Se recomienda que la partici�n 11\n"
 "abarque el disco completo y sea del tipo `SGI volume'\n"
 
-#: fdisk/fdisksgilabel.c:728
+#: fdisk/fdisksgilabel.c:706
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Se producir� un solapamiento de particiones en el disco. Corr�jalo antes de "
 "continuar.\n"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:711
 #, c-format
 msgid " Last %s"
 msgstr " �ltimo %s"
 
-#: fdisk/fdisksgilabel.c:756
+#: fdisk/fdisksgilabel.c:733
+#, fuzzy
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
-"content will be unrecoverable lost.\n"
+"content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
 "Se est� creando una nueva etiqueta de disco SGI. Los cambios s�lo\n"
@@ -3711,12 +3760,12 @@ msgstr ""
 "operaci�n, el contenido anterior se habr� perdido de forma irrecuperable.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:784
+#: fdisk/fdisksgilabel.c:761
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Intentando conservar los par�metros de la partici�n %d.\n"
 
-#: fdisk/fdisksgilabel.c:786
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tPRINCIPIO=%d\tLONGITUD=%d\n"
@@ -3753,7 +3802,7 @@ msgstr "SunOS var"
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:122
+#: fdisk/fdisksunlabel.c:129
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
@@ -3766,12 +3815,12 @@ msgstr ""
 "como cabezales, sectores, cilindros y particiones\n"
 "o forzar una nueva etiqueta (comando s en men� principal)\n"
 
-#: fdisk/fdisksunlabel.c:215
+#: fdisk/fdisksunlabel.c:228
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "La configuraci�n autom�tica ha encontrado %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:242
+#: fdisk/fdisksunlabel.c:255
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -3783,7 +3832,7 @@ msgstr ""
 "operaci�n, el contenido anterior no se podr� recuperar.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:253
+#: fdisk/fdisksunlabel.c:266
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3793,71 +3842,71 @@ msgstr ""
 "   ?   Con configuraci�n autom�tica\n"
 "   0   Personalizada (con valores predeterminados detectados por hardware)"
 
-#: fdisk/fdisksunlabel.c:263
+#: fdisk/fdisksunlabel.c:276
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Seleccionar tipo (? para autom�tico, 0 para personalizado): "
 
-#: fdisk/fdisksunlabel.c:275
+#: fdisk/fdisksunlabel.c:288
 msgid "Autoconfigure failed.\n"
 msgstr "Error de configuraci�n autom�tica.\n"
 
-#: fdisk/fdisksunlabel.c:303
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Sectores/pista"
 
-#: fdisk/fdisksunlabel.c:310
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:313
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Cilindros f�sicos"
 
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
 msgid "Rotation speed (rpm)"
 msgstr "Velocidad de rotaci�n (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
 msgid "Interleave factor"
 msgstr "Factor de interleave"
 
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
 msgid "Extra sectors per cylinder"
 msgstr "Sectores adicionales por cilindro"
 
-#: fdisk/fdisksunlabel.c:334
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Puede cambiar todos los par�metros de disco desde el men� x"
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "Disquete 3,5 pulg."
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:418
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partici�n %d no termina en un l�mite de cilindro\n"
 
-#: fdisk/fdisksunlabel.c:438
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partici�n %d se solapa con otras en los sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:460
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Espacio no utilizado - sectores 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espacio no utilizado - sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:512
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3865,7 +3914,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:547
+#: fdisk/fdisksunlabel.c:570
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3876,7 +3925,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:567
+#: fdisk/fdisksunlabel.c:590
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3885,7 +3934,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:580
+#: fdisk/fdisksunlabel.c:603
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3899,7 +3948,7 @@ msgstr ""
 "Escriba YES si est� seguro de que desea que la partici�n\n"
 "est� marcada con 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:634
 #, c-format
 msgid ""
 "\n"
@@ -3918,7 +3967,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:648
 #, c-format
 msgid ""
 "\n"
@@ -3931,16 +3980,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Indic.  Principio   Fin    Bloques  Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:655
+#: fdisk/fdisksunlabel.c:678
 msgid "Number of alternate cylinders"
 msgstr "N�mero de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:688
+#: fdisk/fdisksunlabel.c:711
 msgid "Number of physical cylinders"
 msgstr "N�mero de cilindros f�sicos"
 
@@ -4052,279 +4101,307 @@ msgid "NEC DOS"
 msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
 msgstr "PartitionMagic recovery"
 
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
 msgstr "Venix 80286"
 
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
 msgstr "PPC PReP Boot"
 
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:36
 msgid "SFS"
 msgstr "SFS"
 
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
 msgstr "QNX4.x"
 
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
 msgstr "QNX4.x segunda parte"
 
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
 msgstr "QNX4.x tercera parte"
 
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
 msgstr "OnTrack DM"
 
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
 #. (or Novell)
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
 #. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
 
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
 msgstr "OnTrackDM6"
 
-#: fdisk/i386_sys_types.c:44
+#: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
 msgstr "EZ-Drive"
 
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
 msgstr "Golden Bow"
 
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
-#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:82
+#: fdisk/i386_sys_types.c:85 fdisk/i386_sys_types.c:86
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD o SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
 
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
 msgstr "Novell Netware 386"
 
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
 msgstr "DiskSecure Multi-Boot"
 
-#: fdisk/i386_sys_types.c:52
+#: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
 msgstr "PC/IX"
 
-#: fdisk/i386_sys_types.c:53
+#: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
 msgstr "Old Minix"
 
 #. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / old Linux"
 
-#: fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Unidad C: oculta de OS/2"
 
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
 msgstr "Linux ampliado"
 
-#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
 msgstr "Conjunto de vol�menes NTFS"
 
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
 msgstr "Amoeba"
 
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
 #. (bad block table)
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:65
+#, fuzzy
+msgid "BSD/OS"
+msgstr "BSD/386"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
 msgstr "Hibernaci�n de IBM Thinkpad"
 
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
 msgstr "BSD/386"
 
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
 msgstr "NeXTSTEP"
 
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
 msgstr "BSDI fs"
 
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
 msgstr "BSDI swap"
 
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
 msgstr "DRDOS/sec (FAT-12)"
 
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr "DRDOS/sec (FAT-16 < 32M)"
 
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16)"
 msgstr "DRDOS/sec (FAT-16)"
 
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
 msgid "Syrinx"
 msgstr "Syrinx"
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:76
+msgid "Non-FS data"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:77
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:74
+#. CP/M or Concurrent CP/M or
+#. Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:79
 msgid "DOS access"
 msgstr "DOS access"
 
-#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:75
+#. DOS access or SpeedStor 12-bit FAT
+#. extended partition
+#: fdisk/i386_sys_types.c:81
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:77
+#. SpeedStor 16-bit FAT extended
+#. partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:84
 msgid "BeOS fs"
 msgstr "BeOS fs"
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:80
+#: fdisk/i386_sys_types.c:87
 msgid "DOS secondary"
 msgstr "DOS secondary"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:88
 msgid "Linux raid autodetect"
 msgstr "Linux raid autodetect"
 
-#. New (2.2.x) raid partition with autodetect
-#. using persistent superblock
-#: fdisk/i386_sys_types.c:83
+#. New (2.2.x) raid partition with
+#. autodetect using persistent
+#. superblock
+#: fdisk/i386_sys_types.c:91
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:92
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:147
+#: fdisk/sfdisk.c:152
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Error de b�squeda en %s; no se puede buscar en %lu\n"
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:157
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Error de b�squeda: se esperaba 0x%08x%08x, se ha obtenido 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:198
+#: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
 msgstr "No queda memoria; se abandona el intento\n"
 
-#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Error de lectura en %s; no se puede leer el sector %lu\n"
 
-#: fdisk/sfdisk.c:218
+#: fdisk/sfdisk.c:224
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERROR: el sector %lu no tiene una signatura msdos\n"
 
-#: fdisk/sfdisk.c:235
+#: fdisk/sfdisk.c:241
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Error de escritura en %s; no se puede escribir el sector %lu\n"
 
-#: fdisk/sfdisk.c:273
+#: fdisk/sfdisk.c:279
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "No es posible abrir el archivo de guardar sector de partici�n (%s)\n"
 
-#: fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:297
 #, c-format
 msgid "write error on %s\n"
 msgstr "Error de escritura en %s\n"
 
-#: fdisk/sfdisk.c:309
+#: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "No es posible ejecutar stat para archivo de restaurar partici�n (%s)\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:320
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "Tama�o incorrecto de archivo de restaurar partici�n; no se efect�a "
 "restauraci�n\n"
 
-#: fdisk/sfdisk.c:318
+#: fdisk/sfdisk.c:324
 msgid "out of memory?\n"
 msgstr "�No queda memoria?\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "No es posible abrir archivo de restaurar partici�n (%s)\n"
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:336
 #, c-format
 msgid "error reading %s\n"
 msgstr "Error al leer %s\n"
 
-#: fdisk/sfdisk.c:337
+#: fdisk/sfdisk.c:343
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "No es posible abrir el dispositivo %s para escribir\n"
 
-#: fdisk/sfdisk.c:349
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "Error al escribir el sector %lu en %s\n"
 
-#: fdisk/sfdisk.c:415
+#: fdisk/sfdisk.c:406
+#, fuzzy, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Disco %s: no es posible obtener la geometr�a\n"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Disco %s: no es posible obtener la geometr�a\n"
+
+#: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
 "Warning: start=%d - this looks like a partition rather than\n"
@@ -4335,27 +4412,22 @@ msgstr ""
 "disco entero. Usar fdisk con ella probablemente no tiene sentido.\n"
 "[Use la opci�n --force si realmente desea realizar esta operaci�n.]\n"
 
-#: fdisk/sfdisk.c:421
+#: fdisk/sfdisk.c:442
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
 msgstr "Advertencia: HDIO_GETGEO indica que hay %d cabezales\n"
 
-#: fdisk/sfdisk.c:424
+#: fdisk/sfdisk.c:445
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
 msgstr "Advertencia: HDIO_GETGEO indica que hay %d sectores\n"
 
-#: fdisk/sfdisk.c:427
-#, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
+#: fdisk/sfdisk.c:449
+#, fuzzy, c-format
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
 msgstr "Advertencia: HDIO_GETGEO indica que hay %d cilindros\n"
 
-#: fdisk/sfdisk.c:431
-#, c-format
-msgid "Disk %s: cannot get geometry\n"
-msgstr "Disco %s: no es posible obtener la geometr�a\n"
-
-#: fdisk/sfdisk.c:433
+#: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%d) - usually at most 63\n"
@@ -4364,7 +4436,7 @@ msgstr ""
 "Advertencia: n�mero improbable de sectores (%d); normalmente 63 como m�ximo\n"
 "Esto causar� problemas con el software que direccione con Cil./Cab./Sector\n"
 
-#: fdisk/sfdisk.c:437
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid ""
 "\n"
@@ -4373,7 +4445,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabezales, %lu sectores/pista\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:539
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
@@ -4381,7 +4453,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para cabezal: %d (debe estar "
 "entre 0 y %d)\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:544
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
@@ -4389,7 +4461,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para sector: %d (debe estar "
 "entre 1 y %d)\n"
 
-#: fdisk/sfdisk.c:527
+#: fdisk/sfdisk.c:549
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %d (should be in "
@@ -4398,7 +4470,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para cilindro: %d (debe estar "
 "entre 0 y %d)\n"
 
-#: fdisk/sfdisk.c:566
+#: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4406,11 +4478,11 @@ msgstr ""
 "Id  Nombre\n"
 "\n"
 
-#: fdisk/sfdisk.c:719
+#: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
 msgstr "Volviendo a leer la tabla de particiones...\n"
 
-#: fdisk/sfdisk.c:725
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4418,31 +4490,31 @@ msgstr ""
 "El comando para volver a leer la tabla de particiones ha fallado.\n"
 "Reinicie el sistema ahora, antes de utilizar mkfs.\n"
 
-#: fdisk/sfdisk.c:730
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Error al cerrar %s\n"
 
-#: fdisk/sfdisk.c:768
+#: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: esta partici�n no existe\n"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
 msgstr "Formato no reconocido; utilizando sectores\n"
 
-#: fdisk/sfdisk.c:830
+#: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabla de particiones de %s\n"
 
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato no implementado; utilizando %s\n"
 
-#: fdisk/sfdisk.c:845
+#: fdisk/sfdisk.c:867
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4451,11 +4523,11 @@ msgstr ""
 "Unidades = cilindros de %lu bytes, bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
 msgstr "   Disp.  Inic. Princ.   Fin   N�cil   N�bloq.   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:875
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4464,11 +4536,11 @@ msgstr ""
 "Unidades = sectores de 512 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:855
+#: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
 msgstr "   Disp.  Inicio  Principio   Fin  N� sect.  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4477,11 +4549,11 @@ msgstr ""
 "Unidades = bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:860
+#: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
 msgstr "   Disp.  Inic.  Principio   Fin   N�bloques Id  Sistema\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:885
 #, c-format
 msgid ""
 "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4490,34 +4562,34 @@ msgstr ""
 "Unidades = MB de 1048576 bytes, bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:865
+#: fdisk/sfdisk.c:887
 msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
 msgstr "   Disp.  Inic Princ.  Fin     MB   N�bloques Id  Sistema\n"
 
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1019
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tprincipio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1004
+#: fdisk/sfdisk.c:1026
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1007
+#: fdisk/sfdisk.c:1029
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partici�n termina en el cilindro %ld, m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1018
+#: fdisk/sfdisk.c:1040
 msgid "No partitions found\n"
 msgstr "No se ha encontrado ninguna partici�n\n"
 
-#: fdisk/sfdisk.c:1025
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid ""
 "Warning: The first partition looks like it was made\n"
@@ -4528,95 +4600,95 @@ msgstr ""
 "  para Cil./Cab./Sect.=*/%ld/%ld (en lugar de %ld/%ld/%ld).\n"
 "Para este listado se presupondr� esta geometr�a.\n"
 
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1097
 msgid "no partition table present.\n"
 msgstr "No existe ninguna tabla de particiones.\n"
 
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Extra�amente s�lo hay %d particiones definidas.\n"
 
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1108
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Advertencia: partici�n %s tiene tama�o 0 pero no est� marcada como vac�a\n"
 
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1111
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Advertencia: la partici�n %s tiene tama�o 0 y es iniciable\n"
 
-#: fdisk/sfdisk.c:1092
+#: fdisk/sfdisk.c:1114
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Advertencia: la partition %s tiene tama�o 0 y principio distinto de cero\n"
 
-#: fdisk/sfdisk.c:1103
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Advertencia: la partici�n %s "
 
-#: fdisk/sfdisk.c:1104
+#: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "no se encuentra dentro de la partici�n %s\n"
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Advertencia: las particiones %s "
 
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
 msgstr "y %s se solapan\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, c-format
 msgid "Warning: partition %s contains part of "
 msgstr "Advertencia: la partici�n %s contiene parte de "
 
-#: fdisk/sfdisk.c:1128
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "the partition table (sector %lu),\n"
 msgstr "la tabla de particiones (sector %lu),\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
 msgstr "y la destruir� al rellenarla\n"
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Advertencia: la partici�n %s empieza en el sector 0\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1164
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Advertencia: la partici�n %s finaliza m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1156
+#: fdisk/sfdisk.c:1178
 msgid "Among the primary partitions, at most one can be extended\n"
 msgstr "Como m�ximo una de las particiones primarias puede ser ampliada\n"
 
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
 msgstr " (aunque esto no supone un problema en Linux)\n"
 
-#: fdisk/sfdisk.c:1174
+#: fdisk/sfdisk.c:1196
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Advertencia: la partici�n %s no empieza en un l�mite de cilindro\n"
 
-#: fdisk/sfdisk.c:1180
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Advertencia: la partici�n %s no termina en un l�mite de cilindro\n"
 
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1220
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4626,7 +4698,7 @@ msgstr ""
 "Esto no es poblema para LILO, pero el MBR de DOS no se iniciar� con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4635,7 +4707,7 @@ msgstr ""
 "primarias.\n"
 "LILO no tiene en cuenta el indicador de iniciable.\n"
 
-#: fdisk/sfdisk.c:1211
+#: fdisk/sfdisk.c:1233
 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"
@@ -4645,7 +4717,7 @@ msgstr ""
 "Esto no es problema para LILO, pero el MBR de DOS no iniciar� con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1228
+#: fdisk/sfdisk.c:1250
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4653,145 +4725,163 @@ msgstr ""
 "Partici�n %s: principio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1237
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partici�n %s: fin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1240
+#: fdisk/sfdisk.c:1262
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partici�n %s termina en el cilindro %ld, m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#: fdisk/sfdisk.c:1287
+#, fuzzy, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "Advertencia: inicio de datos incorrecto en partici�n %d\n"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1291
+#, fuzzy
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr "Advertencia: la partici�n %s no empieza en un l�mite de cilindro\n"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "demasiadas particiones - se ignoran las posteriores al n� (%d)\n"
 
-#: fdisk/sfdisk.c:1288
+#: fdisk/sfdisk.c:1324
 msgid "tree of partitions?\n"
 msgstr "��rbol de particiones?\n"
 
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Administrador de disco detectado; no es posible tratar esto\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
 msgstr "Detectada signatura DM6 - abandonando\n"
 
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "Situaci�n an�mala: �partici�n ampliada de tama�o 0?\n"
 
-#: fdisk/sfdisk.c:1426
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "Situaci�n an�mala: �partici�n ampliada de tama�o 0?\n"
 
-#: fdisk/sfdisk.c:1458
+#: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr " %s: partici�n no reconocida\n"
 
-#: fdisk/sfdisk.c:1470
+#: fdisk/sfdisk.c:1536
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Se ha especificado el indicador -n: no se ha producido ning�n cambio\n"
 
-#: fdisk/sfdisk.c:1483
+#: fdisk/sfdisk.c:1549
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Error al guardar los sectores antiguos; anulando la operaci�n\n"
 
-#: fdisk/sfdisk.c:1488
+#: fdisk/sfdisk.c:1554
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: fdisk/sfdisk.c:1565
+#: fdisk/sfdisk.c:1631
 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:1601
+#: fdisk/sfdisk.c:1667
 #, 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:1608
+#: fdisk/sfdisk.c:1674
 #, 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:1614
+#: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Entrada no reconocida: %s\n"
 
-#: fdisk/sfdisk.c:1646
+#: fdisk/sfdisk.c:1712
 msgid "number too big\n"
 msgstr "N�mero demasiado elevado\n"
 
-#: fdisk/sfdisk.c:1650
+#: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
 msgstr "Datos extra�os tras el n�mero\n"
 
-#: fdisk/sfdisk.c:1766
+#: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
 msgstr "No hay espacio para descriptor de partici�n\n"
 
-#: fdisk/sfdisk.c:1799
+#: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
 msgstr "No se puede crear partici�n ampliada adyacente\n"
 
-#: fdisk/sfdisk.c:1850
+#: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
 msgstr "Demasiados campos de entrada\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1884
+#: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
 msgstr "No queda m�s espacio\n"
 
-#: fdisk/sfdisk.c:1903
+#: fdisk/sfdisk.c:1969
 msgid "Illegal type\n"
 msgstr "Tipo no permitido\n"
 
-#: fdisk/sfdisk.c:1935
-#, c-format
-msgid "Warning: exceeds max allowable size (%lu)\n"
+#: fdisk/sfdisk.c:2001
+#, fuzzy, c-format
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Advertencia: se supera tama�o m�ximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:1940
+#: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
 msgstr "Advertencia: partici�n vac�a\n"
 
-#: fdisk/sfdisk.c:1954
+#: fdisk/sfdisk.c:2021
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Advertencia: principio de partici�n incorrecto (antes %lu)\n"
 
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Indicador de iniciable no reconocido; elija - o *\n"
 
-#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
 msgstr "�Especificaci�n parcial de cil,cab,sect?\n"
 
-#: fdisk/sfdisk.c:2008
+#: fdisk/sfdisk.c:2075
 msgid "Extended partition not where expected\n"
 msgstr "Partici�n ampliada en ubicaci�n no esperada\n"
 
-#: fdisk/sfdisk.c:2040
+#: fdisk/sfdisk.c:2107
 msgid "bad input\n"
 msgstr "Entrada incorrecta\n"
 
-#: fdisk/sfdisk.c:2062
+#: fdisk/sfdisk.c:2129
 msgid "too many partitions\n"
 msgstr "Hay demasiadas particiones\n"
 
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2162
 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"
@@ -4803,47 +4893,47 @@ msgstr ""
 "<cil,cab,sec>\n"
 "Normalmente s�lo debe especificar <principio> y <tama�o> (y quiz�s <tipo>).\n"
 
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2182
 msgid "version"
 msgstr "versi�n"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2188
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2189
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: similar a /dev/hda or /dev/sda"
 
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2190
 msgid "useful options:"
 msgstr "opciones �tiles:"
 
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2191
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]:  Mostrar tama�o de una partici�n"
 
-#: fdisk/sfdisk.c:2125
+#: fdisk/sfdisk.c:2192
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [o --id]:         Imprimir o cambiar identificador de partici�n"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2193
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:       Mostrar particiones de cada dispositivo"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2194
 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 "
 "posterior"
 
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2195
 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:2129
+#: fdisk/sfdisk.c:2196
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of "
 "sectors/blocks/cylinders/MB"
@@ -4851,60 +4941,60 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  Aceptar/reportar en unidades de "
 "sectores/bloques/cilindros/MB"
 
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2197
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]: Mostrar los tipos de particiones conocidos"
 
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2198
 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:2132
+#: fdisk/sfdisk.c:2199
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [o --re-read]:    Hacer que el kernel vuelva a leer la tabla de "
 "particiones"
 
-#: fdisk/sfdisk.c:2133
+#: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                Cambiar �nicamente la partici�n con el n�mero #"
 
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 No escribir realmente en el disco"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2202
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O archivo :         Guardar los sectores que se van a sobreescribir en "
 "un archivo"
 
-#: fdisk/sfdisk.c:2136
+#: fdisk/sfdisk.c:2203
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I archivo:          Restaurar estos sectores de nuevo"
 
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:    Imprimir versi�n"
 
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:       Imprimir este mensaje"
 
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
 msgstr "opciones peligrosas:"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2207
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [o --show-geometry]:  Imprimir la idea del kernel sobre la geometr�a"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4913,131 +5003,126 @@ msgstr ""
 "salida\n"
 "                             o esperar sus descriptores en entrada"
 
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2210
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [o --Linux]:       No mostrar avisos sobre aspectos irrelevantes "
 "para Linux"
 
-#: fdisk/sfdisk.c:2144
+#: fdisk/sfdisk.c:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:       Suprimir mensajes de advertencia"
 
-#: fdisk/sfdisk.c:2145
+#: fdisk/sfdisk.c:2212
 msgid "    You can override the detected geometry using:"
 msgstr "    Puede modificar la geometr�a detectada utilizando:"
 
-#: fdisk/sfdisk.c:2146
+#: fdisk/sfdisk.c:2213
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 "    -C# [o --cylinders #]: Establecer el n�mero de cilindros que se "
 "utilizar�n"
 
-#: fdisk/sfdisk.c:2147
+#: fdisk/sfdisk.c:2214
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 "    -H# [o --heads #]:     Establecer el n�mero de cabezales que se "
 "utilizar�n"
 
-#: fdisk/sfdisk.c:2148
+#: fdisk/sfdisk.c:2215
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 "    -S# [o --sectors #]:   Establecer el n�mero de sectores que se utilizar�n"
 
-#: fdisk/sfdisk.c:2149
+#: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
 msgstr "Puede desactivar toda comprobaci�n de coherencia con:"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2217
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 "    -f  [o --force]:       Hacer lo que ordene el usuario, aunque sea il�gico"
 
-#: fdisk/sfdisk.c:2156
+#: fdisk/sfdisk.c:2223
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2157
+#: fdisk/sfdisk.c:2224
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\t Enumerar las particiones activas del dispositivo\n"
 
-#: fdisk/sfdisk.c:2158
+#: fdisk/sfdisk.c:2225
 #, 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:2159
+#: fdisk/sfdisk.c:2226
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An dispositivo\t activar partici�n n, desactivar el resto\n"
 
-#: fdisk/sfdisk.c:2278
+#: fdisk/sfdisk.c:2346
 msgid "no command?\n"
 msgstr "�ning�n comando?\n"
 
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2471
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "total: %d bloques\n"
 
-#: fdisk/sfdisk.c:2438
+#: fdisk/sfdisk.c:2508
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uso: sfdisk --print-id dispositivo n�mero-partici�n\n"
 
-#: fdisk/sfdisk.c:2440
+#: fdisk/sfdisk.c:2510
 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:2442
+#: fdisk/sfdisk.c:2512
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uso: sfdisk --id dispositivo n�mero-partici�n [Id]\n"
 
-#: fdisk/sfdisk.c:2449
+#: fdisk/sfdisk.c:2519
 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:2474
+#: fdisk/sfdisk.c:2544
 #, c-format
 msgid "cannot open %s %s\n"
 msgstr "No es posible abrir %s %s\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "read-write"
 msgstr "lectura/escritura"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "for reading"
 msgstr "para lectura"
 
-#: fdisk/sfdisk.c:2499
+#: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcto\n"
 
-#: fdisk/sfdisk.c:2516
-#, c-format
-msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
+#: fdisk/sfdisk.c:2586
+#, fuzzy, c-format
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %d cilindros, %d cabezales, %d sectores por pista\n"
 
-#: fdisk/sfdisk.c:2519
-#, c-format
-msgid "%s: unknown geometry\n"
-msgstr "%s: geometr�a desconocida\n"
-
-#: fdisk/sfdisk.c:2535
+#: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "Error de ioctl BLKGETSIZE para %s\n"
 
-#: fdisk/sfdisk.c:2612
+#: fdisk/sfdisk.c:2680
 #, 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:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
 msgid ""
 "Done\n"
 "\n"
@@ -5045,7 +5130,7 @@ msgstr ""
 "Fin\n"
 "\n"
 
-#: fdisk/sfdisk.c:2638
+#: fdisk/sfdisk.c:2706
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5054,40 +5139,41 @@ 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:2652
+#: fdisk/sfdisk.c:2720
 #, 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:2708
+#: fdisk/sfdisk.c:2777
 #, c-format
 msgid "Bad Id %x\n"
 msgstr "Identificador %x incorrecto\n"
 
-#: fdisk/sfdisk.c:2723
+#: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
 msgstr "Actualmente este disco est� en uso.\n"
 
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Error muy grave: no se puede encontrar %s\n"
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2812
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Advertencia: %s no es un dispositivo de bloques\n"
 
-#: fdisk/sfdisk.c:2749
+#: fdisk/sfdisk.c:2818
 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:2751
+#: fdisk/sfdisk.c:2820
+#, fuzzy
 msgid ""
 "\n"
-"This disk is currently in use - repartitioning is probably a bad idea.Umount "
-"all file systems, and swapoff all swap partitions on this disk.Use the "
-"--no-reread flag to suppress this check.\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
 "Actualmente este disco est� en uso; no se aconseja volver a crear "
@@ -5095,28 +5181,29 @@ msgstr ""
 "particiones de intercambio de este disco.Utilice el indicador --no-reread "
 "para eliminar esta comprobaci�n.\n"
 
-#: fdisk/sfdisk.c:2755
+#: fdisk/sfdisk.c:2824
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:2759
-msgid "OK"
+#: fdisk/sfdisk.c:2828
+#, fuzzy
+msgid "OK\n"
 msgstr "Correcto"
 
-#: fdisk/sfdisk.c:2768
+#: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
 msgstr "Situaci�n anterior:\n"
 
-#: fdisk/sfdisk.c:2772
+#: fdisk/sfdisk.c:2841
 #, 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:2780
+#: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
 msgstr "Situaci�n nueva:\n"
 
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2854
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5125,21 +5212,21 @@ msgstr ""
 "nada.\n"
 "(Si realmente desea realizar esta operaci�n, use la opci�n --force.)\n"
 
-#: fdisk/sfdisk.c:2788
+#: fdisk/sfdisk.c:2857
 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:2793
+#: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
 msgstr "�Est� satisfecho con esta operaci�n? [ynq] "
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "�Desea escribir esta informaci�n en el disco? [ynq] "
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2869
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5147,15 +5234,15 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada antes de lo previsto\n"
 
-#: fdisk/sfdisk.c:2802
+#: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
 msgstr "Se est� saliendo; no se ha cambiado nada\n"
 
-#: fdisk/sfdisk.c:2808
+#: fdisk/sfdisk.c:2877
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda con una de las entradas siguientes: y,n,q\n"
 
-#: fdisk/sfdisk.c:2816
+#: fdisk/sfdisk.c:2885
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5163,7 +5250,7 @@ msgstr ""
 "La nueva tabla de particiones se ha escrito correctamente\n"
 "\n"
 
-#: fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2891
 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"
@@ -5174,109 +5261,115 @@ msgstr ""
 "bs=512 count=1\n"
 "(V�ase fdisk(8).)\n"
 
-#: games/banner.c:1048
+#: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
 msgstr "uso: banner [-w anchura]\n"
 
-#: games/banner.c:1068
+#: games/banner.c:1065
 msgid "Message: "
 msgstr "Mensaje: "
 
-#: games/banner.c:1102
+#: games/banner.c:1099
 #, c-format
 msgid "The character '%c' is not in my character set"
 msgstr "El car�cter '%c' no pertenece al juego de caracteres del sistema"
 
-#: games/banner.c:1110
+#: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
 msgstr "El mensaje '%s' es correcto\n"
 
-#: getopt-1.0.3b/getopt.c:229
+#: getopt-1.1.0a/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Escriba `getopt --help' para obtener m�s informaci�n.\n"
 
-#: getopt-1.0.3b/getopt.c:295
+#: getopt-1.1.0a/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "Opci�n larga vac�a tras argumento -l o --long"
 
-#: getopt-1.0.3b/getopt.c:315
+#: getopt-1.1.0a/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "Int�rprete de comandos desconocido tras argumento -s o --shell"
 
-#: getopt-1.0.3b/getopt.c:320
+#: getopt-1.1.0a/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Uso: getopt cadenaopciones par�metros\n"
 
-#: getopt-1.0.3b/getopt.c:321
+#: getopt-1.1.0a/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [opciones] [--] cadenaopciones par�metros\n"
 
-#: getopt-1.0.3b/getopt.c:322
+#: getopt-1.1.0a/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [opciones] -o|--options cadenaopciones [opciones] [--]\n"
 
-#: getopt-1.0.3b/getopt.c:323
+#: getopt-1.1.0a/getopt.c:327
 msgid "              parameters\n"
 msgstr "              par�metros\n"
 
-#: getopt-1.0.3b/getopt.c:324
+#: getopt-1.1.0a/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Permitir opciones largas con un solo - "
 "inicial\n"
 
-#: getopt-1.0.3b/getopt.c:325
+#: getopt-1.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Esta peque�a gu�a de uso\n"
 
-#: getopt-1.0.3b/getopt.c:326
+#: getopt-1.1.0a/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=opclargas  Opciones largas para reconocer\n"
 
-#: getopt-1.0.3b/getopt.c:327
+#: getopt-1.1.0a/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=nombreprograma    El nombre con el que se informa de los "
 "errores\n"
 
-#: getopt-1.0.3b/getopt.c:328
+#: getopt-1.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=cadenaopciones Opciones cortas para reconocer\n"
 
-#: getopt-1.0.3b/getopt.c:329
+#: getopt-1.1.0a/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Desactivar informaci�n de errores mediante "
 "getopt(3)\n"
 
-#: getopt-1.0.3b/getopt.c:330
+#: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           No hay salida normal\n"
 
-#: getopt-1.0.3b/getopt.c:331
+#: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=int�rpr.comandos Definir convenciones de int�rprete\n"
 
-#: getopt-1.0.3b/getopt.c:332
+#: getopt-1.1.0a/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Probar para versi�n getopt(1)\n"
 
-#: getopt-1.0.3b/getopt.c:333
+#: getopt-1.1.0a/getopt.c:337
+#, fuzzy
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -Q, --quiet-output           No hay salida normal\n"
+
+#: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Mostrar informaci�n de versi�n\n"
 
-#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
 msgstr "Falta el argumento cadenaopciones"
 
-#: getopt-1.0.3b/getopt.c:433
-msgid "getopt (enhanced) 1.0.3\n"
+#: getopt-1.1.0a/getopt.c:441
+#, fuzzy
+msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (mejorado) 1.0.3\n"
 
-#: getopt-1.0.3b/getopt.c:439
+#: getopt-1.1.0a/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "Error interno; contacte con el desarrollador."
 
@@ -5334,70 +5427,70 @@ msgstr "after getopt loop\n"
 msgid "exiting parseargs\n"
 msgstr "exiting parseargs\n"
 
-#: login-utils/agetty.c:505
+#: login-utils/agetty.c:504
 msgid "entered parse_speeds\n"
 msgstr "entered parse_speeds\n"
 
-#: login-utils/agetty.c:508
+#: login-utils/agetty.c:507
 #, c-format
 msgid "bad speed: %s"
 msgstr "bad speed: %s"
 
-#: login-utils/agetty.c:510
+#: login-utils/agetty.c:509
 msgid "too many alternate speeds"
 msgstr "too many alternate speeds"
 
-#: login-utils/agetty.c:512
+#: login-utils/agetty.c:511
 msgid "exiting parsespeeds\n"
 msgstr "exiting parsespeeds\n"
 
-#: login-utils/agetty.c:587
+#: login-utils/agetty.c:584
 #, c-format
 msgid "%s: open for update: %m"
 msgstr "%s: abierto para actualizaci�n: %m"
 
-#: login-utils/agetty.c:605
+#: login-utils/agetty.c:602
 #, c-format
 msgid "%s: no utmp entry"
 msgstr "%s: no hay ninguna entrada de utmp"
 
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:631
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "/dev: chdir() ha fallado: %m"
 
-#: login-utils/agetty.c:638
+#: login-utils/agetty.c:635
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: no es un dispositivo de caracteres"
 
 #. ignore close(2) errors
-#: login-utils/agetty.c:645
+#: login-utils/agetty.c:642
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:644
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: no se puede abrir como entrada est�ndar: %m"
 
-#: login-utils/agetty.c:657
+#: login-utils/agetty.c:654
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: no abierto para lectura/escritura"
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:661
+#: login-utils/agetty.c:658
 msgid "duping\n"
 msgstr "duping\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:663
+#: login-utils/agetty.c:660
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problema de dup: %m"
 
-#: login-utils/agetty.c:733
+#: login-utils/agetty.c:730
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
@@ -5434,30 +5527,30 @@ msgstr ""
 "cadena_inicializaci�n] [-H host_inicio_sesi�n]l�nea velocidad_baudios,... "
 "[tipo_terminal]\n"
 
-#: login-utils/checktty.c:46
+#: login-utils/checktty.c:41
 #, c-format
 msgid "badlogin: %s\n"
 msgstr "Inicio de sesi�n incorrecto: %s\n"
 
-#: login-utils/checktty.c:52
+#: login-utils/checktty.c:47
 #, c-format
 msgid "sleepexit %d\n"
 msgstr "sleepexit %d\n"
 
-#: login-utils/checktty.c:108 login-utils/checktty.c:130
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
 msgstr "login: poca memoria; el inicio de sesi�n puede fallar\n"
 
-#: login-utils/checktty.c:109
+#: login-utils/checktty.c:104
 msgid "can't malloc for ttyclass"
 msgstr "No se puede realizar asignaci�n de memoria para ttyclass"
 
-#: login-utils/checktty.c:131
+#: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
 msgstr "No se puede realizar asignaci�n de memoria para grplist"
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:431
+#: login-utils/checktty.c:426
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Inicio de sesi�n en %s desde %s denegado de forma predeterminada.\n"
@@ -5466,58 +5559,58 @@ msgstr "Inicio de sesi�n en %s desde %s denegado de forma predeterminada.\n"
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:442
+#: login-utils/checktty.c:437
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Inicio de sesi�n en %s desde %s denegado.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:117
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: el usuario %d no existe.\n"
 
-#: login-utils/chfn.c:141 login-utils/chsh.c:124
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: el usuario \"%s\" no existe.\n"
 
-#: login-utils/chfn.c:146 login-utils/chsh.c:129
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s: s�lo se pueden modificar entradas locales; utilice yp%s en su lugar.\n"
 
-#: login-utils/chfn.c:158
+#: login-utils/chfn.c:145
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Cambiando informaci�n de finger para %s.\n"
 
-#: login-utils/chfn.c:164 login-utils/chfn.c:168 login-utils/chfn.c:175
-#: login-utils/chfn.c:179 login-utils/chsh.c:153 login-utils/chsh.c:157
-#: login-utils/chsh.c:164 login-utils/chsh.c:168
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
 msgid "Password error."
 msgstr "Error de contrase�a."
 
-#: login-utils/chfn.c:188 login-utils/chsh.c:177 login-utils/login.c:684
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:266 mount/lomount.c:221
+#: mount/lomount.c:227
 msgid "Password: "
 msgstr "Contrase�a: "
 
-#: login-utils/chfn.c:191 login-utils/chsh.c:180
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "Contrase�a incorrecta."
 
-#: login-utils/chfn.c:202
+#: login-utils/chfn.c:189
 msgid "Finger information not changed.\n"
 msgstr "No se ha cambiado la informaci�n de finger.\n"
 
-#: login-utils/chfn.c:305
+#: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Uso: %s [ -f nombre-completo ] [ -o oficina ] "
 
-#: login-utils/chfn.c:306
+#: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -5525,11 +5618,11 @@ msgstr ""
 "[ -p tel�fono-oficina ]\n"
 "\t[ -h tel�fono-particular ] "
 
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:376 login-utils/chsh.c:293
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
 msgid ""
 "\n"
 "Aborted.\n"
@@ -5537,159 +5630,159 @@ msgstr ""
 "\n"
 "Operaci�n anulada.\n"
 
-#: login-utils/chfn.c:409
+#: login-utils/chfn.c:398
 msgid "field is too long.\n"
 msgstr "Campo demasiado largo.\n"
 
-#: login-utils/chfn.c:417
+#: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' no est� permitido.\n"
 
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
 msgstr "Los caracteres de control no est�n permitidos.\n"
 
-#: login-utils/chfn.c:487
+#: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "*NO* se ha cambiado la informaci�n de finger. Int�ntelo de nuevo m�s "
 "adelante.\n"
 
-#: login-utils/chfn.c:490
+#: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: login-utils/chfn.c:504 login-utils/chsh.c:411 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
 msgid "malloc failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
-#: login-utils/chsh.c:140
+#: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 "%s: el int�rprete de comandos no est� en /etc/shells; cambio de int�rprete "
 "de comandos denegado\n"
 
-#: login-utils/chsh.c:147
+#: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Cambiando int�rprete de comandos para %s.\n"
 
-#: login-utils/chsh.c:188
+#: login-utils/chsh.c:178
 msgid "New shell"
 msgstr "Nuevo int�rprete de comandos"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
 msgstr "No se ha cambiado el int�rprete de comandos.\n"
 
-#: login-utils/chsh.c:202
+#: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr ""
 "*NO* se ha cambiado el int�rprete de comandos. Int�ntelo de nuevo m�s "
 "adelante.\n"
 
-#: login-utils/chsh.c:205
+#: login-utils/chsh.c:195
 msgid "Shell changed.\n"
 msgstr "Se ha cambiado el int�rprete de comandos.\n"
 
-#: login-utils/chsh.c:273
+#: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
 msgstr "Uso: %s [ -s int�rprete_comandos ] "
 
-#: login-utils/chsh.c:274
+#: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:275
+#: login-utils/chsh.c:265
 msgid "       [ username ]\n"
 msgstr "       [ nombre_usuario ]\n"
 
-#: login-utils/chsh.c:319
+#: login-utils/chsh.c:309
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: el int�rprete de comandos debe ser un nombre de ruta completo.\n"
 
-#: login-utils/chsh.c:323
+#: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" no existe.\n"
 
-#: login-utils/chsh.c:327
+#: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" no es ejecutable.\n"
 
-#: login-utils/chsh.c:334
+#: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' no est� permitido.\n"
 
-#: login-utils/chsh.c:338
+#: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: los caracteres de control no est�n permitidos.\n"
 
-#: login-utils/chsh.c:345
+#: login-utils/chsh.c:335
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Advertencia: \"%s\" no figura en /etc/shells\n"
 
-#: login-utils/chsh.c:347
+#: login-utils/chsh.c:337
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" no figura en /etc/shells.\n"
 
-#: login-utils/chsh.c:349
+#: login-utils/chsh.c:339
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: utilice la opci�n -l para ver una lista\n"
 
-#: login-utils/chsh.c:355
+#: login-utils/chsh.c:345
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Advertencia: \"%s\" no figura en /etc/shells.\n"
 
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:346
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Utilice %s -l para ver una lista.\n"
 
-#: login-utils/chsh.c:377
+#: login-utils/chsh.c:367
 msgid "No known shells.\n"
 msgstr "No hay ning�n int�rprete de comandos conocido.\n"
 
-#: login-utils/cryptocard.c:70
+#: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
 msgstr "No se ha podido abrir /dev/urandom"
 
-#: login-utils/cryptocard.c:75
+#: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
 msgstr "No se han podido leer datos aleatorios de /dev/urandom"
 
-#: login-utils/cryptocard.c:98
+#: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
 msgstr "No se puede abrir %s para lectura"
 
-#: login-utils/cryptocard.c:102
+#: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
 msgstr "No se puede realizar stat(%s)"
 
-#: login-utils/cryptocard.c:108
+#: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
 msgstr "%s no tiene los modos de archivo correctos"
 
-#: login-utils/cryptocard.c:113
+#: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
 msgstr "No se puede leer datos de %s"
 
-#: login-utils/islocal.c:36
+#: login-utils/islocal.c:37
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "No se puede leer %s; saliendo."
@@ -5720,7 +5813,7 @@ msgid "last: gethostname"
 msgstr "last: gethostname"
 
 #: login-utils/last.c:469
-#, c-format
+#, c-format, ycp-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
@@ -5728,37 +5821,40 @@ msgstr ""
 "\n"
 "interrumpido %10.10s %5.5s \n"
 
-#: login-utils/login.c:377
+#: login-utils/login.c:373
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h s�lo para superusuario.\n"
 
-#: login-utils/login.c:402
+#: login-utils/login.c:398
 msgid "usage: login [-fp] [username]\n"
 msgstr "uso: login [-fp] [nombreusuario]\n"
 
-#: login-utils/login.c:504
+#: login-utils/login.c:501
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: error de PAM; anulando: %s\n"
 
-#: login-utils/login.c:506
+#: login-utils/login.c:503
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "No se ha podido inicializar PAM: %s"
 
-#. Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. so that the "login: " prompt gets localized. Unfortunately,
-#. PAM doesn't have an interface to specify the "Password: " string (yet).
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
 #: login-utils/login.c:519
 msgid "login: "
 msgstr "Inicio de sesi�n: "
 
-#: login-utils/login.c:552
+#: login-utils/login.c:553
 #, 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:554
+#: login-utils/login.c:555
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -5766,17 +5862,17 @@ msgstr ""
 "Inicio de sesi�n incorrecto\n"
 "\n"
 
-#: login-utils/login.c:563
+#: login-utils/login.c:564
 #, 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:567
+#: login-utils/login.c:568
 #, 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:570
+#: login-utils/login.c:571
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -5784,30 +5880,30 @@ msgstr ""
 "\n"
 "Inicio de sesi�n incorrecto\n"
 
-#: login-utils/login.c:619
+#: login-utils/login.c:620
 msgid "Illegal username"
 msgstr "Nombre de usuario no permitido"
 
-#: login-utils/login.c:662
+#: login-utils/login.c:663
 #, 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:667
+#: login-utils/login.c:668
 #, 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:671
+#: login-utils/login.c:672
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "Inicio de sesi�n %s rechazado en tty %s"
 
-#: login-utils/login.c:723
+#: login-utils/login.c:725
 msgid "Login incorrect\n"
 msgstr "Inicio de sesi�n incorrecto\n"
 
-#: login-utils/login.c:745
+#: login-utils/login.c:747
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5815,101 +5911,101 @@ msgstr ""
 "Ya hay demasiados usuarios con una sesi�n iniciada.\n"
 "Int�ntelo de nuevo m�s adelante.\n"
 
-#: login-utils/login.c:749
+#: login-utils/login.c:751
 msgid "You have too many processes running.\n"
 msgstr "Tiene demasiados procesos en ejecuci�n.\n"
 
-#: login-utils/login.c:795
+#: login-utils/login.c:797
 msgid "Warning: no Kerberos tickets issued\n"
 msgstr "Advertencia: no se han emitido tickets de Kerberos\n"
 
-#: login-utils/login.c:807
+#: login-utils/login.c:809
 msgid "Sorry -- your password has expired.\n"
 msgstr "La contrase�a ha caducado.\n"
 
-#: login-utils/login.c:813
+#: login-utils/login.c:815
 #, c-format
-msgid "Warning: your password expires on %s %d, %d\n"
-msgstr "Advertencia: la contrase�a caduca en %s (d�a %d) del a�o %d\n"
+msgid "Warning: your password expires on %d %s %d.\n"
+msgstr "Advertencia: la contrase�a caduca en %d %s del a�o %d.\n"
 
-#: login-utils/login.c:821
+#: login-utils/login.c:823
 msgid "Sorry -- your account has expired.\n"
 msgstr "La cuenta ha caducado.\n"
 
-#: login-utils/login.c:827
+#: login-utils/login.c:829
 #, c-format
-msgid "Warning: your account expires on %s %d, %d\n"
-msgstr "Advertencia: la cuenta caduca en %s (d�a %d) del a�o %d\n"
+msgid "Warning: your account expires on %d %s %d.\n"
+msgstr "Advertencia: la cuenta caduca en %d %s del a�o %d.\n"
 
-#: login-utils/login.c:1061
+#: login-utils/login.c:1066
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "Conexi�n telef�nica en %s por %s"
 
-#: login-utils/login.c:1068
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "Inicio de sesi�n con root en %s desde %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1076
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "Inicio de sesi�n con root en %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1079
 #, 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:1077
+#: login-utils/login.c:1082
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "Inicio de sesi�n en %s por %s"
 
-#: login-utils/login.c:1089
+#: login-utils/login.c:1094
 #, c-format
 msgid "You have %smail.\n"
 msgstr "Tiene %scorreo.\n"
 
-#: login-utils/login.c:1090
+#: login-utils/login.c:1095
 msgid "new "
 msgstr "nuevo "
 
 #. error in fork()
-#: login-utils/login.c:1108
+#: login-utils/login.c:1113
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: error en fork: %s"
 
-#: login-utils/login.c:1123
+#: login-utils/login.c:1128
 msgid "setuid() failed"
 msgstr "setuid() ha fallado"
 
-#: login-utils/login.c:1129
+#: login-utils/login.c:1134
 #, c-format
 msgid "No directory %s!\n"
 msgstr "No hay ning�n directorio %s\n"
 
-#: login-utils/login.c:1133
+#: login-utils/login.c:1138
 msgid "Logging in with home = \"/\".\n"
 msgstr "Iniciando la sesi�n con directorio de inicio = \"/\".\n"
 
-#: login-utils/login.c:1141
+#: login-utils/login.c:1146
 msgid "login: no memory for shell script.\n"
 msgstr "login: no queda memoria para script de int�rprete de comandos.\n"
 
-#: login-utils/login.c:1169
+#: login-utils/login.c:1174
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 "login: no se ha podido ejecutar el script de int�rprete de comandos: %s.\n"
 
-#: login-utils/login.c:1172
+#: login-utils/login.c:1177
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: no hay int�rprete de comandos: %s.\n"
 
-#: login-utils/login.c:1188
+#: login-utils/login.c:1191
 #, c-format
 msgid ""
 "\n"
@@ -5918,62 +6014,62 @@ msgstr ""
 "\n"
 "Inicio de sesi�n de %s: "
 
-#: login-utils/login.c:1199
+#: login-utils/login.c:1202
 msgid "login name much too long.\n"
 msgstr "Nombre de inicio de sesi�n demasiado largo.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1203
 msgid "NAME too long"
 msgstr "Nombre demasiado largo"
 
-#: login-utils/login.c:1207
+#: login-utils/login.c:1210
 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:1217
+#: login-utils/login.c:1220
 msgid "too many bare linefeeds.\n"
 msgstr "Demasiados avances de l�nea solos.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1221
 msgid "EXCESSIVE linefeeds"
 msgstr "Excesivos avances de l�nea"
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1231
 #, 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:1329
+#: login-utils/login.c:1325
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ltimo inicio de sesi�n: %.*s "
 
-#: login-utils/login.c:1333
+#: login-utils/login.c:1329
 #, c-format
 msgid "from %.*s\n"
 msgstr "desde %.*s\n"
 
-#: login-utils/login.c:1336
+#: login-utils/login.c:1332
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1359
+#: login-utils/login.c:1355
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Error de inicio de sesi�n desde %s, %s"
 
-#: login-utils/login.c:1362
+#: login-utils/login.c:1358
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Error de inicio de sesi�n en %s, %s"
 
-#: login-utils/login.c:1366
+#: login-utils/login.c:1362
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d errores de inicio de sesi�n desde %s, %s"
 
-#: login-utils/login.c:1369
+#: login-utils/login.c:1365
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d errores de inicio de sesi�n en %s, %s"
@@ -6014,187 +6110,187 @@ msgstr "newgrp: setuid"
 msgid "No shell"
 msgstr "No hay ning�n int�rprete de comandos"
 
-#: login-utils/passwd.c:161
+#: login-utils/passwd.c:159
 msgid "The password must have at least 6 characters, try again.\n"
 msgstr ""
 "La contrase�a debe tener como m�nimo 6 caracteres; int�ntelo de nuevo.\n"
 
-#: login-utils/passwd.c:174
+#: login-utils/passwd.c:172
 msgid "The password must contain characters out of two of the following\n"
 msgstr ""
 "La contrase�a debe contener caracteres de dos de los tipos siguientes\n"
 
-#: login-utils/passwd.c:175
+#: login-utils/passwd.c:173
 msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
 msgstr "clases: letras may�sculas y min�sculas, d�gitos y caracteres\n"
 
-#: login-utils/passwd.c:176
+#: login-utils/passwd.c:174
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "no alfanum�ricos. V�ase passwd(1) para obtener m�s informaci�n.\n"
 
-#: login-utils/passwd.c:181
+#: login-utils/passwd.c:179
 msgid "You cannot reuse the old password.\n"
 msgstr "No puede volver a utilizar la antigua contrase�a.\n"
 
-#: login-utils/passwd.c:186
+#: login-utils/passwd.c:184
 msgid "Please don't use something like your username as password!\n"
 msgstr ""
 "No utilice un valor como por ejemplo el nombre de usuario como contrase�a.\n"
 
-#: login-utils/passwd.c:197 login-utils/passwd.c:204
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
 msgid "Please don't use something like your realname as password!\n"
 msgstr "No utilice un valor como por ejemplo su nombre real como contrase�a.\n"
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:220
 msgid "Usage: passwd [username [password]]\n"
 msgstr "Uso: passwd [nombreusuario [contrase�a]]\n"
 
-#: login-utils/passwd.c:222
+#: login-utils/passwd.c:221
 msgid "Only root may use the one and two argument forms.\n"
 msgstr ""
 "S�lo el usuario root puede utilizar los formatos de uno y dos argumentos.\n"
 
-#: login-utils/passwd.c:278
+#: login-utils/passwd.c:275
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "Uso: passwd [-foqsvV] [usuario [contrase�a]]\n"
 
-#: login-utils/passwd.c:299
+#: login-utils/passwd.c:296
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "No se puede ejecutar %s: %s\n"
 
-#: login-utils/passwd.c:310
+#: login-utils/passwd.c:307
 msgid "Cannot find login name"
 msgstr "No se puede encontrar el nombre de inicio de sesi�n"
 
-#: login-utils/passwd.c:317 login-utils/passwd.c:324
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
 msgid "Only root can change the password for others.\n"
 msgstr "S�lo el usuario root puede cambiar la contrase�a de otros usuarios.\n"
 
-#: login-utils/passwd.c:332
+#: login-utils/passwd.c:329
 msgid "Too many arguments.\n"
 msgstr "Hay demasiados argumentos.\n"
 
-#: login-utils/passwd.c:337
+#: login-utils/passwd.c:334
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
 msgstr ""
 "No se puede encontrar el nombre de usuario. �`%s' es realmente un usuario?"
 
-#: login-utils/passwd.c:341
+#: login-utils/passwd.c:338
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr ""
 "Este comando s�lo puede cambiar las contrase�as locales. Utilice yppasswd en "
 "su lugar."
 
-#: login-utils/passwd.c:347
+#: login-utils/passwd.c:344
 msgid "UID and username does not match, imposter!"
 msgstr "El UID y el nombre de usuario no coinciden."
 
-#: login-utils/passwd.c:352
+#: login-utils/passwd.c:349
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "Cambiando contrase�a para %s\n"
 
-#: login-utils/passwd.c:356
+#: login-utils/passwd.c:353
 msgid "Enter old password: "
 msgstr "Escriba la contrase�a antigua: "
 
-#: login-utils/passwd.c:358
+#: login-utils/passwd.c:355
 msgid "Illegal password, imposter."
 msgstr "Contrase�a no permitida."
 
-#: login-utils/passwd.c:370
+#: login-utils/passwd.c:367
 msgid "Enter new password: "
 msgstr "Escriba la nueva contrase�a: "
 
-#: login-utils/passwd.c:372
+#: login-utils/passwd.c:369
 msgid "Password not changed."
 msgstr "No se ha cambiado la contrase�a."
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:379
 msgid "Re-type new password: "
 msgstr "Vuelva a escribir la nueva contrase�a: "
 
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:382
 msgid "You misspelled it. Password not changed."
 msgstr "Ha escrito de forma incorrecta la contrase�a. No se ha cambiado."
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:397
 #, c-format
 msgid "password changed, user %s"
 msgstr "La contrase�a ha cambiado; usuario %s"
 
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:400
 msgid "ROOT PASSWORD CHANGED"
 msgstr "Contrase�a de usuario root cambiada"
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:402
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "Contrase�a cambiada por usuario root; usuario %s"
 
-#: login-utils/passwd.c:412
+#: login-utils/passwd.c:409
 msgid "calling setpwnam to set password.\n"
 msgstr "Llamando a setpwnam para establecer contrase�a.\n"
 
-#: login-utils/passwd.c:416
+#: login-utils/passwd.c:413
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "*NO* se ha cambiado la contrase�a. Int�ntelo de nuevo m�s adelante.\n"
 
-#: login-utils/passwd.c:422
+#: login-utils/passwd.c:419
 msgid "Password changed.\n"
 msgstr "Se ha cambiado la contrase�a.\n"
 
-#: login-utils/shutdown.c:85
+#: login-utils/shutdown.c:87
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 msgstr "Uso: shutdown [-h|-r] [-fqs] [now|hh:ss|+minutos]\n"
 
-#: login-utils/shutdown.c:103
+#: login-utils/shutdown.c:105
 msgid "Shutdown process aborted"
 msgstr "Proceso de shutdown anulado"
 
-#: login-utils/shutdown.c:125
+#: login-utils/shutdown.c:131
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
 msgstr "%s: s�lo el usuario root puede cerrar un sistema.\n"
 
-#: login-utils/shutdown.c:219
+#: login-utils/shutdown.c:225
 msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr "Esta operaci�n se realizar� ma�ana; �puede esperar hasta entonces?\n"
 
-#: login-utils/shutdown.c:271
+#: login-utils/shutdown.c:277
 msgid "for maintenance; bounce, bounce"
 msgstr "Para mantenimiento; bounce, bounce"
 
-#: login-utils/shutdown.c:275
+#: login-utils/shutdown.c:281
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#: login-utils/shutdown.c:300
+#: login-utils/shutdown.c:306
 msgid "The system is being shut down within 5 minutes"
 msgstr "El sistema se cerrar� dentro de 5 minutos"
 
-#: login-utils/shutdown.c:304
+#: login-utils/shutdown.c:310
 msgid "Login is therefore prohibited."
 msgstr "Por consiguiente el inicio de sesi�n est� prohibido."
 
-#: login-utils/shutdown.c:325
+#: login-utils/shutdown.c:331
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%s por %s: %s"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "rebooted"
 msgstr "reiniciado"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "halted"
 msgstr "detenido"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:377
+#: login-utils/shutdown.c:387
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
@@ -6202,7 +6298,7 @@ msgstr ""
 "\n"
 "�Por qu� sigue activo el proceso tras la operaci�n de reinicio?"
 
-#: login-utils/shutdown.c:379
+#: login-utils/shutdown.c:389
 msgid ""
 "\n"
 "Now you can turn off the power..."
@@ -6210,101 +6306,106 @@ msgstr ""
 "\n"
 "Ahora puede desconectar la alimentaci�n..."
 
-#: login-utils/shutdown.c:394
+#: login-utils/shutdown.c:404
 msgid "Calling kernel power-off facility...\n"
 msgstr "Llamando a recurso de apagado del kernel...\n"
 
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:407
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "Error al apagar\t%s\n"
 
-#: login-utils/shutdown.c:405
+#: login-utils/shutdown.c:415
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "Ejecutando el programa \"%s\" ...\n"
 
-#: login-utils/shutdown.c:408
+#: login-utils/shutdown.c:418
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "Error al ejecutar \t%s\n"
 
-#: login-utils/shutdown.c:431
+#: login-utils/shutdown.c:441
 #, c-format
 msgid "URGENT: broadcast message from %s:"
 msgstr "Urgente: mensaje de difusi�n general (broadcast) de %s:"
 
-#: login-utils/shutdown.c:437
+#: login-utils/shutdown.c:447
 msgid "System going down IMMEDIATELY!\n"
 msgstr "El sistema se apagar� de inmediato.\n"
 
-#: login-utils/shutdown.c:440
+#: login-utils/shutdown.c:450
 #, c-format
 msgid "System going down in %d hour%s %d minutes"
 msgstr "El sistema se apagar� dentro de %d hora%s y %d minuto(s)"
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
 msgid "s"
 msgstr "s"
 
-#: login-utils/shutdown.c:443
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "System going down in %d minute%s\n"
 msgstr "El sistema se apagar� dentro de %d minuto%s\n"
 
-#: login-utils/shutdown.c:449
+#: login-utils/shutdown.c:459
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:506
+#: login-utils/shutdown.c:516
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "No es posible realizar una operaci�n fork para ejecutar swapoff."
 
-#: login-utils/shutdown.c:514
+#: login-utils/shutdown.c:524
 msgid "Cannot exec swapoff, hoping umount will do the trick."
 msgstr "No es posible ejecutar swapoff; se intenta con umount."
 
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:543
 msgid "Cannot fork for umount, trying manually."
 msgstr ""
 "No es posible realizar una operaci�n fork para ejecutar umount; se intenta "
 "manualmente."
 
-#: login-utils/shutdown.c:542
+#: login-utils/shutdown.c:552
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr "No es posible ejecutar %s; se intenta umount.\n"
 
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:556
 msgid "Cannot exec umount, giving up on umount."
 msgstr "No es posible ejecutar umount; se abandona la operaci�n umount."
 
-#: login-utils/shutdown.c:551
+#: login-utils/shutdown.c:561
 msgid "Unmounting any remaining filesystems..."
 msgstr "Desmontando los sistemas de archivos restantes..."
 
-#: login-utils/shutdown.c:587
-#, c-format
-msgid "shutdown: Couldn't umount %s\n"
+#: login-utils/shutdown.c:595
+#, fuzzy, c-format
+msgid "shutdown: Couldn't umount %s: %s\n"
 msgstr "shutdown: No es posible ejecutar umount %s\n"
 
-#: login-utils/simpleinit.c:79
+#: login-utils/simpleinit.c:109
 msgid "Booting to single user mode.\n"
 msgstr "Iniciando en modo de un solo usuario.\n"
 
-#: login-utils/simpleinit.c:83
+#: login-utils/simpleinit.c:113
 msgid "exec of single user shell failed\n"
 msgstr ""
 "La ejecuci�n (exec) de int�rprete de comandos de un solo usuario ha fallado\n"
 
-#: login-utils/simpleinit.c:87
+#: login-utils/simpleinit.c:117
 msgid "fork of single user shell failed\n"
 msgstr ""
 "La bifurcaci�n (fork) de int�rprete de comandos de un solo usuario ha "
 "fallado\n"
 
-#: login-utils/simpleinit.c:226
+#: login-utils/simpleinit.c:166
+#, fuzzy
+msgid "error opening fifo\n"
+msgstr "Error al apagar\t%s\n"
+
+#: login-utils/simpleinit.c:271
 msgid ""
 "\n"
 "Wrong password.\n"
@@ -6312,34 +6413,36 @@ msgstr ""
 "\n"
 "Contrase�a incorrecta.\n"
 
-#: login-utils/simpleinit.c:252
-msgid "exec rc failed\n"
-msgstr "La ejecuci�n (exec) de rc ha fallado\n"
+#: login-utils/simpleinit.c:341
+#, fuzzy
+msgid "stat of path failed\n"
+msgstr "settimeofday() ha fallado"
 
-#: login-utils/simpleinit.c:255
-msgid "open of rc file failed\n"
+#: login-utils/simpleinit.c:348
+#, fuzzy
+msgid "open of directory failed\n"
 msgstr "La apertura del archivo rc ha fallado\n"
 
-#: login-utils/simpleinit.c:261
-msgid "fork of rc shell failed\n"
-msgstr "La bifurcaci�n (fork) de int�rprete de comandos de rc ha fallado\n"
-
-#: login-utils/simpleinit.c:273
+#: login-utils/simpleinit.c:415
 msgid "fork failed\n"
 msgstr "La bifurcaci�n (fork) ha fallado\n"
 
-#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+#: login-utils/simpleinit.c:445 text-utils/more.c:1541
 msgid "exec failed\n"
 msgstr "La ejecuci�n (exec) ha fallado\n"
 
-#: login-utils/simpleinit.c:324
+#: login-utils/simpleinit.c:469
 msgid "cannot open inittab\n"
 msgstr "No es posible abrir inittab\n"
 
-#: login-utils/simpleinit.c:362
+#: login-utils/simpleinit.c:529
 msgid "no TERM or cannot stat tty\n"
 msgstr "Sin TERM o no es posible ejecutar stat para tty\n"
 
+#: login-utils/simpleinit.c:753 login-utils/simpleinit.c:854
+msgid "error running programme\n"
+msgstr ""
+
 #: login-utils/ttymsg.c:81
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr "Demasidos iov (modificar c�digo en wall/ttymsg.c)"
@@ -6362,37 +6465,37 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: error incorrecto"
 
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:145
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s: el archivo %s est� ocupado.\n"
 
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: el archivo %s est� ocupado (%s presente).\n"
 
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:167
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: no se puede enlazar %s: %s\n"
 
-#: login-utils/vipw.c:193
+#: login-utils/vipw.c:188
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: no se puede desbloquear %s: %s (los cambios todav�a est�n en %s)\n"
 
-#: login-utils/vipw.c:217
+#: login-utils/vipw.c:211
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: no es posible bifurcar (fork)\n"
 
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:251
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s no se ha modificado\n"
 
-#: login-utils/vipw.c:300
+#: login-utils/vipw.c:294
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: no se ha efectuado ning�n cambio\n"
@@ -6427,76 +6530,76 @@ msgstr "%s: no se puede ejecutar stat para archivo temporal.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: no se puede leer el archivo temporal.\n"
 
-#: misc-utils/cal.c:189
+#: misc-utils/cal.c:186
 msgid "illegal month value: use 1-12"
 msgstr "Valor de mes no permitido: utilice 1-12"
 
-#: misc-utils/cal.c:193
+#: misc-utils/cal.c:190
 msgid "illegal year value: use 1-9999"
 msgstr "Valor de a�o no permitido: utilice 1-9999"
 
-#: misc-utils/cal.c:489
+#: misc-utils/cal.c:486
 msgid "usage: cal [-mjyV] [[month] year]\n"
 msgstr "uso: cal [-mjyV] [[mes] a�o]\n"
 
-#: misc-utils/ddate.c:192
+#: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "uso: %s [+formato] [d�a mes a�o]\n"
 
 #. handle St. Tib's Day
-#: misc-utils/ddate.c:238
+#: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
 msgstr "D�a de San Tibb"
 
-#: misc-utils/kill.c:209
+#: misc-utils/kill.c:210
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: se�al desconocida %s\n"
 
-#: misc-utils/kill.c:271
+#: misc-utils/kill.c:272
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr "%s: no se puede encontrar el proceso \"%s\"\n"
 
-#: misc-utils/kill.c:315
+#: misc-utils/kill.c:316
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: se�al desconocida %s; se�ales v�lidas:\n"
 
-#: misc-utils/kill.c:355
+#: misc-utils/kill.c:356
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "uso: %s [ -s se�al | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:356
+#: misc-utils/kill.c:357
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ se�al ]\n"
 
-#: misc-utils/logger.c:144
+#: misc-utils/logger.c:139
 #, c-format
 msgid "logger: %s: %s.\n"
 msgstr "logger: %s: %s.\n"
 
-#: misc-utils/logger.c:248
+#: misc-utils/logger.c:243
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr "logger: nombre de recurso desconocido: %s.\n"
 
-#: misc-utils/logger.c:260
+#: misc-utils/logger.c:255
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr "logger: nombre de prioridad desconocida: %s.\n"
 
-#: misc-utils/logger.c:287
+#: misc-utils/logger.c:282
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 "uso: logger [-is] [-f archivo] [-p pri] [-t etiqueta] [-u socket] [ mensaje "
 "... ]\n"
 
-#: misc-utils/look.c:336
+#: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr "uso: look [-dfa] [-t car�cter] cadena [archivo]\n"
 
@@ -6510,62 +6613,63 @@ msgstr "No se ha podido abrir %s\n"
 msgid "Got %d bytes from %s\n"
 msgstr "Se han obtenido %d bytes de %s\n"
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:100
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr "namei: no es posible obtener el directorio actual - %s\n"
 
-#: misc-utils/namei.c:118
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr "namei: no es posible ejecutar chdir para %s - %s (%d)\n"
 
-#: misc-utils/namei.c:128
+#: misc-utils/namei.c:120
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr "uso: namei [-mx] nombreruta [nombreruta ...]\n"
 
-#: misc-utils/namei.c:157
+#: misc-utils/namei.c:145
 msgid "namei: could not chdir to root!\n"
 msgstr "namei: no es posible ejecutar chdir para directorio ra�z\n"
 
-#: misc-utils/namei.c:164
+#: misc-utils/namei.c:152
 msgid "namei: could not stat root!\n"
 msgstr "namei: no es posible ejecutar stat para el directorio ra�z\n"
 
-#: misc-utils/namei.c:219
+#: misc-utils/namei.c:207
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr " ? no es posible ejecutar chdir para %s - %s (%d)\n"
 
-#: misc-utils/namei.c:248
+#: misc-utils/namei.c:236
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr " ? problemas al leer el enlace simb�lico %s - %s (%d)\n"
 
-#: misc-utils/namei.c:258
+#: misc-utils/namei.c:246
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr "  *** Se ha superado l�mite de enlaces simb�licos de Unix ***\n"
 
-#: misc-utils/namei.c:295
+#: misc-utils/namei.c:283
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei: tipo de archivo desconocido 0%06o en archivo %s\n"
 
-#: misc-utils/script.c:109
-msgid "usage: script [-a] [file]\n"
+#: misc-utils/script.c:118
+#, fuzzy
+msgid "usage: script [-a] [-f] [file]\n"
 msgstr "uso: script [-a] [archivo]\n"
 
-#: misc-utils/script.c:129
+#: misc-utils/script.c:139
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado; el archivo es %s\n"
 
-#: misc-utils/script.c:198
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado (%s)"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:269
 #, c-format
 msgid ""
 "\n"
@@ -6574,289 +6678,289 @@ msgstr ""
 "\n"
 "Script terminado (%s)"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script terminado; el archivo es %s\n"
 
-#: misc-utils/script.c:281
+#: misc-utils/script.c:288
 msgid "openpty failed\n"
 msgstr "openpty ha fallado\n"
 
-#: misc-utils/script.c:315
+#: misc-utils/script.c:322
 msgid "Out of pty's\n"
 msgstr "No quedan pty\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:713
+#: misc-utils/setterm.c:743
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: error de argumento, uso\n"
 
-#: misc-utils/setterm.c:716
+#: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nombre_terminal ]\n"
 
-#: misc-utils/setterm.c:717
+#: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:718
+#: misc-utils/setterm.c:748
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:719
+#: misc-utils/setterm.c:749
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:721
+#: misc-utils/setterm.c:751
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:722
+#: misc-utils/setterm.c:752
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:724
+#: misc-utils/setterm.c:754
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:725
+#: misc-utils/setterm.c:755
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:726
+#: misc-utils/setterm.c:756
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:727
+#: misc-utils/setterm.c:757
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:728
+#: misc-utils/setterm.c:758
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:730
+#: misc-utils/setterm.c:760
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:732
+#: misc-utils/setterm.c:762
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
-#: misc-utils/setterm.c:739
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:734
+#: misc-utils/setterm.c:764
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:736
+#: misc-utils/setterm.c:766
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:738
+#: misc-utils/setterm.c:768
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:741
+#: misc-utils/setterm.c:771
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:773
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:774
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:775
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:776
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:777
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:778
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:779
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:780
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:781
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:782
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:784
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NUM_CONSOLAS] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLAS] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file nombrearchivovuelco ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:789
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:790
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:791
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:792
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:793
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq n�merofrecuencia ]\n"
 
-#: misc-utils/setterm.c:831
+#: misc-utils/setterm.c:862
 msgid "snow.on"
 msgstr "snow.on"
 
-#: misc-utils/setterm.c:833
+#: misc-utils/setterm.c:864
 msgid "snow.off"
 msgstr "snow.off"
 
-#: misc-utils/setterm.c:839
+#: misc-utils/setterm.c:870
 msgid "softscroll.on"
 msgstr "softscroll.on"
 
-#: misc-utils/setterm.c:841
+#: misc-utils/setterm.c:872
 msgid "softscroll.off"
 msgstr "softscroll.off"
 
-#: misc-utils/setterm.c:1016
+#: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr "No es posible (des)activar el modo de ahorro de alimentaci�n\n"
 
-#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "Error de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1104
+#: misc-utils/setterm.c:1133
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Error al leer %s\n"
 
-#: misc-utils/setterm.c:1119
+#: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
 msgstr "Error al escribir vuelco de pantalla\n"
 
-#: misc-utils/setterm.c:1133
+#: misc-utils/setterm.c:1162
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "No se ha podido leer %s y no se puede efectuar vuelco de ioctl\n"
 
-#: misc-utils/setterm.c:1198
+#: misc-utils/setterm.c:1227
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM no est� definido.\n"
 
-#: misc-utils/tsort.c:120
+#: misc-utils/tsort.c:117
 msgid "usage: tsort [ inputfile ]\n"
 msgstr "uso: tsort [ archivoentrada ]\n"
 
-#: misc-utils/tsort.c:157
+#: misc-utils/tsort.c:154
 msgid "tsort: odd data count.\n"
 msgstr "tsort: n�mero de datos impar.\n"
 
-#: misc-utils/tsort.c:320
+#: misc-utils/tsort.c:305
 msgid "tsort: cycle in data.\n"
 msgstr "tsort: ciclo en datos.\n"
 
-#: misc-utils/tsort.c:333
+#: misc-utils/tsort.c:318
 msgid "tsort: internal error -- could not find cycle.\n"
 msgstr "tsort: error interno -- no se ha podido encontrar el ciclo.\n"
 
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:155
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nombre...\n"
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:100
 msgid "write: can't find your tty's name\n"
 msgstr "write: no se puede encontrar el nombre de tty\n"
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:111
 msgid "write: you have write permission turned off.\n"
 msgstr "write: tiene el permiso de escritura desactivado.\n"
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:132
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr "write: %s no tiene una sesi�n iniciada en %s.\n"
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:140
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr "write: %s tiene los mensajes desactivados en %s\n"
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:147
 msgid "usage: write user [tty]\n"
 msgstr "uso: write usuario [tty]\n"
 
-#: misc-utils/write.c:245
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write: %s no tiene iniciada una sesi�n\n"
 
-#: misc-utils/write.c:254
+#: misc-utils/write.c:255
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr "write: %s tiene los mensajes desactivados\n"
 
-#: misc-utils/write.c:258
+#: misc-utils/write.c:259
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr ""
 "write: %s tiene iniciada una sesi�n m�s de una vez; escribiendo en %s\n"
 
-#: misc-utils/write.c:325
+#: misc-utils/write.c:323
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Mensaje de %s@%s el %s a las %s ..."
@@ -6878,43 +6982,44 @@ msgstr "mount: no se ha podido abrir %s; en su lugar se utiliza %s\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system? Filesystem full?
-#: mount/fstab.c:375
+#. Too many files open in the system?
+#. Filesystem full?
+#: mount/fstab.c:376
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "No es posible crear el archivo de bloqueo %s: %s (utilice -n para modificar "
 "este valor)"
 
-#: mount/fstab.c:387
+#: mount/fstab.c:388
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "No es posible enlazar el archivo de bloqueo %s: %s (utilice -n para "
 "modificar este valor)"
 
-#: mount/fstab.c:399
+#: mount/fstab.c:400
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "No es posible abrir el archivo de bloqueo %s: %s (utilice -n para modificar "
 "este valor)"
 
-#: mount/fstab.c:414
+#: mount/fstab.c:415
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "No es posible bloquear el archivo de bloqueo %s: %s\n"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:428
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "No es posible bloquear el archivo de bloqueo %s: %s"
 
-#: mount/fstab.c:429
+#: mount/fstab.c:430
 msgid "timed out"
 msgstr "Tiempo de espera excedido"
 
-#: mount/fstab.c:436
+#: mount/fstab.c:437
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -6923,34 +7028,34 @@ msgstr ""
 "No es posible crear enlace %s\n"
 "Puede que haya un archivo de bloqueo obsoleto.\n"
 
-#: mount/fstab.c:482 mount/fstab.c:490
+#: mount/fstab.c:483 mount/fstab.c:491
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "No es posible abrir %s (%s) - mtab no actualizado"
 
-#: mount/fstab.c:515
+#: mount/fstab.c:519
 msgid "mount: warning: cannot change mounted device with a remount\n"
 msgstr ""
 "mount: advertencia: no es posible cambiar el dispositivo montado con un "
 "nuevo montaje\n"
 
-#: mount/fstab.c:520
+#: mount/fstab.c:524
 msgid "mount: warning: cannot change filesystem type with a remount\n"
 msgstr ""
 "mount: advertencia: no es posible cambiar el sistema de archivos con un "
 "nuevo montaje\n"
 
-#: mount/fstab.c:528 mount/fstab.c:534
+#: mount/fstab.c:533 mount/fstab.c:539
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Error al escribir %s: %s"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:546
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "Error al cambiar el modo de %s: %s\n"
 
-#: mount/fstab.c:548
+#: mount/fstab.c:553
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "No es posible cambiar el nombre %s por %s: %s\n"
@@ -6965,16 +7070,16 @@ msgstr "loop: no es posible abrir el dispositivo %s: %s\n"
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: no es posible obtener informaci�n sobre el dispositivo %s: %s\n"
 
-#: mount/lomount.c:89 mount/losetup.c:74
+#: mount/lomount.c:89
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 msgstr "%s: [%04x]:%ld (%s) desplazamiento %d, %s cifrado\n"
 
-#: mount/lomount.c:143
+#: mount/lomount.c:148
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: no es posible encontrar ning�n dispositivo /dev/loop#"
 
-#: mount/lomount.c:147
+#: mount/lomount.c:152
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -6982,7 +7087,7 @@ msgstr ""
 "mount: No es posible encontrar ning�n dispositivo de bucle.\n"
 "       Puede que /dev/loop# tenga un n�mero principal incorrecto."
 
-#: mount/lomount.c:151
+#: mount/lomount.c:156
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -6993,7 +7098,7 @@ msgstr ""
 "       este kernel no conoce el dispositivo de bucle.\n"
 "       (En este caso, vuelva a realizar la compilaci�n o `insmod loop.o'.)"
 
-#: mount/lomount.c:156
+#: mount/lomount.c:162
 msgid ""
 "mount: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
@@ -7005,55 +7110,55 @@ msgstr ""
 "loop.o')\n"
 "       o tal vez /dev/loop# tenga el n�mero principal incorrecto."
 
-#: mount/lomount.c:160
+#: mount/lomount.c:166
 msgid "mount: could not find any free loop device"
 msgstr "mount: no se ha encontrado ning�n dispositivo de bucle libre"
 
-#: mount/lomount.c:191 mount/losetup.c:106
+#: mount/lomount.c:197
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Tipo de cifrado no soportado %s\n"
 
-#: mount/lomount.c:210 mount/losetup.c:126
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr ""
+
+#: mount/lomount.c:231
 msgid "Init (up to 16 hex digits): "
 msgstr "Inicializaci�n (hasta 16 d�gitos hexadecimales): "
 
-#: mount/lomount.c:217 mount/losetup.c:133
+#: mount/lomount.c:238
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "D�gito no hexadecimal '%c'.\n"
 
-#: mount/lomount.c:223 mount/losetup.c:140
+#: mount/lomount.c:245
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "No se sabe c�mo obtener la clave para el sistema de cifrado %d\n"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:261
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d): ejecuci�n correcta\n"
 
-#: mount/lomount.c:250
+#: mount/lomount.c:272
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: no se puede suprimir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:260
+#: mount/lomount.c:282
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ejecuci�n correcta\n"
 
-#: mount/lomount.c:268
+#: mount/lomount.c:290
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Este montaje se ha compilado sin soporte de bucle. Vuelva a realizar la "
 "compilaci�n.\n"
 
-#: mount/losetup.c:70
-msgid "Cannot get loop info"
-msgstr "No es posible obtener la informaci�n de loop"
-
-#: mount/losetup.c:176
+#: mount/lomount.c:327
 #, c-format
 msgid ""
 "usage:\n"
@@ -7066,7 +7171,11 @@ msgstr ""
 "  %s -d dispositivo_bucle                             # eliminar\n"
 "  %s [ -e cifrado ] [ -o despl ] disp_bucle archivo   # configurar\n"
 
-#: mount/losetup.c:234
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr "No hay suficiente memoria"
+
+#: mount/lomount.c:416
 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 "
@@ -7087,147 +7196,161 @@ msgstr "[mntent]: la l�nea %d de %s es incorrecta%s\n"
 msgid "; rest of file ignored"
 msgstr "; el resto del archivo no se tiene en cuenta"
 
-#: mount/mount.c:333
+#: mount/mount.c:351
 #, 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:336
+#: mount/mount.c:354
 #, 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:357
+#: mount/mount.c:375
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: no es posible abrir %s para escritura: %s"
 
-#: mount/mount.c:372 mount/mount.c:654
+#: mount/mount.c:390 mount/mount.c:593
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: error al escribir %s: %s"
 
-#: mount/mount.c:379
+#: mount/mount.c:397
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: error al cambiar el modo de %s: %s"
 
-#: mount/mount.c:413
+#: mount/mount.c:442
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espacio de intercambio - no montado"
 
-#: mount/mount.c:481
+#: mount/mount.c:485
 msgid "mount failed"
 msgstr "montaje err�neo"
 
-#: mount/mount.c:483
+#: mount/mount.c:487
 #, 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:511
+#: mount/mount.c:515
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de bucle especificado dos veces"
 
-#: mount/mount.c:517
+#: mount/mount.c:520
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado dos veces"
 
-#: mount/mount.c:529
+#: mount/mount.c:532
 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:538
+#: mount/mount.c:541
 #, 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:542
+#: mount/mount.c:545
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: error al configurar dispositivo de bucle\n"
 
-#: mount/mount.c:546
+#: mount/mount.c:549
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuraci�n correcta de dispositivo de bucle\n"
 
-#: mount/mount.c:559
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: esta versi�n se ha compilado sin soporte para el tipo `nfs'"
+#: mount/mount.c:588
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: no es posible abrir %s: %s"
+
+#: mount/mount.c:611
+#, fuzzy, c-format
+msgid "mount: cannot not open %s for setting speed"
+msgstr "mount: no es posible abrir %s para escritura: %s"
+
+#: mount/mount.c:614
+#, fuzzy, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: no es posible abrir %s: %s"
 
-#: mount/mount.c:610 mount/mount.c:1043
+#: mount/mount.c:675 mount/mount.c:1202
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: no es posible bifurcar (fork): %s"
 
-#: mount/mount.c:649
-#, c-format
-msgid "mount: can't open %s: %s"
-msgstr "mount: no es posible abrir %s: %s"
+#: mount/mount.c:749
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr "mount: esta versi�n se ha compilado sin soporte para el tipo `nfs'"
+
+#: mount/mount.c:789
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr ""
 
-#: mount/mount.c:678
+#: mount/mount.c:800
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount: no se ha podido determinar tipo de sistema de archivos y no se ha "
 "especificado ninguno"
 
-#: mount/mount.c:681
+#: mount/mount.c:803
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: debe especificar el tipo de sistema de archivos"
 
 #. should not happen
-#: mount/mount.c:684
+#: mount/mount.c:806
 msgid "mount: mount failed"
 msgstr "mount: montaje err�neo"
 
-#: mount/mount.c:690 mount/mount.c:725
+#: mount/mount.c:812 mount/mount.c:847
 #, 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:692
+#: mount/mount.c:814
 msgid "mount: permission denied"
 msgstr "mount: permiso denegado"
 
-#: mount/mount.c:694
+#: mount/mount.c:816
 msgid "mount: must be superuser to use mount"
 msgstr "mount: debe ser superusuario para utilizar mount"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:698 mount/mount.c:702
+#: mount/mount.c:820 mount/mount.c:824
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est� ocupado"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:704
+#: mount/mount.c:826
 msgid "mount: proc already mounted"
 msgstr "mount: proc ya est� montado"
 
-#: mount/mount.c:706
+#: mount/mount.c:828
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s ya est� montado o %s est� ocupado"
 
-#: mount/mount.c:712
+#: mount/mount.c:834
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: el punto de montaje %s no existe"
 
-#: mount/mount.c:714
+#: mount/mount.c:836
 #, 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:717
+#: mount/mount.c:839
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: el dispositivo especial %s no existe"
 
-#: mount/mount.c:727
+#: mount/mount.c:849
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7236,12 +7359,12 @@ msgstr ""
 "mount: el dispositivo especial %s no existe\n"
 "       (un prefijo de ruta no es un directorio)\n"
 
-#: mount/mount.c:739
+#: mount/mount.c:862
 #, 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:741
+#: mount/mount.c:864
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7251,36 +7374,36 @@ msgstr ""
 "superbloque incorrecto en %s,\n"
 "       o n�mero de sistemas de archivos montados excesivo"
 
-#: mount/mount.c:756
+#: mount/mount.c:898
 msgid "mount table full"
 msgstr "tabla de dispositivos montados completa"
 
-#: mount/mount.c:758
+#: mount/mount.c:900
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: no se puede leer el superbloque"
 
-#: mount/mount.c:761
-#, c-format
-msgid "mount: %s has wrong major or minor number"
-msgstr "mount: %s tiene un n�mero principal o secundario incorrecto"
+#: mount/mount.c:904
+#, fuzzy, c-format
+msgid "mount: %s: unknown device"
+msgstr "umount: %s: dispositivo de bloques no v�lido"
 
-#: mount/mount.c:766
+#: mount/mount.c:909
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr ""
 "mount: el tipo de sistema de archivos %s no est� soportado por el kernel"
 
-#: mount/mount.c:778
+#: mount/mount.c:921
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probablemente quer�a referirse a %s"
 
-#: mount/mount.c:780
+#: mount/mount.c:923
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: �tal vez quer�a referirse a iso9660?"
 
-#: mount/mount.c:783
+#: mount/mount.c:926
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7288,12 +7411,12 @@ msgstr ""
 "%s no soportado"
 
 #. strange ...
-#: mount/mount.c:788
+#: mount/mount.c:932
 #, 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:790
+#: mount/mount.c:934
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7302,55 +7425,62 @@ msgstr ""
 "mount: el kernel no reconoce %s como dispositivo de bloques\n"
 "       (�tal vez `insmod driver'?)"
 
-#: mount/mount.c:793
+#: mount/mount.c:937
 #, 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:796
+#: mount/mount.c:940
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s no es un dispositivo de bloques"
 
-#: mount/mount.c:799
+#: mount/mount.c:943
 #, 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:803
-#, c-format
-msgid "mount: block device %s is not permitted on its filesystem"
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:946
+msgid "block device "
+msgstr "dispositivo de bloques "
+
+#: mount/mount.c:948
+#, fuzzy, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "umount: no se ha podido volver a montar %s como de s�lo lectura\n"
+
+#: mount/mount.c:952
+#, fuzzy, c-format
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount: dispositivo de bloques %s no permitido en este sistema de archivos"
+"mount: %s%s est� protegido contra escritura; se monta como s�lo lectura"
 
-#: mount/mount.c:819
+#: mount/mount.c:968
 #, 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:820
-msgid "block device "
-msgstr "dispositivo de bloques "
-
-#: mount/mount.c:907
-#, c-format
-msgid "mount: consider mounting %s by %s\n"
+#: mount/mount.c:1057
+#, fuzzy, c-format
+msgid "mount: going to mount %s by %s\n"
 msgstr "mount: considere la posibilidad de montar %s mediante %s\n"
 
-#: mount/mount.c:908
+#: mount/mount.c:1058
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:908
+#: mount/mount.c:1058
 msgid "label"
 msgstr "etiqueta"
 
-#: mount/mount.c:910 mount/mount.c:1226
+#: mount/mount.c:1060 mount/mount.c:1430
 msgid "mount: no such partition found"
 msgstr "mount: no se ha encontrado esta partici�n"
 
-#: mount/mount.c:918
+#: mount/mount.c:1068
 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 "
@@ -7359,182 +7489,189 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:934
+#: mount/mount.c:1084
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: ejecutando en segundo plano \"%s\"\n"
 
-#: mount/mount.c:945
+#: mount/mount.c:1095
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: se abandona \"%s\"\n"
 
-#: mount/mount.c:994
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ya est� montado en %s\n"
 
-#: mount/mount.c:1105
-msgid ""
-"Usage: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       A special device can be indicated by  -L label  or  -U uuid .\n"
-msgstr ""
-"Uso:   mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o opciones] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o opciones] special node\n"
-"       Un dispositivo especial puede indicarse mediante -L etiqueta o -U "
-"uuid\n"
-
-#: mount/mount.c:1211
+#: mount/mount.c:1270
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+
+#: mount/mount.c:1414
 msgid "mount: only root can do that"
 msgstr "mount: s�lo el usuario root puede efectuar esta acci�n"
 
-#: mount/mount.c:1216
+#: mount/mount.c:1419
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: no se ha encontrado %s; se est� creando...\n"
 
-#: mount/mount.c:1228
+#: mount/mount.c:1432
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1237
+#: mount/mount.c:1441
 msgid "not mounted anything"
 msgstr "No se ha montado nada"
 
-#: mount/mount.c:1250
+#: mount/mount.c:1456
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: no se puede encontrar %s en %s"
 
-#: mount/mount.c:1264
+#: mount/mount.c:1471
 #, 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_by_label.c:141
+#: mount/mount_by_label.c:99
+#, fuzzy, c-format
+msgid ""
+"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr "mount: no se ha podido abrir %s; en su lugar se utiliza %s\n"
+
+#: mount/mount_by_label.c:201
 msgid "mount: bad UUID"
 msgstr "mount: UUID incorrecto"
 
-#: mount/mount_guess_fstype.c:251
+#: mount/mount_guess_fstype.c:257
 #, 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 archivos para %s\n"
 
-#: mount/mount_guess_fstype.c:254
+#: mount/mount_guess_fstype.c:260
 #, 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_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:263
 msgid "       and it looks like this is swapspace\n"
 msgstr "       y parece que sea un espacio de intercambio\n"
 
-#: mount/mount_guess_fstype.c:259
+#: mount/mount_guess_fstype.c:265
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Se probar� con el tipo %s\n"
 
-#: mount/mount_guess_fstype.c:321
+#: mount/mount_guess_fstype.c:329
 #, c-format
 msgid "Trying %s\n"
 msgstr "Probando con %s\n"
 
-#: mount/nfsmount.c:157
+#: mount/nfsmount.c:225
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argumento host:dir demasiado largo\n"
 
-#: mount/nfsmount.c:170
+#: mount/nfsmount.c:238
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: advertencia: varios nombres de host no soportados\n"
 
-#: mount/nfsmount.c:174
+#: mount/nfsmount.c:242
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: el directorio que se debe montar no tiene el formato host:dir\n"
 
-#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#: mount/nfsmount.c:253 mount/nfsmount.c:510
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: no se puede obtener la direcci�n para %s\n"
 
-#: mount/nfsmount.c:191
+#: mount/nfsmount.c:259
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: valor incorrecto para hp->h_length\n"
 
-#: mount/nfsmount.c:208
+#: mount/nfsmount.c:276
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argumento de opci�n demasiado largo\n"
 
-#: mount/nfsmount.c:299
+#: mount/nfsmount.c:368
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Advertencia: opci�n proto= no reconocida.\n"
 
-#: mount/nfsmount.c:306
+#: mount/nfsmount.c:375
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Advertencia: la opci�n namlen no est� soportada.\n"
 
-#: mount/nfsmount.c:310
+#: mount/nfsmount.c:379
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "Par�metro de montaje nfs desconocido: %s=%d\n"
 
-#: mount/nfsmount.c:345
+#: mount/nfsmount.c:414
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Advertencia: la opci�n nolock no est� soportada.\n"
 
-#: mount/nfsmount.c:348
+#: mount/nfsmount.c:419
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "Opci�n de montaje nfs desconocida: %s%s\n"
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:516
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: �valor incorrecto para hp->h_length?\n"
 
-#: mount/nfsmount.c:528
-#, c-format
-msgid "mount: %s:%s failed, reason given by server: %s\n"
-msgstr "mount: %s:%s ha fallado; motivo indicado por servidor: %s\n"
-
-#: mount/nfsmount.c:539
+#: mount/nfsmount.c:692
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sobre TCP no est� soportado.\n"
 
-#: mount/nfsmount.c:546
+#: mount/nfsmount.c:699
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:550
+#: mount/nfsmount.c:703
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:561
+#: mount/nfsmount.c:714
 msgid "used portmapper to find NFS port\n"
 msgstr "Se ha utilizado el asignador de puertos para encontrar el puerto NFS\n"
 
-#: mount/nfsmount.c:565
+#: mount/nfsmount.c:718
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "Utilizando puerto %d para daemon de nfs\n"
 
-#: mount/nfsmount.c:576
+#: mount/nfsmount.c:729
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:665
+#: mount/nfsmount.c:816
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "Valor de retorno de nfs status desconocido: %d"
 
-#: mount/sundries.c:41 mount/sundries.c:56
-msgid "not enough memory"
-msgstr "No hay suficiente memoria"
-
 #: mount/sundries.c:66
 msgid "bug in xstrndup call"
 msgstr "Error en la llamada xstrndup"
@@ -7649,27 +7786,27 @@ msgstr "umount2 no existe; se est� probando con umount...\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"
 
-#: mount/umount.c:270
+#: mount/umount.c:272
 #, 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:278
+#: mount/umount.c:282
 #, 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:286
+#: mount/umount.c:290
 #, c-format
 msgid "%s umounted\n"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: mount/umount.c:369
+#: mount/umount.c:374
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount: no se puede encontrar lista de sistemas de archivos para desmontar"
 
-#: mount/umount.c:398
+#: mount/umount.c:403
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7679,46 +7816,46 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:459
+#: mount/umount.c:464
 msgid "umount: only root can do that"
 msgstr "umount: s�lo el usuario root puede efectuar esta acci�n"
 
-#: mount/umount.c:474
+#: mount/umount.c:479
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Se est� intentando ejecutar umount en %s\n"
 
-#: mount/umount.c:478
+#: mount/umount.c:483
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "No es posible encontrar %s en mtab\n"
 
-#: mount/umount.c:482
+#: mount/umount.c:487
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s no est� montado (seg�n mtab)"
 
-#: mount/umount.c:484
+#: mount/umount.c:489
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s se ha montado varias veces"
 
-#: mount/umount.c:496
+#: mount/umount.c:501
 #, 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:499
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: montaje de %s no concuerda con fstab"
 
-#: mount/umount.c:520
+#: mount/umount.c:525
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: s�lo el usuario root puede desmontar %s desde %s"
 
-#: mount/umount.c:531
+#: mount/umount.c:536
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: s�lo %s puede desmontar %s desde %s"
@@ -7732,7 +7869,7 @@ msgstr ""
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "Uso: ctrlaltdel hard|soft\n"
 
-#: sys-utils/cytune.c:118
+#: sys-utils/cytune.c:120
 #, c-format
 msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
@@ -7741,7 +7878,7 @@ msgstr ""
 "Archivo %s, para valor de umbral %lu, m�ximo de caracteres en fifo fue %d\n"
 "y velocidad de transferencia m�xima en caracteres por segundo fue %f\n"
 
-#: sys-utils/cytune.c:129
+#: sys-utils/cytune.c:131
 #, c-format
 msgid ""
 "File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -7871,50 +8008,61 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f enteros/seg.; %f recepci�n (caracteres/seg.)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:37
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n nivel] [-s tama�ob�fer]\n"
 
-#: sys-utils/ipcrm.c:46
-#, c-format
-msgid "usage: %s [shm | msg | sem] id\n"
+#: sys-utils/ipcrm.c:59
+#, fuzzy, c-format
+msgid "invalid id: %s\n"
+msgstr "N�mero no v�lido: %s\n"
+
+#: sys-utils/ipcrm.c:77
+#, fuzzy, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "No es posible abrir %s %s\n"
+
+#: sys-utils/ipcrm.c:91
+#, fuzzy, c-format
+msgid "usage: %s {shm | msg | sem} id ...\n"
 msgstr "uso: %s [shm | msg | sem] id\n"
 
-#: sys-utils/ipcrm.c:70
-#, c-format
-msgid "usage: %s [-shm | -msg | -sem] id\n"
-msgstr "uso: %s [-shm | -msg | -sem] id\n"
+#: sys-utils/ipcrm.c:124
+#, fuzzy, c-format
+msgid "unknown resource type: %s\n"
+msgstr "Par�metro de montaje nfs desconocido: %s=%d\n"
 
-#: sys-utils/ipcrm.c:73
-msgid "resource deleted\n"
+#: sys-utils/ipcrm.c:128
+#, fuzzy
+msgid "resource(s) deleted\n"
 msgstr "Recurso suprimido\n"
 
-#: sys-utils/ipcs.c:117
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
 msgstr "uso: %s -asmq -tclup \n"
 
-#: sys-utils/ipcs.c:118
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
 msgstr "\t%s [-s -m -q] -i id\n"
 
-#: sys-utils/ipcs.c:119
+#: sys-utils/ipcs.c:124
 #, c-format
 msgid "\t%s -h for help.\n"
 msgstr "\t%s -h para obtener ayuda.\n"
 
-#: sys-utils/ipcs.c:125
+#: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
 msgstr "%s facilita informaci�n sobre los recursos ipc para"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
 msgstr " los que tiene acceso de lectura.\n"
 
-#: sys-utils/ipcs.c:127
+#: sys-utils/ipcs.c:132
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
@@ -7924,7 +8072,7 @@ msgstr ""
 "\t-m : memoria compartida\n"
 "\t-q : mensajes\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
@@ -7932,7 +8080,7 @@ msgstr ""
 "\t-s : sem�foros\n"
 "\t-a : todo (valor predeterminado)\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
@@ -7944,7 +8092,7 @@ msgstr ""
 "\t-p : pid\n"
 "\t-c : creador\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
@@ -7952,370 +8100,370 @@ msgstr ""
 "\t-l : l�mites\n"
 "\t-u : resumen\n"
 
-#: sys-utils/ipcs.c:131
+#: sys-utils/ipcs.c:136
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
 msgstr ""
 "-i id [-s -q -m] : informaci�n detallada sobre los recursos identificados "
 "por id\n"
 
-#: sys-utils/ipcs.c:263 sys-utils/ipcs.c:465
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
 msgid "kernel not configured for shared memory\n"
 msgstr "Kernel no configurado para memoria compartida\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
 msgstr "---- L�mites memoria compartida ----\n"
 
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:277
 #, c-format
 msgid "max number of segments = %d\n"
 msgstr "n�mero m�x. segmentos = %d\n"
 
-#: sys-utils/ipcs.c:273
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max seg size (kbytes) = %d\n"
 msgstr "tama�o m�x. segmento (kbytes) = %d\n"
 
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max total shared memory (kbytes) = %d\n"
 msgstr "total m�x. memoria compartida (kbytes) = %d\n"
 
-#: sys-utils/ipcs.c:275
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "min seg size (bytes) = %d\n"
 msgstr "tama�o m�n. segmento (bytes) = %d\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:284
 msgid "------ Shared Memory Status --------\n"
 msgstr "----- Estado memoria compartida ----\n"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "segmentos asignados %d\n"
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:286
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "p�ginas asignadas %ld\n"
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:287
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "p�ginas residentes %ld\n"
 
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:288
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "p�ginas intercambiadas %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:289
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
 msgstr "Rendimiento de intercambio: %ld intentos\t %ld correctos\n"
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:294
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "-- Creadores/propietarios segmento mem. compartida --\n"
 
-#: sys-utils/ipcs.c:290 sys-utils/ipcs.c:396 sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:297 sys-utils/ipcs.c:302
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:302 sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:408
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:308 sys-utils/ipcs.c:397
-#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:489 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:494 sys-utils/ipcs.c:511
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "-- Tiempos conexi�n/desconexi�n/modificac. mem. comp. --\n"
 
-#: sys-utils/ipcs.c:296
+#: sys-utils/ipcs.c:301
 #, c-format
 msgid "%-10s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:297 sys-utils/ipcs.c:302 sys-utils/ipcs.c:308
-#: sys-utils/ipcs.c:403 sys-utils/ipcs.c:412 sys-utils/ipcs.c:495
-#: sys-utils/ipcs.c:500 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:307 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:417 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505 sys-utils/ipcs.c:511
 msgid "owner"
 msgstr "propietario"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "attached"
 msgstr "conectado"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "detached"
 msgstr "desconectado"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "changed"
 msgstr "modificado"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "---- Creador/�ltimo op. memoria compart. ----\n"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:311
 msgid "------ Shared Memory Segments --------\n"
 msgstr "---- Segmentos memoria compartida ----\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:412 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
 msgid "key"
 msgstr "key"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "bytes"
 msgstr "bytes"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
 msgid "status"
 msgstr "estado"
 
-#: sys-utils/ipcs.c:328 sys-utils/ipcs.c:329 sys-utils/ipcs.c:330
-#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:434 sys-utils/ipcs.c:526
-#: sys-utils/ipcs.c:527 sys-utils/ipcs.c:528
+#: sys-utils/ipcs.c:333 sys-utils/ipcs.c:334 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:438 sys-utils/ipcs.c:439 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:533
 msgid "Not set"
 msgstr "No establecido"
 
-#: sys-utils/ipcs.c:350
+#: sys-utils/ipcs.c:355
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:356
 msgid "locked"
 msgstr "bloqueado"
 
-#: sys-utils/ipcs.c:371
+#: sys-utils/ipcs.c:376
 msgid "kernel not configured for semaphores\n"
 msgstr "Kernel no configurado para sem�foros\n"
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:382
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ L�mites sem�foro --------\n"
 
-#: sys-utils/ipcs.c:381
+#: sys-utils/ipcs.c:386
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "n�mero m�ximo de matrices = %d\n"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:387
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "m�x. sem�foros por matriz = %d\n"
 
-#: sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:388
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "m�x. sem�foros sistema = %d\n"
 
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:389
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "m�x. oper. por llamada semop = %d\n"
 
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:390
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valor m�x. sem�foro = %d\n"
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:394
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Estado sem�foro ---------\n"
 
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:395
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "matrices utilizadas = %d\n"
 
-#: sys-utils/ipcs.c:391
+#: sys-utils/ipcs.c:396
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "sem�foros asignados = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:400
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "---- Creadores/propietarios matrices sem�f. ----\n"
 
-#: sys-utils/ipcs.c:397 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:406
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "--- Tiempos operaci�n/modificaci�n memoria comp. ---\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-op"
 msgstr "�ltima operaci�n"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-changed"
 msgstr "�ltima modificaci�n"
 
-#: sys-utils/ipcs.c:410
+#: sys-utils/ipcs.c:415
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Matrices sem�foro -------\n"
 
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:417
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:478
 msgid "------ Messages: Limits --------\n"
 msgstr "------ Mensajes: l�mites -------\n"
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:479
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "m�x. colas sistema = %d\n"
 
-#: sys-utils/ipcs.c:475
+#: sys-utils/ipcs.c:480
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "tama�o m�x. mensaje (bytes) = %d\n"
 
-#: sys-utils/ipcs.c:476
+#: sys-utils/ipcs.c:481
 #, 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:480
+#: sys-utils/ipcs.c:485
 msgid "------ Messages: Status --------\n"
 msgstr "------ Mensajes: estado --------\n"
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:486
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "colas asignadas = %d\n"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:487
 #, c-format
 msgid "used headers = %d\n"
 msgstr "cabeceras utilizadas = %d\n"
 
-#: sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:488
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "espacio utilizado = %d bytes\n"
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:492
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr "-- Colas de mensajes: creadores/propietarios --\n"
 
-#: sys-utils/ipcs.c:489 sys-utils/ipcs.c:495 sys-utils/ipcs.c:500
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:498
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "--- Tiempos env�o/recep./modific. colas mensajes ----\n"
 
-#: sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:499
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "send"
 msgstr "env�o"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "recv"
 msgstr "recepci�n"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "change"
 msgstr "modificaci�n"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:504
 msgid "------ Message Queues PIDs --------\n"
 msgstr "----- PID de colas de mensajes ----\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:509
 msgid "------ Message Queues --------\n"
 msgstr "------ Colas de mensajes -----\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "used-bytes"
 msgstr "bytes utilizados"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "messages"
 msgstr "mensajes"
 
-#: sys-utils/ipcs.c:565
+#: sys-utils/ipcs.c:570
 #, c-format
 msgid ""
 "\n"
@@ -8324,41 +8472,41 @@ msgstr ""
 "\n"
 "Segmento de memoria compartida shmid=%d\n"
 
-#: sys-utils/ipcs.c:566
+#: sys-utils/ipcs.c:571
 #, 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:568
+#: sys-utils/ipcs.c:573
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:569
+#: sys-utils/ipcs.c:574
 #, c-format
 msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:577
 #, c-format
 msgid "att_time=%s"
 msgstr "att_time=%s"
 
-#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:575 sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
 msgid "Not set\n"
 msgstr "No establecido\n"
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:579
 #, c-format
 msgid "det_time=%s"
 msgstr "det_time=%s"
 
-#: sys-utils/ipcs.c:576
+#: sys-utils/ipcs.c:581
 #, c-format
 msgid "change_time=%s"
 msgstr "change_time=%s"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:597
 #, c-format
 msgid ""
 "\n"
@@ -8367,26 +8515,26 @@ msgstr ""
 "\n"
 "Cola de mensajes msqid=%d\n"
 
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:598
 #, 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:595
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "send_time=%srcv_time=%schange_time=%s"
 msgstr "send_time=%srcv_time=%schange_time=%s"
 
-#: sys-utils/ipcs.c:599 sys-utils/ipcs.c:600 sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:604 sys-utils/ipcs.c:605 sys-utils/ipcs.c:606
 msgid "Not Set\n"
 msgstr "No establecido\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:623
 #, c-format
 msgid ""
 "\n"
@@ -8395,118 +8543,118 @@ msgstr ""
 "\n"
 "semid de matriz de sem�foros=%d\n"
 
-#: sys-utils/ipcs.c:619
+#: sys-utils/ipcs.c:624
 #, 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:621
+#: sys-utils/ipcs.c:626
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:622
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "nsems = %d\n"
 msgstr "nsems = %d\n"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "otime = %s"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:630
 #, c-format
 msgid "ctime = %s"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "value"
 msgstr "value"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:67
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr ""
 "uso: rdev [ -rsv ] [ -o DESPLAZAMIENTO ] [ IMAGEN [ VALOR [ DESPLAZAMIENTO ] "
 "] ]"
 
-#: sys-utils/rdev.c:69
+#: sys-utils/rdev.c:68
 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:70
+#: sys-utils/rdev.c:69
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
 msgstr "  rdev /dev/fd0 /dev/hda2         Establecer ROOT en /dev/hda2"
 
-#: sys-utils/rdev.c:71
+#: sys-utils/rdev.c:70
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr ""
 "  rdev -R /dev/fd0 1              Establecer ROOTFLAGS (estado de s�lo "
 "lectura)"
 
-#: sys-utils/rdev.c:72
+#: sys-utils/rdev.c:71
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
 msgstr "  rdev -s /dev/fd0 /dev/hda2      Establecer dispositivo SWAP"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:72
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
 msgstr "  rdev -r /dev/fd0 627            Establecer tama�o de RAMDISK"
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:73
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr "  rdev -v /dev/fd0 1              Establecer VIDEOMODE de inicio"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:74
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   Utilizar desplazamiento de bytes N"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:75
 msgid "  rootflags ...                   same as rdev -R"
 msgstr "  rootflags ...                   Igual que rdev -R"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:76
 msgid "  swapdev ...                     same as rdev -s"
 msgstr "  swapdev ...                     Igual que rdev -s"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr "  ramsize ...                     Igual que rdev -r"
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     Igual que rdev -v"
 
-#: sys-utils/rdev.c:80
+#: sys-utils/rdev.c:79
 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, 1=key1, "
 "2=key2,..."
 
-#: sys-utils/rdev.c:81
+#: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr ""
 "      Utilizar -R 1 para montar root como de s�lo lectura; -R 0 para "
@@ -8595,7 +8743,7 @@ msgstr "%d: prioridad antigua %d, nueva prioridad %d\n"
 msgid "usage: %s program [arg ...]\n"
 msgstr "uso: %s programa [arg ...]\n"
 
-#: sys-utils/tunelp.c:73
+#: sys-utils/tunelp.c:74
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8607,82 +8755,83 @@ msgstr ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
 msgid "malloc error"
 msgstr "Error de asignaci�n de memoria"
 
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:102
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s: valor incorrecto\n"
 
-#: sys-utils/tunelp.c:237
+#: sys-utils/tunelp.c:241
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s no es un dispositivo lp.\n"
 
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:262
 #, c-format
 msgid "%s status is %d"
 msgstr "El estado de %s es %d"
 
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:263
 msgid ", busy"
 msgstr ", ocupado"
 
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:264
 msgid ", ready"
 msgstr ", preparado"
 
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:265
 msgid ", out of paper"
 msgstr ", falta papel"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:266
 msgid ", on-line"
 msgstr ", en l�nea"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:267
 msgid ", error"
 msgstr ", error"
 
-#: sys-utils/tunelp.c:280
+#: sys-utils/tunelp.c:284
 msgid "LPGETIRQ error"
 msgstr "error de LPGETIRQ"
 
-#: sys-utils/tunelp.c:286
+#: sys-utils/tunelp.c:290
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s utilizando IRQ %d\n"
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:292
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s utilizando sondeo\n"
 
-#: text-utils/col.c:153
+#: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col: argumento -l incorrecto %s.\n"
 
-#: text-utils/col.c:516
-msgid "usage: col [-bfx] [-l nline]\n"
+#: text-utils/col.c:521
+#, fuzzy
+msgid "usage: col [-bfpx] [-l nline]\n"
 msgstr "uso: col [-bfx] [-l nline]\n"
 
-#: text-utils/col.c:522
+#: text-utils/col.c:527
 msgid "col: write error.\n"
 msgstr "col: error de escritura.\n"
 
-#: text-utils/col.c:529
+#: text-utils/col.c:534
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr "col: advertencia: no se puede hacer copia de seguridad de %s.\n"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "past first line"
 msgstr "m�s all� de primera l�nea"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "-- line already flushed"
 msgstr "-- l�nea ya vaciada"
 
@@ -8691,11 +8840,11 @@ msgstr "-- l�nea ya vaciada"
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "uso: %s [ - ] [ -2 ] [ archivo ... ]\n"
 
-#: text-utils/column.c:302
+#: text-utils/column.c:300
 msgid "line too long"
 msgstr "l�nea demasiado larga"
 
-#: text-utils/column.c:379
+#: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
 msgstr "uso: column [-tx] [-c columnas] [archivo ...]\n"
 
@@ -8714,12 +8863,12 @@ msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f archivo_fmt] [-n longitud] [-s omitir] "
 "[archivo ...]\n"
 
-#: text-utils/more.c:329
+#: text-utils/more.c:330
 #, c-format
 msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "uso: %s [-dfln] [+n�ml�neas | +/patr�n] nombre1 nombre2 ...\n"
 
-#: text-utils/more.c:504
+#: text-utils/more.c:505
 #, c-format
 msgid ""
 "\n"
@@ -8731,7 +8880,7 @@ msgstr ""
 "\n"
 
 #. simple ELF detection
-#: text-utils/more.c:543
+#: text-utils/more.c:544
 #, c-format
 msgid ""
 "\n"
@@ -8746,30 +8895,30 @@ msgstr ""
 msgid "[Use q or Q to quit]"
 msgstr "[Utilizar q o Q para salir]"
 
-#: text-utils/more.c:833
+#: text-utils/more.c:826
 msgid "--More--"
 msgstr "--M�s--"
 
-#: text-utils/more.c:835
+#: text-utils/more.c:828
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Siguiente archivo: %s)"
 
-#: text-utils/more.c:841
+#: text-utils/more.c:834
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Presione la barra espaciadora para continuar; 'q' para salir.]"
 
-#: text-utils/more.c:1139
+#: text-utils/more.c:1132
 #, c-format
 msgid "...back %d page"
 msgstr "...retroceder %d p�gina"
 
-#: text-utils/more.c:1185
+#: text-utils/more.c:1178
 #, c-format
 msgid "...skipping %d line"
 msgstr "...omitiendo la l�nea %d"
 
-#: text-utils/more.c:1226
+#: text-utils/more.c:1219
 msgid ""
 "\n"
 "***Back***\n"
@@ -8779,37 +8928,37 @@ msgstr ""
 "***Atr�s***\n"
 "\n"
 
-#: text-utils/more.c:1264
+#: text-utils/more.c:1257
 msgid "Can't open help file"
 msgstr "No es posible abrir el archivo"
 
-#: text-utils/more.c:1285 text-utils/more.c:1289
+#: text-utils/more.c:1278 text-utils/more.c:1282
 msgid "[Press 'h' for instructions.]"
 msgstr "[Presione 'h' para consultar las instrucciones.]"
 
-#: text-utils/more.c:1324
+#: text-utils/more.c:1316
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" l�nea %d"
 
-#: text-utils/more.c:1326
+#: text-utils/more.c:1318
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[No es un archivo] l�nea %d"
 
-#: text-utils/more.c:1410
+#: text-utils/more.c:1402
 msgid "  Overflow\n"
 msgstr "  Desbordamiento\n"
 
-#: text-utils/more.c:1457
+#: text-utils/more.c:1449
 msgid "...skipping\n"
 msgstr "...omitiendo\n"
 
-#: text-utils/more.c:1487
+#: text-utils/more.c:1479
 msgid "Regular expression botch"
 msgstr "Error en expresi�n regular"
 
-#: text-utils/more.c:1499
+#: text-utils/more.c:1491
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -8817,15 +8966,15 @@ msgstr ""
 "\n"
 "Patr�n no encontrado\n"
 
-#: text-utils/more.c:1502
+#: text-utils/more.c:1494
 msgid "Pattern not found"
 msgstr "Patr�n no encontrado"
 
-#: text-utils/more.c:1563
+#: text-utils/more.c:1555
 msgid "can't fork\n"
 msgstr "no se puede bifurcar\n"
 
-#: text-utils/more.c:1602
+#: text-utils/more.c:1594
 msgid ""
 "\n"
 "...Skipping "
@@ -8833,23 +8982,23 @@ msgstr ""
 "\n"
 "...Saltando "
 
-#: text-utils/more.c:1606
+#: text-utils/more.c:1598
 msgid "...Skipping "
 msgstr "...Saltando "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "to file "
 msgstr "al archivo "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "back to file "
 msgstr "hacia atr�s al archivo "
 
-#: text-utils/more.c:1846
+#: text-utils/more.c:1835
 msgid "Line too long"
 msgstr "L�nea demasiado larga"
 
-#: text-utils/more.c:1890
+#: text-utils/more.c:1878
 msgid "No previous command to substitute for"
 msgstr "No hay ning�n comando anterior para sustituir"
 
@@ -8886,6 +9035,7 @@ msgstr ""
 "hexdump: n�mero total de bytes incorrecto para car�cter de conversi�n %s.\n"
 
 #: text-utils/parse.c:497
+#, ycp-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
 msgstr ""
 "hexdump: %%s requiere un valor de precisi�n o un n�mero total de bytes.\n"
@@ -8899,11 +9049,11 @@ msgstr "hexdump: formato incorrecto {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: car�cter de conversi�n %%%s incorrecto.\n"
 
-#: text-utils/rev.c:114
+#: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
 msgstr "No es posible asignar espacio de b�fer\n"
 
-#: text-utils/rev.c:173
+#: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
 msgstr "uso: rev [archivo ...]\n"
 
@@ -8925,11 +9075,11 @@ msgstr "Secuencia de escape desconocida en entrada: %o, %o\n"
 msgid "Unable to allocate buffer.\n"
 msgstr "No es posible asignar el b�fer.\n"
 
-#: text-utils/ul.c:555
+#: text-utils/ul.c:553
 msgid "Input line too long.\n"
 msgstr "L�nea de entrada demasiado larga.\n"
 
-#: text-utils/ul.c:568
+#: text-utils/ul.c:566
 msgid "Out of memory when growing buffer.\n"
 msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 
@@ -8945,3 +9095,51 @@ msgstr "Uso: kbdrate [-V] [-s] [-r velocidad] [-d retardo]\n"
 #: kbd/kbdrate.c:252
 msgid "Cannot open /dev/port"
 msgstr "No es posible abrir /dev/port"
+
+#~ msgid "Writing disklabel to %s%d.\n"
+#~ msgstr "Escribiendo etiqueta de disco en %s%d.\n"
+
+#~ msgid "%s%d contains no disklabel.\n"
+#~ msgstr "%s%d no contiene ninguna etiqueta de disco.\n"
+
+#~ msgid "Bootstrap installed on %s%d.\n"
+#~ msgstr "Secuencia de inicio instalada en %s%d.\n"
+
+#~ msgid "%s: unknown geometry\n"
+#~ msgstr "%s: geometr�a desconocida\n"
+
+#~ msgid "exec rc failed\n"
+#~ msgstr "La ejecuci�n (exec) de rc ha fallado\n"
+
+#~ msgid "fork of rc shell failed\n"
+#~ msgstr "La bifurcaci�n (fork) de int�rprete de comandos de rc ha fallado\n"
+
+#~ msgid "Cannot get loop info"
+#~ msgstr "No es posible obtener la informaci�n de loop"
+
+#~ msgid "mount: %s has wrong major or minor number"
+#~ msgstr "mount: %s tiene un n�mero principal o secundario incorrecto"
+
+#~ msgid "mount: block device %s is not permitted on its filesystem"
+#~ msgstr ""
+#~ "mount: dispositivo de bloques %s no permitido en este sistema de archivos"
+
+#~ msgid ""
+#~ "Usage: mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
+#~ msgstr ""
+#~ "Uso:   mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o opciones] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o opciones] special node\n"
+#~ "       Un dispositivo especial puede indicarse mediante -L etiqueta o -U "
+#~ "uuid\n"
+
+#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
+#~ msgstr "mount: %s:%s ha fallado; motivo indicado por servidor: %s\n"
+
+#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
+#~ msgstr "uso: %s [-shm | -msg | -sem] id\n"
diff --git a/po/fr.po b/po/fr.po
index e9c44c24a1..b24c48b980 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,103 +3,105 @@
 # Vincent Renardias <vincent@ldsol.com>, 1999.
 # Martin Quinson <mquinson@zeppelin-cb.de>, 1999.
 # Beth Powell <bpowell@turbolinux.com>, 2000.
+# Christophe Merlet (RedFox) <christophe@merlet.net>, 2000.
 #
 # Permission is granted to copy and distribute this file and
 # modified versions of this file provided this header is not removed.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux VERSION\n"
-"POT-Creation-Date: 2000-03-21 14:47-0800\n"
-"PO-Revision-Date: 1999-03-28 19:17+0100\n"
-"Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
+"Project-Id-Version: util-linux 2.10o\n"
+"POT-Creation-Date: 2000-09-07 09:19+0200\n"
+"PO-Revision-Date: 2000-09-07 19:17+0100\n"
+"Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
 "Language-Team: Vincent Renardias <vincent@ldsol.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:146
+#: clock/cmos.c:157
 msgid "booted from MILO\n"
 msgstr "amor�� � partir de MILO\n"
 
-#: clock/cmos.c:155
+#: clock/cmos.c:166
 msgid "Ruffian BCD clock\n"
 msgstr "horloge Ruffian BCD\n"
 
-#: clock/cmos.c:171
+#: clock/cmos.c:182
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "port horloge ajust� � 0x%x\n"
 
-#: clock/cmos.c:181
+#: clock/cmos.c:192
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: clock/cmos.c:235
+#: clock/cmos.c:246
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s : �chec de %s atomique pour 1000 it�rations !"
 
-#: clock/cmos.c:559
+#: clock/cmos.c:570
 #, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr "Impossible d'ouvrir /dev/port: %s"
+msgstr "Impossible d'ouvrir /dev/port : %s"
 
-#: clock/cmos.c:566
+#: clock/cmos.c:577
 msgid "I failed to get permission because I didnt try.\n"
 msgstr ""
 "Je n'ai pas r�ussi � obtenir l'autorisation parce que je n'ai pas essay�.\n"
 
-#: clock/cmos.c:569
+#: clock/cmos.c:580
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s ne peut pas acc�der au port d'E/S : l'appel � iopl(3) a �chou�.\n"
 
-#: clock/cmos.c:572
+#: clock/cmos.c:583
 msgid "Probably you need root privileges.\n"
 msgstr "Vous avez probablement besoin des privil�ges root.\n"
 
-#: clock/hwclock.c:213
+#: clock/hwclock.c:217
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Suppose que l'horloge mat�rielle est � l'heure %s.\n"
 
-#: clock/hwclock.c:214 clock/hwclock.c:303
+#: clock/hwclock.c:218 clock/hwclock.c:307
 msgid "UTC"
 msgstr "UTC"
 
-#: clock/hwclock.c:214 clock/hwclock.c:302
+#: clock/hwclock.c:218 clock/hwclock.c:306
 msgid "local"
 msgstr "local"
 
-#: clock/hwclock.c:286
+#: clock/hwclock.c:290
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr ""
 "%s : Avertissement : le fichier adjtime contient une troisi�me ligne non "
 "reconnue.\n"
 
-#: clock/hwclock.c:288
+#: clock/hwclock.c:292
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Attendu : `UTC' ou `LOCAL' ou rien.)\n"
 
-#: clock/hwclock.c:297
+#: clock/hwclock.c:301
 #, c-format
 msgid "Last drift adjustment done at %d seconds after 1969\n"
 msgstr ""
 "Dernier ajustement du facteur de d�rive effectu� %d secondes apr�s 1969\n"
 
-#: clock/hwclock.c:299
+#: clock/hwclock.c:303
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
 msgstr "Dernier calibrage effectu� %d secondes apr�s 1969\n"
 
-#: clock/hwclock.c:301
+#: clock/hwclock.c:305
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "L'horloge mat�rielle est � l'heure %s\n"
 
-#: clock/hwclock.c:303
+#: clock/hwclock.c:307
 msgid "unknown"
 msgstr "inconnu"
 
@@ -117,43 +119,44 @@ msgstr "inconnu"
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:325
+#: clock/hwclock.c:329
 msgid "Waiting for clock tick...\n"
 msgstr "Attente du tic de l'horloge...\n"
 
-#: clock/hwclock.c:329
+#: clock/hwclock.c:333
 msgid "...got clock tick\n"
 msgstr "...tic de l'horloge re�u\n"
 
-#: clock/hwclock.c:380
+#: clock/hwclock.c:384
 #, c-format
-msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
-"Valeurs incorrectes dans l'horloge mat�rielle : %2d/%.2d/%.2d "
+"Valeurs incorrectes dans l'horloge mat�rielle : %4d/%.2d/%.2d "
 "%.2d:%.2d:%.2d\n"
 
-#: clock/hwclock.c:389
+#: clock/hwclock.c:392
 #, c-format
-msgid "Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
-"Heure � l'horloge mat�rielle : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d secondes depuis 1969\n"
+"Heure � l'horloge mat�rielle : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld secondes "
+"depuis 1969\n"
 
-#: clock/hwclock.c:417
+#: clock/hwclock.c:420
 #, c-format
-msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
-msgstr "Heure lue � l'horloge mat�rielle : %02d:%02d:%02d\n"
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Heure lue � l'horloge mat�rielle : %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: clock/hwclock.c:443
+#: clock/hwclock.c:447
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
 msgstr ""
 "R�glage de l'horloge mat�rielle � %.2d:%.2d:%.2d = %d secondes depuis 1969\n"
 
-#: clock/hwclock.c:449
+#: clock/hwclock.c:453
 msgid "Clock not changed - testing only.\n"
 msgstr "Horloge non modifi�e. Test.\n"
 
-#: clock/hwclock.c:497
+#: clock/hwclock.c:501
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -162,7 +165,7 @@ msgstr ""
 "Le temps �coul� depuis l'heure de r�f�rence est de %.6f secondes.\n"
 "D�lai suppl�mentaire jusqu'� la prochaine seconde.\n"
 
-#: clock/hwclock.c:521
+#: clock/hwclock.c:525
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
@@ -177,18 +180,18 @@ msgstr ""
 #.
 #. Compute display value for time
 #. Cut off trailing newline
-#: clock/hwclock.c:533
+#: clock/hwclock.c:537
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f secondes\n"
 
-#: clock/hwclock.c:567
+#: clock/hwclock.c:571
 msgid "No --date option specified.\n"
 msgstr "Pas d'option --date sp�cifi�e.\n"
 
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:572
+#: clock/hwclock.c:576
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
@@ -196,23 +199,23 @@ msgstr ""
 "La valeur de l'option --date n'est pas une date valide.\n"
 "Elle contient, en particulier, des points d'interrogation.\n"
 
-#: clock/hwclock.c:578
+#: clock/hwclock.c:582
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "R�ponse de la commande date : %s\n"
 
-#: clock/hwclock.c:582
+#: clock/hwclock.c:586
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Impossible de lancer le programme 'date' dans le shell /bin/sh. popen() a "
 "�chou�."
 
-#: clock/hwclock.c:588
+#: clock/hwclock.c:592
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "R�ponse de la commande date = %s\n"
 
-#: clock/hwclock.c:590
+#: clock/hwclock.c:594
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -227,11 +230,11 @@ msgstr ""
 "Le r�sultat �tait :\n"
 "  %s\n"
 
-#: clock/hwclock.c:599
+#: clock/hwclock.c:603
 #, c-format
 msgid ""
-"The date command issued by %s returnedsomething other than an integer where "
-"the convertedtime value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
@@ -244,12 +247,12 @@ msgstr ""
 "Le r�sultat �tait :\n"
 "  %s\n"
 
-#: clock/hwclock.c:609
+#: clock/hwclock.c:613
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr "La cha�ne de date %s �quivaut � %d secondes depuis 1969.\n"
 
-#: clock/hwclock.c:641
+#: clock/hwclock.c:645
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
@@ -257,34 +260,34 @@ msgstr ""
 "L'horloge mat�rielle ne contient pas d'heure valide. On ne peut donc pas "
 "r�gler l'horloge syst�me � partir de celle-ci.\n"
 
-#: clock/hwclock.c:654
+#: clock/hwclock.c:667
 msgid "Calling settimeofday:\n"
 msgstr "Appel de settimeofday :\n"
 
-#: clock/hwclock.c:655
+#: clock/hwclock.c:668
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: clock/hwclock.c:657
+#: clock/hwclock.c:670
 #, c-format
-msgid "\ttz.tz_minuteswest = %ld\n"
-msgstr "\ttz.tz_minuteswest = %ld\n"
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: clock/hwclock.c:660
+#: clock/hwclock.c:673
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "L'horloge syst�me n'a pas �t� modifi�e car l'ex�cution est en mode test.\n"
 
-#: clock/hwclock.c:673
+#: clock/hwclock.c:681
 msgid "Must be superuser to set system clock.\n"
 msgstr "Vous devez �tre un superutilisateur pour d�finir l'horloge syst�me.\n"
 
-#: clock/hwclock.c:675
+#: clock/hwclock.c:683
 msgid "settimeofday() failed"
 msgstr "settimeofday() a �chou�."
 
-#: clock/hwclock.c:708
+#: clock/hwclock.c:716
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
@@ -292,7 +295,7 @@ msgstr ""
 "Pas de modification du facteur de d�rive car l'horloge mat�rielle contient "
 "des d�chets.\n"
 
-#: clock/hwclock.c:712
+#: clock/hwclock.c:720
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
@@ -300,7 +303,7 @@ msgstr ""
 "Le facteur de d�rive n'a pas �t� modifi� car le dernier calibrage a moins "
 "d'un jour.\n"
 
-#: clock/hwclock.c:721
+#: clock/hwclock.c:729
 #, c-format
 msgid ""
 "Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
@@ -311,22 +314,22 @@ msgstr ""
 "le facteur de d�rive de %f secondes par jour.\n"
 "Ajustement du facteur de d�rive � %f secondes par jour.\n"
 
-#: clock/hwclock.c:772
+#: clock/hwclock.c:780
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Il s'est �coul� %d secondes depuis le dernier ajustement.\n"
 
-#: clock/hwclock.c:774
+#: clock/hwclock.c:782
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "Il faut ajouter %d secondes, et se r�f�rer � %.6f secondes dans le pass�.\n"
 
-#: clock/hwclock.c:803
+#: clock/hwclock.c:811
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Fichier adjtime non modifiable en mode test.\n"
 
-#: clock/hwclock.c:804
+#: clock/hwclock.c:812
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -335,37 +338,37 @@ msgstr ""
 "Aurait �crit ce qui suit sur %s :\n"
 "%s"
 
-#: clock/hwclock.c:828
+#: clock/hwclock.c:836
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Facteur de d�rive non modifi�.\n"
 
-#: clock/hwclock.c:869
+#: clock/hwclock.c:877
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "L'horloge mat�rielle ne contient pas d'heure valide, on ne peut donc pas "
 "l'ajuster.\n"
 
-#: clock/hwclock.c:893
+#: clock/hwclock.c:901
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "L'ajustement n�cessaire est inf�rieur � une seconde, pas de changement "
 "effectu�.\n"
 
-#: clock/hwclock.c:919
+#: clock/hwclock.c:927
 #, c-format
 msgid "Using %s.\n"
 msgstr "Utilisation de %s.\n"
 
-#: clock/hwclock.c:921
+#: clock/hwclock.c:929
 msgid "No usable clock interface found.\n"
 msgstr "Aucune interface avec l'horloge utilisable trouv�e.\n"
 
-#: clock/hwclock.c:1016
+#: clock/hwclock.c:1024
 msgid "Unable to set system clock.\n"
 msgstr "Impossible de r�gler l'horloge syst�me.\n"
 
-#: clock/hwclock.c:1045
+#: clock/hwclock.c:1053
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
 "machine.\n"
@@ -379,16 +382,16 @@ msgstr ""
 "(et n'est, par cons�quent, sans doute pas ex�cut�e sur un Alpha). Aucune "
 "action entreprise.\n"
 
-#: clock/hwclock.c:1054
+#: clock/hwclock.c:1062
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Impossible d'obtenir la valeur epoch depuis le kernel.\n"
 
-#: clock/hwclock.c:1056
+#: clock/hwclock.c:1064
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Le kernel suppose une valeur epoch de %lu\n"
 
-#: clock/hwclock.c:1059
+#: clock/hwclock.c:1067
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
@@ -396,16 +399,17 @@ msgstr ""
 "Pour d�finir une valeur epoch, utilisez l'option 'epoch' pour indiquer la "
 "valeur sur laquelle elle doit �tre r�gl�e.\n"
 
-#: clock/hwclock.c:1062
+#: clock/hwclock.c:1070
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Valeur epoch non d�finie sur %d. Test uniquement.\n"
 
-#: clock/hwclock.c:1065
+#: clock/hwclock.c:1073
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Impossible de modifier la valeur epoch du kernel.\n"
 
-#: clock/hwclock.c:1088
+#: clock/hwclock.c:1102
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -427,25 +431,25 @@ msgid ""
 "Options: \n"
 "  --utc         the hardware clock is kept in coordinated universal time\n"
 "  --localtime   the hardware clock is kept in local time\n"
-"  --directisa   access the ISA bus directly instead of /dev/rtc\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
 "  --badyear     ignore rtc's year because the bios is broken\n"
 "  --date        specifies the time to which to set the hardware clock\n"
 "  --epoch=year  specifies the year which is the beginning of the \n"
 "                hardware clock's epoch value\n"
 msgstr ""
 
-#: clock/hwclock.c:1113
+#: clock/hwclock.c:1127
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 
-#: clock/hwclock.c:1209
+#: clock/hwclock.c:1223
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "L'option %s ne prend pas d'argument. Cependant, vous avez donn� %d.\n"
 
-#: clock/hwclock.c:1219
+#: clock/hwclock.c:1233
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
@@ -453,7 +457,7 @@ msgstr ""
 "Vous avez d�fini plusieurs options de fonction.\n"
 "Vous pouvez effectuer une seule fonction � la fois.\n"
 
-#: clock/hwclock.c:1225
+#: clock/hwclock.c:1239
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -462,30 +466,39 @@ msgstr ""
 "%s : Les options --utc et --localtime s'excluent mutuellement. Vous avez "
 "d�fini les deux.\n"
 
-#: clock/hwclock.c:1238
+#: clock/hwclock.c:1252
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "Aucune heure utilisable. Impossible de r�gler l'horloge.\n"
 
-#: clock/hwclock.c:1253
+#: clock/hwclock.c:1267
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
-"D�sol�, seul l'utilisateur root est autoris� � modifier l'horloge "
+"D�sol�, seul le superutilisateur est autoris� � modifier l'horloge "
 "mat�rielle.\n"
 
-#: clock/hwclock.c:1257
+#: clock/hwclock.c:1271
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr ""
+"D�sol�, seul le superutilisateur est autoris� � modifier l'horloge syst�me.\n"
+
+#: clock/hwclock.c:1275
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
-"D�sol�, seul l'utilisateur root est autoris� � modifier la valeur epoch de "
+"D�sol�, seul le superutilisateur est autoris� � modifier la valeur epoch de "
 "l'horloge mat�rielle dans le kernel.\n"
 
-#: clock/hwclock.c:1275
+#: clock/hwclock.c:1295
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr ""
+"Impossible d'acc�der � l'horloge mat�riel � l'aide d'une m�thode connue.\n"
+
+#: clock/hwclock.c:1298
 msgid ""
-"Cannot access the Hardware Clock via any known method.  Use --debug option "
-"to see the details of our search for an access method.\n"
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
 msgstr ""
-"Impossible d'acc�der � l'horloge mat�rielle � l'aide d'une m�thode connue. "
 "Utilisez l'option --debug pour afficher les d�tails de la recherche d'une "
 "m�thode d'acc�s.\n"
 
@@ -497,7 +510,7 @@ msgstr "Attente en boucle du changement d'heure dans KDGHWCLK.\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "La lecture de l'heure par KDGHWCLK ioctl a �chou�."
 
-#: clock/kd.c:65 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
 msgstr "Temporisation de l'attente du changement d'heure.\n"
 
@@ -515,111 +528,118 @@ msgstr "ioctl() pour ouvrir /dev/tty1 a �chou�."
 
 #: clock/kd.c:157
 msgid "KDGHWCLK ioctl failed"
-msgstr "Echec de KDGHWCLK ioctl."
+msgstr "�chec de KDGHWCLK ioctl."
 
-#: clock/kd.c:161
+#: clock/kd.c:163
 msgid "Can't open /dev/tty1"
 msgstr "Impossible d'ouvrir /dev/tty1."
 
-#: clock/rtc.c:98
-msgid "ioctl() to /dev/rtc to read the time failed.\n"
-msgstr "ioctl() sur /dev/rtc pour lire l'heure a �chou�.\n"
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "ioctl() sur %s pour lire l'heure a �chou�.\n"
 
-#: clock/rtc.c:129
-msgid "Waiting in loop for time from /dev/rtc to change\n"
-msgstr "Attente en boucle du changement de l'heure de /dev/rtc.\n"
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Attente en boucle du changement de l'heure de %s.\n"
 
-#: clock/rtc.c:165 clock/rtc.c:222
-msgid "open() of /dev/rtc failed"
-msgstr "open() de /dev/rtc a �chou�."
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() de %s a �chou�."
 
-#. This rtc device doesn't have interrupt functions.  This is typical
-#. on an Alpha, where the Hardware Clock interrupts are used by the
-#. kernel for the system clock, so aren't at the user's disposal.
-#.
-#: clock/rtc.c:182
-msgid "/dev/rtc does not have interrupt functions. "
-msgstr "/dev/rtc n'a pas de fonctions d'interruption. "
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s n'a pas de fonctions d'interruption. "
 
-#: clock/rtc.c:191
-msgid "read() to /dev/rtc to wait for clock tick failed"
-msgstr "read() sur /dev/rtc pour attendre le tic de l'horloge a �chou�."
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "read() sur %s pour attendre le tic de l'horloge a �chou�."
 
-#: clock/rtc.c:199
-msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
-"ioctl() sur /dev/rtc pour d�sactiver les interruptions de mise � jour a "
-"�chou�."
+"ioctl() sur %s pour d�sactiver les interruptions de mise � jour a �chou�."
 
-#: clock/rtc.c:202
-msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"ioctl() sur /dev/rtc pour activer les interruptions de mise � jour a �chou� "
-"de mani�re inattendue."
+"ioctl() sur %s pour activer les interruptions de mise � jour a �chou� de "
+"mani�re inattendue."
 
-#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
-msgid "Unable to open /dev/rtc"
-msgstr "Impossible d'ouvrir /dev/rtc."
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossible d'ouvrir %s."
 
-#: clock/rtc.c:268
-msgid "ioctl() to /dev/rtc to set the time failed.\n"
-msgstr "ioctl() sur /dev/rtc pour r�gler l'heure a �chou�.\n"
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "ioctl() sur %s pour r�gler l'heure a �chou�.\n"
 
-#: clock/rtc.c:272
+#: clock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) a abouti.\n"
 
-#: clock/rtc.c:302
-msgid "Open of /dev/rtc failed"
-msgstr "L'ouverture de /dev/rtc a �chou�."
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "L'ouverture de %s a �chou�."
 
-#: clock/rtc.c:320 clock/rtc.c:365
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file /dev/rtc.  This file does not "
-"exist on this system.\n"
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
 msgstr ""
 "Afin de pouvoir manipuler la valeur epoch dans le kernel, nous devons "
 "acc�der au pilote de p�riph�rique Linux 'rtc' depuis le fichier sp�cial de "
-"p�riph�rique /dev/rtc. Ce fichier est introuvable sur le syst�me.\n"
+"p�riph�rique %s. Ce fichier est introuvable sur le syst�me.\n"
 
-#: clock/rtc.c:331
-msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
-msgstr "ioctl(RTC_EPOCH_READ) sur /dev/rtc a �chou�."
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "ioctl(RTC_EPOCH_READ) sur %s a �chou�."
 
-#: clock/rtc.c:337
+#: clock/rtc.c:344
 #, c-format
-msgid "we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n"
-msgstr "Valeur epoch lue %ld depuis /dev/rtc avec RTC_EPOCH_READ ioctl.\n"
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "Valeur epoch lue %ld depuis %s avec RTC_EPOCH_READ ioctl.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: clock/rtc.c:357
+#: clock/rtc.c:364
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 "La valeur epoch doit �tre sup�rieure ou �gale � 1900. Vous avez demand� "
 "%ld.\n"
 
-#: clock/rtc.c:374
+#: clock/rtc.c:381
 #, c-format
-msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
-msgstr ""
-"R�glage de la valeur epoch sur %ld avec RTC_EPOCH_SET ioctl sur /dev/rtc.\n"
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "R�glage de la valeur epoch sur %ld avec RTC_EPOCH_SET ioctl sur %s.\n"
 
-#: clock/rtc.c:379
+#: clock/rtc.c:386
+#, c-format
 msgid ""
-"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
-"ioctl.\n"
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
-"Le pilote de p�riph�rique du kernel pour /dev/rtc ne dispose pas de "
-"RTC_EPOCH_SET ioctl.\n"
+"Le pilote de p�riph�rique du kernel pour %s ne dispose pas de RTC_EPOCH_SET "
+"ioctl.\n"
 
-#: clock/rtc.c:382
-msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
-msgstr "ioctl(RTC_EPOCH_SET) sur /dev/rtc a �chou�."
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "ioctl(RTC_EPOCH_SET) sur %s a �chou�."
 
 #: clock/shhopt.c:255 clock/shhopt.c:281
 #, c-format
@@ -651,83 +671,83 @@ msgstr "l'option `%s' n'autorise pas d'argument\n"
 msgid "unrecognized option `-%c'\n"
 msgstr "option non reconnue `-%c'\n"
 
-#: disk-utils/blockdev.c:34
+#: disk-utils/blockdev.c:47
 msgid "set read-only"
-msgstr ""
+msgstr "d�fini en lecture seulement"
 
-#: disk-utils/blockdev.c:35
+#: disk-utils/blockdev.c:48
 msgid "set read-write"
-msgstr ""
+msgstr "d�fini en lecture-�criture"
 
-#: disk-utils/blockdev.c:38
+#: disk-utils/blockdev.c:51
 msgid "get read-only"
 msgstr ""
 
-#: disk-utils/blockdev.c:41
+#: disk-utils/blockdev.c:54
 msgid "get sectorsize"
 msgstr ""
 
-#: disk-utils/blockdev.c:44
+#: disk-utils/blockdev.c:57
 msgid "get size"
 msgstr ""
 
-#: disk-utils/blockdev.c:47
+#: disk-utils/blockdev.c:60
 msgid "set readahead"
 msgstr ""
 
-#: disk-utils/blockdev.c:50
+#: disk-utils/blockdev.c:63
 msgid "get readahead"
 msgstr ""
 
-#: disk-utils/blockdev.c:53
+#: disk-utils/blockdev.c:66
 msgid "flush buffers"
-msgstr ""
+msgstr "vide les tampons"
 
-#: disk-utils/blockdev.c:57
-msgid "reread partition table\n"
-msgstr ""
+#: disk-utils/blockdev.c:70
+msgid "reread partition table"
+msgstr "relecture de la table de partition"
 
-#: disk-utils/blockdev.c:66
+#: disk-utils/blockdev.c:79
 #, c-format
 msgid "Usage: %s [-V] [-v|-q] commands devices\n"
-msgstr ""
+msgstr "Usage : %s [-V] [-v|-q] commandes p�riph�riques\n"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:80
 msgid "Available commands:\n"
-msgstr ""
+msgstr "Commandes disponible :\n"
 
-#: disk-utils/blockdev.c:167
+#: disk-utils/blockdev.c:180
 #, c-format
 msgid "%s: Unknown command: %s\n"
-msgstr ""
+msgstr "%s : Commande inconnue : %s\n"
 
-#: disk-utils/blockdev.c:178
+#: disk-utils/blockdev.c:191
 #, c-format
 msgid "%s requires an argument\n"
-msgstr ""
+msgstr "%s n�cessite un argument\n"
 
-#: disk-utils/fdformat.c:33
+#: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Formatage en cours ... "
 
-#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
 msgstr "termin�\n"
 
-#: disk-utils/fdformat.c:62
+#: disk-utils/fdformat.c:65
 msgid "Verifying ... "
 msgstr "V�rification en cours ... "
 
-#: disk-utils/fdformat.c:73
+#: disk-utils/fdformat.c:76
 msgid "Read: "
 msgstr "Lecture : "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:78
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
 msgstr "Probl�me lors de la lecture du cylindre %d, %d attendu, %d lu\n"
 
-#: disk-utils/fdformat.c:81
+#: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
@@ -736,80 +756,80 @@ msgstr ""
 "Mauvaises donn�es au cylindre %d\n"
 "Continuation..."
 
-#: disk-utils/fdformat.c:96
+#: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
 msgstr "Usage : %s [ -n ] p�riph�rique\n"
 
-#: disk-utils/fdformat.c:117 disk-utils/fsck.minix.c:1255 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:650 disk-utils/mkswap.c:351
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:175 misc-utils/ddate.c:172
-#: misc-utils/kill.c:191
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:444
+#: disk-utils/setfdprm.c:128 misc-utils/cal.c:172 misc-utils/ddate.c:181
+#: misc-utils/kill.c:192
 #, c-format
 msgid "%s from %s\n"
-msgstr ""
+msgstr "%s de %s\n"
 
-#: disk-utils/fdformat.c:131
+#: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
 msgstr "%s : n'est pas un lecteur de disquettes.\n"
 
-#: disk-utils/fdformat.c:137
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
 msgstr "Impossible de d�terminer le type du format en cours."
 
-#: disk-utils/fdformat.c:138
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "%s-faces, %d pistes, %d sec/piste. Capacit� totale %d Ko.\n"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Double"
 msgstr "Double"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Single"
 msgstr "Simple"
 
-#: disk-utils/fsck.minix.c:196
+#: disk-utils/fsck.minix.c:197
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Usage : %s [ -larvsmf ] /dev/nom\n"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:296
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s est mont�.\t "
 
-#: disk-utils/fsck.minix.c:296
+#: disk-utils/fsck.minix.c:298
 msgid "Do you really want to continue"
 msgstr "Voulez-vous vraiment continuer ?"
 
-#: disk-utils/fsck.minix.c:300
+#: disk-utils/fsck.minix.c:302
 msgid "check aborted.\n"
 msgstr "V�rification interrompue.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:337
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
 msgid "Zone nr < FIRSTZONE in file `"
 msgstr "Zone n� < FIRSTZONE dans fichier `"
 
-#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
 msgid "Zone nr >= ZONES in file `"
 msgstr "Zone n� >= ZONES dans fichier `"
 
-#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
 msgid "Remove block"
 msgstr "Enlever le bloc"
 
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:364
 msgid "Read error: unable to seek to block in file '"
 msgstr "Erreur de lecture : bloc impossible dans le fichier '"
 
-#: disk-utils/fsck.minix.c:368
+#: disk-utils/fsck.minix.c:370
 msgid "Read error: bad block in file '"
 msgstr "Erreur de lecture : mauvais bloc dans le fichier '"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:386
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -817,284 +837,284 @@ msgstr ""
 "Erreur interne : tentative d'�criture d'un mauvais bloc.\n"
 "Requ�te d'�criture ignor�e.\n"
 
-#: disk-utils/fsck.minix.c:390 disk-utils/mkfs.minix.c:289
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
 msgid "seek failed in write_block"
 msgstr "La recherche dans write_block a �chou�."
 
-#: disk-utils/fsck.minix.c:392
+#: disk-utils/fsck.minix.c:394
 msgid "Write error: bad block in file '"
 msgstr "Erreur d'�criture : mauvais bloc dans le fichier '"
 
-#: disk-utils/fsck.minix.c:511
+#: disk-utils/fsck.minix.c:513
 msgid "seek failed in write_super_block"
 msgstr "La recherche dans write_super_block a �chou�."
 
-#: disk-utils/fsck.minix.c:513 disk-utils/mkfs.minix.c:276
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr "Impossible d'�crire les superblocs"
 
-#: disk-utils/fsck.minix.c:523
+#: disk-utils/fsck.minix.c:525
 msgid "Unable to write inode map"
 msgstr "Impossible d'�crire la table des i-noeuds"
 
-#: disk-utils/fsck.minix.c:525
+#: disk-utils/fsck.minix.c:527
 msgid "Unable to write zone map"
 msgstr "Impossible d'�crire la table des zones"
 
-#: disk-utils/fsck.minix.c:527
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inodes"
 msgstr "Impossible d'�crire les i-noeuds"
 
-#: disk-utils/fsck.minix.c:556
+#: disk-utils/fsck.minix.c:558
 msgid "seek failed"
 msgstr "La recherche a �chou�."
 
-#: disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.minix.c:560
 msgid "unable to read super block"
 msgstr "Impossible de lire les superblocs"
 
-#: disk-utils/fsck.minix.c:578
+#: disk-utils/fsck.minix.c:580
 msgid "bad magic number in super-block"
 msgstr "Mauvais nombre magique dans le superbloc"
 
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:582
 msgid "Only 1k blocks/zones supported"
 msgstr "Seuls les blocs/zones de 1k sont pris en charge."
 
-#: disk-utils/fsck.minix.c:582
+#: disk-utils/fsck.minix.c:584
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Champ s_imap_blocks invalide dans le superbloc"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:586
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Champ s_zmap_blocks invalide dans le superbloc"
 
-#: disk-utils/fsck.minix.c:591
+#: disk-utils/fsck.minix.c:593
 msgid "Unable to allocate buffer for inode map"
 msgstr "Impossible d'allouer le tampon pour la table des i-noeuds"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inodes"
 msgstr "Impossible d'allouer le tampon pour les i-noeuds"
 
-#: disk-utils/fsck.minix.c:602
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for inode count"
 msgstr "Impossible d'allouer le tampon pour le nombre de i-noeuds"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:607
 msgid "Unable to allocate buffer for zone count"
 msgstr "Impossible d'allouer le tampon pour le nombre de zones"
 
-#: disk-utils/fsck.minix.c:607
+#: disk-utils/fsck.minix.c:609
 msgid "Unable to read inode map"
 msgstr "Impossible de lire la table des i-noeuds"
 
-#: disk-utils/fsck.minix.c:609
+#: disk-utils/fsck.minix.c:611
 msgid "Unable to read zone map"
 msgstr "Impossible de lire la table des zones"
 
-#: disk-utils/fsck.minix.c:611
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to read inodes"
 msgstr "Impossible de lire les i-noeuds"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:615
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Avertissement : Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:532
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld i-noeuds\n"
 
-#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:533
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocs\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Premi�rezonededonn�es=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tailledelazone=%d\n"
 
-#: disk-utils/fsck.minix.c:622
+#: disk-utils/fsck.minix.c:624
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Taillemax=%ld\n"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:625
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Etat du syst�me de fichiers=%d\n"
 
-#: disk-utils/fsck.minix.c:624
+#: disk-utils/fsck.minix.c:626
 #, c-format
 msgid ""
 "namelen=%d\n"
 "\n"
 msgstr "longueurnom=%d\n"
 
-#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:690
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
 msgid "Inode %d marked not used, but used for file '"
 msgstr "I-noeud %d marqu� libre, mais utilis� pour le fichier '"
 
-#: disk-utils/fsck.minix.c:643 disk-utils/fsck.minix.c:694
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
 msgstr "Marqu� utilis�"
 
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:714
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
 msgstr " a pour mode %05o\n"
 
-#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
 msgid "Warning: inode count too big.\n"
 msgstr "Avertissement : nombre de i-noeuds trop grand.\n"
 
-#: disk-utils/fsck.minix.c:732
+#: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
 msgstr "L' i-noeud root n'est pas un r�pertoire."
 
-#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:789
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
 msgid "Block has been used before. Now in file `"
 msgstr "Bloc d�j� utilis�. Maintenant dans le fichier `"
 
-#: disk-utils/fsck.minix.c:758 disk-utils/fsck.minix.c:792
-#: disk-utils/fsck.minix.c:1120 disk-utils/fsck.minix.c:1129
-#: disk-utils/fsck.minix.c:1173 disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
 msgid "Clear"
 msgstr "Effacer"
 
-#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:801
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
 msgstr "Bloc %d dans le fichier `"
 
-#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
 msgstr "' est marqu� libre."
 
-#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
 msgstr "Correct"
 
-#: disk-utils/fsck.minix.c:954 disk-utils/fsck.minix.c:1018
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
 msgid " contains a bad inode number for file '"
 msgstr " contient un nombre i-noeuds incorrect pour le fichier "
 
-#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
 msgstr "Supprimer"
 
-#: disk-utils/fsck.minix.c:970 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
 msgid ": bad directory: '.' isn't first\n"
 msgstr ": mauvais r�pertoire : '.' ne vient pas en premier.\n"
 
-#: disk-utils/fsck.minix.c:977 disk-utils/fsck.minix.c:1042
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
 msgid ": bad directory: '..' isn't second\n"
 msgstr ": mauvais r�pertoire : '..' ne vient pas en second.\n"
 
-#: disk-utils/fsck.minix.c:1074
+#: disk-utils/fsck.minix.c:1070
 msgid "internal error"
 msgstr "Erreur interne"
 
-#: disk-utils/fsck.minix.c:1077
+#: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
 msgstr ": mauvais r�pertoire: taille<32"
 
-#: disk-utils/fsck.minix.c:1096
+#: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
 msgstr ": mauvais r�pertoire: taille < 32"
 
-#: disk-utils/fsck.minix.c:1109
+#: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
 msgstr "La recherche dans bad_zone a �chou�."
 
-#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1172
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Mode i-noeud %d non effac�."
 
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "I-noeud %d libre, mais marqu� utilis� dans le fichier bitmap."
 
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1187
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "I-noeud %d utilis�, mais marqu� libre dans le fichier bitmap."
 
-#: disk-utils/fsck.minix.c:1140 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-noeud %d (mode = %07o), i_nlinks=%d, nombre=%d."
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 msgid "Set i_nlinks to count"
 msgstr "R�gler i_nlinks sur nombre"
 
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zone %d : marqu�e utilis�e, mais aucun fichier ne l'utilise."
 
-#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1207
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "D�marquer"
 
-#: disk-utils/fsck.minix.c:1159 disk-utils/fsck.minix.c:1211
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
 #, c-format
 msgid "Zone %d: %sin use, counted=%d\n"
 msgstr "Zone %d : %s utilis�e, nombre=%d\n"
 
-#: disk-utils/fsck.minix.c:1160 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
 msgstr "non "
 
-#: disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1182
 msgid "Set"
 msgstr "D�finir"
 
-#: disk-utils/fsck.minix.c:1260 disk-utils/mkfs.minix.c:655
-#: disk-utils/mkfs.minix.c:658
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
 msgid "bad inode size"
 msgstr "Taille de i-noeuds incorrecte"
 
-#: disk-utils/fsck.minix.c:1263
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "Taille de i-noeuds v2 incorrecte"
 
-#: disk-utils/fsck.minix.c:1289
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "Terminal requis pour r�parations interactives"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "Impossible d'ouvrir '%s'"
 
-#: disk-utils/fsck.minix.c:1308
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s est propre, pas de v�rification.\n"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "For�age de la v�rification du syst�me de fichiers sur %s.\n"
 
-#: disk-utils/fsck.minix.c:1314
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Syst�me de fichiers sur %s non propre. V�rification requise.\n"
 
-#: disk-utils/fsck.minix.c:1343
+#: disk-utils/fsck.minix.c:1336
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
@@ -1102,11 +1122,11 @@ msgstr ""
 "\n"
 "%6ld i-noeuds utilis�s (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones utilis�es (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1343
 #, c-format
 msgid ""
 "\n"
@@ -1129,22 +1149,22 @@ msgstr ""
 "------\n"
 "%6d fichiers\n"
 
-#: disk-utils/fsck.minix.c:1363
+#: disk-utils/fsck.minix.c:1356
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
 "----------------------------\n"
 msgstr ""
-"----------------------------\n"
-"LE SYSTEME DE FICHIERS A ETE MODIFIE\n"
-"----------------------------\n"
+"------------------------------------\n"
+"LE SYST�ME DE FICHIERS A �T� MODIFI�\n"
+"------------------------------------\n"
 
 #: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr "Usage : mkfs [-V] [-t fstype] [fs-options] p�riph�rique [taille]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s : A court de m�moire !\n"
@@ -1154,198 +1174,199 @@ msgstr "%s : A court de m�moire !\n"
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs version %s (%s)\n"
 
-#: disk-utils/mkfs.minix.c:185
+#: disk-utils/mkfs.minix.c:179
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Usage : %s [-c | -l nomdefichier] [-nXX] [-iXX] /dev/nom [blocs]\n"
 
-#: disk-utils/mkfs.minix.c:209
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s est mont� ; pas de cr�ation de syst�me de fichiers ici !"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
 msgstr "La recherche de bloc d'amorce dans write_tables a �chou�."
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
 msgstr "Impossible d'effacer le secteur d'amorce."
 
-#: disk-utils/mkfs.minix.c:274
+#: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
 msgstr "La recherche dans write_tables a �chou�."
 
-#: disk-utils/mkfs.minix.c:278
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
 msgstr "Impossible d'�crire la table des i-noeuds."
 
-#: disk-utils/mkfs.minix.c:280
+#: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
 msgstr "Impossible d'�crire la table des zones."
 
-#: disk-utils/mkfs.minix.c:282
+#: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
 msgstr "Impossible d'�crire les i-noeuds."
 
-#: disk-utils/mkfs.minix.c:291
+#: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
 msgstr "L'�criture dans write_block a �chou�."
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:299 disk-utils/mkfs.minix.c:373
-#: disk-utils/mkfs.minix.c:424
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
 msgid "too many bad blocks"
 msgstr "Trop de mauvais blocs."
 
-#: disk-utils/mkfs.minix.c:307
+#: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
 msgstr "Pas assez de bons blocs."
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
 msgstr "Impossible d'allouer le tampon pour les tables."
 
-#: disk-utils/mkfs.minix.c:530
+#: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
 msgstr "Impossible d'allouer le tampon pour les i-noeuds."
 
-#: disk-utils/mkfs.minix.c:536
+#: disk-utils/mkfs.minix.c:528
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr "Taillemax=%ld\n"
 
-#: disk-utils/mkfs.minix.c:550
+#: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
 msgstr "La recherche lors du test des blocs a �chou�."
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:550
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valeurs �tranges dans do_check : sans doute des bogues.\n"
 
-#: disk-utils/mkfs.minix.c:589 disk-utils/mkswap.c:261
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:354
 msgid "seek failed in check_blocks"
 msgstr "La recherche dans check_blocks a �chou�."
 
-#: disk-utils/mkfs.minix.c:598
+#: disk-utils/mkfs.minix.c:590
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "Mauvais blocs avant la zone de donn�es : impossible de cr�er fs."
 
-#: disk-utils/mkfs.minix.c:604 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
-msgstr "%ld mauvais blocs\n"
+msgstr "%d mauvais blocs\n"
 
-#: disk-utils/mkfs.minix.c:606 disk-utils/mkfs.minix.c:628
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
 msgstr "un mauvais bloc\n"
 
-#: disk-utils/mkfs.minix.c:618
+#: disk-utils/mkfs.minix.c:608
 msgid "can't open file of bad blocks"
 msgstr "Impossible d'ouvrir le fichier contenant les mauvais blocs."
 
-#: disk-utils/mkfs.minix.c:687
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
 msgstr "%s : non compil� avec prise en charge minix v2.\n"
 
-#: disk-utils/mkfs.minix.c:703
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "Erreur strtol : nombre de blocs non indiqu�.'"
 
-#: disk-utils/mkfs.minix.c:735
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
 msgstr "Impossible d'ouvrir %s"
 
-#: disk-utils/mkfs.minix.c:737
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
 msgstr "stat de %s impossible"
 
-#: disk-utils/mkfs.minix.c:741
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "Pas de tentative de cr�ation d'un syst�me de fichiers sur '%s'."
 
-#: disk-utils/mkswap.c:117
+#: disk-utils/mkswap.c:170
 #, c-format
 msgid "Bad user-specified page size %d\n"
-msgstr ""
+msgstr "Mauvaise taille de page %d sp�cifi� par l'utilisateur\n"
 
-#: disk-utils/mkswap.c:126
+#: disk-utils/mkswap.c:179
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
+"Utilise une taille de page %d sp�cifi� par l'utilisateur, au lieu des "
+"valeurs syst�me %d/%d\n"
 
-#: disk-utils/mkswap.c:130
+#: disk-utils/mkswap.c:183
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr ""
-"Pages de format %d (pas %d) attendues.\n"
+msgstr "Pages de format %d (pas %d) attendues.\n"
 
-#: disk-utils/mkswap.c:215
+#: disk-utils/mkswap.c:308
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
 msgstr "Usage : %s [-c] [-v0|-v1] [-pTAILLEPG] /dev/nom [taille en blocs]\n"
 
-#: disk-utils/mkswap.c:238
+#: disk-utils/mkswap.c:331
 msgid "too many bad pages"
 msgstr "Trop de mauvaises pages"
 
-#: disk-utils/mkswap.c:252 misc-utils/look.c:170 misc-utils/setterm.c:1100
-#: text-utils/more.c:1863 text-utils/more.c:1874
+#: disk-utils/mkswap.c:345 misc-utils/look.c:179 misc-utils/setterm.c:1129
+#: text-utils/more.c:1851 text-utils/more.c:1862
 msgid "Out of memory"
 msgstr "A court de m�moire"
 
-#: disk-utils/mkswap.c:269
+#: disk-utils/mkswap.c:362
 msgid "one bad page\n"
 msgstr "une mauvaise page\n"
 
-#: disk-utils/mkswap.c:271
+#: disk-utils/mkswap.c:364
 #, c-format
 msgid "%d bad pages\n"
 msgstr "%d mauvaises pages\n"
 
-#: disk-utils/mkswap.c:391
+#: disk-utils/mkswap.c:484
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s : erreur  : aucun endroit d�fini pour l'�change ?\n"
 
-#: disk-utils/mkswap.c:409
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
 msgstr ""
 "%s : erreur : la taille %ld est plus grande que celle du p�riph�rique : %d\n"
 
-#: disk-utils/mkswap.c:427
+#: disk-utils/mkswap.c:521
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s : erreur : version inconnue %d\n"
 
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:527
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr ""
 "%s : erreur : la taille de la zone d'�change doit �tre d'au moins %ldKo\n"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s : avertissement : troncature de la zone d'�change � %ldKo\n"
 
-#: disk-utils/mkswap.c:464
+#: disk-utils/mkswap.c:558
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Pas d'essai de cr�ation de p�riph�rique d'�change sur '%s'"
 
-#: disk-utils/mkswap.c:473 disk-utils/mkswap.c:494
+#: disk-utils/mkswap.c:567 disk-utils/mkswap.c:588
 msgid "fatal: first page unreadable"
 msgstr "Erreur bloquante : premi�re page illisible."
 
-#: disk-utils/mkswap.c:479
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1360,26 +1381,26 @@ msgstr ""
 "p�riph�rique, utilisez\n"
 "l'option -f pour forcer celui-ci.\n"
 
-#: disk-utils/mkswap.c:503
+#: disk-utils/mkswap.c:597
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossible de configurer l'espace d'�change : illisible."
 
-#: disk-utils/mkswap.c:504
+#: disk-utils/mkswap.c:598
 #, c-format
 msgid "Setting up swapspace version %d, size = %ld bytes\n"
 msgstr "Configuration de l'espace d'�change version %d, taille = %ld octets\n"
 
-#: disk-utils/mkswap.c:510
+#: disk-utils/mkswap.c:604
 msgid "unable to rewind swap-device"
 msgstr "Impossible de rembobiner le p�riph�rique d'�change."
 
-#: disk-utils/mkswap.c:513
+#: disk-utils/mkswap.c:607
 msgid "unable to write signature page"
 msgstr "Impossible d'�crire la page de signature."
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:614
 msgid "fsync failed"
-msgstr "Echec de fsync."
+msgstr "�chec de fsync."
 
 #: disk-utils/setfdprm.c:30
 #, c-format
@@ -1419,46 +1440,46 @@ msgstr "       %s [ -c | -y | -n | -d ] p�riph\n"
 msgid "       %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] p�riph\n"
 
-#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
 msgid "Unusable"
 msgstr "Inutilisable"
 
-#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
 msgid "Free Space"
 msgstr "Espace libre"
 
-#: fdisk/cfdisk.c:399
+#: fdisk/cfdisk.c:398
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:403
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:405
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:410
+#: fdisk/cfdisk.c:409
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:420
 msgid "Disk has been changed.\n"
 msgstr "Le disque a �t� chang�.\n"
 
-#: fdisk/cfdisk.c:422
+#: fdisk/cfdisk.c:421
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "R�amorcez le syst�me pour �tre s�r que la table de partition a �t� "
 "correctement mise � jour.\n"
 
-#: fdisk/cfdisk.c:425
+#: fdisk/cfdisk.c:424
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1466,27 +1487,27 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 "\n"
-"AVERTISSEMENT: Si vous avez cr�� ou modifi�\n"
+"AVERTISSEMENT : Si vous avez cr�� ou modifi�\n"
 "une des partitions DOS 6.x, reportez-vous au manuel\n"
 "de cfdisk pour plus d'informations.\n"
 
-#: fdisk/cfdisk.c:520
+#: fdisk/cfdisk.c:519
 msgid "FATAL ERROR"
 msgstr "ERREUR BLOQUANTE"
 
-#: fdisk/cfdisk.c:529
+#: fdisk/cfdisk.c:528
 msgid "Press any key to exit cfdisk"
 msgstr "Appuyez sur une touche pour quitter cfdisk."
 
-#: fdisk/cfdisk.c:565 fdisk/cfdisk.c:573
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
 msgid "Cannot seek on disk drive"
 msgstr "Erreur d'acc�s sur le disque dur"
 
-#: fdisk/cfdisk.c:567
+#: fdisk/cfdisk.c:566
 msgid "Cannot read disk drive"
 msgstr "Impossible de lire le disque dur"
 
-#: fdisk/cfdisk.c:575
+#: fdisk/cfdisk.c:574
 msgid "Cannot write disk drive"
 msgstr "Impossible d'�crire sur le disque dur"
 
@@ -1688,7 +1709,7 @@ msgstr ""
 #: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1931 fdisk/cfdisk.c:2015
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr ""
-"Entrez un nom de fichier ou appuyez sur ENTREE pour afficher � l'�cran : "
+"Entrez un nom de fichier ou appuyez sur ENTR�E pour afficher � l'�cran : "
 
 #: fdisk/cfdisk.c:1821 fdisk/cfdisk.c:1939 fdisk/cfdisk.c:2023
 #, c-format
@@ -1728,8 +1749,8 @@ msgstr "   Logique"
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1071 fdisk/fdisk.c:1220
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1212 fdisk/fdisk.c:1436
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:663 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -1935,7 +1956,7 @@ msgstr ""
 
 #: fdisk/cfdisk.c:2133
 msgid "             Since this might destroy data on the disk, you must"
-msgstr "             Etant donn� que cela peut d�truire des donn�es"
+msgstr "             �tant donn� que cela peut d�truire des donn�es"
 
 #: fdisk/cfdisk.c:2134
 msgid "             either confirm or deny the write by entering `yes' or"
@@ -1969,8 +1990,8 @@ msgstr "Remarque : Toutes ces commandes peuvent �tre saisies en majuscules ou"
 msgid "case letters (except for Writes)."
 msgstr "minuscules (� l'exception de Write)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:305
-#: fdisk/fdisksunlabel.c:307
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:312
+#: fdisk/fdisksunlabel.c:314
 msgid "Cylinders"
 msgstr "Cylindres"
 
@@ -1978,7 +1999,7 @@ msgstr "Cylindres"
 msgid "Change cylinder geometry"
 msgstr "Changer la g�om�trie des cylindres"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:309
 msgid "Heads"
 msgstr "T�tes"
 
@@ -2186,23 +2207,23 @@ msgstr "Change l'unit� pour la taille des partitions (Mo, sect, cyl)"
 
 #: fdisk/cfdisk.c:2563
 msgid "Write"
-msgstr "Ecrire"
+msgstr "�crire"
 
 #: fdisk/cfdisk.c:2563
 msgid "Write partition table to disk (this might destroy data)"
-msgstr "Ecrit la table de partition sur le disque (peut d�truire des donn�es)"
+msgstr "�crit la table de partition sur le disque (peut d�truire des donn�es)"
 
 #: fdisk/cfdisk.c:2609
 msgid "Cannot make this partition bootable"
-msgstr "Impossible de rendre cette partition amor�able"
+msgstr "Impossible de rendre cette partition amor�able."
 
 #: fdisk/cfdisk.c:2619
 msgid "Cannot delete an empty partition"
-msgstr "Impossible de supprimer une partition vide"
+msgstr "Impossible de supprimer une partition vide."
 
 #: fdisk/cfdisk.c:2639 fdisk/cfdisk.c:2641
 msgid "Cannot maximize this partition"
-msgstr "Impossible d'optimiser cette partition"
+msgstr "Impossible d'optimiser cette partition."
 
 #: fdisk/cfdisk.c:2649
 msgid "This partition is unusable"
@@ -2225,8 +2246,8 @@ msgid "Illegal command"
 msgstr "Commande non valide"
 
 #: fdisk/cfdisk.c:2718
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
@@ -2266,7 +2287,7 @@ msgstr ""
 "                de t�tes et de secteurs par piste.\n"
 "\n"
 
-#: fdisk/fdisk.c:246
+#: fdisk/fdisk.c:204
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2287,7 +2308,7 @@ msgstr ""
 "-u: Affiche le D�but et la Fin en unit�s de secteurs (au lieu de cylindres)\n"
 "-b 2048 : (pour certains disques MO) Utilise des secteurs de 2048 octets\n"
 
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:216
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2304,213 +2325,222 @@ msgstr ""
 "RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:224
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Impossible d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Impossible de lire %s\n"
 
-#: fdisk/fdisk.c:272
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Impossible de rechercher %s\n"
 
-#: fdisk/fdisk.c:275
+#: fdisk/fdisk.c:233
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Impossible d'�crire %s\n"
 
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:236
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
-msgstr "Echec de BLKGETSIZE ioctl sur %s\n"
+msgstr "�chec de BLKGETSIZE ioctl sur %s\n"
 
-#: fdisk/fdisk.c:282
+#: fdisk/fdisk.c:240
 msgid "Unable to allocate any more memory\n"
 msgstr "Impossible d'allouer plus de m�moire\n"
 
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:242
 msgid "Fatal error\n"
 msgstr "Erreur fatale\n"
 
-#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:332 fdisk/fdisk.c:339
-#: fdisk/fdisk.c:362 fdisk/fdisk.c:380 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:348 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:378 fdisk/fdisk.c:396 fdisk/fdisk.c:412 fdisk/fdisk.c:428
+#: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
 msgstr "Action de commande"
 
-#: fdisk/fdisk.c:296
+#: fdisk/fdisk.c:312
 msgid "   a   toggle a read only flag"
 msgstr "   a   (D�s)active un indicateur en lecture seule"
 
 #. sun
-#: fdisk/fdisk.c:297 fdisk/fdisk.c:341
+#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
 msgid "   b   edit bsd disklabel"
 msgstr "   b   Edite le libell� de disque bsd"
 
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:314
 msgid "   c   toggle the mountable flag"
 msgstr "   c   (D�s)active l'indicateur Mountable"
 
 #. sun
-#: fdisk/fdisk.c:299 fdisk/fdisk.c:318 fdisk/fdisk.c:343
+#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
 msgid "   d   delete a partition"
 msgstr "   d   Supprime une partition"
 
-#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
 msgid "   l   list known partition types"
 msgstr "   l   R�pertorie les types de partition connus"
 
 #. sun
-#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:333 fdisk/fdisk.c:345
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:387 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:349 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   Affiche ce menu"
 
-#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
 msgid "   n   add a new partition"
 msgstr "   n   Ajoute une nouvelle partition"
 
-#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:334 fdisk/fdisk.c:347
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   Cr�e une nouvelle table de partition DOS vide"
 
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:348 fdisk/fdisk.c:371
-#: fdisk/fdisk.c:388
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
 msgid "   p   print the partition table"
 msgstr "   p   Affiche la table de partition"
 
-#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:335 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:372 fdisk/fdisk.c:389 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:351 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr "   q   Quitte le programme sans enregistrer les modifications"
 
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   Cr�e un nouveau libell� de disque Sun vide"
 
 #. sun
-#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   t   change a partition's system id"
 msgstr "   t   Change l'ID syst�me d'une partition"
 
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
 msgid "   u   change display/entry units"
 msgstr "   u   Change l'unit� d'affichage/saisie"
 
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:392
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   v   verify the partition table"
 msgstr "   v   V�rifie la table de partition"
 
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   w   write table to disk and exit"
 msgstr "   w   Ecrit la table sur le disque et quitte le programme"
 
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Fonctions suppl�mentaires (experts seulement)"
 
-#: fdisk/fdisk.c:315
+#: fdisk/fdisk.c:331
 msgid "   a   select bootable partition"
 msgstr "   a   S�lectionne la partition amor�able"
 
 #. sgi flavour
-#: fdisk/fdisk.c:316
+#: fdisk/fdisk.c:332
 msgid "   b   edit bootfile entry"
 msgstr "   b   Edite l'entr�e du fichier amorce"
 
 #. sgi
-#: fdisk/fdisk.c:317
+#: fdisk/fdisk.c:333
 msgid "   c   select sgi swap partition"
 msgstr "   c   S�lectionne la partition de swap SGI"
 
-#: fdisk/fdisk.c:340
+#: fdisk/fdisk.c:356
 msgid "   a   toggle a bootable flag"
 msgstr "   a   (D�s)active un indicateur Bootable"
 
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:358
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   (D�s)active l'indicateur de compatibilit� DOS"
 
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:379
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   Change le nombre de cylindres de remplacement"
 
 #. sun
-#: fdisk/fdisk.c:364 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
 msgid "   c   change number of cylinders"
 msgstr "   c   Change le nombre de cylindres"
 
-#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   Affiche les donn�es brutes de la table de partition"
 
-#: fdisk/fdisk.c:366
+#: fdisk/fdisk.c:382
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   Change le nombre de secteurs suppl�mentaires par cylindre"
 
 #. sun
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
 msgid "   h   change number of heads"
 msgstr "   h   Change le nombre de t�tes"
 
-#: fdisk/fdisk.c:368
+#: fdisk/fdisk.c:384
 msgid "   i   change interleave factor"
 msgstr "   i   Change le facteur d'entrelacement"
 
 #. sun
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:385
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   Change la vitesse de rotation (rpm)"
 
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   Revient au menu principal"
 
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   s   change number of sectors/track"
 msgstr "   s   Change le nombre de secteurs/piste"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:393
 msgid "   y   change number of physical cylinders"
 msgstr "   y   Change le nombre de cylindres physiques"
 
-#: fdisk/fdisk.c:381
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   D�place le d�but des donn�es d'une partition"
 
-#: fdisk/fdisk.c:384
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
 msgid "   e   list extended partitions"
 msgstr "   e   R�pertorie les partitions �tendues"
 
 #. !sun
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
 msgid "   g   create an IRIX partition table"
 msgstr "   g   Cr�e une table de partition IRIX"
 
-#: fdisk/fdisk.c:481
+#. !sun
+#: fdisk/fdisk.c:433
+msgid "   f   fix partition order"
+msgstr "   f   fixe l'ordre des partitions"
+
+#: fdisk/fdisk.c:532
 msgid "You must set"
 msgstr "Vous devez d�finir les"
 
-#: fdisk/fdisk.c:495
+#: fdisk/fdisk.c:546
 msgid "heads"
 msgstr "t�tes"
 
-#: fdisk/fdisk.c:497 fdisk/fdisk.c:905 fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:548 fdisk/fdisk.c:1045 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "secteurs"
 
-#: fdisk/fdisk.c:499 fdisk/fdisk.c:905 fdisk/fdiskbsdlabel.c:444
-#: fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:550 fdisk/fdisk.c:1045 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cylindres"
 
-#: fdisk/fdisk.c:503
+#: fdisk/fdisk.c:554
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2519,33 +2549,33 @@ msgstr ""
 "%s%s.\n"
 "Vous pouvez le faire depuis le menu des fonctions suppl�mentaires.\n"
 
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:555
 msgid " and "
 msgstr " et "
 
-#: fdisk/fdisk.c:538
+#: fdisk/fdisk.c:595
 msgid "Bad offset in primary extended partition\n"
 msgstr "Mauvais d�calage dans la partition primaire �tendue\n"
 
-#: fdisk/fdisk.c:545
+#: fdisk/fdisk.c:609
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Avertissement : suppression des partitions apr�s %d\n"
 
-#: fdisk/fdisk.c:566
+#: fdisk/fdisk.c:625
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr ""
 "Avertissement : pointeur de lien en trop dans la table de partition %d\n"
 
-#: fdisk/fdisk.c:574
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 "Avertissement : va ignorer les donn�es suppl�mentaires de la table de "
 "partition %d\n"
 
-#: fdisk/fdisk.c:600
+#: fdisk/fdisk.c:677
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -2556,36 +2586,36 @@ msgstr ""
 "uniquement conserv�es en m�moire,\n"
 "jusqu'� ce que vous d�cidiez de les �crire. Une fois termin�, le contenu "
 "pr�c�dent\n"
-"ne  pourra �tre restaur�.\n"
+"ne pourra �tre restaur�.\n"
 "\n"
 
-#: fdisk/fdisk.c:636
-msgid "You will not be able to write the partition table.\n"
-msgstr "Vous ne pourrez pas �crire la table de partition.\n"
-
-#: fdisk/fdisk.c:645
+#: fdisk/fdisk.c:701
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Remarque : la taille de secteur est %d (pas %d)\n"
 
-#: fdisk/fdisk.c:693
+#: fdisk/fdisk.c:783
+msgid "You will not be able to write the partition table.\n"
+msgstr "Vous ne pourrez pas �crire la table de partition.\n"
+
+#: fdisk/fdisk.c:811
 msgid ""
-"Device contains neither a valid DOS partition table, nor Sun or SGI "
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 "Le p�riph�rique ne contient ni une table de partition DOS valide, ni un "
-"libell� de disque Sunou SGI.\n"
+"libell� de disque Sun, SGI ou OSF.\n"
 
-#: fdisk/fdisk.c:709
+#: fdisk/fdisk.c:827
 msgid "Internal error\n"
 msgstr "Erreur interne\n"
 
-#: fdisk/fdisk.c:719
+#: fdisk/fdisk.c:849
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Va ignorer la partition �tendue suppl�mentaire %d\n"
 
-#: fdisk/fdisk.c:726
+#: fdisk/fdisk.c:861
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2594,7 +2624,7 @@ msgstr ""
 "Avertissement : l'indicateur invalide 0x%04x de la table de partition %d "
 "sera corrig� par w(rite).\n"
 
-#: fdisk/fdisk.c:747
+#: fdisk/fdisk.c:883
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2602,65 +2632,65 @@ msgstr ""
 "\n"
 "EOF obtenu � trois reprises. Fermeture en cours...\n"
 
-#: fdisk/fdisk.c:784
+#: fdisk/fdisk.c:920
 msgid "Hex code (type L to list codes): "
 msgstr "Code hexad�cimal (tapez L pour afficher une liste des codes) : "
 
-#: fdisk/fdisk.c:823
+#: fdisk/fdisk.c:959
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, %d par d�faut) : "
 
-#: fdisk/fdisk.c:877
+#: fdisk/fdisk.c:1013
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Utilisation de la valeur par d�faut %d\n"
 
-#: fdisk/fdisk.c:881
+#: fdisk/fdisk.c:1017
 msgid "Value out of range.\n"
 msgstr "Valeur hors plage.\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:1027
 msgid "Partition number"
 msgstr "Nombre de partitions"
 
-#: fdisk/fdisk.c:896
+#: fdisk/fdisk.c:1036
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Avertissement : la partition %d a un type vide.\n"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1043
 msgid "cylinder"
 msgstr "cylindre"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1043
 msgid "sector"
 msgstr "secteur"
 
-#: fdisk/fdisk.c:912
+#: fdisk/fdisk.c:1052
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Remplacement des unit�s d'affichage/saisie par %s\n"
 
-#: fdisk/fdisk.c:922
+#: fdisk/fdisk.c:1063
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "AVERTISSEMENT : La partition %d est une partition �tendue.\n"
 
-#: fdisk/fdisk.c:935
+#: fdisk/fdisk.c:1074
 msgid "DOS Compatibility flag is set\n"
 msgstr "L'indicateur de compatibilit� DOS est d�fini.\n"
 
-#: fdisk/fdisk.c:939
+#: fdisk/fdisk.c:1078
 msgid "DOS Compatibility flag is not set\n"
 msgstr "L'indicateur de compatibilit� DOS n'est pas d�fini.\n"
 
-#: fdisk/fdisk.c:1025
+#: fdisk/fdisk.c:1166
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partition %d n'existe pas encore !\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1171
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2673,7 +2703,7 @@ msgstr ""
 "type 0 n'est pas une bonne id�e. Vous pouvez supprimer\n"
 "une partition � l'aide de la commande `d'.\n"
 
-#: fdisk/fdisk.c:1039
+#: fdisk/fdisk.c:1180
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2682,7 +2712,7 @@ msgstr ""
 "inversement.\n"
 "Supprimez-la d'abord.\n"
 
-#: fdisk/fdisk.c:1048
+#: fdisk/fdisk.c:1189
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2692,7 +2722,7 @@ msgstr ""
 "car SunOS/Solaris s'y attend et Linux aime �galement l'utiliser.\n"
 "\n"
 
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1195
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2702,53 +2732,53 @@ msgstr ""
 "et la partition 11 en tant que volume entier (6) car IRIX s'y attend.\n"
 "\n"
 
-#: fdisk/fdisk.c:1068
+#: fdisk/fdisk.c:1209
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "Le type de syst�me de la partition %d a �t� remplac� par %x (%s).\n"
 
-#: fdisk/fdisk.c:1121
+#: fdisk/fdisk.c:1260
 #, 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:1123 fdisk/fdisk.c:1131 fdisk/fdisk.c:1140 fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1262 fdisk/fdisk.c:1270 fdisk/fdisk.c:1279 fdisk/fdisk.c:1288
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132
+#: fdisk/fdisk.c:1263 fdisk/fdisk.c:1271
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logique=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1129
+#: fdisk/fdisk.c:1268
 #, 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:1138
+#: fdisk/fdisk.c:1277
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "La partition %i ne commence pas � la limite du cylindre :\n"
 
-#: fdisk/fdisk.c:1141
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "devrait �tre (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1147
+#: fdisk/fdisk.c:1286
 #, c-format
 msgid "Partition %i does not end on cylinder boundary:\n"
 msgstr "La partition %i ne se termine pas � la limite du cylindre :\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1289
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "devrait �tre (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1157
+#: fdisk/fdisk.c:1296
 #, c-format
 msgid ""
 "\n"
@@ -2761,18 +2791,32 @@ msgstr ""
 "Unit�s = %s sur %d * %d octets\n"
 "\n"
 
-#. FIXME! let's see how this shows up with other languagues
-#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1341
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+"Rien � faire. L'ordre est d�j� correct.\n"
+"\n"
+
+#: fdisk/fdisk.c:1407
 #, 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:1195 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1408 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:648
 msgid "Device"
 msgstr "P�riph�rique"
 
-#: fdisk/fdisk.c:1235
+#: fdisk/fdisk.c:1445
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr ""
+"\n"
+"Les entr�es de la table de partitions ne suivent pas l'ordre du disque.\n"
+
+#: fdisk/fdisk.c:1455
 #, c-format
 msgid ""
 "\n"
@@ -2783,111 +2827,111 @@ msgstr ""
 "Disque %s : %d t�tes, %d secteurs, %d cylindres\n"
 "\n"
 
-#: fdisk/fdisk.c:1237
+#: fdisk/fdisk.c:1457
 msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
 msgstr "N� DA Tt Sec  Cyl  Tt Sec  Cyl   D�but    Taille ID\n"
 
-#: fdisk/fdisk.c:1276
+#: fdisk/fdisk.c:1501
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Avertissement : la partition %d contient un secteur 0.\n"
 
-#: fdisk/fdisk.c:1279
+#: fdisk/fdisk.c:1504
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "Partition %d : t�te %d sup�rieure � la valeur maximum %d\n"
 
-#: fdisk/fdisk.c:1282
+#: fdisk/fdisk.c:1507
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partition %d : secteur %d sup�rieur � la valeur maximum %d\n"
 
-#: fdisk/fdisk.c:1285
+#: fdisk/fdisk.c:1510
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "Partition %d : cylindre %d sup�rieur � la valeur maximum %d.\n"
 
-#: fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1514
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 "Partition %d : secteurs %d pr�c�dents ne correspondent pas au total %d.\n"
 
-#: fdisk/fdisk.c:1319
+#: fdisk/fdisk.c:1546
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Avertissement : mauvaises donn�es de d�but dans la partition %d.\n"
 
-#: fdisk/fdisk.c:1327
+#: fdisk/fdisk.c:1554
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Avertissement : la partition %d chevauche la partition %d.\n"
 
-#: fdisk/fdisk.c:1345
+#: fdisk/fdisk.c:1574
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Avertissement : la partition %d est vide.\n"
 
-#: fdisk/fdisk.c:1350
+#: fdisk/fdisk.c:1579
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "La partition logique %d n'est pas compl�tement dans la partition %d.\n"
 
-#: fdisk/fdisk.c:1356
+#: fdisk/fdisk.c:1585
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr ""
 "Le total des secteurs allou�s %d est sup�rieur � la valeur maximum %d.\n"
 
-#: fdisk/fdisk.c:1359
+#: fdisk/fdisk.c:1588
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d secteurs non allou�s\n"
 
-#: fdisk/fdisk.c:1371 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1601 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:496
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partition %d est d�j� d�finie. Supprimez-la avant de l'ajouter de "
 "nouveau.\n"
 
-#: fdisk/fdisk.c:1392 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
-#: fdisk/fdisksunlabel.c:494
+#: fdisk/fdisk.c:1622 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:511
 #, c-format
 msgid "First %s"
 msgstr "Premier %s"
 
-#: fdisk/fdisk.c:1407 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1637 fdisk/fdisksunlabel.c:536
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Le secteur %d est d�j� allou�.\n"
 
-#: fdisk/fdisk.c:1439
+#: fdisk/fdisk.c:1673
 msgid "No free sectors available\n"
 msgstr "Aucun secteur libre disponible.\n"
 
-#: fdisk/fdisk.c:1449 fdisk/fdiskbsdlabel.c:259 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1681 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:546
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Dernier %s ou +size ou +sizeM ou +sizeK"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1714
 #, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
 msgstr ""
 "Avertissement : la partition %d contient un nombre impair de secteurs.\n"
 
-#: fdisk/fdisk.c:1516 fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdisk.c:1754 fdisk/fdiskbsdlabel.c:611
 msgid "The maximum number of partitions has been created\n"
 msgstr "Le nombre maximum de partitions a d�j� �t� cr��.\n"
 
-#: fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1764
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 "Vous devez d'abord supprimer une partition et ajouter une partition "
 "�tendue.\n"
 
-#: fdisk/fdisk.c:1530
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Command action\n"
@@ -2898,20 +2942,20 @@ msgstr ""
 "   %s\n"
 "   p   Partition primaire (1-4)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1770
 msgid "l   logical (5 or over)"
 msgstr "l   Logique (5 ou plus)"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1770
 msgid "e   extended"
 msgstr "e   Etendue"
 
-#: fdisk/fdisk.c:1549
+#: fdisk/fdisk.c:1787
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Nombre de partitions non valide pour le type `%c'.\n"
 
-#: fdisk/fdisk.c:1581
+#: fdisk/fdisk.c:1822
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2919,11 +2963,11 @@ msgstr ""
 "La table de partition a �t� modifi�e !\n"
 "\n"
 
-#: fdisk/fdisk.c:1590
+#: fdisk/fdisk.c:1831
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Appel de ioctl() pour relire la table de partition.\n"
 
-#: fdisk/fdisk.c:1606
+#: fdisk/fdisk.c:1847
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2933,7 +2977,7 @@ msgstr ""
 "R�amorcez le syst�me pour �tre s�r que la table de partition a �t� mise � "
 "jour.\n"
 
-#: fdisk/fdisk.c:1612
+#: fdisk/fdisk.c:1853
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2945,67 +2989,72 @@ msgstr ""
 "une partition DOS 6.x, reportez-vous au manuel de fdisk\n"
 "pour plus d'informations.\n"
 
-#: fdisk/fdisk.c:1619
+#: fdisk/fdisk.c:1860
 msgid "Syncing disks.\n"
 msgstr "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:1650
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Device: %s\n"
 msgstr "P�riph�rique : %s\n"
 
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1907
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partition %d ne contient pas de zone de donn�es.\n"
 
-#: fdisk/fdisk.c:1671
+#: fdisk/fdisk.c:1912
 msgid "New beginning of data"
 msgstr "Nouveau d�but des donn�es"
 
-#: fdisk/fdisk.c:1685
+#: fdisk/fdisk.c:1928
 msgid "Expert command (m for help): "
 msgstr "Commande Expert (m pour aide) :"
 
-#: fdisk/fdisk.c:1696
+#: fdisk/fdisk.c:1941
 msgid "Number of cylinders"
 msgstr "Nombre de cylindres"
 
-#: fdisk/fdisk.c:1717
+#: fdisk/fdisk.c:1967
 msgid "Number of heads"
 msgstr "Nombre de t�tes"
 
-#: fdisk/fdisk.c:1742
+#: fdisk/fdisk.c:1992
 msgid "Number of sectors"
 msgstr "Nombre de secteurs"
 
-#: fdisk/fdisk.c:1745
+#: fdisk/fdisk.c:1995
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Avertissement : d�finition du d�calage des secteurs pour la compatibilit� "
 "DOS\n"
 
-#: fdisk/fdisk.c:1807
+#: fdisk/fdisk.c:2057
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Le disque %s ne contient pas de table de partition valide.\n"
 
-#: fdisk/fdisk.c:1821
+#: fdisk/fdisk.c:2071
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossible d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:1838
+#: fdisk/fdisk.c:2088
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Impossible d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:1911
+#: fdisk/fdisk.c:2109
+#, c-format
+msgid "%c: unknown command\n"
+msgstr "%c : commande inconnue\n"
+
+#: fdisk/fdisk.c:2160
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Ce kernel trouve lui-m�me la taille de secteur, option  - -b ignor�e.\n"
 
-#: fdisk/fdisk.c:1914
+#: fdisk/fdisk.c:2163
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -3013,11 +3062,18 @@ msgstr ""
 "Avertissement : l'option -b (d�finition de la taille de secteur) doit �tre "
 "utilis�e avec un p�riph�riqued�fini.\n"
 
-#: fdisk/fdisk.c:1973
+#: fdisk/fdisk.c:2226
+#, c-format
+msgid ""
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:2235
 msgid "Command (m for help): "
 msgstr "Commande (m pour aide) : "
 
-#: fdisk/fdisk.c:1987
+#: fdisk/fdisk.c:2251
 #, c-format
 msgid ""
 "\n"
@@ -3026,15 +3082,15 @@ msgstr ""
 "\n"
 "Le fichier amorce en cours est : %s.\n"
 
-#: fdisk/fdisk.c:1989
+#: fdisk/fdisk.c:2253
 msgid "Please enter the name of the new boot file: "
 msgstr "Entrez le nom du nouveau fichier amorce : "
 
-#: fdisk/fdisk.c:1991
+#: fdisk/fdisk.c:2255
 msgid "Boot file unchanged\n"
 msgstr "Fichier amorce inchang�\n"
 
-#: fdisk/fdisk.c:2051
+#: fdisk/fdisk.c:2323
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3044,7 +3100,7 @@ msgstr ""
 "\tD�sol�, aucun menu Experts disponible pour les tables de partition SGI.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:29
+#: fdisk/fdiskaixlabel.c:28
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3073,7 +3129,7 @@ msgstr ""
 "\t   de supprimer logiquement le disque de votre ordinateur AIX.\n"
 "\t   (Sinon, vous deviendrez un AIXpert)."
 
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:117
 #, c-format
 msgid ""
 "\n"
@@ -3082,163 +3138,167 @@ msgstr ""
 "\n"
 "Libell� BSD pour le p�riph�rique : %s\n"
 
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:125
 msgid "   d   delete a BSD partition"
 msgstr "   d   Efface une partition BSD"
 
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
 msgstr "   e   Edite les donn�es du disque"
 
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
 msgstr "   i   Installe une amorce"
 
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
 msgstr "   l   R�pertorie les types de syst�me de fichiers connus"
 
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   n   add a new BSD partition"
 msgstr "   n   Ajoute une nouvelle partition BSD"
 
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   p   print BSD partition table"
 msgstr "   p   Affiche la table de partition BSD"
 
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
 msgstr "   s   Affiche le libell� de disque complet"
 
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
 msgstr "   t   Change l'ID du syst�me de fichiers d'une partition"
 
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   Change d'unit�s (cylindres/secteurs)"
+
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
-msgstr "   w   Ecrit le libell� de disque dans un disque"
+msgstr "   w   �crit le libell� de disque dans un disque"
 
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   Lie la partition BSD � une partition non BSD"
 
-#: fdisk/fdiskbsdlabel.c:146
+#: fdisk/fdiskbsdlabel.c:168
 #, c-format
-msgid "Partition %s%d has invalid starting sector 0.\n"
-msgstr "La partition %s%d a un secteur de d�but 0 non valide.\n"
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "La partition %s a un secteur de d�but 0 non valide.\n"
 
-#: fdisk/fdiskbsdlabel.c:150
+#: fdisk/fdiskbsdlabel.c:172
 #, c-format
-msgid "Reading disklabel of %s%d at sector %d.\n"
-msgstr "Lecture du libell� de disque de %s%d dans le secteur %d.\n"
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "Lecture du libell� de disque de %s dans le secteur %d.\n"
 
-#: fdisk/fdiskbsdlabel.c:159
+#: fdisk/fdiskbsdlabel.c:182
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
 msgstr "Il n'y a aucune partition *BSD sur %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
 msgstr "Commande de libell� de disque BSD (m pour aide) : "
 
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:310
 #, c-format
 msgid "type: %s\n"
 msgstr "type : %s\n"
 
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:312
 #, c-format
 msgid "type: %d\n"
 msgstr "type : %d\n"
 
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:313
 #, c-format
 msgid "disk: %.*s\n"
 msgstr "disque : %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:292
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
 msgstr "libell� : %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:315
 msgid "flags:"
 msgstr "indicateurs :"
 
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:317
 msgid " removable"
 msgstr " supprimable"
 
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
 msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:299
+#: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
 msgstr " badsect"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr "octets/secteur : %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr "secteurs/piste : %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr "pistes/cylindre : %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr "secteurs/cylindre : %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:329
 #, c-format
 msgid "cylinders: %ld\n"
 msgstr "cylindres : %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
 msgstr "tpm : %d\n"
 
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
 msgstr "interleave : %d\n"
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "trackskew : %d\n"
 
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "cylinderskew: %d\n"
 msgstr "cylinderskew : %d\n"
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr "headswitch : %ld\t\t# millisecondes\n"
 
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr "track-to-track seek : %ld\t# millisecondes\n"
 
-#: fdisk/fdiskbsdlabel.c:314
+#: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
 msgstr "drivedata : "
 
-#: fdisk/fdiskbsdlabel.c:323
+#: fdisk/fdiskbsdlabel.c:347
 #, c-format
 msgid ""
 "\n"
@@ -3247,113 +3307,98 @@ msgstr ""
 "\n"
 "%d partitions :\n"
 
-#: fdisk/fdiskbsdlabel.c:324
-msgid "#        size   offset    fstype   [fsize bsize   cpg]\n"
-msgstr "N�        taille   d�calage    fstype   [fsize bsize   cpg]\n"
-
-#: fdisk/fdiskbsdlabel.c:380
-#, c-format
-msgid "Writing disklabel to %s%d.\n"
-msgstr "Ecriture du libell� de disque dans %s%d.\n"
+#: fdisk/fdiskbsdlabel.c:348
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr "N�      d�but       fin      taille   fstype   [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:383
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, c-format
 msgid "Writing disklabel to %s.\n"
 msgstr "Ecriture du libell� de disque dans %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:395
-#, c-format
-msgid "%s%d contains no disklabel.\n"
-msgstr "%s%d ne contient aucun libell� de disque.\n"
-
-#: fdisk/fdiskbsdlabel.c:398
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
 msgstr "%s ne contient aucun libell� de disque.\n"
 
-#: fdisk/fdiskbsdlabel.c:402
+#: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
 msgstr "Voulez-vous cr�er un libell� de disque ? (y/n) "
 
-#: fdisk/fdiskbsdlabel.c:441
+#: fdisk/fdiskbsdlabel.c:458
 msgid "bytes/sector"
 msgstr "octets/secteur"
 
-#: fdisk/fdiskbsdlabel.c:442
+#: fdisk/fdiskbsdlabel.c:459
 msgid "sectors/track"
 msgstr "secteurs/piste"
 
-#: fdisk/fdiskbsdlabel.c:443
+#: fdisk/fdiskbsdlabel.c:460
 msgid "tracks/cylinder"
 msgstr "pistes/cylindre"
 
-#: fdisk/fdiskbsdlabel.c:451
+#: fdisk/fdiskbsdlabel.c:468
 msgid "sectors/cylinder"
 msgstr "secteurs/cylindre"
 
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr "Doit �tre <= secteurs/piste * pistes/cylindre (par d�faut).\n"
 
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
 msgstr "tpm"
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
 msgstr "interleave"
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
 msgstr "trackskew"
 
-#: fdisk/fdiskbsdlabel.c:460
+#: fdisk/fdiskbsdlabel.c:477
 msgid "cylinderskew"
 msgstr "cylinderskew"
 
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
 msgstr "headswitch"
 
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
 msgstr "track-to-track seek"
 
-#: fdisk/fdiskbsdlabel.c:503
+#: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "Amorce : %sboot -> boot%s (%s) : "
 
-#: fdisk/fdiskbsdlabel.c:529
+#: fdisk/fdiskbsdlabel.c:546
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr "L'amorce chevauche le libell� de disque !\n"
 
-#: fdisk/fdiskbsdlabel.c:550
-#, c-format
-msgid "Bootstrap installed on %s%d.\n"
-msgstr "Amorce install�e sur %s%d.\n"
-
-#: fdisk/fdiskbsdlabel.c:552
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr "Amorce install�e sur %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:573
+#: fdisk/fdiskbsdlabel.c:591
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c) : "
 
-#: fdisk/fdiskbsdlabel.c:604
+#: fdisk/fdiskbsdlabel.c:622
 msgid "This partition already exists.\n"
 msgstr "Cette partition existe d�j� .\n"
 
-#: fdisk/fdiskbsdlabel.c:726
+#: fdisk/fdiskbsdlabel.c:742
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr ""
 "Avertissement : partitions trop nombreuses (%d, le nombre maximum est %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:772
+#: fdisk/fdiskbsdlabel.c:789
 msgid ""
 "\n"
 "Syncing disks.\n"
@@ -3361,68 +3406,72 @@ msgstr ""
 "\n"
 "Synchronisation des disques.\n"
 
-#: fdisk/fdisksgilabel.c:56
+#: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:57
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:58
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:59
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:60
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:61
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:62
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI volume"
 msgstr "volume SGI"
 
-#: fdisk/fdisksgilabel.c:63
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:64
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:65
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:66
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:67
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xlvol"
 msgstr "SGI xlvol"
 
-#: fdisk/fdisksgilabel.c:68
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI rxlvol"
 msgstr "SGI rxlvol"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Echange Linux"
 
-#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux natif"
 
-#: fdisk/fdisksgilabel.c:143
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:158
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3430,11 +3479,11 @@ msgstr ""
 "Selon MIPS Computer Systems, Inc le libell� ne doit pas contenir plus de 512 "
 "octets\n"
 
-#: fdisk/fdisksgilabel.c:162
+#: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Libell� de disque SGI d�tect� avec total de contr�le incorrect.\n"
 
-#: fdisk/fdisksgilabel.c:186
+#: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
 "\n"
@@ -3453,7 +3502,7 @@ msgstr ""
 "Unit�s = %s sur %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:199
+#: fdisk/fdisksgilabel.c:213
 #, c-format
 msgid ""
 "\n"
@@ -3466,7 +3515,7 @@ msgstr ""
 "Unit�s = %s sur %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:205
+#: fdisk/fdisksgilabel.c:219
 #, c-format
 msgid ""
 "----- partitions -----\n"
@@ -3475,7 +3524,7 @@ msgstr ""
 "----- partitions -----\n"
 "%*s  Infos      D�but       Fin   Secteurs  Id  Syst�me\n"
 
-#: fdisk/fdisksgilabel.c:227
+#: fdisk/fdisksgilabel.c:241
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3486,12 +3535,12 @@ msgstr ""
 "Fichier amorce : %s\n"
 "----- entr�es de r�pertoire -----\n"
 
-#: fdisk/fdisksgilabel.c:237
+#: fdisk/fdisksgilabel.c:251
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d : %-10s secteur%5u taille%8u\n"
 
-#: fdisk/fdisksgilabel.c:298
+#: fdisk/fdisksgilabel.c:305
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3503,7 +3552,7 @@ msgstr ""
 "\tLe fichier amorce doit �tre un nom de chemin absolu non nul,\n"
 "\tpar exemple, \"/unix\" ou \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:312
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3511,7 +3560,7 @@ msgstr ""
 "\n"
 "\tNom du fichier amorce trop long : 16 octets maximum.\n"
 
-#: fdisk/fdisksgilabel.c:310
+#: fdisk/fdisksgilabel.c:317
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3519,7 +3568,7 @@ msgstr ""
 "\n"
 "\tLe fichier amorce doit avoir un nom de chemin valide.\n"
 
-#: fdisk/fdisksgilabel.c:315
+#: fdisk/fdisksgilabel.c:322
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3530,7 +3579,7 @@ msgstr ""
 "\tLa valeur par d�faut de SGI est \"/unix\" et celle de sauvegarde est "
 "\"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:343
+#: fdisk/fdisksgilabel.c:350
 #, c-format
 msgid ""
 "\n"
@@ -3543,7 +3592,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Il existe plus d'une entr�e de disque entier.\n"
 
-#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:472
 msgid "No partitions defined\n"
 msgstr "Aucune partition d�finie\n"
 
@@ -3644,26 +3693,26 @@ msgstr ""
 "diff�remment.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:621
+#: fdisk/fdisksgilabel.c:607
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr ""
 "Savez-vous qu'il existe un chevauchement de partitions sur le disque ?\n"
 
-#: fdisk/fdisksgilabel.c:691
+#: fdisk/fdisksgilabel.c:669
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Tentative de g�n�ration automatique de l'entr�e de disque entier.\n"
 
-#: fdisk/fdisksgilabel.c:698
+#: fdisk/fdisksgilabel.c:676
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Le disque entier est d�j� partitionn�.\n"
 
-#: fdisk/fdisksgilabel.c:703
+#: fdisk/fdisksgilabel.c:681
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Il y a un chevauchement de partitions sur le disque. Rectifiez d'abord ce "
 "probl�me !\n"
 
-#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3671,37 +3720,35 @@ msgstr ""
 "Il est fortement recommand� que la onzi�me partition\n"
 "couvre le disque entier et soit de type `SGI volume'.\n"
 
-#: fdisk/fdisksgilabel.c:728
+#: fdisk/fdisksgilabel.c:706
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Le disque contiendra un chevauchement de partitions. Rectifiez d'abord ce "
 "probl�me !\n"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:711
 #, c-format
 msgid " Last %s"
 msgstr " Dernier %s"
 
-#: fdisk/fdisksgilabel.c:756
+#: fdisk/fdisksgilabel.c:733
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
-"content will be unrecoverable lost.\n"
+"content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"Cr�ation d'un nouveau libell� de disque SGI. Les modifications seront "
-"uniquement conserv�es en\n"
-"m�moire jusqu'� ce que vous d�cidiez de les �crire. Une fois termin�, le "
-"contenu pr�c�dent\n"
-"ne pourra �tre restaur�.\n"
+"Cr�ation d'un nouveau libell� de disque SGI. Les modifications seront\n"
+"uniquement conserv�es en m�moire jusqu'� ce que vous d�cidiez de les\n"
+"�crire. Une fois termin�, le contenu pr�c�dent ne pourra �tre restaur�.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:784
+#: fdisk/fdisksgilabel.c:761
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Tentative de conservation des param�tres de la partition %d.\n"
 
-#: fdisk/fdisksgilabel.c:786
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tSTART=%d\tLENGTH=%d\n"
@@ -3738,7 +3785,7 @@ msgstr "SunOS var"
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:122
+#: fdisk/fdisksunlabel.c:123
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
@@ -3750,12 +3797,12 @@ msgstr ""
 "par exemple, t�tes, secteurs, cylindres et partitions\n"
 "ou forcer un nouveau libell� (commande s du menu principal).\n"
 
-#: fdisk/fdisksunlabel.c:215
+#: fdisk/fdisksunlabel.c:222
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Le programme de configuration automatique a trouv� un %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:242
+#: fdisk/fdisksunlabel.c:249
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -3769,7 +3816,7 @@ msgstr ""
 "ne pourra �tre restaur�.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:253
+#: fdisk/fdisksunlabel.c:260
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3779,72 +3826,72 @@ msgstr ""
 "   ?   configuration auto\n"
 "   0   personnalis� (avec d�tection des param�tres mat�riels par d�faut)"
 
-#: fdisk/fdisksunlabel.c:263
+#: fdisk/fdisksunlabel.c:270
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "S�lectionnez le type (? pour auto, 0 pour personnalis�) : "
 
-#: fdisk/fdisksunlabel.c:275
+#: fdisk/fdisksunlabel.c:282
 msgid "Autoconfigure failed.\n"
-msgstr "Echec de la configuration automatique.\n"
+msgstr "�chec de la configuration automatique.\n"
 
-#: fdisk/fdisksunlabel.c:303
+#: fdisk/fdisksunlabel.c:310
 msgid "Sectors/track"
 msgstr "Secteurs/piste"
 
-#: fdisk/fdisksunlabel.c:310
+#: fdisk/fdisksunlabel.c:317
 msgid "Alternate cylinders"
 msgstr "Cylindres de remplacement"
 
-#: fdisk/fdisksunlabel.c:313
+#: fdisk/fdisksunlabel.c:320
 msgid "Physical cylinders"
 msgstr "Cylindres physiques"
 
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+#: fdisk/fdisksunlabel.c:323 fdisk/fdisksunlabel.c:698
 msgid "Rotation speed (rpm)"
 msgstr "Vitesse de rotation (tpm)"
 
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisksunlabel.c:325 fdisk/fdisksunlabel.c:691
 msgid "Interleave factor"
 msgstr "Facteur d'entrelacement"
 
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:684
 msgid "Extra sectors per cylinder"
 msgstr "Secteurs suppl�mentaires par cylindre"
 
-#: fdisk/fdisksunlabel.c:334
+#: fdisk/fdisksunlabel.c:342
 msgid "You may change all the disk params from the x menu"
 msgstr "Vous pouvez modifier tous les param�tres de disque depuis le menu x."
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:348
 msgid "3,5\" floppy"
 msgstr "Disquette 3,5\""
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:348
 msgid "Linux custom"
 msgstr "Linux personnalis�"
 
-#: fdisk/fdisksunlabel.c:418
+#: fdisk/fdisksunlabel.c:435
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partition %d ne se termine pas sur une limite de cylindre.\n"
 
-#: fdisk/fdisksunlabel.c:438
+#: fdisk/fdisksunlabel.c:455
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr ""
 "La partition %d chevauche d'autres partitions dans les secteurs %d-%d.\n"
 
-#: fdisk/fdisksunlabel.c:460
+#: fdisk/fdisksunlabel.c:477
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervalle inutilis� - secteurs 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:479 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervalle inutilis� - secteurs %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:506
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3852,7 +3899,7 @@ msgstr ""
 "D'autres partitions couvrent d�j� le disque entier.\n"
 "Supprimez ou r�duisez-en avant d'essayer de nouveau.\n"
 
-#: fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksunlabel.c:564
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3863,7 +3910,7 @@ msgstr ""
 "%d %s couvre une autre partition. Votre entr�e a �t� remplac�e\n"
 "par %d %s.\n"
 
-#: fdisk/fdisksunlabel.c:567
+#: fdisk/fdisksunlabel.c:584
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3873,7 +3920,7 @@ msgstr ""
 "conserver cette\n"
 "partition en tant que disque entier (5), commen�ant � 0, avec %u secteurs.\n"
 
-#: fdisk/fdisksunlabel.c:580
+#: fdisk/fdisksunlabel.c:597
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3888,7 +3935,7 @@ msgstr ""
 "Tapez OUI si vous �tes certain de vouloir baliser cette partition\n"
 "avec la valeur 82 (swap Linux) : "
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:628
 #, c-format
 msgid ""
 "\n"
@@ -3907,7 +3954,7 @@ msgstr ""
 "Unit�s = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:642
 #, c-format
 msgid ""
 "\n"
@@ -3920,16 +3967,16 @@ msgstr ""
 "Unit�s = %s sur %d * 512 octects\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:647
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Indicateur    D�but       Fin    Blocs   Id  Syst�me\n"
 
-#: fdisk/fdisksunlabel.c:655
+#: fdisk/fdisksunlabel.c:672
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cylindres de remplacement"
 
-#: fdisk/fdisksunlabel.c:688
+#: fdisk/fdisksunlabel.c:705
 msgid "Number of physical cylinders"
 msgstr "Nombre de cylindres physiques"
 
@@ -4041,281 +4088,300 @@ msgid "NEC DOS"
 msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr "Plan 9"
+
+#: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
 msgstr "Reprise PartitionMagic"
 
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
 msgstr "Venix 80286"
 
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
 msgstr "Amorce PPC PReP"
 
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:36
 msgid "SFS"
 msgstr "SFS"
 
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
 msgstr "QNX4.x"
 
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
 msgstr "QNX4.x 2�me partie"
 
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
 msgstr "QNX4.x 3�me partie"
 
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
 msgstr "OnTrack DM"
 
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
 #. (or Novell)
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
 #. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
 
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
 msgstr "OnTrackDM6"
 
-#: fdisk/i386_sys_types.c:44
+#: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
 msgstr "EZ-Drive"
 
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
 msgstr "Golden Bow"
 
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
-#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:81 fdisk/i386_sys_types.c:82
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD ou SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
 
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
 msgstr "Novell Netware 386"
 
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
 msgstr "DiskSecure Multi-Boot"
 
-#: fdisk/i386_sys_types.c:52
+#: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
 msgstr "PC/IX"
 
-#: fdisk/i386_sys_types.c:53
+#: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
 msgstr "Old Minix"
 
 #. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / ancien Linux"
 
-#: fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Lecteur C: cach� OS/2"
 
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
 msgstr "Linux �tendu"
 
-#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
 msgstr "Ensemble de volumes NTFS"
 
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
 msgstr "Amoeba"
 
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
 #. (bad block table)
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:65
+msgid "BSD/OS"
+msgstr "BSD/OS"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
 msgstr "Hibernation Thinkpad IBM"
 
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
 msgstr "BSD/386"
 
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
 msgstr "NeXTSTEP"
 
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
 msgstr "BSDI fs"
 
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
 msgstr "Swap BSDI"
 
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
 msgstr "DRDOS/sec (FAT-12)"
 
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr "DRDOS/sec (FAT-16 < 32M)"
 
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16)"
 msgstr "DRDOS/sec (FAT-16)"
 
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
 msgid "Syrinx"
 msgstr "Syrinx"
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:76
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
 #. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:74
+#: fdisk/i386_sys_types.c:77
 msgid "DOS access"
 msgstr "Acc�s DOS"
 
 #. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:75
+#: fdisk/i386_sys_types.c:78
 msgid "DOS R/O"
 msgstr "R/O DOS"
 
 #. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:77
+#: fdisk/i386_sys_types.c:80
 msgid "BeOS fs"
 msgstr "BeOS fs"
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:80
+#: fdisk/i386_sys_types.c:83
 msgid "DOS secondary"
 msgstr "DOS secondaire"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:84
 msgid "Linux raid autodetect"
 msgstr "D�tection auto RAID Linux"
 
 #. New (2.2.x) raid partition with autodetect
 #. using persistent superblock
-#: fdisk/i386_sys_types.c:83
+#: fdisk/i386_sys_types.c:86
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:87
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:147
+#: fdisk/sfdisk.c:152
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "Erreur de recherche sur %s - impossible de rechercher vers %lu\n"
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:157
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "Erreur de recherche : 0x%08x%08x voulu, 0x%08x%08x obtenu\n"
 
-#: fdisk/sfdisk.c:198
+#: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
 msgstr "A court de m�moire - abandon.\n"
 
-#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "Erreur de lecture sur %s - impossible de lire le secteur %lu.\n"
 
-#: fdisk/sfdisk.c:218
+#: fdisk/sfdisk.c:224
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERREUR : le secteur %lu n'a aucune signature msdos.\n"
 
-#: fdisk/sfdisk.c:235
+#: fdisk/sfdisk.c:241
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "Erreur d'�criture sur %s - impossible d'�crire le secteur %lu.\n"
 
-#: fdisk/sfdisk.c:273
+#: fdisk/sfdisk.c:279
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 "Impossible d'ouvrir le fichier d'enregistrement des secteurs de partition "
 "(%s).\n"
 
-#: fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:297
 #, c-format
 msgid "write error on %s\n"
-msgstr "Erreur d'�criture sur %.\n"
+msgstr "Erreur d'�criture sur %s\n"
 
-#: fdisk/sfdisk.c:309
+#: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "stat du fichier de restauration de partition (%s) impossible.\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:320
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "La taille du fichier de restauration de partition est incorrecte - "
 "restauration impossible.\n"
 
-#: fdisk/sfdisk.c:318
+#: fdisk/sfdisk.c:324
 msgid "out of memory?\n"
 msgstr "A court de m�moire ?\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "Impossible d'ouvrir le fichier de restauration de partition (%s).\n"
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:336
 #, c-format
 msgid "error reading %s\n"
-msgstr "Erreur de lecture de %s\n"
+msgstr "Erreur de lecture de %s.\n"
 
-#: fdisk/sfdisk.c:337
+#: fdisk/sfdisk.c:343
 #, c-format
 msgid "cannot open device %s for writing\n"
-msgstr "Impossible d'ouvrir le p�riph�rique %s pour �criture\n"
+msgstr "Impossible d'ouvrir le p�riph�rique %s pour �criture.\n"
 
-#: fdisk/sfdisk.c:349
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "error writing sector %lu on %s\n"
-msgstr "Erreur d'�criture du secteur %lu sur %s\n"
+msgstr "Erreur d'�criture du secteur %lu sur %s.\n"
 
-#: fdisk/sfdisk.c:415
+#: fdisk/sfdisk.c:406
+#, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Disque %s : impossible d'obtenir la taille.\n"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Disque %s : impossible d'obtenir la g�om�trie.\n"
+
+#: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
 "Warning: start=%d - this looks like a partition rather than\n"
@@ -4326,27 +4392,23 @@ msgstr ""
 "le disque entier. L'utilisation de fdisk est probablement inutile.\n"
 "[Utilisez l'option --force si vous souhaitez quand m�me op�rer.]\n"
 
-#: fdisk/sfdisk.c:421
+#: fdisk/sfdisk.c:442
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
 msgstr "Avertissement : HDIO_GETGEO indique qu'il y a %d t�tes.\n"
 
-#: fdisk/sfdisk.c:424
+#: fdisk/sfdisk.c:445
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
 msgstr "Avertissement : HDIO_GETGEO indique qu'il y a %d secteurs.\n"
 
-#: fdisk/sfdisk.c:427
+#: fdisk/sfdisk.c:449
 #, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
-msgstr "Avertissement : HDIO_GETGEO indique qu'il y a %d cylindres.\n"
-
-#: fdisk/sfdisk.c:431
-#, c-format
-msgid "Disk %s: cannot get geometry\n"
-msgstr "Disque %s : impossible d'obtenir la g�om�trie.\n"
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
+msgstr ""
+"Avertissement : BLKGETSIZE/HDIO_GETGEO indique qu'il y a %d cylindres.\n"
 
-#: fdisk/sfdisk.c:433
+#: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%d) - usually at most 63\n"
@@ -4357,7 +4419,7 @@ msgstr ""
 "Ceci entra�nera des probl�mes avec tous les logiciels utilisant l'adressage "
 "C/T/S.\n"
 
-#: fdisk/sfdisk.c:437
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid ""
 "\n"
@@ -4366,7 +4428,7 @@ msgstr ""
 "\n"
 "Disque %s : %lu cylindres, %lu t�tes, %lu secteurs/piste\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:539
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
@@ -4374,7 +4436,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour la t�te : %d (doit �tre "
 "compris dans 0-%d).\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:544
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
@@ -4382,7 +4444,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour le secteur : %d (doit "
 "�tre compris dans 1-%d).\n"
 
-#: fdisk/sfdisk.c:527
+#: fdisk/sfdisk.c:549
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %d (should be in "
@@ -4391,7 +4453,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour le cylindre : %d (doit "
 "�tre compris dans 0-%d).\n"
 
-#: fdisk/sfdisk.c:566
+#: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4399,43 +4461,43 @@ msgstr ""
 "Nom Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:719
+#: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
 msgstr "Relecture de la table de partition en cours...\n"
 
-#: fdisk/sfdisk.c:725
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
-"Echec de la commande de relecture de la table de partition.\n"
+"�chec de la commande de relecture de la table de partition.\n"
 "Red�marrez le syst�me maintenant avant d'utiliser mkfs.\n"
 
-#: fdisk/sfdisk.c:730
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erreur de fermeture de %s\n"
 
-#: fdisk/sfdisk.c:768
+#: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s : cette partition n'existe pas.\n"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
 msgstr "Format non reconnu - utilisation des secteurs.\n"
 
-#: fdisk/sfdisk.c:830
+#: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "N� table de partition de %s\n"
 
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "Format non mis en oeuvre - utilisation de %s.\n"
 
-#: fdisk/sfdisk.c:845
+#: fdisk/sfdisk.c:867
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4444,12 +4506,12 @@ msgstr ""
 "Unit�s = cylindres de %lu octets, blocs de 1024 octets, � partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
 msgstr ""
 "   P�riph�rique Amorce D�but     Fin   Nb cyls   Nb blocs   Id  Syst�me\n"
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:875
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4458,11 +4520,11 @@ msgstr ""
 "Unit�s = secteurs de 512 octets, � partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:855
+#: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
 msgstr "   P�riph�rique Amorce    D�but       Fin  Nb secteurs  Id  Syst�me\n"
 
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4471,11 +4533,11 @@ msgstr ""
 "Unit�s = blocs de 1024 octets, � partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:860
+#: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
 msgstr "   P�riph�rique Amorce   D�but       Fin   Nb blocs   Id  Syst�me\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:885
 #, c-format
 msgid ""
 "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4485,31 +4547,31 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:865
+#: fdisk/sfdisk.c:887
 msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
 msgstr "   P�riph�rique Amorce D�but   Fin     Mo   Nb blocs   Id  Syst�me\n"
 
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1019
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\td�but : (c,t,s) (%ld,%ld,%ld) attendus (%ld,%ld,%ld) trouv�s\n"
 
-#: fdisk/sfdisk.c:1004
+#: fdisk/sfdisk.c:1026
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tfin : (c,t,s) (%ld,%ld,%ld) attendus (%ld,%ld,%ld) trouv�s\n"
 
-#: fdisk/sfdisk.c:1007
+#: fdisk/sfdisk.c:1029
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partition se termine au cylindre %ld, au del� de la fin du disque.\n"
 
-#: fdisk/sfdisk.c:1018
+#: fdisk/sfdisk.c:1040
 msgid "No partitions found\n"
 msgstr "Aucune partition trouv�e\n"
 
-#: fdisk/sfdisk.c:1025
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid ""
 "Warning: The first partition looks like it was made\n"
@@ -4520,100 +4582,100 @@ msgstr ""
 " pour C/T/S=*/%ld/%ld (au lieu de %ld/%ld/%ld).\n"
 "Cette liste est bas�e sur cette g�om�trie.\n"
 
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1097
 msgid "no partition table present.\n"
 msgstr "Il n'existe aucune table de partition.\n"
 
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Etrange, seules %d partitions sont d�finies.\n"
 
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1108
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Avertissement : la partition %s a une taille �gale � 0 mais n'est pas "
 "marqu�e vide.\n"
 
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1111
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 "Avertissement : la partition %s a une taille �gale � 0 et est amor�able.\n"
 
-#: fdisk/sfdisk.c:1092
+#: fdisk/sfdisk.c:1114
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Avertissement : la partition %s a une taille �gale � 0 et un d�but autre que "
 "z�ro.\n"
 
-#: fdisk/sfdisk.c:1103
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Avertissement : la partition %s "
 
-#: fdisk/sfdisk.c:1104
+#: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "n'est pas contenue dans la partition %s.\n"
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Avertissement : les partitions %s "
 
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
 msgstr "et %s se chevauchent.\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, c-format
 msgid "Warning: partition %s contains part of "
 msgstr "Avertissement : la partition %s contient une partie de"
 
-#: fdisk/sfdisk.c:1128
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "the partition table (sector %lu),\n"
 msgstr "la table de partition (secteur %lu),\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
 msgstr "et sera d�truite une fois remplie.\n"
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Avertissement : la partition %s commence au secteur 0.\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1164
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Avertissement : la partition %s va au del� de la fin du disque.\n"
 
-#: fdisk/sfdisk.c:1156
+#: fdisk/sfdisk.c:1178
 msgid "Among the primary partitions, at most one can be extended\n"
 msgstr "Parmi les partitions primaires, une seule peut �tre �tendue\n"
 
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
 msgstr " (bien que cela ne soit pas probl�matique sous Linux.)\n"
 
-#: fdisk/sfdisk.c:1174
+#: fdisk/sfdisk.c:1196
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 "Avertissement : la partition %s ne commence pas � une limite de cylindre.\n"
 
-#: fdisk/sfdisk.c:1180
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 "Avertissement : la partition %s ne se termine pas � une limite de cylindre.\n"
 
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1220
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4623,7 +4685,7 @@ msgstr ""
 "Cela est sans importance pour LILO, mais le MBR DOS n'amorcera pas ce "
 "disque.\n"
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4632,7 +4694,7 @@ msgstr ""
 "primaires. Seul\n"
 "LILO ignore l'indicateur `bootable'.\n"
 
-#: fdisk/sfdisk.c:1211
+#: fdisk/sfdisk.c:1233
 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"
@@ -4641,151 +4703,172 @@ msgstr ""
 "Cela est sans importance pour LILO, mais le MBR DOS n'amorcera pas ce "
 "disque.\n"
 
-#: fdisk/sfdisk.c:1228
+#: fdisk/sfdisk.c:1250
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s : d�but : (c,t,s) (%ld,%ld,%ld) attendus (%ld,%ld,%ld) trouv�s\n"
 
-#: fdisk/sfdisk.c:1237
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s : fin : (c,t,s) (%ld,%ld,%ld) attendus (%ld,%ld,%ld) trouv�s\n"
 
-#: fdisk/sfdisk.c:1240
+#: fdisk/sfdisk.c:1262
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partition %s se termine au cylindre %ld, au del� de la fin du disque.\n"
 
-#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#: fdisk/sfdisk.c:1287
+#, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "Avertissement : d�but d�cal� de la partition �tendu de %ld vers %ld.\n"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr "(Pour des besoins de listage seulement. Ne change pas le contenu.)\n"
+
+#: fdisk/sfdisk.c:1291
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr ""
+"Avertissement : la partition �tendu ne commence pas � une limite de "
+"cylindre.\n"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr "DOS et Linux interpr�teront le contenu differemment.\n"
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "Trop de partitions - celles apr�s le n� (%d) sont ignor�es.\n"
 
-#: fdisk/sfdisk.c:1288
+#: fdisk/sfdisk.c:1324
 msgid "tree of partitions?\n"
 msgstr "Arborescence des partitions ?\n"
 
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gestionnaire de disques d�tect� - gestion impossible\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
 msgstr "Signature DM6 trouv�e - abandon\n"
 
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
-msgstr "Etrange..., une partition �tendue de taille 0 ?\n"
+msgstr "�trange..., une partition �tendue de taille 0 ?\n"
 
-#: fdisk/sfdisk.c:1426
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
 msgid "strange..., a BSD partition of size 0?\n"
-msgstr "Etrange..., une partition BSD de taille 0 ?\n"
+msgstr "�trange..., une partition BSD de taille 0 ?\n"
 
-#: fdisk/sfdisk.c:1458
+#: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr " %s : partition non reconnue\n"
 
-#: fdisk/sfdisk.c:1470
+#: fdisk/sfdisk.c:1536
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Indicateur -n attribu� : aucune modification\n"
 
-#: fdisk/sfdisk.c:1483
+#: fdisk/sfdisk.c:1549
 msgid "Failed saving the old sectors - aborting\n"
-msgstr "Echec de l'enregistrement des anciens secteurs - annulation\n"
+msgstr "�chec de l'enregistrement des anciens secteurs - annulation\n"
 
-#: fdisk/sfdisk.c:1488
+#: fdisk/sfdisk.c:1554
 #, c-format
 msgid "Failed writing the partition on %s\n"
-msgstr "Echec de l'�criture de la partition sur %s\n"
+msgstr "�chec de l'�criture de la partition sur %s\n"
 
-#: fdisk/sfdisk.c:1565
+#: fdisk/sfdisk.c:1631
 msgid "long or incomplete input line - quitting\n"
 msgstr "Ligne d'entr�e longue ou incompl�te - fermeture\n"
 
-#: fdisk/sfdisk.c:1601
+#: fdisk/sfdisk.c:1667
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "Erreur d'entr�e : `=' attendu apr�s le champ %s\n"
 
-#: fdisk/sfdisk.c:1608
+#: fdisk/sfdisk.c:1674
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "Erreur d'entr�e : caract�re %c inattendu apr�s le champ %s\n"
 
-#: fdisk/sfdisk.c:1614
+#: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Entr�e non reconnue : %s\n"
 
-#: fdisk/sfdisk.c:1646
+#: fdisk/sfdisk.c:1712
 msgid "number too big\n"
 msgstr "Nombre trop �lev�\n"
 
-#: fdisk/sfdisk.c:1650
+#: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
 msgstr "Caract�res de fin ind�sirables apr�s le nombre\n"
 
-#: fdisk/sfdisk.c:1766
+#: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
 msgstr "Pas de place pour le descriptif de partition\n"
 
-#: fdisk/sfdisk.c:1799
+#: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
 msgstr "Impossible de construire autour de la partition �tendue\n"
 
-#: fdisk/sfdisk.c:1850
+#: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
 msgstr "Champs d'entr�e trop nombreux\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1884
+#: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
 msgstr "Plus de place\n"
 
-#: fdisk/sfdisk.c:1903
+#: fdisk/sfdisk.c:1969
 msgid "Illegal type\n"
 msgstr "Type non valide\n"
 
-#: fdisk/sfdisk.c:1935
+#: fdisk/sfdisk.c:2001
 #, c-format
-msgid "Warning: exceeds max allowable size (%lu)\n"
-msgstr "Avertissement : d�passe la taille maximale allouable (%lu)\n"
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
+msgstr ""
+"Avertissement : la taille donn�e (%lu) d�passe la taille maximale allouable "
+"(%lu)\n"
 
-#: fdisk/sfdisk.c:1940
+#: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
 msgstr "Avertissement : partition vide\n"
 
-#: fdisk/sfdisk.c:1954
+#: fdisk/sfdisk.c:2021
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Avertissement : d�but de partition incorrect (%lu au plus t�t)\n"
 
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Indicateur Bootable non reconnu - choisissez  la commande - or *\n"
 
-#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
 msgstr "Sp�cification c,t,s partielle ?\n"
 
-#: fdisk/sfdisk.c:2008
+#: fdisk/sfdisk.c:2075
 msgid "Extended partition not where expected\n"
 msgstr "Partition �tendue non attendue ici\n"
 
-#: fdisk/sfdisk.c:2040
+#: fdisk/sfdisk.c:2107
 msgid "bad input\n"
 msgstr "Entr�e incorrecte\n"
 
-#: fdisk/sfdisk.c:2062
+#: fdisk/sfdisk.c:2129
 msgid "too many partitions\n"
 msgstr "Trop de partitions\n"
 
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2162
 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"
@@ -4797,49 +4880,49 @@ msgstr ""
 "Vous devez en g�n�ral d�finir uniquement <d�but> et <taille> (voire "
 "<type>).\n"
 
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2182
 msgid "version"
 msgstr "Version "
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2188
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Usage : %s [options] p�riph�rique ...\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2189
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "P�riph�rique : quelque chose comme /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2190
 msgid "useful options:"
 msgstr "Options utiles :"
 
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2191
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [ou --show-size] : Affiche la taille d'une partition"
 
-#: fdisk/sfdisk.c:2125
+#: fdisk/sfdisk.c:2192
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ou --id] :        Affiche ou modifie l'Id de partition"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2193
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 "    -l [ou --list] :      R�pertorie les partitions de chaque p�riph�rique"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2194
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 "    -d [ou --dump] :      Idem, mais dans un format appropri� � une entr�e "
 "ult�rieure"
 
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2195
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 "    -i [ou --increment] : Enum�re les cylindres etc. � partir de 1 au lieu "
 "de 0"
 
-#: fdisk/sfdisk.c:2129
+#: fdisk/sfdisk.c:2196
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of "
 "sectors/blocks/cylinders/MB"
@@ -4847,59 +4930,59 @@ msgstr ""
 "    -uS, -uB, -uC, -uM :  Accepte/rapporte en unit�s "
 "desecteurs/blocs/cylindres/Mo"
 
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2197
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [ou --list-types] : R�pertorie les types de partition connus"
 
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2198
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 "    -D [ou --DOS] :       Pour la compatibilit� DOS : occupe un peu d'espace"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2199
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 "    -R [ou --re-read] :   Fait relire la table de partition par le kernel"
 
-#: fdisk/sfdisk.c:2133
+#: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 "    -N# :                Change uniquement la partition portant le num�ro #"
 
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 N'�crit pas sur le disque"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2202
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 "    -O file :            Enregistre les secteurs qui seront �cras�s dans un "
 "fichier"
 
-#: fdisk/sfdisk.c:2136
+#: fdisk/sfdisk.c:2203
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            Restaure ces secteurs"
 
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version] :   Affiche la version"
 
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help] :      Affiche ce message"
 
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
 msgstr "Options dangereuses :"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2207
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 "    -g [ou --show-geometry] : Affiche l'id�e que se fait le kernel de la "
 "g�om�trie"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4909,126 +4992,121 @@ msgstr ""
 "                             ou attend des descriptifs de celles-ci � "
 "l'entr�e"
 
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2210
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [ou --Linux] :      Ne se plaint pas de probl�mes ne concernant pas "
 "Linux"
 
-#: fdisk/sfdisk.c:2144
+#: fdisk/sfdisk.c:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet] :      Supprime les messages d'avertissement"
 
-#: fdisk/sfdisk.c:2145
+#: fdisk/sfdisk.c:2212
 msgid "    You can override the detected geometry using:"
 msgstr "    Vous pouvez �craser la g�om�trie d�tect�e � l'aide de :"
 
-#: fdisk/sfdisk.c:2146
+#: fdisk/sfdisk.c:2213
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [ou --cylinders #] : D�finit le nombre de cylindres � utiliser"
 
-#: fdisk/sfdisk.c:2147
+#: fdisk/sfdisk.c:2214
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [ou --heads #] :    D�finit le nombre de t�tes � utiliser"
 
-#: fdisk/sfdisk.c:2148
+#: fdisk/sfdisk.c:2215
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [ou --sectors #] :  D�finit le nombre de secteurs � utiliser"
 
-#: fdisk/sfdisk.c:2149
+#: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
 msgstr "Vous pouvez d�sactiver toute v�rification de coh�rence � l'aide de :"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2217
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [ou --force] :      Force une action, m�me inadapt�e"
 
-#: fdisk/sfdisk.c:2156
+#: fdisk/sfdisk.c:2223
 msgid "Usage:"
 msgstr "Usage :"
 
-#: fdisk/sfdisk.c:2157
+#: fdisk/sfdisk.c:2224
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 "%s p�riph�rique\t\t R�pertorie les partitions actives sur le p�riph�rique\n"
 
-#: fdisk/sfdisk.c:2158
+#: fdisk/sfdisk.c:2225
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s p�riph�rique n1 n2 ... Active les partitions n1 ..., d�sactive le reste\n"
 
-#: fdisk/sfdisk.c:2159
+#: fdisk/sfdisk.c:2226
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An p�riph�rique\t Active la partition n, d�sactive les autres\n"
 
-#: fdisk/sfdisk.c:2278
+#: fdisk/sfdisk.c:2346
 msgid "no command?\n"
 msgstr "Aucune commande ?\n"
 
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2471
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "total : %d blocs\n"
 
-#: fdisk/sfdisk.c:2438
+#: fdisk/sfdisk.c:2508
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "usage : sfdisk --print-id p�riph�rique num�ro-partition \n"
 
-#: fdisk/sfdisk.c:2440
+#: fdisk/sfdisk.c:2510
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "usage : sfdisk --change-id p�riph�rique num�ro-partition Id\n"
 
-#: fdisk/sfdisk.c:2442
+#: fdisk/sfdisk.c:2512
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "usage : sfdisk --id p�riph�rique num�ro-partition [Id]\n"
 
-#: fdisk/sfdisk.c:2449
+#: fdisk/sfdisk.c:2519
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "Peut uniquement sp�cifier un p�riph�rique (sauf avec -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 #, c-format
 msgid "cannot open %s %s\n"
 msgstr "Impossible d'ouvrir %s %s\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "read-write"
 msgstr "Lecture-�criture"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "for reading"
 msgstr "pour lecture"
 
-#: fdisk/sfdisk.c:2499
+#: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s : OK\n"
 
-#: fdisk/sfdisk.c:2516
-#, c-format
-msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
-msgstr "%s : %d cylindres, %d t�tes, %d secteurs/piste\n"
-
-#: fdisk/sfdisk.c:2519
+#: fdisk/sfdisk.c:2586
 #, c-format
-msgid "%s: unknown geometry\n"
-msgstr "%s : g�om�trie inconnue\n"
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
+msgstr "%s : %ld cylindres, %ld t�tes, %ld secteurs/piste\n"
 
-#: fdisk/sfdisk.c:2535
+#: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl a �chou� pour %s\n"
 
-#: fdisk/sfdisk.c:2612
+#: fdisk/sfdisk.c:2680
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "Mauvais octet actif : 0x%x au lieu de 0x80\n"
 
-#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
 msgid ""
 "Done\n"
 "\n"
@@ -5036,7 +5114,7 @@ msgstr ""
 "Termin�\n"
 "\n"
 
-#: fdisk/sfdisk.c:2638
+#: fdisk/sfdisk.c:2706
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5046,40 +5124,40 @@ msgstr ""
 "mais le MBR DOS amorcera uniquement 1 disque ayant une seule partition "
 "active.\n"
 
-#: fdisk/sfdisk.c:2652
+#: fdisk/sfdisk.c:2720
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "La partition %s a l'Id %x et n'est pas cach�e.\n"
 
-#: fdisk/sfdisk.c:2708
+#: fdisk/sfdisk.c:2777
 #, c-format
 msgid "Bad Id %x\n"
 msgstr "Mauvais Id %x\n"
 
-#: fdisk/sfdisk.c:2723
+#: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
 msgstr "Ce disque est d�j� utilis�.\n"
 
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erreur fatale : %s introuvable\n"
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2812
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Avertissement : %s n'est pas un p�riph�rique de bloc.\n"
 
-#: fdisk/sfdisk.c:2749
+#: fdisk/sfdisk.c:2818
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "V�rification que personne n'utilise le disque en ce moment ...\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2820
 msgid ""
 "\n"
-"This disk is currently in use - repartitioning is probably a bad idea.Umount "
-"all file systems, and swapoff all swap partitions on this disk.Use the "
-"--no-reread flag to suppress this check.\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
 "Ce disque est en cours d'utilisation. Un repartitionnement n'est pas "
@@ -5087,29 +5165,29 @@ msgstr ""
 "partitions d'�change sur le disque. Utilisez l'indicateur --no-reread pour "
 "supprimer cette v�rification.\n"
 
-#: fdisk/sfdisk.c:2755
+#: fdisk/sfdisk.c:2824
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 "Utilisez l'indicateur --force pour passer outre toutes les v�rifications.\n"
 
-#: fdisk/sfdisk.c:2759
-msgid "OK"
-msgstr "OK"
+#: fdisk/sfdisk.c:2828
+msgid "OK\n"
+msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2768
+#: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
 msgstr "Ancienne situation :\n"
 
-#: fdisk/sfdisk.c:2772
+#: fdisk/sfdisk.c:2841
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partition %d n'existe pas, impossible de la modifier.\n"
 
-#: fdisk/sfdisk.c:2780
+#: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
 msgstr "Nouvelle situation :\n"
 
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2854
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5117,19 +5195,19 @@ msgstr ""
 "Je n'aime pas ces partitions - rien d'inchang�.\n"
 "(Si vous le souhaitez vraiment, utilisez l'option --force.)\n"
 
-#: fdisk/sfdisk.c:2788
+#: fdisk/sfdisk.c:2857
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Je n'aime pas �a - vous devriez sans doute r�pondre Non.\n"
 
-#: fdisk/sfdisk.c:2793
+#: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Etes-vous satisfait ? [ynq] "
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Voulez-vous �crire cet �l�ment dans un disque ? [ynq] "
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2869
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5137,15 +5215,15 @@ msgstr ""
 "\n"
 "sfdisk : fin pr�matur�e de l'entr�e\n"
 
-#: fdisk/sfdisk.c:2802
+#: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
 msgstr "Fermeture en cours - rien d'inchang�\n"
 
-#: fdisk/sfdisk.c:2808
+#: fdisk/sfdisk.c:2877
 msgid "Please answer one of y,n,q\n"
 msgstr "Veuillez r�pondre � y,n,q\n"
 
-#: fdisk/sfdisk.c:2816
+#: fdisk/sfdisk.c:2885
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5153,7 +5231,7 @@ msgstr ""
 "L'�criture de la nouvelle table de partition a abouti.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2891
 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"
@@ -5165,109 +5243,113 @@ msgstr ""
 "bs=512 count=1\n"
 "(Voir fdisk(8).)\n"
 
-#: games/banner.c:1048
+#: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
 msgstr "usage : banni�re [-w width]\n"
 
-#: games/banner.c:1068
+#: games/banner.c:1065
 msgid "Message: "
 msgstr "Message : "
 
-#: games/banner.c:1102
+#: games/banner.c:1099
 #, c-format
 msgid "The character '%c' is not in my character set"
 msgstr "Le caract�re '%c' ne fait pas partie de mon jeu de caract�res."
 
-#: games/banner.c:1110
+#: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
 msgstr "Le message '%s' est OK\n"
 
-#: getopt-1.0.3b/getopt.c:229
+#: getopt-1.1.0a/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Essayez `getopt --help' pour plus d'informations.\n"
 
-#: getopt-1.0.3b/getopt.c:295
+#: getopt-1.1.0a/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "Longue option vide apr�s -l ou argument --long"
 
-#: getopt-1.0.3b/getopt.c:315
+#: getopt-1.1.0a/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "Shell inconnu apr�s -s ou argument --shell"
 
-#: getopt-1.0.3b/getopt.c:320
+#: getopt-1.1.0a/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Usage : getopt param�tres optstring\n"
 
-#: getopt-1.0.3b/getopt.c:321
+#: getopt-1.1.0a/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [options] [--] param�tres optstring\n"
 
-#: getopt-1.0.3b/getopt.c:322
+#: getopt-1.1.0a/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [options] -o|--options optstring [options] [--]\n"
 
-#: getopt-1.0.3b/getopt.c:323
+#: getopt-1.1.0a/getopt.c:327
 msgid "              parameters\n"
 msgstr "              param�tres\n"
 
-#: getopt-1.0.3b/getopt.c:324
+#: getopt-1.1.0a/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Autorise les options longues commen�ant par "
 "un seul -\n"
 
-#: getopt-1.0.3b/getopt.c:325
+#: getopt-1.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Ce petit guide d'utilisation\n"
 
-#: getopt-1.0.3b/getopt.c:326
+#: getopt-1.1.0a/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   Options longues � reconna�tre\n"
 
-#: getopt-1.0.3b/getopt.c:327
+#: getopt-1.1.0a/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=progname          Nom sous lequel les erreurs sont rapport�es\n"
 
-#: getopt-1.0.3b/getopt.c:328
+#: getopt-1.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      Options courtes � reconna�tre\n"
 
-#: getopt-1.0.3b/getopt.c:329
+#: getopt-1.1.0a/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  D�sactive le rapport d'erreur avec getopt(3)\n"
 
-#: getopt-1.0.3b/getopt.c:330
+#: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Aucune sortie normale\n"
 
-#: getopt-1.0.3b/getopt.c:331
+#: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 "  -s, --shell=shell            D�finit les conventions de d�claration du "
 "shell\n"
 
-#: getopt-1.0.3b/getopt.c:332
+#: getopt-1.1.0a/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Teste la version getopt(1)\n"
 
-#: getopt-1.0.3b/getopt.c:333
+#: getopt-1.1.0a/getopt.c:337
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -u, --unqote                 Ne pas quoter la sortie\n"
+
+#: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Affiche les informations de version\n"
 
-#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
 msgstr "Argument optstring manquant"
 
-#: getopt-1.0.3b/getopt.c:433
-msgid "getopt (enhanced) 1.0.3\n"
-msgstr "getopt (avanc�) 1.0.3\n"
+#: getopt-1.1.0a/getopt.c:441
+msgid "getopt (enhanced) 1.1.0\n"
+msgstr "getopt (avanc�) 1.1.0\n"
 
-#: getopt-1.0.3b/getopt.c:439
+#: getopt-1.1.0a/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "Erreur interne, contactez l'auteur."
 
@@ -5325,92 +5407,92 @@ msgstr "apr�s la boucle getopt\n"
 msgid "exiting parseargs\n"
 msgstr "quitter parseargs\n"
 
-#: login-utils/agetty.c:505
+#: login-utils/agetty.c:504
 msgid "entered parse_speeds\n"
 msgstr "entrer parse_speeds\n"
 
-#: login-utils/agetty.c:508
+#: login-utils/agetty.c:507
 #, c-format
 msgid "bad speed: %s"
 msgstr "Vitesse incorrecte : %s"
 
-#: login-utils/agetty.c:510
+#: login-utils/agetty.c:509
 msgid "too many alternate speeds"
 msgstr "Trop de vitesses secondaires"
 
-#: login-utils/agetty.c:512
+#: login-utils/agetty.c:511
 msgid "exiting parsespeeds\n"
 msgstr "quitter parsespeeds\n"
 
-#: login-utils/agetty.c:587
+#: login-utils/agetty.c:584
 #, c-format
 msgid "%s: open for update: %m"
 msgstr "%s : ouvert pour mise � jour : %m"
 
-#: login-utils/agetty.c:605
+#: login-utils/agetty.c:602
 #, c-format
 msgid "%s: no utmp entry"
 msgstr "%s : aucune entr�e utmp"
 
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:631
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "/dev : chdir() a �chou� : %m"
 
-#: login-utils/agetty.c:638
+#: login-utils/agetty.c:635
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s : n'est pas un p�riph�rique de caract�re"
 
 #. ignore close(2) errors
-#: login-utils/agetty.c:645
+#: login-utils/agetty.c:642
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:644
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s : ouverture impossible en entr�e standard : %m"
 
-#: login-utils/agetty.c:657
+#: login-utils/agetty.c:654
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s : non ouvert pour lecture/�criture"
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:661
+#: login-utils/agetty.c:658
 msgid "duping\n"
 msgstr "duping\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:663
+#: login-utils/agetty.c:660
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s : probl�me dup : %m"
 
-#: login-utils/agetty.c:733
+#: login-utils/agetty.c:730
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:912
 msgid "user"
 msgstr "utilisateur"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:912
 msgid "users"
 msgstr "utilisateurs"
 
-#: login-utils/agetty.c:1003
+#: login-utils/agetty.c:1000
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s : lire : %m"
 
-#: login-utils/agetty.c:1049
+#: login-utils/agetty.c:1046
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s : d�bordement d'entr�e"
 
-#: login-utils/agetty.c:1173
+#: login-utils/agetty.c:1170
 #, c-format
 msgid ""
 "Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
@@ -5423,30 +5505,30 @@ msgstr ""
 "ou\t[-hiLmw] [-l programme_connexion] [-t temporisation] [-I cha�ne "
 "d'initialisation] [-H h�te_connexion] ligne d�bit_bauds,... [typetype]\n"
 
-#: login-utils/checktty.c:46
+#: login-utils/checktty.c:41
 #, c-format
 msgid "badlogin: %s\n"
 msgstr "Connexion incorrecte : %s\n"
 
-#: login-utils/checktty.c:52
+#: login-utils/checktty.c:47
 #, c-format
 msgid "sleepexit %d\n"
 msgstr "sleepexit %d\n"
 
-#: login-utils/checktty.c:108 login-utils/checktty.c:130
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
 msgstr "Connexion : m�moire faible, �chec possible de la connexion\n"
 
-#: login-utils/checktty.c:109
+#: login-utils/checktty.c:104
 msgid "can't malloc for ttyclass"
 msgstr "malloc impossible pour ttyclass"
 
-#: login-utils/checktty.c:131
+#: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
 msgstr "malloc impossible pour grplist"
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:431
+#: login-utils/checktty.c:426
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Connexion � %s � partir de %s refus�e par d�faut.\n"
@@ -5455,58 +5537,58 @@ msgstr "Connexion � %s � partir de %s refus�e par d�faut.\n"
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:442
+#: login-utils/checktty.c:437
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Connexion sur %s � partir de %s refus�e.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:117
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s : vous (utilisateur %d) n'existez pas.\n"
 
-#: login-utils/chfn.c:141 login-utils/chsh.c:124
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s : l'utilisateur \"%s\" n'existe pas.\n"
 
-#: login-utils/chfn.c:146 login-utils/chsh.c:129
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s : peut seulement changer les entr�es locales ; utilisez plut�t yp%s.\n"
 
-#: login-utils/chfn.c:158
+#: login-utils/chfn.c:145
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Changement des informations utilisateur pour %s.\n"
 
-#: login-utils/chfn.c:164 login-utils/chfn.c:168 login-utils/chfn.c:175
-#: login-utils/chfn.c:179 login-utils/chsh.c:153 login-utils/chsh.c:157
-#: login-utils/chsh.c:164 login-utils/chsh.c:168
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
 msgid "Password error."
 msgstr "Erreur de mot de passe."
 
-#: login-utils/chfn.c:188 login-utils/chsh.c:177 login-utils/login.c:684
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:266 mount/lomount.c:221
+#: mount/lomount.c:227
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: login-utils/chfn.c:191 login-utils/chsh.c:180
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect."
 
-#: login-utils/chfn.c:202
+#: login-utils/chfn.c:189
 msgid "Finger information not changed.\n"
 msgstr "Informations utilisateur non chang�es.\n"
 
-#: login-utils/chfn.c:305
+#: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Usage : %s [ -f nom-complet ] [ -o bureau ] "
 
-#: login-utils/chfn.c:306
+#: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -5514,11 +5596,11 @@ msgstr ""
 "[ -p t�l�phone-bureau ]\n"
 "\t[ -h t�l�phone-maison ] "
 
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:376 login-utils/chsh.c:293
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
 msgid ""
 "\n"
 "Aborted.\n"
@@ -5526,155 +5608,155 @@ msgstr ""
 "\n"
 "Abandon.\n"
 
-#: login-utils/chfn.c:409
+#: login-utils/chfn.c:398
 msgid "field is too long.\n"
 msgstr "champ trop long.\n"
 
-#: login-utils/chfn.c:417
+#: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' n'est pas un caract�re permis.\n"
 
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
 msgstr "Les caract�res de contr�le ne sont pas permis.\n"
 
-#: login-utils/chfn.c:487
+#: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "Informations utilisateur *NON* chang�es. Essayez de nouveau plus tard.\n"
 
-#: login-utils/chfn.c:490
+#: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
 msgstr "Informations utilisateur chang�es.\n"
 
-#: login-utils/chfn.c:504 login-utils/chsh.c:411 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
 msgid "malloc failed"
-msgstr "Echec de malloc"
+msgstr "�chec de malloc"
 
-#: login-utils/chsh.c:140
+#: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 "%s : Votre shell n'est pas dans /etc/shells, changement de shell annul�.\n"
 
-#: login-utils/chsh.c:147
+#: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Changement du shell pour %s.\n"
 
-#: login-utils/chsh.c:188
+#: login-utils/chsh.c:178
 msgid "New shell"
 msgstr "Nouveau shell"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
 msgstr "Shell non chang�.\n"
 
-#: login-utils/chsh.c:202
+#: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell *NON* chang�. Essayez de nouveau plus tard.\n"
 
-#: login-utils/chsh.c:205
+#: login-utils/chsh.c:195
 msgid "Shell changed.\n"
 msgstr "Le shell a �t� chang�.\n"
 
-#: login-utils/chsh.c:273
+#: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
 msgstr "Usage : %s [ -s shell ] "
 
-#: login-utils/chsh.c:274
+#: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:275
+#: login-utils/chsh.c:265
 msgid "       [ username ]\n"
 msgstr "       [ nom-utilisateur ]\n"
 
-#: login-utils/chsh.c:319
+#: login-utils/chsh.c:309
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s : le shell doit �tre un chemin complet.\n"
 
-#: login-utils/chsh.c:323
+#: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s : \"%s\" n'existe pas.\n"
 
-#: login-utils/chsh.c:327
+#: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s : \"%s\" n'est pas ex�cutable.\n"
 
-#: login-utils/chsh.c:334
+#: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s : '%c' n'est pas autoris�.\n"
 
-#: login-utils/chsh.c:338
+#: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s : Les caract�res de contr�le ne sont pas permis.\n"
 
-#: login-utils/chsh.c:345
+#: login-utils/chsh.c:335
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Avertissement : \"%s\" n'est pas list� dans /etc/shells.\n"
 
-#: login-utils/chsh.c:347
+#: login-utils/chsh.c:337
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s : \"%s\" n'est pas list� dans /etc/shells.\n"
 
-#: login-utils/chsh.c:349
+#: login-utils/chsh.c:339
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s : utilisez l'option -l pour voir la liste.\n"
 
-#: login-utils/chsh.c:355
+#: login-utils/chsh.c:345
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Avertissement : \"%s\" n'est pas list� dans /etc/shells.\n"
 
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:346
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Utilisez %s -l pour voir la liste.\n"
 
-#: login-utils/chsh.c:377
+#: login-utils/chsh.c:367
 msgid "No known shells.\n"
 msgstr "Aucun shell connu.\n"
 
-#: login-utils/cryptocard.c:70
+#: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
 msgstr "Impossible d'ouvrir /dev/urandom"
 
-#: login-utils/cryptocard.c:75
+#: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
 msgstr "Impossible de lire les donn�es al�atoires depuis /dev/urandom."
 
-#: login-utils/cryptocard.c:98
+#: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
 msgstr "Impossible d'ouvrir %s pour lecture."
 
-#: login-utils/cryptocard.c:102
+#: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
 msgstr "stat(%s) impossible"
 
-#: login-utils/cryptocard.c:108
+#: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
 msgstr "%s n'a pas les modes de fichiers corrects"
 
-#: login-utils/cryptocard.c:113
+#: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
 msgstr "Impossible de lire les donn�es depuis %s"
 
-#: login-utils/islocal.c:36
+#: login-utils/islocal.c:37
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "Impossible de lire %s, fermeture."
@@ -5714,37 +5796,40 @@ msgstr ""
 "\n"
 "%10.10s %5.5s interrompu\n"
 
-#: login-utils/login.c:377
+#: login-utils/login.c:373
 msgid "login: -h for super-user only.\n"
 msgstr "connexion : -h pour superutilisateur uniquement.\n"
 
-#: login-utils/login.c:402
+#: login-utils/login.c:398
 msgid "usage: login [-fp] [username]\n"
 msgstr "usage : connexion [-fp] [nom-utilisateur]\n"
 
-#: login-utils/login.c:504
+#: login-utils/login.c:501
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "connexion : �chec de PAM, abandon : %s\n"
 
-#: login-utils/login.c:506
+#: login-utils/login.c:503
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Initialisation de PAM impossible : %s"
 
-#. Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. so that the "login: " prompt gets localized. Unfortunately,
-#. PAM doesn't have an interface to specify the "Password: " string (yet).
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
 #: login-utils/login.c:519
 msgid "login: "
 msgstr "connexion : "
 
-#: login-utils/login.c:552
+#: login-utils/login.c:553
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "ECHEC DE LA CONNEXION %d DEPUIS %s POUR %s, %s"
 
-#: login-utils/login.c:554
+#: login-utils/login.c:555
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -5752,17 +5837,17 @@ msgstr ""
 "Connexion incorrecte\n"
 "\n"
 
-#: login-utils/login.c:563
+#: login-utils/login.c:564
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "TENTATIVES DE CONNEXION TROP NOMBREUSES (%d) DEPUIS %s POUR %s, %s"
 
-#: login-utils/login.c:567
+#: login-utils/login.c:568
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr "ECHEC DE LA SESSION DE CONNEXION DEPUIS %s POUR %s, %s"
+msgstr "�CHEC DE LA SESSION DE CONNEXION DEPUIS %s POUR %s, %s"
 
-#: login-utils/login.c:570
+#: login-utils/login.c:571
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -5770,30 +5855,30 @@ msgstr ""
 "\n"
 "Connexion incorrecte\n"
 
-#: login-utils/login.c:619
+#: login-utils/login.c:620
 msgid "Illegal username"
 msgstr "Nom utilisateur non valide"
 
-#: login-utils/login.c:662
+#: login-utils/login.c:663
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "Connexion %s refus�e sur ce terminal.\n"
 
-#: login-utils/login.c:667
+#: login-utils/login.c:668
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr "CONNEXION %s REFUSEE DEPUIS %s SUR TTY %s"
+msgstr "CONNEXION %s REFUS�E DEPUIS %s SUR TTY %s"
 
-#: login-utils/login.c:671
+#: login-utils/login.c:672
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr "CONNEXION %s REFUSEE SUR TTY %s"
+msgstr "CONNEXION %s REFUS�E SUR TTY %s"
 
-#: login-utils/login.c:723
+#: login-utils/login.c:725
 msgid "Login incorrect\n"
 msgstr "Connexion incorrecte\n"
 
-#: login-utils/login.c:745
+#: login-utils/login.c:747
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5801,100 +5886,100 @@ msgstr ""
 "Trop d'utilisateurs d�j� connect�s.\n"
 "Essayez de nouveau plus tard.\n"
 
-#: login-utils/login.c:749
+#: login-utils/login.c:751
 msgid "You have too many processes running.\n"
 msgstr "Trop de processus en cours d'ex�cution.\n"
 
-#: login-utils/login.c:795
+#: login-utils/login.c:797
 msgid "Warning: no Kerberos tickets issued\n"
 msgstr "Avertissement : aucun ticket Kerberos �mis.\n"
 
-#: login-utils/login.c:807
+#: login-utils/login.c:809
 msgid "Sorry -- your password has expired.\n"
 msgstr "D�sol� -- votre mot de passe a expir�.\n"
 
-#: login-utils/login.c:813
+#: login-utils/login.c:815
 #, c-format
-msgid "Warning: your password expires on %s %d, %d\n"
-msgstr "Avertissement : votre mot de passe expire le %s %d, %d.\n"
+msgid "Warning: your password expires on %d %s %d.\n"
+msgstr "Avertissement : votre mot de passe expire le %d %s %d.\n"
 
-#: login-utils/login.c:821
+#: login-utils/login.c:823
 msgid "Sorry -- your account has expired.\n"
 msgstr "D�sol� --votre compte a expir�.\n"
 
-#: login-utils/login.c:827
+#: login-utils/login.c:829
 #, c-format
-msgid "Warning: your account expires on %s %d, %d\n"
-msgstr "Avertissement : votre compte expire le %s %d, %d.\n"
+msgid "Warning: your account expires on %d %s %d.\n"
+msgstr "Avertissement : votre compte expire le %d %s %d.\n"
 
-#: login-utils/login.c:1061
+#: login-utils/login.c:1066
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr "ACCES DISTANT A %s PAR %s"
+msgstr "ACC�S DISTANT � %s PAR %s"
 
-#: login-utils/login.c:1068
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "CONNEXION ROOT A %s DEPUIS %s"
+msgstr "CONNEXION ROOT � %s DEPUIS %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1076
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr "CONNEXION ROOT A %s"
+msgstr "CONNEXION ROOT � %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
-msgstr "CONNEXION A %s PAR %s DEPUIS %s"
+msgstr "CONNEXION � %s PAR %s DEPUIS %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1082
 #, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr "CONNEXION A %s PAR %s"
+msgstr "CONNEXION � %s PAR %s"
 
-#: login-utils/login.c:1089
+#: login-utils/login.c:1094
 #, c-format
 msgid "You have %smail.\n"
 msgstr "Vous avez %smail.\n"
 
-#: login-utils/login.c:1090
+#: login-utils/login.c:1095
 msgid "new "
 msgstr "nouveau"
 
 #. error in fork()
-#: login-utils/login.c:1108
+#: login-utils/login.c:1113
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "Connexion : �chec de fork : %s"
 
-#: login-utils/login.c:1123
+#: login-utils/login.c:1128
 msgid "setuid() failed"
 msgstr "setuid() a �chou�"
 
-#: login-utils/login.c:1129
+#: login-utils/login.c:1134
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Aucun r�pertoire %s !\n"
 
-#: login-utils/login.c:1133
+#: login-utils/login.c:1138
 msgid "Logging in with home = \"/\".\n"
 msgstr "Connexion avec home = \"/\".\n"
 
-#: login-utils/login.c:1141
+#: login-utils/login.c:1146
 msgid "login: no memory for shell script.\n"
 msgstr "Connexion : m�moire insuffisante pour le script de shell.\n"
 
-#: login-utils/login.c:1169
+#: login-utils/login.c:1174
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "Connexion : impossible d'ex�cuter le script de shell : %s.\n"
 
-#: login-utils/login.c:1172
+#: login-utils/login.c:1177
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "Connexion : aucun shell : %s.\n"
 
-#: login-utils/login.c:1188
+#: login-utils/login.c:1191
 #, c-format
 msgid ""
 "\n"
@@ -5903,65 +5988,65 @@ msgstr ""
 "\n"
 "Connexion %s : "
 
-#: login-utils/login.c:1199
+#: login-utils/login.c:1202
 msgid "login name much too long.\n"
 msgstr "nom de connexion beaucoup trop long.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1203
 msgid "NAME too long"
 msgstr "NOM trop long"
 
-#: login-utils/login.c:1207
+#: login-utils/login.c:1210
 msgid "login names may not start with '-'.\n"
 msgstr "Les noms de connexion ne peuvent pas commencer par '-'.\n"
 
-#: login-utils/login.c:1217
+#: login-utils/login.c:1220
 msgid "too many bare linefeeds.\n"
 msgstr "Trop de sauts de ligne vides.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1221
 msgid "EXCESSIVE linefeeds"
 msgstr "Sauts de ligne EXCESSIFS"
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1231
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Temporisation de la connexion apr�s %d secondes.\n"
 
-#: login-utils/login.c:1329
+#: login-utils/login.c:1325
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Derni�re connexion : %.*s "
 
-#: login-utils/login.c:1333
+#: login-utils/login.c:1329
 #, c-format
 msgid "from %.*s\n"
 msgstr "depuis %.*s\n"
 
-#: login-utils/login.c:1336
+#: login-utils/login.c:1332
 #, c-format
 msgid "on %.*s\n"
 msgstr "� %.*s\n"
 
-#: login-utils/login.c:1359
+#: login-utils/login.c:1355
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr "ECHEC DE LA CONNEXION DEPUIS %s, %s"
+msgstr "�CHEC DE LA CONNEXION DEPUIS %s, %s"
 
-#: login-utils/login.c:1362
+#: login-utils/login.c:1358
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr "ECHEC DE LA CONNEXION A %s, %s"
+msgstr "�CHEC DE LA CONNEXION � %s, %s"
 
-#: login-utils/login.c:1366
+#: login-utils/login.c:1362
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr "%d ECHECS DE CONNEXION DEPUIS %s, %s"
+msgstr "%d �CHECS DE CONNEXION DEPUIS %s, %s"
 
-#: login-utils/login.c:1369
+#: login-utils/login.c:1365
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr "%d ECHECS DE CONNEXION A %s, %s"
+msgstr "%d �CHECS DE CONNEXION � %s, %s"
 
 #: login-utils/mesg.c:89
 msgid "is y\n"
@@ -5999,189 +6084,189 @@ msgstr "Nouveau groupe : setuid"
 msgid "No shell"
 msgstr "Aucun shell"
 
-#: login-utils/passwd.c:161
+#: login-utils/passwd.c:159
 msgid "The password must have at least 6 characters, try again.\n"
 msgstr ""
 "Le mot de passe doit contenir au moins 6 caract�res. Essayez de nouveau.\n"
 
-#: login-utils/passwd.c:174
+#: login-utils/passwd.c:172
 msgid "The password must contain characters out of two of the following\n"
 msgstr "Le mot de passe doit contenir des caract�res de deux des classes\n"
 
-#: login-utils/passwd.c:175
+#: login-utils/passwd.c:173
 msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
 msgstr ""
 "classes : lettres minuscules et majuscules, chiffres et caract�res non\n"
 
-#: login-utils/passwd.c:176
+#: login-utils/passwd.c:174
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "alphanum�riques. Voir passwd(1) pour plus d'informations.\n"
 
-#: login-utils/passwd.c:181
+#: login-utils/passwd.c:179
 msgid "You cannot reuse the old password.\n"
 msgstr "Vous ne pouvez pas r�utiliser l'ancien mot de passe.\n"
 
-#: login-utils/passwd.c:186
+#: login-utils/passwd.c:184
 msgid "Please don't use something like your username as password!\n"
 msgstr "N'utilisez pas votre nom d'utilisateur comme mot de passe !\n"
 
-#: login-utils/passwd.c:197 login-utils/passwd.c:204
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
 msgid "Please don't use something like your realname as password!\n"
 msgstr "N'utilisez pas votre nom r�el comme mot de passe !\n"
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:220
 msgid "Usage: passwd [username [password]]\n"
 msgstr "Usage : passwd [nom-utilisateur [mot de passe]]\n"
 
-#: login-utils/passwd.c:222
+#: login-utils/passwd.c:221
 msgid "Only root may use the one and two argument forms.\n"
 msgstr ""
 "Seul l'utilisateur root peut utiliser les formes d'argument un et deux.\n"
 
-#: login-utils/passwd.c:278
+#: login-utils/passwd.c:275
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "Usage : passwd [-foqsvV] [utilisateur [mot de passe]]\n"
 
-#: login-utils/passwd.c:299
+#: login-utils/passwd.c:296
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "Impossible d'ex�cuter %s : %s\n"
 
-#: login-utils/passwd.c:310
+#: login-utils/passwd.c:307
 msgid "Cannot find login name"
 msgstr "Nom de connexion introuvable"
 
-#: login-utils/passwd.c:317 login-utils/passwd.c:324
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
 msgid "Only root can change the password for others.\n"
 msgstr ""
 "Seul l'utilisateur root peut modifier le mot de passe d'autres "
 "utilisateurs.\n"
 
-#: login-utils/passwd.c:332
+#: login-utils/passwd.c:329
 msgid "Too many arguments.\n"
 msgstr "Trop d'arguments.\n"
 
-#: login-utils/passwd.c:337
+#: login-utils/passwd.c:334
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
 msgstr ""
 "Impossible de trouver ce nom d'utilisateur. Est-ce que `%s' est r�ellement "
 "un utilisateur ?"
 
-#: login-utils/passwd.c:341
+#: login-utils/passwd.c:338
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr ""
 "D�sol�, je peux seulement changer les mots de passe locaux. Utilisez "
 "yppasswd � la place."
 
-#: login-utils/passwd.c:347
+#: login-utils/passwd.c:344
 msgid "UID and username does not match, imposter!"
 msgstr "UID et le nom d'utilisateur ne correspondent pas, imposteur !"
 
-#: login-utils/passwd.c:352
+#: login-utils/passwd.c:349
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "Changement du mot de passe pour %s\n"
 
-#: login-utils/passwd.c:356
+#: login-utils/passwd.c:353
 msgid "Enter old password: "
 msgstr "Entrez l'ancien mot de passe : "
 
-#: login-utils/passwd.c:358
+#: login-utils/passwd.c:355
 msgid "Illegal password, imposter."
 msgstr "Mot de passe non valide, imposteur !"
 
-#: login-utils/passwd.c:370
+#: login-utils/passwd.c:367
 msgid "Enter new password: "
 msgstr "Entrez le nouveau mot de passe : "
 
-#: login-utils/passwd.c:372
+#: login-utils/passwd.c:369
 msgid "Password not changed."
 msgstr "Mot de passe inchang�."
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:379
 msgid "Re-type new password: "
 msgstr "Re-tapez le nouveau mot de passe : "
 
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:382
 msgid "You misspelled it. Password not changed."
 msgstr "Vous avez fait une faute de frappe. Mot de passe inchang�."
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:397
 #, c-format
 msgid "password changed, user %s"
 msgstr "Mot de passe chang� pour l'utilisateur %s."
 
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:400
 msgid "ROOT PASSWORD CHANGED"
 msgstr "MOT DE PASSE ROOT CHANG�"
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:402
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "Mot de passe chang� par l'utilisateur root pour l'utilisateur %s."
 
-#: login-utils/passwd.c:412
+#: login-utils/passwd.c:409
 msgid "calling setpwnam to set password.\n"
 msgstr "Appel de setpwnam pour d�finir le mot de passe.\n"
 
-#: login-utils/passwd.c:416
+#: login-utils/passwd.c:413
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "Mot de passe *NON* chang�. Essayez de nouveau plus tard.\n"
 
-#: login-utils/passwd.c:422
+#: login-utils/passwd.c:419
 msgid "Password changed.\n"
 msgstr "Mot de passe chang�.\n"
 
-#: login-utils/shutdown.c:85
+#: login-utils/shutdown.c:87
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 msgstr "Usage : shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 
-#: login-utils/shutdown.c:103
+#: login-utils/shutdown.c:105
 msgid "Shutdown process aborted"
 msgstr "Processus de fermeture abandonn�."
 
-#: login-utils/shutdown.c:125
+#: login-utils/shutdown.c:131
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
 msgstr "%s : Seul l'utilisateur root peut �teindre le syst�me.\n"
 
-#: login-utils/shutdown.c:219
+#: login-utils/shutdown.c:225
 msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr "Ca doit �tre demain, ne pouvez-vous pas attendre jusque l� ?\n"
 
-#: login-utils/shutdown.c:271
+#: login-utils/shutdown.c:277
 msgid "for maintenance; bounce, bounce"
 msgstr "pour la maintenance ; bounce, bounce"
 
-#: login-utils/shutdown.c:275
+#: login-utils/shutdown.c:281
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#: login-utils/shutdown.c:300
+#: login-utils/shutdown.c:306
 msgid "The system is being shut down within 5 minutes"
 msgstr "Le syst�me sera ferm� dans 5 minutes."
 
-#: login-utils/shutdown.c:304
+#: login-utils/shutdown.c:310
 msgid "Login is therefore prohibited."
 msgstr "Connexion non autoris�e par cons�quent."
 
-#: login-utils/shutdown.c:325
+#: login-utils/shutdown.c:331
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%s par %s : %s"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "rebooted"
 msgstr "r�amorc�"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "halted"
 msgstr "interrompu"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:377
+#: login-utils/shutdown.c:387
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
@@ -6189,7 +6274,7 @@ msgstr ""
 "\n"
 "Pourquoi suis-je encore vivant apr�s le red�marrage ?"
 
-#: login-utils/shutdown.c:379
+#: login-utils/shutdown.c:389
 msgid ""
 "\n"
 "Now you can turn off the power..."
@@ -6197,96 +6282,100 @@ msgstr ""
 "\n"
 "Vous pouvez �teindre la machine maintenant..."
 
-#: login-utils/shutdown.c:394
+#: login-utils/shutdown.c:404
 msgid "Calling kernel power-off facility...\n"
 msgstr "Appel de la fonction de mise hors tension du kernel...\n"
 
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:407
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "Erreur lors de la mise hors tension de\t%s\n"
 
-#: login-utils/shutdown.c:405
+#: login-utils/shutdown.c:415
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "Ex�cution en cours du programme \"%s\" ...\n"
 
-#: login-utils/shutdown.c:408
+#: login-utils/shutdown.c:418
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "Erreur lors de l'ex�cution de\t%s\n"
 
-#: login-utils/shutdown.c:431
+#: login-utils/shutdown.c:441
 #, c-format
 msgid "URGENT: broadcast message from %s:"
 msgstr "URGENT: message broadcast depuis %s :"
 
-#: login-utils/shutdown.c:437
+#: login-utils/shutdown.c:447
 msgid "System going down IMMEDIATELY!\n"
 msgstr "Arr�t IMMEDIAT du syst�me !\n"
 
-#: login-utils/shutdown.c:440
+#: login-utils/shutdown.c:450
 #, c-format
 msgid "System going down in %d hour%s %d minutes"
 msgstr "Arr�t du syst�me dans %d heure%s %d minutes."
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
 msgid "s"
 msgstr "s"
 
-#: login-utils/shutdown.c:443
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "System going down in %d minute%s\n"
 msgstr "Arr�t du syst�me dans %d minute%s.\n"
 
-#: login-utils/shutdown.c:449
+#: login-utils/shutdown.c:459
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:506
+#: login-utils/shutdown.c:516
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "fork pour swapoff impossible. "
 
-#: login-utils/shutdown.c:514
+#: login-utils/shutdown.c:524
 msgid "Cannot exec swapoff, hoping umount will do the trick."
 msgstr "exec swapoff impossible. Il reste � esp�rer que umount fera l'affaire."
 
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:543
 msgid "Cannot fork for umount, trying manually."
 msgstr "fork pour umount impossible. Essayez manuellement."
 
-#: login-utils/shutdown.c:542
+#: login-utils/shutdown.c:552
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr "exec %s impossible. Essayez umount.\n"
 
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:556
 msgid "Cannot exec umount, giving up on umount."
 msgstr "exec umount impossible. Abandon de umount."
 
-#: login-utils/shutdown.c:551
+#: login-utils/shutdown.c:561
 msgid "Unmounting any remaining filesystems..."
 msgstr "D�montage en cours des syst�mes de fichiers restants..."
 
-#: login-utils/shutdown.c:587
+#: login-utils/shutdown.c:595
 #, c-format
-msgid "shutdown: Couldn't umount %s\n"
-msgstr "Fermeture : umount %s impossible.\n"
+msgid "shutdown: Couldn't umount %s: %s\n"
+msgstr "Fermeture : umount %s impossible : %s\n"
 
-#: login-utils/simpleinit.c:79
+#: login-utils/simpleinit.c:109
 msgid "Booting to single user mode.\n"
 msgstr "Amor�age en mode utilisateur unique.\n"
 
-#: login-utils/simpleinit.c:83
+#: login-utils/simpleinit.c:113
 msgid "exec of single user shell failed\n"
 msgstr "exec utilisateur unique a �chou�.\n"
 
-#: login-utils/simpleinit.c:87
+#: login-utils/simpleinit.c:117
 msgid "fork of single user shell failed\n"
 msgstr "fork utilisateur unique a �chou�.\n"
 
-#: login-utils/simpleinit.c:226
+#: login-utils/simpleinit.c:166
+msgid "error opening fifo\n"
+msgstr "erreur lors de l'ouverture du fifo\n"
+
+#: login-utils/simpleinit.c:271
 msgid ""
 "\n"
 "Wrong password.\n"
@@ -6294,34 +6383,34 @@ msgstr ""
 "\n"
 "Mot de passe incorrect.\n"
 
-#: login-utils/simpleinit.c:252
-msgid "exec rc failed\n"
-msgstr "Echec de exec rc\n"
-
-#: login-utils/simpleinit.c:255
-msgid "open of rc file failed\n"
-msgstr "Echec de l'ouverture du fichier rc\n"
+#: login-utils/simpleinit.c:341
+msgid "stat of path failed\n"
+msgstr "l'�tat du chemin a �chou�\n"
 
-#: login-utils/simpleinit.c:261
-msgid "fork of rc shell failed\n"
-msgstr "Echec de fork du shell rc.\n"
+#: login-utils/simpleinit.c:348
+msgid "open of directory failed\n"
+msgstr "�chec de l'ouverture du r�pertoire.\n"
 
-#: login-utils/simpleinit.c:273
+#: login-utils/simpleinit.c:415
 msgid "fork failed\n"
-msgstr "Echec de fork.\n"
+msgstr "�chec de fork.\n"
 
-#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+#: login-utils/simpleinit.c:445 text-utils/more.c:1541
 msgid "exec failed\n"
-msgstr "Echec de exec.\n"
+msgstr "�chec de exec.\n"
 
-#: login-utils/simpleinit.c:324
+#: login-utils/simpleinit.c:469
 msgid "cannot open inittab\n"
 msgstr "Impossible d'ouvrir inittab.\n"
 
-#: login-utils/simpleinit.c:362
+#: login-utils/simpleinit.c:529
 msgid "no TERM or cannot stat tty\n"
 msgstr "aucun TERM ou stat tty impossible.\n"
 
+#: login-utils/simpleinit.c:753 login-utils/simpleinit.c:854
+msgid "error running programme\n"
+msgstr "erreur lors de l'ex�cution du programme\n"
+
 #: login-utils/ttymsg.c:81
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr "Trop de iov (changez le code dans wall/ttymsg.c)"
@@ -6344,39 +6433,39 @@ msgstr "fork : %s"
 msgid "%s: BAD ERROR"
 msgstr "%s : MAUVAISE ERREUR"
 
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:145
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s : le fichier %s est occup�.\n"
 
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s : le fichier %s est occup� (%s pr�sent)\n"
 
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:167
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s : impossible de lier %s: %s\n"
 
-#: login-utils/vipw.c:193
+#: login-utils/vipw.c:188
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s : impossible de d�verrouiller %s: %s (vos modifications sont toujours "
 "dans %s).\n"
 
-#: login-utils/vipw.c:217
+#: login-utils/vipw.c:211
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s : fork impossible\n"
 
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:251
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s : %s inchang�\n"
 
-#: login-utils/vipw.c:300
+#: login-utils/vipw.c:294
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s : aucun changement effectu�\n"
@@ -6411,76 +6500,76 @@ msgstr "%s : stat du fichier temporaire impossible.\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s : lecture du fichier temporaire impossible.\n"
 
-#: misc-utils/cal.c:189
+#: misc-utils/cal.c:186
 msgid "illegal month value: use 1-12"
 msgstr "Valeur de mois non valide : utilisez les valeurs 1 � 12."
 
-#: misc-utils/cal.c:193
+#: misc-utils/cal.c:190
 msgid "illegal year value: use 1-9999"
 msgstr "Valeur d'ann�e non valide : utilisez 1-9999."
 
-#: misc-utils/cal.c:489
+#: misc-utils/cal.c:486
 msgid "usage: cal [-mjyV] [[month] year]\n"
 msgstr "Usage : cal [-mjyV] [[mois] ann�e]\n"
 
-#: misc-utils/ddate.c:192
+#: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Usage : %s [+format] [jour mois ann�e]\n"
 
 #. handle St. Tib's Day
-#: misc-utils/ddate.c:238
+#: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
 msgstr "Jour de la St. Tib"
 
-#: misc-utils/kill.c:209
+#: misc-utils/kill.c:210
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s : signal %s inconnu\n"
 
-#: misc-utils/kill.c:271
+#: misc-utils/kill.c:272
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr "%s : processus \"%s\" introuvable\n"
 
-#: misc-utils/kill.c:315
+#: misc-utils/kill.c:316
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s : signal %s inconnu ; signaux valides :\n"
 
-#: misc-utils/kill.c:355
+#: misc-utils/kill.c:356
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Usage : %s [ -s signal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:356
+#: misc-utils/kill.c:357
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ signal ]\n"
 
-#: misc-utils/logger.c:144
+#: misc-utils/logger.c:133
 #, c-format
 msgid "logger: %s: %s.\n"
 msgstr "Utilisateur tentant de se connecter : %s: %s.\n"
 
-#: misc-utils/logger.c:248
+#: misc-utils/logger.c:237
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr "Utilisateur : nom de fonction inconnu : %s.\n"
 
-#: misc-utils/logger.c:260
+#: misc-utils/logger.c:249
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr "Utilisateur : nom de priorit� inconnu : %s.\n"
 
-#: misc-utils/logger.c:287
+#: misc-utils/logger.c:276
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 "usage : utilisateur [-is] [-f fichier] [-p pri] [-t balise] [-u socket] [ "
 "message ... ]\n"
 
-#: misc-utils/look.c:336
+#: misc-utils/look.c:345
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr "usage : look [-dfa] [-t car] string [fichier]\n"
 
@@ -6494,62 +6583,62 @@ msgstr "Impossible d'ouvrir %s\n"
 msgid "Got %d bytes from %s\n"
 msgstr "%d octets re�us de %s\n"
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:100
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr "namei : impossible d'obtenir le r�pertoire en cours - %s\n"
 
-#: misc-utils/namei.c:118
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr "namei : chdir impossible dans %s - %s (%d)\n"
 
-#: misc-utils/namei.c:128
+#: misc-utils/namei.c:120
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr "Usage : namei [-mx] pathname [nom-chemin ...]\n"
 
-#: misc-utils/namei.c:157
+#: misc-utils/namei.c:145
 msgid "namei: could not chdir to root!\n"
 msgstr "namei : chdir impossible dans le r�pertoire root !\n"
 
-#: misc-utils/namei.c:164
+#: misc-utils/namei.c:152
 msgid "namei: could not stat root!\n"
 msgstr "namei : stat du r�pertoire root impossible !\n"
 
-#: misc-utils/namei.c:219
+#: misc-utils/namei.c:207
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr " ? chdir impossible dans %s - %s (%d)\n"
 
-#: misc-utils/namei.c:248
+#: misc-utils/namei.c:236
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr " ? probl�mes lors de la lecture du lien symbolique %s - %s (%d)\n"
 
-#: misc-utils/namei.c:258
+#: misc-utils/namei.c:246
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-msgstr "  *** LIMITE UNIX DE LIENS SYMBOLIQUES DEPASSEE ***\n"
+msgstr "  *** LIMITE UNIX DE LIENS SYMBOLIQUES DEPASS�E ***\n"
 
-#: misc-utils/namei.c:295
+#: misc-utils/namei.c:283
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei : type de fichier inconnu 0%06o dans le fichier %s\n"
 
-#: misc-utils/script.c:109
-msgid "usage: script [-a] [file]\n"
-msgstr "Usage : script [-a] [fichier]\n"
+#: misc-utils/script.c:118
+msgid "usage: script [-a] [-f] [file]\n"
+msgstr "Usage : script [-a] [-f] [fichier]\n"
 
-#: misc-utils/script.c:129
+#: misc-utils/script.c:139
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Le script a commenc�, le fichier est %s\n"
 
-#: misc-utils/script.c:198
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started on %s"
 msgstr "D�but du script sur %s"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:269
 #, c-format
 msgid ""
 "\n"
@@ -6558,288 +6647,288 @@ msgstr ""
 "\n"
 "Script termin� sur %s"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script termin�, le fichier est %s\n"
 
-#: misc-utils/script.c:281
+#: misc-utils/script.c:288
 msgid "openpty failed\n"
 msgstr "openpty a �chou�.\n"
 
-#: misc-utils/script.c:315
+#: misc-utils/script.c:322
 msgid "Out of pty's\n"
 msgstr "A court de pty\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:713
+#: misc-utils/setterm.c:743
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s : Erreur d'argument, usage\n"
 
-#: misc-utils/setterm.c:716
+#: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nom_terminal ]\n"
 
-#: misc-utils/setterm.c:717
+#: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:718
+#: misc-utils/setterm.c:748
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:719
+#: misc-utils/setterm.c:749
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:721
+#: misc-utils/setterm.c:751
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:722
+#: misc-utils/setterm.c:752
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:724
+#: misc-utils/setterm.c:754
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:725
+#: misc-utils/setterm.c:755
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:726
+#: misc-utils/setterm.c:756
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:727
+#: misc-utils/setterm.c:757
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:728
+#: misc-utils/setterm.c:758
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:730
+#: misc-utils/setterm.c:760
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:732
+#: misc-utils/setterm.c:762
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
-#: misc-utils/setterm.c:739
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:734
+#: misc-utils/setterm.c:764
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:736
+#: misc-utils/setterm.c:766
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:738
+#: misc-utils/setterm.c:768
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:741
+#: misc-utils/setterm.c:771
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:773
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:774
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:775
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:776
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:777
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:778
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:779
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:780
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:781
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:782
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:784
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilename ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:789
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:790
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:791
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:792
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:793
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:831
+#: misc-utils/setterm.c:862
 msgid "snow.on"
 msgstr "snow.on"
 
-#: misc-utils/setterm.c:833
+#: misc-utils/setterm.c:864
 msgid "snow.off"
 msgstr "snow.off"
 
-#: misc-utils/setterm.c:839
+#: misc-utils/setterm.c:870
 msgid "softscroll.on"
 msgstr "softscroll.on"
 
-#: misc-utils/setterm.c:841
+#: misc-utils/setterm.c:872
 msgid "softscroll.off"
 msgstr "softscroll.off"
 
-#: misc-utils/setterm.c:1016
+#: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr "Impossible de (d�s)activer le mode veille.\n"
 
-#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "Erreur klogctl : %s\n"
 
-#: misc-utils/setterm.c:1104
+#: misc-utils/setterm.c:1133
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Erreur lors de la lecture de %s\n"
 
-#: misc-utils/setterm.c:1119
+#: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
 msgstr "Erreur lors de l'�criture de la capture d'�cran\n"
 
-#: misc-utils/setterm.c:1133
+#: misc-utils/setterm.c:1162
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "Lecture de %s impossible, et ioctl dump impossible.\n"
 
-#: misc-utils/setterm.c:1198
+#: misc-utils/setterm.c:1227
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s : $TERM n'est pas d�fini.\n"
 
-#: misc-utils/tsort.c:120
+#: misc-utils/tsort.c:117
 msgid "usage: tsort [ inputfile ]\n"
 msgstr "Usage : tsort [ fichier entr�e ]\n"
 
-#: misc-utils/tsort.c:157
+#: misc-utils/tsort.c:154
 msgid "tsort: odd data count.\n"
 msgstr "tsort : total donn�es impaires.\n"
 
-#: misc-utils/tsort.c:320
+#: misc-utils/tsort.c:305
 msgid "tsort: cycle in data.\n"
 msgstr "tsort : cycle des donn�es.\n"
 
-#: misc-utils/tsort.c:333
+#: misc-utils/tsort.c:318
 msgid "tsort: internal error -- could not find cycle.\n"
 msgstr "tsort : erreur interne -- cycle introuvable.\n"
 
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:155
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nom...\n"
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:100
 msgid "write: can't find your tty's name\n"
 msgstr "write : nom tty introuvable\n"
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:111
 msgid "write: you have write permission turned off.\n"
 msgstr "write : permission d'�criture d�sactiv�e.\n"
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:132
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr "write : %s non connect� sur %s.\n"
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:140
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr "write : %s a des messages d�sactiv�s sur %s\n"
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:147
 msgid "usage: write user [tty]\n"
 msgstr "Usage : utilisateur write [tty]\n"
 
-#: misc-utils/write.c:245
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write : %s n'est pas connect�\n"
 
-#: misc-utils/write.c:254
+#: misc-utils/write.c:255
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr "write : %s a les messages d�sactiv�s\n"
 
-#: misc-utils/write.c:258
+#: misc-utils/write.c:259
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr "write : %s est connect� plus d'une fois ; �criture dans %s.\n"
 
-#: misc-utils/write.c:325
+#: misc-utils/write.c:323
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Message de %s@%s dans %s at %s ..."
@@ -6847,12 +6936,12 @@ msgstr "Message de %s@%s dans %s at %s ..."
 #: mount/fstab.c:116
 #, c-format
 msgid "warning: error reading %s: %s"
-msgstr "Avertissement : erreur lors de la lecture de %s: %s"
+msgstr "Avertissement : erreur lors de la lecture de %s : %s"
 
 #: mount/fstab.c:143 mount/fstab.c:166
 #, c-format
 msgid "warning: can't open %s: %s"
-msgstr "Avertissement : impossible d'ouvrir %s: %s"
+msgstr "Avertissement : impossible d'ouvrir %s : %s"
 
 #: mount/fstab.c:147
 #, c-format
@@ -6866,32 +6955,32 @@ msgstr "mount : impossible d'ouvrir %s - utilisation de %s � la place\n"
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
-"Impossible de cr�er le fichier de verrouillage %s: %s (utilisez l'indicateur "
-"-n pour passer outre)"
+"Impossible de cr�er le fichier de verrouillage %s : %s (utilisez "
+"l'indicateur -n pour passer outre)"
 
 #: mount/fstab.c:387
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
-"Impossible de lier le fichier de verrouillage %s: %s (utilisez l'indicateur "
+"Impossible de lier le fichier de verrouillage %s : %s (utilisez l'indicateur "
 "-n pour passer outre)"
 
 #: mount/fstab.c:399
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
-"Impossible d'ouvrir le fichier de verrouillage %s: %s (utilisez la balise -n "
-"pour passer outre)"
+"Impossible d'ouvrir le fichier de verrouillage %s : %s (utilisez la balise "
+"-n pour passer outre)"
 
 #: mount/fstab.c:414
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr "Impossible de verrouiller le fichier de verrouillage %s: %s\n"
+msgstr "Impossible de verrouiller le fichier de verrouillage %s : %s\n"
 
 #: mount/fstab.c:427
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr "Impossible de verrouiller le fichier de verrouillage %s: %s"
+msgstr "Impossible de verrouiller le fichier de verrouillage %s : %s"
 
 #: mount/fstab.c:429
 msgid "timed out"
@@ -6903,6 +6992,8 @@ msgid ""
 "Cannot create link %s\n"
 "Perhaps there is a stale lock file?\n"
 msgstr ""
+"Impossible de cr�er le lien %s\n"
+"Peut etre qu'il y a un fichier de verrouillage latent ?\n"
 
 #: mount/fstab.c:482 mount/fstab.c:490
 #, c-format
@@ -6946,16 +7037,16 @@ msgstr "loop : impossible d'ouvrir le p�riph�rique %s: %s\n"
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop : impossible d'obtenir des infos sur le p�riph�rique %s: %s\n"
 
-#: mount/lomount.c:89 mount/losetup.c:74
+#: mount/lomount.c:89
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 msgstr "%s : [%04x]:%ld (%s) d�calage %d, %s cryptage\n"
 
-#: mount/lomount.c:143
+#: mount/lomount.c:148
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount : p�riph�rique introuvable dans /dev/loop#"
 
-#: mount/lomount.c:147
+#: mount/lomount.c:152
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -6963,7 +7054,7 @@ msgstr ""
 "mount : p�riph�rique de boucle introuvable.\n"
 " /dev/loop# a peut-�tre un nombre majeur incorrect ?"
 
-#: mount/lomount.c:151
+#: mount/lomount.c:156
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -6974,7 +7065,7 @@ msgstr ""
 "       ce kernel ne sait rien du p�riph�rique de boucle.\n"
 "       (Si tel est le cas, recompilez ou effectuez `insmod loop.o'.)"
 
-#: mount/lomount.c:156
+#: mount/lomount.c:162
 msgid ""
 "mount: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
@@ -6986,53 +7077,53 @@ msgstr ""
 "loop.o'). Il se peut aussi que\n"
 "       /dev/loop# ait un nombre majeur incorrect."
 
-#: mount/lomount.c:160
+#: mount/lomount.c:166
 msgid "mount: could not find any free loop device"
 msgstr "mount : impossible de trouver un p�riph�rique de boucle disponible"
 
-#: mount/lomount.c:191 mount/losetup.c:106
+#: mount/lomount.c:197
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Type de cryptage %s non pris en charge\n"
 
-#: mount/lomount.c:210 mount/losetup.c:126
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr "Impossible de verrouiller en m�moire, quitte.\n"
+
+#: mount/lomount.c:231
 msgid "Init (up to 16 hex digits): "
 msgstr "Init(jusqu'� 16 chiffres hexad�cimaux) : "
 
-#: mount/lomount.c:217 mount/losetup.c:133
+#: mount/lomount.c:238
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Chiffre non hexad�cimal '%c'.\n"
 
-#: mount/lomount.c:223 mount/losetup.c:140
+#: mount/lomount.c:245
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "Ne sais pas comment obtenir la cl� du syst�me de cryptage %d\n"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:261
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d) : succ�s\n"
 
-#: mount/lomount.c:250
+#: mount/lomount.c:272
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop : impossible de supprimer le p�riph�rique %s: %s\n"
 
-#: mount/lomount.c:260
+#: mount/lomount.c:282
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s) : succ�s\n"
 
-#: mount/lomount.c:268
+#: mount/lomount.c:290
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Ce montage a �t� compil� sans prise en charge de boucle. Recompilez.\n"
 
-#: mount/losetup.c:70
-msgid "Cannot get loop info"
-msgstr "Impossible d'obtenir les infos loop"
-
-#: mount/losetup.c:176
+#: mount/lomount.c:327
 #, c-format
 msgid ""
 "usage:\n"
@@ -7047,7 +7138,11 @@ msgstr ""
 "  %s [ -e cryptage ] [ -o d�calage ] fichier p�riph�rique_boucle # "
 "configurer\n"
 
-#: mount/losetup.c:234
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr "M�moire insuffisante"
+
+#: mount/lomount.c:416
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Aucune prise en charge de boucle disponible au moment de la compilation. "
@@ -7068,39 +7163,39 @@ msgstr "[mntent] : la ligne %d dans %s est incorrecte%s\n"
 msgid "; rest of file ignored"
 msgstr "; reste du fichier ignor�"
 
-#: mount/mount.c:333
+#: mount/mount.c:350
 #, 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:336
+#: mount/mount.c:353
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount : selon mtab, %s est mont� sur %s"
 
-#: mount/mount.c:357
+#: mount/mount.c:374
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount : impossible d'ouvrir %s pour �criture : %s"
 
-#: mount/mount.c:372 mount/mount.c:654
+#: mount/mount.c:389 mount/mount.c:589
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount : erreur lors de l'�criture de %s: %s"
 
-#: mount/mount.c:379
+#: mount/mount.c:396
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount : erreur lors du changement du mode de %s: %s"
 
-#: mount/mount.c:413
+#: mount/mount.c:438
 #, c-format
 msgid "%s looks like swapspace - not mounted"
-msgstr ""
+msgstr "%s ressemble � un espace d'�change - non mont�"
 
 #: mount/mount.c:481
 msgid "mount failed"
-msgstr "Echec du montage"
+msgstr "�chec du montage"
 
 #: mount/mount.c:483
 #, c-format
@@ -7111,68 +7206,82 @@ msgstr "mount : seul l'utilisateur root peut monter %s sur %s"
 msgid "mount: loop device specified twice"
 msgstr "mount : p�riph�rique de boucle sp�cifi� deux fois"
 
-#: mount/mount.c:517
+#: mount/mount.c:516
 msgid "mount: type specified twice"
 msgstr "mount : type sp�cifi� deux fois"
 
-#: mount/mount.c:529
+#: mount/mount.c:528
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount : saut de la configuration d'un p�riph�rique de boucle\n"
 
-#: mount/mount.c:538
+#: mount/mount.c:537
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount : le p�riph�rique de boucle %s va �tre utilis�\n"
 
-#: mount/mount.c:542
+#: mount/mount.c:541
 msgid "mount: failed setting up loop device\n"
 msgstr "mount : �chec de la configuration du p�riph�rique de boucle\n"
 
-#: mount/mount.c:546
+#: mount/mount.c:545
 msgid "mount: setup loop device successfully\n"
 msgstr "mount : la configuration du p�riph�rique de boucle a abouti\n"
 
-#: mount/mount.c:559
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount : cette version a �t� compil�e sans prise en charge du type `nfs'"
+#: mount/mount.c:584
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount : impossible d'ouvrir %s: %s"
+
+#: mount/mount.c:607
+#, c-format
+msgid "mount: cannot not open %s for setting speed"
+msgstr "mount : impossible d'ouvrir %s pour d�finir la vitesse"
 
-#: mount/mount.c:610 mount/mount.c:1043
+#: mount/mount.c:610
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount : impossible de d�finir la vitesse : %s"
+
+#: mount/mount.c:671 mount/mount.c:1175
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount : fork impossible : %s"
 
-#: mount/mount.c:649
-#, c-format
-msgid "mount: can't open %s: %s"
-msgstr "mount : impossible d'ouvrir %s: %s"
+#: mount/mount.c:739
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr ""
+"mount : cette version a �t� compil�e sans prise en charge du type `nfs'"
 
-#: mount/mount.c:678
+#: mount/mount.c:779
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr "mount : �chec avec nfs mount version 4, essaye avec la 3...\n"
+
+#: mount/mount.c:790
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr ""
 "mount : Impossible de d�terminer le type du syst�me de fichiers et aucun "
 "n'�tait sp�cifi�."
 
-#: mount/mount.c:681
+#: mount/mount.c:793
 msgid "mount: you must specify the filesystem type"
 msgstr "mount : vous devez indiquer le type de syst�me de fichiers."
 
 #. should not happen
-#: mount/mount.c:684
+#: mount/mount.c:796
 msgid "mount: mount failed"
-msgstr "mount: Echec du montage"
+msgstr "mount : �chec du montage"
 
-#: mount/mount.c:690 mount/mount.c:725
+#: mount/mount.c:802 mount/mount.c:837
 #, 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:692
+#: mount/mount.c:804
 msgid "mount: permission denied"
 msgstr "mount : permission refus�e."
 
-#: mount/mount.c:694
+#: mount/mount.c:806
 msgid "mount: must be superuser to use mount"
 msgstr ""
 "mount : vous devez �tre l'utilisateur root pour utiliser la fonction de "
@@ -7180,38 +7289,38 @@ msgstr ""
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:698 mount/mount.c:702
+#: mount/mount.c:810 mount/mount.c:814
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount : %s est occup�"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:704
+#: mount/mount.c:816
 msgid "mount: proc already mounted"
 msgstr "mount : proc d�j� mont�"
 
-#: mount/mount.c:706
+#: mount/mount.c:818
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount : %s d�j� mont� ou %s occup�"
 
-#: mount/mount.c:712
+#: mount/mount.c:824
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount : le point de montage %s n'existe pas."
 
-#: mount/mount.c:714
+#: mount/mount.c:826
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount : le point de montage %s est un lien symbolique avec rien"
 
-#: mount/mount.c:717
+#: mount/mount.c:829
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount : le p�riph�rique sp�cial %s n'existe pas."
 
-#: mount/mount.c:727
+#: mount/mount.c:839
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7220,12 +7329,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:739
+#: mount/mount.c:851
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount : %s pas encore mont�, ou option incorrecte"
 
-#: mount/mount.c:741
+#: mount/mount.c:853
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7234,35 +7343,35 @@ msgstr ""
 "mount : type fs incorrect, option incorrecte, superbloc incorrect sur %s,\n"
 "       ou trop de syst�mes de fichiers mont�s"
 
-#: mount/mount.c:756
+#: mount/mount.c:871
 msgid "mount table full"
 msgstr "Table de montage compl�te"
 
-#: mount/mount.c:758
+#: mount/mount.c:873
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount : %s: impossible de lire le superbloc"
 
-#: mount/mount.c:761
+#: mount/mount.c:877
 #, c-format
 msgid "mount: %s has wrong major or minor number"
 msgstr "mount : %s a un nombre majeur ou un nombre mineur incorrect."
 
-#: mount/mount.c:766
+#: mount/mount.c:882
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount : type fs %s non pris en charge par le kernel"
 
-#: mount/mount.c:778
+#: mount/mount.c:894
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount : vous vouliez sans doute dire %s."
 
-#: mount/mount.c:780
+#: mount/mount.c:896
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount : vous vouliez peut-�tre dire iso9660 ?"
 
-#: mount/mount.c:783
+#: mount/mount.c:899
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -7270,12 +7379,12 @@ msgstr ""
 "pris en charge."
 
 #. strange ...
-#: mount/mount.c:788
+#: mount/mount.c:905
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
-msgstr "mount : %s n'est pas un p�riph�rique de bloc. Echec de stat ?"
+msgstr "mount : %s n'est pas un p�riph�rique de bloc. �chec de stat ?"
 
-#: mount/mount.c:790
+#: mount/mount.c:907
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7284,237 +7393,275 @@ msgstr ""
 "mount : le kernel ne reconna�t pas %s comme p�riph�rique de bloc\n"
 "       (peut-�tre `insmod driver' ?)"
 
-#: mount/mount.c:793
+#: mount/mount.c:910
 #, 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 bloc (essayez `-o loop' ?)."
 
-#: mount/mount.c:796
+#: mount/mount.c:913
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount : %s n'est pas un p�riph�rique de bloc."
 
-#: mount/mount.c:799
+#: mount/mount.c:916
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount : %s n'est pas un p�riph�rique de bloc valide."
 
-#: mount/mount.c:803
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:919
+msgid "block device "
+msgstr "P�riph�rique de bloc"
+
+#: mount/mount.c:921
 #, c-format
-msgid "mount: block device %s is not permitted on its filesystem"
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount : impossible de monter %s%s en lecture seule."
+
+#: mount/mount.c:925
+#, c-format
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount : le p�riph�rique de bloc %s n'est pas autoris� sur son syst�me de "
-"fichiers."
+"mount : %s%s est prot�g� en �criture mais l'indicateur `-w' a �t� "
+"explicitement donn�."
 
-#: mount/mount.c:819
+#: mount/mount.c:941
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount : %s%s est prot�g� en �criture. Montage en lecture seule."
 
-#: mount/mount.c:820
-msgid "block device "
-msgstr "P�riph�rique de bloc"
-
-#: mount/mount.c:907
+#: mount/mount.c:1030
 #, c-format
-msgid "mount: consider mounting %s by %s\n"
+msgid "mount: going to mount %s by %s\n"
 msgstr "mount : envisagez de monter %s par %s.\n"
 
-#: mount/mount.c:908
+#: mount/mount.c:1031
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:908
+#: mount/mount.c:1031
 msgid "label"
 msgstr "Libell�"
 
-#: mount/mount.c:910 mount/mount.c:1226
+#: mount/mount.c:1033 mount/mount.c:1403
 msgid "mount: no such partition found"
 msgstr "mount : partition introuvable"
 
-#: mount/mount.c:918
+#: mount/mount.c:1041
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount : aucun type donn� - nfs suppos� en raison du point virgule\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:934
+#: mount/mount.c:1057
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount : tentative de montage en arri�re-plan en cours \"%s\"\n"
 
-#: mount/mount.c:945
+#: mount/mount.c:1068
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount : abandon de \"%s\"\n"
 
-#: mount/mount.c:994
+#: mount/mount.c:1126
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount : %s d�j� mont� sur %s\n"
 
-#: mount/mount.c:1105
-msgid ""
-"Usage: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       A special device can be indicated by  -L label  or  -U uuid .\n"
-msgstr ""
-"Usage : mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       Un p�riph�rique sp�cial peut �tre indiqu� par un libell� -L ou -U "
-"uuid .\n"
-
-#: mount/mount.c:1211
+#: mount/mount.c:1243
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+"Usage : mount -V                 : affiche la version\n"
+"        mount -h                 : affiche cette aide\n"
+"        mount                    : liste les syt�mes de fichiers mont�s\n"
+"        mount -l                 : idem, inclus les noms de volumes\n"
+"Pour la partie information. Vient le montage.\n"
+"La commande est `mount [-t fstype] quelquechose quelquepart'.\n"
+"D�tails trouv� dans /etc/fstab peuvent etre omis.\n"
+"        mount -a                 : monte tout /etc/fstab\n"
+"        mount p�riph�rique       : monte le p�riph�rique � la place connue\n"
+"        mount r�pertoire         : monte le p�riph�rique connu ici\n"
+"        mount -t type p�r r�p    : commande de montage normal\n"
+"Notez que celle ci ne monte pas vraiment un p�riph�rique, elle monte\n"
+"un syst�me de fichier (du type donn�) trouv� sur le p�riph�rique.\n"
+"Celle ci peut aussi monter un r�pertoire d�j� visible autrepart :\n"
+"        mount --bind ancienr�p nouveaur�p\n"
+"Un p�riph�rique peut etre d�sign� par son nom, /dev/hda1 ou /dev/cdrom,\n"
+"ou par son label, en utilisant  -L label ou par son uuid, en utilisant\n"
+"-U uuid .\n"
+"Les montages simultan�s sont sp�cifi�s en utilisant une des options\n"
+"        --replace, --after, --before, --over\n"
+"Autres options : [-nfFrsvw] [-o options].\n"
+"Pour plus de d�tails, voyez man 8 mount .\n"
+
+#: mount/mount.c:1387
 msgid "mount: only root can do that"
 msgstr "mount : seul l'utilisateur root peut le faire."
 
-#: mount/mount.c:1216
+#: mount/mount.c:1392
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount : %s introuvable - cr�ation en cours..\n"
 
-#: mount/mount.c:1228
+#: mount/mount.c:1405
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount : montage de %s en cours...\n"
 
-#: mount/mount.c:1237
+#: mount/mount.c:1414
 msgid "not mounted anything"
 msgstr "Pas de montage"
 
-#: mount/mount.c:1250
+#: mount/mount.c:1429
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount : impossible de trouver %s dans %s"
 
-#: mount/mount.c:1264
+#: mount/mount.c:1444
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount : impossible de trouver %s dans %s ou %s"
 
-#: mount/mount_by_label.c:141
+#: mount/mount_by_label.c:97
+#, c-format
+msgid ""
+"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+"mount : impossible d'ouvrir %s, tant que la conversion UUID et LABEL n'a pas "
+"�t� faite.\n"
+
+#: mount/mount_by_label.c:199
 msgid "mount: bad UUID"
 msgstr "mount : UUID incorrect"
 
-#: mount/mount_guess_fstype.c:251
+#: mount/mount_guess_fstype.c:257
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount : aucun type de syst�me de fichiers sp�cifi� pour %s\n"
 
-#: mount/mount_guess_fstype.c:254
+#: mount/mount_guess_fstype.c:260
 #, c-format
 msgid "       I will try all types mentioned in %s or %s\n"
 msgstr "       Essayer des autres types mentionn�s dans %s ou %s\n"
 
-#: mount/mount_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:263
 msgid "       and it looks like this is swapspace\n"
-msgstr ""
+msgstr "       et il semble que ce soit un espace d'�change\n"
 
-#: mount/mount_guess_fstype.c:259
+#: mount/mount_guess_fstype.c:265
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "      Essayer avec le type %s\n"
 
-#: mount/mount_guess_fstype.c:321
+#: mount/mount_guess_fstype.c:329
 #, c-format
 msgid "Trying %s\n"
-msgstr ""
+msgstr "Essaye %s\n"
 
-#: mount/nfsmount.c:157
+#: mount/nfsmount.c:220
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount : argument h�te:dir beaucoup trop long\n"
 
-#: mount/nfsmount.c:170
+#: mount/nfsmount.c:233
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount : avertissement: noms d'h�tes multiples non pris en charge\n"
 
-#: mount/nfsmount.c:174
+#: mount/nfsmount.c:237
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount : le r�pertoire � monter n'est pas au format h�te:dir.\n"
 
-#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#: mount/nfsmount.c:248 mount/nfsmount.c:498
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount : impossible d'obtenir l'adresse pour %s\n"
 
-#: mount/nfsmount.c:191
+#: mount/nfsmount.c:254
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount : hp->h_length incorrect re�u\n"
 
-#: mount/nfsmount.c:208
+#: mount/nfsmount.c:271
 msgid "mount: excessively long option argument\n"
 msgstr "mount : argument option beaucoup trop long\n"
 
-#: mount/nfsmount.c:299
+#: mount/nfsmount.c:362
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Avertissement : option proto= non reconnue.\n"
 
-#: mount/nfsmount.c:306
+#: mount/nfsmount.c:369
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Avertissement : option namlen non prise en charge.\n"
 
-#: mount/nfsmount.c:310
+#: mount/nfsmount.c:373
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "Param�tre de montage nfs inconnu : %s=%d\n"
 
-#: mount/nfsmount.c:345
+#: mount/nfsmount.c:408
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Avertissement : option nolock non prise en charge.\n"
 
-#: mount/nfsmount.c:348
+#: mount/nfsmount.c:411
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "Option de montage nfs inconnue : %s%s\n"
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:504
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount : hp->h_length incorrect re�u ?\n"
 
-#: mount/nfsmount.c:528
-#, c-format
-msgid "mount: %s:%s failed, reason given by server: %s\n"
-msgstr "mount : �chec de %s:%s. Raison donn�e par le serveur : %s\n"
-
-#: mount/nfsmount.c:539
+#: mount/nfsmount.c:680
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sur TCP non pris en charge.\n"
 
-#: mount/nfsmount.c:546
+#: mount/nfsmount.c:687
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:550
+#: mount/nfsmount.c:691
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:561
+#: mount/nfsmount.c:702
 msgid "used portmapper to find NFS port\n"
 msgstr "Mappeur de port utilis� pour trouver le port NFS\n"
 
-#: mount/nfsmount.c:565
+#: mount/nfsmount.c:706
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "Utilisation du port %d pour le daemon nfs\n"
 
-#: mount/nfsmount.c:576
+#: mount/nfsmount.c:717
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:665
+#: mount/nfsmount.c:804
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "Valeur de l'�tat nfs renvoy�e inconnue : %d"
 
-#: mount/sundries.c:41 mount/sundries.c:56
-msgid "not enough memory"
-msgstr "M�moire insuffisante"
-
 #: mount/sundries.c:66
 msgid "bug in xstrndup call"
 msgstr "Bogue dans l'appel de xstrndup"
@@ -7527,10 +7674,10 @@ msgid ""
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 msgstr ""
-"usage : %s [-hV]\n"
-"       %s -a [-v]\n"
-"       %s [-v] [-p priorit�] special ...\n"
-"       %s [-s]\n"
+"Usage : %s [-hV]\n"
+"        %s -a [-v]\n"
+"        %s [-v] [-p priorit�] special ...\n"
+"        %s [-s]\n"
 
 #: mount/swapon.c:88
 #, c-format
@@ -7629,27 +7776,27 @@ msgstr "Aucun umount2, essai avec umount...\n"
 msgid "could not umount %s - trying %s instead\n"
 msgstr "umount %s impossible - essai avec %s � la place\n"
 
-#: mount/umount.c:270
+#: mount/umount.c:272
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount : %s en cours d'utilisation - remont� en lecture seule\n"
 
-#: mount/umount.c:278
+#: mount/umount.c:282
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount : impossible de remonter %s en lecture seule\n"
 
-#: mount/umount.c:286
+#: mount/umount.c:290
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s d�mont�\n"
 
-#: mount/umount.c:369
+#: mount/umount.c:374
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 "umount : impossible de trouver la liste des syst�mes de fichiers � d�monter"
 
-#: mount/umount.c:398
+#: mount/umount.c:403
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7659,48 +7806,48 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
 "        umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:459
+#: mount/umount.c:464
 msgid "umount: only root can do that"
 msgstr "umount : seul l'utilisateur root peut effectuer cette action."
 
-#: mount/umount.c:474
+#: mount/umount.c:479
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentative de d�monter %s\n"
 
-#: mount/umount.c:478
+#: mount/umount.c:483
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Impossible de trouver %s dans mtab\n"
 
-#: mount/umount.c:482
+#: mount/umount.c:487
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount : %s n'est pas mont� (selon mtab)."
 
-#: mount/umount.c:484
+#: mount/umount.c:489
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount : il semble que %s soit mont� � plusieurs endroits."
 
-#: mount/umount.c:496
+#: mount/umount.c:501
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 "umount : %s n'est pas dans le fichier fstab (et vous n'�tes pas un "
 "utilisateur root)."
 
-#: mount/umount.c:499
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount : %s est en d�saccord avec le fichier fstab."
 
-#: mount/umount.c:520
+#: mount/umount.c:525
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount : seul l'utilisateur root peut d�monter %s de %s."
 
-#: mount/umount.c:531
+#: mount/umount.c:536
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount : seul %s peut d�monter %s de %s."
@@ -7715,7 +7862,7 @@ msgstr ""
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "Usage : ctrlaltdel hard|soft\n"
 
-#: sys-utils/cytune.c:118
+#: sys-utils/cytune.c:120
 #, c-format
 msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
@@ -7725,7 +7872,7 @@ msgstr ""
 "�taient de %d,\n"
 "et le d�bit de transfert maximum en caract�res/seconde �tait de %f.\n"
 
-#: sys-utils/cytune.c:129
+#: sys-utils/cytune.c:131
 #, c-format
 msgid ""
 "File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -7855,50 +8002,60 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec ; %f re�us (car/sec)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:37
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Usage : %s [-c] [-n niveau] [-s taille-tampon]\n"
 
-#: sys-utils/ipcrm.c:46
+#: sys-utils/ipcrm.c:59
+#, c-format
+msgid "invalid id: %s\n"
+msgstr "id invalide : %s\n"
+
+#: sys-utils/ipcrm.c:77
+#, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "Impossible de supprimer l'id %s (%s)\n"
+
+#: sys-utils/ipcrm.c:91
 #, c-format
-msgid "usage: %s [shm | msg | sem] id\n"
-msgstr "Usage : %s [shm | msg | sem] id\n"
+msgid "usage: %s {shm | msg | sem} id ...\n"
+msgstr "Usage : %s {shm | msg | sem} id...\n"
 
-#: sys-utils/ipcrm.c:70
+#: sys-utils/ipcrm.c:124
 #, c-format
-msgid "usage: %s [-shm | -msg | -sem] id\n"
-msgstr "Usage : %s [-shm | -msg | -sem] id\n"
+msgid "unknown resource type: %s\n"
+msgstr "Type de ressource inconnu : %s\n"
 
-#: sys-utils/ipcrm.c:73
-msgid "resource deleted\n"
-msgstr "Ressource supprim�e\n"
+#: sys-utils/ipcrm.c:128
+msgid "resource(s) deleted\n"
+msgstr "Ressource(s) supprim�e(s)\n"
 
-#: sys-utils/ipcs.c:117
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
 msgstr "Usage : %s -asmq -tclup \n"
 
-#: sys-utils/ipcs.c:118
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
 msgstr "\t%s [-s -m -q] -i id\n"
 
-#: sys-utils/ipcs.c:119
+#: sys-utils/ipcs.c:124
 #, c-format
 msgid "\t%s -h for help.\n"
 msgstr "\t%s -h pour aide.\n"
 
-#: sys-utils/ipcs.c:125
+#: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
 msgstr "%s fournit des informations sur les fonctions ipc auxquelles"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
 msgstr " vous avez acc�s en lecture.\n"
 
-#: sys-utils/ipcs.c:127
+#: sys-utils/ipcs.c:132
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
@@ -7908,7 +8065,7 @@ msgstr ""
 "\t-m : m�m_partag�e\n"
 "\t-q : messages\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
@@ -7916,7 +8073,7 @@ msgstr ""
 "\t-s : s�maphores\n"
 "\t-a : tous (par d�faut)\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
@@ -7928,7 +8085,7 @@ msgstr ""
 "\t-p : pid\n"
 "\t-c : cr�ateur\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
@@ -7936,374 +8093,374 @@ msgstr ""
 "\t-l : limites\n"
 "\t-u : r�sum�\n"
 
-#: sys-utils/ipcs.c:131
+#: sys-utils/ipcs.c:136
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
 msgstr "-i id [-s -q -m] : D�tails sur la ressource identifi�e par Id\n"
 
-#: sys-utils/ipcs.c:263 sys-utils/ipcs.c:465
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
 msgid "kernel not configured for shared memory\n"
 msgstr "Kernel non configur� pour la m�moire partag�e\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Limites de la m�moire partag�e --------\n"
 
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:277
 #, c-format
 msgid "max number of segments = %d\n"
 msgstr "Nombre max de segments = %d\n"
 
-#: sys-utils/ipcs.c:273
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max seg size (kbytes) = %d\n"
 msgstr "Taille max de segment (kilo-octets) = %d\n"
 
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max total shared memory (kbytes) = %d\n"
 msgstr "Total max de la m�moire partag�e (kilo-octets) = %d\n"
 
-#: sys-utils/ipcs.c:275
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "min seg size (bytes) = %d\n"
 msgstr "Taille min de segment (octets) = %d\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:284
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Statut de la m�moire partag�e --------\n"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "Segments allou�s %d\n"
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:286
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "Pages allou�es %ld\n"
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:287
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "Pages r�sidentes  %ld\n"
 
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:288
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "Pages �chang�es   %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:289
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
 msgstr "Performances d'�change : %ld tentatives\t %ld succ�s\n"
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:294
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr ""
 "------ Cr�ateurs/Propri�taires de segments en m�moire partag�e --------\n"
 
-#: sys-utils/ipcs.c:290 sys-utils/ipcs.c:396 sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:297 sys-utils/ipcs.c:302
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:302 sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:408
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:308 sys-utils/ipcs.c:397
-#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:489 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:494 sys-utils/ipcs.c:511
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 "------ Heures d'attachement/d�tachement/modification de m�moire partag�e "
 "--------\n"
 
-#: sys-utils/ipcs.c:296
+#: sys-utils/ipcs.c:301
 #, c-format
 msgid "%-10s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:297 sys-utils/ipcs.c:302 sys-utils/ipcs.c:308
-#: sys-utils/ipcs.c:403 sys-utils/ipcs.c:412 sys-utils/ipcs.c:495
-#: sys-utils/ipcs.c:500 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:307 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:417 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505 sys-utils/ipcs.c:511
 msgid "owner"
 msgstr "propri�taire"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "attached"
 msgstr "attach�"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "detached"
 msgstr "d�tach�"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "changed"
 msgstr "chang�"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "------ Cr�ateur/Dernier op�rateur en m�moire partag�e --------\n"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:311
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segments de m�moire partag�e --------\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:412 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
 msgid "key"
 msgstr "touche"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "bytes"
 msgstr "octets"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
 msgid "status"
 msgstr "statut"
 
-#: sys-utils/ipcs.c:328 sys-utils/ipcs.c:329 sys-utils/ipcs.c:330
-#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:434 sys-utils/ipcs.c:526
-#: sys-utils/ipcs.c:527 sys-utils/ipcs.c:528
+#: sys-utils/ipcs.c:333 sys-utils/ipcs.c:334 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:438 sys-utils/ipcs.c:439 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:533
 msgid "Not set"
 msgstr "Non d�fini"
 
-#: sys-utils/ipcs.c:350
+#: sys-utils/ipcs.c:355
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:356
 msgid "locked"
 msgstr "verrouill�"
 
-#: sys-utils/ipcs.c:371
+#: sys-utils/ipcs.c:376
 msgid "kernel not configured for semaphores\n"
 msgstr "Kernel non configur� pour les s�maphores\n"
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:382
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Limites des s�maphores --------\n"
 
-#: sys-utils/ipcs.c:381
+#: sys-utils/ipcs.c:386
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "Nombre max de tables = %d\n"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:387
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "S�maphores max par table = %d\n"
 
-#: sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:388
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "Nombre max de s�maphores dans le syst�me = %d\n"
 
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:389
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "Op�rateurs max par appel semop = %d\n"
 
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:390
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "Valeur max de s�maphores = %d\n"
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:394
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Statut des s�maphores --------\n"
 
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:395
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "Tables utilis�es = %d\n"
 
-#: sys-utils/ipcs.c:391
+#: sys-utils/ipcs.c:396
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "S�maphores allou�s = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:400
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Cr�ateurs/Propri�taires de tables de s�maphores --------\n"
 
-#: sys-utils/ipcs.c:397 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:406
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "------ Heures d'op�ration/modification en m�moire partag�e --------\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-op"
 msgstr "Dernier op�rateur"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-changed"
 msgstr "Derni�re modification"
 
-#: sys-utils/ipcs.c:410
+#: sys-utils/ipcs.c:415
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Tables de s�maphores --------\n"
 
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:417
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:478
 msgid "------ Messages: Limits --------\n"
 msgstr "------ Messages : Limites --------\n"
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:479
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "Files d'attente max dans le syst�me = %d\n"
 
-#: sys-utils/ipcs.c:475
+#: sys-utils/ipcs.c:480
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "Taille de message max (octets) = %d\n"
 
-#: sys-utils/ipcs.c:476
+#: sys-utils/ipcs.c:481
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "Taille de la file max par d�faut (octets) = %d\n"
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:485
 msgid "------ Messages: Status --------\n"
 msgstr "------ Messages : Statut --------\n"
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:486
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "Files d'attente allou�es = %d\n"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:487
 #, c-format
 msgid "used headers = %d\n"
 msgstr "En-t�tes utilis�s = %d\n"
 
-#: sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:488
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "Espace utilis� = %d octets\n"
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:492
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr ""
 "------ Files d'attente de messages : Cr�ateurs/Propri�taires --------\n"
 
-#: sys-utils/ipcs.c:489 sys-utils/ipcs.c:495 sys-utils/ipcs.c:500
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:498
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 "------ Heures d'envoi/r�ception/modification des files d'attente de messages "
 "--------\n"
 
-#: sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:499
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "send"
 msgstr "envoi"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "recv"
 msgstr "r�ception"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "change"
 msgstr "modification"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:504
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID de files d'attente de messages --------\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:509
 msgid "------ Message Queues --------\n"
 msgstr "------ Files d'attente de messages --------\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "used-bytes"
 msgstr "octets utilis�s"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "messages"
 msgstr "messages"
 
-#: sys-utils/ipcs.c:565
+#: sys-utils/ipcs.c:570
 #, c-format
 msgid ""
 "\n"
@@ -8312,41 +8469,41 @@ msgstr ""
 "\n"
 "shmid de segments de m�moire partag�e =%d\n"
 
-#: sys-utils/ipcs.c:566
+#: sys-utils/ipcs.c:571
 #, 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:568
+#: sys-utils/ipcs.c:573
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:569
+#: sys-utils/ipcs.c:574
 #, c-format
 msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 msgstr "octets=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:577
 #, c-format
 msgid "att_time=%s"
 msgstr "att_time=%s"
 
-#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:575 sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
 msgid "Not set\n"
 msgstr "Non d�fini\n"
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:579
 #, c-format
 msgid "det_time=%s"
 msgstr "det_time=%s"
 
-#: sys-utils/ipcs.c:576
+#: sys-utils/ipcs.c:581
 #, c-format
 msgid "change_time=%s"
 msgstr "change_time=%s"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:597
 #, c-format
 msgid ""
 "\n"
@@ -8355,26 +8512,26 @@ msgstr ""
 "\n"
 "msqid de file de messages=%d\n"
 
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:598
 #, 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:595
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "send_time=%srcv_time=%schange_time=%s"
 msgstr "send_time=%srcv_time=%schange_time=%s"
 
-#: sys-utils/ipcs.c:599 sys-utils/ipcs.c:600 sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:604 sys-utils/ipcs.c:605 sys-utils/ipcs.c:606
 msgid "Not Set\n"
 msgstr "Non d�fini\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:623
 #, c-format
 msgid ""
 "\n"
@@ -8383,117 +8540,117 @@ msgstr ""
 "\n"
 "semid de table de s�maphores=%d\n"
 
-#: sys-utils/ipcs.c:619
+#: sys-utils/ipcs.c:624
 #, 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:621
+#: sys-utils/ipcs.c:626
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:622
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "nsems = %d\n"
 msgstr "nsems = %d\n"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "otime = %s"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:630
 #, c-format
 msgid "ctime = %s"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "value"
 msgstr "valeur"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:67
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr ""
 "Usage : rdev [ -rsv ] [ -o DECALAGE ] [ IMAGE [ VALEUR [ DECALAGE ] ] ]"
 
-#: sys-utils/rdev.c:69
+#: sys-utils/rdev.c:68
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
 msgstr ""
 "  rdev /dev/fd0  (ou rdev /linux, etc.) Affiche le p�riph�rique ROOT en cours"
 
-#: sys-utils/rdev.c:70
+#: sys-utils/rdev.c:69
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
 msgstr "  rdev /dev/fd0 /dev/hda2         D�finit ROOT sur /dev/hda2"
 
-#: sys-utils/rdev.c:71
+#: sys-utils/rdev.c:70
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr ""
 "  rdev -R /dev/fd0 1              D�finit les INDICATEURSROOT (statut "
 "lecture seule)"
 
-#: sys-utils/rdev.c:72
+#: sys-utils/rdev.c:71
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
 msgstr "  rdev -s /dev/fd0 /dev/hda2      D�finit le p�riph�rique D'ECHANGE"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:72
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
 msgstr "  rdev -r /dev/fd0 627            D�finit la taille du disque RAM"
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:73
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr "  rdev -v /dev/fd0 1              D�finit l'amor�age en MODE VIDEO"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:74
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   Utilise le d�calage d'octet N"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:75
 msgid "  rootflags ...                   same as rdev -R"
 msgstr "  rootflags ...                   Identique � rdev -R"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:76
 msgid "  swapdev ...                     same as rdev -s"
 msgstr "  swapdev ...                     Identique � rdev -s"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr "  ramsize ...                     Identique � rdev -r"
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     Identique � rdev -v"
 
-#: sys-utils/rdev.c:80
+#: sys-utils/rdev.c:79
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
 "Remarque : les modes vid�o sont : -3=Ask, -2=Extended, -1=NormalVga, 1=key1, "
 "2=key2,..."
 
-#: sys-utils/rdev.c:81
+#: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr ""
 "      Utilisez -R 1 pour monter root en lecture seule, -R 0 pour "
@@ -8584,7 +8741,7 @@ msgstr "%d : ancienne priorit� %d, nouvelle priorit� %d\n"
 msgid "usage: %s program [arg ...]\n"
 msgstr "Usage : %s programme [arg ...]\n"
 
-#: sys-utils/tunelp.c:73
+#: sys-utils/tunelp.c:74
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8596,82 +8753,82 @@ msgstr ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
 msgid "malloc error"
 msgstr "Erreur de malloc"
 
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:102
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s : mauvaise valeur\n"
 
-#: sys-utils/tunelp.c:237
+#: sys-utils/tunelp.c:241
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s : %s n'est pas un p�riph�rique lp.\n"
 
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:262
 #, c-format
 msgid "%s status is %d"
 msgstr "Le statut de %s est %d."
 
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:263
 msgid ", busy"
 msgstr ", occup�"
 
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:264
 msgid ", ready"
 msgstr ", pr�t"
 
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:265
 msgid ", out of paper"
 msgstr ", plus de papier"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:266
 msgid ", on-line"
 msgstr ", en ligne"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:267
 msgid ", error"
 msgstr ", erreur"
 
-#: sys-utils/tunelp.c:280
+#: sys-utils/tunelp.c:284
 msgid "LPGETIRQ error"
 msgstr "Erreur LPGETIRQ"
 
-#: sys-utils/tunelp.c:286
+#: sys-utils/tunelp.c:290
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s utilise l'IRQ %d.\n"
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:292
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s utilise la v�rification\n"
 
-#: text-utils/col.c:153
+#: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col : mauvais argument pour -l %s.\n"
 
-#: text-utils/col.c:516
-msgid "usage: col [-bfx] [-l nline]\n"
-msgstr "Usage : col [-bfx] [-l nline]\n"
+#: text-utils/col.c:521
+msgid "usage: col [-bfpx] [-l nline]\n"
+msgstr "Usage : col [-bfpx] [-l nline]\n"
 
-#: text-utils/col.c:522
+#: text-utils/col.c:527
 msgid "col: write error.\n"
 msgstr "col : erreur d'�criture.\n"
 
-#: text-utils/col.c:529
+#: text-utils/col.c:534
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr "col : avertissement : impossible de sauvegarder %s.\n"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "past first line"
 msgstr "au del� de la premi�re ligne"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "-- line already flushed"
 msgstr "-- ligne d�j� vid�e sur disque"
 
@@ -8680,11 +8837,11 @@ msgstr "-- ligne d�j� vid�e sur disque"
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "Usage : %s [ - ] [ -2 ] [ fichier ... ]\n"
 
-#: text-utils/column.c:302
+#: text-utils/column.c:300
 msgid "line too long"
 msgstr "ligne trop longue"
 
-#: text-utils/column.c:379
+#: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
 msgstr "Usage : column [-tx] [-c colonnes] [fichier ...]\n"
 
@@ -8703,12 +8860,12 @@ msgstr ""
 "hexdump : [-bcdovx] [-e fmt] [-f fichier_fmt] [-n longueur] [-s saut] "
 "[fichier ...]\n"
 
-#: text-utils/more.c:329
+#: text-utils/more.c:330
 #, c-format
 msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "Usage : %s [-dfln] [+lignenum | +/motif] nom1 nom2 ...\n"
 
-#: text-utils/more.c:504
+#: text-utils/more.c:505
 #, c-format
 msgid ""
 "\n"
@@ -8720,7 +8877,7 @@ msgstr ""
 "\n"
 
 #. simple ELF detection
-#: text-utils/more.c:543
+#: text-utils/more.c:544
 #, c-format
 msgid ""
 "\n"
@@ -8735,30 +8892,30 @@ msgstr ""
 msgid "[Use q or Q to quit]"
 msgstr "[Utilisez q ou Q pour quitter]"
 
-#: text-utils/more.c:833
+#: text-utils/more.c:826
 msgid "--More--"
 msgstr "--Encore--"
 
-#: text-utils/more.c:835
+#: text-utils/more.c:828
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Fichier suivant : %s)"
 
-#: text-utils/more.c:841
+#: text-utils/more.c:834
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Appuyez sur espace pour continuer, sur 'q' pour quitter.]"
 
-#: text-utils/more.c:1139
+#: text-utils/more.c:1132
 #, c-format
 msgid "...back %d page"
 msgstr "...retour � la page %d"
 
-#: text-utils/more.c:1185
+#: text-utils/more.c:1178
 #, c-format
 msgid "...skipping %d line"
 msgstr "...saut de la ligne %d"
 
-#: text-utils/more.c:1226
+#: text-utils/more.c:1219
 msgid ""
 "\n"
 "***Back***\n"
@@ -8768,37 +8925,37 @@ msgstr ""
 "***Arri�re***\n"
 "\n"
 
-#: text-utils/more.c:1264
+#: text-utils/more.c:1257
 msgid "Can't open help file"
 msgstr "Impossible d'ouvrir le fichier d'aide"
 
-#: text-utils/more.c:1285 text-utils/more.c:1289
+#: text-utils/more.c:1278 text-utils/more.c:1282
 msgid "[Press 'h' for instructions.]"
 msgstr "[Appuyez sur 'h' pour l'aide.]"
 
-#: text-utils/more.c:1324
+#: text-utils/more.c:1316
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" ligne %d"
 
-#: text-utils/more.c:1326
+#: text-utils/more.c:1318
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Pas un fichier] ligne %d"
 
-#: text-utils/more.c:1410
+#: text-utils/more.c:1402
 msgid "  Overflow\n"
 msgstr "  D�passement\n"
 
-#: text-utils/more.c:1457
+#: text-utils/more.c:1449
 msgid "...skipping\n"
 msgstr "...saut\n"
 
-#: text-utils/more.c:1487
+#: text-utils/more.c:1479
 msgid "Regular expression botch"
 msgstr "expression r�guli�re botch"
 
-#: text-utils/more.c:1499
+#: text-utils/more.c:1491
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -8806,15 +8963,15 @@ msgstr ""
 "\n"
 "Motif introuvable\n"
 
-#: text-utils/more.c:1502
+#: text-utils/more.c:1494
 msgid "Pattern not found"
 msgstr "Motif introuvable"
 
-#: text-utils/more.c:1563
+#: text-utils/more.c:1555
 msgid "can't fork\n"
 msgstr "Fork impossible\n"
 
-#: text-utils/more.c:1602
+#: text-utils/more.c:1594
 msgid ""
 "\n"
 "...Skipping "
@@ -8822,23 +8979,23 @@ msgstr ""
 "\n"
 "...Saut "
 
-#: text-utils/more.c:1606
+#: text-utils/more.c:1598
 msgid "...Skipping "
 msgstr "...Saut "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "to file "
 msgstr "vers le fichier "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "back to file "
 msgstr "retour au fichier "
 
-#: text-utils/more.c:1846
+#: text-utils/more.c:1835
 msgid "Line too long"
 msgstr "Ligne trop longue"
 
-#: text-utils/more.c:1890
+#: text-utils/more.c:1878
 msgid "No previous command to substitute for"
 msgstr "Aucune commande ant�rieure � substituer"
 
@@ -8850,7 +9007,7 @@ msgstr "od : od(1) a �t� r�trograd� pour hexdump(1).\n"
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
 msgstr ""
-"od : la compatibilit� avec hexdump(1) ne prend pas en charge l'option%s -%c\n"
+"od : la compatibilit� avec hexdump(1) ne prend pas en charge le -%c option%s\n"
 
 #: text-utils/odsyntax.c:137
 msgid "; see strings(1)."
@@ -8888,11 +9045,11 @@ msgstr "hexdump : format incorrect {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump : caract�re de conversion incorrect %%%s.\n"
 
-#: text-utils/rev.c:114
+#: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
 msgstr "Impossible d'allouer de l'espace pour le tampon\n"
 
-#: text-utils/rev.c:173
+#: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
 msgstr "Usage : rev [fichier ...]\n"
 
@@ -8914,11 +9071,11 @@ msgstr "S�quence d'�chappement inconnue en entr�e : %o, %o\n"
 msgid "Unable to allocate buffer.\n"
 msgstr "Impossible d'allouer le tampon.\n"
 
-#: text-utils/ul.c:555
+#: text-utils/ul.c:553
 msgid "Input line too long.\n"
 msgstr "Ligne en entr�e trop longue.\n"
 
-#: text-utils/ul.c:568
+#: text-utils/ul.c:566
 msgid "Out of memory when growing buffer.\n"
 msgstr "M�moire insuffisante pour accro�tre le tampon.\n"
 
@@ -8929,11 +9086,57 @@ msgstr "Taux Typematic d�fini sur %.1f cps (d�lai = %d ms)\n"
 
 #: kbd/kbdrate.c:222
 msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
-msgstr ""
+msgstr "Usage : kbdrate [-V] [-s] [-r taux] [-d d�lai]\n"
 
 #: kbd/kbdrate.c:252
 msgid "Cannot open /dev/port"
 msgstr "Impossible d'ouvrir /dev/port"
 
+#~ msgid "Writing disklabel to %s%d.\n"
+#~ msgstr "Ecriture du libell� de disque dans %s%d.\n"
+
+#~ msgid "%s%d contains no disklabel.\n"
+#~ msgstr "%s%d ne contient aucun libell� de disque.\n"
+
+#~ msgid "Bootstrap installed on %s%d.\n"
+#~ msgstr "Amorce install�e sur %s%d.\n"
+
+#~ msgid "%s: unknown geometry\n"
+#~ msgstr "%s : g�om�trie inconnue\n"
+
+#~ msgid "exec rc failed\n"
+#~ msgstr "�chec de exec rc\n"
+
+#~ msgid "fork of rc shell failed\n"
+#~ msgstr "�chec de fork du shell rc.\n"
+
+#~ msgid "Cannot get loop info"
+#~ msgstr "Impossible d'obtenir les infos loop"
+
+#~ msgid "mount: block device %s is not permitted on its filesystem"
+#~ msgstr ""
+#~ "mount : le p�riph�rique de bloc %s n'est pas autoris� sur son syst�me de "
+#~ "fichiers."
+
+#~ msgid ""
+#~ "Usage: mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
+#~ msgstr ""
+#~ "Usage : mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       Un p�riph�rique sp�cial peut �tre indiqu� par un libell� -L ou -U "
+#~ "uuid .\n"
+
+#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
+#~ msgstr "mount : �chec de %s:%s. Raison donn�e par le serveur : %s\n"
+
+#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
+#~ msgstr "Usage : %s [-shm | -msg | -sem] id\n"
+
 #~ msgid "sscanf error"
 #~ msgstr "Erreur de sscanf"
diff --git a/po/it.po b/po/it.po
index 207ea6ed52..0ac7312d92 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.10f\n"
-"POT-Creation-Date: 2000-03-21 14:47-0800\n"
+"POT-Creation-Date: 2000-10-16 16:44+0200\n"
 "PO-Revision-Date: 2000-04-04 21:52-0800\n"
 "Last-Translator: Beth Powell <bpowell@turbolinux.com>\n"
 "Language-Team: <support@turbolinux.com>\n"
@@ -12,87 +12,87 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:146
+#: clock/cmos.c:157
 msgid "booted from MILO\n"
 msgstr "avviato da MILO\n"
 
-#: clock/cmos.c:155
+#: clock/cmos.c:166
 msgid "Ruffian BCD clock\n"
 msgstr "Ruffian BCD clock\n"
 
-#: clock/cmos.c:171
+#: clock/cmos.c:182
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "porta clock regolata su 0x%x\n"
 
-#: clock/cmos.c:181
+#: clock/cmos.c:192
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: clock/cmos.c:235
+#: clock/cmos.c:246
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: %s atomico non � riuscito per 1000 iterazioni!"
 
-#: clock/cmos.c:559
+#: clock/cmos.c:570
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "Impossibile aprire /dev/port: %s"
 
-#: clock/cmos.c:566
+#: clock/cmos.c:577
 msgid "I failed to get permission because I didnt try.\n"
 msgstr ""
 "Non sono riuscito ad ottenere l'autorizzazione perch� non ho provato.\n"
 
-#: clock/cmos.c:569
+#: clock/cmos.c:580
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 "%s non riesce a ottenere l'accesso alla porta I/O:  chiamata iopl(3)non "
 "riuscita.\n"
 
-#: clock/cmos.c:572
+#: clock/cmos.c:583
 msgid "Probably you need root privileges.\n"
 msgstr "Probabilmente sono necessari privilegi di root.\n"
 
-#: clock/hwclock.c:213
+#: clock/hwclock.c:219
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Si presuppone che il clock hardware sia mantenuto nell'orario %s.\n"
 
-#: clock/hwclock.c:214 clock/hwclock.c:303
+#: clock/hwclock.c:220 clock/hwclock.c:309
 msgid "UTC"
 msgstr "UTC"
 
-#: clock/hwclock.c:214 clock/hwclock.c:302
+#: clock/hwclock.c:220 clock/hwclock.c:308
 msgid "local"
 msgstr "locale"
 
-#: clock/hwclock.c:286
+#: clock/hwclock.c:292
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: attenzione: terza linea non riconosciuta nel file adjtime\n"
 
-#: clock/hwclock.c:288
+#: clock/hwclock.c:294
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Previsto: `UTC' o `LOCAL' o niente.)\n"
 
-#: clock/hwclock.c:297
+#: clock/hwclock.c:303
 #, c-format
 msgid "Last drift adjustment done at %d seconds after 1969\n"
 msgstr "Ultima regolazione della deriva effettuata %d secondi dopo il 1969\n"
 
-#: clock/hwclock.c:299
+#: clock/hwclock.c:305
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
 msgstr "Ultima calibrazione effettuata %d secondi dopo il 1969\n"
 
-#: clock/hwclock.c:301
+#: clock/hwclock.c:307
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "Il clock hardware � sull'orario %s\n"
 
-#: clock/hwclock.c:303
+#: clock/hwclock.c:309
 msgid "unknown"
 msgstr "sconosciuto"
 
@@ -110,41 +110,41 @@ msgstr "sconosciuto"
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:325
+#: clock/hwclock.c:331
 msgid "Waiting for clock tick...\n"
 msgstr "Attesa del segnale dal clock...\n"
 
-#: clock/hwclock.c:329
+#: clock/hwclock.c:335
 msgid "...got clock tick\n"
 msgstr "...ricevuto segnale dal clock\n"
 
-#: clock/hwclock.c:380
-#, c-format
-msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+#: clock/hwclock.c:386
+#, fuzzy, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr " Valori non validi nel clock hardware: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: clock/hwclock.c:389
-#, c-format
-msgid "Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d seconds since 1969\n"
+#: clock/hwclock.c:394
+#, fuzzy, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 " Orario clock hardware : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d secondi dal 1969\n"
 
-#: clock/hwclock.c:417
-#, c-format
-msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+#: clock/hwclock.c:422
+#, fuzzy, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr " Orario letto dal clock hardware: %02d:%02d:%02d\n"
 
-#: clock/hwclock.c:443
+#: clock/hwclock.c:449
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
 msgstr ""
 " Impostazione del clock hardware a %.2d:%.2d:%.2d = %d secondi dal 1969\n"
 
-#: clock/hwclock.c:449
+#: clock/hwclock.c:455
 msgid "Clock not changed - testing only.\n"
 msgstr "Nessun cambio del clock - si tratta solamente di una verifica.\n"
 
-#: clock/hwclock.c:497
+#: clock/hwclock.c:503
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -153,7 +153,7 @@ msgstr ""
 "Il tempo trascorso dall'orario di riferimento e' stato di %.6f secondi.\n"
 "Accumulare ulteriore ritardo per raggiungere il secondo pieno successivo.\n"
 
-#: clock/hwclock.c:521
+#: clock/hwclock.c:527
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
@@ -168,18 +168,18 @@ msgstr ""
 #.
 #. Compute display value for time
 #. Cut off trailing newline
-#: clock/hwclock.c:533
+#: clock/hwclock.c:539
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f secondi\n"
 
-#: clock/hwclock.c:567
+#: clock/hwclock.c:573
 msgid "No --date option specified.\n"
 msgstr "Opzione --date non specificata.\n"
 
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:572
+#: clock/hwclock.c:578
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
@@ -187,22 +187,22 @@ msgstr ""
 "Il valore dell'opzione --date non � una data valida.\n"
 "In particolare, contiene virgolette.\n"
 
-#: clock/hwclock.c:578
+#: clock/hwclock.c:584
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Esecuzione comando date: %s\n"
 
-#: clock/hwclock.c:582
+#: clock/hwclock.c:588
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 "Impossibile eseguire il programma 'date' nella shell /bin/sh. popen() fallito"
 
-#: clock/hwclock.c:588
+#: clock/hwclock.c:594
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "risposta dal comando date = %s\n"
 
-#: clock/hwclock.c:590
+#: clock/hwclock.c:596
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -217,11 +217,11 @@ msgstr ""
 "La risposta � stata:\n"
 "  %s\n"
 
-#: clock/hwclock.c:599
-#, c-format
+#: clock/hwclock.c:605
+#, fuzzy, c-format
 msgid ""
-"The date command issued by %s returnedsomething other than an integer where "
-"the convertedtime value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
@@ -234,12 +234,12 @@ msgstr ""
 "La risposta � stata:\n"
 " %s\n"
 
-#: clock/hwclock.c:609
+#: clock/hwclock.c:615
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr "la stringa della data %s equivale a %d secondi dal 1969.\n"
 
-#: clock/hwclock.c:641
+#: clock/hwclock.c:647
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
@@ -247,35 +247,35 @@ msgstr ""
 "Il clock hardware non contiene un orario valido, perci� non � possibile "
 "impostare l'ora del sistema a partire da esso.\n"
 
-#: clock/hwclock.c:654
+#: clock/hwclock.c:669
 msgid "Calling settimeofday:\n"
 msgstr " Chiamata settimeofday in corso:\n"
 
-#: clock/hwclock.c:655
+#: clock/hwclock.c:670
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: clock/hwclock.c:657
-#, c-format
-msgid "\ttz.tz_minuteswest = %ld\n"
+#: clock/hwclock.c:672
+#, fuzzy, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
 msgstr "\ttz.tz_minuteswest = %ld\n"
 
-#: clock/hwclock.c:660
+#: clock/hwclock.c:675
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 "Il clock di sistema non viene impostato perch� sta funzionando in modalit� "
 "test.\n"
 
-#: clock/hwclock.c:673
+#: clock/hwclock.c:683
 msgid "Must be superuser to set system clock.\n"
 msgstr "Bisogna essere superuser per impostare il clock del sistema\n"
 
-#: clock/hwclock.c:675
+#: clock/hwclock.c:685
 msgid "settimeofday() failed"
 msgstr " settimeofday() non riuscito"
 
-#: clock/hwclock.c:708
+#: clock/hwclock.c:718
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
@@ -283,7 +283,7 @@ msgstr ""
 "Non viene effettuata la regolazione del fattore di deriva poich� in "
 "precedenza il clock hardwareconteneva elementi insoliti.\n"
 
-#: clock/hwclock.c:712
+#: clock/hwclock.c:722
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
@@ -291,7 +291,7 @@ msgstr ""
 "Non viene effettuata la regolazione del fattore di deriva poich� � trascorso "
 "meno di un giornodall'ultima calibrazione.\n"
 
-#: clock/hwclock.c:721
+#: clock/hwclock.c:731
 #, c-format
 msgid ""
 "Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
@@ -302,22 +302,22 @@ msgstr ""
 "nonostante il fattoredi deriva fosse di %f secondi/giorno.\n"
 "Regolazione del fattore di deriva a %f secondi/giorno\n"
 
-#: clock/hwclock.c:772
+#: clock/hwclock.c:782
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "Il tempo trascorso dall'ultima regolazione � di %d secondi\n"
 
-#: clock/hwclock.c:774
+#: clock/hwclock.c:784
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 "� necessario inserire %d secondi e riportare l'ora indietro di %.6f secondi\n"
 
-#: clock/hwclock.c:803
+#: clock/hwclock.c:813
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "Il file adjtime non viene aggiornato a causa della modalit� test.\n"
 
-#: clock/hwclock.c:804
+#: clock/hwclock.c:814
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -326,37 +326,37 @@ msgstr ""
 "Si sarebbe scritto quanto segue in %s:\n"
 "%s"
 
-#: clock/hwclock.c:828
+#: clock/hwclock.c:838
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Parametri di regolazione della deriva non aggiornati.\n"
 
-#: clock/hwclock.c:869
+#: clock/hwclock.c:879
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 "Il clock hardware non contiene un'ora valida, perci� non � possibile "
 "regolarlo.\n"
 
-#: clock/hwclock.c:893
+#: clock/hwclock.c:903
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 "La regolazione necessaria equivale a meno di un secondo, perci� il clock non "
 "viene impostato.\n"
 
-#: clock/hwclock.c:919
+#: clock/hwclock.c:929
 #, c-format
 msgid "Using %s.\n"
 msgstr "Utilizzo di %s in corso.\n"
 
-#: clock/hwclock.c:921
+#: clock/hwclock.c:931
 msgid "No usable clock interface found.\n"
 msgstr "Impossibile trovare un'interfaccia clock utilizzabile.\n"
 
-#: clock/hwclock.c:1016
+#: clock/hwclock.c:1026
 msgid "Unable to set system clock.\n"
 msgstr "Impossibile impostare il clock di sistema.\n"
 
-#: clock/hwclock.c:1045
+#: clock/hwclock.c:1055
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
 "machine.\n"
@@ -370,16 +370,16 @@ msgstr ""
 "(e quindi, presumibilmente, non pu� essere eseguita su un Alpha in questo "
 "momento). Nessuna azione intrapresa.\n"
 
-#: clock/hwclock.c:1054
+#: clock/hwclock.c:1064
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "Impossibile ottenere il valore epoch dal kernel.\n"
 
-#: clock/hwclock.c:1056
+#: clock/hwclock.c:1066
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Il kernel pressuppone un valore epoch di %lu\n"
 
-#: clock/hwclock.c:1059
+#: clock/hwclock.c:1069
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
@@ -387,18 +387,19 @@ msgstr ""
 "Per impostare il valore epoch si deve utilizzare l'opzione 'epoch' per "
 "indicare su quale valore impostarlo.\n"
 
-#: clock/hwclock.c:1062
+#: clock/hwclock.c:1072
 #, 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"
 
-#: clock/hwclock.c:1065
+#: clock/hwclock.c:1075
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Impossibile impostare il valore epoch nel kernel.\n"
 
-#: clock/hwclock.c:1088
+#: clock/hwclock.c:1104
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -420,7 +421,7 @@ msgid ""
 "Options: \n"
 "  --utc         the hardware clock is kept in coordinated universal time\n"
 "  --localtime   the hardware clock is kept in local time\n"
-"  --directisa   access the ISA bus directly instead of /dev/rtc\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
 "  --badyear     ignore rtc's year because the bios is broken\n"
 "  --date        specifies the time to which to set the hardware clock\n"
 "  --epoch=year  specifies the year which is the beginning of the \n"
@@ -448,13 +449,13 @@ msgstr ""
 "  --utc         il clock hardware � mantenuto su di un orario universale "
 "coordinato\n"
 "  --localtime   il clock hardware � mantenuto sull'ora locale\n"
-"  --directisa   accesso diretto al bus ISA invece di /dev/rtc\n"
+"  --directisa   accesso diretto al bus ISA invece di %s\n"
 "  --badyear     ignora l'anno rtc perch� il bios � danneggiato\n"
 "  --date        specifica l'ora sulla quale impostare il clock hardware \n"
 "  --epoch=anno  specifica l'anno che � l'inizio per il \n"
 "                valore epoch del clock hardware\n"
 
-#: clock/hwclock.c:1113
+#: clock/hwclock.c:1129
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
@@ -463,13 +464,13 @@ msgstr ""
 "                indicano al hwclock il tipo di alpha utilizzato (consultare "
 "hwclock(8))\n"
 
-#: clock/hwclock.c:1209
+#: clock/hwclock.c:1227
 #, 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"
 
-#: clock/hwclock.c:1219
+#: clock/hwclock.c:1237
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
@@ -477,7 +478,7 @@ msgstr ""
 "Sono state specificate opzioni di funzione multipla.\n"
 "� possibile eseguire una sola funzione per volta.\n"
 
-#: clock/hwclock.c:1225
+#: clock/hwclock.c:1243
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
@@ -486,26 +487,36 @@ msgstr ""
 "%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
 "specificate entrambe.\n"
 
-#: clock/hwclock.c:1238
+#: clock/hwclock.c:1256
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 "Impossibile utilizzare l'ora impostata. Impossibile impostare il clock.\n"
 
-#: clock/hwclock.c:1253
+#: clock/hwclock.c:1271
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Spiacente, solamente il superuser pu� modificare il clock hardware.\n"
 
-#: clock/hwclock.c:1257
+#: clock/hwclock.c:1275
+#, fuzzy
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "Spiacente, solamente il superuser pu� modificare il clock hardware.\n"
+
+#: clock/hwclock.c:1279
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 "Solamente il supeuser pu� modificare l'epoch del clock hardware nel kernel.\n"
 
-#: clock/hwclock.c:1275
+#: clock/hwclock.c:1299
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr ""
+
+#: clock/hwclock.c:1302
+#, fuzzy
 msgid ""
-"Cannot access the Hardware Clock via any known method.  Use --debug option "
-"to see the details of our search for an access method.\n"
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
 msgstr ""
 " Impossibile accedere al clock hardware attraverso qualsiasi metodo "
 "conosciuto.  Utilizzare l'opzione --debug per visionare i dettagli della "
@@ -519,7 +530,7 @@ msgstr "Attesa in loop per il cambio ora da KDGHWCLK\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "Lettura dell'orario con KDGHWCLK ioctl non riuscita"
 
-#: clock/kd.c:65 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
 msgstr "Tempo d'attesa per il cambio ora esaurito.\n"
 
@@ -539,108 +550,114 @@ msgstr "impossibile per ioctl() aprire /dev/tty1"
 msgid "KDGHWCLK ioctl failed"
 msgstr " KDGHWCLK ioctl non riuscito"
 
-#: clock/kd.c:161
+#: clock/kd.c:163
 msgid "Can't open /dev/tty1"
 msgstr "Impossibile aprire /dev/tty1"
 
-#: clock/rtc.c:98
-msgid "ioctl() to /dev/rtc to read the time failed.\n"
-msgstr "Lettura dell'orario attraverso ioctl() su /dev/rtc non riuscita.\n"
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "Lettura dell'orario attraverso ioctl() su %s non riuscita.\n"
 
-#: clock/rtc.c:129
-msgid "Waiting in loop for time from /dev/rtc to change\n"
-msgstr "Attesa in loop per il cambio ora da /dev/rtc\n"
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Attesa in loop per il cambio ora da %s\n"
 
-#: clock/rtc.c:165 clock/rtc.c:222
-msgid "open() of /dev/rtc failed"
-msgstr "open() di /dev/rtc fallita"
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() di %s fallita"
 
-#. This rtc device doesn't have interrupt functions.  This is typical
-#. on an Alpha, where the Hardware Clock interrupts are used by the
-#. kernel for the system clock, so aren't at the user's disposal.
-#.
-#: clock/rtc.c:182
-msgid "/dev/rtc does not have interrupt functions. "
-msgstr "/dev/rtc non ha funzioni di interrupt. "
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s non ha funzioni di interrupt. "
 
-#: clock/rtc.c:191
-msgid "read() to /dev/rtc to wait for clock tick failed"
-msgstr " read() su /dev/rtc per l'attesa del segnale dal clock fallita"
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr " read() su %s per l'attesa del segnale dal clock fallita"
 
-#: clock/rtc.c:199
-msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 "Non riuscita la disattivazione degli interrupt d'aggiornamento attraverso "
-"ioctl() su /dev/rtc"
+"ioctl() su %s"
 
-#: clock/rtc.c:202
-msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 "Non riuscita inaspettatamente l'attivazione degli interrupt d'aggiornametno "
-"attraverso ioctl() su /dev/rtc "
+"attraverso ioctl() su %s "
 
-#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
-msgid "Unable to open /dev/rtc"
-msgstr "Impossibile aprire /dev/rtc"
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossibile aprire %s"
 
-#: clock/rtc.c:268
-msgid "ioctl() to /dev/rtc to set the time failed.\n"
-msgstr ""
-"Non riusciuta l'impostazione dell'ora attraverso ioctl() su /dev/rtc.\n"
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "Non riusciuta l'impostazione dell'ora attraverso ioctl() su %s.\n"
 
-#: clock/rtc.c:272
+#: clock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr " ioctl(%s) ha funzionato.\n"
 
-#: clock/rtc.c:302
-msgid "Open of /dev/rtc failed"
-msgstr "Non riuscita l'apertura di /dev/rtc"
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "Non riuscita l'apertura di %s"
 
-#: clock/rtc.c:320 clock/rtc.c:365
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file /dev/rtc.  This file does not "
-"exist on this system.\n"
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
 msgstr ""
 "Per modificare il valore epoch nel kernel, si deve accedere al driver di "
-"periferica 'rtc' di Linux attraverso il file speciale della periferica "
-"/dev/rtc.  Questo file non esiste su questo sistema.\n"
+"periferica 'rtc' di Linux attraverso il file speciale della periferica %s.  "
+"Questo file non esiste su questo sistema.\n"
 
-#: clock/rtc.c:331
-msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
-msgstr " Non riuscito ioctl(RTC_EPOCH_READ) su /dev/rtc"
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr " Non riuscito ioctl(RTC_EPOCH_READ) su %s"
 
-#: clock/rtc.c:337
+#: clock/rtc.c:344
 #, c-format
-msgid "we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n"
-msgstr "lettura di epoch %ld da /dev/rtc con RTC_EPOCH_READ ioctl.\n"
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "lettura di epoch %ld da %s con RTC_EPOCH_READ ioctl.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: clock/rtc.c:357
+#: clock/rtc.c:364
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "Il valore epoch non pu� essere inferiore a 1900. Si � richiesto %ld\n"
 
-#: clock/rtc.c:374
+#: clock/rtc.c:381
 #, c-format
-msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
-msgstr ""
-"impostazione epoch su %ld con RTC_EPOCH_SET ioctl su /dev/rtc in corso.\n"
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "impostazione epoch su %ld con RTC_EPOCH_SET ioctl su %s in corso.\n"
 
-#: clock/rtc.c:379
+#: clock/rtc.c:386
+#, c-format
 msgid ""
-"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
-"ioctl.\n"
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
-"Il driver di periferica per il kernel per /dev/rtc non ha RTC_EPOCH_SET "
-"ioctl.\n"
+"Il driver di periferica per il kernel per %s non ha RTC_EPOCH_SET ioctl.\n"
 
-#: clock/rtc.c:382
-msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
-msgstr "Non riuscito ioctl(RTC_EPOCH_SET) su /dev/rtc"
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "Non riuscito ioctl(RTC_EPOCH_SET) su %s"
 
 #: clock/shhopt.c:255 clock/shhopt.c:281
 #, c-format
@@ -672,83 +689,83 @@ msgstr "l'opzione `%s' non consente un argomento\n"
 msgid "unrecognized option `-%c'\n"
 msgstr "opzione `-%c' non riconosciuta\n"
 
-#: disk-utils/blockdev.c:34
+#: disk-utils/blockdev.c:47
 msgid "set read-only"
 msgstr "impostare sola lettura"
 
-#: disk-utils/blockdev.c:35
+#: disk-utils/blockdev.c:48
 msgid "set read-write"
 msgstr "impostare lettura-scrittura"
 
-#: disk-utils/blockdev.c:38
+#: disk-utils/blockdev.c:51
 msgid "get read-only"
 msgstr "visualizzare sola-lettura"
 
-#: disk-utils/blockdev.c:41
+#: disk-utils/blockdev.c:54
 msgid "get sectorsize"
 msgstr "visualizzare la dimensione del settore"
 
-#: disk-utils/blockdev.c:44
+#: disk-utils/blockdev.c:57
 msgid "get size"
 msgstr "visualizzare la dimensione"
 
-#: disk-utils/blockdev.c:47
+#: disk-utils/blockdev.c:60
 msgid "set readahead"
 msgstr "impostare readahead"
 
-#: disk-utils/blockdev.c:50
+#: disk-utils/blockdev.c:63
 msgid "get readahead"
 msgstr "visualizzare readahead"
 
-#: disk-utils/blockdev.c:53
+#: disk-utils/blockdev.c:66
 msgid "flush buffers"
 msgstr "scaricamento buffer"
 
-#: disk-utils/blockdev.c:57
+#: disk-utils/blockdev.c:70
 msgid "reread partition table"
 msgstr "rilettura della tabella delle partizioni"
 
-#: disk-utils/blockdev.c:66
+#: disk-utils/blockdev.c:79
 #, c-format
 msgid "Usage: %s [-V] [-v|-q] commands devices\n"
 msgstr "Utilizzo: %s [-V] [-v|-q] dispositivi comandi\n"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:80
 msgid "Available commands:\n"
 msgstr "Comandi disponibili:\n"
 
-#: disk-utils/blockdev.c:167
+#: disk-utils/blockdev.c:180
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: comando sconosciuto: %s\n"
 
-#: disk-utils/blockdev.c:178
+#: disk-utils/blockdev.c:191
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s richiede un argomento\n"
 
-#: disk-utils/fdformat.c:33
+#: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Formattazione in corso ... "
 
-#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
 msgstr "fatto\n"
 
-#: disk-utils/fdformat.c:62
+#: disk-utils/fdformat.c:65
 msgid "Verifying ... "
 msgstr "Verifica in corso ... "
 
-#: disk-utils/fdformat.c:73
+#: disk-utils/fdformat.c:76
 msgid "Read: "
 msgstr "Leggere: "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:78
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
 msgstr "Problema durante la lettura del cilindro %d, %d previsto, lettura %d\n"
 
-#: disk-utils/fdformat.c:81
+#: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
@@ -757,80 +774,80 @@ msgstr ""
 "dati danneggiati nel cil %d\n"
 "Continua ... "
 
-#: disk-utils/fdformat.c:96
+#: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
 msgstr "utilizzo: dispositivo %s [ -n ]\n"
 
-#: disk-utils/fdformat.c:117 disk-utils/fsck.minix.c:1255 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:650 disk-utils/mkswap.c:351
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:175 misc-utils/ddate.c:172
-#: misc-utils/kill.c:191
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:448
+#: disk-utils/setfdprm.c:128 misc-utils/cal.c:172 misc-utils/ddate.c:181
+#: misc-utils/kill.c:192
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s da %s\n"
 
-#: disk-utils/fdformat.c:131
+#: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
 msgstr "%s: non si tratta di un dispositivo floppy\n"
 
-#: disk-utils/fdformat.c:137
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
 msgstr "Impossibile determinare il tipo di formato attuale"
 
-#: disk-utils/fdformat.c:138
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "%s-completo, tracce %d , %d sec/traccia. Capacit� totale %d kB.\n"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Double"
 msgstr "Doppio"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Single"
 msgstr "Singolo"
 
-#: disk-utils/fsck.minix.c:196
+#: disk-utils/fsck.minix.c:197
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Utilizzo: %s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:296
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s � montato.\t"
 
-#: disk-utils/fsck.minix.c:296
+#: disk-utils/fsck.minix.c:298
 msgid "Do you really want to continue"
 msgstr "Continuare?"
 
-#: disk-utils/fsck.minix.c:300
+#: disk-utils/fsck.minix.c:302
 msgid "check aborted.\n"
 msgstr "controllo interrotto.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:337
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
 msgid "Zone nr < FIRSTZONE in file `"
 msgstr " Zona n. < FIRSTZONE nel file `"
 
-#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
 msgid "Zone nr >= ZONES in file `"
 msgstr "N. Zona >= ZONES nel file `"
 
-#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
 msgid "Remove block"
 msgstr "Rimuovere blocco"
 
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:364
 msgid "Read error: unable to seek to block in file '"
 msgstr "Errore di lettura: ricerca del blocco nel file' impossibile"
 
-#: disk-utils/fsck.minix.c:368
+#: disk-utils/fsck.minix.c:370
 msgid "Read error: bad block in file '"
 msgstr "Errore di lettura: blocco danneggiato nel file '"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:386
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -838,121 +855,121 @@ msgstr ""
 "Errore interno: nel tentativo di scrivere il blocco danneggiato\n"
 "ignorata la richiesta di scrittura\n"
 
-#: disk-utils/fsck.minix.c:390 disk-utils/mkfs.minix.c:289
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
 msgid "seek failed in write_block"
 msgstr "tentativo fallito in write_block "
 
-#: disk-utils/fsck.minix.c:392
+#: disk-utils/fsck.minix.c:394
 msgid "Write error: bad block in file '"
 msgstr "Errore di scrittura: blocco danneggiato nel file '"
 
-#: disk-utils/fsck.minix.c:511
+#: disk-utils/fsck.minix.c:513
 msgid "seek failed in write_super_block"
 msgstr "ricerca fallita in write_super_block"
 
-#: disk-utils/fsck.minix.c:513 disk-utils/mkfs.minix.c:276
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr "impossibile scrivere in super-block"
 
-#: disk-utils/fsck.minix.c:523
+#: disk-utils/fsck.minix.c:525
 msgid "Unable to write inode map"
 msgstr "Impossibile scrivere nella mappa di inode"
 
-#: disk-utils/fsck.minix.c:525
+#: disk-utils/fsck.minix.c:527
 msgid "Unable to write zone map"
 msgstr "Impossibile scrivere nella mappa di zona"
 
-#: disk-utils/fsck.minix.c:527
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inodes"
 msgstr "Impossibile scrivere inode"
 
-#: disk-utils/fsck.minix.c:556
+#: disk-utils/fsck.minix.c:558
 msgid "seek failed"
 msgstr "ricerca non riuscita"
 
-#: disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.minix.c:560
 msgid "unable to read super block"
 msgstr "impossibile leggere super block"
 
-#: disk-utils/fsck.minix.c:578
+#: disk-utils/fsck.minix.c:580
 msgid "bad magic number in super-block"
 msgstr "numero magico danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:582
 msgid "Only 1k blocks/zones supported"
 msgstr "� supportato solamente 1k blocchi/zone"
 
-#: disk-utils/fsck.minix.c:582
+#: disk-utils/fsck.minix.c:584
 msgid "bad s_imap_blocks field in super-block"
 msgstr "campo s_imap_blocks danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:586
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "campo s_zmap_blocks danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:591
+#: disk-utils/fsck.minix.c:593
 msgid "Unable to allocate buffer for inode map"
 msgstr "Impossibile allocare il buffer per la mappa inode"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inodes"
 msgstr "Impossibile allocare il buffer per gli inode"
 
-#: disk-utils/fsck.minix.c:602
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for inode count"
 msgstr "Impossibile allocare il buffer per il conteggio inode"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:607
 msgid "Unable to allocate buffer for zone count"
 msgstr "Impossibile allocare il buffer per il conteggio zona"
 
-#: disk-utils/fsck.minix.c:607
+#: disk-utils/fsck.minix.c:609
 msgid "Unable to read inode map"
 msgstr "Impossibile leggere la mappa inode"
 
-#: disk-utils/fsck.minix.c:609
+#: disk-utils/fsck.minix.c:611
 msgid "Unable to read zone map"
 msgstr "Impossibile leggere la mappa di zona"
 
-#: disk-utils/fsck.minix.c:611
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to read inodes"
 msgstr "Impossibile leggere gli inode"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:615
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Attenzione: prima zona != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:532
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "Inode %ld\n"
 
-#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:533
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "blocchi %ld\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Prima zona dati=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Dimensione zona=%d\n"
 
-#: disk-utils/fsck.minix.c:622
+#: disk-utils/fsck.minix.c:624
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Dimensione massima=%ld\n"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:625
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stato del filesystem=%d\n"
 
-#: disk-utils/fsck.minix.c:624
+#: disk-utils/fsck.minix.c:626
 #, c-format
 msgid ""
 "namelen=%d\n"
@@ -961,163 +978,163 @@ msgstr ""
 "lunghezzanom=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:690
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
 msgid "Inode %d marked not used, but used for file '"
 msgstr "Inode %d contrassegnato non utilizzato, ma utilizzato per il file '"
 
-#: disk-utils/fsck.minix.c:643 disk-utils/fsck.minix.c:694
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
 msgstr "Segno in uso"
 
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:714
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
 msgstr "ha modalit� %05o\n"
 
-#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
 msgid "Warning: inode count too big.\n"
 msgstr "Attenzione: conteggio inode troppo grande.\n"
 
-#: disk-utils/fsck.minix.c:732
+#: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
 msgstr "l'inode di root non � una directory"
 
-#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:789
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
 msgid "Block has been used before. Now in file `"
 msgstr "Il blocco � stato utilizzato in precedenza. Ora nel file  `"
 
-#: disk-utils/fsck.minix.c:758 disk-utils/fsck.minix.c:792
-#: disk-utils/fsck.minix.c:1120 disk-utils/fsck.minix.c:1129
-#: disk-utils/fsck.minix.c:1173 disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
 msgid "Clear"
 msgstr "Cancella"
 
-#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:801
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
 msgstr "Blocco %d nel file `"
 
-#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
 msgstr "' � marcato come non in uso."
 
-#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
 msgstr "Corretto"
 
-#: disk-utils/fsck.minix.c:954 disk-utils/fsck.minix.c:1018
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
 msgid " contains a bad inode number for file '"
 msgstr "contiene un numero inode non corretto per il file '"
 
-#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
 msgstr "Rimuovere"
 
-#: disk-utils/fsck.minix.c:970 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
 msgid ": bad directory: '.' isn't first\n"
 msgstr ": directory danneggiata: '.' non � la prima\n"
 
-#: disk-utils/fsck.minix.c:977 disk-utils/fsck.minix.c:1042
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
 msgid ": bad directory: '..' isn't second\n"
 msgstr ": directory danneggiata: '..' non � la seconda\n"
 
-#: disk-utils/fsck.minix.c:1074
+#: disk-utils/fsck.minix.c:1070
 msgid "internal error"
 msgstr "errore interno"
 
-#: disk-utils/fsck.minix.c:1077
+#: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
 msgstr ": directory danneggiata: dimensione<32"
 
-#: disk-utils/fsck.minix.c:1096
+#: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
 msgstr ": directory danneggiata: dimensione < 32"
 
-#: disk-utils/fsck.minix.c:1109
+#: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
 msgstr "ricerca in bad_zone non riuscita"
 
-#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1172
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Modalit� dell'inode %d non cancellata."
 
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "Inode %d non utilizzato, inode contrassegnato utilizzato in bitmap"
 
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1187
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "Inode %d utilizzato, inode contrassegnato non utilizzato in bitmap."
 
-#: disk-utils/fsck.minix.c:1140 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modalit� = %07o), i_nlinks=%d, conteggiati=%d."
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 msgid "Set i_nlinks to count"
 msgstr "Impostare i_nlinks da conteggiare"
 
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zona %d: contrassegnata in uso, nessun file la utilizza."
 
-#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1207
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Non contrassegnata"
 
-#: disk-utils/fsck.minix.c:1159 disk-utils/fsck.minix.c:1211
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
 #, c-format
 msgid "Zone %d: %sin use, counted=%d\n"
 msgstr "Zona %d: %s utilizzati , conteggiati=%d\n"
 
-#: disk-utils/fsck.minix.c:1160 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
 msgstr "non "
 
-#: disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1182
 msgid "Set"
 msgstr "Impostare"
 
-#: disk-utils/fsck.minix.c:1260 disk-utils/mkfs.minix.c:655
-#: disk-utils/mkfs.minix.c:658
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
 msgid "bad inode size"
 msgstr "dimensione inode non corretta"
 
-#: disk-utils/fsck.minix.c:1263
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "dimensione inode v2 non corretta"
 
-#: disk-utils/fsck.minix.c:1289
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "terminale necessario per le riparazioni interattive"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "impossibile aprire '%s'"
 
-#: disk-utils/fsck.minix.c:1308
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "'%s' � corretto, non controllare.\n"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forzatura controllo filesystem su %s in corso.\n"
 
-#: disk-utils/fsck.minix.c:1314
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Il filesystem su %s � danneggiato, controllo necessario.\n"
 
-#: disk-utils/fsck.minix.c:1343
+#: disk-utils/fsck.minix.c:1336
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
@@ -1125,12 +1142,12 @@ msgstr ""
 "\n"
 "%6ld inode utilizzati (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zone utilizzate (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1350
-#, c-format
+#: disk-utils/fsck.minix.c:1343
+#, c-format, ycp-format
 msgid ""
 "\n"
 "%6d regular files\n"
@@ -1152,7 +1169,7 @@ msgstr ""
 "------\n"
 "%6d file\n"
 
-#: disk-utils/fsck.minix.c:1363
+#: disk-utils/fsck.minix.c:1356
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -1167,8 +1184,8 @@ msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 " Utilizzo: mkfs [-V] [-t tipofs] [opzioni-fs] dispositivo [dimensione]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: memoria esaurita!\n"
@@ -1178,64 +1195,64 @@ msgstr "%s: memoria esaurita!\n"
 msgid "mkfs version %s (%s)\n"
 msgstr "versione mkfs %s (%s)\n"
 
-#: disk-utils/mkfs.minix.c:185
+#: disk-utils/mkfs.minix.c:179
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr " Utilizzo: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
 
-#: disk-utils/mkfs.minix.c:209
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s � montata; qui non verr� creato un filesystem!"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
 msgstr ""
 "tentativo di effettuare il boot del blocco in write_tables non riuscito"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
 msgstr "impossibile cancellare il settore di boot"
 
-#: disk-utils/mkfs.minix.c:274
+#: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
 msgstr "ricerca in write_tables non riuscita"
 
-#: disk-utils/mkfs.minix.c:278
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
 msgstr "impossibile scrivere nella mappa degli inode"
 
-#: disk-utils/mkfs.minix.c:280
+#: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
 msgstr "impossibile scrivere nella mappa delle zone"
 
-#: disk-utils/mkfs.minix.c:282
+#: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
 msgstr "impossibile scrivere inode"
 
-#: disk-utils/mkfs.minix.c:291
+#: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
 msgstr "scrittura in write_block non riuscita"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:299 disk-utils/mkfs.minix.c:373
-#: disk-utils/mkfs.minix.c:424
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
 msgid "too many bad blocks"
 msgstr "troppi blocchi danneggiati"
 
-#: disk-utils/mkfs.minix.c:307
+#: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
 msgstr "numero insufficiente di blocchi corretti"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
 msgstr "impossibile allocare i buffer per le mappe"
 
-#: disk-utils/mkfs.minix.c:530
+#: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
 msgstr "impossibile allocare il buffer per gli inode"
 
-#: disk-utils/mkfs.minix.c:536
+#: disk-utils/mkfs.minix.c:528
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1244,136 +1261,136 @@ msgstr ""
 "Dimensione max=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:550
+#: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
 msgstr "ricerca non riuscita durante il controllo dei blocchi"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:550
 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:589 disk-utils/mkswap.c:261
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
 msgid "seek failed in check_blocks"
 msgstr "ricerca in check_blocks non riuscita"
 
-#: disk-utils/mkfs.minix.c:598
+#: disk-utils/mkfs.minix.c:590
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "blocchi danneggiati prima dell'area dati: impossibile creare fs"
 
-#: disk-utils/mkfs.minix.c:604 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "blocchi danneggiati %d\n"
 
-#: disk-utils/mkfs.minix.c:606 disk-utils/mkfs.minix.c:628
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
 msgstr "un blocco danneggiato\n"
 
-#: disk-utils/mkfs.minix.c:618
+#: disk-utils/mkfs.minix.c:608
 msgid "can't open file of bad blocks"
 msgstr "impossibile aprire il file dei blocchi danneggiati"
 
-#: disk-utils/mkfs.minix.c:687
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
 msgstr "%s: non e' stato compilato con il supporto per minix v2\n"
 
-#: disk-utils/mkfs.minix.c:703
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "errore strtol: numero di blocchi non specificato"
 
-#: disk-utils/mkfs.minix.c:735
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
 msgstr "impossibile aprire %s"
 
-#: disk-utils/mkfs.minix.c:737
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
 msgstr "impossibile avviare %s"
 
-#: disk-utils/mkfs.minix.c:741
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "non si tenter� di creare un filesystem su '%s'"
 
-#: disk-utils/mkswap.c:117
+#: disk-utils/mkswap.c:174
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "dimensione pagina %d specificata dall'utente non corretta\n"
 
-#: disk-utils/mkswap.c:126
+#: disk-utils/mkswap.c:183
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Utilizzo della dimensione pagina %d specificata dall'utente, al posto dei "
 "valori del sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:130
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Si presuppone che le pagine siano di dimensione %d (non %d)\n"
 
-#: disk-utils/mkswap.c:215
+#: disk-utils/mkswap.c:312
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
 msgstr " Utilizzo: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocchi]\n"
 
-#: disk-utils/mkswap.c:238
+#: disk-utils/mkswap.c:335
 msgid "too many bad pages"
 msgstr "troppe pagine danneggiate"
 
-#: disk-utils/mkswap.c:252 misc-utils/look.c:170 misc-utils/setterm.c:1100
-#: text-utils/more.c:1863 text-utils/more.c:1874
+#: disk-utils/mkswap.c:349 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1851 text-utils/more.c:1862
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: disk-utils/mkswap.c:269
+#: disk-utils/mkswap.c:366
 msgid "one bad page\n"
 msgstr "una pagina danneggiata\n"
 
-#: disk-utils/mkswap.c:271
+#: disk-utils/mkswap.c:368
 #, c-format
 msgid "%d bad pages\n"
 msgstr "%d pagine danneggiate\n"
 
-#: disk-utils/mkswap.c:391
+#: disk-utils/mkswap.c:488
 #, 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:409
+#: disk-utils/mkswap.c:506
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
 msgstr ""
 "%s: errore: la dimensione %ld � maggiore rispetto a quella del dispositivo "
 "%d\n"
 
-#: disk-utils/mkswap.c:427
+#: disk-utils/mkswap.c:525
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: errore: versione sconosciuta %d\n"
 
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:531
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: errore: l'area di swap deve equivalere almeno a %ldkB\n"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:550
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: attenzione: troncamento area swap a %ldkB\n"
 
-#: disk-utils/mkswap.c:464
+#: disk-utils/mkswap.c:562
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "Non si cercher� di creare uno swapdevice su '%s'"
 
-#: disk-utils/mkswap.c:473 disk-utils/mkswap.c:494
+#: disk-utils/mkswap.c:571 disk-utils/mkswap.c:592
 msgid "fatal: first page unreadable"
 msgstr "errore irreversibile: impossibile leggere la prima pagina"
 
-#: disk-utils/mkswap.c:479
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1387,24 +1404,24 @@ msgstr ""
 "Nessuno swap creato. Se si desidera creare uno swap v0 su quel dispositivo,\n"
 "utilizzare l'opzione -f per forzare l'operazione.\n"
 
-#: disk-utils/mkswap.c:503
+#: disk-utils/mkswap.c:601
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Impossibile impostare lo spazio-swap: non leggibile"
 
-#: disk-utils/mkswap.c:504
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "Setting up swapspace version %d, size = %ld bytes\n"
 msgstr "Impostazione spazio di swap versione %d, dimensione = %ld byte\n"
 
-#: disk-utils/mkswap.c:510
+#: disk-utils/mkswap.c:608
 msgid "unable to rewind swap-device"
 msgstr "impossibile riavvolgere il dispositivo swap"
 
-#: disk-utils/mkswap.c:513
+#: disk-utils/mkswap.c:611
 msgid "unable to write signature page"
 msgstr "impossibile scrivere sulla pagina di firma"
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:619
 msgid "fsync failed"
 msgstr "fsync non riuscito "
 
@@ -1445,46 +1462,46 @@ msgstr "       %s [ -c | -y | -n | -d ] dev\n"
 msgid "       %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] dev\n"
 
-#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
 msgid "Unusable"
 msgstr "Inutilizzabile"
 
-#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
 msgid "Free Space"
 msgstr "Spazio disponibile"
 
-#: fdisk/cfdisk.c:399
+#: fdisk/cfdisk.c:398
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:403
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:405
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:410
+#: fdisk/cfdisk.c:409
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:420
 msgid "Disk has been changed.\n"
 msgstr "Il disco � stato cambiato.\n"
 
-#: fdisk/cfdisk.c:422
+#: fdisk/cfdisk.c:421
 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:425
+#: fdisk/cfdisk.c:424
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1496,23 +1513,23 @@ msgstr ""
 "partizione DOS 6.x, consultare la pagina del manuale cfdisk\n"
 "per ulteriori informazioni.\n"
 
-#: fdisk/cfdisk.c:520
+#: fdisk/cfdisk.c:519
 msgid "FATAL ERROR"
 msgstr "ERRORE IRREVERSIBILE"
 
-#: fdisk/cfdisk.c:529
+#: fdisk/cfdisk.c:528
 msgid "Press any key to exit cfdisk"
 msgstr "Premere qualsiasi tasto per uscire da cfdisk"
 
-#: fdisk/cfdisk.c:565 fdisk/cfdisk.c:573
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
 msgid "Cannot seek on disk drive"
 msgstr "Ricerca sull'unit� disco impossibile"
 
-#: fdisk/cfdisk.c:567
+#: fdisk/cfdisk.c:566
 msgid "Cannot read disk drive"
 msgstr "Impossibile leggere l'unit� disco"
 
-#: fdisk/cfdisk.c:575
+#: fdisk/cfdisk.c:574
 msgid "Cannot write disk drive"
 msgstr "Impossibile scrivere sull'unit� disco"
 
@@ -1753,8 +1770,8 @@ msgstr "   Logico"
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1071 fdisk/fdisk.c:1220
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1213 fdisk/fdisk.c:1437
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -2000,8 +2017,8 @@ msgstr "Nota: � possibile immettere tutti i comandi in maiuscolo o minuscolo"
 msgid "case letters (except for Writes)."
 msgstr "lettere maiuscole/minuscole (fatta eccezione per Writes)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:305
-#: fdisk/fdisksunlabel.c:307
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindri"
 
@@ -2009,7 +2026,7 @@ msgstr "Cilindri"
 msgid "Change cylinder geometry"
 msgstr "Modifica la geometria dei cilindri"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Testine"
 
@@ -2260,7 +2277,8 @@ msgid "Illegal command"
 msgstr "Comando non valido"
 
 #: fdisk/cfdisk.c:2718
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+#, fuzzy
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
@@ -2302,7 +2320,7 @@ msgstr ""
 "                al numero di testine e di settori/traccia.\n"
 "\n"
 
-#: fdisk/fdisk.c:246
+#: fdisk/fdisk.c:204
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2324,7 +2342,7 @@ msgstr ""
 "-u: indica Inizio e Fine con unit� di misura settore (invece di cilindro)\n"
 "-b 2048: (per alcune unit� MO) utilizzare i settori a 2048 byte\n"
 
-#: fdisk/fdisk.c:258
+#: fdisk/fdisk.c:216
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2340,213 +2358,223 @@ msgstr ""
 "  o: fdisk /dev/rd/c0d0  o: fdisk /dev/ida/c0d0  (per i dispositivi RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:224
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Impossibile leggere %s\n"
 
-#: fdisk/fdisk.c:272
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ricerca impossibile su %s\n"
 
-#: fdisk/fdisk.c:275
+#: fdisk/fdisk.c:233
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Impossibile scrivere su %s\n"
 
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:236
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "BLKGETSIZE ioctl non riuscito su %s\n"
 
-#: fdisk/fdisk.c:282
+#: fdisk/fdisk.c:240
 msgid "Unable to allocate any more memory\n"
 msgstr "Impossibile allocare altra memoria\n"
 
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:242
 msgid "Fatal error\n"
 msgstr "Errore irreversibile\n"
 
-#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:332 fdisk/fdisk.c:339
-#: fdisk/fdisk.c:362 fdisk/fdisk.c:380 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:348 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:378 fdisk/fdisk.c:396 fdisk/fdisk.c:412 fdisk/fdisk.c:428
+#: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
 msgstr "Azione comando"
 
-#: fdisk/fdisk.c:296
+#: fdisk/fdisk.c:312
 msgid "   a   toggle a read only flag"
 msgstr "   a   attivazione/disattivazione di un flag di sola lettura"
 
 #. sun
-#: fdisk/fdisk.c:297 fdisk/fdisk.c:341
+#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
 msgid "   b   edit bsd disklabel"
 msgstr "   b   modifica di bsd disklabel"
 
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:314
 msgid "   c   toggle the mountable flag"
 msgstr "   c   attivazione/disattivazione del flag montabile"
 
 #. sun
-#: fdisk/fdisk.c:299 fdisk/fdisk.c:318 fdisk/fdisk.c:343
+#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
 msgid "   d   delete a partition"
 msgstr "   d   cancellazione di una partizione"
 
-#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
 msgid "   l   list known partition types"
 msgstr "   l   elenco dei tipi di partizione conosciuti"
 
 #. sun
-#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:333 fdisk/fdisk.c:345
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:387 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:349 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   stampa di questo menu"
 
-#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
 msgid "   n   add a new partition"
 msgstr "   n   aggiunta di una nuova partizione"
 
-#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:334 fdisk/fdisk.c:347
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   creazione di una nuova tabella delle partizioni DOS vuota"
 
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:348 fdisk/fdisk.c:371
-#: fdisk/fdisk.c:388
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
 msgid "   p   print the partition table"
 msgstr "   p   stampa della tabella delle partizioni"
 
-#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:335 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:372 fdisk/fdisk.c:389 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:351 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr "   q   uscita senza salvataggio delle modifiche"
 
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   creazione di una nuova disklabel Sun vuota"
 
 #. sun
-#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   t   change a partition's system id"
 msgstr "   t   modifica dell'id di sistema di una partizione"
 
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
 msgid "   u   change display/entry units"
 msgstr "   u   modifica delle unit� di visualizzazione/di immissione"
 
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:392
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   v   verify the partition table"
 msgstr "   v   verifica della tabella delle partizioni"
 
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   w   write table to disk and exit"
 msgstr "   w   scrittura della tabella su disco e uscita"
 
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
 msgid "   x   extra functionality (experts only)"
 msgstr " x   ulteriori funzioni (solo per esperti)"
 
-#: fdisk/fdisk.c:315
+#: fdisk/fdisk.c:331
 msgid "   a   select bootable partition"
 msgstr "   a   selezione della partizione che � possibile avviare"
 
 #. sgi flavour
-#: fdisk/fdisk.c:316
+#: fdisk/fdisk.c:332
 msgid "   b   edit bootfile entry"
 msgstr "   b   modifica della voce bootfile"
 
 #. sgi
-#: fdisk/fdisk.c:317
+#: fdisk/fdisk.c:333
 msgid "   c   select sgi swap partition"
 msgstr "   c   selezione della partizione swap sgi"
 
-#: fdisk/fdisk.c:340
+#: fdisk/fdisk.c:356
 msgid "   a   toggle a bootable flag"
 msgstr "   a  Cambia bootable flag"
 
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:358
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   cambia il flag compatibile con il dos"
 
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:379
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   modifica del numero di cilindri alternativi"
 
 #. sun
-#: fdisk/fdisk.c:364 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
 msgid "   c   change number of cylinders"
 msgstr "   c   modifica del numero di cilindri"
 
-#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   stampa dei dati grezzi nella tabella delle partizioni"
 
-#: fdisk/fdisk.c:366
+#: fdisk/fdisk.c:382
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   modifica del numero dei settori supplementari per cilindro"
 
 #. sun
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
 msgid "   h   change number of heads"
 msgstr "   h   modifica del numero di testine"
 
-#: fdisk/fdisk.c:368
+#: fdisk/fdisk.c:384
 msgid "   i   change interleave factor"
 msgstr "   i   modifica del fattore di interleave"
 
 #. sun
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:385
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   modifica della velocit� di rotazione (rpm)"
 
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   ritorno al menu principale"
 
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   s   change number of sectors/track"
 msgstr "   s   modifica del numero di settori/traccia"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:393
 msgid "   y   change number of physical cylinders"
 msgstr "   y   modifica del numero di cilindri fisici"
 
-#: fdisk/fdisk.c:381
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   spostamento dell'inizio di dati in una partizione"
 
-#: fdisk/fdisk.c:384
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
 msgid "   e   list extended partitions"
 msgstr "   e   elenco delle partizioni estese"
 
 #. !sun
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
 msgid "   g   create an IRIX partition table"
 msgstr "   g   creazione di una tabella delle partizioni IRIX"
 
-#: fdisk/fdisk.c:481
+#. !sun
+#: fdisk/fdisk.c:433
+#, fuzzy
+msgid "   f   fix partition order"
+msgstr "   p   stampa della tabella delle partizioni"
+
+#: fdisk/fdisk.c:532
 msgid "You must set"
 msgstr "Si devono impostare"
 
-#: fdisk/fdisk.c:495
+#: fdisk/fdisk.c:546
 msgid "heads"
 msgstr "testine"
 
-#: fdisk/fdisk.c:497 fdisk/fdisk.c:905 fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:548 fdisk/fdisk.c:1046 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "settori"
 
-#: fdisk/fdisk.c:499 fdisk/fdisk.c:905 fdisk/fdiskbsdlabel.c:444
-#: fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:550 fdisk/fdisk.c:1046 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cilindri"
 
-#: fdisk/fdisk.c:503
+#: fdisk/fdisk.c:554
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2556,34 +2584,34 @@ msgstr ""
 "� possibile effettuare questa operazione dal menu delle funzioni "
 "supplementari.\n"
 
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:555
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:538
+#: fdisk/fdisk.c:595
 msgid "Bad offset in primary extended partition\n"
 msgstr "Offset errato nella partizione estesa primaria\n"
 
-#: fdisk/fdisk.c:545
+#: fdisk/fdisk.c:609
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Attenzione: cancellazione delle partizioni dopo %d\n"
 
-#: fdisk/fdisk.c:566
+#: fdisk/fdisk.c:625
 #, 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:574
+#: fdisk/fdisk.c:633
 #, 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:600
+#: fdisk/fdisk.c:677
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -2595,33 +2623,34 @@ msgstr ""
 "contenuto precedente non potr� essere recuperato.\n"
 "\n"
 
-#: fdisk/fdisk.c:636
-msgid "You will not be able to write the partition table.\n"
-msgstr "Impossibile scrivere la tabella delle partizioni.\n"
-
-#: fdisk/fdisk.c:645
+#: fdisk/fdisk.c:701
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Nota: la dimensione del settore � %d (non %d)\n"
 
-#: fdisk/fdisk.c:693
+#: fdisk/fdisk.c:783
+msgid "You will not be able to write the partition table.\n"
+msgstr "Impossibile scrivere la tabella delle partizioni.\n"
+
+#: fdisk/fdisk.c:811
+#, fuzzy
 msgid ""
-"Device contains neither a valid DOS partition table, nor Sun or SGI "
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 "Il dispositivo non contiene n� una tabella delle partizioni DOS, n� una "
 "disklabel Sun o SGI valide\n"
 
-#: fdisk/fdisk.c:709
+#: fdisk/fdisk.c:827
 msgid "Internal error\n"
 msgstr "Errore interno\n"
 
-#: fdisk/fdisk.c:719
+#: fdisk/fdisk.c:849
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "La partizione estesa supplementare viene ignorata %d\n"
 
-#: fdisk/fdisk.c:726
+#: fdisk/fdisk.c:861
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2630,7 +2659,7 @@ msgstr ""
 "Attenzione: il flag 0x%04x non valido della tabella delle partizioni %d "
 "verr� corretto con w(rite)\n"
 
-#: fdisk/fdisk.c:747
+#: fdisk/fdisk.c:883
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2638,65 +2667,65 @@ msgstr ""
 "\n"
 "ricevuto EOF tre volte - uscita in corso..\n"
 
-#: fdisk/fdisk.c:784
+#: fdisk/fdisk.c:921
 msgid "Hex code (type L to list codes): "
 msgstr "Codice esadecimale (digitare L per elencare i codici): "
 
-#: fdisk/fdisk.c:823
+#: fdisk/fdisk.c:960
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, predefinito %d): "
 
-#: fdisk/fdisk.c:877
+#: fdisk/fdisk.c:1014
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Utilizzo del valore predefinito %d\n"
 
-#: fdisk/fdisk.c:881
+#: fdisk/fdisk.c:1018
 msgid "Value out of range.\n"
 msgstr "Valore fuori intervallo.\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:1028
 msgid "Partition number"
 msgstr "Numero della partizione"
 
-#: fdisk/fdisk.c:896
+#: fdisk/fdisk.c:1037
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Attenzione: la partizione %d ha tipo vuoto\n"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1044
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1044
 msgid "sector"
 msgstr "settore"
 
-#: fdisk/fdisk.c:912
+#: fdisk/fdisk.c:1053
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Modifica delle unit� di visualizzazione/immissione su %s\n"
 
-#: fdisk/fdisk.c:922
+#: fdisk/fdisk.c:1064
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ATTENZIONE: la partizione %d � una partizione estesa\n"
 
-#: fdisk/fdisk.c:935
+#: fdisk/fdisk.c:1075
 msgid "DOS Compatibility flag is set\n"
 msgstr "Impostato il flag compatibile con DOS\n"
 
-#: fdisk/fdisk.c:939
+#: fdisk/fdisk.c:1079
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Il flag compatibile con DOS non � impostato\n"
 
-#: fdisk/fdisk.c:1025
+#: fdisk/fdisk.c:1167
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "La partizione %d non esiste ancora!\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1172
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2708,7 +2737,7 @@ msgstr ""
 "tipo 0 probabilmente non � consigliabile. � possibile eliminare\n"
 "una partizione utilizzando il comando `d'.\n"
 
-#: fdisk/fdisk.c:1039
+#: fdisk/fdisk.c:1181
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2716,7 +2745,7 @@ msgstr ""
 "Non � possibile trasformare una partizione in una estesa o viceversa\n"
 "Prima bisogna eliminarla.\n"
 
-#: fdisk/fdisk.c:1048
+#: fdisk/fdisk.c:1190
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2726,7 +2755,7 @@ msgstr ""
 "poich� SunOS/Solaris lo prevede e ci� � gradito anche a Linux.\n"
 "\n"
 
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1196
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2736,53 +2765,53 @@ msgstr ""
 "e la partizione 11 come volume intero (6) poich� IRIX lo prevede.\n"
 "\n"
 
-#: fdisk/fdisk.c:1068
+#: fdisk/fdisk.c:1210
 #, 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:1121
+#: fdisk/fdisk.c:1261
 #, 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:1123 fdisk/fdisk.c:1131 fdisk/fdisk.c:1140 fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1263 fdisk/fdisk.c:1271 fdisk/fdisk.c:1280 fdisk/fdisk.c:1289
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "    phys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132
+#: fdisk/fdisk.c:1264 fdisk/fdisk.c:1272
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logico=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1129
+#: fdisk/fdisk.c:1269
 #, 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:1138
+#: fdisk/fdisk.c:1278
 #, 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:1141
+#: fdisk/fdisk.c:1281
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "dovrebbe essere (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1147
+#: fdisk/fdisk.c:1287
 #, 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:1150
+#: fdisk/fdisk.c:1290
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "dovrebbe essere (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1157
+#: fdisk/fdisk.c:1297
 #, c-format
 msgid ""
 "\n"
@@ -2795,18 +2824,29 @@ msgstr ""
 "Unit� = %s di %d * %d byte\n"
 "\n"
 
-#. FIXME! let's see how this shows up with other languagues
-#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1342
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1408
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Avvio    Inizio    Fine   Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1195 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1409 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1235
+#: fdisk/fdisk.c:1446
+#, fuzzy
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr "le partizioni logiche non sono nell'ordine del disco"
+
+#: fdisk/fdisk.c:1456
 #, c-format
 msgid ""
 "\n"
@@ -2817,107 +2857,107 @@ msgstr ""
 "Disco %s: %d testine, %d settori, %d cilindri\n"
 "\n"
 
-#: fdisk/fdisk.c:1237
+#: fdisk/fdisk.c:1458
 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:1276
+#: fdisk/fdisk.c:1502
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Attenzione: la partizione %d contiene il settore 0\n"
 
-#: fdisk/fdisk.c:1279
+#: fdisk/fdisk.c:1505
 #, 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:1282
+#: fdisk/fdisk.c:1508
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Partizione %d: settore %d pi� grande del massimo %d\n"
 
-#: fdisk/fdisk.c:1285
+#: fdisk/fdisk.c:1511
 #, 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:1289
+#: fdisk/fdisk.c:1515
 #, 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:1319
+#: fdisk/fdisk.c:1547
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
 
-#: fdisk/fdisk.c:1327
+#: fdisk/fdisk.c:1555
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Attenzione: la partizione %d si sovrappone alla partizione %d.\n"
 
-#: fdisk/fdisk.c:1345
+#: fdisk/fdisk.c:1575
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Attenzione: la partizione %d � vuota\n"
 
-#: fdisk/fdisk.c:1350
+#: fdisk/fdisk.c:1580
 #, 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:1356
+#: fdisk/fdisk.c:1586
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "Numero %d totale dei settori allocati superiore al massimo %d\n"
 
-#: fdisk/fdisk.c:1359
+#: fdisk/fdisk.c:1589
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d settori non allocati\n"
 
-#: fdisk/fdisk.c:1371 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1602 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 "La partizione %d � gi� definita.  Cancellarla prima di riaggiungerla.\n"
 
-#: fdisk/fdisk.c:1392 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
-#: fdisk/fdisksunlabel.c:494
+#: fdisk/fdisk.c:1623 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primo %s"
 
-#: fdisk/fdisk.c:1407 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1638 fdisk/fdisksunlabel.c:542
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Il settore %d � gi� allocato\n"
 
-#: fdisk/fdisk.c:1439
+#: fdisk/fdisk.c:1674
 msgid "No free sectors available\n"
 msgstr "Non ci sono settori liberi disponibili\n"
 
-#: fdisk/fdisk.c:1449 fdisk/fdiskbsdlabel.c:259 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1682 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Ultimo %s o +size o +sizeM o +sizeK "
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1715
 #, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
 msgstr "Attenzione: la partizione %d ha un numero strano di settori.\n"
 
-#: fdisk/fdisk.c:1516 fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdisk.c:1755 fdisk/fdiskbsdlabel.c:611
 msgid "The maximum number of partitions has been created\n"
 msgstr "� stato creato il numero massimo di partizioni\n"
 
-#: fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1765
 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:1530
+#: fdisk/fdisk.c:1769
 #, c-format
 msgid ""
 "Command action\n"
@@ -2928,20 +2968,20 @@ msgstr ""
 "   %s\n"
 "   p   partizione primaria (1-4)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1771
 msgid "l   logical (5 or over)"
 msgstr "l   logica (5 od oltre)"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1771
 msgid "e   extended"
 msgstr " e   estesa"
 
-#: fdisk/fdisk.c:1549
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Numero di partizioni non valido per il tipo `%c'\n"
 
-#: fdisk/fdisk.c:1581
+#: fdisk/fdisk.c:1823
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2949,11 +2989,11 @@ msgstr ""
 "La tabella delle partizioni � stata alterata!\n"
 "\n"
 
-#: fdisk/fdisk.c:1590
+#: fdisk/fdisk.c:1832
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chiamata di ioctl() per rileggere la tabella delle partizioni.\n"
 
-#: fdisk/fdisk.c:1606
+#: fdisk/fdisk.c:1848
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2963,7 +3003,7 @@ msgstr ""
 "Riavviare il sistema per assicurarsi che la tabella delle partizioni sia "
 "aggiornata.\n"
 
-#: fdisk/fdisk.c:1612
+#: fdisk/fdisk.c:1854
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2975,68 +3015,73 @@ msgstr ""
 "consultare la pagina del manuale fdisk per ulteriori\n"
 "informazioni.\n"
 
-#: fdisk/fdisk.c:1619
+#: fdisk/fdisk.c:1861
 msgid "Syncing disks.\n"
 msgstr "Sincronizzazione dei dischi in corso.\n"
 
-#: fdisk/fdisk.c:1650
+#: fdisk/fdisk.c:1892
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
 
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1908
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partizione %d non ha area dati\n"
 
-#: fdisk/fdisk.c:1671
+#: fdisk/fdisk.c:1913
 msgid "New beginning of data"
 msgstr "Nuovo inizio dati"
 
-#: fdisk/fdisk.c:1685
+#: fdisk/fdisk.c:1929
 msgid "Expert command (m for help): "
 msgstr "Comando per esperti (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:1696
+#: fdisk/fdisk.c:1942
 msgid "Number of cylinders"
 msgstr "Numero di cilindri"
 
-#: fdisk/fdisk.c:1717
+#: fdisk/fdisk.c:1968
 msgid "Number of heads"
 msgstr "Numero di testine"
 
-#: fdisk/fdisk.c:1742
+#: fdisk/fdisk.c:1993
 msgid "Number of sectors"
 msgstr "Numero di settori"
 
-#: fdisk/fdisk.c:1745
+#: fdisk/fdisk.c:1996
 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:1807
+#: fdisk/fdisk.c:2058
 #, 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:1821
+#: fdisk/fdisk.c:2072
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:1838
+#: fdisk/fdisk.c:2089
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:1911
+#: fdisk/fdisk.c:2110
+#, fuzzy, c-format
+msgid "%c: unknown command\n"
+msgstr "%s: comando sconosciuto: %s\n"
+
+#: fdisk/fdisk.c:2161
 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:1914
+#: fdisk/fdisk.c:2164
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -3044,11 +3089,18 @@ msgstr ""
 "Attenzione: l'opzione -b (mpostazione della dimensione del settore) si "
 "dovrebbe utilizzare con un dispositivo specificato\n"
 
-#: fdisk/fdisk.c:1973
+#: fdisk/fdisk.c:2227
+#, c-format
+msgid ""
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:2236
 msgid "Command (m for help): "
 msgstr "Comando (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:1987
+#: fdisk/fdisk.c:2252
 #, c-format
 msgid ""
 "\n"
@@ -3057,15 +3109,15 @@ msgstr ""
 "\n"
 "Il file d'avvio corrente �: %s\n"
 
-#: fdisk/fdisk.c:1989
+#: fdisk/fdisk.c:2254
 msgid "Please enter the name of the new boot file: "
 msgstr "Immettere il nome del nuovo file d'avvio:"
 
-#: fdisk/fdisk.c:1991
+#: fdisk/fdisk.c:2256
 msgid "Boot file unchanged\n"
 msgstr "File d'avvio immutato\n"
 
-#: fdisk/fdisk.c:2051
+#: fdisk/fdisk.c:2320
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3075,7 +3127,7 @@ msgstr ""
 "\tnessun menu per esperti disponibile per le tabelle delle partizioni SGI.\n"
 "\n"
 
-#: fdisk/fdiskaixlabel.c:29
+#: fdisk/fdiskaixlabel.c:28
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3104,7 +3156,7 @@ msgstr ""
 "\t   di rimuovere in maniera logica il disco dalla macchina AIX \n"
 "\t   (altrimenti si diviene AIXpert)."
 
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:117
 #, c-format
 msgid ""
 "\n"
@@ -3113,163 +3165,168 @@ msgstr ""
 "\n"
 "Etichetta BSD per dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:125
 msgid "   d   delete a BSD partition"
 msgstr "   d   eliminanazione di una partizione BSD"
 
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
 msgstr "   e   modifica dei dati dell'unit�"
 
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
 msgstr "   i   installazione di bootstrap"
 
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
 msgstr "   l   elenco dei tipi di filesystem conosciuti"
 
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   n   add a new BSD partition"
 msgstr "   n   aggiunta di una nuova partizione BSD"
 
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   p   print BSD partition table"
 msgstr "   p   stampa della tabella delle partizioni BSD"
 
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
 msgstr "   s   visualizzazione del disklabel completo"
 
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
 msgstr "   t   modifica dell'id del filesystem di una partizione"
 
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:136
+#, fuzzy
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   c   modifica del numero di cilindri"
+
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
 msgstr "   w   scrittura del disklabel su disco"
 
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   collegamento della partizione BSD a una non-BSD"
 
-#: fdisk/fdiskbsdlabel.c:146
-#, c-format
-msgid "Partition %s%d has invalid starting sector 0.\n"
+#: fdisk/fdiskbsdlabel.c:168
+#, fuzzy, c-format
+msgid "Partition %s has invalid starting sector 0.\n"
 msgstr "La partizione %s%d ha settore di inizio 0: dato non valido.\n"
 
-#: fdisk/fdiskbsdlabel.c:150
-#, c-format
-msgid "Reading disklabel of %s%d at sector %d.\n"
+#: fdisk/fdiskbsdlabel.c:172
+#, fuzzy, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
 msgstr "Lettura del disklabel di %s%d al settore %d.\n"
 
-#: fdisk/fdiskbsdlabel.c:159
+#: fdisk/fdiskbsdlabel.c:182
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
 msgstr "Non esiste partizione *BSD su %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
 msgstr "Comando disklabel BSD (m per richiamare la guida): "
 
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:310
 #, c-format
 msgid "type: %s\n"
 msgstr "tipo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:312
 #, c-format
 msgid "type: %d\n"
 msgstr "tipo: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:313
 #, c-format
 msgid "disk: %.*s\n"
 msgstr "disco: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:292
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
 msgstr "etichetta: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:315
 msgid "flags:"
 msgstr "flag:"
 
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:317
 msgid " removable"
 msgstr " rimovibile"
 
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
 msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:299
+#: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
 msgstr " badsect"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr "byte/settore: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr "settori/traccia: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr "tracce/cilindro: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr "settori/cilindro: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:329
 #, c-format
 msgid "cylinders: %ld\n"
 msgstr "cilindri: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
 msgstr "rpm: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
 msgstr " interleave: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "trackskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "cylinderskew: %d\n"
 msgstr "cylinderskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr "headswitch: %ld\t\t# millisecondi\n"
 
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr "ricerca traccia-a-traccia: %ld\t# millisecondi\n"
 
-#: fdisk/fdiskbsdlabel.c:314
+#: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
 msgstr "datiunit�:"
 
-#: fdisk/fdiskbsdlabel.c:323
+#: fdisk/fdiskbsdlabel.c:347
 #, c-format
 msgid ""
 "\n"
@@ -3278,112 +3335,98 @@ msgstr ""
 "\n"
 "%d partizioni:\n"
 
-#: fdisk/fdiskbsdlabel.c:324
-msgid "#        size   offset    fstype   [fsize bsize   cpg]\n"
+#: fdisk/fdiskbsdlabel.c:348
+#, fuzzy
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
 msgstr "#        size   offset    fstype   [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:380
-#, c-format
-msgid "Writing disklabel to %s%d.\n"
-msgstr "Scrittura del disklabel su %s%d in corso.\n"
-
-#: fdisk/fdiskbsdlabel.c:383
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, c-format
 msgid "Writing disklabel to %s.\n"
 msgstr "Scrittura del disklabel su %s in corso.\n"
 
-#: fdisk/fdiskbsdlabel.c:395
-#, c-format
-msgid "%s%d contains no disklabel.\n"
-msgstr "%s%d non contiene disklabel.\n"
-
-#: fdisk/fdiskbsdlabel.c:398
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
 msgstr "%s non contiene disklabel.\n"
 
-#: fdisk/fdiskbsdlabel.c:402
+#: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
 msgstr "Creare un disklabel? (s/n)"
 
-#: fdisk/fdiskbsdlabel.c:441
+#: fdisk/fdiskbsdlabel.c:458
 msgid "bytes/sector"
 msgstr "byte/settore"
 
-#: fdisk/fdiskbsdlabel.c:442
+#: fdisk/fdiskbsdlabel.c:459
 msgid "sectors/track"
 msgstr "settori/traccia"
 
-#: fdisk/fdiskbsdlabel.c:443
+#: fdisk/fdiskbsdlabel.c:460
 msgid "tracks/cylinder"
 msgstr "tracce/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:451
+#: fdisk/fdiskbsdlabel.c:468
 msgid "sectors/cylinder"
 msgstr "settori/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr " Deve essere <= settori/traccia * tracce/cilindro (predefinito).\n"
 
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
 msgstr "rpm"
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
 msgstr "interleave"
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
 msgstr "trackskew"
 
-#: fdisk/fdiskbsdlabel.c:460
+#: fdisk/fdiskbsdlabel.c:477
 msgid "cylinderskew"
 msgstr "cylinderskew"
 
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
 msgstr "headswitch"
 
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
 msgstr "ricerca traccia-a-traccia"
 
-#: fdisk/fdiskbsdlabel.c:503
+#: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "Bootstrap: %sboot -> boot%s (%s): "
 
-#: fdisk/fdiskbsdlabel.c:529
+#: fdisk/fdiskbsdlabel.c:546
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr "Sovrapposizione del bootstrap con il disklabel!\n"
 
-#: fdisk/fdiskbsdlabel.c:550
-#, c-format
-msgid "Bootstrap installed on %s%d.\n"
-msgstr "Bootstrap installato su %s%d.\n"
-
-#: fdisk/fdiskbsdlabel.c:552
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr "Bootstrap installato su %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:573
+#: fdisk/fdiskbsdlabel.c:591
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Partizione (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:604
+#: fdisk/fdiskbsdlabel.c:622
 msgid "This partition already exists.\n"
 msgstr "Questa partizione esiste gi�.\n"
 
-#: fdisk/fdiskbsdlabel.c:726
+#: fdisk/fdiskbsdlabel.c:742
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Attenzione: troppe partizioni (%d, il massimo � %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:772
+#: fdisk/fdiskbsdlabel.c:789
 msgid ""
 "\n"
 "Syncing disks.\n"
@@ -3391,68 +3434,73 @@ msgstr ""
 "\n"
 "Sincronizzazione dei dischi.\n"
 
-#: fdisk/fdisksgilabel.c:56
+#: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:57
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:58
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:59
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:60
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:61
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:62
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:63
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:64
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:65
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:66
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:67
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xlvol"
 msgstr "SGI xlvol"
 
-#: fdisk/fdisksgilabel.c:68
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI rxlvol"
 msgstr "SGI rxlvol"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativo"
 
-#: fdisk/fdisksgilabel.c:143
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+#, fuzzy
+msgid "Linux LVM"
+msgstr "Linux"
+
+#: fdisk/fdisksgilabel.c:158
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3460,11 +3508,11 @@ msgstr ""
 "Secondo la ditta MIPS Computer Systems, Inc l'etichetta non deve contenere "
 "pi� di512 byte\n"
 
-#: fdisk/fdisksgilabel.c:162
+#: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Rilevato un disklabel sgi con checksum errato.\n"
 
-#: fdisk/fdisksgilabel.c:186
+#: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
 "\n"
@@ -3483,7 +3531,7 @@ msgstr ""
 "Unit� = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:199
+#: fdisk/fdisksgilabel.c:213
 #, c-format
 msgid ""
 "\n"
@@ -3496,7 +3544,7 @@ msgstr ""
 "Unit� = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:205
+#: fdisk/fdisksgilabel.c:219
 #, c-format
 msgid ""
 "----- partitions -----\n"
@@ -3505,7 +3553,7 @@ msgstr ""
 "----- partizioni -----\n"
 "%*s  Info      Inizio       Fine   Settori  Id  Sistema\n"
 
-#: fdisk/fdisksgilabel.c:227
+#: fdisk/fdisksgilabel.c:241
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3516,12 +3564,12 @@ msgstr ""
 "File di avvio: %s\n"
 "----- Voci directory -----\n"
 
-#: fdisk/fdisksgilabel.c:237
+#: fdisk/fdisksgilabel.c:251
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s settore%5u dimensione%8u\n"
 
-#: fdisk/fdisksgilabel.c:298
+#: fdisk/fdisksgilabel.c:305
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3533,7 +3581,7 @@ msgstr ""
 "\tIl file di avvio deve essere un path assoluto non nullo,\n"
 "\tes. \"/unix\" o \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:312
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3541,7 +3589,7 @@ msgstr ""
 "\n"
 "\tNome del file di avvio troppo lungo:  deve essere di 16 byte al massimo.\n"
 
-#: fdisk/fdisksgilabel.c:310
+#: fdisk/fdisksgilabel.c:317
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3549,7 +3597,7 @@ msgstr ""
 "\n"
 "\tIl file di avvio deve avere un path completo.\n"
 
-#: fdisk/fdisksgilabel.c:315
+#: fdisk/fdisksgilabel.c:322
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3561,7 +3609,7 @@ msgstr ""
 "\tL'impostazione predefinita di SGI � \"/unix\" e per il backup "
 "\"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:343
+#: fdisk/fdisksgilabel.c:350
 #, c-format
 msgid ""
 "\n"
@@ -3574,7 +3622,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "Presente pi� di una voce disco intero.\n"
 
-#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:478
 msgid "No partitions defined\n"
 msgstr "Nessuna partizione definita\n"
 
@@ -3672,29 +3720,29 @@ msgstr ""
 "modo differente.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:621
+#: fdisk/fdisksgilabel.c:607
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr ""
 "Si � a conoscenza del fatto che sul disco esiste una sovrapposizione di "
 "partizioni?\n"
 
-#: fdisk/fdisksgilabel.c:691
+#: fdisk/fdisksgilabel.c:669
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr ""
 "Tentativo di generare automaticamente l'immissione dell'intero disco in "
 "corso.\n"
 
-#: fdisk/fdisksgilabel.c:698
+#: fdisk/fdisksgilabel.c:676
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "L'intero disco � gi� coperto da partizioni.\n"
 
-#: fdisk/fdisksgilabel.c:703
+#: fdisk/fdisksgilabel.c:681
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Sovrapposizione di partizioni sul disco. Risolvere anzitutto questo "
 "problema.\n"
 
-#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3702,22 +3750,23 @@ msgstr ""
 "Si raccomanda che l'undicesima partizione\n"
 "copra l'intero disco e sia di tipo `SGI volume'\n"
 
-#: fdisk/fdisksgilabel.c:728
+#: fdisk/fdisksgilabel.c:706
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 "Si avr� una sovrapposizione di partizioni sul disco. Risolvere anzitutto "
 "questo problema.\n"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:711
 #, c-format
 msgid " Last %s"
 msgstr " Ultimo %s"
 
-#: fdisk/fdisksgilabel.c:756
+#: fdisk/fdisksgilabel.c:733
+#, fuzzy
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
-"content will be unrecoverable lost.\n"
+"content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
 "Creazione di una nuova disklabel SGI. Le modifiche rimarranno memorizzate\n"
@@ -3725,12 +3774,12 @@ msgstr ""
 "contenuto precedente sar� definitivamente perso.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:784
+#: fdisk/fdisksgilabel.c:761
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Tentativo di mantenere i parametri della partizione %d in corso.\n"
 
-#: fdisk/fdisksgilabel.c:786
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tINIZIO=%d\tLUNGHEZZA=%d\n"
@@ -3767,7 +3816,7 @@ msgstr "SunOS var"
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:122
+#: fdisk/fdisksunlabel.c:129
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
@@ -3779,12 +3828,12 @@ msgstr ""
 "per es. testine, settori, cilindri e partizioni\n"
 "o forzare un'etichetta nuova (comando s nel menu principale)\n"
 
-#: fdisk/fdisksunlabel.c:215
+#: fdisk/fdisksunlabel.c:228
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "L'autoconfigurazione ha trovato un %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:242
+#: fdisk/fdisksunlabel.c:255
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -3795,7 +3844,7 @@ msgstr ""
 "solamente fino a quando si decide di scriverle. Dopodich�, chiaramente, il\n"
 "contenuto precedente non sar� recuperabile.\n"
 
-#: fdisk/fdisksunlabel.c:253
+#: fdisk/fdisksunlabel.c:266
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3805,71 +3854,71 @@ msgstr ""
 "   ?   auto configure\n"
 "   0   custom (con le impostazioni predefinite rilevate dell'hardware)"
 
-#: fdisk/fdisksunlabel.c:263
+#: fdisk/fdisksunlabel.c:276
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Selezione tipo (? per auto, 0 per custom): "
 
-#: fdisk/fdisksunlabel.c:275
+#: fdisk/fdisksunlabel.c:288
 msgid "Autoconfigure failed.\n"
 msgstr "Autoconfigurazione non riuscita.\n"
 
-#: fdisk/fdisksunlabel.c:303
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Settori/traccia"
 
-#: fdisk/fdisksunlabel.c:310
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:313
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Cilindri fisici"
 
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
 msgid "Rotation speed (rpm)"
 msgstr "Velocit� di rotazione (rpm)"
 
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
 msgid "Interleave factor"
 msgstr "Fattore di interleave"
 
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
 msgid "Extra sectors per cylinder"
 msgstr "Settori supplementari per cilindro"
 
-#: fdisk/fdisksunlabel.c:334
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "� possibile modificare tutti i parametri disco dal menu x"
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "floppy da 3,5\""
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:418
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "La partizione %d non finisce al limite del cilindro\n"
 
-#: fdisk/fdisksunlabel.c:438
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "La partizione %d si sovrappone ad altre nei settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:460
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervallo inutilizzato - settori 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervallo inutilizzato - settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:512
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3877,7 +3926,7 @@ msgstr ""
 "Altre partizioni coprono gi� il disco intero.\n"
 "Eliminarne alcune/rimpicciolirle prima di riprovare.\n"
 
-#: fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksunlabel.c:570
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3888,7 +3937,7 @@ msgstr ""
 "%d %s copre alcune altre partizioni. La voce immessa � stata cambiata\n"
 "in %d %s\n"
 
-#: fdisk/fdisksunlabel.c:567
+#: fdisk/fdisksunlabel.c:590
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3898,7 +3947,7 @@ msgstr ""
 "in considerazione di lasciare questa partizione come disco intero (5), "
 "partendo da 0, con %u settori\n"
 
-#: fdisk/fdisksunlabel.c:580
+#: fdisk/fdisksunlabel.c:603
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3914,7 +3963,7 @@ msgstr ""
 "Digitare YES  (s�) se si � certi di volere che quella partizione\n"
 "venga codificata con 82 (swap Linux ): "
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:634
 #, c-format
 msgid ""
 "\n"
@@ -3933,7 +3982,7 @@ msgstr ""
 "Unit� = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:648
 #, c-format
 msgid ""
 "\n"
@@ -3946,16 +3995,16 @@ msgstr ""
 "Unit� = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Inizio       Fine    Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:655
+#: fdisk/fdisksunlabel.c:678
 msgid "Number of alternate cylinders"
 msgstr "Numero di cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:688
+#: fdisk/fdisksunlabel.c:711
 msgid "Number of physical cylinders"
 msgstr "Numero dei cilindri fisici"
 
@@ -4067,279 +4116,307 @@ msgid "NEC DOS"
 msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
 msgstr "Recupero PartitionMagic"
 
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
 msgstr "Venix 80286"
 
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
 msgstr "PPC PReP Boot"
 
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:36
 msgid "SFS"
 msgstr "SFS"
 
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
 msgstr "QNX4.x"
 
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
 msgstr "QNX4.x 2a partiz."
 
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
 msgstr "QNX4.x 3rd partiz."
 
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
 msgstr "OnTrack DM"
 
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
 #. (or Novell)
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
 #. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
 
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
 msgstr "OnTrackDM6"
 
-#: fdisk/i386_sys_types.c:44
+#: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
 msgstr " EZ-Drive"
 
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
 msgstr "Golden Bow"
 
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
-#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:82
+#: fdisk/i386_sys_types.c:85 fdisk/i386_sys_types.c:86
 msgid "SpeedStor"
 msgstr " SpeedStor"
 
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD o SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
 
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
 msgstr "Novell Netware 386"
 
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
 msgstr "DiskSecure Multi-Boot"
 
-#: fdisk/i386_sys_types.c:52
+#: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
 msgstr "PC/IX"
 
-#: fdisk/i386_sys_types.c:53
+#: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
 msgstr "Vecchio Minix"
 
 #. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / vecchio Linux"
 
-#: fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "C nascosto OS/2: drive"
 
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
 msgstr "Linux esteso"
 
-#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
 msgstr "set volume NTFS"
 
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
 msgstr "Amoeba"
 
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
 #. (bad block table)
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:65
+#, fuzzy
+msgid "BSD/OS"
+msgstr "BSD/386"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
 msgstr "Ibernazione IBM Thinkpad"
 
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
 msgstr "BSD/386"
 
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
 msgstr "NeXTSTEP"
 
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
 msgstr "BSDI fs"
 
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
 msgstr "BSDI swap"
 
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
 msgstr "DRDOS/sec (FAT-12)"
 
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr "DRDOS/sec (FAT-16 < 32M)"
 
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16)"
 msgstr "DRDOS/sec (FAT-16)"
 
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
 msgid "Syrinx"
 msgstr "Syrinx"
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:76
+msgid "Non-FS data"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:77
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:74
+#. CP/M or Concurrent CP/M or
+#. Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:79
 msgid "DOS access"
 msgstr "accesso DOS"
 
-#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:75
+#. DOS access or SpeedStor 12-bit FAT
+#. extended partition
+#: fdisk/i386_sys_types.c:81
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:77
+#. SpeedStor 16-bit FAT extended
+#. partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:84
 msgid "BeOS fs"
 msgstr "BeOS fs"
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:80
+#: fdisk/i386_sys_types.c:87
 msgid "DOS secondary"
 msgstr "DOS secondario"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:88
 msgid "Linux raid autodetect"
 msgstr "Autorilevamento raid di Linux"
 
-#. New (2.2.x) raid partition with autodetect
-#. using persistent superblock
-#: fdisk/i386_sys_types.c:83
+#. New (2.2.x) raid partition with
+#. autodetect using persistent
+#. superblock
+#: fdisk/i386_sys_types.c:91
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:92
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:147
+#: fdisk/sfdisk.c:152
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "errore di ricerca su %s - impossibile ricercare a %lu\n"
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:157
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "errore di ricerca: si voleva 0x%08x%08x, si � ottenuto 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:198
+#: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
 msgstr "memoria insufficiente - termina\n"
 
-#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "errore in lettura su %s - impossibile leggere il settore %lu\n"
 
-#: fdisk/sfdisk.c:218
+#: fdisk/sfdisk.c:224
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERRORE: il settore %lu non ha una firma msdos\n"
 
-#: fdisk/sfdisk.c:235
+#: fdisk/sfdisk.c:241
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "errore di scrittura su %s - impossibile scrivere il settore %lu\n"
 
-#: fdisk/sfdisk.c:273
+#: fdisk/sfdisk.c:279
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "impossibile aprire il file di salvataggio settore partizione (%s)\n"
 
-#: fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:297
 #, c-format
 msgid "write error on %s\n"
 msgstr "errore di scrittura su %s\n"
 
-#: fdisk/sfdisk.c:309
+#: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "impossibile eseguire stat del file di ripristino partizione (%s)\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:320
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "il file di ripristino partizione ha una dimensione errata - il ripristino "
 "non viene effettuato\n"
 
-#: fdisk/sfdisk.c:318
+#: fdisk/sfdisk.c:324
 msgid "out of memory?\n"
 msgstr "memoria insufficiente?\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "impossibile aprire il file di ripristino partizione (%s)\n"
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:336
 #, c-format
 msgid "error reading %s\n"
 msgstr "errore durante la lettura di %s\n"
 
-#: fdisk/sfdisk.c:337
+#: fdisk/sfdisk.c:343
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "impossibile aprire il dispositivo %s per scrivere\n"
 
-#: fdisk/sfdisk.c:349
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "errore durante la scrittura del settore %lu su %s\n"
 
-#: fdisk/sfdisk.c:415
+#: fdisk/sfdisk.c:406
+#, fuzzy, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Disco %s: impossibile ottenere la geometria\n"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Disco %s: impossibile ottenere la geometria\n"
+
+#: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
 "Warning: start=%d - this looks like a partition rather than\n"
@@ -4350,27 +4427,22 @@ msgstr ""
 "l'intero disco. Utilizzare fdisk su di esso probabilmente non ha senso.\n"
 "[Utilizzare l'opzione --force se lo si desidera davvero]\n"
 
-#: fdisk/sfdisk.c:421
+#: fdisk/sfdisk.c:442
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
 msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d testine\n"
 
-#: fdisk/sfdisk.c:424
+#: fdisk/sfdisk.c:445
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
 msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d testine\n"
 
-#: fdisk/sfdisk.c:427
-#, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
+#: fdisk/sfdisk.c:449
+#, fuzzy, c-format
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
 msgstr "Attenzione: HDIO_GETGEO dice che vi sono %d cilindri\n"
 
-#: fdisk/sfdisk.c:431
-#, c-format
-msgid "Disk %s: cannot get geometry\n"
-msgstr "Disco %s: impossibile ottenere la geometria\n"
-
-#: fdisk/sfdisk.c:433
+#: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%d) - usually at most 63\n"
@@ -4381,7 +4453,7 @@ msgstr ""
 "Questo creer� problemi con tutto il software che utilizza l'indirizzamento "
 "C/H/S.\n"
 
-#: fdisk/sfdisk.c:437
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid ""
 "\n"
@@ -4390,7 +4462,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindri, %lu testine, %lu settori/traccia\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:539
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
@@ -4398,7 +4470,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per la testina: %d "
 "(dovrebbeessere compreso nell'intervallo 0-%d)\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:544
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
@@ -4406,7 +4478,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per il settore: %d "
 "(dovrebbeessere compreso nell'intervallo 1-%d)\n"
 
-#: fdisk/sfdisk.c:527
+#: fdisk/sfdisk.c:549
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %d (should be in "
@@ -4415,7 +4487,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per i cilindri: %d (dovrebbe "
 "essere compreso nell'intervallo 0-%d)\n"
 
-#: fdisk/sfdisk.c:566
+#: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4423,11 +4495,11 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:719
+#: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
 msgstr "Rilettura della tabella delle partizioni in corso...\n"
 
-#: fdisk/sfdisk.c:725
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4435,31 +4507,31 @@ msgstr ""
 "Il comando per la rilettura della tabella delle partizioni non � riuscito\n"
 "Riavviare adesso il sistema prima di utilizzare mkfs\n"
 
-#: fdisk/sfdisk.c:730
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Errore durante la chiusura di %s\n"
 
-#: fdisk/sfdisk.c:768
+#: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: nessuna partizione di questo tipo\n"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
 msgstr "formato non riconosciuto - utilizzo dei settori in corso\n"
 
-#: fdisk/sfdisk.c:830
+#: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabella delle partizioni di %s\n"
 
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato non implementato - utilizzo di %s in corso\n"
 
-#: fdisk/sfdisk.c:845
+#: fdisk/sfdisk.c:867
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4468,12 +4540,12 @@ msgstr ""
 "Unit� = cilindri di %lu byte, blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
 msgstr ""
 "   Inizio Boot Dispositivo     Fine   #cilin.   #blocchi   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:875
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4482,11 +4554,11 @@ msgstr ""
 "Unit� = settori di 512 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:855
+#: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
 msgstr "   Boot Dispositivo    Inizio      Fine  #settori Id  Sistema\n"
 
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4495,11 +4567,11 @@ msgstr ""
 "Unit� = blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:860
+#: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
 msgstr "   Boot Dispositivo   Inizio       Fine  #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:885
 #, c-format
 msgid ""
 "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4508,30 +4580,30 @@ msgstr ""
 "Unit� = megabyte da 1048576 byte, blocchi da 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:865
+#: fdisk/sfdisk.c:887
 msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
 msgstr "   Inizio Boot Dispositivo   Fine    MB   #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1019
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tinizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1004
+#: fdisk/sfdisk.c:1026
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tendenza: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1007
+#: fdisk/sfdisk.c:1029
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1018
+#: fdisk/sfdisk.c:1040
 msgid "No partitions found\n"
 msgstr "Non si � trovata alcuna partizione\n"
 
-#: fdisk/sfdisk.c:1025
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid ""
 "Warning: The first partition looks like it was made\n"
@@ -4542,95 +4614,95 @@ msgstr ""
 "  per C/H/S=*/%ld/%ld (al posto di %ld/%ld/%ld).\n"
 "Per questo elenco viene presunta tale geometria.\n"
 
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1097
 msgid "no partition table present.\n"
 msgstr "nessuna tabella delle partizioni presente.\n"
 
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "strano, sono definite solo %d partizioni.\n"
 
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1108
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Attenzione: la partizione %s ha dimensione 0 ma non � contrassegnata come "
 "vuota\n"
 
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1111
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Attenzione: la partizione %s ha dimensione 0 ed � avviabile\n"
 
-#: fdisk/sfdisk.c:1092
+#: fdisk/sfdisk.c:1114
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Attenzione: la partizione %s ha dimensione 0 e inizio non nullo\n"
 
-#: fdisk/sfdisk.c:1103
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Attenzione: la partizione %s "
 
-#: fdisk/sfdisk.c:1104
+#: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "non � contenuta nella partizione %s\n"
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Attenzione: le partizioni %s "
 
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
 msgstr "e %s si sovrappongono\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, c-format
 msgid "Warning: partition %s contains part of "
 msgstr "Attenzione: la partizione %s contiene parte della "
 
-#: fdisk/sfdisk.c:1128
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "the partition table (sector %lu),\n"
 msgstr "tabella delle partizioni (settore %lu),\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
 msgstr "e la eliminer� quando � piena\n"
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Attenzione: la partizione %s inizia al settore 0\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1164
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Attenzione: la partizione %s si estende dopo la fine del disco\n"
 
-#: fdisk/sfdisk.c:1156
+#: fdisk/sfdisk.c:1178
 msgid "Among the primary partitions, at most one can be extended\n"
 msgstr "Tra le partizioni primarie, al massimo una pu� essere estesa\n"
 
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
 msgstr " (sebbene questo non costituisca un problema su Linux)\n"
 
-#: fdisk/sfdisk.c:1174
+#: fdisk/sfdisk.c:1196
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1180
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non termina al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1220
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4639,7 +4711,7 @@ msgstr ""
 "(attiva)\n"
 "Questo non ha importanza per LILO, ma MBR DOS non avvier� questo disco.\n"
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4648,7 +4720,7 @@ msgstr ""
 "primarie\n"
 "LILO non prende in considerazione il flag `bootable' (flag 'avviabile').\n"
 
-#: fdisk/sfdisk.c:1211
+#: fdisk/sfdisk.c:1233
 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"
@@ -4657,150 +4729,168 @@ msgstr ""
 "(attiva)\n"
 "Questo non ha importanza per LILO, ma MBR DOS non avvier� questo disco.\n"
 
-#: fdisk/sfdisk.c:1228
+#: fdisk/sfdisk.c:1250
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partizione %s: inizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1237
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 " partizione %s: fine: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1240
+#: fdisk/sfdisk.c:1262
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione %s termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#: fdisk/sfdisk.c:1287
+#, fuzzy, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "Attenzione: inizio dati danneggiato nella partizione %d\n"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1291
+#, fuzzy
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "troppe partizioni - sto ignorando quei numeri passati (%d)\n"
 
-#: fdisk/sfdisk.c:1288
+#: fdisk/sfdisk.c:1324
 msgid "tree of partitions?\n"
 msgstr "struttura delle partizioni?\n"
 
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "rilevato l'amministratore del disco - impossibile da gestire\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
 msgstr "trovata firma DM6 - termina\n"
 
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "strano..., una partizione estesa di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1426
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "strano..., una partizione BSD di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1458
+#: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr " %s: partizione non riconosciuta\n"
 
-#: fdisk/sfdisk.c:1470
+#: fdisk/sfdisk.c:1536
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flag -n dato: nessuna modifica\n"
 
-#: fdisk/sfdisk.c:1483
+#: fdisk/sfdisk.c:1549
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Salvataggio dei vecchi settori non riuscito - interruzione in corso\n"
 
-#: fdisk/sfdisk.c:1488
+#: fdisk/sfdisk.c:1554
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: fdisk/sfdisk.c:1565
+#: fdisk/sfdisk.c:1631
 msgid "long or incomplete input line - quitting\n"
 msgstr "linea di input lunga o incompleta - uscita in corso\n"
 
-#: fdisk/sfdisk.c:1601
+#: fdisk/sfdisk.c:1667
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "errore di input: `=' previsto dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1608
+#: fdisk/sfdisk.c:1674
 #, 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:1614
+#: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input non riconosciuto: %s\n"
 
-#: fdisk/sfdisk.c:1646
+#: fdisk/sfdisk.c:1712
 msgid "number too big\n"
 msgstr "numero troppo grande\n"
 
-#: fdisk/sfdisk.c:1650
+#: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
 msgstr "segni strani dopo il numero\n"
 
-#: fdisk/sfdisk.c:1766
+#: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
 msgstr "non c'� spazio per il descrittore di partizione\n"
 
-#: fdisk/sfdisk.c:1799
+#: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
 msgstr "impossibile costituire una partizione estesa adiacente\n"
 
-#: fdisk/sfdisk.c:1850
+#: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
 msgstr "troppi campi di input\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1884
+#: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
 msgstr "Non c'� spazio per altri\n"
 
-#: fdisk/sfdisk.c:1903
+#: fdisk/sfdisk.c:1969
 msgid "Illegal type\n"
 msgstr "Tipo non valido\n"
 
-#: fdisk/sfdisk.c:1935
-#, c-format
-msgid "Warning: exceeds max allowable size (%lu)\n"
+#: fdisk/sfdisk.c:2001
+#, fuzzy, c-format
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Attenzione: superiore alla dimensione massima consentita (%lu)\n"
 
-#: fdisk/sfdisk.c:1940
+#: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
 msgstr "Attenzione: partizione vuota\n"
 
-#: fdisk/sfdisk.c:1954
+#: fdisk/sfdisk.c:2021
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Attenzione: inizio partizione non valido (%lu troppo anticipato)\n"
 
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "flag avviabile non riconosciuto - scegliere - o *\n"
 
-#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
 msgstr "Specificazione c,h,s parziale?\n"
 
-#: fdisk/sfdisk.c:2008
+#: fdisk/sfdisk.c:2075
 msgid "Extended partition not where expected\n"
 msgstr "partizione estesa in posizione non prevista\n"
 
-#: fdisk/sfdisk.c:2040
+#: fdisk/sfdisk.c:2107
 msgid "bad input\n"
 msgstr "input non valido\n"
 
-#: fdisk/sfdisk.c:2062
+#: fdisk/sfdisk.c:2129
 msgid "too many partitions\n"
 msgstr "troppe partizioni\n"
 
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2162
 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"
@@ -4813,47 +4903,47 @@ msgstr ""
 "Solitamente � necessario specificare solamente <inizio> e <dimensione> ( e "
 "forse <tipo>).\n"
 
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2182
 msgid "version"
 msgstr "versione"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2188
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Utilizzo: %s [opzioni] dispositivo...\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2189
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: qualcosa come /dev/hda o /dev/sda"
 
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2190
 msgid "useful options:"
 msgstr "opzioni utili:"
 
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2191
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [o --show-size]: elenco dimensioni di una partizione"
 
-#: fdisk/sfdisk.c:2125
+#: fdisk/sfdisk.c:2192
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [o --id]:        stampa o modifica dell'Id della partizione"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2193
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [o --list]:      elenco delle partizioni di ciascun dispositivo"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2194
 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:2128
+#: fdisk/sfdisk.c:2195
 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:2129
+#: fdisk/sfdisk.c:2196
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of "
 "sectors/blocks/cylinders/MB"
@@ -4861,56 +4951,56 @@ msgstr ""
 "    -uS, -uB, -uC, -uM:  accetta/riporta in unit� di "
 "settori/blocchi/cilindri/MB"
 
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2197
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [o --list-types]:elenca i tipi di partizione conosciuti"
 
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2198
 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:2132
+#: fdisk/sfdisk.c:2199
 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:2133
+#: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                modifica solamente la partizione con numero #"
 
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 non scrive realmente sul disco"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2202
 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:2136
+#: fdisk/sfdisk.c:2203
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ripristina questi settori nuovamente"
 
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [o --version]:   stampa versione"
 
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [o --help]:     stampa questo messaggio"
 
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
 msgstr "opzioni pericolose:"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2207
 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:2141
+#: fdisk/sfdisk.c:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4918,125 +5008,120 @@ msgstr ""
 "    -x [o --show-extended]: elenca anche le partizioni estese in output\n"
 "                             o prevede i rispettivi descrittori in input"
 
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2210
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 "    -L  [o --Linux]:      non reclamare per cose che risultano irrilevanti "
 "per Linux"
 
-#: fdisk/sfdisk.c:2144
+#: fdisk/sfdisk.c:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [o --quiet]:      elimina i messaggi di avvertimento"
 
-#: fdisk/sfdisk.c:2145
+#: fdisk/sfdisk.c:2212
 msgid "    You can override the detected geometry using:"
 msgstr "    � possibile non usare la geometria rilevata utilizzando:"
 
-#: fdisk/sfdisk.c:2146
+#: fdisk/sfdisk.c:2213
 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:2147
+#: fdisk/sfdisk.c:2214
 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:2148
+#: fdisk/sfdisk.c:2215
 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:2149
+#: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
 msgstr "� possibile disattivare tutte le verifiche di coerenza con:"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2217
 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:2156
+#: fdisk/sfdisk.c:2223
 msgid "Usage:"
 msgstr "Utilizzo:"
 
-#: fdisk/sfdisk.c:2157
+#: fdisk/sfdisk.c:2224
 #, 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:2158
+#: fdisk/sfdisk.c:2225
 #, 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:2159
+#: fdisk/sfdisk.c:2226
 #, 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:2278
+#: fdisk/sfdisk.c:2346
 msgid "no command?\n"
 msgstr "nessun comando?\n"
 
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2471
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "totale: %d blocchi\n"
 
-#: fdisk/sfdisk.c:2438
+#: fdisk/sfdisk.c:2508
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "utilizzo: sfdisk --print-id numero partizione dispositivo\n"
 
-#: fdisk/sfdisk.c:2440
+#: fdisk/sfdisk.c:2510
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr " utilizzo: sfdisk --change-id numero partizione dispositivo Id\n"
 
-#: fdisk/sfdisk.c:2442
+#: fdisk/sfdisk.c:2512
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "utilizzo: sfdisk --id numero partizione dispositivo [Id]\n"
 
-#: fdisk/sfdisk.c:2449
+#: fdisk/sfdisk.c:2519
 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:2474
+#: fdisk/sfdisk.c:2544
 #, c-format
 msgid "cannot open %s %s\n"
 msgstr "impossibile aprire %s %s\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "read-write"
 msgstr "lettura-scrittura"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "for reading"
 msgstr "in lettura"
 
-#: fdisk/sfdisk.c:2499
+#: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2516
-#, c-format
-msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
+#: fdisk/sfdisk.c:2586
+#, fuzzy, c-format
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %d cilindri, %d testine, %d settori/traccia\n"
 
-#: fdisk/sfdisk.c:2519
-#, c-format
-msgid "%s: unknown geometry\n"
-msgstr "%s: geometria sconosciuta\n"
-
-#: fdisk/sfdisk.c:2535
+#: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "BLKGETSIZE ioctl non riuscito per %s\n"
 
-#: fdisk/sfdisk.c:2612
+#: fdisk/sfdisk.c:2680
 #, 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:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
 msgid ""
 "Done\n"
 "\n"
@@ -5044,7 +5129,7 @@ msgstr ""
 "Fine\n"
 "\n"
 
-#: fdisk/sfdisk.c:2638
+#: fdisk/sfdisk.c:2706
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5053,42 +5138,43 @@ 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:2652
+#: fdisk/sfdisk.c:2720
 #, 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:2708
+#: fdisk/sfdisk.c:2777
 #, c-format
 msgid "Bad Id %x\n"
 msgstr "Id non valido %x\n"
 
-#: fdisk/sfdisk.c:2723
+#: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
 msgstr "Questo disco � attualmente in uso.\n"
 
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Errore irreversibile: impossibile trovare %s\n"
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2812
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Attenzione: %s non � un dispositivo di blocchi\n"
 
-#: fdisk/sfdisk.c:2749
+#: fdisk/sfdisk.c:2818
 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:2751
+#: fdisk/sfdisk.c:2820
+#, fuzzy
 msgid ""
 "\n"
-"This disk is currently in use - repartitioning is probably a bad idea.Umount "
-"all file systems, and swapoff all swap partitions on this disk.Use the "
-"--no-reread flag to suppress this check.\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
 "Questo disco � attualmente in uso - effettuare una ripartizione non � "
@@ -5096,28 +5182,29 @@ msgstr ""
 "swapoff di tutte le partizioni swap su questo disco. Utilizzare il "
 "flag--no-reread per eliminare questo controllo.\n"
 
-#: fdisk/sfdisk.c:2755
+#: fdisk/sfdisk.c:2824
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:2759
-msgid "OK"
+#: fdisk/sfdisk.c:2828
+#, fuzzy
+msgid "OK\n"
 msgstr "OK"
 
-#: fdisk/sfdisk.c:2768
+#: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
 msgstr "Vecchia situazione:\n"
 
-#: fdisk/sfdisk.c:2772
+#: fdisk/sfdisk.c:2841
 #, 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:2780
+#: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
 msgstr "Nuova situazione:\n"
 
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2854
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5125,19 +5212,19 @@ msgstr ""
 "Queste partizioni non mi piacciono - nessuna modifica\n"
 "(se questo � quanto si desidera, utilizzare l'opzione --force.)\n"
 
-#: fdisk/sfdisk.c:2788
+#: fdisk/sfdisk.c:2857
 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:2793
+#: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Soddisfatti di questo? [ynq] "
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Scrivere questo su disco? [ynq] "
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2869
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5145,15 +5232,15 @@ msgstr ""
 "\n"
 "sfdisk: fine prematura dell'input\n"
 
-#: fdisk/sfdisk.c:2802
+#: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
 msgstr "Uscita in corso - nessuna modifica\n"
 
-#: fdisk/sfdisk.c:2808
+#: fdisk/sfdisk.c:2877
 msgid "Please answer one of y,n,q\n"
 msgstr "Scegliere un'opzione per la risposta tra y,n,q\n"
 
-#: fdisk/sfdisk.c:2816
+#: fdisk/sfdisk.c:2885
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5161,7 +5248,7 @@ msgstr ""
 "La nuova tabella delle partizioni � stata scritta con successo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2891
 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"
@@ -5172,108 +5259,114 @@ msgstr ""
 " per azzerare i primi 512 byte: dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(Consultare fdisk(8).)\n"
 
-#: games/banner.c:1048
+#: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
 msgstr "utilizzo: banner [-w width]\n"
 
-#: games/banner.c:1068
+#: games/banner.c:1065
 msgid "Message: "
 msgstr "Messaggio: "
 
-#: games/banner.c:1102
+#: games/banner.c:1099
 #, c-format
 msgid "The character '%c' is not in my character set"
 msgstr "Il carattere '%c' non � compreso nel mio set di caratteri"
 
-#: games/banner.c:1110
+#: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
 msgstr "Il messaggio '%s' � OK\n"
 
-#: getopt-1.0.3b/getopt.c:229
+#: getopt-1.1.0a/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Provare con `getopt --help' per ulteriori informazioni.\n"
 
-#: getopt-1.0.3b/getopt.c:295
+#: getopt-1.1.0a/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "opzione lunga vuota dopo parametro -l o --long"
 
-#: getopt-1.0.3b/getopt.c:315
+#: getopt-1.1.0a/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "shell sconosciuta dopo parametro -s o --shell"
 
-#: getopt-1.0.3b/getopt.c:320
+#: getopt-1.1.0a/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Utilizzo: getopt optstring parametri\n"
 
-#: getopt-1.0.3b/getopt.c:321
+#: getopt-1.1.0a/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "      getopt [opzioni] [--] optstring parametri\n"
 
-#: getopt-1.0.3b/getopt.c:322
+#: getopt-1.1.0a/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "      getopt [opzioni] -o|--options optstring [opzioni] [--]\n"
 
-#: getopt-1.0.3b/getopt.c:323
+#: getopt-1.1.0a/getopt.c:327
 msgid "              parameters\n"
 msgstr "             parametri\n"
 
-#: getopt-1.0.3b/getopt.c:324
+#: getopt-1.1.0a/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            Consente le opzioni lunghe che iniziano con "
 "un singolo -\n"
 
-#: getopt-1.0.3b/getopt.c:325
+#: getopt-1.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Questa piccola guida all'utilizzo\n"
 
-#: getopt-1.0.3b/getopt.c:326
+#: getopt-1.1.0a/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   Opzioni lunghe da riconoscere\n"
 
-#: getopt-1.0.3b/getopt.c:327
+#: getopt-1.1.0a/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 "  -n, --name=progname          Il nome con il quale vengono riportati gli "
 "errori\n"
 
-#: getopt-1.0.3b/getopt.c:328
+#: getopt-1.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      Opzioni brevi da riconoscere\n"
 
-#: getopt-1.0.3b/getopt.c:329
+#: getopt-1.1.0a/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 "  -q, --quiet                  Disattiva errore riportato da getopt(3)\n"
 
-#: getopt-1.0.3b/getopt.c:330
+#: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Nessun output normale\n"
 
-#: getopt-1.0.3b/getopt.c:331
+#: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            Imposta la shell \n"
 
-#: getopt-1.0.3b/getopt.c:332
+#: getopt-1.1.0a/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Prova della versione getopt(1)\n"
 
-#: getopt-1.0.3b/getopt.c:333
+#: getopt-1.1.0a/getopt.c:337
+#, fuzzy
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -Q, --quiet-output           Nessun output normale\n"
+
+#: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                informazioni sulla versione di output\n"
 
-#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
 msgstr "argomento optstring mancante"
 
-#: getopt-1.0.3b/getopt.c:433
-msgid "getopt (enhanced) 1.0.3\n"
+#: getopt-1.1.0a/getopt.c:441
+#, fuzzy
+msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (avanzato) 1.0.3\n"
 
-#: getopt-1.0.3b/getopt.c:439
+#: getopt-1.1.0a/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "errore interno, contattare l'autore."
 
@@ -5331,70 +5424,70 @@ msgstr "after getopt loop\n"
 msgid "exiting parseargs\n"
 msgstr "exiting parseargs\n"
 
-#: login-utils/agetty.c:505
+#: login-utils/agetty.c:504
 msgid "entered parse_speeds\n"
 msgstr "entered parse_speeds\n"
 
-#: login-utils/agetty.c:508
+#: login-utils/agetty.c:507
 #, c-format
 msgid "bad speed: %s"
 msgstr "velocit� non valida: %s"
 
-#: login-utils/agetty.c:510
+#: login-utils/agetty.c:509
 msgid "too many alternate speeds"
 msgstr "troppe velocit� alternative"
 
-#: login-utils/agetty.c:512
+#: login-utils/agetty.c:511
 msgid "exiting parsespeeds\n"
 msgstr "uscita da parsespeeds\n"
 
-#: login-utils/agetty.c:587
+#: login-utils/agetty.c:584
 #, c-format
 msgid "%s: open for update: %m"
 msgstr "%s: apertura per l'aggiornamento: %m"
 
-#: login-utils/agetty.c:605
+#: login-utils/agetty.c:602
 #, c-format
 msgid "%s: no utmp entry"
 msgstr "%s: nessuna voce utmp"
 
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:631
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "/dev: chdir() non riuscito: %m"
 
-#: login-utils/agetty.c:638
+#: login-utils/agetty.c:635
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: non � un dispositivo di caratteri"
 
 #. ignore close(2) errors
-#: login-utils/agetty.c:645
+#: login-utils/agetty.c:642
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:644
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: impossibile l'apertura come input standard: %m"
 
-#: login-utils/agetty.c:657
+#: login-utils/agetty.c:654
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: non � aperto per lettura/scrittura"
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:661
+#: login-utils/agetty.c:658
 msgid "duping\n"
 msgstr "duping\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:663
+#: login-utils/agetty.c:660
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problema dup: %m"
 
-#: login-utils/agetty.c:733
+#: login-utils/agetty.c:730
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
@@ -5428,35 +5521,31 @@ msgstr ""
 "login_host] baud_rate,... linea [tipo terminale]\n"
 "o\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "baud_rate linea,... [tipo terminale]\n"
-"Utilizzo: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
-"login_host] baud_rate,... linea [tipo terminale]\n"
-"o\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
-"linea baud_rate,... [tipo terminale]\n"
 
-#: login-utils/checktty.c:46
+#: login-utils/checktty.c:41
 #, c-format
 msgid "badlogin: %s\n"
 msgstr "login non valida: %s\n"
 
-#: login-utils/checktty.c:52
+#: login-utils/checktty.c:47
 #, c-format
 msgid "sleepexit %d\n"
 msgstr "sleepexit %d\n"
 
-#: login-utils/checktty.c:108 login-utils/checktty.c:130
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
 msgstr "login: poca memoria, � possibile che il login non riesca\n"
 
-#: login-utils/checktty.c:109
+#: login-utils/checktty.c:104
 msgid "can't malloc for ttyclass"
 msgstr "malloc per ttyclass non possibile"
 
-#: login-utils/checktty.c:131
+#: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
 msgstr "malloc per grplist impossibile"
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:431
+#: login-utils/checktty.c:426
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login a %s da %s negato in base all'impostazione predefinita.\n"
@@ -5465,58 +5554,58 @@ msgstr "Login a %s da %s negato in base all'impostazione predefinita.\n"
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:442
+#: login-utils/checktty.c:437
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login a %s da %s negato.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:117
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: non si esiste (come utente %d).\n"
 
-#: login-utils/chfn.c:141 login-utils/chsh.c:124
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: utente \"%s\" non esiste.\n"
 
-#: login-utils/chfn.c:146 login-utils/chsh.c:129
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s: � possibile modificare solo le voci locali; utilizzare invece yp%s.\n"
 
-#: login-utils/chfn.c:158
+#: login-utils/chfn.c:145
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Modifica delle informazioni finger per %s in corso.\n"
 
-#: login-utils/chfn.c:164 login-utils/chfn.c:168 login-utils/chfn.c:175
-#: login-utils/chfn.c:179 login-utils/chsh.c:153 login-utils/chsh.c:157
-#: login-utils/chsh.c:164 login-utils/chsh.c:168
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
 msgid "Password error."
 msgstr "Errore password."
 
-#: login-utils/chfn.c:188 login-utils/chsh.c:177 login-utils/login.c:684
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:266 mount/lomount.c:221
+#: mount/lomount.c:227
 msgid "Password: "
 msgstr "Password: "
 
-#: login-utils/chfn.c:191 login-utils/chsh.c:180
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "Password non corretta."
 
-#: login-utils/chfn.c:202
+#: login-utils/chfn.c:189
 msgid "Finger information not changed.\n"
 msgstr "Le informazioni finger non sono state modificate.\n"
 
-#: login-utils/chfn.c:305
+#: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Utilizzo: %s [ -f nome intero ] [ -o ufficio ]"
 
-#: login-utils/chfn.c:306
+#: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -5524,11 +5613,11 @@ msgstr ""
 "[ -p tel. ufficio]\n"
 "\t[ -h tel. casa ] "
 
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:376 login-utils/chsh.c:293
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
 msgid ""
 "\n"
 "Aborted.\n"
@@ -5536,155 +5625,155 @@ msgstr ""
 "\n"
 "interrotto.\n"
 
-#: login-utils/chfn.c:409
+#: login-utils/chfn.c:398
 msgid "field is too long.\n"
 msgstr "il campo � troppo lungo.\n"
 
-#: login-utils/chfn.c:417
+#: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' non � consentito.\n"
 
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
 msgstr "Non sono ammessi i caratteri di controllo.\n"
 
-#: login-utils/chfn.c:487
+#: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 "Le informazioni finger *NON* sono state modificate. Riprovare "
 "successivamente.\n"
 
-#: login-utils/chfn.c:490
+#: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
 msgstr "Le informazioni finger sono state modificate.\n"
 
-#: login-utils/chfn.c:504 login-utils/chsh.c:411 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
 msgid "malloc failed"
 msgstr "malloc non riuscita"
 
-#: login-utils/chsh.c:140
+#: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr "%s: la shell non � in /etc/shells, modifica shell negata\n"
 
-#: login-utils/chsh.c:147
+#: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Modifica shell per %s in corso.\n"
 
-#: login-utils/chsh.c:188
+#: login-utils/chsh.c:178
 msgid "New shell"
 msgstr "Nuova shell"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
 msgstr "Shell non modificata.\n"
 
-#: login-utils/chsh.c:202
+#: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell *NON* modificata.  Riprovare successivamente.\n"
 
-#: login-utils/chsh.c:205
+#: login-utils/chsh.c:195
 msgid "Shell changed.\n"
 msgstr "Shell modificata.\n"
 
-#: login-utils/chsh.c:273
+#: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
 msgstr "Utilizzo: %s [ -s shell ]"
 
-#: login-utils/chsh.c:274
+#: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:275
+#: login-utils/chsh.c:265
 msgid "       [ username ]\n"
 msgstr "       [ nome utente ]\n"
 
-#: login-utils/chsh.c:319
+#: login-utils/chsh.c:309
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: la shell deve essere un nome percorso completo.\n"
 
-#: login-utils/chsh.c:323
+#: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" non esiste.\n"
 
-#: login-utils/chsh.c:327
+#: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" non eseguibile.\n"
 
-#: login-utils/chsh.c:334
+#: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' non � consentito.\n"
 
-#: login-utils/chsh.c:338
+#: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Non sono ammessi i caratteri di controllo.\n"
 
-#: login-utils/chsh.c:345
+#: login-utils/chsh.c:335
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Attenzione: \"%s\" non � elencato in /etc/shells\n"
 
-#: login-utils/chsh.c:347
+#: login-utils/chsh.c:337
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" non � elencato in /etc/shells.\n"
 
-#: login-utils/chsh.c:349
+#: login-utils/chsh.c:339
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: utilizzo opzione -l per consultare l'elenco\n"
 
-#: login-utils/chsh.c:355
+#: login-utils/chsh.c:345
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Attenzione: \"%s\" non � elencato in /etc/shells.\n"
 
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:346
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Utilizzare %s -l per consultare l'elenco.\n"
 
-#: login-utils/chsh.c:377
+#: login-utils/chsh.c:367
 msgid "No known shells.\n"
 msgstr "Nessuna shell conosciuta.\n"
 
-#: login-utils/cryptocard.c:70
+#: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
 msgstr " impossibile aprire /dev/urandom"
 
-#: login-utils/cryptocard.c:75
+#: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
 msgstr "impossibile leggere dati random da /dev/urandom"
 
-#: login-utils/cryptocard.c:98
+#: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
 msgstr "impossibile aprire %s in lettura"
 
-#: login-utils/cryptocard.c:102
+#: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
 msgstr "impossibile eseguire stat(%s)"
 
-#: login-utils/cryptocard.c:108
+#: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
 msgstr "%s non ha i filemode corretti"
 
-#: login-utils/cryptocard.c:113
+#: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
 msgstr "impossibile leggere i dati da %s"
 
-#: login-utils/islocal.c:36
+#: login-utils/islocal.c:37
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "Impossibile leggere %s, uscita in corso."
@@ -5715,7 +5804,7 @@ msgid "last: gethostname"
 msgstr "last: gethostname"
 
 #: login-utils/last.c:469
-#, c-format
+#, c-format, ycp-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
@@ -5723,37 +5812,40 @@ msgstr ""
 "\n"
 "interrotto %10.10s %5.5s \n"
 
-#: login-utils/login.c:377
+#: login-utils/login.c:373
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h solamente per super-user.\n"
 
-#: login-utils/login.c:402
+#: login-utils/login.c:398
 msgid "usage: login [-fp] [username]\n"
 msgstr "utilizzo: login [-fp] [nomeutente]\n"
 
-#: login-utils/login.c:504
+#: login-utils/login.c:501
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "logine: errore PAM, interruzione in corso: %s\n"
 
-#: login-utils/login.c:506
+#: login-utils/login.c:503
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Impossibile inizializzare PAM: %s"
 
-#. Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. so that the "login: " prompt gets localized. Unfortunately,
-#. PAM doesn't have an interface to specify the "Password: " string (yet).
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
 #: login-utils/login.c:519
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:552
+#: login-utils/login.c:553
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FALLITA LOGIN %d DA %s PER %s, %s"
 
-#: login-utils/login.c:554
+#: login-utils/login.c:555
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -5761,17 +5853,17 @@ msgstr ""
 "Login non corretto\n"
 "\n"
 
-#: login-utils/login.c:563
+#: login-utils/login.c:564
 #, 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:567
+#: login-utils/login.c:568
 #, 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:570
+#: login-utils/login.c:571
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -5779,30 +5871,30 @@ msgstr ""
 "\n"
 "Login  non corretto\n"
 
-#: login-utils/login.c:619
+#: login-utils/login.c:620
 msgid "Illegal username"
 msgstr "Nome utente non valido"
 
-#: login-utils/login.c:662
+#: login-utils/login.c:663
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s login rifiutato su questo terminale.\n"
 
-#: login-utils/login.c:667
+#: login-utils/login.c:668
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO DA %s SU TTY %s"
 
-#: login-utils/login.c:671
+#: login-utils/login.c:672
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "LOGIN %s RIFIUTATO SU TTY %s"
 
-#: login-utils/login.c:723
+#: login-utils/login.c:725
 msgid "Login incorrect\n"
 msgstr "Login non corretto\n"
 
-#: login-utils/login.c:745
+#: login-utils/login.c:747
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5810,100 +5902,100 @@ msgstr ""
 "Troppi utenti gi� collegati.\n"
 "Riprovare successivamente.\n"
 
-#: login-utils/login.c:749
+#: login-utils/login.c:751
 msgid "You have too many processes running.\n"
 msgstr "Ci sono troppi processi in esecuzione.\n"
 
-#: login-utils/login.c:795
+#: login-utils/login.c:797
 msgid "Warning: no Kerberos tickets issued\n"
 msgstr "Attenzione: non sono stati emessi i ticket di Kerberos\n"
 
-#: login-utils/login.c:807
+#: login-utils/login.c:809
 msgid "Sorry -- your password has expired.\n"
 msgstr "La password � scaduta.\n"
 
-#: login-utils/login.c:813
+#: login-utils/login.c:815
 #, c-format
-msgid "Warning: your password expires on %s %d, %d\n"
-msgstr "Attenzione: la password scade in data %s %d, %d\n"
+msgid "Warning: your password expires on %d %s %d.\n"
+msgstr "Attenzione: la password scade in data %d %s %d.\n"
 
-#: login-utils/login.c:821
+#: login-utils/login.c:823
 msgid "Sorry -- your account has expired.\n"
 msgstr "L'account � scaduto.\n"
 
-#: login-utils/login.c:827
+#: login-utils/login.c:829
 #, c-format
-msgid "Warning: your account expires on %s %d, %d\n"
-msgstr "Attenzione: l'account scade in data %s %d, %d\n"
+msgid "Warning: your account expires on %d %s %d.\n"
+msgstr "Attenzione: l'account scade in data %d %s %d.\n"
 
-#: login-utils/login.c:1061
+#: login-utils/login.c:1066
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr " CONNESSIONE DI ACCESSO REMOTO A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1068
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN DI ROOT A %s DA %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1076
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN DI ROOT A %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN A %s ATTRAVERSO %s DA %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1082
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN A %s ATTRAVERSO %s"
 
-#: login-utils/login.c:1089
+#: login-utils/login.c:1094
 #, c-format
 msgid "You have %smail.\n"
 msgstr "C'� %sposta.\n"
 
-#: login-utils/login.c:1090
+#: login-utils/login.c:1095
 msgid "new "
 msgstr "nuovo "
 
 #. error in fork()
-#: login-utils/login.c:1108
+#: login-utils/login.c:1113
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: errore in esecuzione forking: %s"
 
-#: login-utils/login.c:1123
+#: login-utils/login.c:1128
 msgid "setuid() failed"
 msgstr "setuid() non riuscito"
 
-#: login-utils/login.c:1129
+#: login-utils/login.c:1134
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Nessuna directory %s!\n"
 
-#: login-utils/login.c:1133
+#: login-utils/login.c:1138
 msgid "Logging in with home = \"/\".\n"
 msgstr "Connessione con home = \"/\".\n"
 
-#: login-utils/login.c:1141
+#: login-utils/login.c:1146
 msgid "login: no memory for shell script.\n"
 msgstr "login: nessuna memoria per lo script shell.\n"
 
-#: login-utils/login.c:1169
+#: login-utils/login.c:1174
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: exec dello script shell impossibile: %s.\n"
 
-#: login-utils/login.c:1172
+#: login-utils/login.c:1177
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: nessuna shell: %s.\n"
 
-#: login-utils/login.c:1188
+#: login-utils/login.c:1191
 #, c-format
 msgid ""
 "\n"
@@ -5912,62 +6004,62 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: login-utils/login.c:1199
+#: login-utils/login.c:1202
 msgid "login name much too long.\n"
 msgstr "il nome di login � troppo lungo.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1203
 msgid "NAME too long"
 msgstr "NOME troppo lungo"
 
-#: login-utils/login.c:1207
+#: login-utils/login.c:1210
 msgid "login names may not start with '-'.\n"
 msgstr "I nomi di login non possono iniziare con'-'.\n"
 
-#: login-utils/login.c:1217
+#: login-utils/login.c:1220
 msgid "too many bare linefeeds.\n"
 msgstr "troppi linefeed vuoti.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1221
 msgid "EXCESSIVE linefeeds"
 msgstr "Linefeed ECCESSIVI"
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1231
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Login scaduto dopo %d secondi\n"
 
-#: login-utils/login.c:1329
+#: login-utils/login.c:1325
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Ultimo login: %.*s "
 
-#: login-utils/login.c:1333
+#: login-utils/login.c:1329
 #, c-format
 msgid "from %.*s\n"
 msgstr "da %.*s\n"
 
-#: login-utils/login.c:1336
+#: login-utils/login.c:1332
 #, c-format
 msgid "on %.*s\n"
 msgstr "su %.*s\n"
 
-#: login-utils/login.c:1359
+#: login-utils/login.c:1355
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ERRORE DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1362
+#: login-utils/login.c:1358
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ERRORE DI LOGIN SU %s, %s"
 
-#: login-utils/login.c:1366
+#: login-utils/login.c:1362
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ERRORI DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1369
+#: login-utils/login.c:1365
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ERRORI DI LOGIN SU %s, %s"
@@ -6008,183 +6100,183 @@ msgstr "newgrp: setuid"
 msgid "No shell"
 msgstr "Nessuna shell"
 
-#: login-utils/passwd.c:161
+#: login-utils/passwd.c:159
 msgid "The password must have at least 6 characters, try again.\n"
 msgstr "La password deve avere almeno 6 caratteri, riprovare.\n"
 
-#: login-utils/passwd.c:174
+#: login-utils/passwd.c:172
 msgid "The password must contain characters out of two of the following\n"
 msgstr "La password deve contenere caratteri delle due seguenti\n"
 
-#: login-utils/passwd.c:175
+#: login-utils/passwd.c:173
 msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
 msgstr ""
 "classi:  lettere maiuscole minuscole, cifre e caratteri non alfanumerici.\n"
 
-#: login-utils/passwd.c:176
+#: login-utils/passwd.c:174
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "Consultare passwd(1) per ulteriori informazioni.\n"
 
-#: login-utils/passwd.c:181
+#: login-utils/passwd.c:179
 msgid "You cannot reuse the old password.\n"
 msgstr "Impossibile riutilizzare la vecchia password.\n"
 
-#: login-utils/passwd.c:186
+#: login-utils/passwd.c:184
 msgid "Please don't use something like your username as password!\n"
 msgstr ""
 "Non utilizzare come password qualcosa che assomigli al proprio nome utente!\n"
 
-#: login-utils/passwd.c:197 login-utils/passwd.c:204
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
 msgid "Please don't use something like your realname as password!\n"
 msgstr ""
 "Non utilizzare come password qualcosa che assomigli al proprio vero nome!\n"
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:220
 msgid "Usage: passwd [username [password]]\n"
 msgstr "Utilizzo: passwd [nome utente [password]]\n"
 
-#: login-utils/passwd.c:222
+#: login-utils/passwd.c:221
 msgid "Only root may use the one and two argument forms.\n"
 msgstr "Solo root pu� utilizzare le forme a uno e due argomenti\n"
 
-#: login-utils/passwd.c:278
+#: login-utils/passwd.c:275
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "Utilizzo: passwd [-foqsvV] [utente [password]]\n"
 
-#: login-utils/passwd.c:299
+#: login-utils/passwd.c:296
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "Exec %s impossibile: %s\n"
 
-#: login-utils/passwd.c:310
+#: login-utils/passwd.c:307
 msgid "Cannot find login name"
 msgstr "Impossibile trovare il nome di login"
 
-#: login-utils/passwd.c:317 login-utils/passwd.c:324
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
 msgid "Only root can change the password for others.\n"
 msgstr "Solo root pu� modificare la password per gli altri.\n"
 
-#: login-utils/passwd.c:332
+#: login-utils/passwd.c:329
 msgid "Too many arguments.\n"
 msgstr "Troppi argomenti.\n"
 
-#: login-utils/passwd.c:337
+#: login-utils/passwd.c:334
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
 msgstr "Impossibile trovare il nome utente.`%s' � davvero un utente?"
 
-#: login-utils/passwd.c:341
+#: login-utils/passwd.c:338
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr "Posso modificare solo le password locali. Utilizzare invece yppasswd."
 
-#: login-utils/passwd.c:347
+#: login-utils/passwd.c:344
 msgid "UID and username does not match, imposter!"
 msgstr "UID e nome utente non combaciano, impostore!"
 
-#: login-utils/passwd.c:352
+#: login-utils/passwd.c:349
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "Modifica password per %s\n"
 
-#: login-utils/passwd.c:356
+#: login-utils/passwd.c:353
 msgid "Enter old password: "
 msgstr "Immettere vecchia password: "
 
-#: login-utils/passwd.c:358
+#: login-utils/passwd.c:355
 msgid "Illegal password, imposter."
 msgstr "Password non valida, impostore."
 
-#: login-utils/passwd.c:370
+#: login-utils/passwd.c:367
 msgid "Enter new password: "
 msgstr "Immettere la nuova password: "
 
-#: login-utils/passwd.c:372
+#: login-utils/passwd.c:369
 msgid "Password not changed."
 msgstr "Password non modificata."
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:379
 msgid "Re-type new password: "
 msgstr "Ridigitare la nuova password: "
 
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:382
 msgid "You misspelled it. Password not changed."
 msgstr "Ortografia sbagliata. La password non � stata modificata."
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:397
 #, c-format
 msgid "password changed, user %s"
 msgstr "password modificata, utente %s"
 
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:400
 msgid "ROOT PASSWORD CHANGED"
 msgstr "PASSWORD ROOT MODIFICATA"
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:402
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "password modificata da root, utente %s"
 
-#: login-utils/passwd.c:412
+#: login-utils/passwd.c:409
 msgid "calling setpwnam to set password.\n"
 msgstr "chiamata di setpwnam per impostare la password.\n"
 
-#: login-utils/passwd.c:416
+#: login-utils/passwd.c:413
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "Password *NON* modificata. Riprovare successivamente.\n"
 
-#: login-utils/passwd.c:422
+#: login-utils/passwd.c:419
 msgid "Password changed.\n"
 msgstr "Password modificata.\n"
 
-#: login-utils/shutdown.c:85
+#: login-utils/shutdown.c:87
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 msgstr "Utilizzo: spegnimento [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 
-#: login-utils/shutdown.c:103
+#: login-utils/shutdown.c:105
 msgid "Shutdown process aborted"
 msgstr "Processo di spegnimento interrotto"
 
-#: login-utils/shutdown.c:125
+#: login-utils/shutdown.c:131
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
 msgstr "%s: solamente root pu� spegnere un sistema.\n"
 
-#: login-utils/shutdown.c:219
+#: login-utils/shutdown.c:225
 msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr "Verr� effettuato domani, non � possibile attendere fino ad allora?\n"
 
-#: login-utils/shutdown.c:271
+#: login-utils/shutdown.c:277
 msgid "for maintenance; bounce, bounce"
 msgstr "per manutenzione; bounce,bounce"
 
-#: login-utils/shutdown.c:275
+#: login-utils/shutdown.c:281
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr " timeout = %d, quiet = %d, reboot = %d\n"
 
-#: login-utils/shutdown.c:300
+#: login-utils/shutdown.c:306
 msgid "The system is being shut down within 5 minutes"
 msgstr "Il sistema verr� spento entro 5 minuti"
 
-#: login-utils/shutdown.c:304
+#: login-utils/shutdown.c:310
 msgid "Login is therefore prohibited."
 msgstr "� perci� proibito effettuare il login."
 
-#: login-utils/shutdown.c:325
+#: login-utils/shutdown.c:331
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%s attraverso %s: %s"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "rebooted"
 msgstr "riavviato"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "halted"
 msgstr "arrestato"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:377
+#: login-utils/shutdown.c:387
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
@@ -6192,7 +6284,7 @@ msgstr ""
 "\n"
 "perch� sono ancora attivo dopo il riavvio?"
 
-#: login-utils/shutdown.c:379
+#: login-utils/shutdown.c:389
 msgid ""
 "\n"
 "Now you can turn off the power..."
@@ -6200,96 +6292,101 @@ msgstr ""
 "\n"
 "Ora � possibile togliere l'alimentazione elettrica..."
 
-#: login-utils/shutdown.c:394
+#: login-utils/shutdown.c:404
 msgid "Calling kernel power-off facility...\n"
 msgstr "Chiamata della funzionalit� di spegnimento del kernel...\n"
 
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:407
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "Errore durante lo spegnimento\t%s\n"
 
-#: login-utils/shutdown.c:405
+#: login-utils/shutdown.c:415
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "Esecuzione del programma \"%s\" in corso...\n"
 
-#: login-utils/shutdown.c:408
+#: login-utils/shutdown.c:418
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "Errore durante l'esecuzione di\t%s\n"
 
-#: login-utils/shutdown.c:431
+#: login-utils/shutdown.c:441
 #, c-format
 msgid "URGENT: broadcast message from %s:"
 msgstr "URGENTE: messaggio broadcast da %s:"
 
-#: login-utils/shutdown.c:437
+#: login-utils/shutdown.c:447
 msgid "System going down IMMEDIATELY!\n"
 msgstr "Il sistema si spegner� IMMEDIATAMENTE!\n"
 
-#: login-utils/shutdown.c:440
+#: login-utils/shutdown.c:450
 #, c-format
 msgid "System going down in %d hour%s %d minutes"
 msgstr "Il sistema si spegner� tra %d ora/e%s %d minuti"
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
 msgid "s"
 msgstr "s"
 
-#: login-utils/shutdown.c:443
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "System going down in %d minute%s\n"
 msgstr "Il sistema si spegner� in %d minuti%s\n"
 
-#: login-utils/shutdown.c:449
+#: login-utils/shutdown.c:459
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:506
+#: login-utils/shutdown.c:516
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "Esecuzione del fork per swapoff impossibile.Pazienza!"
 
-#: login-utils/shutdown.c:514
+#: login-utils/shutdown.c:524
 msgid "Cannot exec swapoff, hoping umount will do the trick."
 msgstr "Exec swapoff impossibile, sperando che umount ce la faccia."
 
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:543
 msgid "Cannot fork for umount, trying manually."
 msgstr "impossibile eseguire il fork per umount, provare manualmente."
 
-#: login-utils/shutdown.c:542
+#: login-utils/shutdown.c:552
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr "Exec %s impossibile, tentativo di utilizzo di umount.\n"
 
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:556
 msgid "Cannot exec umount, giving up on umount."
 msgstr "Exec umount impossibile, termina utilizzo di umount."
 
-#: login-utils/shutdown.c:551
+#: login-utils/shutdown.c:561
 msgid "Unmounting any remaining filesystems..."
 msgstr "Smontaggio in corso di qualsiasi filesystem rimanente..."
 
-#: login-utils/shutdown.c:587
-#, c-format
-msgid "shutdown: Couldn't umount %s\n"
+#: login-utils/shutdown.c:595
+#, fuzzy, c-format
+msgid "shutdown: Couldn't umount %s: %s\n"
 msgstr "spegnimento: impossibile eseguire umount di %s\n"
 
-#: login-utils/simpleinit.c:79
+#: login-utils/simpleinit.c:109
 msgid "Booting to single user mode.\n"
 msgstr "Avvio in modalit� singolo utente.\n"
 
-#: login-utils/simpleinit.c:83
+#: login-utils/simpleinit.c:113
 msgid "exec of single user shell failed\n"
 msgstr " exec di una shell per singolo utente non riuscita\n"
 
-#: login-utils/simpleinit.c:87
+#: login-utils/simpleinit.c:117
 msgid "fork of single user shell failed\n"
 msgstr "fork di una shell per singolo utente non riuscito\n"
 
-#: login-utils/simpleinit.c:226
+#: login-utils/simpleinit.c:166
+#, fuzzy
+msgid "error opening fifo\n"
+msgstr "Errore durante lo spegnimento\t%s\n"
+
+#: login-utils/simpleinit.c:271
 msgid ""
 "\n"
 "Wrong password.\n"
@@ -6297,34 +6394,36 @@ msgstr ""
 "\n"
 "password errata.\n"
 
-#: login-utils/simpleinit.c:252
-msgid "exec rc failed\n"
-msgstr " exec di rc non riuscito\n"
+#: login-utils/simpleinit.c:341
+#, fuzzy
+msgid "stat of path failed\n"
+msgstr " settimeofday() non riuscito"
 
-#: login-utils/simpleinit.c:255
-msgid "open of rc file failed\n"
+#: login-utils/simpleinit.c:348
+#, fuzzy
+msgid "open of directory failed\n"
 msgstr "apertura file rc non riuscita\n"
 
-#: login-utils/simpleinit.c:261
-msgid "fork of rc shell failed\n"
-msgstr "fork della shell rc non riuscita\n"
-
-#: login-utils/simpleinit.c:273
+#: login-utils/simpleinit.c:415
 msgid "fork failed\n"
 msgstr "fork non riuscito\n"
 
-#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+#: login-utils/simpleinit.c:445 text-utils/more.c:1541
 msgid "exec failed\n"
 msgstr "exec fallita\n"
 
-#: login-utils/simpleinit.c:324
+#: login-utils/simpleinit.c:469
 msgid "cannot open inittab\n"
 msgstr "impossibile aprire inittab\n"
 
-#: login-utils/simpleinit.c:362
+#: login-utils/simpleinit.c:529
 msgid "no TERM or cannot stat tty\n"
 msgstr "TERM non definito o impossibile eseguire stat sul tty\n"
 
+#: login-utils/simpleinit.c:753 login-utils/simpleinit.c:854
+msgid "error running programme\n"
+msgstr ""
+
 #: login-utils/ttymsg.c:81
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr "troppi iov's (modificare codice in wall/ttymsg.c)"
@@ -6347,39 +6446,39 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: BRUTTO ERRORE"
 
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:145
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s: il file %s � occupato.\n"
 
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: il file %s � occupato (%s presente)\n"
 
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:167
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: impossibile collegare %s: %s\n"
 
-#: login-utils/vipw.c:193
+#: login-utils/vipw.c:188
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: impossibile sbloccare %s: %s (le modifiche effettuate sono ancora in "
 "%s)\n"
 
-#: login-utils/vipw.c:217
+#: login-utils/vipw.c:211
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: impossibile effettuare il fork\n"
 
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:251
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s immutato\n"
 
-#: login-utils/vipw.c:300
+#: login-utils/vipw.c:294
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: nessuna modifica effettuata\n"
@@ -6414,76 +6513,76 @@ msgstr "%s: impossibile eseguire lo 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:189
+#: misc-utils/cal.c:186
 msgid "illegal month value: use 1-12"
 msgstr "valore mese non valido: utilizzarne uno da 1 a 12"
 
-#: misc-utils/cal.c:193
+#: misc-utils/cal.c:190
 msgid "illegal year value: use 1-9999"
 msgstr "valore anno non valido: utilizzarne uno da 1 da 9999"
 
-#: misc-utils/cal.c:489
+#: misc-utils/cal.c:486
 msgid "usage: cal [-mjyV] [[month] year]\n"
 msgstr "utilizzo: cal [-mjyV] [[mese] anno]\n"
 
-#: misc-utils/ddate.c:192
+#: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr " utilizzo: %s [+formato] [giorno mese anno]\n"
 
 #. handle St. Tib's Day
-#: misc-utils/ddate.c:238
+#: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
 msgstr "Giorno di S.Tiberio"
 
-#: misc-utils/kill.c:209
+#: misc-utils/kill.c:210
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: segnale sconosciuto %s\n"
 
-#: misc-utils/kill.c:271
+#: misc-utils/kill.c:272
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr "%s: impossibile trovare il processo \"%s\"\n"
 
-#: misc-utils/kill.c:315
+#: misc-utils/kill.c:316
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: segnale sconosciuto %s; segnali validi:\n"
 
-#: misc-utils/kill.c:355
+#: misc-utils/kill.c:356
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "utilizzo: %s [ -s signal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:356
+#: misc-utils/kill.c:357
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ signal ]\n"
 
-#: misc-utils/logger.c:144
+#: misc-utils/logger.c:139
 #, c-format
 msgid "logger: %s: %s.\n"
 msgstr "logger: %s: %s.\n"
 
-#: misc-utils/logger.c:248
+#: misc-utils/logger.c:243
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr "logger: nome funzionalit� sconosciuto: %s.\n"
 
-#: misc-utils/logger.c:260
+#: misc-utils/logger.c:255
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr "logger: nome priorit� sconosciuto: %s.\n"
 
-#: misc-utils/logger.c:287
+#: misc-utils/logger.c:282
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 "utilizzo: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ messaggio "
 ".. ]\n"
 
-#: misc-utils/look.c:336
+#: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr " utilizzo: look [-dfa] [-t char] stringa [file]\n"
 
@@ -6497,62 +6596,63 @@ msgstr "Impossibile aprire %s\n"
 msgid "Got %d bytes from %s\n"
 msgstr "Ottenuti %d byte da %s\n"
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:100
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr "namei: impossibile ottenere la directory corrente - %s\n"
 
-#: misc-utils/namei.c:118
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr "namei: impossibile eseguire chdir su %s - %s (%d)\n"
 
-#: misc-utils/namei.c:128
+#: misc-utils/namei.c:120
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr "utilizzo: namei [-mx] nome percorso [nome percorso ...]\n"
 
-#: misc-utils/namei.c:157
+#: misc-utils/namei.c:145
 msgid "namei: could not chdir to root!\n"
 msgstr "namei: impossibile eseguire chdir su directory root!\n"
 
-#: misc-utils/namei.c:164
+#: misc-utils/namei.c:152
 msgid "namei: could not stat root!\n"
 msgstr "namei: impossibile eseguire stat della directory root!\n"
 
-#: misc-utils/namei.c:219
+#: misc-utils/namei.c:207
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr " ? impossibile eseguire chdir in %s - %s (%d)\n"
 
-#: misc-utils/namei.c:248
+#: misc-utils/namei.c:236
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr " ? problemi nella lettura del link simbolico %s - %s (%d)\n"
 
-#: misc-utils/namei.c:258
+#: misc-utils/namei.c:246
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr "  *** SUPERATO IL LIMITE UNIX DI LINK SIMBOLICI ***\n"
 
-#: misc-utils/namei.c:295
+#: misc-utils/namei.c:283
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei: tipo file sconosciuto 0%06o su file %s\n"
 
-#: misc-utils/script.c:109
-msgid "usage: script [-a] [file]\n"
+#: misc-utils/script.c:118
+#, fuzzy
+msgid "usage: script [-a] [-f] [file]\n"
 msgstr " utilizzo: script [-a] [file]\n"
 
-#: misc-utils/script.c:129
+#: misc-utils/script.c:139
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniziato, il file � %s\n"
 
-#: misc-utils/script.c:198
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniziato su %s"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:269
 #, c-format
 msgid ""
 "\n"
@@ -6561,288 +6661,288 @@ msgstr ""
 "\n"
 "Script effettuato su %s"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script effettuato, il file � %s\n"
 
-#: misc-utils/script.c:281
+#: misc-utils/script.c:288
 msgid "openpty failed\n"
 msgstr "openpty non riuscita\n"
 
-#: misc-utils/script.c:315
+#: misc-utils/script.c:322
 msgid "Out of pty's\n"
 msgstr "esauriti tutti i pty disponibili\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:713
+#: misc-utils/setterm.c:743
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: argomento errato, utilizzo\n"
 
-#: misc-utils/setterm.c:716
+#: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term terminal_name ]\n"
 
-#: misc-utils/setterm.c:717
+#: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:718
+#: misc-utils/setterm.c:748
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:719
+#: misc-utils/setterm.c:749
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:721
+#: misc-utils/setterm.c:751
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:722
+#: misc-utils/setterm.c:752
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:724
+#: misc-utils/setterm.c:754
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:725
+#: misc-utils/setterm.c:755
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:726
+#: misc-utils/setterm.c:756
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:727
+#: misc-utils/setterm.c:757
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:728
+#: misc-utils/setterm.c:758
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:730
+#: misc-utils/setterm.c:760
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:732
+#: misc-utils/setterm.c:762
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
-#: misc-utils/setterm.c:739
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:734
+#: misc-utils/setterm.c:764
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:736
+#: misc-utils/setterm.c:766
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:738
+#: misc-utils/setterm.c:768
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:741
+#: misc-utils/setterm.c:771
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:773
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:774
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:775
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:776
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:777
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:778
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:779
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:780
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:781
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:782
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:784
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLE] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file dumpfilename ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:789
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:790
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:791
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:792
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:793
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:831
+#: misc-utils/setterm.c:862
 msgid "snow.on"
 msgstr " snow.on"
 
-#: misc-utils/setterm.c:833
+#: misc-utils/setterm.c:864
 msgid "snow.off"
 msgstr " snow.off"
 
-#: misc-utils/setterm.c:839
+#: misc-utils/setterm.c:870
 msgid "softscroll.on"
 msgstr " softscroll.on"
 
-#: misc-utils/setterm.c:841
+#: misc-utils/setterm.c:872
 msgid "softscroll.off"
 msgstr " softscroll.off"
 
-#: misc-utils/setterm.c:1016
+#: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr " impossibile (dis)impostare la modalit� risparmio energetico\n"
 
-#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "errore klogctl : %s\n"
 
-#: misc-utils/setterm.c:1104
+#: misc-utils/setterm.c:1133
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Errore durante la lettura di %s\n"
 
-#: misc-utils/setterm.c:1119
+#: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
 msgstr "Errore in scrittura screendump\n"
 
-#: misc-utils/setterm.c:1133
+#: misc-utils/setterm.c:1162
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "impossibile leggere %s  e impossibile eseguire ioctl sul dump\n"
 
-#: misc-utils/setterm.c:1198
+#: misc-utils/setterm.c:1227
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM non � definito.\n"
 
-#: misc-utils/tsort.c:120
+#: misc-utils/tsort.c:117
 msgid "usage: tsort [ inputfile ]\n"
 msgstr "utilizzo: tsort [ inputfile ]\n"
 
-#: misc-utils/tsort.c:157
+#: misc-utils/tsort.c:154
 msgid "tsort: odd data count.\n"
 msgstr "tsort: conteggio dati strano.\n"
 
-#: misc-utils/tsort.c:320
+#: misc-utils/tsort.c:305
 msgid "tsort: cycle in data.\n"
 msgstr "tsort: ciclo nei dati.\n"
 
-#: misc-utils/tsort.c:333
+#: misc-utils/tsort.c:318
 msgid "tsort: internal error -- could not find cycle.\n"
 msgstr "tsort: errore interno - impossibile trovare il ciclo.\n"
 
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:155
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nome...\n"
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:100
 msgid "write: can't find your tty's name\n"
 msgstr "write: impossibile trovare il nome di tty\n"
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:111
 msgid "write: you have write permission turned off.\n"
 msgstr "write: l'autorizzazione per la scrittura � disattivata.\n"
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:132
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr "write: %s non � collegato a %s.\n"
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:140
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr "write: %s ha i messaggi disattivati su %s\n"
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:147
 msgid "usage: write user [tty]\n"
 msgstr "utilizzo: write user [tty]\n"
 
-#: misc-utils/write.c:245
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write: %s non � collegato\n"
 
-#: misc-utils/write.c:254
+#: misc-utils/write.c:255
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr "write: %s ha i messaggi disattivati\n"
 
-#: misc-utils/write.c:258
+#: misc-utils/write.c:259
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr "write: %s � collegato pi� di una volta; scrittura su %s in corso\n"
 
-#: misc-utils/write.c:325
+#: misc-utils/write.c:323
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Messaggio da %s@%s su %s a %s ..."
@@ -6864,43 +6964,44 @@ msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system? Filesystem full?
-#: mount/fstab.c:375
+#. Too many files open in the system?
+#. Filesystem full?
+#: mount/fstab.c:376
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 "impossibile creare un file di blocco %s: %s (utilizzare il flag -n per "
 "tralasciare)"
 
-#: mount/fstab.c:387
+#: mount/fstab.c:388
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 "impossibile collegare il file di blocco %s: %s  (utilizzare il flag -n per "
 "tralasciare)"
 
-#: mount/fstab.c:399
+#: mount/fstab.c:400
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 "impossibile aprire il file di blocco %s: %s (utilizzare flag -n per "
 "tralasciare)"
 
-#: mount/fstab.c:414
+#: mount/fstab.c:415
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Impossibile bloccare il file di blocco %s: %s\n"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:428
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Impossibile bloccare il file di blocco %s: %s"
 
-#: mount/fstab.c:429
+#: mount/fstab.c:430
 msgid "timed out"
 msgstr "scaduto"
 
-#: mount/fstab.c:436
+#: mount/fstab.c:437
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -6909,34 +7010,34 @@ msgstr ""
 "Impossibile creare il collegamento %s\n"
 "Forse c'� un vecchio file di blocco?\n"
 
-#: mount/fstab.c:482 mount/fstab.c:490
+#: mount/fstab.c:483 mount/fstab.c:491
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "impossibile aprire %s (%s) - mtab non aggiornato"
 
-#: mount/fstab.c:515
+#: mount/fstab.c:519
 msgid "mount: warning: cannot change mounted device with a remount\n"
 msgstr ""
 "mount: attenzione: impossibile modificare il device montato con un "
 "rimontaggio\n"
 
-#: mount/fstab.c:520
+#: mount/fstab.c:524
 msgid "mount: warning: cannot change filesystem type with a remount\n"
 msgstr ""
 "mount: attenzione: impossibile modificare il tipo di filesystem con un "
 "rimontaggio\n"
 
-#: mount/fstab.c:528 mount/fstab.c:534
+#: mount/fstab.c:533 mount/fstab.c:539
 #, c-format
 msgid "error writing %s: %s"
 msgstr "errore durante la scrittura di %s: %s"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:546
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "errore durante il cambiamento della modalit� di %s: %s\n"
 
-#: mount/fstab.c:548
+#: mount/fstab.c:553
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "impossibile rinominare %s in %s: %s\n"
@@ -6951,16 +7052,16 @@ msgstr "loop: impossibile aprire il device %s: %s\n"
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
 
-#: mount/lomount.c:89 mount/losetup.c:74
+#: mount/lomount.c:89
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 msgstr "%s: [%04x]:%ld (%s) offset %d, criptazione %s\n"
 
-#: mount/lomount.c:143
+#: mount/lomount.c:148
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: impossibile trovare un qualsiasi device /dev/loop#"
 
-#: mount/lomount.c:147
+#: mount/lomount.c:152
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -6968,7 +7069,7 @@ msgstr ""
 "mount: impossibile trovare qualsiasi loop device.\n"
 "       Forse /dev/loop# ha un major number errato?"
 
-#: mount/lomount.c:151
+#: mount/lomount.c:156
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -6979,7 +7080,7 @@ msgstr ""
 "       questo kernel non � a conoscenza del loop device\n"
 "       (se � questo il caso, ricompilare o `insmod loop.o'.)"
 
-#: mount/lomount.c:156
+#: mount/lomount.c:162
 msgid ""
 "mount: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
@@ -6989,53 +7090,53 @@ msgstr ""
 "       non � a conoscenza del loop device (allora ricompilare o \n"
 "       `insmod loop.o'), o forse /dev/loop# ha il major number errato?"
 
-#: mount/lomount.c:160
+#: mount/lomount.c:166
 msgid "mount: could not find any free loop device"
 msgstr "mount: impossibile trovare un qualsiasi loop device libero"
 
-#: mount/lomount.c:191 mount/losetup.c:106
+#: mount/lomount.c:197
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Tipo di criptazione non supportata %s\n"
 
-#: mount/lomount.c:210 mount/losetup.c:126
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr ""
+
+#: mount/lomount.c:231
 msgid "Init (up to 16 hex digits): "
 msgstr "Init (fino a 16 cifre esadecimali): "
 
-#: mount/lomount.c:217 mount/losetup.c:133
+#: mount/lomount.c:238
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Cifra non esadec. '%c'.\n"
 
-#: mount/lomount.c:223 mount/losetup.c:140
+#: mount/lomount.c:245
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "Non so come ottenere la chiave del sistema di criptazione %d\n"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:261
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d): riuscito\n"
 
-#: mount/lomount.c:250
+#: mount/lomount.c:272
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: impossibile cancellare il device %s: %s\n"
 
-#: mount/lomount.c:260
+#: mount/lomount.c:282
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): riuscito\n"
 
-#: mount/lomount.c:268
+#: mount/lomount.c:290
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Questo montaggio � stato compilato senza supporto loop. Ricompilare.\n"
 
-#: mount/losetup.c:70
-msgid "Cannot get loop info"
-msgstr "Impossibile avere informazioni sul loop"
-
-#: mount/losetup.c:176
+#: mount/lomount.c:327
 #, c-format
 msgid ""
 "usage:\n"
@@ -7048,7 +7149,11 @@ msgstr ""
 "  %s -d loop_device                                   # elimina\n"
 "  %s [ -e encryption ] [ -o offset ] loop_device file # imposta\n"
 
-#: mount/losetup.c:234
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr "memoria insufficiente"
+
+#: mount/lomount.c:416
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "Nessun supporto loop disponibile al momento della compilazione. "
@@ -7070,148 +7175,162 @@ msgstr "[mntent]: la linea %d in %s non � valida%s\n"
 msgid "; rest of file ignored"
 msgstr "; ignorato resto del file"
 
-#: mount/mount.c:333
+#: mount/mount.c:351
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: in base a mtab, %s � gi� montato su %s"
 
-#: mount/mount.c:336
+#: mount/mount.c:354
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: in base a mtab, %s � montato su %s"
 
-#: mount/mount.c:357
+#: mount/mount.c:375
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: impossibile aprire %s in scrittura: %s"
 
-#: mount/mount.c:372 mount/mount.c:654
+#: mount/mount.c:390 mount/mount.c:593
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: errore durante la scrittura di %s: %s"
 
-#: mount/mount.c:379
+#: mount/mount.c:397
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: errore durante il cambio di modalit� di %s: %s"
 
-#: mount/mount.c:413
+#: mount/mount.c:442
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s assomigla a swapspace - non montato"
 
-#: mount/mount.c:481
+#: mount/mount.c:485
 msgid "mount failed"
 msgstr "mount non riuscito"
 
-#: mount/mount.c:483
+#: mount/mount.c:487
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: solamente root pu� montare %s su %s"
 
-#: mount/mount.c:511
+#: mount/mount.c:515
 msgid "mount: loop device specified twice"
 msgstr "mount: loop device specificato due volte"
 
-#: mount/mount.c:517
+#: mount/mount.c:520
 msgid "mount: type specified twice"
 msgstr "mount: tipo specificato due volte"
 
-#: mount/mount.c:529
+#: mount/mount.c:532
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: si ignora l'impostazione di un loop device\n"
 
-#: mount/mount.c:538
+#: mount/mount.c:541
 #, 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:542
+#: mount/mount.c:545
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: mancata impostazione del loop device\n"
 
-#: mount/mount.c:546
+#: mount/mount.c:549
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: impostazione del loop device riuscita\n"
 
-#: mount/mount.c:559
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: questa versione � stata compilata senza supporto per il tipo `nfs'"
+#: mount/mount.c:588
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: impossibile aprire %s: %s"
+
+#: mount/mount.c:611
+#, fuzzy, c-format
+msgid "mount: cannot not open %s for setting speed"
+msgstr "mount: impossibile aprire %s in scrittura: %s"
+
+#: mount/mount.c:614
+#, fuzzy, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: impossibile aprire %s: %s"
 
-#: mount/mount.c:610 mount/mount.c:1043
+#: mount/mount.c:675 mount/mount.c:1202
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: impossibile effettuare il fork: %s"
 
-#: mount/mount.c:649
-#, c-format
-msgid "mount: can't open %s: %s"
-msgstr "mount: impossibile aprire %s: %s"
+#: mount/mount.c:749
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr ""
+"mount: questa versione � stata compilata senza supporto per il tipo `nfs'"
+
+#: mount/mount.c:789
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr ""
 
-#: mount/mount.c:678
+#: mount/mount.c:800
 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:681
+#: mount/mount.c:803
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: si deve specificare il tipo di filesystem"
 
 #. should not happen
-#: mount/mount.c:684
+#: mount/mount.c:806
 msgid "mount: mount failed"
 msgstr "mount: mount non riuscito"
 
-#: mount/mount.c:690 mount/mount.c:725
+#: mount/mount.c:812 mount/mount.c:847
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: il mount point di %s non � una directory"
 
-#: mount/mount.c:692
+#: mount/mount.c:814
 msgid "mount: permission denied"
 msgstr "mount: autorizzazione negata"
 
-#: mount/mount.c:694
+#: mount/mount.c:816
 msgid "mount: must be superuser to use mount"
 msgstr "mount: bisogna essere superuser per utilizzare mount"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:698 mount/mount.c:702
+#: mount/mount.c:820 mount/mount.c:824
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s � occupato"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:704
+#: mount/mount.c:826
 msgid "mount: proc already mounted"
 msgstr "mount: proc gi� montato"
 
-#: mount/mount.c:706
+#: mount/mount.c:828
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s gi� montato o %s occupato"
 
-#: mount/mount.c:712
+#: mount/mount.c:834
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: il mount point %s non esiste"
 
-#: mount/mount.c:714
+#: mount/mount.c:836
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: il mount point %s � un link simbolico a nulla"
 
-#: mount/mount.c:717
+#: mount/mount.c:839
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: il device speciale %s non esiste"
 
-#: mount/mount.c:727
+#: mount/mount.c:849
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7220,12 +7339,12 @@ msgstr ""
 "mount: il device speciale %s non esiste\n"
 "       (un prefisso di percorso non � una directory)\n"
 
-#: mount/mount.c:739
+#: mount/mount.c:862
 #, 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:741
+#: mount/mount.c:864
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7234,47 +7353,47 @@ msgstr ""
 "mount: tipo fs errato, opzione non valida, superblocco su %s danneggiato,\n"
 "       o troppi file system montati"
 
-#: mount/mount.c:756
+#: mount/mount.c:898
 msgid "mount table full"
 msgstr "mount table piena"
 
-#: mount/mount.c:758
+#: mount/mount.c:900
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: impossibile leggere il superblocco"
 
-#: mount/mount.c:761
-#, c-format
-msgid "mount: %s has wrong major or minor number"
-msgstr "mount: %s ha un major o un minor number errato"
+#: mount/mount.c:904
+#, fuzzy, c-format
+msgid "mount: %s: unknown device"
+msgstr "umount: %s: dispositivo di blocchi non valido"
 
-#: mount/mount.c:766
+#: mount/mount.c:909
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: fs di tipo %s non supportato dal kernel"
 
-#: mount/mount.c:778
+#: mount/mount.c:921
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: probabilmente si intende %s"
 
-#: mount/mount.c:780
+#: mount/mount.c:923
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: forse si intendeva iso9660 ?"
 
-#: mount/mount.c:783
+#: mount/mount.c:926
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 "mount: %s ha un numero device errato o il fs di tipo %s non � supportato"
 
 #. strange ...
-#: mount/mount.c:788
+#: mount/mount.c:932
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s non � un dispositivo di blocchi e lo stat non � riuscito?"
 
-#: mount/mount.c:790
+#: mount/mount.c:934
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7283,55 +7402,62 @@ msgstr ""
 "mount: il kernel non riconosce %s come un dispositivo di blocchi\n"
 "       (forse `insmod driver'?)"
 
-#: mount/mount.c:793
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr "mount: %s  non � un dispositivo di blocchi (magari tentare `-o loop'?)"
 
-#: mount/mount.c:796
+#: mount/mount.c:940
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s non � un dispositivo di blocchi"
 
-#: mount/mount.c:799
+#: mount/mount.c:943
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s non un dispositivo di blocchi valido"
 
-#: mount/mount.c:803
-#, c-format
-msgid "mount: block device %s is not permitted on its filesystem"
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:946
+msgid "block device "
+msgstr " dispositivo di blocchi"
+
+#: mount/mount.c:948
+#, fuzzy, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "umount: impossibile rimontare %s di sola lettura\n"
+
+#: mount/mount.c:952
+#, fuzzy, c-format
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount: il dispositivo di blocchi %s non � consentito sul relativo filesystem"
+"mount: %s%s � protetto da scrittura, montaggio in sola lettura in corso"
 
-#: mount/mount.c:819
+#: mount/mount.c:968
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 "mount: %s%s � protetto da scrittura, montaggio in sola lettura in corso"
 
-#: mount/mount.c:820
-msgid "block device "
-msgstr " dispositivo di blocchi"
-
-#: mount/mount.c:907
-#, c-format
-msgid "mount: consider mounting %s by %s\n"
+#: mount/mount.c:1057
+#, fuzzy, c-format
+msgid "mount: going to mount %s by %s\n"
 msgstr "mount: considerare il montaggio di %s con %s\n"
 
-#: mount/mount.c:908
+#: mount/mount.c:1058
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:908
+#: mount/mount.c:1058
 msgid "label"
 msgstr "etichetta"
 
-#: mount/mount.c:910 mount/mount.c:1226
+#: mount/mount.c:1060 mount/mount.c:1430
 msgid "mount: no such partition found"
 msgstr "mount: non si � trovata tale partizione"
 
-#: mount/mount.c:918
+#: mount/mount.c:1068
 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"
@@ -7339,181 +7465,189 @@ msgstr ""
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:934
+#: mount/mount.c:1084
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: esecuzione in background di \"%s\"\n"
 
-#: mount/mount.c:945
+#: mount/mount.c:1095
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: termina \"%s\"\n"
 
-#: mount/mount.c:994
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s gi� montato su %s\n"
 
-#: mount/mount.c:1105
-msgid ""
-"Usage: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       A special device can be indicated by  -L label  or  -U uuid .\n"
-msgstr ""
-"Utilizzo: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       Un device speciale pu� essere indicato da  -L label  o  -U uuid .\n"
-
-#: mount/mount.c:1211
+#: mount/mount.c:1270
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+
+#: mount/mount.c:1414
 msgid "mount: only root can do that"
 msgstr "mount: � possibile solo per root"
 
-#: mount/mount.c:1216
+#: mount/mount.c:1419
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nessun %s trovato - creazione in corso..\n"
 
-#: mount/mount.c:1228
+#: mount/mount.c:1432
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: mount di %s in corso\n"
 
-#: mount/mount.c:1237
+#: mount/mount.c:1441
 msgid "not mounted anything"
 msgstr "niente � montato"
 
-#: mount/mount.c:1250
+#: mount/mount.c:1456
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: impossibile trovare %s in %s"
 
-#: mount/mount.c:1264
+#: mount/mount.c:1471
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: impossibile trovare %s in %s o %s"
 
-#: mount/mount_by_label.c:141
+#: mount/mount_by_label.c:99
+#, fuzzy, c-format
+msgid ""
+"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr "mount: impossibile aprire %s - si sta utilizzando al suo posto %s\n"
+
+#: mount/mount_by_label.c:201
 msgid "mount: bad UUID"
 msgstr "mount: UUID non valido"
 
-#: mount/mount_guess_fstype.c:251
+#: mount/mount_guess_fstype.c:257
 #, 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_guess_fstype.c:254
+#: mount/mount_guess_fstype.c:260
 #, 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_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:263
 msgid "       and it looks like this is swapspace\n"
 msgstr "      e sembra che questo sia swapspace\n"
 
-#: mount/mount_guess_fstype.c:259
+#: mount/mount_guess_fstype.c:265
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "      Prover� il tipo %s\n"
 
-#: mount/mount_guess_fstype.c:321
+#: mount/mount_guess_fstype.c:329
 #, c-format
 msgid "Trying %s\n"
 msgstr "Prova di %s in corso\n"
 
-#: mount/nfsmount.c:157
+#: mount/nfsmount.c:225
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argomento host:dir eccessivamente lungo\n"
 
-#: mount/nfsmount.c:170
+#: mount/nfsmount.c:238
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: attenzione:nomi host multipli non supportati\n"
 
-#: mount/nfsmount.c:174
+#: mount/nfsmount.c:242
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: la directory da montare non � nell'host: formato dir\n"
 
-#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#: mount/nfsmount.c:253 mount/nfsmount.c:510
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: impossibile ottenere l'indirizzo di %s\n"
 
-#: mount/nfsmount.c:191
+#: mount/nfsmount.c:259
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ottenuto hp->h_length non valido\n"
 
-#: mount/nfsmount.c:208
+#: mount/nfsmount.c:276
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argomento dell'opzione eccessivamente lungo\n"
 
-#: mount/nfsmount.c:299
+#: mount/nfsmount.c:368
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Attenzione: opzione proto= non riconosciuta.\n"
 
-#: mount/nfsmount.c:306
+#: mount/nfsmount.c:375
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Attenzione: l'opzione namlen non � supportata.\n"
 
-#: mount/nfsmount.c:310
+#: mount/nfsmount.c:379
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "parametro di nfs mount sconosciuto: %s=%d\n"
 
-#: mount/nfsmount.c:345
+#: mount/nfsmount.c:414
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Attenzione: l'opzione nolock non � supportata.\n"
 
-#: mount/nfsmount.c:348
+#: mount/nfsmount.c:419
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "opzione di nfs mount sconosciuta: %s%s\n"
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:516
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ottenuto un hp->h_length non valido?\n"
 
-#: mount/nfsmount.c:528
-#, c-format
-msgid "mount: %s:%s failed, reason given by server: %s\n"
-msgstr "mount: %s:%s non riuscito, motivo indicato dal server: %s\n"
-
-#: mount/nfsmount.c:539
+#: mount/nfsmount.c:692
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS attraverso TCP non supportato.\n"
 
-#: mount/nfsmount.c:546
+#: mount/nfsmount.c:699
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:550
+#: mount/nfsmount.c:703
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:561
+#: mount/nfsmount.c:714
 msgid "used portmapper to find NFS port\n"
 msgstr "utilizzato il portmapper(mappatore porte) per trovare la porta NFS\n"
 
-#: mount/nfsmount.c:565
+#: mount/nfsmount.c:718
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "utilizzo della porta %d per il demone nfs\n"
 
-#: mount/nfsmount.c:576
+#: mount/nfsmount.c:729
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:665
+#: mount/nfsmount.c:816
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valore riportato di stato nfs sconosciuto: %d"
 
-#: mount/sundries.c:41 mount/sundries.c:56
-msgid "not enough memory"
-msgstr "memoria insufficiente"
-
 #: mount/sundries.c:66
 msgid "bug in xstrndup call"
 msgstr "bug in chiamata xstrndup"
@@ -7629,26 +7763,26 @@ msgstr ""
 "impossibile eseguire umount di %s - al suo posto � in corso un tentativo con "
 "%s\n"
 
-#: mount/umount.c:270
+#: mount/umount.c:272
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s occupato - rimontato sola lettura\n"
 
-#: mount/umount.c:278
+#: mount/umount.c:282
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: impossibile rimontare %s di sola lettura\n"
 
-#: mount/umount.c:286
+#: mount/umount.c:290
 #, c-format
 msgid "%s umounted\n"
 msgstr "eseguito umount di %s\n"
 
-#: mount/umount.c:369
+#: mount/umount.c:374
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: impossibile trovare l'elenco dei filesystem da smontare"
 
-#: mount/umount.c:398
+#: mount/umount.c:403
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7658,46 +7792,46 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:459
+#: mount/umount.c:464
 msgid "umount: only root can do that"
 msgstr " umount: � possibile solo per root"
 
-#: mount/umount.c:474
+#: mount/umount.c:479
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentativo di eseguire umount di %s in corso\n"
 
-#: mount/umount.c:478
+#: mount/umount.c:483
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Impossibile trovare %s in mtab\n"
 
-#: mount/umount.c:482
+#: mount/umount.c:487
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s non � montato (secondo mtab)"
 
-#: mount/umount.c:484
+#: mount/umount.c:489
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: sembra che %s sia stato montato diverse volte"
 
-#: mount/umount.c:496
+#: mount/umount.c:501
 #, 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:499
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s mount non coerente con fstab"
 
-#: mount/umount.c:520
+#: mount/umount.c:525
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: solamente root pu� smontare %s da %s"
 
-#: mount/umount.c:531
+#: mount/umount.c:536
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: solamente %s pu� smontare %s da %s"
@@ -7710,7 +7844,7 @@ msgstr "Bisogna essere root per impostare modalit� Ctrl-Alt-Del.\n"
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "Utilizzo: ctrlaltdel hard|soft\n"
 
-#: sys-utils/cytune.c:118
+#: sys-utils/cytune.c:120
 #, c-format
 msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
@@ -7720,7 +7854,7 @@ msgstr ""
 "era %d,\n"
 "e la velocit� massima di trasferimento di caratteri/secondo era di %f\n"
 
-#: sys-utils/cytune.c:129
+#: sys-utils/cytune.c:131
 #, c-format
 msgid ""
 "File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -7849,50 +7983,61 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (car/sec)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:37
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr " Utilizzo: %s [-c] [-n level] [-s bufsize]\n"
 
-#: sys-utils/ipcrm.c:46
-#, c-format
-msgid "usage: %s [shm | msg | sem] id\n"
+#: sys-utils/ipcrm.c:59
+#, fuzzy, c-format
+msgid "invalid id: %s\n"
+msgstr "Numero non valido: %s\n"
+
+#: sys-utils/ipcrm.c:77
+#, fuzzy, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "impossibile aprire %s %s\n"
+
+#: sys-utils/ipcrm.c:91
+#, fuzzy, c-format
+msgid "usage: %s {shm | msg | sem} id ...\n"
 msgstr "utilizzo: %s [shm | msg | sem] id\n"
 
-#: sys-utils/ipcrm.c:70
-#, c-format
-msgid "usage: %s [-shm | -msg | -sem] id\n"
-msgstr "utilizzo: %s [-shm | -msg | -sem] id\n"
+#: sys-utils/ipcrm.c:124
+#, fuzzy, c-format
+msgid "unknown resource type: %s\n"
+msgstr "parametro di nfs mount sconosciuto: %s=%d\n"
 
-#: sys-utils/ipcrm.c:73
-msgid "resource deleted\n"
+#: sys-utils/ipcrm.c:128
+#, fuzzy
+msgid "resource(s) deleted\n"
 msgstr "risorsa eliminata\n"
 
-#: sys-utils/ipcs.c:117
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
 msgstr "utilizzo : %s -asmq -tclup \n"
 
-#: sys-utils/ipcs.c:118
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
 msgstr "\t%s [-s -m -q] -i id\n"
 
-#: sys-utils/ipcs.c:119
+#: sys-utils/ipcs.c:124
 #, c-format
 msgid "\t%s -h for help.\n"
 msgstr "\t%s -h per richiamare la guida.\n"
 
-#: sys-utils/ipcs.c:125
+#: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
 msgstr "%s fornisce informazioni sulle funzionalit� ipc per"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
 msgstr " le quali si ha accesso in lettura.\n"
 
-#: sys-utils/ipcs.c:127
+#: sys-utils/ipcs.c:132
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
@@ -7902,7 +8047,7 @@ msgstr ""
 "\t-m : shared_mem (mem_condiv)\n"
 "\t-q : messaggi\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
@@ -7910,7 +8055,7 @@ msgstr ""
 "\t-s : semafori\n"
 "\t-a : tutti (predefinito)\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
@@ -7922,7 +8067,7 @@ msgstr ""
 "\t-p : pid\n"
 "\t-c : creatore\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
@@ -7930,368 +8075,368 @@ msgstr ""
 "\t-l : limiti\n"
 "\t-u : sommario\n"
 
-#: sys-utils/ipcs.c:131
+#: sys-utils/ipcs.c:136
 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"
 
-#: sys-utils/ipcs.c:263 sys-utils/ipcs.c:465
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
 msgid "kernel not configured for shared memory\n"
 msgstr "il kernel non � configurato per la condivisione della memoria\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Limiti della memoria condivisa --------\n"
 
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:277
 #, c-format
 msgid "max number of segments = %d\n"
 msgstr "numero massimo di segmenti = %d\n"
 
-#: sys-utils/ipcs.c:273
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max seg size (kbytes) = %d\n"
 msgstr "dimensione max seg (kbyte) = %d\n"
 
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max total shared memory (kbytes) = %d\n"
 msgstr "valore massimo totale di memoria condivisa (kbyte) = %d\n"
 
-#: sys-utils/ipcs.c:275
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "min seg size (bytes) = %d\n"
 msgstr "dimensione min seg (byte) = %d\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:284
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ stato della memoria condivisa --------\n"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "segmenti allocati %d\n"
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:286
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "pagine allocate %ld\n"
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:287
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "pagine residenti  %ld\n"
 
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:288
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "pagine scambiate (swapping)   %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:289
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
 msgstr "Prestazione swap: %ld tentativi\t %ld riusciti\n"
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:294
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Segmento Mem. Condiv. Creatori/Propr.--------\n"
 
-#: sys-utils/ipcs.c:290 sys-utils/ipcs.c:396 sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:297 sys-utils/ipcs.c:302
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:302 sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:408
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:308 sys-utils/ipcs.c:397
-#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:489 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:494 sys-utils/ipcs.c:511
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Mem. Condiv.  Conn./Sconn./Cambio  Volte --------\n"
 
-#: sys-utils/ipcs.c:296
+#: sys-utils/ipcs.c:301
 #, c-format
 msgid "%-10s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:297 sys-utils/ipcs.c:302 sys-utils/ipcs.c:308
-#: sys-utils/ipcs.c:403 sys-utils/ipcs.c:412 sys-utils/ipcs.c:495
-#: sys-utils/ipcs.c:500 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:307 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:417 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505 sys-utils/ipcs.c:511
 msgid "owner"
 msgstr "proprietario"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "attached"
 msgstr "connesso"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "detached"
 msgstr "disconnesso"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "changed"
 msgstr "cambiato"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "------ Mem.  Condiv. Creatore/Last-op--------\n"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:311
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segm. Memoria Condivisa --------\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:412 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
 msgid "key"
 msgstr "chiave"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "bytes"
 msgstr "byte"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
 msgid "status"
 msgstr "stato"
 
-#: sys-utils/ipcs.c:328 sys-utils/ipcs.c:329 sys-utils/ipcs.c:330
-#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:434 sys-utils/ipcs.c:526
-#: sys-utils/ipcs.c:527 sys-utils/ipcs.c:528
+#: sys-utils/ipcs.c:333 sys-utils/ipcs.c:334 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:438 sys-utils/ipcs.c:439 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:533
 msgid "Not set"
 msgstr "Non impostato"
 
-#: sys-utils/ipcs.c:350
+#: sys-utils/ipcs.c:355
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:356
 msgid "locked"
 msgstr "bloccato"
 
-#: sys-utils/ipcs.c:371
+#: sys-utils/ipcs.c:376
 msgid "kernel not configured for semaphores\n"
 msgstr "kernel non configurato per i semafori\n"
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:382
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Limiti di semaforo --------\n"
 
-#: sys-utils/ipcs.c:381
+#: sys-utils/ipcs.c:386
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "numero max di matrici = %d\n"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:387
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "numero max di semafori per matrice = %d\n"
 
-#: sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:388
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "numero max di semafori su tutto il sistema = %d\n"
 
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:389
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "numero max opz. per chiamata semop = %d\n"
 
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:390
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valore max del semaforo = %d\n"
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:394
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Stato del semaforo --------\n"
 
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:395
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "matrici utilizzate = %d\n"
 
-#: sys-utils/ipcs.c:391
+#: sys-utils/ipcs.c:396
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "semafori allocati = %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:400
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Matrice di Semaf. Creatori/Propr. --------\n"
 
-#: sys-utils/ipcs.c:397 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:406
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "------ Mem. Condivisa Operazione/Modif. Volte --------\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-op"
 msgstr "last-op"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-changed"
 msgstr "ultima-modifica"
 
-#: sys-utils/ipcs.c:410
+#: sys-utils/ipcs.c:415
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Matrici semafori --------\n"
 
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:417
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:478
 msgid "------ Messages: Limits --------\n"
 msgstr "------ Messaggi: limiti --------\n"
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:479
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "numero max di code su tutto il sistema = %d\n"
 
-#: sys-utils/ipcs.c:475
+#: sys-utils/ipcs.c:480
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "dimensione max del messaggio (byte) = %d\n"
 
-#: sys-utils/ipcs.c:476
+#: sys-utils/ipcs.c:481
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "dimensione massima predefinita della coda (byte) = %d\n"
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:485
 msgid "------ Messages: Status --------\n"
 msgstr "------ Messaggi: stato --------\n"
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:486
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "code allocate = %d\n"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:487
 #, c-format
 msgid "used headers = %d\n"
 msgstr "intestazioni utilizzate = %d\n"
 
-#: sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:488
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "spazio utilizzato = %d byte\n"
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:492
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr "------ Code messaggi: Creatori/Proprietari --------\n"
 
-#: sys-utils/ipcs.c:489 sys-utils/ipcs.c:495 sys-utils/ipcs.c:500
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:498
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ Code messaggi  Inv./Ric./Modif. Volte--------\n"
 
-#: sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:499
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "send"
 msgstr "invio"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "recv"
 msgstr "ricez."
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "change"
 msgstr "modifica"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:504
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ Code Messaggi  PID  --------\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:509
 msgid "------ Message Queues --------\n"
 msgstr "------ Code messaggi  --------\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "used-bytes"
 msgstr "byte utilizzati"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "messages"
 msgstr "messaggi"
 
-#: sys-utils/ipcs.c:565
+#: sys-utils/ipcs.c:570
 #, c-format
 msgid ""
 "\n"
@@ -8300,41 +8445,41 @@ msgstr ""
 "\n"
 "Segmento memoria condivisa shmid=%d\n"
 
-#: sys-utils/ipcs.c:566
+#: sys-utils/ipcs.c:571
 #, 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:568
+#: sys-utils/ipcs.c:573
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:569
+#: sys-utils/ipcs.c:574
 #, c-format
 msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 msgstr "byte=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:577
 #, c-format
 msgid "att_time=%s"
 msgstr "att_time=%s"
 
-#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:575 sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
 msgid "Not set\n"
 msgstr "Non impostato\n"
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:579
 #, c-format
 msgid "det_time=%s"
 msgstr "det_time=%s"
 
-#: sys-utils/ipcs.c:576
+#: sys-utils/ipcs.c:581
 #, c-format
 msgid "change_time=%s"
 msgstr "change_time=%s"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:597
 #, c-format
 msgid ""
 "\n"
@@ -8343,26 +8488,26 @@ msgstr ""
 "\n"
 "Coda di messaggi msqid=%d\n"
 
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:598
 #, 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:595
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "send_time=%srcv_time=%schange_time=%s"
 msgstr "send_time=%srcv_time=%schange_time=%s"
 
-#: sys-utils/ipcs.c:599 sys-utils/ipcs.c:600 sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:604 sys-utils/ipcs.c:605 sys-utils/ipcs.c:606
 msgid "Not Set\n"
 msgstr "Non impostato\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:623
 #, c-format
 msgid ""
 "\n"
@@ -8371,116 +8516,116 @@ msgstr ""
 "\n"
 "matrice semafori semid=%d\n"
 
-#: sys-utils/ipcs.c:619
+#: sys-utils/ipcs.c:624
 #, 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:621
+#: sys-utils/ipcs.c:626
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "modalit�=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:622
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "nsems = %d\n"
 msgstr "nsems = %d\n"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "otime = %s"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:630
 #, c-format
 msgid "ctime = %s"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "value"
 msgstr "valore"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:67
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr ""
 "utilizzo: rdev [ -rsv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
 
-#: sys-utils/rdev.c:69
+#: sys-utils/rdev.c:68
 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:70
+#: sys-utils/rdev.c:69
 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:71
+#: sys-utils/rdev.c:70
 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:72
+#: sys-utils/rdev.c:71
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
 msgstr "  rdev -s /dev/fd0 /dev/hda2      imposta SWAP device"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:72
 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:74
+#: sys-utils/rdev.c:73
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr "  rdev -v /dev/fd0 1             imposta VIDEOMODE all'avvio"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:74
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   utilizza byte offset N"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:75
 msgid "  rootflags ...                   same as rdev -R"
 msgstr " rootflags ...                   come rdev -R"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:76
 msgid "  swapdev ...                     same as rdev -s"
 msgstr "  swapdev ...                     same as rdev -s"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr " ramsize ...                     come rdev -r"
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
 msgstr " vidmode ...                     come rdev -v"
 
-#: sys-utils/rdev.c:80
+#: sys-utils/rdev.c:79
 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:81
+#: sys-utils/rdev.c:80
 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."
@@ -8569,7 +8714,7 @@ msgstr "%d: vecchia priorit� %d, nuova priorit� %d\n"
 msgid "usage: %s program [arg ...]\n"
 msgstr "utilizzo: %s programma [arg ...]\n"
 
-#: sys-utils/tunelp.c:73
+#: sys-utils/tunelp.c:74
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8580,82 +8725,83 @@ msgstr ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
 msgid "malloc error"
 msgstr "errore di malloc"
 
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:102
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s: valore non valido\n"
 
-#: sys-utils/tunelp.c:237
+#: sys-utils/tunelp.c:241
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s no � un lp device.\n"
 
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:262
 #, c-format
 msgid "%s status is %d"
 msgstr "lo stato di %s � %d"
 
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:263
 msgid ", busy"
 msgstr ", occupato"
 
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:264
 msgid ", ready"
 msgstr ", pronto"
 
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:265
 msgid ", out of paper"
 msgstr ", carta esaurita"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:266
 msgid ", on-line"
 msgstr ", on-line"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:267
 msgid ", error"
 msgstr ", errore"
 
-#: sys-utils/tunelp.c:280
+#: sys-utils/tunelp.c:284
 msgid "LPGETIRQ error"
 msgstr "errore LPGETIRQ"
 
-#: sys-utils/tunelp.c:286
+#: sys-utils/tunelp.c:290
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s utilizzo di IRQ %d in corso\n"
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:292
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s utilizzo del polling in corso\n"
 
-#: text-utils/col.c:153
+#: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col: argomento -l invalido per %s.\n"
 
-#: text-utils/col.c:516
-msgid "usage: col [-bfx] [-l nline]\n"
+#: text-utils/col.c:521
+#, fuzzy
+msgid "usage: col [-bfpx] [-l nline]\n"
 msgstr "utilizzo: col [-bfx] [-l nline]\n"
 
-#: text-utils/col.c:522
+#: text-utils/col.c:527
 msgid "col: write error.\n"
 msgstr "col: errore in scrittura.\n"
 
-#: text-utils/col.c:529
+#: text-utils/col.c:534
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr "col: attenzione: impossibile eseguire il backup di %s.\n"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "past first line"
 msgstr "dopo la prima linea"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "-- line already flushed"
 msgstr "-- linea gi� svuotata"
 
@@ -8664,11 +8810,11 @@ msgstr "-- linea gi� svuotata"
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "utilizzo: %s [ - ] [ -2 ] [ file ... ]\n"
 
-#: text-utils/column.c:302
+#: text-utils/column.c:300
 msgid "line too long"
 msgstr "linea troppo lunga"
 
-#: text-utils/column.c:379
+#: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
 msgstr "utilizzo: column [-tx] [-c columns] [file ...]\n"
 
@@ -8686,12 +8832,12 @@ msgid ""
 msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 
-#: text-utils/more.c:329
+#: text-utils/more.c:330
 #, c-format
 msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr " usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 
-#: text-utils/more.c:504
+#: text-utils/more.c:505
 #, c-format
 msgid ""
 "\n"
@@ -8703,7 +8849,7 @@ msgstr ""
 "\n"
 
 #. simple ELF detection
-#: text-utils/more.c:543
+#: text-utils/more.c:544
 #, c-format
 msgid ""
 "\n"
@@ -8718,30 +8864,30 @@ msgstr ""
 msgid "[Use q or Q to quit]"
 msgstr "[Utilizzare q o Q per uscire]"
 
-#: text-utils/more.c:833
+#: text-utils/more.c:826
 msgid "--More--"
 msgstr "--Ancora--"
 
-#: text-utils/more.c:835
+#: text-utils/more.c:828
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(File successivo: %s)"
 
-#: text-utils/more.c:841
+#: text-utils/more.c:834
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Premere spazio per continuare, 'q' per uscire.]"
 
-#: text-utils/more.c:1139
+#: text-utils/more.c:1132
 #, c-format
 msgid "...back %d page"
 msgstr "...indietro %d pagine"
 
-#: text-utils/more.c:1185
+#: text-utils/more.c:1178
 #, c-format
 msgid "...skipping %d line"
 msgstr "...sto saltando %d righe"
 
-#: text-utils/more.c:1226
+#: text-utils/more.c:1219
 msgid ""
 "\n"
 "***Back***\n"
@@ -8751,37 +8897,37 @@ msgstr ""
 "***Indietro***\n"
 "\n"
 
-#: text-utils/more.c:1264
+#: text-utils/more.c:1257
 msgid "Can't open help file"
 msgstr "Impossibile aprire il file guida"
 
-#: text-utils/more.c:1285 text-utils/more.c:1289
+#: text-utils/more.c:1278 text-utils/more.c:1282
 msgid "[Press 'h' for instructions.]"
 msgstr "[Premere 'h' per visualizzare le istruzioni.]"
 
-#: text-utils/more.c:1324
+#: text-utils/more.c:1316
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linea %d"
 
-#: text-utils/more.c:1326
+#: text-utils/more.c:1318
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Non un file] linea %d"
 
-#: text-utils/more.c:1410
+#: text-utils/more.c:1402
 msgid "  Overflow\n"
 msgstr "  Overflow\n"
 
-#: text-utils/more.c:1457
+#: text-utils/more.c:1449
 msgid "...skipping\n"
 msgstr "...ignora\n"
 
-#: text-utils/more.c:1487
+#: text-utils/more.c:1479
 msgid "Regular expression botch"
 msgstr "Errore nell'espressione regolare"
 
-#: text-utils/more.c:1499
+#: text-utils/more.c:1491
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -8789,15 +8935,15 @@ msgstr ""
 "\n"
 "Pattern non trovato\n"
 
-#: text-utils/more.c:1502
+#: text-utils/more.c:1494
 msgid "Pattern not found"
 msgstr "Pattern non trovato"
 
-#: text-utils/more.c:1563
+#: text-utils/more.c:1555
 msgid "can't fork\n"
 msgstr "impossibile effettuare fork\n"
 
-#: text-utils/more.c:1602
+#: text-utils/more.c:1594
 msgid ""
 "\n"
 "...Skipping "
@@ -8805,23 +8951,23 @@ msgstr ""
 "\n"
 "...sto ignorando"
 
-#: text-utils/more.c:1606
+#: text-utils/more.c:1598
 msgid "...Skipping "
 msgstr "...Sto ignorando"
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "to file "
 msgstr "al file"
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "back to file "
 msgstr "ritorna al file"
 
-#: text-utils/more.c:1846
+#: text-utils/more.c:1835
 msgid "Line too long"
 msgstr "Linea troppo lunga"
 
-#: text-utils/more.c:1890
+#: text-utils/more.c:1878
 msgid "No previous command to substitute for"
 msgstr "Nessun comando precedente da sostituire"
 
@@ -8857,6 +9003,7 @@ msgid "hexdump: bad byte count for conversion character %s.\n"
 msgstr "hexdump: conteggio byte errato per il carattere di conversione %s.\n"
 
 #: text-utils/parse.c:497
+#, ycp-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
 msgstr ""
 "hexdump: %%s richiede un conteggio di precisione o un conteggio dei byte.\n"
@@ -8870,11 +9017,11 @@ msgstr "hexdump: formato non valido {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: carattere di conversione non valido %%%s.\n"
 
-#: text-utils/rev.c:114
+#: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
 msgstr "Impossibile allocare lo spazio buffer\n"
 
-#: text-utils/rev.c:173
+#: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
 msgstr "utilizzo: rev [file ...]\n"
 
@@ -8896,11 +9043,11 @@ msgstr "Sequenza di escape sconosciuta in input: %o, %o\n"
 msgid "Unable to allocate buffer.\n"
 msgstr "Impossibile allocare il buffer.\n"
 
-#: text-utils/ul.c:555
+#: text-utils/ul.c:553
 msgid "Input line too long.\n"
 msgstr "Linea di input troppo lunga.\n"
 
-#: text-utils/ul.c:568
+#: text-utils/ul.c:566
 msgid "Out of memory when growing buffer.\n"
 msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 
@@ -8916,3 +9063,50 @@ msgstr " Utilizzo: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
 #: kbd/kbdrate.c:252
 msgid "Cannot open /dev/port"
 msgstr "Impossibile aprire /dev/port"
+
+#~ msgid "Writing disklabel to %s%d.\n"
+#~ msgstr "Scrittura del disklabel su %s%d in corso.\n"
+
+#~ msgid "%s%d contains no disklabel.\n"
+#~ msgstr "%s%d non contiene disklabel.\n"
+
+#~ msgid "Bootstrap installed on %s%d.\n"
+#~ msgstr "Bootstrap installato su %s%d.\n"
+
+#~ msgid "%s: unknown geometry\n"
+#~ msgstr "%s: geometria sconosciuta\n"
+
+#~ msgid "exec rc failed\n"
+#~ msgstr " exec di rc non riuscito\n"
+
+#~ msgid "fork of rc shell failed\n"
+#~ msgstr "fork della shell rc non riuscita\n"
+
+#~ msgid "Cannot get loop info"
+#~ msgstr "Impossibile avere informazioni sul loop"
+
+#~ msgid "mount: %s has wrong major or minor number"
+#~ msgstr "mount: %s ha un major o un minor number errato"
+
+#~ msgid "mount: block device %s is not permitted on its filesystem"
+#~ msgstr ""
+#~ "mount: il dispositivo di blocchi %s non � consentito sul relativo filesystem"
+
+#~ msgid ""
+#~ "Usage: mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
+#~ msgstr ""
+#~ "Utilizzo: mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       Un device speciale pu� essere indicato da  -L label  o  -U uuid .\n"
+
+#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
+#~ msgstr "mount: %s:%s non riuscito, motivo indicato dal server: %s\n"
+
+#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
+#~ msgstr "utilizzo: %s [-shm | -msg | -sem] id\n"
diff --git a/po/ja.po b/po/ja.po
index a34e996939..d527a58a41 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,98 +1,98 @@
-# Japanese messages for util-linux 2.10
+# Japanese messages for util-linux 2.10o
 #
-# Copyright (C) 1999 Free Software Foundation, Inc.
-# Daisuke Yamashita <yamad@mb.infoweb.ne.jp>, 1999.
-# includes cfdisk translation by
-#     Hidenobu NABETANI <nabetani@kern.phys.sci.osaka-u.ac.jp>
+# Copyright (C) 2000 Free Software Foundation, Inc.
+# Daisuke Yamashita <yamad@mb.infoweb.ne.jp>, 1999-2000.
+#   includes cfdisk translation by
+#         Hidenobu NABETANI <nabetani@kern.phys.sci.osaka-u.ac.jp>
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.10\n"
-"POT-Creation-Date: 1999-11-03 12:58+0900\n"
-"PO-Revision-Date: 1999-11-03 13:25+0900\n"
+"Project-Id-Version: util-linux 2.10o\n"
+"POT-Creation-Date: 2000-08-25 12:43+0900\n"
+"PO-Revision-Date: 2000-08-25 12:43+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: japanese <japo@flatout.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-jp\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:146
+#: clock/cmos.c:157
 msgid "booted from MILO\n"
 msgstr "MILO ����֡��Ȥ���ޤ���\n"
 
-#: clock/cmos.c:154
+#: clock/cmos.c:166
 msgid "Ruffian BCD clock\n"
-msgstr "��˽�� BCD �����å�\n"
+msgstr "�ƹ��� BCD �����å�\n"
 
-#: clock/cmos.c:170
+#: clock/cmos.c:182
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "�����å��ݡ��Ȥ� 0x%x �˽������ޤ���\n"
 
-#: clock/cmos.c:180
+#: clock/cmos.c:192
 msgid "funky TOY!\n"
-msgstr "�����������!\n"
+msgstr "�������� TOY!\n"
 
-#: clock/cmos.c:234
+#: clock/cmos.c:246
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: �Բ�ʬ��%s�� 1000 ���ȿ��������!"
 
-#: clock/cmos.c:558
+#: clock/cmos.c:570
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "/dev/port �򳫤��ޤ���: %s"
 
-#: clock/cmos.c:565
+#: clock/cmos.c:577
 msgid "I failed to get permission because I didnt try.\n"
 msgstr "���Ĥμ������ʤ��ä��Τǡ����Ĥμ����˼��Ԥ��ޤ�����\n"
 
-#: clock/cmos.c:568
+#: clock/cmos.c:580
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr "%s �� I/O �ݡ��ȥ����������Ǥ��ޤ���: iopl(3) ������˼��ԡ�\n"
 
-#: clock/cmos.c:571
+#: clock/cmos.c:583
 msgid "Probably you need root privileges.\n"
 msgstr "���餯�롼�ȸ��¤�ɬ�פǤ���\n"
 
-#: clock/hwclock.c:213
+#: clock/hwclock.c:217
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
-msgstr "�ϡ��ɥ����������å���%s������ݻ����Ƥ���Ȥߤʤ��ޤ�\n"
+msgstr "�ϡ��ɥ���������%s������ݻ����Ƥ���Ȥߤʤ��ޤ�\n"
 
-#: clock/hwclock.c:214 clock/hwclock.c:303
+#: clock/hwclock.c:218 clock/hwclock.c:307
 msgid "UTC"
 msgstr " UTC "
 
-#: clock/hwclock.c:214 clock/hwclock.c:302
+#: clock/hwclock.c:218 clock/hwclock.c:306
 msgid "local"
 msgstr "��������"
 
-#: clock/hwclock.c:286
+#: clock/hwclock.c:290
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
-msgstr "%s: �ٹ�: adjtime �ե�����λ����ܤ�ǧ����ޤ���Ǥ���\n"
+msgstr "%s: �ٹ�: adjtime �ե�����λ����ܤ�ǧ���Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:288
+#: clock/hwclock.c:292
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(���Ԥ����Τ�: `UTC', `LOCAL' ���뤤�ϲ���ʤ����Ǥ���)\n"
 
-#: clock/hwclock.c:297
+#: clock/hwclock.c:301
 #, c-format
 msgid "Last drift adjustment done at %d seconds after 1969\n"
-msgstr "����κǽ������� 1969 ǯ�ʹ� %d �û����ǹԤʤ��ޤ���\n"
+msgstr "ľ���Τ���ν����� 1969 ǯ�ʹ� %d �û����ǹԤʤ��ޤ���\n"
 
-#: clock/hwclock.c:299
+#: clock/hwclock.c:303
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
-msgstr "�ǽ�Ĵ���� 1969 ǯ�ʹ� %d �û����ǹԤʤ��ޤ���\n"
+msgstr "ľ����Ĵ���� 1969 ǯ�ʹ� %d �û����ǹԤʤ��ޤ���\n"
 
-#: clock/hwclock.c:301
+#: clock/hwclock.c:305
 #, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr "�ϡ��ɥ����������å���%s����Ǥ�\n"
+msgstr "�ϡ��ɥ��������פ�%s����Ǥ�\n"
 
-#: clock/hwclock.c:303
+#: clock/hwclock.c:307
 msgid "unknown"
 msgstr "������"
 
@@ -110,39 +110,39 @@ msgstr "������"
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:325
+#: clock/hwclock.c:329
 msgid "Waiting for clock tick...\n"
 msgstr "�����å����å����ԤäƤ��ޤ�...\n"
 
-#: clock/hwclock.c:329
+#: clock/hwclock.c:333
 msgid "...got clock tick\n"
 msgstr "�����å����å���������ޤ���\n"
 
-#: clock/hwclock.c:381
+#: clock/hwclock.c:384
 #, c-format
-msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr "�ϡ��ɥ����������å�����������: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr "�ϡ��ɥ��������פ���������: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: clock/hwclock.c:390
+#: clock/hwclock.c:392
 #, c-format
-msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
-msgstr "�ϡ��ɥ����������å����� : %.2d:%.2d:%.2d = 1969 ǯ���� %d ��\n"
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr "�ϡ��ɥ��������׻��� : %4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969 ǯ���� %ld ��\n"
 
-#: clock/hwclock.c:416
+#: clock/hwclock.c:420
 #, c-format
-msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
-msgstr "�ϡ��ɥ����������å������ɹ��������: %02d:%02d:%02d\n"
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "�ϡ��ɥ��������פ����ɹ��������: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: clock/hwclock.c:442
+#: clock/hwclock.c:447
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
-msgstr "�ϡ��ɥ����������å��� %.2d:%.2d:%.2d ������ = 1969 ǯ���� %d ��\n"
+msgstr "�ϡ��ɥ��������פ� %.2d:%.2d:%.2d ������ = 1969 ǯ���� %d ��\n"
 
-#: clock/hwclock.c:448
+#: clock/hwclock.c:453
 msgid "Clock not changed - testing only.\n"
 msgstr "�����å����ѹ����ޤ���Ǥ��� -- �ƥ��Ȥ����Ǥ���\n"
 
-#: clock/hwclock.c:496
+#: clock/hwclock.c:501
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -151,12 +151,12 @@ msgstr ""
 "����򻲾Ȥ����������� %.6f �÷вᡣ\n"
 "���δ������äޤ��٤餻�ޤ���\n"
 
-#: clock/hwclock.c:520
+#: clock/hwclock.c:525
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
 msgstr ""
-"�ϡ��ɥ����������å��쥸����������������(�� ����50��)�ˤʤäƤ��뤫��\n"
+"�ϡ��ɥ��������ץ쥸����������������(�� ����50��)�ˤʤäƤ��뤫��\n"
 "��ª�Ǥ��ʤ��ϰϤ���(�� 2095ǯ)�ˤʤäƤ��ޤ���\n"
 
 #. Address of static storage containing time string
@@ -165,18 +165,18 @@ msgstr ""
 #.
 #. Compute display value for time
 #. Cut off trailing newline
-#: clock/hwclock.c:532
+#: clock/hwclock.c:537
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f ��\n"
 
-#: clock/hwclock.c:566
+#: clock/hwclock.c:571
 msgid "No --date option specified.\n"
 msgstr "--date ���ץ���󤬻��ꤵ��Ƥ��ޤ���\n"
 
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:571
+#: clock/hwclock.c:576
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
@@ -184,23 +184,23 @@ msgstr ""
 "--date ���ץ������ͤ����������դǤϤ���ޤ���\n"
 "�äˡ��������ơ������ޡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: clock/hwclock.c:577
+#: clock/hwclock.c:582
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "date ���ޥ�ɤ�ȯ�Ԥ��ޤ�: %s\n"
 
-#: clock/hwclock.c:581
+#: clock/hwclock.c:586
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
-"/bin/sh ������ץ������� 'date' ��¹ԤǤ��ޤ���\n"
+"/bin/sh ��������� 'date' �ץ�������¹ԤǤ��ޤ���\n"
 "popen() �����Ԥ��ޤ�����"
 
-#: clock/hwclock.c:587
+#: clock/hwclock.c:592
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "date ���ޥ�ɤ�������� = %s\n"
 
-#: clock/hwclock.c:589
+#: clock/hwclock.c:594
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -215,11 +215,11 @@ msgstr ""
 "����������:\n"
 "  %s\n"
 
-#: clock/hwclock.c:598
+#: clock/hwclock.c:603
 #, c-format
 msgid ""
-"The date command issued by %s returnedsomething other than an integer where "
-"the convertedtime value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
@@ -229,87 +229,85 @@ msgstr ""
 "�����˲����̤Τ�Τ��֤��Ƥ��ޤ�����\n"
 "���Υ��ޥ�ɤ�:\n"
 "  %s\n"
-"����������:\n"
+"���α�����:\n"
 " %s\n"
 
-#: clock/hwclock.c:608
+#: clock/hwclock.c:613
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr "date ʸ���� %s �� 1969 ǯ���� %d �äȸ��ʤ��ޤ���\n"
 
-#: clock/hwclock.c:643
+#: clock/hwclock.c:645
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
-"�ϡ��ɥ����������å��ϡ������������ޤ�Ǥ��ʤ��Τǡ�������������줿�ͤ�\n"
+"�ϡ��ɥ��������פϡ������������ޤ�Ǥ��ʤ��Τǡ�������������줿�ͤ�\n"
 "�����ƥ���������Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:659
+#: clock/hwclock.c:667
 msgid "Calling settimeofday:\n"
-msgstr "settimeofday �򥳡��뤷�ޤ�:\n"
+msgstr "settimeofday ��ƤӽФ��ޤ�:\n"
 
-#: clock/hwclock.c:660
+#: clock/hwclock.c:668
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: clock/hwclock.c:662
+#: clock/hwclock.c:670
 #, c-format
-msgid "\ttz.tz_minuteswest = %ld\n"
-msgstr "\ttz.tz_minuteswest = %ld\n"
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: clock/hwclock.c:665
+#: clock/hwclock.c:673
 msgid "Not setting system clock because running in test mode.\n"
 msgstr "�ƥ��ȥ⡼�ɤ�ư��Ƥ��뤿�ᡢ�����ƥ९���å������ꤷ�ޤ���\n"
 
-#: clock/hwclock.c:677
+#: clock/hwclock.c:681
 msgid "Must be superuser to set system clock.\n"
 msgstr "�����ƥ९���å������ꤹ��ˤϡ������ѡ��桼���Ǥʤ���Фʤ�ޤ���\n"
 
-#: clock/hwclock.c:679
+#: clock/hwclock.c:683
 msgid "settimeofday() failed"
-msgstr "settimeofday() ������˼���"
+msgstr "settimeofday() �ƤӽФ��˼���"
 
-#: clock/hwclock.c:712
+#: clock/hwclock.c:716
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
-msgstr ""
-"�ϡ��ɥ����������å��˰����Υ��ߤ��ޤޤ�Ƥ��ꡢ��������Ǥ��ޤ���\n"
+msgstr "�ϡ��ɥ���������˰����Υ��ߤ��ޤޤ�Ƥ��ꡢ��������Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:716
+#: clock/hwclock.c:720
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr "�����Ĵ�����衢���ʤ��Ȥ�����вᤷ�ʤ��ȡ���������Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:725
+#: clock/hwclock.c:729
 #, c-format
 msgid ""
 "Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
 "of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"��� %2$d �äδ֤ˡ����������� %3$f �ä��餷�Ƥ���ΤǤ����������å��� %1$d "
-"��\n"
-"����ޤ��������������� %4$f �ä���������ޤ�\n"
+"��� %2$d �äδ֤ˡ����������� %3$f �ä��餷�Ƥ���ΤǤ����������å��� %1$d �ä���ޤ�����\n"
+"���������� %4$f �ä���������ޤ�\n"
 
-#: clock/hwclock.c:776
+#: clock/hwclock.c:780
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "�ǽ��������狼�� %d �äǤ�\n"
+msgstr "����ν�������λ��֤� %d �äǤ�\n"
 
-#: clock/hwclock.c:778
+#: clock/hwclock.c:782
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr "%d �ä������ȡ�%.6f �����λ���λ��Ȥ�ɬ�פǤ�\n"
 
-#: clock/hwclock.c:807
+#: clock/hwclock.c:811
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "�ƥ��ȥ⡼�ɤ�ư��Ƥ��뤿�� adjtime �ե�����򹹿����ޤ���\n"
 
-#: clock/hwclock.c:808
+#: clock/hwclock.c:812
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
@@ -318,57 +316,54 @@ msgstr ""
 "����ʤ�� %s �˰ʲ��Τ褦�˽񤭹��ޤ��Ϥ��Ǥ���:\n"
 "%s"
 
-#: clock/hwclock.c:832
+#: clock/hwclock.c:836
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "����ν����ͤϹ�������ޤ���Ǥ�����\n"
 
-#: clock/hwclock.c:873
+#: clock/hwclock.c:877
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr ""
-"�ϡ��ɥ����������å��ϡ�����ʻ����ޤ�Ǥ��ʤ��Τǡ���������Ǥ��ޤ���"
-"\n"
+msgstr "�ϡ��ɥ��������פ�������ʻ����ޤ�Ǥ��ʤ��Τǡ������Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:897
+#: clock/hwclock.c:901
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "ɬ�פʽ���������̤���ʤΤǡ������å������ꤷ�ޤ���\n"
 
-#: clock/hwclock.c:923
+#: clock/hwclock.c:927
 #, c-format
 msgid "Using %s.\n"
 msgstr "%s ��Ȥ��ޤ���\n"
 
-#: clock/hwclock.c:925
+#: clock/hwclock.c:929
 msgid "No usable clock interface found.\n"
 msgstr "���Ѳ�ǽ�ʥ����å����󥿡��ե����������Ĥ���ޤ���\n"
 
-#: clock/hwclock.c:1020
+#: clock/hwclock.c:1024
 msgid "Unable to set system clock.\n"
 msgstr "�����ƥ९���å�������Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:1049
+#: clock/hwclock.c:1053
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
 "machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
-"�����ͥ뤬�ϡ��ɥ����������å��Τ���Υ��ݥå��ͤ��ݻ��Ǥ���Τ� Alpha "
-"�ޥ���\n"
-"�ΤߤǤ���\n"
+"�����ͥ뤬�ϡ��ɥ��������פΤ���Υ��ݥå��ͤ��ݻ��Ǥ���Τ� Alpha �ޥ���\n"
+"�����Ǥ���\n"
 "���� hwclock ��ʣ���� Alpha �ʳ��Υޥ���ǥӥ�ɤ���ޤ���\n"
 "(���������������� Alpha ��Ǽ¹Ԥ���Ƥ��ޤ���)���¹ԤǤ��ޤ���\n"
 
-#: clock/hwclock.c:1058
+#: clock/hwclock.c:1062
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr "�����ͥ뤫�饨�ݥå��ͤ�����Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:1060
+#: clock/hwclock.c:1064
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "�����ͥ�ϥ��ݥå��ͤ� %lu �����ꤷ�Ƥ��ޤ�\n"
 
-#: clock/hwclock.c:1063
+#: clock/hwclock.c:1067
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
@@ -376,21 +371,83 @@ msgstr ""
 "���ݥå��ͤ����ꤹ�뤿��ˤϡ������ͤ����ꤹ�뤫���Τ餻�뤿��� 'epoch'\n"
 "���ץ�����Ȥ�ʤ���Фʤ�ޤ���\n"
 
-#: clock/hwclock.c:1066
+#: clock/hwclock.c:1070
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "���ݥå��� %d �����ꤷ�ޤ��� -- �ƥ��Ȥ����Ǥ���\n"
 
-#: clock/hwclock.c:1069
+#: clock/hwclock.c:1073
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "�����ͥ�˥��ݥå��ͤ����ꤹ�뤳�Ȥ��Ǥ��ޤ���Ǥ�����\n"
 
-#: clock/hwclock.c:1151
+#: clock/hwclock.c:1102
+#, c-format
+msgid ""
+"hwclock - query and set the hardware clock (RTC)\n"
+"\n"
+"Usage: hwclock [function] [options...]\n"
+"\n"
+"Functions:\n"
+"  --help        show this help\n"
+"  --show        read hardware clock and print result\n"
+"  --set         set the rtc to the time given with --date\n"
+"  --hctosys     set the system time from the hardware clock\n"
+"  --systohc     set the hardware clock to the current system time\n"
+"  --adjust      adjust the rtc to account for systematic drift since \n"
+"                the clock was last set or adjusted\n"
+"  --getepoch    print out the kernel's hardware clock epoch value\n"
+"  --setepoch    set the kernel's hardware clock epoch value to the \n"
+"                value given with --epoch\n"
+"  --version     print out the version of hwclock to stdout\n"
+"\n"
+"Options: \n"
+"  --utc         the hardware clock is kept in coordinated universal time\n"
+"  --localtime   the hardware clock is kept in local time\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
+"  --badyear     ignore rtc's year because the bios is broken\n"
+"  --date        specifies the time to which to set the hardware clock\n"
+"  --epoch=year  specifies the year which is the beginning of the \n"
+"                hardware clock's epoch value\n"
+msgstr ""
+"hwclock - �ϡ��ɥ��������� (RTC) �ؤ��䤤��碌�������Ԥ�\n"
+"\n"
+"�Ȥ���: hwclock [��ǽ] [���ץ����...]\n"
+"\n"
+"��ǽ:\n"
+"  --help        ���Υإ�פ�ɽ������\n"
+"  --show        �ϡ��ɥ��������פ��ɤ߼�äơ���̤�ɽ������\n"
+"  --set         --date ��Ϳ����줿����� rtc �����ꤹ��\n"
+"  --hctosys     �ϡ��ɥ��������פλ���򥷥��ƥ����˹�碌��\n"
+"  --systohc     ���ߤΥ����ƥ�����ϡ��ɥ��������פ˹�碌��\n"
+"  --adjust      ���פ��Ǹ������ޤ���Ĵ�����줿�������顢�����ƥ�Ū�ʤ����\n"
+"                �׻����� rtc ��Ĵ������\n"
+"  --getepoch    �����ͥ�Υϡ��ɥ���������Υ��ݥå��ͤ�ɽ������\n"
+"  --setepoch    �����ͥ�Υϡ��ɥ���������Υ��ݥå��ͤ� --epoch �Ȥ���Ϳ��\n"
+"                ��줿�ͤ����ꤹ��\n"
+"  --version     hwclock �ΥС�������ɸ����Ϥ�ɽ������\n"
+"\n"
+"���ץ����: \n"
+"  --utc         �ϡ��ɥ��������פ�������������ݻ�����\n"
+"  --localtime   �ϡ��ɥ��������פ�������������ݻ�����\n"
+"  --directisa   %s �ǤϤʤ���ľ�� ISA �Х��˥�����������\n"
+"  --badyear     BIOS �����꤬���뤿�ᡢrtc ��ǯ��̵�뤹��\n"
+"  --date        �ϡ��ɥ��������פ˻��ꤹ�����\n"
+"  --epoch=year  �ϡ��ɥ��������פΥ��ݥå��ͤε����˻��ꤹ��ǯ\n"
+
+#: clock/hwclock.c:1127
+msgid ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                tell hwclock the type of alpha you have (see hwclock(8))\n"
+msgstr ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                ���ʤ��� alpha �Υ����פ�ؼ����� (hwclock(8) ����)\n"
+
+#: clock/hwclock.c:1223
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s �ϲ��餫�Υ��ץ�����������ޤ������ʤ��� %d ��Ϳ���ޤ�����\n"
 
-#: clock/hwclock.c:1159
+#: clock/hwclock.c:1233
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
@@ -398,37 +455,44 @@ msgstr ""
 "���ʤ��ϵ�ǽ���ץ�����ʣ���Ļ��ꤷ�ޤ�����\n"
 "���٤˰�Ĥε�ǽ�Τ߹Ԥʤ����Ȥ��Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:1165
+#: clock/hwclock.c:1239
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
-msgstr "%s: --utc �� --localtime ���ץ����������¾Ū�Ǥ�����ξ�������ꤵ��ޤ�����\n"
+msgstr ""
+"%s: --utc �� --localtime "
+"���ץ����������¾Ū�Ǥ�����ξ�������ꤵ��ޤ�����\n"
 
-#: clock/hwclock.c:1178
+#: clock/hwclock.c:1252
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr "ͭ����������郎����ޤ��󡣥����å�������Ǥ��ޤ���\n"
 
-#: clock/hwclock.c:1193
+#: clock/hwclock.c:1267
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr ""
-"��ǰ�ʤ��顢�ϡ��ɥ����������å����ѹ��ϥ����ѡ��桼���Ǥ����Ԥʤ��ޤ���\n"
+msgstr "��ǰ�ʤ��顢�ϡ��ɥ����������פ��ѹ��ϥ����ѡ��桼���Ǥ����Ԥʤ��ޤ���\n"
 
-#: clock/hwclock.c:1197
+#: clock/hwclock.c:1271
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "��ǰ�ʤ��顢�����ƥ���פ��ѹ��ϥ����ѡ��桼���Ǥ����Ԥʤ��ޤ���\n"
+
+#: clock/hwclock.c:1275
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
-"��ǰ�ʤ��顢�����ͥ���Υϡ��ɥ����������å��Υ��ݥå��ͤ��ѹ��Ǥ���Τϡ�\n"
+"��ǰ�ʤ��顢�����ͥ���Υϡ��ɥ��������פΥ��ݥå��ͤ��ѹ��Ǥ���Τϡ�\n"
 "�����ѡ��桼�������Ǥ���\n"
 
-#: clock/hwclock.c:1213
+#: clock/hwclock.c:1295
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr "���ΤΤɤ����ˡ�Ǥ⡢�ϡ��ɥ��������פ˥��������Ǥ��ޤ���\n"
+
+#: clock/hwclock.c:1298
 msgid ""
-"Cannot access the Hardware Clock via any known method.  Use --debug option "
-"to see the details of our search for an access method.\n"
-msgstr ""
-"�ץ�����ब�Τ�¤����ˡ�Ǥϡ��ϡ��ɥ����������å��˥��������Ǥ��ޤ���\n"
-"--debug ���ץ����ǥ���������ˡ�����ξܺ٤ˤĤ��Ƹ��Ƥ���������\n"
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
+msgstr "--debug ���ץ����ǥ���������ˡ�����ξܺ٤ˤĤ��Ƹ��Ƥ���������\n"
 
 #: clock/kd.c:41
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
@@ -438,7 +502,7 @@ msgstr "KDGHWCLK �����ѹ��Τ���λ�����������롼����Ǥ�\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "KDGHWCLK �λ����ɤ߼�꤬���Ԥ��ޤ���"
 
-#: clock/kd.c:65 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
 msgstr "�����ѹ��Ԥ��������ॢ���Ȥ��ޤ�����\n"
 
@@ -458,105 +522,111 @@ msgstr "/dev/tty1 �򥪡��ץ󤹤뤿��� ioctl �����Ԥ��ޤ���"
 msgid "KDGHWCLK ioctl failed"
 msgstr "KDGHWCLK ioctl �˼��Ԥ��ޤ���"
 
-#: clock/kd.c:161
+#: clock/kd.c:163
 msgid "Can't open /dev/tty1"
 msgstr "/dev/tty1 �򳫤��ޤ���"
 
-#: clock/rtc.c:98
-msgid "ioctl() to /dev/rtc to read the time failed.\n"
-msgstr "�����ɤ߹��ߤΤ���� /dev/rtc �ؤ� ioctl() �˼��Ԥ��ޤ�����\n"
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "�����ɤ߹��ߤΤ���� %s �ؤ� ioctl() �˼��Ԥ��ޤ�����\n"
 
-#: clock/rtc.c:129
-msgid "Waiting in loop for time from /dev/rtc to change\n"
-msgstr "/dev/rtc ���������ѹ����뤿��Υ롼����Ǥ�\n"
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "%s ���������ѹ����뤿��Υ롼����Ǥ�\n"
 
-#: clock/rtc.c:165 clock/rtc.c:222
-msgid "open() of /dev/rtc failed"
-msgstr "/dev/rtc �ؤ� open() �����Ԥ��ޤ���"
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "%s �ؤ� open() �����Ԥ��ޤ���"
 
-#. This rtc device doesn't have interrupt functions.  This is typical
-#. on an Alpha, where the Hardware Clock interrupts are used by the
-#. kernel for the system clock, so aren't at the user's disposal.
-#.
-#: clock/rtc.c:182
-msgid "/dev/rtc does not have interrupt functions. "
-msgstr "/dev/rtc �ϳ����ߵ�ǽ����äƤ��ޤ��� "
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s �ϳ����ߵ�ǽ����äƤ��ޤ��� "
 
-#: clock/rtc.c:191
-msgid "read() to /dev/rtc to wait for clock tick failed"
-msgstr "�����å����å����ԤĤ���� /dev/rtc �ؤ� read() �����Ԥ��ޤ���"
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "�����å����å����ԤĤ���� %s �ؤ� read() �����Ԥ��ޤ���"
 
-#: clock/rtc.c:199
-msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
-msgstr "�����߹����򥪥դˤ��뤿��� /dev/rtc �ؤ� ioctl() �����Ԥ��ޤ���"
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "�����߹����򥪥դˤ��뤿��� %s �ؤ� ioctl() �����Ԥ��ޤ���"
 
-#: clock/rtc.c:202
-msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"�����߹����򥪥�ˤ��뤿��� /dev/rtc �ؤ� ioctl() "
-"��ͽ�����̼��Ԥ˽����ޤ���"
+"�����߹����򥪥�ˤ��뤿��� %s �ؤ� ioctl() ��ͽ�����̼��Ԥ˽����ޤ���"
 
-#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
-msgid "Unable to open /dev/rtc"
-msgstr "/dev/rtc �򥪡��ץ�Ǥ��ޤ���"
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s �򥪡��ץ�Ǥ��ޤ���"
 
-#: clock/rtc.c:268
-msgid "ioctl() to /dev/rtc to set the time failed.\n"
-msgstr "��������Τ���� /dev/rtc �ؤ� ioctl() �����Ԥ��ޤ�����\n"
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "��������Τ���� %s �ؤ� ioctl() �����Ԥ��ޤ�����\n"
 
-#: clock/rtc.c:272
+#: clock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) ���������ޤ�����\n"
 
-#: clock/rtc.c:302
-msgid "Open of /dev/rtc failed"
-msgstr "/dev/rtc �Υ����ץ�˼��Ԥ��ޤ���"
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "%s �Υ����ץ�˼��Ԥ��ޤ���"
 
-#: clock/rtc.c:320 clock/rtc.c:365
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file /dev/rtc.  This file does not "
-"exist on this system.\n"
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
 msgstr ""
-"�����ͥ���Υ��ݥå��ͤ򻻽Ф���ˤϡ����ڥ����ե����� /dev/rtc ���̤���\n"
+"�����ͥ���Υ��ݥå��ͤ򻻽Ф���ˤϡ����ڥ����ե����� %s ���̤���\n"
 "Linux �� 'rtc' �ǥХ����ɥ饤�Ф˥�����������ɬ�פ�����ޤ���������������\n"
 "�ե����뤬�����ƥ��¸�ߤ��ޤ���\n"
 
-#: clock/rtc.c:331
-msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
-msgstr "/dev/rtc �ؤ� ioctl(RTC_EPOCH_READ) �����Ԥ��ޤ���"
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "%s �ؤ� ioctl(RTC_EPOCH_READ) �����Ԥ��ޤ���"
 
-#: clock/rtc.c:337
+#: clock/rtc.c:344
 #, c-format
-msgid "we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n"
-msgstr ""
-"/dev/rtc ���� RTC_EPOCH_READ ioctl �ˤ�äƥ��ݥå� %ld ���ɤ߼��ޤ�����\n"
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "���� RTC_EPOCH_READ ioctl �ˤ�äƥ��ݥå� %ld ���ɤ߼��ޤ����� %s\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: clock/rtc.c:357
+#: clock/rtc.c:364
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 "���ݥå��ͤ� 1900 ǯ�����ǤϤ������ޤ��󡣤��ʤ��� %ld ���׵ᤷ�ޤ���\n"
 
-#: clock/rtc.c:374
+#: clock/rtc.c:381
 #, c-format
-msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
-msgstr ""
-"/dev/rtc ���� RTC_EPOCH_READ ioctl �ˤ�äƥ��ݥå� %ld ���ɤ߼��ޤ�����\n"
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "���� RTC_EPOCH_READ ioctl �ˤ�äƥ��ݥå� %ld ���ɤ߼��ޤ����� %s\n"
 
-#: clock/rtc.c:379
+#: clock/rtc.c:386
+#, c-format
 msgid ""
-"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
-"ioctl.\n"
-msgstr "/dev/rtc �Υ����ͥ�ɥ饤�Ф� RTC_EPOCH_SET ioctl ����äƤ��ޤ���\n"
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "%s �Υ����ͥ�ɥ饤�Ф� RTC_EPOCH_SET ioctl ����äƤ��ޤ���\n"
 
-#: clock/rtc.c:382
-msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
-msgstr "/dev/rtc �ؤ� ioctl(RTC_EPOCH_SET) �����Ԥ��ޤ���"
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "%s �ؤ� ioctl(RTC_EPOCH_SET) �����Ԥ��ޤ���"
 
 #: clock/shhopt.c:255 clock/shhopt.c:281
 #, c-format
@@ -588,28 +658,83 @@ msgstr "���ץ���� `%s' �ϰ���������դ��ޤ���\n"
 msgid "unrecognized option `-%c'\n"
 msgstr "ǧ���Ǥ��ʤ����ץ���� `-%c' �Ǥ�\n"
 
-#: disk-utils/fdformat.c:33
+#: disk-utils/blockdev.c:47
+msgid "set read-only"
+msgstr "�ɤ߹������Ѥ�����"
+
+#: disk-utils/blockdev.c:48
+msgid "set read-write"
+msgstr "�ɤ߽񤭲�ǽ������"
+
+#: disk-utils/blockdev.c:51
+msgid "get read-only"
+msgstr "�ɤ߽񤭲�ǽ���ɤ�����ƥ���"
+
+#: disk-utils/blockdev.c:54
+msgid "get sectorsize"
+msgstr "�������������"
+
+#: disk-utils/blockdev.c:57
+msgid "get size"
+msgstr "�����������"
+
+#: disk-utils/blockdev.c:60
+msgid "set readahead"
+msgstr "readahead �ͤ�����"
+
+#: disk-utils/blockdev.c:63
+msgid "get readahead"
+msgstr "readahead �ͤ����"
+
+#: disk-utils/blockdev.c:66
+msgid "flush buffers"
+msgstr "�Хåե���ե�å��夹��"
+
+#: disk-utils/blockdev.c:70
+msgid "reread partition table"
+msgstr "�ѡ��ƥ������ơ��֥����ɤ߹���"
+
+#: disk-utils/blockdev.c:79
+#, c-format
+msgid "Usage: %s [-V] [-v|-q] commands devices\n"
+msgstr "�Ȥ���: %s [-V] [-v|-q] ���ޥ�� �ǥХ���\n"
+
+#: disk-utils/blockdev.c:80
+msgid "Available commands:\n"
+msgstr "���Ѳ�ǽ���ޥ��:\n"
+
+#: disk-utils/blockdev.c:180
+#, c-format
+msgid "%s: Unknown command: %s\n"
+msgstr "%s: ̤�ΤΥ��ޥ��: %s\n"
+
+#: disk-utils/blockdev.c:191
+#, c-format
+msgid "%s requires an argument\n"
+msgstr "%s �ϰ������׵ᤷ�ޤ�\n"
+
+#: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "�ե����ޥåȤ��ޤ� ... "
 
-#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
 msgstr "��λ\n"
 
-#: disk-utils/fdformat.c:62
+#: disk-utils/fdformat.c:65
 msgid "Verifying ... "
 msgstr "�ȹ礷�ޤ� ... "
 
-#: disk-utils/fdformat.c:73
+#: disk-utils/fdformat.c:76
 msgid "Read: "
 msgstr "�ɹ�: "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:78
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
 msgstr "�ɹ����������ȯ���������� %d, %d ��Ȧ�Ǥ��� %d ���ɹ��ߤޤ���\n"
 
-#: disk-utils/fdformat.c:81
+#: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
@@ -618,34 +743,42 @@ msgstr ""
 "������ %d �������ʥǡ���\n"
 "³���ޤ� ... "
 
-#: disk-utils/fdformat.c:96
+#: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
 msgstr "�Ȥ���: %s [ -n ] �ǥХ���\n"
 
-#: disk-utils/fdformat.c:122
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:444
+#: disk-utils/setfdprm.c:128 misc-utils/cal.c:172 misc-utils/ddate.c:181
+#: misc-utils/kill.c:192
+#, c-format
+msgid "%s from %s\n"
+msgstr "%s from %s\n"
+
+#: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
 msgstr "%s: �ե��åԡ��ǥХ����ǤϤ���ޤ���\n"
 
-#: disk-utils/fdformat.c:128
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
 msgstr "���ߤΥե����ޥåȥ����פ�����Ǥ��ޤ���"
 
-#: disk-utils/fdformat.c:129
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "%s��, %d �ȥ�å�, %d ������/�ȥ�å���������� %d kB��\n"
 
-#: disk-utils/fdformat.c:130
+#: disk-utils/fdformat.c:142
 msgid "Double"
 msgstr "ξ"
 
-#: disk-utils/fdformat.c:130
+#: disk-utils/fdformat.c:142
 msgid "Single"
 msgstr "��"
 
-#: disk-utils/fsck.minix.c:198
+#: disk-utils/fsck.minix.c:197
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "�Ȥ���: %s [ -larvsmf ] /dev/name\n"
@@ -691,7 +824,7 @@ msgstr ""
 "�������顼: �����֥��å��ؤν񤭹���\n"
 "�񤭹����׵��̵�뤵��ޤ�\n"
 
-#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
 msgid "seek failed in write_block"
 msgstr "�񤭹��ߥ֥��å���Υ������˼��Ԥ��ޤ���"
 
@@ -703,7 +836,7 @@ msgstr "�񤭹��ߥ��顼: �ե��������������֥��å�������ޤ� '"
 msgid "seek failed in write_super_block"
 msgstr "�����ѡ��֥��å�������Υե����륷�����˼��Ԥ��ޤ���"
 
-#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr "�����ѡ��֥��å���񤭹���ޤ���"
 
@@ -775,22 +908,22 @@ msgstr "inode ���ɹ���ޤ���"
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Warning: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "inode �� %ld\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "�֥��å��� %ld\n"
 
-#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:530
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:531
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zone ������=%d\n"
@@ -814,163 +947,163 @@ msgstr ""
 "̾����Ĺ��=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
 msgid "Inode %d marked not used, but used for file '"
 msgstr "Inode %d ���Ի��ѥޡ�������Ƥ��ޤ��������Υե����뤬���Ѥ��Ƥ��ޤ� '"
 
-#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
 msgstr "���ѥޡ���"
 
-#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
 msgstr " �ϥ⡼�� %05o\n"
 
-#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
 msgid "Warning: inode count too big.\n"
 msgstr "�ٹ�: inode �����礭�����ޤ���\n"
 
-#: disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
 msgstr "root inode ���ǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
 msgid "Block has been used before. Now in file `"
 msgstr "�֥��å��ϰ����������Ѥ���Ƥ��ޤ������ߤϥե����� `"
 
-#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
 msgid "Clear"
 msgstr "���ꥢ"
 
-#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
 msgstr "�֥��å� %d in �ե����� `"
 
-#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
 msgstr "' ���Ի��ѥޡ���"
 
-#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
 msgstr "������"
 
-#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
 msgid " contains a bad inode number for file '"
 msgstr " ������ inode �ֹ������ޤ�: �ե����� '"
 
-#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
 msgstr " ���"
 
-#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
 msgid ": bad directory: '.' isn't first\n"
 msgstr ": �����ʥǥ��쥯�ȥ�: '.' ���ǽ�ǤϤ���ޤ���\n"
 
-#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
 msgid ": bad directory: '..' isn't second\n"
 msgstr ": �����ʥǥ��쥯�ȥ�: '..' �� 2 ���ܤǤϤ���ޤ���\n"
 
-#: disk-utils/fsck.minix.c:1076
+#: disk-utils/fsck.minix.c:1070
 msgid "internal error"
 msgstr "�������顼"
 
-#: disk-utils/fsck.minix.c:1079
+#: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
 msgstr ": �����ʥǥ��쥯�ȥ�: �������� 32 ̤��"
 
-#: disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
 msgstr ": �����ʥǥ��쥯�ȥ�: �������� 32 ̤��"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
 msgstr "������ zone �ǤΥ������˼���"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Inode %d �Υ⡼�ɤϥ��ꥢ���줺��"
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr "inode %d �ϻȤ��ޤ��󤬡��ӥåȥޥåפǤϻ��ѥޡ������դ��Ƥ��ޤ�"
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr "inode %d �����Ѥ���ޤ������ӥåȥޥåפǤ��Ի��ѥޡ������դ��Ƥ��ޤ�"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "inode %d (�⡼�� = %07o), i_nlinks=%d, counted=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks ���ͤ� count �����ꤷ�ޤ���"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zone %d: ���ѥޡ������դ��Ƥ��ޤ������ɤΥե������ȤäƤ��ޤ���"
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "�ޡ����ʤ�"
 
-#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
 #, c-format
 msgid "Zone %d: %sin use, counted=%d\n"
 msgstr "Zone %d: %s���ѡ�counted=%d\\n\n"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
 msgstr "��"
 
-#: disk-utils/fsck.minix.c:1190
+#: disk-utils/fsck.minix.c:1182
 msgid "Set"
 msgstr "����"
 
-#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:637
-#: disk-utils/mkfs.minix.c:640
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
 msgid "bad inode size"
 msgstr "������ inode ������"
 
-#: disk-utils/fsck.minix.c:1257
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "������ v2 inode ������"
 
-#: disk-utils/fsck.minix.c:1283
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "����Ū�ʽ�����Ԥʤ���ü����ɬ�פǤ�"
 
-#: disk-utils/fsck.minix.c:1287
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "'%s' �򳫤��ޤ���"
 
-#: disk-utils/fsck.minix.c:1304
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s �ϥ��꡼��Ǥ��������å����ޤ���\n"
 
-#: disk-utils/fsck.minix.c:1308
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "����Ū�� %s �Υե����륷���ƥม�����ޤ���\n"
 
-#: disk-utils/fsck.minix.c:1310
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "%s �Υե����륷���ƥ�ϱ���Ƥ��ꡢ������ɬ�פǤ���\n"
 
-#: disk-utils/fsck.minix.c:1339
+#: disk-utils/fsck.minix.c:1336
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
@@ -978,11 +1111,11 @@ msgstr ""
 "\n"
 "%6ld i�Ρ��ɤ��Ȥ�줿 (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zone ���Ȥ�줿 (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1346
+#: disk-utils/fsck.minix.c:1343
 #, c-format
 msgid ""
 "\n"
@@ -1005,7 +1138,7 @@ msgstr ""
 "------\n"
 "%6d �ե�����\n"
 
-#: disk-utils/fsck.minix.c:1359
+#: disk-utils/fsck.minix.c:1356
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -1015,79 +1148,79 @@ msgstr ""
 "*�ե����륷���ƥब�ѹ�����ޤ���*\n"
 "----------------------------------\n"
 
-#: disk-utils/mkfs.c:66
+#: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "�Ȥ���: mkfs [-V] [-t �ե����륷���ƥ෿] [fs ���ץ����] �ǥХ��� [������]\n"
 
-#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:370 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: ���꤬��ޤ���\n"
 
-#: disk-utils/mkfs.c:89
+#: disk-utils/mkfs.c:99
 #, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs �С������ %s (%s)\n"
 
-#: disk-utils/mkfs.minix.c:186
+#: disk-utils/mkfs.minix.c:179
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "�Ȥ���: %s [-c | -l �ե�����̾] [-nXX] [-iXX] /dev/name [�֥��å���]\n"
 
-#: disk-utils/mkfs.minix.c:210
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s �ϥޥ���Ȥ���Ƥ��ޤ� -- �����ˤϥե����륷���ƥ��Ĥ���ޤ���"
 
-#: disk-utils/mkfs.minix.c:271
+#: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
 msgstr "write_tables �ǤΥ֡��ȥ֥��å��ؤΥ������˼��Ԥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:273
+#: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
 msgstr "�֡��ȥ������򥯥ꥢ�Ǥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:275
+#: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
 msgstr "write_tables �ǤΥ������˼��Ԥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:279
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
 msgstr "inode �ޥåפν񤭹��ߤ��Ǥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
 msgstr "������ޥåפν񤭹��ߤ��Ǥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:283
+#: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
 msgstr "inode �ν񤭹��ߤ��Ǥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:292
+#: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
 msgstr "write_block �Ǥν񤭹��ߤ˼��Ԥ��ޤ���"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:300 disk-utils/mkfs.minix.c:374
-#: disk-utils/mkfs.minix.c:425
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
 msgid "too many bad blocks"
 msgstr "�����֥��å���¿�����ޤ�"
 
-#: disk-utils/mkfs.minix.c:308
+#: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
 msgstr "����ʥ֥��å����Խ�ʬ�Ǥ�"
 
-#: disk-utils/mkfs.minix.c:517
+#: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
 msgstr "�ޥåץХåե�����ݤǤ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:526
+#: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
 msgstr "inode �Хåե��γ��ݤ��Ǥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:532
+#: disk-utils/mkfs.minix.c:528
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1096,122 +1229,132 @@ msgstr ""
 "���祵����=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
 msgstr "�֥��å��Υƥ�����˥����������Ԥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:554
+#: disk-utils/mkfs.minix.c:550
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check ���Ѥ��ͤ�����ޤ�: ¿ʬ�Х��Ǥ��礦\n"
 
-#: disk-utils/mkfs.minix.c:585 disk-utils/mkswap.c:231
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:354
 msgid "seek failed in check_blocks"
 msgstr "check_blocks �ǤΥ������˼��Ԥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:594
+#: disk-utils/mkfs.minix.c:590
 msgid "bad blocks before data-area: cannot make fs"
 msgstr "�ǡ����ΰ�����������֥��å�: �ե����륷���ƥ������Ǥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:600 disk-utils/mkfs.minix.c:622
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "�����֥��å��� %d\n"
 
-#: disk-utils/mkfs.minix.c:602 disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
 msgstr "�����֥��å��� 1\n"
 
-#: disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:608
 msgid "can't open file of bad blocks"
 msgstr "�����֥��å��Υե�����򳫤��ޤ���"
 
-#: disk-utils/mkfs.minix.c:669
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
 msgstr "%s: minix v2 �Υ��ݡ��ȤĤ��ǥ���ѥ��뤵��Ƥ��ޤ���\n"
 
-#: disk-utils/mkfs.minix.c:685
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol ���顼: �֥��å��ο������ꤵ��ޤ���Ǥ���"
 
-#: disk-utils/mkfs.minix.c:717
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
 msgstr "%s �򳫤��ޤ���"
 
-#: disk-utils/mkfs.minix.c:719
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
 msgstr "%s �ξ��֤�����Ǥ��ޤ���"
 
-#: disk-utils/mkfs.minix.c:723
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' ��˥ե����륷���ƥ����ʤ��褦�ˤ��ޤ�"
 
-#: disk-utils/mkswap.c:101
+#: disk-utils/mkswap.c:170
 #, c-format
-msgid "Assuming pages of size %d\n"
-msgstr "������ %d �ڡ������ޤ�\n"
+msgid "Bad user-specified page size %d\n"
+msgstr "�����ʥ桼������ڡ��������� %d\n"
 
-#: disk-utils/mkswap.c:185
+#: disk-utils/mkswap.c:179
 #, c-format
-msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
-msgstr "�Ȥ���: %s [-c] [-v0|-v1] /dev/name [�֥��å���]\n"
+msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
+msgstr "�����ƥ�Υڡ����������� %2$d/%3$d ������ˡ��桼�������� %1$d ��Ȥ��ޤ�\n"
 
-#: disk-utils/mkswap.c:208
+#: disk-utils/mkswap.c:183
+#, c-format
+msgid "Assuming pages of size %d (not %d)\n"
+msgstr "������ %d (%d �ǤϤʤ�) �Υڡ������ޤ�\n"
+
+#: disk-utils/mkswap.c:308
+#, c-format
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
+msgstr "�Ȥ���: %s [-c] [-v0|-v1] [-p�ڡ���������] /dev/name [�֥��å���]\n"
+
+#: disk-utils/mkswap.c:331
 msgid "too many bad pages"
 msgstr "�����ڡ�����¿�����ޤ�"
 
-#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1100
-#: text-utils/more.c:1863 text-utils/more.c:1874
+#: disk-utils/mkswap.c:345 misc-utils/look.c:179 misc-utils/setterm.c:1129
+#: text-utils/more.c:1851 text-utils/more.c:1862
 msgid "Out of memory"
 msgstr "���꤬��ޤ���"
 
-#: disk-utils/mkswap.c:239
+#: disk-utils/mkswap.c:362
 msgid "one bad page\n"
-msgstr "�����ʥڡ����� 1\n"
+msgstr "�����ʥڡ�����\n"
 
-#: disk-utils/mkswap.c:241
+#: disk-utils/mkswap.c:364
 #, c-format
 msgid "%d bad pages\n"
 msgstr "�����ʥڡ����� %d\n"
 
-#: disk-utils/mkswap.c:345
+#: disk-utils/mkswap.c:484
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr "%s: ���顼: ����åפ�ͭ�������ꤹ�뤿��ξ�꤬�ʤ���\n"
 
-#: disk-utils/mkswap.c:354
+#: disk-utils/mkswap.c:502
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
 msgstr "%s: ���顼: ������ %ld ���ǥХ����Υ����� %d �����礭���Ǥ�\n"
 
-#: disk-utils/mkswap.c:372
+#: disk-utils/mkswap.c:521
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: ���顼: ̤�ΤΥС������ %d\n"
 
-#: disk-utils/mkswap.c:378
+#: disk-utils/mkswap.c:527
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s: ���顼: ����å��ΰ�Ͼ��ʤ��Ȥ� %ldkB ɬ�פǤ�\n"
 
-#: disk-utils/mkswap.c:397
+#: disk-utils/mkswap.c:546
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s: �ٹ�: ����å��ΰ�� %ldkB ���ڤ�ͤ�ޤ���\n"
 
-#: disk-utils/mkswap.c:409
+#: disk-utils/mkswap.c:558
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "'%s' �ˤϥ���åץǥ�����������ʤ��褦�ˤ��ޤ�"
 
-#: disk-utils/mkswap.c:418 disk-utils/mkswap.c:439
+#: disk-utils/mkswap.c:567 disk-utils/mkswap.c:588
 msgid "fatal: first page unreadable"
 msgstr "��̿���顼: �ǽ�Υڡ������ɹ���ޤ���"
 
-#: disk-utils/mkswap.c:424
+#: disk-utils/mkswap.c:573
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1225,24 +1368,24 @@ msgstr ""
 "����å�\n"
 "��������������С�-f ���ץ����Ƕ��פ��Ƥ���������\n"
 
-#: disk-utils/mkswap.c:448
+#: disk-utils/mkswap.c:597
 msgid "Unable to set up swap-space: unreadable"
 msgstr "����å׶��֤�����Ǥ��ޤ���: �ɹ���ޤ���"
 
-#: disk-utils/mkswap.c:449
+#: disk-utils/mkswap.c:598
 #, c-format
 msgid "Setting up swapspace version %d, size = %ld bytes\n"
 msgstr "����å׶��֥С������ %d �����ꤷ�ޤ��������� = %ld �Х���\n"
 
-#: disk-utils/mkswap.c:455
+#: disk-utils/mkswap.c:604
 msgid "unable to rewind swap-device"
 msgstr "����åץǥ��������򴬤��᤻�ޤ���"
 
-#: disk-utils/mkswap.c:458
+#: disk-utils/mkswap.c:607
 msgid "unable to write signature page"
 msgstr "��̾�ڡ�����񤭹���ޤ���"
 
-#: disk-utils/mkswap.c:465
+#: disk-utils/mkswap.c:614
 msgid "fsync failed"
 msgstr "fsync �˼���"
 
@@ -1283,45 +1426,45 @@ msgstr "       %s [ -c | -y | -n | -d ] �ǥХ���\n"
 msgid "       %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] �ǥХ���\n"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1900
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
 msgid "Unusable"
 msgstr "�����Բ�"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1902
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
 msgid "Free Space"
 msgstr "�����ΰ�"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:398
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:402 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:405
+#: fdisk/cfdisk.c:403
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:409
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:422
+#: fdisk/cfdisk.c:420
 msgid "Disk has been changed.\n"
 msgstr "�ǥ��������ѹ�����ޤ�����\n"
 
-#: fdisk/cfdisk.c:423
+#: fdisk/cfdisk.c:421
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "�ѡ��ƥ��������������������������ˤϥ����ƥ��Ƶ�ư���Ƥ���������\n"
 
-#: fdisk/cfdisk.c:426
+#: fdisk/cfdisk.c:424
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1333,294 +1476,294 @@ msgstr ""
 "�ޤä����ϡ�cfdisk �ޥ˥奢��ڡ����ˤ����ɲþ���\n"
 "�򻲾Ȥ��Ƥ���������\n"
 
-#: fdisk/cfdisk.c:521
+#: fdisk/cfdisk.c:519
 msgid "FATAL ERROR"
 msgstr "*��̿Ū�ʥ��顼*"
 
-#: fdisk/cfdisk.c:530
+#: fdisk/cfdisk.c:528
 msgid "Press any key to exit cfdisk"
 msgstr "���Ǥ���ˤϲ������������Ϥ��Ƥ�������"
 
-#: fdisk/cfdisk.c:566 fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
 msgid "Cannot seek on disk drive"
 msgstr "�ǥ������ɥ饤�־�� seek �Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:568
+#: fdisk/cfdisk.c:566
 msgid "Cannot read disk drive"
 msgstr "�ǥ������ɥ饤�֤��ɤ߹���ޤ���"
 
-#: fdisk/cfdisk.c:576
+#: fdisk/cfdisk.c:574
 msgid "Cannot write disk drive"
 msgstr "�ǥ������ɥ饤�֤˽񤭹���ޤ���"
 
-#: fdisk/cfdisk.c:815
+#: fdisk/cfdisk.c:814
 msgid "Too many partitions"
 msgstr "�ѡ��ƥ������¿�����ޤ�"
 
-#: fdisk/cfdisk.c:820
+#: fdisk/cfdisk.c:819
 msgid "Partition begins before sector 0"
 msgstr "�ѡ��ƥ�����󤬥����� 0 ���ޤ�����ϤޤäƤ��ޤ�"
 
-#: fdisk/cfdisk.c:825
+#: fdisk/cfdisk.c:824
 msgid "Partition ends before sector 0"
 msgstr "�ѡ��ƥ�����󤬥����� 0 ������ǽ���äƤ��ޤ�"
 
-#: fdisk/cfdisk.c:830
+#: fdisk/cfdisk.c:829
 msgid "Partition begins after end-of-disk"
 msgstr "�ѡ��ƥ�����󤬥ǥ������ν�������������ϤޤäƤ��ޤ�"
 
-#: fdisk/cfdisk.c:835
+#: fdisk/cfdisk.c:834
 msgid "Partition ends after end-of-disk"
 msgstr "�ѡ��ƥ�����󤬥ǥ������ν����������ǽ���äƤ��ޤ�"
 
-#: fdisk/cfdisk.c:859
+#: fdisk/cfdisk.c:858
 msgid "logical partitions not in disk order"
 msgstr "�����ΰ褬�ǥ������ν���Ȱ��פ��ޤ���"
 
-#: fdisk/cfdisk.c:862
+#: fdisk/cfdisk.c:861
 msgid "logical partitions overlap"
 msgstr "�����ΰ褬��ʣ���Ƥ��ޤ�"
 
-#: fdisk/cfdisk.c:864
+#: fdisk/cfdisk.c:863
 msgid "enlarged logical partitions overlap"
 msgstr "���礵�줿�����ΰ褬��ʣ���Ƥ��ޤ�"
 
-#: fdisk/cfdisk.c:894
+#: fdisk/cfdisk.c:893
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! �������顼����ĥ�ΰ�ʳ��������ɥ饤�֤�������褦�Ȥ��Ƥ��ޤ� !!!!"
 
-#: fdisk/cfdisk.c:905 fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:904 fdisk/cfdisk.c:916
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "�����ˤ������ɥ饤�֤�����Ǥ��ޤ��� -- 2 �Ĥγ�ĥ�ΰ�Ǥ���к������ޤ�"
 
-#: fdisk/cfdisk.c:1067
+#: fdisk/cfdisk.c:1066
 msgid "Menu item too long. Menu may look odd."
 msgstr "��˥塼����̾��Ĺ�����ޤ�����˥塼ɽ�������Ƥ����ǽ��������ޤ���"
 
-#: fdisk/cfdisk.c:1123
+#: fdisk/cfdisk.c:1122
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "��˥塼������������ޤ��󡣿�ʿ���������ͤȤ��ޤ���"
 
-#: fdisk/cfdisk.c:1253
+#: fdisk/cfdisk.c:1252
 msgid "Illegal key"
 msgstr "�����ʥ���"
 
-#: fdisk/cfdisk.c:1276
+#: fdisk/cfdisk.c:1275
 msgid "Press a key to continue"
 msgstr "³����ˤϲ������������Ϥ��Ƥ�������"
 
-#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2396
-#: fdisk/cfdisk.c:2398
+#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2400
+#: fdisk/cfdisk.c:2402
 msgid "Primary"
 msgstr "�����ΰ�"
 
-#: fdisk/cfdisk.c:1323
+#: fdisk/cfdisk.c:1322
 msgid "Create a new primary partition"
 msgstr "�����˴����ΰ��������ޤ�"
 
-#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2395
-#: fdisk/cfdisk.c:2398
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2399
+#: fdisk/cfdisk.c:2402
 msgid "Logical"
 msgstr "�����ΰ�"
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1323
 msgid "Create a new logical partition"
 msgstr "�����������ΰ��������ޤ�"
 
-#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380 fdisk/cfdisk.c:2075
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2074
 msgid "Cancel"
 msgstr "���"
 
-#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379
 msgid "Don't create a partition"
 msgstr "�ѡ��ƥ�������������ޤ���"
 
-#: fdisk/cfdisk.c:1341
+#: fdisk/cfdisk.c:1340
 msgid "!!! Internal error !!!"
 msgstr "!!! �������顼 !!!"
 
-#: fdisk/cfdisk.c:1344
+#: fdisk/cfdisk.c:1343
 msgid "Size (in MB): "
 msgstr "������ (MB ñ��): "
 
-#: fdisk/cfdisk.c:1378
+#: fdisk/cfdisk.c:1377
 msgid "Beginning"
 msgstr "�ǽ餫��"
 
-#: fdisk/cfdisk.c:1378
+#: fdisk/cfdisk.c:1377
 msgid "Add partition at beginning of free space"
 msgstr "�����ΰ�κǽ�˥ѡ��ƥ��������ɲ�"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1378
 msgid "End"
 msgstr "�Ǹ夫��"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1378
 msgid "Add partition at end of free space"
 msgstr "�����ΰ�κǸ�˥ѡ��ƥ��������ɲ�"
 
-#: fdisk/cfdisk.c:1397
+#: fdisk/cfdisk.c:1396
 msgid "No room to create the extended partition"
 msgstr "��ĥ�ΰ��������뤿��ξ�꤬����ޤ���"
 
-#: fdisk/cfdisk.c:1436
+#: fdisk/cfdisk.c:1435
 msgid "Bad signature on partition table"
 msgstr "�ΰ�ơ��֥�ν�̾�������Ǥ�"
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1473
 msgid "You specified more cylinders than fit on disk"
 msgstr "�ǥ������ˤȤä�Ŭ�ڤʿ�����¿���Υ�����������ꤵ��ޤ���"
 
-#: fdisk/cfdisk.c:1504
+#: fdisk/cfdisk.c:1503
 msgid "Cannot open disk drive"
 msgstr "�ǥ������ɥ饤�֤򳫤��ޤ���"
 
-#: fdisk/cfdisk.c:1506 fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1686
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "�ǥ��������ɹ������Ѥǳ����ޤ��� -- ���ʤ��ˤϽ���߸��¤�����ޤ���"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1526
 msgid "Cannot get disk size"
 msgstr "�ǥ�����������������Ǥ��ޤ���"
 
 #. avoid snprintf - it does not exist on ancient systems
-#: fdisk/cfdisk.c:1553
+#: fdisk/cfdisk.c:1552
 msgid "Bad primary partition"
 msgstr "�����ʴ����ΰ�"
 
 #. avoid snprintf
-#: fdisk/cfdisk.c:1584
+#: fdisk/cfdisk.c:1583
 msgid "Bad logical partition"
 msgstr "�����������ΰ�"
 
-#: fdisk/cfdisk.c:1699
+#: fdisk/cfdisk.c:1698
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "�ٹ� ����Ϥ��ʤ��Υǥ������ˤ���ǡ������˲����뤫�⤷��ޤ���"
 
-#: fdisk/cfdisk.c:1703
+#: fdisk/cfdisk.c:1702
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "�ѡ��ƥ����������ǥ������˽񤭹���Ǥ��������Ǥ�����(yes �ޤ��� no): "
 
-#: fdisk/cfdisk.c:1709
+#: fdisk/cfdisk.c:1708
 msgid "no"
 msgstr "no"
 
-#: fdisk/cfdisk.c:1710
+#: fdisk/cfdisk.c:1709
 msgid "Did not write partition table to disk"
 msgstr "�ΰ�ơ��֥��ǥ������˽񤭹��ߤޤ���Ǥ���"
 
-#: fdisk/cfdisk.c:1712
+#: fdisk/cfdisk.c:1711
 msgid "yes"
 msgstr "yes"
 
-#: fdisk/cfdisk.c:1715
+#: fdisk/cfdisk.c:1714
 msgid "Please enter `yes' or `no'"
 msgstr "`yes' �� `no' �Τ����줫�����Ϥ��Ƥ�������"
 
-#: fdisk/cfdisk.c:1719
+#: fdisk/cfdisk.c:1718
 msgid "Writing partition table to disk..."
 msgstr "�ΰ�ơ��֥��񤭹�����..."
 
-#: fdisk/cfdisk.c:1744 fdisk/cfdisk.c:1748
+#: fdisk/cfdisk.c:1743 fdisk/cfdisk.c:1747
 msgid "Wrote partition table to disk"
 msgstr "�ΰ�ơ��֥��ǥ������˽񤭹��ߤޤ���"
 
-#: fdisk/cfdisk.c:1746
+#: fdisk/cfdisk.c:1745
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "�ΰ�ơ��֥��񤭹��ߤޤ����������ɹ��ߤ˼��ԡ��Ƶ�ư���ƹ������Ƥ�������"
 
-#: fdisk/cfdisk.c:1756
+#: fdisk/cfdisk.c:1755
 msgid ""
 "Not precisely one primary partition is bootable. DOS MBR cannot boot this."
 msgstr ""
 "�֡��Ȳ�ǽ�����ΰ褬��ĤǤϤ���ޤ���DOS MBR �Ϥ����֡��ȤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:1814 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1931 fdisk/cfdisk.c:2015
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "�ե�����̾�����ϡ����̤�ɽ��������ϥ꥿���󥭡�: "
 
-#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
+#: fdisk/cfdisk.c:1821 fdisk/cfdisk.c:1939 fdisk/cfdisk.c:2023
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "�ե����� '%s' �򳫤��ޤ���"
 
-#: fdisk/cfdisk.c:1833
+#: fdisk/cfdisk.c:1832
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "�ǥ������ɥ饤��: %s\n"
 
-#: fdisk/cfdisk.c:1835
+#: fdisk/cfdisk.c:1834
 msgid "Sector 0:\n"
 msgstr "������ 0:\n"
 
-#: fdisk/cfdisk.c:1842
+#: fdisk/cfdisk.c:1841
 #, c-format
 msgid "Sector %d:\n"
 msgstr "������ %d:\n"
 
-#: fdisk/cfdisk.c:1862
+#: fdisk/cfdisk.c:1861
 msgid "   None   "
 msgstr "   ̵��   "
 
-#: fdisk/cfdisk.c:1864
+#: fdisk/cfdisk.c:1863
 msgid "   Pri/Log"
 msgstr "   ����/����"
 
-#: fdisk/cfdisk.c:1866
+#: fdisk/cfdisk.c:1865
 msgid "   Primary"
 msgstr "   �����ΰ�"
 
-#: fdisk/cfdisk.c:1868
+#: fdisk/cfdisk.c:1867
 msgid "   Logical"
 msgstr "   �����ΰ�"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1072 fdisk/fdisk.c:1221
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1212 fdisk/fdisk.c:1436
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:663 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "����"
 
-#: fdisk/cfdisk.c:1912
+#: fdisk/cfdisk.c:1911
 #, c-format
 msgid "Boot (%02X)"
 msgstr "�֡��� (%02X)"
 
-#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:1913 fdisk/cfdisk.c:2408
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "̤�� (%02X)"
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1915
 #, c-format
 msgid "None (%02X)"
 msgstr "�ʤ� (%02X)"
 
-#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
+#: fdisk/cfdisk.c:1950 fdisk/cfdisk.c:2034
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "%s �ѡ��ƥ���������\n"
 
-#: fdisk/cfdisk.c:1953
+#: fdisk/cfdisk.c:1952
 msgid "            First    Last\n"
 msgstr "            �ǽ��   �Ǹ��\n"
 
-#: fdisk/cfdisk.c:1954
+#: fdisk/cfdisk.c:1953
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " #  �ΰ�    ������   ������ ���ե��å� �礭��  Filesystem������(ID)   "
 "�ե饰\n"
 
-#: fdisk/cfdisk.c:1955
+#: fdisk/cfdisk.c:1954
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1628,454 +1771,454 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#: fdisk/cfdisk.c:2037
+#: fdisk/cfdisk.c:2036
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ---�ǽ��-----      ----�Ǹ��---- ���Υ�  \n"
 
-#: fdisk/cfdisk.c:2038
+#: fdisk/cfdisk.c:2037
 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:2039
+#: fdisk/cfdisk.c:2038
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2071
 msgid "Raw"
 msgstr "���ǡ���"
 
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2071
 msgid "Print the table using raw data format"
 msgstr "���ǡ����η����ǥѡ��ƥ�������������"
 
-#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2072 fdisk/cfdisk.c:2174
 msgid "Sectors"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2072
 msgid "Print the table ordered by sectors"
 msgstr "��������˥ѡ��ƥ�������������"
 
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2073
 msgid "Table"
 msgstr "�ơ��֥�"
 
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2073
 msgid "Just print the partition table"
 msgstr "ñ�˥ѡ��ƥ�������������"
 
-#: fdisk/cfdisk.c:2075
+#: fdisk/cfdisk.c:2074
 msgid "Don't print the table"
 msgstr "�ѡ��ƥ������������Ϥ��ʤ�"
 
-#: fdisk/cfdisk.c:2103
+#: fdisk/cfdisk.c:2102
 msgid "Help Screen for cfdisk"
 msgstr "cfdisk �Υإ�ײ���"
 
-#: fdisk/cfdisk.c:2105
+#: fdisk/cfdisk.c:2104
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "cfdisk ��ü�����ǥ������ѡ��ƥ����������ץ������Ǥ���"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2105
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "�ϡ��ɥǥ������ɥ饤�֤Υѡ��ƥ������������������ѹ�"
 
-#: fdisk/cfdisk.c:2107
+#: fdisk/cfdisk.c:2106
 msgid "disk drive."
 msgstr "���뤳�Ȥ��Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:2109
+#: fdisk/cfdisk.c:2108
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2111
+#: fdisk/cfdisk.c:2110
 msgid "Command      Meaning"
 msgstr "���ޥ��      ����"
 
-#: fdisk/cfdisk.c:2112
+#: fdisk/cfdisk.c:2111
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2113
+#: fdisk/cfdisk.c:2112
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          ���������Υѡ��ƥ������Υ֡��ȥե饰������"
 
-#: fdisk/cfdisk.c:2114
+#: fdisk/cfdisk.c:2113
 msgid "  d          Delete the current partition"
 msgstr "  d          ���������Υѡ��ƥ���������"
 
-#: fdisk/cfdisk.c:2115
+#: fdisk/cfdisk.c:2114
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          ������, �إå�, �ȥ�å�������Υ����������ѹ�"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2115
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             �ٹ�: ���Υ��ץ���󤬲��򤹤��Τ����򤷤Ƥ��ʤ���"
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2116
 msgid "             know what they are doing."
 msgstr "             �ϻ��Ѥ��ƤϤ����ʤ���"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2117
 msgid "  h          Print this screen"
 msgstr "  h          ���β��̤�ɽ��"
 
-#: fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:2118
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          ���������Υѡ��ƥ������Υǥ����������̤����ˤ��롣"
 
-#: fdisk/cfdisk.c:2120
+#: fdisk/cfdisk.c:2119
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             ����: ���Υ��ץ����ϡ�DOS, OS/2 ���ȸߴ����Τʤ�"
 
-#: fdisk/cfdisk.c:2121
+#: fdisk/cfdisk.c:2120
 msgid "             DOS, OS/2, ..."
 msgstr "             �ѡ��ƥ���������������ǽ��������ޤ���"
 
-#: fdisk/cfdisk.c:2122
+#: fdisk/cfdisk.c:2121
 msgid "  n          Create new partition from free space"
 msgstr "  n          �����ΰ褫�鿷���˥ѡ��ƥ����������"
 
-#: fdisk/cfdisk.c:2123
+#: fdisk/cfdisk.c:2122
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          �ѡ��ƥ������������̤ޤ��ϥǥ������˽��Ϥ���"
 
-#: fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:2123
 msgid "             There are several different formats for the partition"
 msgstr "             �ѡ��ƥ������ν��Ϥˤϼ��Τ褦��ʣ���η�����������"
 
-#: fdisk/cfdisk.c:2125
+#: fdisk/cfdisk.c:2124
 msgid "             that you can choose from:"
 msgstr "             �Ǥ���:"
 
-#: fdisk/cfdisk.c:2126
+#: fdisk/cfdisk.c:2125
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - ���ǡ���(�ǥ������˽񤭹��ޤ����󤽤Τ��)"
 
-#: fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:2126
 msgid "                s - Table ordered by sectors"
 msgstr "                s - ��������Υѡ��ƥ���������"
 
-#: fdisk/cfdisk.c:2128
+#: fdisk/cfdisk.c:2127
 msgid "                t - Table in raw format"
 msgstr "                t - ���η����Υѡ��ƥ���������"
 
-#: fdisk/cfdisk.c:2129
+#: fdisk/cfdisk.c:2128
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          �ѡ��ƥ����������񤭹��ޤ��˥ץ�������λ"
 
-#: fdisk/cfdisk.c:2130
+#: fdisk/cfdisk.c:2129
 msgid "  t          Change the filesystem type"
 msgstr "  t          �ե����륷���ƥॿ���פ��ѹ�"
 
-#: fdisk/cfdisk.c:2131
+#: fdisk/cfdisk.c:2130
 msgid "  u          Change units of the partition size display"
 msgstr "  u          ɽ������ѡ��ƥ�����󥵥�����ñ�̤��ѹ�����"
 
-#: fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:2131
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             MB, ������, �������ν�˽۴Ĥ���"
 
-#: fdisk/cfdisk.c:2133
+#: fdisk/cfdisk.c:2132
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          �ѡ��ƥ����������ǥ������˽񤭹���(��ʸ�� W ��"
 
-#: fdisk/cfdisk.c:2134
+#: fdisk/cfdisk.c:2133
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             ���Ϥ��ʤ���Фʤ�ʤ�)�����Υ��ץ����ϥǥ��������"
 
-#: fdisk/cfdisk.c:2135
+#: fdisk/cfdisk.c:2134
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             �ǡ������˲������ǽ�������뤿�ᡢ'yes'�ޤ���'no'����"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2135
 msgid "             `no'"
 msgstr "             �Ϥˤ�ꡢ�񤭹��ߤ�Ԥ����ɤ������ǧ���롣"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2136
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "���������   ��Υѡ��ƥ������˥���������ư"
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2137
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "���������   ���Υѡ��ƥ������˥���������ư"
 
-#: fdisk/cfdisk.c:2139
+#: fdisk/cfdisk.c:2138
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       ���̤������"
 
-#: fdisk/cfdisk.c:2140
+#: fdisk/cfdisk.c:2139
 msgid "  ?          Print this screen"
 msgstr "  ?          ���β��̤�ɽ��"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2141
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "����: ���ޥ�ɤϤ��٤���ʸ������ʸ���ɤ���Ǥ���ѤǤ��ޤ�"
 
-#: fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2142
 msgid "case letters (except for Writes)."
 msgstr "(�񤭹��ߤ����)��"
 
-#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2490 fdisk/fdisksunlabel.c:305
-#: fdisk/fdisksunlabel.c:307
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:312
+#: fdisk/fdisksunlabel.c:314
 msgid "Cylinders"
 msgstr "������"
 
-#: fdisk/cfdisk.c:2173
+#: fdisk/cfdisk.c:2172
 msgid "Change cylinder geometry"
 msgstr "�������Υ�����ȥ���ѹ�"
 
-#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:309
 msgid "Heads"
 msgstr "�إåɿ�"
 
-#: fdisk/cfdisk.c:2174
+#: fdisk/cfdisk.c:2173
 msgid "Change head geometry"
 msgstr "�إåɤΥ�����ȥ���ѹ�"
 
-#: fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2174
 msgid "Change sector geometry"
 msgstr "�������Υ�����ȥ���ѹ�"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2175
 msgid "Done"
 msgstr "��λ"
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2175
 msgid "Done with changing geometry"
 msgstr "������ȥ���ѹ����ƽ�λ"
 
-#: fdisk/cfdisk.c:2189
+#: fdisk/cfdisk.c:2188
 msgid "Enter the number of cylinders: "
 msgstr "�������������Ϥ��Ƥ�������: "
 
-#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2758
+#: fdisk/cfdisk.c:2200 fdisk/cfdisk.c:2762
 msgid "Illegal cylinders value"
 msgstr "�����ʥ�������"
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2206
 msgid "Enter the number of heads: "
 msgstr "�إå��������Ϥ��Ƥ�������: "
 
-#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2768
+#: fdisk/cfdisk.c:2213 fdisk/cfdisk.c:2772
 msgid "Illegal heads value"
 msgstr "�����ʥإåɿ�"
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2219
 msgid "Enter the number of sectors per track: "
 msgstr "�ȥ�å�������Υ������������Ϥ��Ƥ�������: "
 
-#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2775
+#: fdisk/cfdisk.c:2226 fdisk/cfdisk.c:2779
 msgid "Illegal sectors value"
 msgstr "�����ʥ�������"
 
-#: fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2329
 msgid "Enter filesystem type: "
 msgstr "�ե����륷���ƥॿ���פ����Ϥ��Ƥ�������: "
 
-#: fdisk/cfdisk.c:2348
+#: fdisk/cfdisk.c:2347
 msgid "Cannot change FS Type to empty"
 msgstr "�ե����륷���ƥॿ���פ�����ѹ��Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:2350
+#: fdisk/cfdisk.c:2349
 msgid "Cannot change FS Type to extended"
 msgstr "�ե����륷���ƥॿ���פ��ĥ���ѹ��Ǥ��ޤ���"
 
-#: fdisk/cfdisk.c:2373 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2377 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "�֡���"
 
-#: fdisk/cfdisk.c:2375
+#: fdisk/cfdisk.c:2379
 #, c-format
 msgid "Unk(%02X)"
 msgstr "̤��(%02X)"
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2381
+#: fdisk/cfdisk.c:2382 fdisk/cfdisk.c:2385
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2386 fdisk/cfdisk.c:2389
+#: fdisk/cfdisk.c:2390 fdisk/cfdisk.c:2393
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2397
+#: fdisk/cfdisk.c:2401
 msgid "Pri/Log"
 msgstr "����/����"
 
-#: fdisk/cfdisk.c:2473
+#: fdisk/cfdisk.c:2477
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "�ǥ������ɥ饤��: %s"
 
-#: fdisk/cfdisk.c:2476
+#: fdisk/cfdisk.c:2480
 #, c-format
 msgid "Size: %lld bytes"
 msgstr "������: %lld �Х���"
 
-#: fdisk/cfdisk.c:2478
+#: fdisk/cfdisk.c:2482
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "�إå�: %d   �ȥ�å�������Υ�����: %d   ������: %d"
 
-#: fdisk/cfdisk.c:2482
+#: fdisk/cfdisk.c:2486
 msgid "Name"
 msgstr "̾��"
 
-#: fdisk/cfdisk.c:2483
+#: fdisk/cfdisk.c:2487
 msgid "Flags"
 msgstr "�ե饰"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2488
 msgid "Part Type"
 msgstr "�ΰ西����"
 
-#: fdisk/cfdisk.c:2485
+#: fdisk/cfdisk.c:2489
 msgid "FS Type"
 msgstr "FS������"
 
-#: fdisk/cfdisk.c:2486
+#: fdisk/cfdisk.c:2490
 msgid "[Label]"
 msgstr "[��٥�]"
 
-#: fdisk/cfdisk.c:2488
+#: fdisk/cfdisk.c:2492
 msgid "  Sectors"
 msgstr "  ������"
 
-#: fdisk/cfdisk.c:2492
+#: fdisk/cfdisk.c:2496
 msgid "Size (MB)"
 msgstr "������ (MB)"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2498
 msgid "Size (GB)"
 msgstr "������ (GB)"
 
-#: fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2553
 msgid "Bootable"
 msgstr "�֡��Ȳ�"
 
-#: fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2553
 msgid "Toggle bootable flag of the current partition"
 msgstr "���������Υѡ��ƥ������Υ֡��ȥե饰���ڤ��ؤ���"
 
-#: fdisk/cfdisk.c:2550
+#: fdisk/cfdisk.c:2554
 msgid "Delete"
 msgstr "���"
 
-#: fdisk/cfdisk.c:2550
+#: fdisk/cfdisk.c:2554
 msgid "Delete the current partition"
 msgstr "���������Υѡ��ƥ���������"
 
-#: fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2555
 msgid "Geometry"
 msgstr "������ȥ�"
 
-#: fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2555
 msgid "Change disk geometry (experts only)"
 msgstr "�ǥ�����������ȥ���ѹ�����(�������ѡ�����)"
 
-#: fdisk/cfdisk.c:2552
+#: fdisk/cfdisk.c:2556
 msgid "Help"
 msgstr "�إ��"
 
-#: fdisk/cfdisk.c:2552
+#: fdisk/cfdisk.c:2556
 msgid "Print help screen"
 msgstr "�إ�ײ��̤�ɽ��"
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2557
 msgid "Maximize"
 msgstr "���粽"
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2557
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "���������Υѡ��ƥ������Υǥ����������̤���粽(�������ѡ�����)"
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2558
 msgid "New"
 msgstr "��������"
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2558
 msgid "Create new partition from free space"
 msgstr "�����ΰ褫�鿷�����ѡ��ƥ����������"
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2559
 msgid "Print"
 msgstr "ɽ��"
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2559
 msgid "Print partition table to the screen or to a file"
 msgstr "�ѡ��ƥ������������̤ޤ��ϥե�����˽���"
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2560
 msgid "Quit"
 msgstr "��λ"
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2560
 msgid "Quit program without writing partition table"
 msgstr "�ѡ��ƥ����������񤭹��ޤ��˥ץ�������λ"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2561
 msgid "Type"
 msgstr "FS������"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2561
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "�ե����륷���ƥ�Υ����פ��ѹ�����(DOS, Linux, OS/2 �ʤ�)"
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2562
 msgid "Units"
 msgstr "ñ��"
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2562
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "ɽ������ѡ��ƥ�����󥵥�����ñ��(MB, ������, ������)���ѹ�����"
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2563
 msgid "Write"
 msgstr "�񤭹���"
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2563
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "�ѡ��ƥ����������ǥ������˽񤭹���(�ǡ������˲������ǽ������)"
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2609
 msgid "Cannot make this partition bootable"
 msgstr "�����ΰ��֡��Ȳ�ǽ�ˤϤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2615
+#: fdisk/cfdisk.c:2619
 msgid "Cannot delete an empty partition"
 msgstr "�����ΰ�������뤳�ȤϤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2635 fdisk/cfdisk.c:2637
+#: fdisk/cfdisk.c:2639 fdisk/cfdisk.c:2641
 msgid "Cannot maximize this partition"
 msgstr "�����ΰ����粽���뤳�ȤϤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2645
+#: fdisk/cfdisk.c:2649
 msgid "This partition is unusable"
 msgstr "�����ΰ�ϻ��ѤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2647
+#: fdisk/cfdisk.c:2651
 msgid "This partition is already in use"
 msgstr "���Υǥ������ϸ��߻�����Ǥ���"
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2668
 msgid "Cannot change the type of an empty partition"
 msgstr "�����ΰ�Υ����פ��ѹ����뤳�ȤϤǤ��ޤ���"
 
-#: fdisk/cfdisk.c:2691 fdisk/cfdisk.c:2697
+#: fdisk/cfdisk.c:2695 fdisk/cfdisk.c:2701
 msgid "No more partitions"
 msgstr "����ʾ���ΰ�Ϥ���ޤ���"
 
-#: fdisk/cfdisk.c:2704
+#: fdisk/cfdisk.c:2708
 msgid "Illegal command"
 msgstr "�����ʥ��ޥ��"
 
-#: fdisk/cfdisk.c:2714
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+#: fdisk/cfdisk.c:2718
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2725
 #, c-format
 msgid ""
 "\n"
@@ -2110,7 +2253,7 @@ msgstr ""
 "                ��ʤ��\n"
 "\n"
 
-#: fdisk/fdisk.c:247
+#: fdisk/fdisk.c:204
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2130,7 +2273,7 @@ msgstr ""
 "-u: (�������������)��������˥åȤγ��ϡ���λ��Ϳ���ޤ�\n"
 "-b 2048: (������ MO �ɥ饤���Ѥ�) 2048 �Х��ȤΥ�������������Ȥ��ޤ�\n"
 
-#: fdisk/fdisk.c:259
+#: fdisk/fdisk.c:216
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2146,213 +2289,222 @@ msgstr ""
 " ����: fdisk /dev/rd/c0d0  ����: fdisk /dev/ida/c0d0  (RAID �ǥ�������)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:267
+#: fdisk/fdisk.c:224
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s �򳫤��ޤ���\n"
 
-#: fdisk/fdisk.c:270
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s ���ɤ�ޤ���\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "%s �򥷡����Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:276
+#: fdisk/fdisk.c:233
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s �ؤν񤭹��ߤ��Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:279
+#: fdisk/fdisk.c:236
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "%s �Ǥ� BLKGETSIZE ioctl �˼���\n"
 
-#: fdisk/fdisk.c:283
+#: fdisk/fdisk.c:240
 msgid "Unable to allocate any more memory\n"
 msgstr "����ʾ�Υ��꤬���ݤǤ��ޤ���\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:242
 msgid "Fatal error\n"
 msgstr "��̿Ū�ʥ��顼\n"
 
-#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:333 fdisk/fdisk.c:340
-#: fdisk/fdisk.c:363 fdisk/fdisk.c:381 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:348 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:378 fdisk/fdisk.c:396 fdisk/fdisk.c:412 fdisk/fdisk.c:428
+#: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
 msgstr "���ޥ�ɤ�ư��"
 
-#: fdisk/fdisk.c:297
+#: fdisk/fdisk.c:312
 msgid "   a   toggle a read only flag"
 msgstr "   a   �ɹ������ѥե饰��Ĥ���"
 
 #. sun
-#: fdisk/fdisk.c:298 fdisk/fdisk.c:342
+#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
 msgid "   b   edit bsd disklabel"
 msgstr "   b   bsd �ǥ�������٥���Խ�����"
 
-#: fdisk/fdisk.c:299
+#: fdisk/fdisk.c:314
 msgid "   c   toggle the mountable flag"
 msgstr "   c   �ޥ���Ȳ�ǽ�ե饰��Ĥ���"
 
 #. sun
-#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
 msgid "   d   delete a partition"
 msgstr "   d   �ΰ��������"
 
-#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:345
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
 msgid "   l   list known partition types"
 msgstr "   l   ���Τ��ΰ西���פ�ꥹ��ɽ������"
 
 #. sun
-#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:334 fdisk/fdisk.c:346
-#: fdisk/fdisk.c:371 fdisk/fdisk.c:388 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:349 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   ���Υ�˥塼��ɽ������"
 
-#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:347
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
 msgid "   n   add a new partition"
 msgstr "   n   �������ΰ���������"
 
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:335 fdisk/fdisk.c:348
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   �����˶��� DOS �ΰ�ơ��֥���������"
 
-#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:349 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:389
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
 msgid "   p   print the partition table"
 msgstr "   p   �ΰ�ơ��֥��ɽ������"
 
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:351 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr "   q   �ѹ�����¸�����˽�λ����"
 
-#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:337 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   ���� Sun �ǥ�������٥���������"
 
 #. sun
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   t   change a partition's system id"
 msgstr "   t   �ΰ�Υ����ƥ� ID ���ѹ�����"
 
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
 msgid "   u   change display/entry units"
 msgstr "   u   ɽ��/���ܥ�˥åȤ��ѹ�����"
 
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   v   verify the partition table"
 msgstr "   v   �ΰ�ơ��֥��ȹ礹��"
 
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355 fdisk/fdisk.c:377
-#: fdisk/fdisk.c:394
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   w   write table to disk and exit"
 msgstr "   w   �ơ��֥��ǥ������˽񤭹��ߡ���λ����"
 
-#: fdisk/fdisk.c:312 fdisk/fdisk.c:356
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   ���̤ʵ�ǽ (�������ѡ�������)"
 
-#: fdisk/fdisk.c:316
+#: fdisk/fdisk.c:331
 msgid "   a   select bootable partition"
 msgstr "   a   �֡��Ȳ�ǽ�ΰ�����򤹤�"
 
 #. sgi flavour
-#: fdisk/fdisk.c:317
+#: fdisk/fdisk.c:332
 msgid "   b   edit bootfile entry"
 msgstr "   b   �֡��ȥե����륨��ȥ���Խ�����"
 
 #. sgi
-#: fdisk/fdisk.c:318
+#: fdisk/fdisk.c:333
 msgid "   c   select sgi swap partition"
 msgstr "   c   sgi ����å��ΰ�����򤹤�"
 
-#: fdisk/fdisk.c:341
+#: fdisk/fdisk.c:356
 msgid "   a   toggle a bootable flag"
 msgstr "   a   �֡��Ȳ�ǽ�ե饰��Ĥ���"
 
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:358
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   dos �ߴ��ե饰��Ĥ���"
 
-#: fdisk/fdisk.c:364
+#: fdisk/fdisk.c:379
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   ���إ����������ѹ�����"
 
 #. sun
-#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
 msgid "   c   change number of cylinders"
 msgstr "   c   �����������ѹ�����"
 
-#: fdisk/fdisk.c:366 fdisk/fdisk.c:384
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
 msgid "   d   print the raw data in the partition table"
 msgstr "   d   �ΰ�ơ��֥�������ǡ�����ɽ������"
 
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:382
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   ���������;�ꥻ���������ѹ�����"
 
 #. sun
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
 msgid "   h   change number of heads"
 msgstr "   h   �إåɿ����ѹ�����"
 
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:384
 msgid "   i   change interleave factor"
 msgstr "   i   ���󥿡��꡼�֥ե��������ѹ�����"
 
 #. sun
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:385
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   ��ž�����ѹ����� (rpm)"
 
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:391 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   �ᥤ���˥塼�����"
 
-#: fdisk/fdisk.c:375 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   s   change number of sectors/track"
 msgstr "   s   ��������/�ȥ�å����ѹ�����"
 
-#: fdisk/fdisk.c:378
+#: fdisk/fdisk.c:393
 msgid "   y   change number of physical cylinders"
 msgstr "   y   ʪ�������������ѹ�����"
 
-#: fdisk/fdisk.c:382
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   �ΰ���Υǡ�������Ƭ�˰�ư����"
 
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
 msgid "   e   list extended partitions"
 msgstr "   e   ��ĥ�ΰ��ꥹ��ɽ������"
 
 #. !sun
-#: fdisk/fdisk.c:386
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
 msgid "   g   create an IRIX partition table"
 msgstr "   g   IRIX �ΰ�ơ��֥���������"
 
-#: fdisk/fdisk.c:482
+#. !sun
+#: fdisk/fdisk.c:433
+msgid "   f   fix partition order"
+msgstr "   f   �ΰ�ν����Ŭ��������"
+
+#: fdisk/fdisk.c:532
 msgid "You must set"
 msgstr "���ꤹ��ɬ�פ�����ޤ�"
 
-#: fdisk/fdisk.c:496
+#: fdisk/fdisk.c:546
 msgid "heads"
 msgstr "�إåɿ�"
 
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:906 fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:548 fdisk/fdisk.c:1045 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "��������"
 
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:906 fdisk/fdiskbsdlabel.c:442
-#: fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:550 fdisk/fdisk.c:1045 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "��������"
 
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:554
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2361,30 +2513,30 @@ msgstr ""
 "%s%s.\n"
 "���ʤ������̵�ǽ��˥塼���餳���Ԥʤ����Ȥ��Ǥ��ޤ�\n"
 
-#: fdisk/fdisk.c:505
+#: fdisk/fdisk.c:555
 msgid " and "
 msgstr " �ڤ� "
 
-#: fdisk/fdisk.c:539
+#: fdisk/fdisk.c:595
 msgid "Bad offset in primary extended partition\n"
 msgstr "���ܳ�ĥ�ΰ�������ʥ��ե��åȤ�����ޤ�\n"
 
-#: fdisk/fdisk.c:546
+#: fdisk/fdisk.c:609
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "�ٹ�: %d �ʹߤ��ΰ�������ޤ�\n"
 
-#: fdisk/fdisk.c:567
+#: fdisk/fdisk.c:625
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "�ٹ�: �ΰ�ơ��֥� %d ������̤ʥ�󥯥ݥ��󥿤Ǥ�\n"
 
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr "�ٹ�: �ΰ�ơ��֥� %d ������̤ʥǡ�����̵�뤷�ޤ�\n"
 
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:677
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -2395,33 +2547,33 @@ msgstr ""
 "�ǥ�������٥��������ޤ������ʤ����񤭹��ߤ���ꤹ��ޤǡ��ѹ���\n"
 "����������˻Ĥ��ޤ������θ�Ϥ��������������ƤϽ����Բ�ǽ�ˤʤ�ޤ���\n"
 
-#: fdisk/fdisk.c:637
-msgid "You will not be able to write the partition table.\n"
-msgstr "�ΰ�ơ��֥�ν񤭹��ߤ�Ԥ��ޤ���\n"
-
-#: fdisk/fdisk.c:646
+#: fdisk/fdisk.c:701
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "����: �������������� %d �Ǥ� (%d �ǤϤʤ�)\n"
 
-#: fdisk/fdisk.c:694
+#: fdisk/fdisk.c:783
+msgid "You will not be able to write the partition table.\n"
+msgstr "�ΰ�ơ��֥�ν񤭹��ߤ�Ԥ��ޤ���\n"
+
+#: fdisk/fdisk.c:811
 msgid ""
-"Device contains neither a valid DOS partition table, nor Sun or SGI "
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
-"�ǥХ���������� DOS �ΰ�ơ��֥�⡢Sun �� SGI �ǥ�������٥��\n"
+"�ǥХ���������� DOS �ΰ�ơ��֥�⡢Sun, SGI �� OSF �ǥ�������٥��\n"
 "�ޤ�Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:710
+#: fdisk/fdisk.c:827
 msgid "Internal error\n"
 msgstr "�������顼\n"
 
-#: fdisk/fdisk.c:720
+#: fdisk/fdisk.c:849
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "���̤ʳ�ĥ�ΰ� %d ��̵�뤷�ޤ�\n"
 
-#: fdisk/fdisk.c:727
+#: fdisk/fdisk.c:861
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2430,7 +2582,7 @@ msgstr ""
 "�ٹ�: �ΰ�ơ��֥� %2$d �������ʥե饰 0x%1$04x �� w(�񤭹���)�ˤ�ä�\n"
 "����ˤʤ�ޤ�\n"
 
-#: fdisk/fdisk.c:748
+#: fdisk/fdisk.c:883
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2438,65 +2590,65 @@ msgstr ""
 "\n"
 "EOF �� 3 ���ɤߤޤ��� -- ��λ���ޤ�..\n"
 
-#: fdisk/fdisk.c:785
+#: fdisk/fdisk.c:920
 msgid "Hex code (type L to list codes): "
 msgstr "16�ʿ������� (L ���ޥ�ɤǥ����ɥꥹ��ɽ��): "
 
-#: fdisk/fdisk.c:824
+#: fdisk/fdisk.c:959
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, ����� %d): "
 
-#: fdisk/fdisk.c:878
+#: fdisk/fdisk.c:1013
 #, c-format
 msgid "Using default value %d\n"
 msgstr "����� %d ��Ȥ��ޤ�\n"
 
-#: fdisk/fdisk.c:882
+#: fdisk/fdisk.c:1017
 msgid "Value out of range.\n"
 msgstr "�ϰϳ����ͤǤ���\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:1027
 msgid "Partition number"
 msgstr "�ΰ��ֹ�"
 
-#: fdisk/fdisk.c:897
+#: fdisk/fdisk.c:1036
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "�ٹ�: �ΰ� %d �϶��Υ����פǤ���\n"
 
-#: fdisk/fdisk.c:904
+#: fdisk/fdisk.c:1043
 msgid "cylinder"
 msgstr "������"
 
-#: fdisk/fdisk.c:904
+#: fdisk/fdisk.c:1043
 msgid "sector"
 msgstr "������"
 
-#: fdisk/fdisk.c:913
+#: fdisk/fdisk.c:1052
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "%s ��ɽ��/���ܥ�˥åȤ��ѹ����ޤ�\n"
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:1063
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "�ٹ�: �ΰ� %d �ϳ�ĥ�ΰ�Ǥ�\n"
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:1074
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS �ߴ��ե饰�����ꤵ��ޤ���\n"
 
-#: fdisk/fdisk.c:940
+#: fdisk/fdisk.c:1078
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS �ߴ��ե饰�����ꤵ��Ƥ��ޤ���\n"
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1166
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "�ΰ� %d �Ϥޤ�¸�ߤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1031
+#: fdisk/fdisk.c:1171
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2508,7 +2660,7 @@ msgstr ""
 "¿ʬ���Ϥ��ʤ��ȤǤ������ʤ��� `d' ���ޥ�ɤ�ȤäƤ��Υѡ��ƥ�������\n"
 "����Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:1040
+#: fdisk/fdisk.c:1180
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2516,7 +2668,7 @@ msgstr ""
 "���ʤ��ϥѡ��ƥ��������ĥ�ѡ��ƥ��������ѹ��Ǥ��ޤ��󤷡�\n"
 "���εդ�ޤ��Ǥ��ޤ��󡣤ޤ������ԤʤäƤ���������\n"
 
-#: fdisk/fdisk.c:1049
+#: fdisk/fdisk.c:1189
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2525,7 +2677,7 @@ msgstr ""
 "�ΰ� 3 �� Whole disk (5) �Ȥ��ƻĤ��Ƥ������Ȥ��θ���Ƥ���������\n"
 "SunOS/Solaris �Ϥ������Ԥ��ޤ�����Linux �Ǥ������줬˾�ޤ����Ǥ���\n"
 
-#: fdisk/fdisk.c:1055
+#: fdisk/fdisk.c:1195
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2535,52 +2687,52 @@ msgstr ""
 "volume (6) �Ȥ��ƻĤ��Ƥ������Ȥ��θ���Ƥ���������IRIX "
 "�Ϥ������Ԥ��ޤ���\n"
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1209
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr "�ΰ�Υ����ƥॿ���פ� %d ���� %x (%s) ���ѹ����ޤ���\n"
 
-#: fdisk/fdisk.c:1122
+#: fdisk/fdisk.c:1260
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr "�ΰ� %d �ϰۤʤä�ʪ��/�������ϰ��֤ˤʤäƤ��ޤ�(Linux �Ǥ�̵��?):\n"
 
-#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132 fdisk/fdisk.c:1141 fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1262 fdisk/fdisk.c:1270 fdisk/fdisk.c:1279 fdisk/fdisk.c:1288
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     ʪ��=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1125 fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1263 fdisk/fdisk.c:1271
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "����=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1130
+#: fdisk/fdisk.c:1268
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "�ΰ� %d �ϰۤʤä�ʪ��/���������ˤʤäƤ��ޤ�:\n"
 
-#: fdisk/fdisk.c:1139
+#: fdisk/fdisk.c:1277
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "�ΰ� %i �ϥ����������ǻϤޤäƤ��ޤ���:\n"
 
-#: fdisk/fdisk.c:1142
+#: fdisk/fdisk.c:1280
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "(%d, %d, 1) �Ǥ���٤��Ǥ�\n"
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1286
 #, c-format
 msgid "Partition %i does not end on cylinder boundary:\n"
 msgstr "�ΰ� %i �ϥ����������ǽ���äƤ��ޤ���:\n"
 
-#: fdisk/fdisk.c:1151
+#: fdisk/fdisk.c:1289
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "(%d, %d, %d) �Ǥ���٤��Ǥ�\n"
 
-#: fdisk/fdisk.c:1158
+#: fdisk/fdisk.c:1296
 #, c-format
 msgid ""
 "\n"
@@ -2593,18 +2745,28 @@ msgstr ""
 "��˥å� = %s of %d * %d �Х���\n"
 "\n"
 
-#. FIXME! let's see how this shows up with other languagues
-#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1195
+#: fdisk/fdisk.c:1341
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr "�Ԥ��٤����ȤϤ���ޤ��󡣴�������ʽ���ˤʤäƤ��ޤ���\n\n"
+
+#: fdisk/fdisk.c:1407
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s �֡���   ����      ����  �֥��å�   ID  �����ƥ�\n"
 
-#: fdisk/fdisk.c:1196 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1408 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:648
 msgid "Device"
 msgstr "�ǥХ���"
 
-#: fdisk/fdisk.c:1236
+#: fdisk/fdisk.c:1445
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr "\n�ΰ�ơ��֥���ܤ��ǥ������ν���Ȱ��פ��ޤ���\n"
+
+#: fdisk/fdisk.c:1455
 #, c-format
 msgid ""
 "\n"
@@ -2615,104 +2777,104 @@ msgstr ""
 "�ǥ����� %s: �إå� %d, ������ %d, ������ %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1238
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl   Start    Size ID\n"
-msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl   ����   ������ ID\n"
+#: fdisk/fdisk.c:1457
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
+msgstr "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    ����    ������ ID\n"
 
-#: fdisk/fdisk.c:1277
+#: fdisk/fdisk.c:1501
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "�ٹ�: �ΰ� %d �ϥ����� 0 ��ޤ�Ǥ��ޤ�\n"
 
-#: fdisk/fdisk.c:1280
+#: fdisk/fdisk.c:1504
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr "�ΰ� %d: �إå� %d �Ϻ����� %d �����礭���Ǥ�\n"
 
-#: fdisk/fdisk.c:1283
+#: fdisk/fdisk.c:1507
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "�ΰ� %d: ������ %d �Ϻ����� %d �����礭���Ǥ�\n"
 
-#: fdisk/fdisk.c:1286
+#: fdisk/fdisk.c:1510
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr "�ΰ� %d: ������ %d �Ϻ����� %d �����礭���Ǥ�\n"
 
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1514
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "�ΰ� %d: ���Υ����� %d �Ϲ�� %d �Ȱ��פ��ޤ���\n"
 
-#: fdisk/fdisk.c:1320
+#: fdisk/fdisk.c:1546
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "�ٹ�: �ΰ� %d �������ʥǡ������ϰ��֤�����ޤ�\n"
 
-#: fdisk/fdisk.c:1328
+#: fdisk/fdisk.c:1554
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "�ٹ�: �ΰ� %d �ϡ��ΰ� %d �ȽŤʤäƤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1346
+#: fdisk/fdisk.c:1574
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "�ٹ�: �ΰ� %d �϶��Ǥ�\n"
 
-#: fdisk/fdisk.c:1351
+#: fdisk/fdisk.c:1579
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr "�����ΰ� %d ���ΰ� %d ���ΤˤʤäƤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1585
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "��׳��ݥ����� %d �Ϻ����� %d �����礭���Ǥ�\n"
 
-#: fdisk/fdisk.c:1360
+#: fdisk/fdisk.c:1588
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "���ݤ���Ƥ��ʤ��������� %d ����ޤ�\n"
 
-#: fdisk/fdisk.c:1372 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1601 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:496
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "�ΰ� %d ������ѤǤ����ޤ��Ϻ����ԤʤäƤ���������\n"
 
-#: fdisk/fdisk.c:1393 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
-#: fdisk/fdisksunlabel.c:494
+#: fdisk/fdisk.c:1622 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:511
 #, c-format
 msgid "First %s"
 msgstr "�ǽ� %s"
 
-#: fdisk/fdisk.c:1408 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1637 fdisk/fdisksunlabel.c:536
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "������ %d �ϴ��˳��ݺѤߤǤ�\n"
 
-#: fdisk/fdisk.c:1440
+#: fdisk/fdisk.c:1673
 msgid "No free sectors available\n"
 msgstr "���Ѳ�ǽ�ե꡼������������ޤ���\n"
 
-#: fdisk/fdisk.c:1450 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1681 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:546
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "���� %s �ޤ��� +������ �ޤ��� +������M �ޤ��� +������K"
 
-#: fdisk/fdisk.c:1480
+#: fdisk/fdisk.c:1714
 #, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
 msgstr "�ٹ�: �ΰ� %d �ϴ�����������ˤʤäƤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1517 fdisk/fdiskbsdlabel.c:591
+#: fdisk/fdisk.c:1754 fdisk/fdiskbsdlabel.c:611
 msgid "The maximum number of partitions has been created\n"
 msgstr "�����ΰ���Ϻ����ѤǤ�\n"
 
-#: fdisk/fdisk.c:1527
+#: fdisk/fdisk.c:1764
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "��ĥ�ΰ���ɲä������ˡ��ޤ��ΰ��������ɬ�פ�����ޤ�\n"
 
-#: fdisk/fdisk.c:1531
+#: fdisk/fdisk.c:1768
 #, c-format
 msgid ""
 "Command action\n"
@@ -2723,20 +2885,20 @@ msgstr ""
 "   %s\n"
 "   p   �����ΰ� (1-4)\n"
 
-#: fdisk/fdisk.c:1533
+#: fdisk/fdisk.c:1770
 msgid "l   logical (5 or over)"
 msgstr "l   ���� (5 �ʾ�)"
 
-#: fdisk/fdisk.c:1533
+#: fdisk/fdisk.c:1770
 msgid "e   extended"
 msgstr "e   ��ĥ"
 
-#: fdisk/fdisk.c:1550
+#: fdisk/fdisk.c:1787
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "������ `%c' �ˤȤäƤ��������ΰ��ֹ�Ǥ�\n"
 
-#: fdisk/fdisk.c:1582
+#: fdisk/fdisk.c:1822
 msgid ""
 "The partition table has been altered!\n"
 "\n"
@@ -2744,11 +2906,11 @@ msgstr ""
 "�ΰ�ơ��֥�ϸ򴹤���ޤ�����\n"
 "\n"
 
-#: fdisk/fdisk.c:1591
+#: fdisk/fdisk.c:1831
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "ioctl() ��ƤӽФ����ΰ�ơ��֥����ɹ��ߤ��ޤ���\n"
 
-#: fdisk/fdisk.c:1607
+#: fdisk/fdisk.c:1847
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2757,7 +2919,7 @@ msgstr ""
 "�ơ��֥�κ��ɤ߹��ߤ����顼���ơ����� %d �Ǽ���: %s.\n"
 "�ΰ���������������������ˤϥ����ƥ��Ƶ�ư���Ƥ���������\n"
 
-#: fdisk/fdisk.c:1613
+#: fdisk/fdisk.c:1853
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2768,60 +2930,70 @@ msgstr ""
 "�ٹ�: DOS 6.x �ΰ��������ޤ����ѹ����Ƥ��ޤä����ϡ�\n"
 "fdisk �ޥ˥奢��ڡ����ˤ����ɲþ���򻲾Ȥ��Ƥ���������\n"
 
-#: fdisk/fdisk.c:1620
+#: fdisk/fdisk.c:1860
 msgid "Syncing disks.\n"
 msgstr "�ǥ�������Ʊ�������ޤ���\n"
 
-#: fdisk/fdisk.c:1651
+#: fdisk/fdisk.c:1891
 #, c-format
 msgid "Device: %s\n"
 msgstr "�ǥХ���: %s\n"
 
-#: fdisk/fdisk.c:1666
+#: fdisk/fdisk.c:1907
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "�ΰ� %d �˥ǡ����ΰ褬����ޤ���\n"
 
-#: fdisk/fdisk.c:1672
+#: fdisk/fdisk.c:1912
 msgid "New beginning of data"
 msgstr "�����ǡ������ϰ���"
 
-#: fdisk/fdisk.c:1686
+#: fdisk/fdisk.c:1928
 msgid "Expert command (m for help): "
 msgstr "�������ѡ��ȥ��ޥ�� (m �ǥإ��): "
 
-#: fdisk/fdisk.c:1697
+#: fdisk/fdisk.c:1941
 msgid "Number of cylinders"
 msgstr "��������"
 
-#: fdisk/fdisk.c:1718
+#: fdisk/fdisk.c:1967
 msgid "Number of heads"
 msgstr "�إåɿ�"
 
-#: fdisk/fdisk.c:1743
+#: fdisk/fdisk.c:1992
 msgid "Number of sectors"
 msgstr "��������"
 
-#: fdisk/fdisk.c:1746
+#: fdisk/fdisk.c:1995
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "�ٹ�: DOS �ߴ��Τ���Υ��������ե��åȤ����ꤷ�ޤ�\n"
 
-#: fdisk/fdisk.c:1808
+#: fdisk/fdisk.c:2057
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "�ǥ����� %s ��������ΰ�ơ��֥��ޤ�Ǥ��ޤ���\n"
 
-#: fdisk/fdisk.c:1822
+#: fdisk/fdisk.c:2071
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s �򳫤��ޤ���\n"
 
-#: fdisk/fdisk.c:1887
+#: fdisk/fdisk.c:2088
+#, c-format
+msgid "cannot open %s\n"
+msgstr "%s �򳫤��ޤ���\n"
+
+#: fdisk/fdisk.c:2109
+#, c-format
+msgid "%c: unknown command\n"
+msgstr "%c: ̤�ΤΥ��ޥ��\n"
+
+#: fdisk/fdisk.c:2160
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "���Υ����ͥ�ϥ�������������ʬǧ�����ޤ� -- -b ���ץ�����̵�뤷�ޤ�\n"
 
-#: fdisk/fdisk.c:1890
+#: fdisk/fdisk.c:2163
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -2829,11 +3001,20 @@ msgstr ""
 "�ٹ�: -b (����������������) ���ץ����� 1 �ĤΥǥХ�������ȶ���\n"
 "���Ѥ����٤��Ǥ�\n"
 
-#: fdisk/fdisk.c:1948
+#: fdisk/fdisk.c:2226
+#, c-format
+msgid ""
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
+msgstr ""
+"%s ��OSF/1 �ǥ�������٥�򸡽Ф����Τǡ��ǥ�������٥�⡼�ɤ˰ܹԤ��ޤ���\n"
+"DOS �ΰ�ơ��֥�⡼�ɤ����ˤϡ�'r' ���ޥ�ɤ�Ȥ��ޤ��礦��\n"
+
+#: fdisk/fdisk.c:2235
 msgid "Command (m for help): "
 msgstr "���ޥ�� (m �ǥإ��): "
 
-#: fdisk/fdisk.c:1962
+#: fdisk/fdisk.c:2251
 #, c-format
 msgid ""
 "\n"
@@ -2842,15 +3023,15 @@ msgstr ""
 "\n"
 "���ߤΥ֡��ȥե������: %s\n"
 
-#: fdisk/fdisk.c:1964
+#: fdisk/fdisk.c:2253
 msgid "Please enter the name of the new boot file: "
 msgstr "�����ʥ֡��ȥե�����̾�����Ϥ��Ƥ�������: "
 
-#: fdisk/fdisk.c:1966
+#: fdisk/fdisk.c:2255
 msgid "Boot file unchanged\n"
 msgstr "�֡��ȥե�������ѹ����ޤ���Ǥ���\n"
 
-#: fdisk/fdisk.c:2026
+#: fdisk/fdisk.c:2319
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -2860,7 +3041,7 @@ msgstr ""
 "\t��ǰ�ʤ��� SGI �ΰ�ơ��֥��ѤΥ������ѡ��ȥ�˥塼��\n"
 "\t�Ѱդ���Ƥ��ޤ���\n"
 
-#: fdisk/fdiskaixlabel.c:29
+#: fdisk/fdiskaixlabel.c:28
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -2888,7 +3069,7 @@ msgstr ""
 "           ɬ���ǥ�������������ǥ������������Ƥ���������(¾����ˡ\n"
 "           �Ȥ��Ƥϡ����ʤ���ã��(AIXpert)�ˤʤ뤳�ȤǤ�)"
 
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:117
 #, c-format
 msgid ""
 "\n"
@@ -2897,163 +3078,167 @@ msgstr ""
 "\n"
 "BSD ��٥��ѥǥХ���: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:125
 msgid "   d   delete a BSD partition"
 msgstr "   d   BSD �ΰ��������"
 
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
 msgstr "   e   �ɥ饤�֥ǡ������Խ�����"
 
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
 msgstr "   i   �֡��ȥ��ȥ�åפ򥤥󥹥ȡ��뤹��"
 
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
 msgstr "   l   ���ΤΥե����륷���ƥॿ���פ�ꥹ��ɽ������"
 
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   n   add a new BSD partition"
 msgstr "   n   ������ BSD �ΰ���������"
 
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   p   print BSD partition table"
 msgstr "   p   BSD �ΰ�ơ��֥��ɽ������"
 
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
 msgstr "   s   �����ʥǥ�������٥��ɽ������"
 
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
 msgstr "   t   �ΰ�Υե����륷���ƥ� ID ���ѹ�����"
 
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   ��˥åȤ��ѹ�(������/������)"
+
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
 msgstr "   w   �ǥ�������٥��ǥ������˽񤭹���"
 
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   BSD �ΰ���� BSD �ΰ�ȥ�󥯤���"
 
-#: fdisk/fdiskbsdlabel.c:146
+#: fdisk/fdiskbsdlabel.c:168
 #, c-format
-msgid "Partition %s%d has invalid starting sector 0.\n"
-msgstr "�ΰ� %s%d �������ʻ��������� 0 �ǻϤޤäƤ��ޤ���\n"
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "�ΰ� %s �������ʻ��������� 0 �ǻϤޤäƤ��ޤ���\n"
 
-#: fdisk/fdiskbsdlabel.c:150
+#: fdisk/fdiskbsdlabel.c:172
 #, c-format
-msgid "Reading disklabel of %s%d at sector %d.\n"
-msgstr "%s%d �Υǥ�������٥�Υ����� %d ���ɹ��ߤޤ���\n"
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "%s �Υǥ�������٥�Υ����� %d ���ɹ��ߤޤ���\n"
 
-#: fdisk/fdiskbsdlabel.c:159
+#: fdisk/fdiskbsdlabel.c:182
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
 msgstr "%s �ˤ� *BSD �ΰ�Ϥ���ޤ���\n"
 
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
 msgstr "BSD �ǥ�������٥륳�ޥ�� (m �ǥإ��): "
 
-#: fdisk/fdiskbsdlabel.c:286
+#: fdisk/fdiskbsdlabel.c:310
 #, c-format
 msgid "type: %s\n"
 msgstr "������: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:312
 #, c-format
 msgid "type: %d\n"
 msgstr "������: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:289
+#: fdisk/fdiskbsdlabel.c:313
 #, c-format
 msgid "disk: %.*s\n"
 msgstr "�ǥ�����: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
 msgstr "��٥�: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:315
 msgid "flags:"
 msgstr "�ե饰:"
 
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:317
 msgid " removable"
 msgstr " ��Ф���ǽ"
 
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
 msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
 msgstr " badsect"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:301
+#: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr "�Х���/������: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:302
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr "������/�ȥ�å�: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr "�ȥ�å�/������: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr "������/������: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:329
 #, c-format
 msgid "cylinders: %ld\n"
 msgstr "������: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
 msgstr "��ž��: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
 msgstr "interleave: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "trackskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "cylinderskew: %d\n"
 msgstr "cylinderskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr "headswitch: %ld\t\t# �ߥ���\n"
 
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr "track-to-track seek: %ld\t# �ߥ���\n"
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
 msgstr "drivedata: "
 
-#: fdisk/fdiskbsdlabel.c:321
+#: fdisk/fdiskbsdlabel.c:347
 #, c-format
 msgid ""
 "\n"
@@ -3062,113 +3247,98 @@ msgstr ""
 "\n"
 "%d �Ĥ��ΰ�:\n"
 
-#: fdisk/fdiskbsdlabel.c:322
-msgid "#        size   offset    fstype   [fsize bsize   cpg]\n"
-msgstr "#      ������ ���ե��å�  fs ��   [fsize bsize   cpg]\n"
-
-#: fdisk/fdiskbsdlabel.c:378
-#, c-format
-msgid "Writing disklabel to %s%d.\n"
-msgstr "%s%d �˥ǥ�������٥��񤭹��ߤޤ���\n"
+#: fdisk/fdiskbsdlabel.c:348
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr "#       ����       ��λ    ������     fs ��    [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:381
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, c-format
 msgid "Writing disklabel to %s.\n"
 msgstr "%s �˥ǥ�������٥��񤭹��ߤޤ���\n"
 
-#: fdisk/fdiskbsdlabel.c:393
-#, c-format
-msgid "%s%d contains no disklabel.\n"
-msgstr "%s%d �ϥǥ�������٥��ޤ�Ǥ��ޤ���\n"
-
-#: fdisk/fdiskbsdlabel.c:396
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
 msgstr "%s �ϥǥ�������٥��ޤ�Ǥ��ޤ���\n"
 
-#: fdisk/fdiskbsdlabel.c:400
+#: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
 msgstr "�ǥ�������٥��������ޤ���? (y/n) "
 
-#: fdisk/fdiskbsdlabel.c:439
+#: fdisk/fdiskbsdlabel.c:458
 msgid "bytes/sector"
 msgstr "�Х���/������"
 
-#: fdisk/fdiskbsdlabel.c:440
+#: fdisk/fdiskbsdlabel.c:459
 msgid "sectors/track"
 msgstr "������/�ȥ�å�"
 
-#: fdisk/fdiskbsdlabel.c:441
+#: fdisk/fdiskbsdlabel.c:460
 msgid "tracks/cylinder"
 msgstr "�ȥ�å�/������"
 
-#: fdisk/fdiskbsdlabel.c:449
+#: fdisk/fdiskbsdlabel.c:468
 msgid "sectors/cylinder"
 msgstr "������/������"
 
-#: fdisk/fdiskbsdlabel.c:453
+#: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr ""
 "�ǥե���Ȥ� sectors/track * tracks/cylinder �ʲ��Ǥʤ���Фʤ�ʤ���\n"
 
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
 msgstr "rpm"
 
-#: fdisk/fdiskbsdlabel.c:456
+#: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
 msgstr "interleave"
 
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
 msgstr "trackskew"
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:477
 msgid "cylinderskew"
 msgstr "cylinderskew"
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
 msgstr "headswitch"
 
-#: fdisk/fdiskbsdlabel.c:460
+#: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
 msgstr "track-to-track seek"
 
-#: fdisk/fdiskbsdlabel.c:501
+#: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "�֡��ȥ��ȥ�å�: %sboot -> boot%s (%s): "
 
-#: fdisk/fdiskbsdlabel.c:527
+#: fdisk/fdiskbsdlabel.c:546
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr "�֡��ȥ��ȥ�åפ��ǥ�������٥�ȽŤʤäƤ��ޤ���\n"
 
-#: fdisk/fdiskbsdlabel.c:548
-#, c-format
-msgid "Bootstrap installed on %s%d.\n"
-msgstr "�֡��ȥ��ȥ�åפ� %s%d �˥��󥹥ȡ��뤵��ޤ�����\n"
-
-#: fdisk/fdiskbsdlabel.c:550
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr "�֡��ȥ��ȥ�åפ� %s �˥��󥹥ȡ��뤵��ޤ�����\n"
 
-#: fdisk/fdiskbsdlabel.c:571
+#: fdisk/fdiskbsdlabel.c:591
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "�ΰ� (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:602
+#: fdisk/fdiskbsdlabel.c:622
 msgid "This partition already exists.\n"
 msgstr "�����ΰ�Ϥ��Ǥ�¸�ߤ��ޤ���\n"
 
-#: fdisk/fdiskbsdlabel.c:724
+#: fdisk/fdiskbsdlabel.c:742
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "�ٹ�: �ΰ褬¿�����ޤ� (%d, ����� %d)��\n"
 
-#: fdisk/fdiskbsdlabel.c:770
+#: fdisk/fdiskbsdlabel.c:789
 msgid ""
 "\n"
 "Syncing disks.\n"
@@ -3176,68 +3346,72 @@ msgstr ""
 "\n"
 "�ǥ�������Ʊ�������ޤ���\n"
 
-#: fdisk/fdisksgilabel.c:56
+#: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
 msgstr "SGI volhdr"
 
-#: fdisk/fdisksgilabel.c:57
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI trkrepl"
 msgstr "SGI trkrepl"
 
-#: fdisk/fdisksgilabel.c:58
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI secrepl"
 msgstr "SGI secrepl"
 
-#: fdisk/fdisksgilabel.c:59
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI raw"
 msgstr "SGI raw"
 
-#: fdisk/fdisksgilabel.c:60
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI bsd"
 msgstr "SGI bsd"
 
-#: fdisk/fdisksgilabel.c:61
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI sysv"
 msgstr "SGI sysv"
 
-#: fdisk/fdisksgilabel.c:62
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI volume"
 msgstr "SGI volume"
 
-#: fdisk/fdisksgilabel.c:63
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI efs"
 msgstr "SGI efs"
 
-#: fdisk/fdisksgilabel.c:64
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI lvol"
 msgstr "SGI lvol"
 
-#: fdisk/fdisksgilabel.c:65
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI rlvol"
 msgstr "SGI rlvol"
 
-#: fdisk/fdisksgilabel.c:66
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI xfs"
 msgstr "SGI xfs"
 
-#: fdisk/fdisksgilabel.c:67
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xlvol"
 msgstr "SGI xlvol"
 
-#: fdisk/fdisksgilabel.c:68
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI rxlvol"
 msgstr "SGI rxlvol"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux ����å�"
 
-#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:143
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:158
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
@@ -3245,11 +3419,11 @@ msgstr ""
 "MIPS Computer Systems, Inc �ˤ��ȡ����Υ�٥�� 512 �Х��Ȱʾ�Ǥʤ����\n"
 "�ʤ�ޤ���\n"
 
-#: fdisk/fdisksgilabel.c:162
+#: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "�ְ�ä������å������ͤ� sgi �ǥ�������٥�򸡽Ф��ޤ�����\n"
 
-#: fdisk/fdisksgilabel.c:186
+#: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
 "\n"
@@ -3268,7 +3442,7 @@ msgstr ""
 "��˥å� = %s of %d * 512 �Х���\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:199
+#: fdisk/fdisksgilabel.c:213
 #, c-format
 msgid ""
 "\n"
@@ -3281,7 +3455,7 @@ msgstr ""
 "��˥å� = %s of %d * 512 �Х���\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:205
+#: fdisk/fdisksgilabel.c:219
 #, c-format
 msgid ""
 "----- partitions -----\n"
@@ -3290,7 +3464,7 @@ msgstr ""
 "----- �ΰ� -----\n"
 "%*s  ����      ����        ����   ������   ID  �����ƥ�\n"
 
-#: fdisk/fdisksgilabel.c:227
+#: fdisk/fdisksgilabel.c:241
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3301,12 +3475,12 @@ msgstr ""
 "�֡��ȥե�����: %s\n"
 "----- �ǥ��쥯�ȥ���� -----\n"
 
-#: fdisk/fdisksgilabel.c:237
+#: fdisk/fdisksgilabel.c:251
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s ������%5u ������%8u\n"
 
-#: fdisk/fdisksgilabel.c:298
+#: fdisk/fdisksgilabel.c:305
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3318,7 +3492,7 @@ msgstr ""
 "\t���Υ֡��ȥե�����������󥼥��ѥ�̾�Ǥʤ���Фʤ�ޤ���\n"
 "\t��. \"/unix\" �ޤ��� \"/unix.save\"\n"
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:312
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
@@ -3326,7 +3500,7 @@ msgstr ""
 "\n"
 "\t�֡��ȥե�����̾��Ĺ�����ޤ� -- ���� 16 �Х��ȡ�\n"
 
-#: fdisk/fdisksgilabel.c:310
+#: fdisk/fdisksgilabel.c:317
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
@@ -3334,7 +3508,7 @@ msgstr ""
 "\n"
 "\t�֡��ȥե�����ϥե�ѥ��ǻ��ꤵ��ʤ���Фʤ�ޤ���\n"
 
-#: fdisk/fdisksgilabel.c:315
+#: fdisk/fdisksgilabel.c:322
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3344,7 +3518,7 @@ msgstr ""
 "\t�֡��ȥե�����Ϥ���¸�ߤ�����å�����ʤ����Ȥ˵��Ť��Ƥ���������\n"
 "\tSGI �ν���ͤ� \"/unix\" �ǡ��Хå����å��Ѥˤ� \"/unix.save\" �Ǥ���\n"
 
-#: fdisk/fdisksgilabel.c:343
+#: fdisk/fdisksgilabel.c:350
 #, c-format
 msgid ""
 "\n"
@@ -3357,7 +3531,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr "ʣ���� entire disk �ι��ܤ�����ޤ���\n"
 
-#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:472
 msgid "No partitions defined\n"
 msgstr "�ΰ褬�������Ƥ��ޤ���\n"
 
@@ -3454,23 +3628,23 @@ msgstr ""
 "�����ΰ�˰ۤʤ륿���դ��ˤĤ��ơ��褯��äƤ���ʤ� YES �����Ϥ��Ʋ�������\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:621
+#: fdisk/fdisksgilabel.c:607
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "�ǥ��������ΰ�Ʊ�Τ���ʣ���Ƥ��뤳�Ȥ��ΤäƤޤ�����\n"
 
-#: fdisk/fdisksgilabel.c:691
+#: fdisk/fdisksgilabel.c:669
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "entire disk ���ܤμ�ư�������ߤޤ���\n"
 
-#: fdisk/fdisksgilabel.c:698
+#: fdisk/fdisksgilabel.c:676
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "entire disk �������ΰ��ʤ�äƤ��ޤ���\n"
 
-#: fdisk/fdisksgilabel.c:703
+#: fdisk/fdisksgilabel.c:681
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "�ǥ��������ΰ褬��ʣ���Ƥ��ޤ����ޤ�����򲿤Ȥ����ޤ��礦��\n"
 
-#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3478,32 +3652,32 @@ msgstr ""
 "11 ���ܤ��ΰ�� entire disk ��ʤ����`SGI volume' ���Ǥ��뤳�Ȥ�\n"
 "�����侩���ޤ�\n"
 
-#: fdisk/fdisksgilabel.c:728
+#: fdisk/fdisksgilabel.c:706
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr "�ǥ��������ΰ褬��ʣ���뤳�Ȥˤʤ�ޤ����ޤ�����򲿤Ȥ����ޤ��礦��\n"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:711
 #, c-format
 msgid " Last %s"
 msgstr " �Ǹ�� %s"
 
-#: fdisk/fdisksgilabel.c:756
+#: fdisk/fdisksgilabel.c:733
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
-"content will be unrecoverable lost.\n"
+"content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
-"������ SGI �ǥ�������٥빽����ˤϡ��ѹ��Ϥ��ν񤭹��ߤ���ꤹ��ޤ�\n"
+"������ SGI �ǥ�������٥빽�ۻ����ѹ��Ϥ��ν񤭹��ߤ���ꤹ��ޤ�\n"
 "������ˤΤ�ȿ�Ǥ���ޤ������θ�Ϥ�����󡢰��������Ƥϼ���졢\n"
 "�������Բ�ǽ�Ȥʤ�ޤ���\n"
 
-#: fdisk/fdisksgilabel.c:784
+#: fdisk/fdisksgilabel.c:761
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "�ΰ� %d ���ͤ���¸���ߤޤ���\n"
 
-#: fdisk/fdisksgilabel.c:786
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\t����=%d\tĹ��=%d\n"
@@ -3540,7 +3714,7 @@ msgstr "SunOS var"
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:122
+#: fdisk/fdisksunlabel.c:123
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
@@ -3552,12 +3726,12 @@ msgstr ""
 "��. �إåɿ����������������������ڤӥѡ��ƥ�������\n"
 "���뤤�� fresh label �������Ƥ������� (�ᥤ���˥塼�� s ���ޥ��)\n"
 
-#: fdisk/fdisksunlabel.c:215
+#: fdisk/fdisksunlabel.c:222
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "��ư����� %s%s%s �򸫤Ĥ��ޤ���\n"
 
-#: fdisk/fdisksunlabel.c:242
+#: fdisk/fdisksunlabel.c:249
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -3567,7 +3741,7 @@ msgstr ""
 "������ sun disklabel ���ۤ��ޤ����ѹ��Ϥ��ʤ����񤭹��ߤ���ꤹ��ޤǡ�\n"
 "����ˤΤ߻Ĥ��ޤ������θ�Ϥ�����󡢰��������Ƥ������Ǥ��ޤ���\n"
 
-#: fdisk/fdisksunlabel.c:253
+#: fdisk/fdisksunlabel.c:260
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3577,71 +3751,71 @@ msgstr ""
 "   ?   ��ư����\n"
 "   0   �������� (�ϡ��ɥ����������Ф����ͤ����ͤȤ���)"
 
-#: fdisk/fdisksunlabel.c:263
+#: fdisk/fdisksunlabel.c:270
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "�����פ�����Ǥ������� (? �Ǽ�ư��0 �ǥ�������): "
 
-#: fdisk/fdisksunlabel.c:275
+#: fdisk/fdisksunlabel.c:282
 msgid "Autoconfigure failed.\n"
 msgstr "��ư���꤬���Ԥ��ޤ�����\n"
 
-#: fdisk/fdisksunlabel.c:303
+#: fdisk/fdisksunlabel.c:310
 msgid "Sectors/track"
 msgstr "������/�ȥ�å�"
 
-#: fdisk/fdisksunlabel.c:310
+#: fdisk/fdisksunlabel.c:317
 msgid "Alternate cylinders"
 msgstr "���إ�������"
 
-#: fdisk/fdisksunlabel.c:313
+#: fdisk/fdisksunlabel.c:320
 msgid "Physical cylinders"
 msgstr "ʪ����������"
 
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+#: fdisk/fdisksunlabel.c:323 fdisk/fdisksunlabel.c:698
 msgid "Rotation speed (rpm)"
 msgstr "��ž�� (rpm)"
 
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisksunlabel.c:325 fdisk/fdisksunlabel.c:691
 msgid "Interleave factor"
 msgstr "���󥿡��꡼��"
 
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:328 fdisk/fdisksunlabel.c:684
 msgid "Extra sectors per cylinder"
 msgstr "������������̤ʥ�����"
 
-#: fdisk/fdisksunlabel.c:334
+#: fdisk/fdisksunlabel.c:342
 msgid "You may change all the disk params from the x menu"
 msgstr "���ƤΥǥ������ѥ�᡼���� x ��˥塼�����ѹ��Ǥ��ޤ�"
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:348
 msgid "3,5\" floppy"
 msgstr "3,5\" �ե��åԡ�"
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:348
 msgid "Linux custom"
 msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:418
+#: fdisk/fdisksunlabel.c:435
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "�ѡ��ƥ������ %d �ϥ����������ǽ���äƤ��ޤ���\n"
 
-#: fdisk/fdisksunlabel.c:438
+#: fdisk/fdisksunlabel.c:455
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "�ѡ��ƥ������ %d ��¾�Υ����� %d-%d �ȽŤʤäƤ��ޤ�\n"
 
-#: fdisk/fdisksunlabel.c:460
+#: fdisk/fdisksunlabel.c:477
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "̤���ѥ���å� -- 0-%d ������\n"
 
-#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:479 fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "̤���ѥ���å� -- %d-%d ������\n"
 
-#: fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:506
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3649,7 +3823,7 @@ msgstr ""
 "¾�Υѡ��ƥ�����󤬴��˥ǥ��������Τ�ʤ�äƤ��ޤ���\n"
 "�ޤ�����������Ƥ���⤦���ٻ�Ƥ���������\n"
 
-#: fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksunlabel.c:564
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3660,7 +3834,7 @@ msgstr ""
 "¾�Τ����Ĥ��Υѡ��ƥ�������ʤ�äƤ��ޤ������ʤ��ι��ܤ� %d %s ��\n"
 "�ѹ�����ޤ�����\n"
 
-#: fdisk/fdisksunlabel.c:567
+#: fdisk/fdisksunlabel.c:584
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3670,7 +3844,7 @@ msgstr ""
 "Whole disk (5) �Τޤޤˤ��Ƥ������Ȥ��θ���Ƥ���������\n"
 "0 ����Ϥޤ� %u ������ʬ�Ǥ�\n"
 
-#: fdisk/fdisksunlabel.c:580
+#: fdisk/fdisksunlabel.c:597
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3684,7 +3858,7 @@ msgstr ""
 "�⤷�����ʤ��������˥ѡ��ƥ���������� 82 (Linux swap) ��Ĥ��������\n"
 "YES �������Ƥ�������: "
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:628
 #, c-format
 msgid ""
 "\n"
@@ -3703,7 +3877,7 @@ msgstr ""
 "��˥å� = %s of %d * 512 �Х���\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:642
 #, c-format
 msgid ""
 "\n"
@@ -3716,16 +3890,16 @@ msgstr ""
 "��˥å� = %s of %d * 512 �Х���\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:647
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s �ե饰  ����        ����   �֥��å� ID  �����ƥ�\n"
 
-#: fdisk/fdisksunlabel.c:655
+#: fdisk/fdisksunlabel.c:672
 msgid "Number of alternate cylinders"
 msgstr "���إ�������"
 
-#: fdisk/fdisksunlabel.c:688
+#: fdisk/fdisksunlabel.c:705
 msgid "Number of physical cylinders"
 msgstr "ʪ����������"
 
@@ -3837,278 +4011,297 @@ msgid "NEC DOS"
 msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr "Plan 9"
+
+#: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
 msgstr "PartitionMagic ����"
 
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
 msgstr "Venix 80286"
 
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
 msgstr "PPC PReP Boot"
 
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:36
 msgid "SFS"
 msgstr "SFS"
 
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
 msgstr "QNX4.x"
 
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
 msgstr "QNX4.x 2nd part"
 
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
 msgstr "QNX4.x 3rd part"
 
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
 msgstr "OnTrack DM"
 
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
 msgstr "OnTrack DM6 Aux1"
 
 #. (or Novell)
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
 #. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "OnTrack DM6 Aux3"
 
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
 msgstr "OnTrackDM6"
 
-#: fdisk/i386_sys_types.c:44
+#: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
 msgstr "EZ-Drive"
 
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
 msgstr "Golden Bow"
 
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
 msgstr "Priam Edisk"
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
-#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:81 fdisk/i386_sys_types.c:82
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD �ޤ��� SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
 
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
 msgstr "Novell Netware 386"
 
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
 msgstr "DiskSecure Multi-Boot"
 
-#: fdisk/i386_sys_types.c:52
+#: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
 msgstr "PC/IX"
 
-#: fdisk/i386_sys_types.c:53
+#: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
 msgstr "�Ť� Minix"
 
 #. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Minix / �Ť� Linux"
 
-#: fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "OS/2 ���� C: �ɥ饤��"
 
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
 msgstr "Linux ��ĥ�ΰ�"
 
-#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
 msgstr "NTFS �ܥ�塼�ॻ�å�"
 
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
 msgstr "Amoeba"
 
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
 #. (bad block table)
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:65
+msgid "BSD/OS"
+msgstr "BSD/OS"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
 msgstr "IBM Thinkpad �ϥ��Х͡������"
 
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
 msgstr "BSD/386"
 
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
 msgstr "NeXTSTEP"
 
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
 msgstr "BSDI fs"
 
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
 msgstr "BSDI ����å�"
 
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
 msgstr "DRDOS/sec (FAT-12)"
 
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr "DRDOS/sec (FAT-16 < 32M)"
 
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16)"
 msgstr "DRDOS/sec (FAT-16)"
 
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
 msgid "Syrinx"
 msgstr "Syrinx"
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:76
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
 #. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:74
+#: fdisk/i386_sys_types.c:77
 msgid "DOS access"
 msgstr "DOS access"
 
 #. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:75
+#: fdisk/i386_sys_types.c:78
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
 #. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:77
+#: fdisk/i386_sys_types.c:80
 msgid "BeOS fs"
 msgstr "BeOS fs"
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:80
+#: fdisk/i386_sys_types.c:83
 msgid "DOS secondary"
 msgstr "DOS ���������"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:84
 msgid "Linux raid autodetect"
 msgstr "Linux raid ��ư����"
 
 #. New (2.2.x) raid partition with autodetect
 #. using persistent superblock
-#: fdisk/i386_sys_types.c:83
+#: fdisk/i386_sys_types.c:86
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:87
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:147
+#: fdisk/sfdisk.c:152
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "%s �Υ��������顼 -- %lu �򥷡����Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:157
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "���������顼: 0x%08x%08x �ΤϤ��Ǥ����� 0x%08x%08x ��������ޤ���\n"
 
-#: fdisk/sfdisk.c:198
+#: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
 msgstr "���꤬��ޤ��� -- ����ޤ�\n"
 
-#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "%s ���ɤ߼�ꥨ�顼 -- ������ %lu ���ɤ�ޤ���\n"
 
-#: fdisk/sfdisk.c:218
+#: fdisk/sfdisk.c:224
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "���顼: ������ %lu �ˤ� msdos �����󤬤���ޤ���\n"
 
-#: fdisk/sfdisk.c:235
+#: fdisk/sfdisk.c:241
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "%s �ؤν񤭹��ߥ��顼 -- ������ %lu �˽񤭹���ޤ���\n"
 
-#: fdisk/sfdisk.c:273
+#: fdisk/sfdisk.c:279
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr "�ѡ��ƥ�����󥻥�����¸�ե����� (%s) �򥪡��ץ�Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:297
 #, c-format
 msgid "write error on %s\n"
 msgstr "%s �ؤν񤭹��ߥ��顼\n"
 
-#: fdisk/sfdisk.c:309
+#: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "�ѡ��ƥ�����������ե����� (%s) �ξ��������Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:320
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 "�ѡ��ƥ�����������ե�����Υ��������ְ�äƤ��ޤ� -- ������Ԥʤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:318
+#: fdisk/sfdisk.c:324
 msgid "out of memory?\n"
 msgstr "���꤬��ʤ���\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "�ѡ��ƥ�����������ե����� (%s) �򳫤��ޤ���\n"
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:336
 #, c-format
 msgid "error reading %s\n"
 msgstr "%s ���ɤ߼�ꥨ�顼\n"
 
-#: fdisk/sfdisk.c:337
+#: fdisk/sfdisk.c:343
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "�ǥХ��� %s ��񤭹��ߤ褦�˥����ץ�Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:349
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "%2$s �Υ����� %1$lu �ؤν񤭹��ߥ��顼\n"
 
-#: fdisk/sfdisk.c:415
+#: fdisk/sfdisk.c:406
+#, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "�ǥ����� %s: ������������Ǥ��ޤ���\n"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "�ǥ����� %s: ������ȥ������Ǥ��ޤ���\n"
+
+#: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
 "Warning: start=%d - this looks like a partition rather than\n"
@@ -4120,27 +4313,22 @@ msgstr ""
 "������ fdisk �����Ѥ���Τ�¿ʬ��̣���ʤ����ȤǤ���\n"
 "[�����ˤ����Ԥʤ�������С�--force ���ץ�����ȤäƤ�������]\n"
 
-#: fdisk/sfdisk.c:421
+#: fdisk/sfdisk.c:442
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
-msgstr "�ٹ�: HDIO_GETGEO �ϥإåɿ��� %d ���֤��ޤ���\n"
+msgstr "�ٹ�: HDIO_GETGEO �ˤ��ȡ��إåɿ��� %d �Ǥ�\n"
 
-#: fdisk/sfdisk.c:424
+#: fdisk/sfdisk.c:445
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
-msgstr "�ٹ�: HDIO_GETGEO �ϥ��������� %d ���֤��ޤ���\n"
+msgstr "�ٹ�: HDIO_GETGEO �ˤ��ȡ����������� %d �Ǥ�\n"
 
-#: fdisk/sfdisk.c:427
+#: fdisk/sfdisk.c:449
 #, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
-msgstr "�ٹ�: HDIO_GETGEO �ϥ��������� %d ���֤��ޤ���\n"
-
-#: fdisk/sfdisk.c:431
-#, c-format
-msgid "Disk %s: cannot get geometry\n"
-msgstr "�ǥ����� %s: ������ȥ������Ǥ��ޤ���\n"
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
+msgstr "�ٹ�: BLKGETSIZE/HDIO_GETGEO �ˤ��ȡ����������� %d �Ǥ�\n"
 
-#: fdisk/sfdisk.c:433
+#: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%d) - usually at most 63\n"
@@ -4150,7 +4338,7 @@ msgstr ""
 "����ϡ�C/H/S �򥢥ɥ쥹���������Ѥ��Ƥ������ƤΥ��եȥ������ǡ�\n"
 "���꤬�����뤳�Ȥˤʤ�ޤ���\n"
 
-#: fdisk/sfdisk.c:437
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid ""
 "\n"
@@ -4159,7 +4347,7 @@ msgstr ""
 "\n"
 "�ǥ����� %s: �������� %lu���إåɿ� %lu��%lu ������/�ȥ�å�\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:539
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
@@ -4167,7 +4355,7 @@ msgstr ""
 "�ѡ��ƥ������ %2$s �Υإåɿ��Ȥ��� %1$s ���Բ�ǽ�Ǥ�: %3$d\n"
 "   (0-%4$d �ˤ��Ƥ�������)\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:544
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
@@ -4175,7 +4363,7 @@ msgstr ""
 "�ѡ��ƥ������ %2$s �Υ��������Ȥ��� %1$s ���Բ�ǽ�Ǥ�: %3$d\n"
 "   (1-%4$d �Ǥʤ���Фʤ�ޤ���)\n"
 
-#: fdisk/sfdisk.c:527
+#: fdisk/sfdisk.c:549
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %d (should be in "
@@ -4184,7 +4372,7 @@ msgstr ""
 "�ѡ��ƥ������ %2$s �Υ��������Ȥ��� %1$s ���Բ�ǽ�Ǥ�: %3$d\n"
 "   (0-%4$d �Ǥʤ���Фʤ�ޤ���)\n"
 
-#: fdisk/sfdisk.c:566
+#: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4192,11 +4380,11 @@ msgstr ""
 "Id  ̾��\n"
 "\n"
 
-#: fdisk/sfdisk.c:719
+#: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
 msgstr "�ѡ��ƥ������ơ��֥����ɤ߹�����...\n"
 
-#: fdisk/sfdisk.c:725
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4204,31 +4392,31 @@ msgstr ""
 "�ѡ��ƥ��������ɹ��ߥ��ޥ�ɤ����Ԥ��ޤ���\n"
 "mkfs ��Ȥ����ˡ������ƥ��Ƶ�ư���Ƥ�������\n"
 
-#: fdisk/sfdisk.c:730
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s �Υ����������顼\n"
 
-#: fdisk/sfdisk.c:768
+#: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ���Τ褦�ʥѡ��ƥ������Ϥ���ޤ���\n"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
 msgstr "ǧ���Ǥ��ʤ��ե����ޥå� -- �������������Ѥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:830
+#: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# %s �Υѡ��ƥ������ơ��֥�\n"
 
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "̤�����Υե����ޥå� -- %s �����Ѥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:845
+#: fdisk/sfdisk.c:867
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4237,11 +4425,11 @@ msgstr ""
 "��˥å� = %lu �Х��ȤΥ�������1024 �Х��ȤΥ֥��å���%d ��������ޤ�\n"
 "\n"
 
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
 msgstr "�ǥХ��� �֡��� ����   ����   #������ #�֥��å� ID   �����ƥ�\n"
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:875
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -4250,11 +4438,11 @@ msgstr ""
 "��˥å� = 512 �Х��ȤΥ�������%d ��������ޤ�\n"
 "\n"
 
-#: fdisk/sfdisk.c:855
+#: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
 msgstr " �ǥХ��� �֡���  ����      ����   #������   ID  �����ƥ�\n"
 
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -4263,11 +4451,11 @@ msgstr ""
 "��˥å� = 1024 �Х��ȤΥ֥��å���%d ��������ޤ�\n"
 "\n"
 
-#: fdisk/sfdisk.c:860
+#: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
 msgstr " �ǥХ��� �֡��� ����        ����  #�֥��å� ID  �����ƥ�\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:885
 #, c-format
 msgid ""
 "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -4276,30 +4464,30 @@ msgstr ""
 "Units = 1048576 �Х��Ȥ�ᥬ�Х��ȡ�1024 �Х��ȤΥ֥��å���%d ��������ޤ�\n"
 "\n"
 
-#: fdisk/sfdisk.c:865
+#: fdisk/sfdisk.c:887
 msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
 msgstr "�ǥХ��� �֡��� ����   ����    MB   #�֥��å� ID  �����ƥ�\n"
 
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1019
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t����: (c,h,s) ������ (%ld,%ld,%ld)  (%ld,%ld,%ld) ��ȯ��\n"
 
-#: fdisk/sfdisk.c:1004
+#: fdisk/sfdisk.c:1026
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t����: (c,h,s) ������ (%ld,%ld,%ld)  (%ld,%ld,%ld) ��ȯ��\n"
 
-#: fdisk/sfdisk.c:1007
+#: fdisk/sfdisk.c:1029
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "������ %ld �˥ѡ��ƥ������ν������ǥ������κǸ��ۤ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1018
+#: fdisk/sfdisk.c:1040
 msgid "No partitions found\n"
 msgstr "�ѡ��ƥ�����󤬸��Ĥ���ޤ���\n"
 
-#: fdisk/sfdisk.c:1025
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid ""
 "Warning: The first partition looks like it was made\n"
@@ -4310,94 +4498,94 @@ msgstr ""
 "  (%ld/%ld/%ld �Τ�����)��\n"
 "���Υꥹ�Ȥϡ����Υ�����ȥ�ȸ��ʤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1097
 msgid "no partition table present.\n"
 msgstr "���ߥѡ��ƥ���������Ϥ���ޤ���\n"
 
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "�ѤǤ���%d �ĤΥѡ��ƥ�����󤷤��������Ƥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1108
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "�ٹ�: �ѡ��ƥ������ %s �ϥ����� 0 �Ǥ��������Ȥ��ƥޡ�������Ƥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1111
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥ����� 0 �ʤΤ˥֡��Ȳ�ǽ�Ǥ���\n"
 
-#: fdisk/sfdisk.c:1092
+#: fdisk/sfdisk.c:1114
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥ����� 0 �ǡ��󥼥��γ��ϰ��֤Ǥ�\n"
 
-#: fdisk/sfdisk.c:1103
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "Warning: partition %s "
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϡ�"
 
-#: fdisk/sfdisk.c:1104
+#: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "�ѡ��ƥ������ %s �˴ޤޤ�Ƥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "�ٹ�: �ѡ��ƥ������ %s "
 
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
 msgstr "�� %s ���ŤʤäƤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, c-format
 msgid "Warning: partition %s contains part of "
 msgstr "�ٹ�: �ѡ��ƥ������ %s ��"
 
-#: fdisk/sfdisk.c:1128
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "the partition table (sector %lu),\n"
 msgstr "�ѡ��ƥ������ơ��֥� (������ %lu)�ΰ�����ޤ�Ǥ��ꡢ\n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
 msgstr "�����Ԥ��ȡ��˲�����Ƥ��ޤ����Ȥˤʤ�Ǥ��礦\n"
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �������� 0 ����ϤޤäƤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1164
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥǥ������ν����ۤ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1156
+#: fdisk/sfdisk.c:1178
 msgid "Among the primary partitions, at most one can be extended\n"
 msgstr "�����ΰ�ѡ��ƥ������Ǥϡ���ĥ�ѡ��ƥ������ϰ�Ĥ������ޤ�\n"
 
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
 msgstr " (Linux �Ǥ�����ǤϤ���ޤ��󤱤ɤ�)\n"
 
-#: fdisk/sfdisk.c:1174
+#: fdisk/sfdisk.c:1196
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥ�������������ϤޤäƤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1180
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "�ٹ�: �ѡ��ƥ������ %s �ϥ����������ǽ���äƤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1220
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
@@ -4406,7 +4594,7 @@ msgstr ""
 "LILO �ˤȤäƤ����ꤢ��ޤ��󤬡�DOS �� MBR �Ϥ��Υǥ�������֡��ȤǤ��ʤ�\n"
 "�ʤäƤ��ޤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4414,7 +4602,7 @@ msgstr ""
 "�ٹ�: ���̤ϥץ饤�ޥ�ѡ��ƥ�������Ĥ�֡��ȤǤ���褦�ˤ��ޤ���\n"
 "LILO �� `�֡��Ȳ�ǽ' �ե饰��̵�뤷�ޤ����ɤ⡣\n"
 
-#: fdisk/sfdisk.c:1211
+#: fdisk/sfdisk.c:1233
 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"
@@ -4423,152 +4611,169 @@ msgstr ""
 "LILO �ˤȤäƤ����ꤢ��ޤ��󤬡�DOS MBR �Ϥ��Υǥ�������֡��ȤǤ��ʤ�\n"
 "�ʤäƤ��ޤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1228
+#: fdisk/sfdisk.c:1250
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "�ѡ��ƥ������ %s: ����: (c,h,s) ������ (%ld,%ld,%ld)  (%ld,%ld,%ld) ��ȯ��\n"
 
-#: fdisk/sfdisk.c:1237
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "�ѡ��ƥ������ %s: ����: (c,h,s) ������ (%ld,%ld,%ld)  (%ld,%ld,%ld) ��ȯ��\n"
 
-#: fdisk/sfdisk.c:1240
+#: fdisk/sfdisk.c:1262
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "������ %2$ld �ˤ���ѡ��ƥ������ %1$s "
 "�ν����ϥǥ������κǸ��ۤ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#: fdisk/sfdisk.c:1287
+#, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "�ٹ�: ��ĥ�ΰ�γ��ϰ��֤� %ld ���� %ld �˰ܤ���ޤ���\n"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr "(�ꥹ�Ȥ���٤������������Ƥ��ѹ��ϹԤ�ʤ���)\n"
+
+#: fdisk/sfdisk.c:1291
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr "�ٹ�: ��ĥ�ΰ褬��������������ϤޤäƤ��ޤ���\n"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr "DOS �� Linux �ǤϤ������Ƥ�ۤʤä���ΤȲ�᤹�뤳�Ȥˤʤ�ޤ�\n"
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "�ѡ��ƥ������¿�����ޤ� -- nr (%d) �ʹߤ�̵�뤷�ޤ�\n"
 
-#: fdisk/sfdisk.c:1288
+#: fdisk/sfdisk.c:1324
 msgid "tree of partitions?\n"
 msgstr "�ѡ��ƥ������Υĥ꡼��\n"
 
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager �򸡽� -- �������ª�Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 �������ȯ�� -- ����ޤ�\n"
 
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "�ѤǤ�..., ������ 0 �γ�ĥ�ѡ��ƥ������ ��\n"
 
-#: fdisk/sfdisk.c:1426
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "�ѤǤ�..., ������ 0 �� BSD �ѡ��ƥ������\n"
 
-#: fdisk/sfdisk.c:1458
+#: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr " %s: ǧ���Ǥ��ʤ��ѡ��ƥ������\n"
 
-#: fdisk/sfdisk.c:1470
+#: fdisk/sfdisk.c:1536
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n �ե饰��Ϳ�����ޤ���: �����ѹ����ޤ���Ǥ���\n"
 
-#: fdisk/sfdisk.c:1483
+#: fdisk/sfdisk.c:1549
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "�Ť�����������¸�˼��� -- ���Ǥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1488
+#: fdisk/sfdisk.c:1554
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s �Υѡ��ƥ������񤭹��ߤ˼���\n"
 
-#: fdisk/sfdisk.c:1565
+#: fdisk/sfdisk.c:1631
 msgid "long or incomplete input line - quitting\n"
 msgstr "Ĺ�����Դ����ʹԤ����� -- ��ߤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1601
+#: fdisk/sfdisk.c:1667
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "���ϥ��顼: `=' �� %s �ե�����ɤθ�ˤ��Ƥ�������\n"
 
-#: fdisk/sfdisk.c:1608
+#: fdisk/sfdisk.c:1674
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "���ϥ��顼: %2$s �ե�����ɤθ��ͽ�����ʤ�ʸ�� `%1$c'\n"
 
-#: fdisk/sfdisk.c:1614
+#: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ǧ���Ǥ��ʤ�����: %s\n"
 
-#: fdisk/sfdisk.c:1646
+#: fdisk/sfdisk.c:1712
 msgid "number too big\n"
 msgstr "�������礭�����ޤ�\n"
 
-#: fdisk/sfdisk.c:1650
+#: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
 msgstr "�����θ���˥��ߤ��դ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1766
+#: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
 msgstr "�ѡ��ƥ�����󵭽һҤζ���������ޤ���\n"
 
-#: fdisk/sfdisk.c:1799
+#: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
 msgstr "��ĥ�ѡ��ƥ������ΰϤ����ۤǤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:1850
+#: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
 msgstr "���ϥե�����ɤ�¿�����ޤ�\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1884
+#: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
 msgstr "����ʾ�ζ���������ޤ���\n"
 
-#: fdisk/sfdisk.c:1903
+#: fdisk/sfdisk.c:1969
 msgid "Illegal type\n"
 msgstr "�����ʥ�����\n"
 
-#: fdisk/sfdisk.c:1935
+#: fdisk/sfdisk.c:2001
 #, c-format
-msgid "Warning: exceeds max allowable size (%lu)\n"
-msgstr "�ٹ�: ��ǽ�ʥ������κ��� (%lu) ��ۤ��Ƥ��ޤ�\n"
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
+msgstr "�ٹ�: Ϳ����줿������ (%lu) �ϡ����ƤǤ�����祵���� (%lu) ��ۤ��Ƥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:1940
+#: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
 msgstr "�ٹ�: ���Υѡ��ƥ������\n"
 
-#: fdisk/sfdisk.c:1954
+#: fdisk/sfdisk.c:2021
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "�ٹ�: �����ʥѡ��ƥ�����󤬻ϤޤäƤ��ޤ� (���ֺǽ� %lu)\n"
 
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ǧ���Ǥ��ʤ��֡��Ȳ�ǽ�ե饰 -- - �� * ������Ǥ�������\n"
 
-#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s �ΰ�������ꡩ\n"
 
-#: fdisk/sfdisk.c:2008
+#: fdisk/sfdisk.c:2075
 msgid "Extended partition not where expected\n"
 msgstr "��ĥ�ѡ��ƥ������ͽ���������ˤ���ޤ���\n"
 
-#: fdisk/sfdisk.c:2040
+#: fdisk/sfdisk.c:2107
 msgid "bad input\n"
 msgstr "����������\n"
 
-#: fdisk/sfdisk.c:2062
+#: fdisk/sfdisk.c:2129
 msgid "too many partitions\n"
 msgstr "�ѡ��ƥ������¿�����ޤ�\n"
 
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2162
 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"
@@ -4579,96 +4784,96 @@ msgstr ""
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "���̤� <start> �� <size> (�����ƶ��餯 <type>)����ꤹ������ǹ����ޤ���\n"
 
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2182
 msgid "version"
 msgstr "�С������"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2188
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "�Ȥ���: %s [���ץ����] �ǥХ���̾...\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2189
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "�ǥХ���: /dev/hda �� /dev/sda ���ͤʲ���"
 
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2190
 msgid "useful options:"
 msgstr "ͭ�פʥ��ץ����:"
 
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2191
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr "    -s [or --show-size]: �ΰ襵�����Υꥹ��"
 
-#: fdisk/sfdisk.c:2125
+#: fdisk/sfdisk.c:2192
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [or --id]:        �ΰ� ID ��ɽ���ޤ����ѹ�"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2193
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [or --list]:      �ǥХ�������ΰ�ꥹ��"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2194
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr "    -d [or --dump]:      ����Ʊ��������������Ͻ񼰤˱褦�褦�ˤ���"
 
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2195
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr "    -i [or --increment]: ���������ʤɡ�0 �ǤϤʤ� 1 ����"
 
-#: fdisk/sfdisk.c:2129
+#: fdisk/sfdisk.c:2196
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of "
 "sectors/blocks/cylinders/MB"
 msgstr ""
 "    -uS, -uB, -uC, -uM:  ������/�֥��å�/������/MB �Υ�˥åȤμ���/���"
 
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2197
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr "    -T [or --list-types]:���Τ��ΰ西���פΥꥹ��"
 
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2198
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr "    -D [or --DOS]:       DOS �ߴ��⡼�� -- ���֤�����̵�̤ˤʤ�ޤ�"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2199
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr "    -R [or --re-read]:   �����ͥ���ΰ�ơ��֥����ɹ��ߤ�����"
 
-#: fdisk/sfdisk.c:2133
+#: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                �����ֹ�# ���ΰ�Τ��ѹ�����"
 
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 �ǥ������ؤμºݤν���ߤ�Ԥ�ʤ�"
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2202
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr "    -O file :            ��񤭤���륻������ե��������¸����"
 
-#: fdisk/sfdisk.c:2136
+#: fdisk/sfdisk.c:2203
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I file :            ��������ե����뤫����������"
 
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [or --version]:   �С�������ɽ������"
 
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [or --help]:      ���Υ�å�������ɽ������"
 
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
 msgstr "�����ʥ��ץ����:"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2207
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr "    -g [or --show-geometry]: �����ͥ�Υ�����ȥ�����ɽ������"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4676,123 +4881,118 @@ msgstr ""
 "    -x [or --show-extended]: ��ĥ�ΰ�ꥹ�Ȥ�ɽ������\n"
 "                             �ޤ��Ϥ����ε��һҤ����Ϥ�����"
 
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2210
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr "    -L  [or --Linux]:      Linux �ˤ�����ʤ��Ƥ�ʸ��򱾤�ʤ�"
 
-#: fdisk/sfdisk.c:2144
+#: fdisk/sfdisk.c:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [or --quiet]:      �ٹ��å���������������"
 
-#: fdisk/sfdisk.c:2145
+#: fdisk/sfdisk.c:2212
 msgid "    You can override the detected geometry using:"
 msgstr "    ������ȥ긡�Ф�������Ǥ��ޤ�:"
 
-#: fdisk/sfdisk.c:2146
+#: fdisk/sfdisk.c:2213
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [or --cylinders #]:���Ѥ��륷�����������ꤹ��"
 
-#: fdisk/sfdisk.c:2147
+#: fdisk/sfdisk.c:2214
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [or --heads #]:    ���Ѥ���إåɿ������ꤹ��"
 
-#: fdisk/sfdisk.c:2148
+#: fdisk/sfdisk.c:2215
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [or --sectors #]:  ���Ѥ��륻�����������ꤹ��"
 
-#: fdisk/sfdisk.c:2149
+#: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
 msgstr "̷��Υ����å���Ԥ�ʤ��褦�ˤǤ��ޤ�:"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2217
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr "    -f  [or --force]:      �������ʻ����ԤäƤ⡢���Τޤ޼¹Ԥ��ޤ�"
 
-#: fdisk/sfdisk.c:2156
+#: fdisk/sfdisk.c:2223
 msgid "Usage:"
 msgstr "�Ȥ���:"
 
-#: fdisk/sfdisk.c:2157
+#: fdisk/sfdisk.c:2224
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s �ǥХ���\t\t �ǥХ�����Υ����ƥ����ΰ��ꥹ�Ȥ��ޤ�\n"
 
-#: fdisk/sfdisk.c:2158
+#: fdisk/sfdisk.c:2225
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s �ǥХ��� n1 n2 ... n1 �򥢥��ƥ����ˤ���..., �Ĥ���󥢥��ƥ����ˤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:2159
+#: fdisk/sfdisk.c:2226
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An �ǥХ���\t n �򥢥��ƥ����ˤ�������ʳ����󥢥��ƥ����ˤ��ޤ�\n"
 
-#: fdisk/sfdisk.c:2278
+#: fdisk/sfdisk.c:2346
 msgid "no command?\n"
 msgstr "���ޥ�ɤʤ���\n"
 
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2471
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "���: %d �֥��å�\n"
 
-#: fdisk/sfdisk.c:2438
+#: fdisk/sfdisk.c:2508
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "�Ȥ���: sfdisk --print-id �ǥХ��� �ѡ��ƥ�������ֹ�\n"
 
-#: fdisk/sfdisk.c:2440
+#: fdisk/sfdisk.c:2510
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "�Ȥ���: sfdisk --change-id �ǥХ��� �ѡ��ƥ�������ֹ� ID\n"
 
-#: fdisk/sfdisk.c:2442
+#: fdisk/sfdisk.c:2512
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "�Ȥ���: sfdisk --id �ǥХ��� �ѡ��ƥ�������ֹ� [ID]\n"
 
-#: fdisk/sfdisk.c:2449
+#: fdisk/sfdisk.c:2519
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "��ĤΥǥХ����Τ߻���Ǥ��ޤ� (-l �� -s �����)\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 #, c-format
 msgid "cannot open %s %s\n"
 msgstr "%s ��%s�ǥ����ץ�Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "read-write"
 msgstr "�ɤ߽񤭲�ǽ"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "for reading"
 msgstr "�ɹ��߲�ǽ"
 
-#: fdisk/sfdisk.c:2499
+#: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2586
 #, c-format
-msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
-msgstr "%s: �������� %d���إåɿ� %d��%d ������/�ȥ�å�\n"
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
+msgstr "%s: �������� %ld���إåɿ� %ld��%ld ������/�ȥ�å�\n"
 
-#: fdisk/sfdisk.c:2519
-#, c-format
-msgid "%s: unknown geometry\n"
-msgstr "%s: ̤�ΤΥ�����ȥ�\n"
-
-#: fdisk/sfdisk.c:2535
+#: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "%s �ؤ� BLKGETSIZE ioctl �˼���\n"
 
-#: fdisk/sfdisk.c:2612
+#: fdisk/sfdisk.c:2680
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "�����ʥ֡��ȥե饰: 0x80 �Ǥʤ� 0x%x �Ǥ�\n"
 
-#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
 msgid ""
 "Done\n"
 "\n"
@@ -4800,7 +5000,7 @@ msgstr ""
 "��λ\n"
 "\n"
 
-#: fdisk/sfdisk.c:2638
+#: fdisk/sfdisk.c:2706
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -4810,71 +5010,70 @@ msgstr ""
 "LILO �Ǥ����ꤢ��ޤ��󤬡�DOS MBR �� 1 �ĤΥ����ƥ��֤ʥѡ��ƥ�����󤷤�\n"
 "�֡��ȤǤ��ޤ���\n"
 
-#: fdisk/sfdisk.c:2652
+#: fdisk/sfdisk.c:2720
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "�ѡ��ƥ������ %s �ˤ� ID %x �����ꡢ������Ƥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:2708
+#: fdisk/sfdisk.c:2777
 #, c-format
 msgid "Bad Id %x\n"
 msgstr "������ ID %x\n"
 
-#: fdisk/sfdisk.c:2723
+#: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
 msgstr "���Υǥ������ϸ��߻�����Ǥ���\n"
 
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "��̿Ū�ʥ��顼: %s �����Ĥ���ޤ���\n"
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2812
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "�ٹ�: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ���\n"
 
-#: fdisk/sfdisk.c:2749
+#: fdisk/sfdisk.c:2818
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "���ߡ�ï�⤳�Υǥ�������ȤäƤ��ʤ�����Ĵ�٤ޤ�...\n"
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2820
 msgid ""
 "\n"
-"This disk is currently in use - repartitioning is probably a bad idea.Umount "
-"all file systems, and swapoff all swap partitions on this disk.Use the "
-"--no-reread flag to suppress this check.\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 "\n"
-"���Υǥ������ϸ��߻�����Ǥ� -- "
-"�ѡ��ƥ������ƹ��ۤϤ�᤿���������Ǥ��礦\n"
-"���ƤΥե����륷���ƥ�򥢥�ޥ���Ȥ������Υǥ������˥���åץѡ��ƥ������"
-"\n"
-"������� swapoff ���Ƥ���������\n"
-"���ʤߤ� --no-reread �ե饰�Ǥ��Υ����å��������Ǥ��ޤ���\n"
+"���Υǥ������ϸ��߻�����Ǥ�\n"
+"-- �ѡ��ƥ������ƹ��ۤϤ�᤿���������Ǥ��礦��\n"
+"   ���ե����륷���ƥ��ޥ���Ȳ���������Υǥ������˥���å��ΰ褬\n"
+"   ������� swapoff ���Ƥ���������\n"
+"   ���ʤߤ� --no-reread �ե饰�Ǥ��Υ����å��������Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:2755
+#: fdisk/sfdisk.c:2824
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "���ƤΥ����å���Ķ�ۤ�����ˤ� --force �ե饰��ȤäƤ���������\n"
 
-#: fdisk/sfdisk.c:2759
-msgid "OK"
-msgstr "OK"
+#: fdisk/sfdisk.c:2828
+msgid "OK\n"
+msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2768
+#: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
 msgstr "�Ť�����:\n"
 
-#: fdisk/sfdisk.c:2772
+#: fdisk/sfdisk.c:2841
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "�ѡ��ƥ������ %d ��¸�ߤ��ޤ���Τǡ��ѹ��Ǥ��ޤ���\n"
 
-#: fdisk/sfdisk.c:2780
+#: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
 msgstr "�����ʾ���:\n"
 
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2854
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -4882,19 +5081,19 @@ msgstr ""
 "��Ϥ����Υѡ��ƥ������˴�Ϳ����������ޤ��� -- �ѹ����ޤ���\n"
 "(�����ˤ����Ԥʤ�������С�--force ���ץ�����ȤäƤ�������)\n"
 
-#: fdisk/sfdisk.c:2788
+#: fdisk/sfdisk.c:2857
 msgid "I don't like this - probably you should answer No\n"
 msgstr "��Ϥ���˴�Ϳ����������ޤ��� -- ���餯 No ��������٤��Ǥ��礦\n"
 
-#: fdisk/sfdisk.c:2793
+#: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
 msgstr "����Ǥ��ʤ����׵����������ޤ����� [ynq] "
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "�ǥ������ؤν񤭹��ߤ�Ԥʤ��ޤ����� [ynq] "
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2869
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -4902,15 +5101,15 @@ msgstr ""
 "\n"
 "sfdisk: ���Ϥ�û�����ޤ�\n"
 
-#: fdisk/sfdisk.c:2802
+#: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
 msgstr "���� -- �����ѹ����ޤ���\n"
 
-#: fdisk/sfdisk.c:2808
+#: fdisk/sfdisk.c:2877
 msgid "Please answer one of y,n,q\n"
 msgstr "y,n,q �Τ����줫�������Ƥ�������\n"
 
-#: fdisk/sfdisk.c:2816
+#: fdisk/sfdisk.c:2885
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -4918,7 +5117,7 @@ msgstr ""
 "�����ʥѡ��ƥ������ν񤭹��ߤ�����\n"
 "\n"
 
-#: fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2891
 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"
@@ -4929,105 +5128,109 @@ msgstr ""
 "dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(�ܺ٤� fdisk(8)�򸫤Ƥ���������)\n"
 
-#: games/banner.c:1048
+#: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
 msgstr "�Ȥ���: banner [-w ��]\n"
 
-#: games/banner.c:1068
+#: games/banner.c:1065
 msgid "Message: "
 msgstr "��å�����: "
 
-#: games/banner.c:1102
+#: games/banner.c:1099
 #, c-format
 msgid "The character '%c' is not in my character set"
 msgstr "ʸ�� '%c' �ϥ���饯�����å���ˤ���ޤ���"
 
-#: games/banner.c:1110
+#: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
 msgstr "��å����� '%s' �� OK �Ǥ�\n"
 
-#: getopt-1.0.3b/getopt.c:229
+#: getopt-1.1.0a/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "`getopt --help' �Ǿܺپ����Ĵ�٤Ƥ���������\n"
 
-#: getopt-1.0.3b/getopt.c:295
+#: getopt-1.1.0a/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "-l �� --long �����θ�Υ��󥰥��ץ���󤬶��Ǥ�"
 
-#: getopt-1.0.3b/getopt.c:315
+#: getopt-1.1.0a/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "-s �� --shell �����θ�Υ�������Τ�ޤ���"
 
-#: getopt-1.0.3b/getopt.c:320
+#: getopt-1.1.0a/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "�Ȥ���: getopt ���ץ����ʸ���� ��\n"
 
-#: getopt-1.0.3b/getopt.c:321
+#: getopt-1.1.0a/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [���ץ����] [--] ���ץ����ʸ���� ��\n"
 
-#: getopt-1.0.3b/getopt.c:322
+#: getopt-1.1.0a/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 "       getopt [���ץ����] -o|--options ���ץ����ʸ���� [���ץ����] [--]\n"
 
-#: getopt-1.0.3b/getopt.c:323
+#: getopt-1.1.0a/getopt.c:327
 msgid "              parameters\n"
 msgstr "              ��\n"
 
-#: getopt-1.0.3b/getopt.c:324
+#: getopt-1.1.0a/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            ���󥰥��ץ���� - ��ĤǻϤޤ�Τ����\n"
 
-#: getopt-1.0.3b/getopt.c:325
+#: getopt-1.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   ���Τ���äȤ����Ȥ�����ɽ������\n"
 
-#: getopt-1.0.3b/getopt.c:326
+#: getopt-1.1.0a/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   ���󥰥��ץ��������򤵤���\n"
 
-#: getopt-1.0.3b/getopt.c:327
+#: getopt-1.1.0a/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr "  -n, --name=progname          ���顼���κݤ�̾��\n"
 
-#: getopt-1.0.3b/getopt.c:328
+#: getopt-1.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      ���硼�ȥ��ץ��������򤵤���\n"
 
-#: getopt-1.0.3b/getopt.c:329
+#: getopt-1.1.0a/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr "  -q, --quiet                  getopt(3) �Υ��顼����Ԥ�ʤ�\n"
 
-#: getopt-1.0.3b/getopt.c:330
+#: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           �̾�ν��Ϥ�Ԥ�ʤ�\n"
 
-#: getopt-1.0.3b/getopt.c:331
+#: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            ������ΰ��Ѽ��������ꤹ��\n"
 
-#: getopt-1.0.3b/getopt.c:332
+#: getopt-1.1.0a/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   getopt(1) �С�������ƥ��Ȥ���\n"
 
-#: getopt-1.0.3b/getopt.c:333
+#: getopt-1.1.0a/getopt.c:337
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -u, --unqote                 ���Ϥ���Ѥ��ʤ�\n"
+
+#: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                �С������������Ϥ���\n"
 
-#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
 msgstr "���ץ����ʸ�����������ޤ���"
 
-#: getopt-1.0.3b/getopt.c:433
-msgid "getopt (enhanced) 1.0.3\n"
-msgstr "getopt (enhanced) 1.0.3\n"
+#: getopt-1.1.0a/getopt.c:441
+msgid "getopt (enhanced) 1.1.0\n"
+msgstr "getopt (enhanced) 1.1.0\n"
 
-#: getopt-1.0.3b/getopt.c:439
+#: getopt-1.1.0a/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "�������顼����Ԥ�Ϣ����"
 
@@ -5085,92 +5288,92 @@ msgstr "getopt �롼�פθ�\n"
 msgid "exiting parseargs\n"
 msgstr "�������Ϥ�λ���ޤ�\n"
 
-#: login-utils/agetty.c:505
+#: login-utils/agetty.c:504
 msgid "entered parse_speeds\n"
 msgstr "parse_speeds ������ޤ���\n"
 
-#: login-utils/agetty.c:508
+#: login-utils/agetty.c:507
 #, c-format
 msgid "bad speed: %s"
 msgstr "������®��: %s"
 
-#: login-utils/agetty.c:510
+#: login-utils/agetty.c:509
 msgid "too many alternate speeds"
 msgstr "����®�٤�¿�����ޤ�"
 
-#: login-utils/agetty.c:512
+#: login-utils/agetty.c:511
 msgid "exiting parsespeeds\n"
 msgstr "parsespeeds �򽪤��ޤ�\n"
 
-#: login-utils/agetty.c:587
+#: login-utils/agetty.c:584
 #, c-format
 msgid "%s: open for update: %m"
 msgstr "%s: �����Ѥ˥����ץ�: %m"
 
-#: login-utils/agetty.c:605
+#: login-utils/agetty.c:602
 #, c-format
 msgid "%s: no utmp entry"
 msgstr "%s: utmp ���ܤˤ���ޤ���"
 
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:631
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "/dev: chdir() ������: %m"
 
-#: login-utils/agetty.c:638
+#: login-utils/agetty.c:635
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ����饯���ǥХ����ǤϤ���ޤ���"
 
 #. ignore close(2) errors
-#: login-utils/agetty.c:645
+#: login-utils/agetty.c:642
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:644
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: ɸ�����ϤȤ��Ƴ������Ȥ��Ǥ��ޤ���: %m"
 
-#: login-utils/agetty.c:657
+#: login-utils/agetty.c:654
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: �ɤ߽�ξ�Ѥ˥����ץ�Ǥ��ޤ���"
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:661
+#: login-utils/agetty.c:658
 msgid "duping\n"
 msgstr "ʣ����\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:663
+#: login-utils/agetty.c:660
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: ʣ��������ȯ��: %m"
 
-#: login-utils/agetty.c:733
+#: login-utils/agetty.c:730
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:912
 msgid "user"
 msgstr "�桼��"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:912
 msgid "users"
 msgstr "�桼��"
 
-#: login-utils/agetty.c:1003
+#: login-utils/agetty.c:1000
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: read: %m"
 
-#: login-utils/agetty.c:1049
+#: login-utils/agetty.c:1046
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: ���Ϥ����ޤ���"
 
-#: login-utils/agetty.c:1173
+#: login-utils/agetty.c:1170
 #, c-format
 msgid ""
 "Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
@@ -5178,33 +5381,35 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"�Ȥ���: %s [-hiLmw] [-l ��������ץ������] [-t �����ॢ����] [-I �����ʸ����] [-H ��������ۥ���] �ܡ��졼��,... �� [ü��������]\n"
-"����\t[-hiLmw] [-l ��������ץ������] [-t�����ॢ���� [-I �����ʸ����] [-H ��������ۥ���] �� �ܡ��졼��,... [ü��������]\n"
+"�Ȥ���: %s [-hiLmw] [-l ��������ץ������] [-t �����ॢ����] [-I "
+"�����ʸ����] [-H ��������ۥ���] �ܡ��졼��,... �� [ü��������]\n"
+"����\t[-hiLmw] [-l ��������ץ������] [-t�����ॢ���� [-I �����ʸ����] [-H "
+"��������ۥ���] �� �ܡ��졼��,... [ü��������]\n"
 
-#: login-utils/checktty.c:46
+#: login-utils/checktty.c:41
 #, c-format
 msgid "badlogin: %s\n"
 msgstr "������������: %s\n"
 
-#: login-utils/checktty.c:52
+#: login-utils/checktty.c:47
 #, c-format
 msgid "sleepexit %d\n"
 msgstr "���꡼�׽�λ %d\n"
 
-#: login-utils/checktty.c:108 login-utils/checktty.c:130
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
 msgstr "login: ���꤬���ʤ��Τǡ���������˼��Ԥ���褦�Ǥ�\n"
 
-#: login-utils/checktty.c:109
+#: login-utils/checktty.c:104
 msgid "can't malloc for ttyclass"
 msgstr "tty ���饹�ѥ��꤬���ݤǤ��ޤ���"
 
-#: login-utils/checktty.c:131
+#: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
 msgstr "���롼�ץꥹ���ѥ��꤬���ݤǤ��ޤ���"
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:431
+#: login-utils/checktty.c:426
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "%2$s ���� %1$s �ؤΥ�������ϡ�������֤Ǥϵ��ݤ���ޤ�����\n"
@@ -5213,58 +5418,58 @@ msgstr "%2$s ���� %1$s �ؤΥ�������ϡ�������֤Ǥϵ��ݤ���ޤ�����\n"
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:442
+#: login-utils/checktty.c:437
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "%2$s ���� %1$s �ؤΥ�����������ꤵ��ޤ�����\n"
 
-#: login-utils/chfn.c:135 login-utils/chsh.c:118
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: ���ʤ� (�桼�� %d) ��¸�ߤ��ޤ���\n"
 
-#: login-utils/chfn.c:142 login-utils/chsh.c:125
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: �桼�� \"%s\" ��¸�ߤ��ޤ���\n"
 
-#: login-utils/chfn.c:147 login-utils/chsh.c:130
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 "%s: ��������ι��ܤ����ѹ��Ǥ��ޤ��� -- ������ yp%s ��Ȥ��ޤ��礦��\n"
 
-#: login-utils/chfn.c:159
+#: login-utils/chfn.c:145
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "%s �� finger ������ѹ����ޤ���\n"
 
-#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
-#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
-#: login-utils/chsh.c:165 login-utils/chsh.c:169
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
 msgid "Password error."
 msgstr "�ѥ���ɥ��顼��"
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:684
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:266 mount/lomount.c:221
+#: mount/lomount.c:227
 msgid "Password: "
 msgstr "�ѥ����: "
 
-#: login-utils/chfn.c:192 login-utils/chsh.c:181
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "�ְ�ä��ѥ���ɤǤ���"
 
-#: login-utils/chfn.c:203
+#: login-utils/chfn.c:189
 msgid "Finger information not changed.\n"
 msgstr "finger ������ѹ�����ޤ���Ǥ�����\n"
 
-#: login-utils/chfn.c:306
+#: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "�Ȥ���: %s [ -f �ե�͡��� ] [ -o ���ե��� ] "
 
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -5272,11 +5477,11 @@ msgstr ""
 "[ -p ���ե��������ֹ� ]\n"
 "\t[ -h ���������ֹ� ] "
 
-#: login-utils/chfn.c:308
+#: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:377 login-utils/chsh.c:294
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
 msgid ""
 "\n"
 "Aborted.\n"
@@ -5284,155 +5489,155 @@ msgstr ""
 "\n"
 "���ǡ�\n"
 
-#: login-utils/chfn.c:410
+#: login-utils/chfn.c:398
 msgid "field is too long.\n"
 msgstr "�ե�����ɤ�Ĺ�����ޤ���\n"
 
-#: login-utils/chfn.c:418
+#: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' �ϵ��Ĥ���ޤ���\n"
 
-#: login-utils/chfn.c:423
+#: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
 msgstr "����ȥ�����ʸ���ϵ��Ĥ���ޤ���\n"
 
-#: login-utils/chfn.c:488
+#: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr "finger ������ѹ� *����ޤ���Ǥ���*���ޤ����Ȥǻ�Ƥ���������\n"
 
-#: login-utils/chfn.c:491
+#: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
 msgstr "finger ������ѹ����ޤ�����\n"
 
-#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
 msgid "malloc failed"
 msgstr "malloc �˼���"
 
-#: login-utils/chsh.c:141
+#: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 "%s: ���ʤ��Υ������ /etc/shells "
 "�ˤ���ޤ���Τǡ���������ѹ������ݤ���ޤ���\n"
 
-#: login-utils/chsh.c:148
+#: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "%s �Υ�������ѹ����ޤ���\n"
 
-#: login-utils/chsh.c:189
+#: login-utils/chsh.c:178
 msgid "New shell"
 msgstr "������������"
 
-#: login-utils/chsh.c:196
+#: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
 msgstr "��������ѹ����ޤ���Ǥ�����\n"
 
-#: login-utils/chsh.c:203
+#: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "��������ѹ� *����ޤ���Ǥ���*�����ȤǤޤ���Ƥ���������\n"
 
-#: login-utils/chsh.c:206
+#: login-utils/chsh.c:195
 msgid "Shell changed.\n"
 msgstr "��������ѹ����ޤ�����\n"
 
-#: login-utils/chsh.c:274
+#: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
 msgstr "�Ȥ���: %s [ -s ������ ] "
 
-#: login-utils/chsh.c:275
+#: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:276
+#: login-utils/chsh.c:265
 msgid "       [ username ]\n"
 msgstr "        [ �桼��̾ ]\n"
 
-#: login-utils/chsh.c:320
+#: login-utils/chsh.c:309
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr "%s: ������ϥե�ѥ���̵����Фʤ�ޤ���\n"
 
-#: login-utils/chsh.c:324
+#: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" ��¸�ߤ��ޤ���\n"
 
-#: login-utils/chsh.c:328
+#: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" �ϼ¹ԤǤ��ޤ���\n"
 
-#: login-utils/chsh.c:335
+#: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' �ϵ��Ĥ���ޤ���\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: ����ȥ�����ʸ���ϵ��Ĥ���ޤ���\n"
 
-#: login-utils/chsh.c:346
+#: login-utils/chsh.c:335
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "�ٹ�: \"%s\" �� /etc/shells �ꥹ�Ȥ���ˤ���ޤ���\n"
 
-#: login-utils/chsh.c:348
+#: login-utils/chsh.c:337
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" �� /etc/shells �ꥹ�Ȥ���ˤ���ޤ���\n"
 
-#: login-utils/chsh.c:350
+#: login-utils/chsh.c:339
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: �ꥹ�Ȥ򸫤�ˤ� -l ���ץ�����ȤäƤ�������\n"
 
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:345
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "�ٹ�: \"%s\" �� /etc/shells �ꥹ�Ȥ���ˤ���ޤ���\n"
 
-#: login-utils/chsh.c:357
+#: login-utils/chsh.c:346
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "�ꥹ�Ȥ򸫤�ˤϡ�%s -l ��ȤäƤ���������\n"
 
-#: login-utils/chsh.c:378
+#: login-utils/chsh.c:367
 msgid "No known shells.\n"
 msgstr "�Τ�ʤ�������Ǥ���\n"
 
-#: login-utils/cryptocard.c:70
+#: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
 msgstr "/dev/urandom �򳫤��ޤ���"
 
-#: login-utils/cryptocard.c:75
+#: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
 msgstr "/dev/urandom ���������ǡ������ɹ���ޤ���"
 
-#: login-utils/cryptocard.c:98
+#: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
 msgstr "%s ���ɹ����Ѥ˳����ޤ���"
 
-#: login-utils/cryptocard.c:102
+#: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
 msgstr "(%s) �ե�������������Ǥ��ޤ���"
 
-#: login-utils/cryptocard.c:108
+#: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
 msgstr "%s ���������ե�����⡼�ɤǤϤ���ޤ���"
 
-#: login-utils/cryptocard.c:113
+#: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
 msgstr "%s ����ǡ������ɹ���ޤ���"
 
-#: login-utils/islocal.c:36
+#: login-utils/islocal.c:37
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "%s ���ɤ�ޤ���Τǽ�λ���ޤ���"
@@ -5471,37 +5676,40 @@ msgstr ""
 "\n"
 "�����ߤ�����ޤ��� %10.10s %5.5s \n"
 
-#: login-utils/login.c:377
+#: login-utils/login.c:373
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h �ϥ����ѡ��桼�����ѤǤ���\n"
 
-#: login-utils/login.c:402
+#: login-utils/login.c:398
 msgid "usage: login [-fp] [username]\n"
 msgstr "�Ȥ���: login [-fp] [�桼��̾]\n"
 
-#: login-utils/login.c:504
+#: login-utils/login.c:501
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: PAM ���ԡ����Ǥ��ޤ�: %s\n"
 
-#: login-utils/login.c:506
+#: login-utils/login.c:503
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM �ν�������Ǥ��ޤ���: %s"
 
-#. Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. so that the "login: " prompt gets localized. Unfortunately,
-#. PAM doesn't have an interface to specify the "Password: " string (yet).
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
 #: login-utils/login.c:519
 msgid "login: "
 msgstr "��������: "
 
-#: login-utils/login.c:552
+#: login-utils/login.c:553
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "FAILED LOGIN %d FROM %s FOR %s, %s"
 
-#: login-utils/login.c:554
+#: login-utils/login.c:555
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -5509,17 +5717,17 @@ msgstr ""
 "Login ���ְ�äƤ��ޤ�\n"
 "\n"
 
-#: login-utils/login.c:563
+#: login-utils/login.c:564
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "*��������ȥ饤��¿�����ޤ�* (%d) %s ���� %s ��, %s"
 
-#: login-utils/login.c:567
+#: login-utils/login.c:568
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "���Ԥ����������󥻥å���� %s ���� %s ��, %s"
 
-#: login-utils/login.c:570
+#: login-utils/login.c:571
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -5527,30 +5735,30 @@ msgstr ""
 "\n"
 "Login ���ְ�äƤ��ޤ�\n"
 
-#: login-utils/login.c:619
+#: login-utils/login.c:620
 msgid "Illegal username"
 msgstr "�����ʥ桼��̾"
 
-#: login-utils/login.c:662
+#: login-utils/login.c:663
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s �Υ�������Ϥ���ü���Ǥϵ��ݤ���ޤ�����\n"
 
-#: login-utils/login.c:667
+#: login-utils/login.c:668
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr "�������� %s ����䡢%s ���� TTY %s ���"
 
-#: login-utils/login.c:671
+#: login-utils/login.c:672
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "�������� %s ����䡢TTY %s ���"
 
-#: login-utils/login.c:723
+#: login-utils/login.c:725
 msgid "Login incorrect\n"
 msgstr "Login ���ְ�äƤ��ޤ�\n"
 
-#: login-utils/login.c:745
+#: login-utils/login.c:747
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5558,100 +5766,100 @@ msgstr ""
 "���˥������󤷤Ƥ���桼��������¿�����ޤ���\n"
 "�ޤ���ǻ�Ƥ���������\n"
 
-#: login-utils/login.c:749
+#: login-utils/login.c:751
 msgid "You have too many processes running.\n"
 msgstr "���ʤ����¹Ԥ��Ƥ���ץ�������¿�����ޤ���\n"
 
-#: login-utils/login.c:795
+#: login-utils/login.c:797
 msgid "Warning: no Kerberos tickets issued\n"
 msgstr "�ٹ�: Kerberos �����åȤ�ȯ�Ԥ���ޤ���\n"
 
-#: login-utils/login.c:807
+#: login-utils/login.c:809
 msgid "Sorry -- your password has expired.\n"
 msgstr "��ǰ�Ǥ��� -- ���ʤ��Υѥ���ɤϴ����ڤ�Ǥ���\n"
 
-#: login-utils/login.c:813
+#: login-utils/login.c:815
 #, c-format
-msgid "Warning: your password expires on %s %d, %d\n"
-msgstr "�ٹ�: ���ʤ��Υѥ���ɤ� %s %d, %d �˴��¤��ڤ�ޤ�\n"
+msgid "Warning: your password expires on %d %s %d.\n"
+msgstr "�ٹ�: ���ʤ��Υѥ���ɤ� %d %s %d �˴��¤��ڤ�ޤ�\n"
 
-#: login-utils/login.c:821
+#: login-utils/login.c:823
 msgid "Sorry -- your account has expired.\n"
 msgstr "��ǰ�Ǥ��� -- ���ʤ��Υ�������Ȥϴ����ڤ�Ǥ���\n"
 
-#: login-utils/login.c:827
+#: login-utils/login.c:829
 #, c-format
-msgid "Warning: your account expires on %s %d, %d\n"
-msgstr "�ٹ�: ���ʤ��Υ�������Ȥ� %s %d, %d �˴��¤��ڤ�ޤ�\n"
+msgid "Warning: your account expires on %d %s %d.\n"
+msgstr "�ٹ�: ���ʤ��Υ�������Ȥ� %d %s %d �˴��¤��ڤ�ޤ�\n"
 
-#: login-utils/login.c:1061
+#: login-utils/login.c:1066
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "�������륢�åפ� %s �ˡ�%s �ˤ��"
 
-#: login-utils/login.c:1068
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "%s �� ROOT ����������%s ����"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1076
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "%s �� ROOT ����������"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "%s �� %s ����������%s ����"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1082
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "%s �� %s ����������"
 
-#: login-utils/login.c:1089
+#: login-utils/login.c:1094
 #, c-format
 msgid "You have %smail.\n"
 msgstr "%s�ᥤ�뤬�Ϥ��Ƥ��ޤ���\n"
 
-#: login-utils/login.c:1090
+#: login-utils/login.c:1095
 msgid "new "
 msgstr "������"
 
 #. error in fork()
-#: login-utils/login.c:1108
+#: login-utils/login.c:1113
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: fork �˼���: %s"
 
-#: login-utils/login.c:1123
+#: login-utils/login.c:1128
 msgid "setuid() failed"
 msgstr "setuid() �˼���"
 
-#: login-utils/login.c:1129
+#: login-utils/login.c:1134
 #, c-format
 msgid "No directory %s!\n"
 msgstr "�ǥ��쥯�ȥ� %s ������ޤ���\n"
 
-#: login-utils/login.c:1133
+#: login-utils/login.c:1138
 msgid "Logging in with home = \"/\".\n"
 msgstr "�ۡ���ǥ��쥯�ȥ� \"/\" �ǥ������󤷤ޤ���\n"
 
-#: login-utils/login.c:1141
+#: login-utils/login.c:1146
 msgid "login: no memory for shell script.\n"
 msgstr "login: �����륹����ץ��ѤΥ��꤬����ޤ���\n"
 
-#: login-utils/login.c:1169
+#: login-utils/login.c:1174
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: �����륹����ץȤ�¹ԤǤ��ޤ���Ǥ���: %s\n"
 
-#: login-utils/login.c:1172
+#: login-utils/login.c:1177
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: �����뤬����ޤ���: %s.\n"
 
-#: login-utils/login.c:1188
+#: login-utils/login.c:1191
 #, c-format
 msgid ""
 "\n"
@@ -5660,62 +5868,62 @@ msgstr ""
 "\n"
 "%s ��������: "
 
-#: login-utils/login.c:1199
+#: login-utils/login.c:1202
 msgid "login name much too long.\n"
 msgstr "��������̾��Ĺ�����ޤ���\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1203
 msgid "NAME too long"
 msgstr "̾����Ĺ�����ޤ�"
 
-#: login-utils/login.c:1207
+#: login-utils/login.c:1210
 msgid "login names may not start with '-'.\n"
 msgstr "��������̾�� '-' �ǻϤޤäƤ��ƤϤ����ޤ���\n"
 
-#: login-utils/login.c:1217
+#: login-utils/login.c:1220
 msgid "too many bare linefeeds.\n"
 msgstr "������(linefeed) ��¿�����ޤ���\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1221
 msgid "EXCESSIVE linefeeds"
 msgstr "����ʹ�����(linefeed)"
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1231
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "%d �ø�˥�������λ����ڤ�\n"
 
-#: login-utils/login.c:1329
+#: login-utils/login.c:1325
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ǽ���������: %.*s "
 
-#: login-utils/login.c:1333
+#: login-utils/login.c:1329
 #, c-format
 msgid "from %.*s\n"
 msgstr " %.*s ����\n"
 
-#: login-utils/login.c:1336
+#: login-utils/login.c:1332
 #, c-format
 msgid "on %.*s\n"
 msgstr " %.*s ��\n"
 
-#: login-utils/login.c:1359
+#: login-utils/login.c:1355
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s ����Υ������󤬼���, %s"
 
-#: login-utils/login.c:1362
+#: login-utils/login.c:1358
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s �ǤΥ������󤬼���, %s"
 
-#: login-utils/login.c:1366
+#: login-utils/login.c:1362
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d �� %s ����Υ������󤬼���, %s"
 
-#: login-utils/login.c:1369
+#: login-utils/login.c:1365
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d �� %s �ǤΥ������󤬼���, %s"
@@ -5756,182 +5964,182 @@ msgstr "newgrp: setuid"
 msgid "No shell"
 msgstr "�����뤬����ޤ���"
 
-#: login-utils/passwd.c:163
+#: login-utils/passwd.c:159
 msgid "The password must have at least 6 characters, try again.\n"
 msgstr "�ѥ���ɤϺ��� 6 ʸ��ɬ�פǤ����⤦���٤��ľ���Ƥ���������\n"
 
-#: login-utils/passwd.c:176
+#: login-utils/passwd.c:172
 msgid "The password must contain characters out of two of the following\n"
 msgstr "�ѥ���ɤϰʲ����� 2 ����ϴޤޤ�ʤ���Фʤ�ޤ���\n"
 
-#: login-utils/passwd.c:177
+#: login-utils/passwd.c:173
 msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
 msgstr "����: ��ʸ���Ⱦ�ʸ�������ͤ��󥢥�ե��٥åȿ���\n"
 
-#: login-utils/passwd.c:178
+#: login-utils/passwd.c:174
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "ʸ����passwd(1) ��ߤƾܺ٤�Ĵ�٤Ƥ���������\n"
 
-#: login-utils/passwd.c:183
+#: login-utils/passwd.c:179
 msgid "You cannot reuse the old password.\n"
 msgstr "�Ť��ѥ���ɤκ����ѤϤǤ��ޤ���\n"
 
-#: login-utils/passwd.c:188
+#: login-utils/passwd.c:184
 msgid "Please don't use something like your username as password!\n"
 msgstr "�桼��̾��Ʊ���褦�ʥѥ���ɤ�Ȥ�ʤ��Ǥ���������\n"
 
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
 msgid "Please don't use something like your realname as password!\n"
 msgstr "���ʤ��μ�̾�Τ褦�ʥѥ���ɤ�Ȥ�ʤ��Ǥ���������\n"
 
-#: login-utils/passwd.c:223
+#: login-utils/passwd.c:220
 msgid "Usage: passwd [username [password]]\n"
 msgstr "�Ȥ���: passwd [�桼��̾ [�ѥ����]]\n"
 
-#: login-utils/passwd.c:224
+#: login-utils/passwd.c:221
 msgid "Only root may use the one and two argument forms.\n"
 msgstr "���ΰ�Ĥޤ�����Ĥΰ��������Ǽ¹ԤǤ���Τ� root �����Ǥ���\n"
 
-#: login-utils/passwd.c:280
+#: login-utils/passwd.c:275
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "�Ȥ���: passwd [-foqsvV] [�桼�� [�ѥ����]]\n"
 
-#: login-utils/passwd.c:301
+#: login-utils/passwd.c:296
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "%s ��¹ԤǤ��ޤ���: %s\n"
 
-#: login-utils/passwd.c:312
+#: login-utils/passwd.c:307
 msgid "Cannot find login name"
 msgstr "��������̾�����Ĥ����ޤ���"
 
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
 msgid "Only root can change the password for others.\n"
 msgstr "¾�ͤΥѥ���ɤ��ѹ��Ǥ���Τϥ롼�Ȥ����Ǥ���\n"
 
-#: login-utils/passwd.c:334
+#: login-utils/passwd.c:329
 msgid "Too many arguments.\n"
 msgstr "������¿�����ޤ���\n"
 
-#: login-utils/passwd.c:339
+#: login-utils/passwd.c:334
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
 msgstr "�桼��̾���ɤ��ˤ⸫�Ĥ���ޤ���`%s' �������˥桼���Ǥ�����"
 
-#: login-utils/passwd.c:343
+#: login-utils/passwd.c:338
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr ""
 "��ǰ�ʤ��顢��������Υѥ���ɤ��ѹ������Ǥ��ޤ���\n"
 "������ yppasswd ��ȤäƤ���������"
 
-#: login-utils/passwd.c:349
+#: login-utils/passwd.c:344
 msgid "UID and username does not match, imposter!"
 msgstr "�桼��ID �ֹ�ȥ桼��̾�����פ��ޤ��󡣺��Τ���"
 
-#: login-utils/passwd.c:354
+#: login-utils/passwd.c:349
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "%s �Υѥ���ɤ��ѹ����ޤ�\n"
 
-#: login-utils/passwd.c:358
+#: login-utils/passwd.c:353
 msgid "Enter old password: "
 msgstr "��ѥ���ɤ����Ϥ��Ƥ�������: "
 
-#: login-utils/passwd.c:360
+#: login-utils/passwd.c:355
 msgid "Illegal password, imposter."
 msgstr "�����ʥѥ���ɡ����ΤǤ���"
 
-#: login-utils/passwd.c:372
+#: login-utils/passwd.c:367
 msgid "Enter new password: "
 msgstr "���ѥ���ɤ����Ϥ��Ƥ���������"
 
-#: login-utils/passwd.c:374
+#: login-utils/passwd.c:369
 msgid "Password not changed."
 msgstr "�ѥ���ɤ��ѹ�����ޤ���Ǥ�����"
 
-#: login-utils/passwd.c:384
+#: login-utils/passwd.c:379
 msgid "Re-type new password: "
 msgstr "���ѥ���ɤ�⤦�������Ϥ��Ƥ�������: "
 
-#: login-utils/passwd.c:387
+#: login-utils/passwd.c:382
 msgid "You misspelled it. Password not changed."
 msgstr "�֤꤬�㤤�ޤ�����Ǥ⤦���ٻ�Ƥ���������"
 
-#: login-utils/passwd.c:402
+#: login-utils/passwd.c:397
 #, c-format
 msgid "password changed, user %s"
 msgstr "�ѥ���ɤ��ѹ�����ޤ������桼�� %s"
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:400
 msgid "ROOT PASSWORD CHANGED"
 msgstr "* root �Υѥ���ɤ��ѹ�����ޤ��� *"
 
-#: login-utils/passwd.c:407
+#: login-utils/passwd.c:402
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "�ѥ���ɤϥ롼�Ȥˤ�ä��ѹ�����ޤ������桼�� %s"
 
-#: login-utils/passwd.c:414
+#: login-utils/passwd.c:409
 msgid "calling setpwnam to set password.\n"
 msgstr "�ѥ���ɤ����ꤹ�뤿�� setpwnam ��ƤӽФ��档\n"
 
-#: login-utils/passwd.c:418
+#: login-utils/passwd.c:413
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "�ѥ���ɤ��ѹ� *����ޤ���Ǥ���*����Ǥ⤦���ٻ�Ƥ���������\n"
 
-#: login-utils/passwd.c:424
+#: login-utils/passwd.c:419
 msgid "Password changed.\n"
 msgstr "�ѥ���ɤ��ѹ�����ޤ�����\n"
 
-#: login-utils/shutdown.c:85
+#: login-utils/shutdown.c:87
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 msgstr "�Ȥ���: shutdown [-h|-r] [-fqs] [now|hh:ss|+ʬ]\n"
 
-#: login-utils/shutdown.c:103
+#: login-utils/shutdown.c:105
 msgid "Shutdown process aborted"
 msgstr "����åȥ�������������Ǥ���ޤ���"
 
-#: login-utils/shutdown.c:125
+#: login-utils/shutdown.c:131
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
 msgstr "%s: �롼�Ȥ����������ƥ�򥷥�åȥ�����Ǥ��ޤ���\n"
 
-#: login-utils/shutdown.c:219
+#: login-utils/shutdown.c:225
 msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr "�����ˤʤäƤ��ޤ��ޤ���������ޤ��ԤƤʤ��Ǥ��硩\n"
 
-#: login-utils/shutdown.c:271
+#: login-utils/shutdown.c:277
 msgid "for maintenance; bounce, bounce"
 msgstr "���ƥʥ��� -- bounce, bouce"
 
-#: login-utils/shutdown.c:275
+#: login-utils/shutdown.c:281
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#: login-utils/shutdown.c:300
+#: login-utils/shutdown.c:306
 msgid "The system is being shut down within 5 minutes"
 msgstr "�����ƥ�� 5 ʬ����˼��Ǥ���ޤ�"
 
-#: login-utils/shutdown.c:304
+#: login-utils/shutdown.c:310
 msgid "Login is therefore prohibited."
 msgstr "��������Ϥ���ζػߤ���Ƥ��ޤ���"
 
-#: login-utils/shutdown.c:325
+#: login-utils/shutdown.c:331
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%2$s �ˤ�� %1$s: %3$s"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "rebooted"
 msgstr "�Ƶ�ư"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "halted"
 msgstr "���"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:377
+#: login-utils/shutdown.c:387
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
@@ -5939,7 +6147,7 @@ msgstr ""
 "\n"
 "�ʤ�ǥ�֡��Ȥ����Τˡ������ޤ������Ƥ������衩"
 
-#: login-utils/shutdown.c:379
+#: login-utils/shutdown.c:389
 msgid ""
 "\n"
 "Now you can turn off the power..."
@@ -5947,96 +6155,100 @@ msgstr ""
 "\n"
 "�������Ÿ����ڤäƤ⤤���Ǥ���..."
 
-#: login-utils/shutdown.c:394
+#: login-utils/shutdown.c:404
 msgid "Calling kernel power-off facility...\n"
 msgstr "�����ͥ�� power-off ��ǽ��ƤӽФ��Ƥ��ޤ�...\n"
 
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:407
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "�Ÿ����ڤ�ݤΥ��顼\t%s\n"
 
-#: login-utils/shutdown.c:405
+#: login-utils/shutdown.c:415
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "�ץ������ \"%s\" ��¹Ԥ��Ƥ��ޤ�...\n"
 
-#: login-utils/shutdown.c:408
+#: login-utils/shutdown.c:418
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "�¹ԥ��顼\t%s\n"
 
-#: login-utils/shutdown.c:431
+#: login-utils/shutdown.c:441
 #, c-format
 msgid "URGENT: broadcast message from %s:"
 msgstr "�۵�: %s ����Υ�å�����:"
 
-#: login-utils/shutdown.c:437
+#: login-utils/shutdown.c:447
 msgid "System going down IMMEDIATELY!\n"
 msgstr "�����ƥ��*��������*��λ���ޤ���\n"
 
-#: login-utils/shutdown.c:440
+#: login-utils/shutdown.c:450
 #, c-format
 msgid "System going down in %d hour%s %d minutes"
 msgstr "�����ƥ�� %d ����%s%d ʬ�ǽ�λ���ޤ�"
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
 msgid "s"
 msgstr " "
 
-#: login-utils/shutdown.c:443
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "System going down in %d minute%s\n"
 msgstr "�����ƥ�� %d%sʬ�ǽ�λ���ޤ�\n"
 
-#: login-utils/shutdown.c:449
+#: login-utils/shutdown.c:459
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:506
+#: login-utils/shutdown.c:516
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "swapoff �ҥץ�������ư�Ǥ��ޤ���"
 
-#: login-utils/shutdown.c:514
+#: login-utils/shutdown.c:524
 msgid "Cannot exec swapoff, hoping umount will do the trick."
 msgstr "swapoff ��¹ԤǤ��ޤ���Τǡ�����ޥ���Ȥ����Ф��Ȥ����Ǥ��礦��"
 
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:543
 msgid "Cannot fork for umount, trying manually."
 msgstr "umount �ҥץ�������ư�Ǥ��ޤ��󡣼�ư���Ƥߤޤ���"
 
-#: login-utils/shutdown.c:542
+#: login-utils/shutdown.c:552
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr "%s ��¹ԤǤ��ޤ��󡣥���ޥ���Ȥ��ߤޤ���\n"
 
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:556
 msgid "Cannot exec umount, giving up on umount."
 msgstr "umount ��¹ԤǤ��ޤ��󡣥���ޥ���Ȥ�����ޤ���"
 
-#: login-utils/shutdown.c:551
+#: login-utils/shutdown.c:561
 msgid "Unmounting any remaining filesystems..."
 msgstr "�Ĥ�Υե����륷���ƥ�򥢥�ޥ���Ȥ��ޤ�..."
 
-#: login-utils/shutdown.c:587
+#: login-utils/shutdown.c:595
 #, c-format
-msgid "shutdown: Couldn't umount %s\n"
-msgstr "shutdown: %s �򥢥�ޥ���ȤǤ��ޤ���Ǥ���\n"
+msgid "shutdown: Couldn't umount %s: %s\n"
+msgstr "shutdown: %s �� umount ���Ǥ��ޤ���Ǥ���: %s\n"
 
-#: login-utils/simpleinit.c:79
+#: login-utils/simpleinit.c:109
 msgid "Booting to single user mode.\n"
 msgstr "���󥰥�桼���⡼�ɤǥ֡��Ȥ��ޤ���\n"
 
-#: login-utils/simpleinit.c:83
+#: login-utils/simpleinit.c:113
 msgid "exec of single user shell failed\n"
 msgstr "���󥰥�桼��������μ¹Ԥ˼��Ԥ��ޤ���\n"
 
-#: login-utils/simpleinit.c:87
+#: login-utils/simpleinit.c:117
 msgid "fork of single user shell failed\n"
 msgstr "���󥰥�桼��������� fork �˼��Ԥ��ޤ���\n"
 
-#: login-utils/simpleinit.c:226
+#: login-utils/simpleinit.c:166
+msgid "error opening fifo\n"
+msgstr "�ѥ��פΥ����ץ�ǥ��顼\n"
+
+#: login-utils/simpleinit.c:271
 msgid ""
 "\n"
 "Wrong password.\n"
@@ -6044,34 +6256,34 @@ msgstr ""
 "\n"
 "�ְ�ä��ѥ���ɡ�\n"
 
-#: login-utils/simpleinit.c:252
-msgid "exec rc failed\n"
-msgstr "rc �μ¹Ԥ˼���\n"
-
-#: login-utils/simpleinit.c:255
-msgid "open of rc file failed\n"
-msgstr "rc �ե�����Υ����ץ�˼���\n"
+#: login-utils/simpleinit.c:341
+msgid "stat of path failed\n"
+msgstr "�ѥ��� stat �����Ԥ��ޤ���\n"
 
-#: login-utils/simpleinit.c:261
-msgid "fork of rc shell failed\n"
-msgstr "rc ������� fork �˼��Ԥ��ޤ���\n"
+#: login-utils/simpleinit.c:348
+msgid "open of directory failed\n"
+msgstr "�ǥ��쥯�ȥ�Υ����ץ󤬼��Ԥ��ޤ���\n"
 
-#: login-utils/simpleinit.c:273
+#: login-utils/simpleinit.c:415
 msgid "fork failed\n"
 msgstr "fork ������\n"
 
-#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+#: login-utils/simpleinit.c:445 text-utils/more.c:1541
 msgid "exec failed\n"
 msgstr "�¹Ԥ˼���\n"
 
-#: login-utils/simpleinit.c:324
+#: login-utils/simpleinit.c:469
 msgid "cannot open inittab\n"
 msgstr "inittab �򳫤��ޤ���\n"
 
-#: login-utils/simpleinit.c:362
+#: login-utils/simpleinit.c:529
 msgid "no TERM or cannot stat tty\n"
 msgstr "ü�����ʤ��� tty �ξ��֤�����Ǥ��ޤ���\n"
 
+#: login-utils/simpleinit.c:753 login-utils/simpleinit.c:854
+msgid "error running programme\n"
+msgstr "�ץ�����൯ư���顼\n"
+
 #: login-utils/ttymsg.c:81
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr "iov ��¿�����ޤ� (wall/ttymsg.c �Υ����ɤ��ѹ����Ƥ�������)"
@@ -6094,37 +6306,37 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: *�����ʥ��顼*"
 
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:145
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s: ���Υե����� %s �ϻ�����Ǥ���\n"
 
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: ���Υե����� %s �ϻ�����Ǥ� (���ߤ� %s)\n"
 
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:167
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: %s ���󥯤Ǥ��ޤ���: %s\n"
 
-#: login-utils/vipw.c:193
+#: login-utils/vipw.c:188
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: %s �Υ��å������Ǥ��ޤ���: %s (�ѹ��� %s �ΤޤޤǤ�)\n"
 
-#: login-utils/vipw.c:217
+#: login-utils/vipw.c:211
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: �ҥץ�������ư�Ǥ��ޤ���\n"
 
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:251
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s ���ѹ�����ޤ���Ǥ���\n"
 
-#: login-utils/vipw.c:300
+#: login-utils/vipw.c:294
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: �ѹ�����ޤ���Ǥ���\n"
@@ -6159,76 +6371,76 @@ msgstr "%s: ����ե�����ξ��������Ǥ��ޤ���\n"
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: ����ե�������ɤ�ޤ���\n"
 
-#: misc-utils/cal.c:184
+#: misc-utils/cal.c:186
 msgid "illegal month value: use 1-12"
 msgstr "�����ʷ�: 1-12 ��ȤäƤ�������"
 
-#: misc-utils/cal.c:188
+#: misc-utils/cal.c:190
 msgid "illegal year value: use 1-9999"
 msgstr "������ǯ: 1-9999 ��ȤäƤ�������"
 
-#: misc-utils/cal.c:484
-msgid "usage: cal [-mjy] [[month] year]\n"
-msgstr "�Ȥ���: cal [-mjy] [[��] ǯ]\n"
+#: misc-utils/cal.c:486
+msgid "usage: cal [-mjyV] [[month] year]\n"
+msgstr "�Ȥ���: cal [-mjyV] [�� �� ǯ]\n"
 
-#: misc-utils/ddate.c:184
+#: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "�Ȥ���: %s [+��] [�� �� ǯ]\n"
 
 #. handle St. Tib's Day
-#: misc-utils/ddate.c:230
+#: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
 msgstr "�� Tib ����"
 
-#: misc-utils/kill.c:199
+#: misc-utils/kill.c:210
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: ̤�ΤΥ����ʥ� %s\n"
 
-#: misc-utils/kill.c:261
+#: misc-utils/kill.c:272
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr "%s: �ץ����� \"%s\" �򸫤Ĥ����ޤ���\n"
 
-#: misc-utils/kill.c:303
+#: misc-utils/kill.c:316
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: ̤�ΤΥ����ʥ� %s -- ����ʥ����ʥ�:\n"
 
-#: misc-utils/kill.c:343
+#: misc-utils/kill.c:356
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "�Ȥ���: %s [ -s �����ʥ� | -p ] [ -a ] �ץ�����ID ...\n"
 
-#: misc-utils/kill.c:344
+#: misc-utils/kill.c:357
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "        %s -l [ �����ʥ� ]\n"
 
-#: misc-utils/logger.c:144
+#: misc-utils/logger.c:133
 #, c-format
 msgid "logger: %s: %s.\n"
 msgstr "logger: %s: %s.\n"
 
-#: misc-utils/logger.c:241
+#: misc-utils/logger.c:237
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr "logger: ̤�Τ�����: %s.\n"
 
-#: misc-utils/logger.c:253
+#: misc-utils/logger.c:249
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr "logger: ̤�Τ�ͥ����: %s.\n"
 
-#: misc-utils/logger.c:280
+#: misc-utils/logger.c:276
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 "�Ȥ���: logger [-is] [-f �ե�����] [-p ͥ����] [-t ����] [-u �����å�] [ "
 "��å����� ... ]\n"
 
-#: misc-utils/look.c:340
+#: misc-utils/look.c:345
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr "�Ȥ���: look [-dfa] [-t ����饯��] ʸ���� [�ե�����]\n"
 
@@ -6242,62 +6454,62 @@ msgstr "%s �򥪡��ץ�Ǥ��ޤ���\n"
 msgid "Got %d bytes from %s\n"
 msgstr "%2$s ���� %1$d �Х��ȼ������ޤ���\n"
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:100
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr "namei: �����ȥǥ��쥯�ȥ�˥��������Ǥ��ޤ��� -- %s\n"
 
-#: misc-utils/namei.c:118
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr "namei: %s �� chkdir �Ǥ��ޤ��� - %s (%d)\n"
 
-#: misc-utils/namei.c:128
+#: misc-utils/namei.c:120
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr "usage: namei [-mx] �ѥ�̾ [�ѥ�̾ ...]\n"
 
-#: misc-utils/namei.c:157
+#: misc-utils/namei.c:145
 msgid "namei: could not chdir to root!\n"
 msgstr "namei: �롼�ȥǥ��쥯�ȥ�˰�ư�Ǥ��ޤ���\n"
 
-#: misc-utils/namei.c:164
+#: misc-utils/namei.c:152
 msgid "namei: could not stat root!\n"
 msgstr "namei: �롼�ȥǥ��쥯�ȥ�Υե�������������Ǥ��ޤ���\n"
 
-#: misc-utils/namei.c:219
+#: misc-utils/namei.c:207
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr " ? %s �ǥ��쥯�ȥ�˰�ư�Ǥ��ޤ��� -- %s (%d)\n"
 
-#: misc-utils/namei.c:248
+#: misc-utils/namei.c:236
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr " ? ����ܥ�å���� %s �ɤ߼��������꤬�����ޤ��� - %s (%d)\n"
 
-#: misc-utils/namei.c:258
-msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***"
-msgstr "  *** ����ܥ�å���󥯿��� UNIX �����¤�ۤ��ޤ��� ***"
+#: misc-utils/namei.c:246
+msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
+msgstr "  *** ����ܥ�å���󥯿��� UNIX �����¤�ۤ��ޤ��� ***\n"
 
-#: misc-utils/namei.c:294
+#: misc-utils/namei.c:283
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei: �ե����� %2$s �ϡ�̤�ΤΥե����륿���� 0%1$06o �Ǥ�\n"
 
-#: misc-utils/script.c:109
-msgid "usage: script [-a] [file]\n"
-msgstr "�Ȥ���: script [-a] [�ե�����]\n"
+#: misc-utils/script.c:118
+msgid "usage: script [-a] [-f] [file]\n"
+msgstr "�Ȥ���: script [-a] [-f] [�ե�����]\n"
 
-#: misc-utils/script.c:129
+#: misc-utils/script.c:139
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "������ץȤ򳫻Ϥ��ޤ������ե������ %s �Ǥ�\n"
 
-#: misc-utils/script.c:198
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started on %s"
 msgstr "������ץȤ� %s �˳��Ϥ��ޤ���"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:269
 #, c-format
 msgid ""
 "\n"
@@ -6306,288 +6518,288 @@ msgstr ""
 "\n"
 "������ץȤ� %s �˽�λ���ޤ���"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "������ץȤ�λ���ޤ������ե������ %s �Ǥ�\n"
 
-#: misc-utils/script.c:281
+#: misc-utils/script.c:288
 msgid "openpty failed\n"
 msgstr "openpty ������\n"
 
-#: misc-utils/script.c:315
+#: misc-utils/script.c:322
 msgid "Out of pty's\n"
 msgstr "���ѤǤ��� pty ������ޤ���\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:713
+#: misc-utils/setterm.c:743
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: �������顼���Ȥ�����\n"
 
-#: misc-utils/setterm.c:716
+#: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term ü��̾ ]\n"
 
-#: misc-utils/setterm.c:717
+#: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:718
+#: misc-utils/setterm.c:748
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:719
+#: misc-utils/setterm.c:749
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:721
+#: misc-utils/setterm.c:751
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:722
+#: misc-utils/setterm.c:752
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:724
+#: misc-utils/setterm.c:754
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:725
+#: misc-utils/setterm.c:755
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:726
+#: misc-utils/setterm.c:756
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:727
+#: misc-utils/setterm.c:757
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:728
+#: misc-utils/setterm.c:758
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:730
+#: misc-utils/setterm.c:760
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:732
+#: misc-utils/setterm.c:762
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
-#: misc-utils/setterm.c:739
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:734
+#: misc-utils/setterm.c:764
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:736
+#: misc-utils/setterm.c:766
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:738
+#: misc-utils/setterm.c:768
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:741
+#: misc-utils/setterm.c:771
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:773
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:774
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:775
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:776
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:777
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:778
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:779
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:780
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:781
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ ����1 ����2 ����3 ... ] ]      (���ֿ� = 1-160)\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:782
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ ����1 ����2 ����3 ... ] ]   (���ֿ� = 1-160)\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:784
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NR_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file ����ץե�����̾ ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:789
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:790
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:791
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:792
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:793
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq freqnumber ]\n"
 
-#: misc-utils/setterm.c:831
+#: misc-utils/setterm.c:862
 msgid "snow.on"
 msgstr "snow.on"
 
-#: misc-utils/setterm.c:833
+#: misc-utils/setterm.c:864
 msgid "snow.off"
 msgstr "snow.off"
 
-#: misc-utils/setterm.c:839
+#: misc-utils/setterm.c:870
 msgid "softscroll.on"
 msgstr "softscroll.on"
 
-#: misc-utils/setterm.c:841
+#: misc-utils/setterm.c:872
 msgid "softscroll.off"
 msgstr "softscroll.off"
 
-#: misc-utils/setterm.c:1016
+#: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr "�ѥ�����֥⡼�ɤ�����(���ϲ��)�Ǥ��ޤ���\n"
 
-#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "klogctl ���顼: %s\n"
 
-#: misc-utils/setterm.c:1104
+#: misc-utils/setterm.c:1133
 #, c-format
 msgid "Error reading %s\n"
 msgstr "%s ���ɹ��ߥ��顼\n"
 
-#: misc-utils/setterm.c:1119
+#: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
 msgstr "�����꡼�����׽񤭹��ߥ��顼\n"
 
-#: misc-utils/setterm.c:1133
+#: misc-utils/setterm.c:1162
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "%s ���ɤ�ޤ��󡢤����� ioctl ����פ��Ǥ��ޤ���\n"
 
-#: misc-utils/setterm.c:1198
+#: misc-utils/setterm.c:1227
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM ���������Ƥ��ޤ���\n"
 
-#: misc-utils/tsort.c:119
+#: misc-utils/tsort.c:117
 msgid "usage: tsort [ inputfile ]\n"
 msgstr "�Ȥ���: tsort [ ���ϥե����� ]\n"
 
-#: misc-utils/tsort.c:156
+#: misc-utils/tsort.c:154
 msgid "tsort: odd data count.\n"
 msgstr "tsort: �Ѥʥǡ���������ȤǤ���\n"
 
-#: misc-utils/tsort.c:321
+#: misc-utils/tsort.c:305
 msgid "tsort: cycle in data.\n"
 msgstr "tsort: �ǡ������۴Ĥ��Ƥ��ޤ���\n"
 
-#: misc-utils/tsort.c:334
+#: misc-utils/tsort.c:318
 msgid "tsort: internal error -- could not find cycle.\n"
 msgstr "tsort: �������顼 -- �۴Ĥ򸫤Ĥ����ޤ���Ǥ�����\n"
 
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:155
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM �ǥ��쥯�ȥ� ... -f ] ̾�� ...\n"
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:100
 msgid "write: can't find your tty's name\n"
 msgstr "write: ���ʤ��� tty ��̾���򸫤Ĥ����ޤ���\n"
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:111
 msgid "write: you have write permission turned off.\n"
 msgstr "write: ���ʤ��Ͻ񤭹��߸��¤򥪥դˤ����ޤޤǤ���\n"
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:132
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr "write: %s �� %s �˥������󤷤Ƥ��ޤ���\n"
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:140
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr "write %s �ˤ� %s ��ǥ�å�������̵���ˤ��Ƥ��ޤ�\n"
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:147
 msgid "usage: write user [tty]\n"
 msgstr "�Ȥ���: write �桼�� [tty]\n"
 
-#: misc-utils/write.c:245
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write %s �ϥ������󤷤Ƥ��ޤ���\n"
 
-#: misc-utils/write.c:254
+#: misc-utils/write.c:255
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr "write: %s �ϥ�å�������̵���ˤ��Ƥ��ޤ�\n"
 
-#: misc-utils/write.c:258
+#: misc-utils/write.c:259
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr "write: %s ��ʣ���������󤷤Ƥ��ޤ� -- %s �� write ���ޤ�\n"
 
-#: misc-utils/write.c:325
+#: misc-utils/write.c:323
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "��å����� from %s@%s on %s at %s ..."
@@ -6630,39 +6842,48 @@ msgstr "���å��ե����� %s �򳫤��ޤ���: %s (-n �ե饰��ȤäƤ�������)"
 msgid "Can't lock lock file %s: %s\n"
 msgstr "���å��ե����� %s ����å��Ǥ��ޤ���: %s\n"
 
-#: mount/fstab.c:425
+#: mount/fstab.c:427
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "���å��ե����� %s ����å��Ǥ��ޤ���: %s"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:429
 msgid "timed out"
 msgstr "�����ॢ����"
 
-#: mount/fstab.c:472 mount/fstab.c:480
+#: mount/fstab.c:436
+#, c-format
+msgid ""
+"Cannot create link %s\n"
+"Perhaps there is a stale lock file?\n"
+msgstr ""
+"��� %s ������Ǥ��ޤ���\n"
+"¿ʬ�����ߤȲ��������å��ե����뤬����ΤǤ� ?\n"
+
+#: mount/fstab.c:482 mount/fstab.c:490
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "%s �򳫤��ޤ��� (%s) -- mtab �Ϲ�������ޤ���"
 
-#: mount/fstab.c:505
+#: mount/fstab.c:515
 msgid "mount: warning: cannot change mounted device with a remount\n"
 msgstr "mount: �ٹ�: �ƥޥ���ȤǤΥޥ���ȺѥǥХ������ѹ��ϤǤ��ޤ���\n"
 
-#: mount/fstab.c:510
+#: mount/fstab.c:520
 msgid "mount: warning: cannot change filesystem type with a remount\n"
 msgstr "mount: �ٹ�: �ƥޥ���ȤǤΥե����륷���ƥॿ���פ��ѹ��ϤǤ��ޤ���\n"
 
-#: mount/fstab.c:518 mount/fstab.c:524
+#: mount/fstab.c:528 mount/fstab.c:534
 #, c-format
 msgid "error writing %s: %s"
 msgstr "%s �ؤν񤭹��ߥ��顼: %s"
 
-#: mount/fstab.c:531
+#: mount/fstab.c:541
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "%s �Υ⡼���ѹ����顼: %s\n"
 
-#: mount/fstab.c:538
+#: mount/fstab.c:548
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s ��̾���� %s ���ѹ��Ǥ��ޤ���: %s\n"
@@ -6677,16 +6898,16 @@ msgstr "loop: �ǥХ��� %s �򥪡��ץ�Ǥ��ޤ���: %s\n"
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: �ǥХ��� %s �ξ��������Ǥ��ޤ���: %s\n"
 
-#: mount/lomount.c:89 mount/losetup.c:74
+#: mount/lomount.c:89
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 msgstr "%s: [%04x]:%ld (%s) ���ե��å� %d, %s encryption\n"
 
-#: mount/lomount.c:143
+#: mount/lomount.c:148
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: /dev/loop# ���������Ĥ���ޤ���"
 
-#: mount/lomount.c:147
+#: mount/lomount.c:152
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -6694,7 +6915,7 @@ msgstr ""
 "mount: /dev/loop# ���������Ĥ���ޤ���\n"
 "       ¿ʬ /dev/loop# �Υ᥸�㡼�ֹ椬�ְ�äƤ���ΤǤϡ�"
 
-#: mount/lomount.c:151
+#: mount/lomount.c:156
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -6705,7 +6926,7 @@ msgstr ""
 "       �Ǥ����顢���Υ����ͥ�� loop �ǥХ����򰷤��ޤ���\n"
 "       (�������Ȥ���С��ƥ���ѥ��뤹�뤫 `insmod loop.o' ���Ʋ�������)"
 
-#: mount/lomount.c:156
+#: mount/lomount.c:162
 msgid ""
 "mount: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
@@ -6717,55 +6938,55 @@ msgstr ""
 "       ��������)�����뤤�ϡ�/dev/loop# �Υ᥸�㡼�ֹ椬�ְ�äƤ���Τ���\n"
 "       �Τ�ޤ���"
 
-#: mount/lomount.c:160
+#: mount/lomount.c:166
 msgid "mount: could not find any free loop device"
 msgstr "mount: �����Ƥ��� loop �ǥХ��������Ĥ���ޤ���"
 
-#: mount/lomount.c:191 mount/losetup.c:106
+#: mount/lomount.c:197
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "%s �����פΰŹ沽�ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/lomount.c:210 mount/losetup.c:126
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr "����˳�Ǽ�Ǥ��ޤ���Ǥ����Τǡ���λ���ޤ���\n"
+
+#: mount/lomount.c:231
 msgid "Init (up to 16 hex digits): "
 msgstr "����� (16 �ʿ��Ǻ��� 16 ʸ���ޤ�): "
 
-#: mount/lomount.c:217 mount/losetup.c:133
+#: mount/lomount.c:238
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "16 �ʿ��ǤϤʤ�ʸ�� '%c'��\n"
 
-#: mount/lomount.c:223 mount/losetup.c:140
+#: mount/lomount.c:245
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr "�Ź沽�����ƥ� %d �θ�������ˡ�����ޤ���\n"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:261
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d): ����\n"
 
-#: mount/lomount.c:250
+#: mount/lomount.c:272
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: �ǥХ��� %s �����Ǥ��ޤ���: %s\n"
 
-#: mount/lomount.c:260
+#: mount/lomount.c:282
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ����\n"
 
-#: mount/lomount.c:268
+#: mount/lomount.c:290
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "���� mount �� loop �Υ��ݡ��Ȥʤ��ǥ���ѥ��뤵��ޤ�����\n"
 "�ƥ���ѥ��뤷�Ƥ���������\n"
 
-#: mount/losetup.c:70
-msgid "Cannot get loop info"
-msgstr "loop �ξ��������Ǥ��ޤ���"
-
-#: mount/losetup.c:176
+#: mount/lomount.c:327
 #, c-format
 msgid ""
 "usage:\n"
@@ -6778,7 +6999,11 @@ msgstr ""
 "  %s -d loop�ǥХ���                                       # ���\n"
 "  %s [ -e �Ź沽 ] [ -o ���ե��å� ] loop�ǥХ��� �ե����� # ����\n"
 
-#: mount/losetup.c:234
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr "���꤬�Խ�ʬ�Ǥ�"
+
+#: mount/lomount.c:416
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 "����ѥ������ loop "
@@ -6798,136 +7023,160 @@ msgstr "[mntent]: %2$s �� %1$d ���ܤ������Ǥ�%3$s\n"
 msgid "; rest of file ignored"
 msgstr "-- ̵�뤷�ޤ�"
 
-#: mount/mount.c:333
+#: mount/mount.c:350
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr "mount: mtab �ˤ��ȡ�%s �� %s �˥ޥ���ȺѤǤ�"
 
-#: mount/mount.c:336
+#: mount/mount.c:353
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr "mount: mtab �ˤ��ȡ�%s �� %s �˥ޥ���Ȥ���Ƥ��ޤ�"
 
-#: mount/mount.c:357
+#: mount/mount.c:374
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s ��񤭹����Ѥ˥����ץ�Ǥ��ޤ���: %s"
 
-#: mount/mount.c:372 mount/mount.c:644
+#: mount/mount.c:389 mount/mount.c:589
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: %s �ν񤭹��ߥ��顼: %s"
 
-#: mount/mount.c:379
+#: mount/mount.c:396
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: %s �Υ⡼���ѹ����顼: %s"
 
-#: mount/mount.c:473
+#: mount/mount.c:438
+#, c-format
+msgid "%s looks like swapspace - not mounted"
+msgstr "%s �ϥ���å׶��֤Τ褦�Ǥ��� -- �ޥ���Ȥ��ޤ���"
+
+#: mount/mount.c:481
 msgid "mount failed"
 msgstr "�ޥ���Ȥ˼��Ԥ��ޤ���"
 
-#: mount/mount.c:475
+#: mount/mount.c:483
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: %s �� %s �˥ޥ���ȤǤ���Τ� root �����Ǥ�"
 
-#: mount/mount.c:503
+#: mount/mount.c:511
 msgid "mount: loop device specified twice"
 msgstr "mount: loop �ǥХ����� 2 ����ꤵ��ޤ���"
 
-#: mount/mount.c:509
+#: mount/mount.c:516
 msgid "mount: type specified twice"
 msgstr "mount: �����פ� 2 ����ꤵ��ޤ���"
 
-#: mount/mount.c:521
+#: mount/mount.c:528
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: loop �ǥХ���������򥹥��åפ��ޤ�\n"
 
-#: mount/mount.c:530
+#: mount/mount.c:537
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr "mount: loop �ǥХ��� %s ��Ȥ��ޤ�\n"
 
-#: mount/mount.c:534
+#: mount/mount.c:541
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: loop �ǥХ���������˼��Ԥ��ޤ���\n"
 
-#: mount/mount.c:538
+#: mount/mount.c:545
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: loop �ǥХ�����������������ޤ���\n"
 
-#: mount/mount.c:551
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr ""
-"mount: ���ΥС������� 'nfs' �����פΥ��ݡ��Ȥʤ��ǥ���ѥ��뤵��Ƥ��ޤ�"
+#: mount/mount.c:584
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: %s �������ץ�Ǥ��ޤ���: %s"
+
+#: mount/mount.c:607
+#, c-format
+msgid "mount: cannot not open %s for setting speed"
+msgstr "mount: %s ��®�������Ѥ˥����ץ�Ǥ��ޤ���"
+
+#: mount/mount.c:610
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: ®�٤����꤬�Ǥ��ޤ���: %s"
 
-#: mount/mount.c:601 mount/mount.c:1030
+#: mount/mount.c:671 mount/mount.c:1175
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: fork �Ǥ��ޤ���: %s"
 
-#: mount/mount.c:639
-#, c-format
-msgid "mount: can't open %s: %s"
-msgstr "mount: %s �������ץ�Ǥ��ޤ���: %s"
+#: mount/mount.c:739
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr ""
+"mount: ���ΥС������� 'nfs' �����פΥ��ݡ��Ȥʤ��ǥ���ѥ��뤵��Ƥ��ޤ�"
 
-#: mount/mount.c:668
+#: mount/mount.c:779
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr "mount: nfs mount version 4 �Ǥϼ��Ԥ��ޤ�����3 ���ޤ�..\n"
+
+#: mount/mount.c:790
 msgid ""
 "mount: I could not determine the filesystem type, and none was specified"
 msgstr "mount: none �����ꤵ��ޤ��������ե����륷���ƥॿ���פ����Ǥ��ޤ���"
 
-#: mount/mount.c:671
+#: mount/mount.c:793
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: �ե����륷���ƥॿ���פ���ꤹ��ɬ�פ�����ޤ�"
 
-#: mount/mount.c:678 mount/mount.c:713
+#. should not happen
+#: mount/mount.c:796
+msgid "mount: mount failed"
+msgstr "mount: �ޥ���Ȥ˼��Ԥ��ޤ���"
+
+#: mount/mount.c:802 mount/mount.c:837
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: �ޥ���ȥݥ���� %s �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: mount/mount.c:680
+#: mount/mount.c:804
 msgid "mount: permission denied"
 msgstr "mount: ���Ĥ�����ޤ���"
 
-#: mount/mount.c:682
+#: mount/mount.c:806
 msgid "mount: must be superuser to use mount"
 msgstr "mount: mount ��Ȥ��ˤϥ����ѡ��桼���Ǥʤ���Фʤ�ޤ���"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:686 mount/mount.c:690
+#: mount/mount.c:810 mount/mount.c:814
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s �ϻ�����Ǥ�"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:692
+#: mount/mount.c:816
 msgid "mount: proc already mounted"
 msgstr "mount: proc �ϥޥ���ȺѤǤ�"
 
-#: mount/mount.c:694
+#: mount/mount.c:818
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s �� �ޥ���ȺѤ� %s ��������Ǥ�"
 
-#: mount/mount.c:700
+#: mount/mount.c:824
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: �ޥ���ȥݥ���� %s ��¸�ߤ��ޤ���"
 
-#: mount/mount.c:702
+#: mount/mount.c:826
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr "mount: �ޥ���ȥݥ���� %s �Ϥɤ��⤵���Ƥ��ʤ�����ܥ�å���󥯤Ǥ�"
 
-#: mount/mount.c:705
+#: mount/mount.c:829
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: ���ڥ����ǥХ��� %s ��¸�ߤ��ޤ���"
 
-#: mount/mount.c:715
+#: mount/mount.c:839
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -6936,12 +7185,12 @@ msgstr ""
 "mount: ���ڥ����ǥХ��� %s ��¸�ߤ��ޤ���\n"
 "       (�ѥ��Υǥ��쥯�ȥ꤬����ޤ���)\n"
 
-#: mount/mount.c:727
+#: mount/mount.c:851
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr "mount: %s �Ϥޤ��ޥ���Ȥ���Ƥ��ʤ����������ʥ��ץ����Ǥ�"
 
-#: mount/mount.c:729
+#: mount/mount.c:853
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -6951,35 +7200,35 @@ msgstr ""
 "       %s �Υ����ѡ��֥��å��������������ϥե����륷���ƥ�Υޥ����\n"
 "       ��¿�����ޤ�"
 
-#: mount/mount.c:744
+#: mount/mount.c:871
 msgid "mount table full"
 msgstr "�ޥ���ȥơ��֥뤬���äѤ��Ǥ�"
 
-#: mount/mount.c:746
+#: mount/mount.c:873
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: �����ѡ��֥��å����ɤ�ޤ���"
 
-#: mount/mount.c:749
+#: mount/mount.c:877
 #, c-format
 msgid "mount: %s has wrong major or minor number"
 msgstr "mount: %s ���ְ�ä��᥸�㡼���ϥޥ��ʡ��ֹ�ˤʤäƤ��ޤ�"
 
-#: mount/mount.c:754
+#: mount/mount.c:882
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: �ե����륷���ƥॿ���� %s �ϥ����ͥ뤬���ݡ��Ȥ��Ƥ��ޤ���"
 
-#: mount/mount.c:766
+#: mount/mount.c:894
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: �����餯���ʤ��� %s ���̣�������ä��ΤǤ��礦"
 
-#: mount/mount.c:768
+#: mount/mount.c:896
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: ¿ʬ���ʤ��� iso9660 ����ꤷ�����ä��ΤǤϡ�"
 
-#: mount/mount.c:771
+#: mount/mount.c:899
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
@@ -6987,12 +7236,12 @@ msgstr ""
 "       %s �����ݡ��Ȥ���Ƥ��ޤ���"
 
 #. strange ...
-#: mount/mount.c:776
+#: mount/mount.c:905
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr "mount: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ��󡢤����� stat �����ԡ�"
 
-#: mount/mount.c:778
+#: mount/mount.c:907
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7001,229 +7250,273 @@ msgstr ""
 "mount: ���Υ����ͥ�� %s ��֥��å��ǥХ����Ȥ���ǧ�����ޤ���\n"
 "       (¿ʬ��`insmod �ɥ饤��' ���ʤ��Ȥ����ʤ��ΤǤϡ�)"
 
-#: mount/mount.c:781
+#: mount/mount.c:910
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 "mount: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ��� (¿ʬ `-o loop' �Ȥ�äƤߤ��顩)"
 
-#: mount/mount.c:784
+#: mount/mount.c:913
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s �ϥ֥��å��ǥХ����ǤϤ���ޤ���"
 
-#: mount/mount.c:787
+#: mount/mount.c:916
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s ������ʥ֥��å��ǥХ����ǤϤ���ޤ���"
 
-#: mount/mount.c:791
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:919
+msgid "block device "
+msgstr "�֥��å��ǥХ��� "
+
+#: mount/mount.c:921
+#, c-format
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount: %s%s ���ɹ������Ѥǥޥ���ȤǤ��ޤ���"
+
+#: mount/mount.c:925
 #, c-format
-msgid "mount: block device %s is not permitted on its filesystem"
-msgstr "mount: �֥��å��ǥХ��� %s �Ϥ��Υե����륷���ƥ��ǵ��Ĥ���ޤ���"
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
+msgstr "mount: %s%s �Ͻ񤭹��߶ػߤǤ�����`-w' �ե饰������Ū��Ϳ�����ޤ���"
 
-#: mount/mount.c:807
+#: mount/mount.c:941
 #, c-format
 msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr "mount: %s%s �Ͻ񤭹��߶ػߤǤ����ɹ������Ѥǥޥ���Ȥ��ޤ�"
 
-#: mount/mount.c:808
-msgid "block device "
-msgstr "�֥��å��ǥХ��� "
-
-#: mount/mount.c:894
+#: mount/mount.c:1030
 #, c-format
-msgid "mount: consider mounting %s by %s\n"
-msgstr "mount: %s �� %s �ǥޥ���Ȥ��뤳�Ȥ�ͤ��ƤߤƤ�������\n"
+msgid "mount: going to mount %s by %s\n"
+msgstr "mount: %s �� %s �ǥޥ���Ȥ��ޤ�\n"
 
-#: mount/mount.c:895
+#: mount/mount.c:1031
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:895
+#: mount/mount.c:1031
 msgid "label"
 msgstr "��٥�"
 
-#: mount/mount.c:897 mount/mount.c:1213
+#: mount/mount.c:1033 mount/mount.c:1403
 msgid "mount: no such partition found"
 msgstr "mount: ���Τ褦�ʥѡ��ƥ������ϸ��Ĥ���ޤ���"
 
-#: mount/mount.c:905
+#: mount/mount.c:1041
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr "mount: �����פ�Ϳ�����Ƥ��ޤ��� -- �����󤬤���Τ� nfs ���ͤǤ���\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:921
+#: mount/mount.c:1057
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: �Хå����饦��� \"%s\"\n"
 
-#: mount/mount.c:932
+#: mount/mount.c:1068
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: ����ޤ��� \"%s\"\n"
 
-#: mount/mount.c:981
+#: mount/mount.c:1126
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s �� %s �˥ޥ���ȺѤǤ�\n"
 
-#: mount/mount.c:1092
-msgid ""
-"Usage: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       A special device can be indicated by  -L label  or  -U uuid .\n"
-msgstr ""
-"�Ȥ���: mount [-hV]\n"
-"        mount -a [-nfFrsvw] [-t �ե����륷���ƥ෿]\n"
-"        mount [-nfrsvw] [-o ���ץ����] special | node\n"
-"        mount [-nfrsvw] [-t �ե����륷���ƥ෿] [-o ���ץ����] special "
-"node\n"
-"        ���ڥ����ǥХ�����  -L ��٥�  ����  -U uuid �ǻؼ��Ǥ��ޤ���\n"
-
-#: mount/mount.c:1198
+#: mount/mount.c:1243
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+"�Ȥ���: mount -V                : �С�������ɽ��\n"
+"        mount -h                : ���Υإ�פ�ɽ��\n"
+"        mount                   : mount �ѥե����륷���ƥ�Υꥹ��\n"
+"        mount -l                : Ʊ�塢�ܥ�塼���٥��ޤ�\n"
+"�ʾ夬����ɽ���˴ؤ����Ρ������ޥ������\n"
+"���Υ��ޥ�ɤ� `mount [-t fstype] ���� �ɤ���'��\n"
+"/etc/fstab �Ǿܺ٤ˤĤ��ƻ��ꤷ�Ƥ����С�������ά���뤳�Ȥ��Ǥ��ޤ���\n"
+"        mount -a                : /etc/fstab ���������Ƥ�ޥ���Ȥ���\n"
+"        mount device            : device ����Τξ��إޥ���Ȥ���\n"
+"        mount directory         : ���ΤΥǥХ����� directory �˥ޥ���Ȥ���\n"
+"        mount -t type dev dir   : �̾�� mount ���ޥ��\n"
+"����Ȥ��ϡ��ǥХ�����ºݤˤϥޥ���Ȥ���������Ȥ��ϥǥХ�����˸��Ĥ���\n"
+"��Ϳ����줿�����פΡ˥ե����륷���ƥ��ޥ���Ȥ���ȱ������Ȥ����ܡ�\n"
+"���˸����Ƥ���ǥ��쥯�ȥ�ĥ꡼��¾�ξ��˥ޥ���ȤǤ�����⤷�ޤ���\n"
+"        mount --bind olddir newdir\n"
+"device �ˤϡ�/dev/hda1 �� /dev/cdrom ���ͤ�̾����Ϳ���Ƥ⡢-L label ��\n"
+"�Ȥäƥ�٥�̾��Ϳ���Ƥ⡢-U uuid ��Ȥä� uuid ��Ϳ���Ƥ⤫�ޤ��ޤ���\n"
+"Union or stack mounts are specified using one of\n"
+"        --replace, --after, --before, --over\n"
+"����¾�Υ��ץ����: [-nfFrsvw] [-o ���ץ����]\n"
+"��äȾܤ������Ȥ��Τꤿ����С�man 8 mount �Ⱦ����Ƥߤޤ��礦��\n"
+
+#: mount/mount.c:1387
 msgid "mount: only root can do that"
 msgstr "mount: root �����������Ԥʤ��ޤ�"
 
-#: mount/mount.c:1203
+#: mount/mount.c:1392
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s �����Ĥ���ޤ��� -- �������ޤ�..\n"
 
-#: mount/mount.c:1215
+#: mount/mount.c:1405
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: %s ��ޥ���Ȥ��ޤ�\n"
 
-#: mount/mount.c:1224
+#: mount/mount.c:1414
 msgid "not mounted anything"
 msgstr "����ޥ���Ȥ��ޤ���Ǥ���"
 
-#: mount/mount.c:1237
+#: mount/mount.c:1429
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %2$s ��� %1$s �򸫤Ĥ����ޤ���"
 
-#: mount/mount.c:1251
+#: mount/mount.c:1444
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: %2$s �� %3$s ��� %1$s �򸫤Ĥ����ޤ���"
 
-#: mount/mount_by_label.c:141
+#: mount/mount_by_label.c:97
+#, c-format
+msgid ""
+"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr "mount: %s �򥪡��ץ�Ǥ��ʤ��ä��Τǡ�UUID �� LABEL ���Ѵ���Ԥ��ޤ���\n"
+
+#: mount/mount_by_label.c:199
 msgid "mount: bad UUID"
 msgstr "mount: ������ UUID"
 
-#: mount/mount_guess_fstype.c:198
+#: mount/mount_guess_fstype.c:257
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr "mount: %s �ؤΥե����륷���ƥॿ���פλ��꤬����ޤ���\n"
 
-#: mount/mount_guess_fstype.c:201
+#: mount/mount_guess_fstype.c:260
+#, c-format
+msgid "       I will try all types mentioned in %s or %s\n"
+msgstr "       %s ���� %s �Υ����פ��Ƥߤޤ�\n"
+
+#: mount/mount_guess_fstype.c:263
+msgid "       and it looks like this is swapspace\n"
+msgstr "       �����ơ�����ϥ���å׶��֤��ͤǤ���\n"
+
+#: mount/mount_guess_fstype.c:265
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       ������ %s ���Ƥߤޤ�\n"
 
-#: mount/mount_guess_fstype.c:203
+#: mount/mount_guess_fstype.c:329
 #, c-format
-msgid "       I will try all types mentioned in %s or %s\n"
-msgstr "       %s ���� %s �Υ����פ��Ƥߤޤ�\n"
+msgid "Trying %s\n"
+msgstr "%s ���ޤ�\n"
 
-#: mount/nfsmount.c:157
+#: mount/nfsmount.c:220
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: ��ü��Ĺ�� �ۥ���:�ǥ��쥯�ȥ� ����\n"
 
-#: mount/nfsmount.c:170
+#: mount/nfsmount.c:233
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: �ٹ�: ʣ���Υۥ���̾�ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/nfsmount.c:174
+#: mount/nfsmount.c:237
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 "mount: �ޥ������ǥ��쥯�ȥ꤬ �ۥ���:�ǥ��쥯�ȥ� �����ˤʤäƤ��ޤ���\n"
 
-#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#: mount/nfsmount.c:248 mount/nfsmount.c:498
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: %s �Υ��ɥ쥹�������Ǥ��ޤ���\n"
 
-#: mount/nfsmount.c:191
+#: mount/nfsmount.c:254
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ������ hp->h_length �ͤ�������ޤ���\n"
 
-#: mount/nfsmount.c:208
+#: mount/nfsmount.c:271
 msgid "mount: excessively long option argument\n"
 msgstr "mount: ���ץ���������Ĺ�����ޤ�\n"
 
-#: mount/nfsmount.c:299
+#: mount/nfsmount.c:362
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "�ٹ�: proto= ���ץ��������Ǥ��ޤ���\n"
 
-#: mount/nfsmount.c:306
+#: mount/nfsmount.c:369
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "�ٹ�: namlen ���ץ����ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/nfsmount.c:310
+#: mount/nfsmount.c:373
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "̤�Τ� nfs �ޥ���ȥѥ�᡼��: %s=%d\n"
 
-#: mount/nfsmount.c:345
+#: mount/nfsmount.c:408
 msgid "Warning: option nolock is not supported.\n"
 msgstr "�ٹ�: nolock ���ץ����ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/nfsmount.c:348
+#: mount/nfsmount.c:411
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "̤�Τ� nfs �ޥ���ȥ��ץ����: %s%s\n"
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:504
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ������ hp->h_length �ͤ������\n"
 
-#: mount/nfsmount.c:528
-#, c-format
-msgid "mount: %s:%s failed, reason given by server: %s\n"
-msgstr "mount: %s:%s �����ԡ������С��������ͳ: %s\n"
-
-#: mount/nfsmount.c:539
+#: mount/nfsmount.c:680
 msgid "NFS over TCP is not supported.\n"
 msgstr "TCP ��ͳ�� NFS �ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: mount/nfsmount.c:546
+#: mount/nfsmount.c:687
 msgid "nfs socket"
 msgstr "nfs �����å�"
 
-#: mount/nfsmount.c:550
+#: mount/nfsmount.c:691
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:561
+#: mount/nfsmount.c:702
 msgid "used portmapper to find NFS port\n"
 msgstr "NFS �ݡ��Ȥ򸫤Ĥ��뤿��� portmapper ������\n"
 
-#: mount/nfsmount.c:565
+#: mount/nfsmount.c:706
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "nfs �ǡ����Τ���� %d �֥ݡ��Ȥ�����\n"
 
-#: mount/nfsmount.c:576
+#: mount/nfsmount.c:717
 msgid "nfs connect"
 msgstr "nfs ��³"
 
-#: mount/nfsmount.c:665
+#: mount/nfsmount.c:804
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "̤�Τ� nfs ���ơ������ͤ��֤��ޤ���: %d"
 
-#: mount/sundries.c:40 mount/sundries.c:55
-msgid "not enough memory"
-msgstr "���꤬�Խ�ʬ�Ǥ�"
-
-#: mount/sundries.c:65
+#: mount/sundries.c:66
 msgid "bug in xstrndup call"
 msgstr "xstrndup �ƤӽФ��ΥХ�"
 
@@ -7335,26 +7628,26 @@ msgstr "umount2 ������ޤ���umount ���Ƥߤޤ�...\n"
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s �򥢥�ޥ���ȤǤ��ޤ���Ǥ��� -- ���� %s ��ȤäƤߤޤ�\n"
 
-#: mount/umount.c:270
+#: mount/umount.c:272
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s �ϻ�����Ǥ� -- �ɹ������ѤȤ��ƺƥޥ���Ȥ��ޤ�\n"
 
-#: mount/umount.c:278
+#: mount/umount.c:282
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr "umount: %s ���ɹ������ѤǺƥޥ���ȤǤ��ޤ���Ǥ���\n"
 
-#: mount/umount.c:286
+#: mount/umount.c:290
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s �ϥ���ޥ���Ȥ���ޤ���\n"
 
-#: mount/umount.c:369
+#: mount/umount.c:374
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: ����ޥ���ȤΤ���Υե����륷���ƥ�ꥹ�Ȥ򸫤Ĥ����ޤ���"
 
-#: mount/umount.c:398
+#: mount/umount.c:403
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7364,47 +7657,47 @@ msgstr ""
 "        umount -a [-f] [-r] [-n] [-v] [-t �ե����륷���ƥॿ����]\n"
 "        umount [-f] [-r] [-n] [-v] special | node...\n"
 
-#: mount/umount.c:459
+#: mount/umount.c:464
 msgid "umount: only root can do that"
 msgstr "umount: ���줬�����Τ� root �����Ǥ�"
 
-#: mount/umount.c:474
+#: mount/umount.c:479
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "%s �򥢥�ޥ���Ȥ��ޤ�\n"
 
-#: mount/umount.c:478
+#: mount/umount.c:483
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "mtab �� %s �����Ĥ���ޤ���\n"
 
-#: mount/umount.c:482
+#: mount/umount.c:487
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s �ޥ���Ȥ���Ƥ��ޤ��� (mtab �ˤ���)"
 
-#: mount/umount.c:484
+#: mount/umount.c:489
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: %s ��ʣ���ޥ���Ȥ���Ƥ���褦�Ǥ�"
 
-#: mount/umount.c:496
+#: mount/umount.c:501
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 "umount: %s �� fstab �ˤ���ޤ��� (����ˡ����ʤ��� root �ǤϤ���ޤ���)"
 
-#: mount/umount.c:499
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: %s �� fstab �Ȱ��פ��ʤ��ޥ���ȤǤ�"
 
-#: mount/umount.c:520
+#: mount/umount.c:525
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: %s �� %s ���饢��ޥ���ȤǤ���Τ� root �����Ǥ�"
 
-#: mount/umount.c:531
+#: mount/umount.c:536
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: %s �� %s ���饢��ޥ���ȤǤ���Τ� %s �����Ǥ�"
@@ -7418,7 +7711,7 @@ msgstr ""
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "�Ȥ���: ctrlaltdel hard|soft\n"
 
-#: sys-utils/cytune.c:118
+#: sys-utils/cytune.c:120
 #, c-format
 msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
@@ -7427,7 +7720,7 @@ msgstr ""
 "�ե����� %s���������� %lu���ѥ�����κ��祭��饯������ %d �Ǥ�����\n"
 "�ôֺ��祭��饯��ž���졼�Ȥ� %f �Ǥ�����\n"
 
-#: sys-utils/cytune.c:129
+#: sys-utils/cytune.c:131
 #, c-format
 msgid ""
 "File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -7556,50 +7849,60 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f ����/�� -- %f ��Ͽ (����饯��/��)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:37
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "�Ȥ���: %s [-c] [-n ��٥�] [-s �Хåե�������]\n"
 
-#: sys-utils/ipcrm.c:46
+#: sys-utils/ipcrm.c:59
+#, c-format
+msgid "invalid id: %s\n"
+msgstr "������ id: %s\n"
+
+#: sys-utils/ipcrm.c:77
+#, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "id %s (%s) �����Ǥ��ޤ���\n"
+
+#: sys-utils/ipcrm.c:91
 #, c-format
-msgid "usage: %s [shm | msg | sem] id\n"
-msgstr "�Ȥ���: %s [shm | msg | sem] id\n"
+msgid "usage: %s {shm | msg | sem} id ...\n"
+msgstr "�Ȥ���: %s {shm | msg | sem} id ...\n"
 
-#: sys-utils/ipcrm.c:70
+#: sys-utils/ipcrm.c:124
 #, c-format
-msgid "usage: %s [-shm | -msg | -sem] id\n"
-msgstr "\\�Ȥ���: %s [-shm | -msg | -sem] id\n"
+msgid "unknown resource type: %s\n"
+msgstr "̤�ΤΥ꥽����������: %s\n"
 
-#: sys-utils/ipcrm.c:73
-msgid "resource deleted\n"
+#: sys-utils/ipcrm.c:128
+msgid "resource(s) deleted\n"
 msgstr "�꥽�����������ޤ���\n"
 
-#: sys-utils/ipcs.c:91
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
 msgstr "�Ȥ��� : %s -asmq -tclup \n"
 
-#: sys-utils/ipcs.c:92
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
 msgstr "\t%s [-s -m -q] -i id\n"
 
-#: sys-utils/ipcs.c:93
+#: sys-utils/ipcs.c:124
 #, c-format
 msgid "\t%s -h for help.\n"
 msgstr "\t%s -h �ǥإ�פ�ɽ����\n"
 
-#: sys-utils/ipcs.c:99
+#: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
 msgstr "%s �Ϥ��ʤ����ɤ߹��ߤǤ��� ipc �Υ꥽���������ʤɤξ�����󶡤��ޤ���"
 
-#: sys-utils/ipcs.c:100
+#: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
 msgstr " \n"
 
-#: sys-utils/ipcs.c:101
+#: sys-utils/ipcs.c:132
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
@@ -7609,7 +7912,7 @@ msgstr ""
 "\t-m : ���������ɥ���\n"
 "\t-q : ��å�����\n"
 
-#: sys-utils/ipcs.c:102
+#: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
@@ -7617,7 +7920,7 @@ msgstr ""
 "\t-s : ���ޥե�\n"
 "\t-a : ���� (�����)\n"
 
-#: sys-utils/ipcs.c:103
+#: sys-utils/ipcs.c:134
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
@@ -7629,7 +7932,7 @@ msgstr ""
 "\t-p : �ץ�����ID\n"
 "\t-c : ������\n"
 
-#: sys-utils/ipcs.c:104
+#: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
@@ -7637,368 +7940,368 @@ msgstr ""
 "\t-l : ����\n"
 "\t-u : ����\n"
 
-#: sys-utils/ipcs.c:105
+#: sys-utils/ipcs.c:136
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
 msgstr "-i id [-s -q -m] : id �ˤ�äƼ��̤����꥽�����ξܺ�\n"
 
-#: sys-utils/ipcs.c:237 sys-utils/ipcs.c:439
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
 msgid "kernel not configured for shared memory\n"
 msgstr "�����ͥ�ϥ��������ɥ���ΰ٤����꤬�Ԥ��Ƥ��ޤ���\n"
 
-#: sys-utils/ipcs.c:243
+#: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ ���������ɥ�������� --------\n"
 
-#: sys-utils/ipcs.c:246
+#: sys-utils/ipcs.c:277
 #, c-format
 msgid "max number of segments = %d\n"
 msgstr "�������ȿ��κ����� = %d\n"
 
-#: sys-utils/ipcs.c:247
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max seg size (kbytes) = %d\n"
 msgstr "�������ȥ������κ��� (ñ��:KB) = %d\n"
 
-#: sys-utils/ipcs.c:248
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max total shared memory (kbytes) = %d\n"
 msgstr "��ץ��������ɥ���κ��� (ñ��:KB) = %d\n"
 
-#: sys-utils/ipcs.c:249
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "min seg size (bytes) = %d\n"
 msgstr "�������ȥ������κǾ� (ñ��:KB) = %d\n"
 
-#: sys-utils/ipcs.c:253
+#: sys-utils/ipcs.c:284
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ ���������ɥ���ξ��� --------\n"
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "���ݤ��줿�������� %d\n"
 
-#: sys-utils/ipcs.c:255
+#: sys-utils/ipcs.c:286
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "���ݤ��줿�ڡ���     %ld\n"
 
-#: sys-utils/ipcs.c:256
+#: sys-utils/ipcs.c:287
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "���ꤵ�줿�ڡ���     %ld\n"
 
-#: sys-utils/ipcs.c:257
+#: sys-utils/ipcs.c:288
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "����åפ��줿�ڡ��� %ld\n"
 
-#: sys-utils/ipcs.c:258
+#: sys-utils/ipcs.c:289
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
 msgstr "����åפ�ư��: %ld ���� %ld ������\n"
 
-#: sys-utils/ipcs.c:263
+#: sys-utils/ipcs.c:294
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ ��ͭ���ꥻ������ ������/��ͭ�� --------\n"
 
-#: sys-utils/ipcs.c:264 sys-utils/ipcs.c:370 sys-utils/ipcs.c:462
+#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:271 sys-utils/ipcs.c:276
-#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:302 sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:408
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:282 sys-utils/ipcs.c:371
-#: sys-utils/ipcs.c:386 sys-utils/ipcs.c:463 sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:494 sys-utils/ipcs.c:511
 msgid "perms"
 msgstr "����"
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ ���������ɥ��� ���/ʬΥ/�ѹ���� --------\n"
 
-#: sys-utils/ipcs.c:270
+#: sys-utils/ipcs.c:301
 #, c-format
 msgid "%-10s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:271 sys-utils/ipcs.c:276 sys-utils/ipcs.c:282
-#: sys-utils/ipcs.c:377 sys-utils/ipcs.c:386 sys-utils/ipcs.c:469
-#: sys-utils/ipcs.c:474 sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:307 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:417 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505 sys-utils/ipcs.c:511
 msgid "owner"
 msgstr "��ͭ��"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:302
 msgid "attached"
 msgstr "���"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:302
 msgid "detached"
 msgstr "ʬΥ"
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:302
 msgid "changed"
 msgstr "�ѹ�"
 
-#: sys-utils/ipcs.c:275
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "------ ���������ɥ��� ������/ľ���̿�� --------\n"
 
-#: sys-utils/ipcs.c:276 sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:307
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:307
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:311
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ ���������ɥ��ꥻ������ --------\n"
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:312
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:386 sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
 msgid "key"
 msgstr "����"
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:313
 msgid "bytes"
 msgstr "�Х���"
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:313
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
 msgid "status"
 msgstr "����"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:303 sys-utils/ipcs.c:304
-#: sys-utils/ipcs.c:407 sys-utils/ipcs.c:408 sys-utils/ipcs.c:500
-#: sys-utils/ipcs.c:501 sys-utils/ipcs.c:502
+#: sys-utils/ipcs.c:333 sys-utils/ipcs.c:334 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:438 sys-utils/ipcs.c:439 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:533
 msgid "Not set"
 msgstr "���åȤ���Ƥ��ޤ���"
 
-#: sys-utils/ipcs.c:324
+#: sys-utils/ipcs.c:355
 msgid "dest"
 msgstr "�о�"
 
-#: sys-utils/ipcs.c:325
+#: sys-utils/ipcs.c:356
 msgid "locked"
 msgstr "���å�"
 
-#: sys-utils/ipcs.c:345
+#: sys-utils/ipcs.c:376
 msgid "kernel not configured for semaphores\n"
 msgstr "�����ͥ뤬���ޥե��򥵥ݡ��Ȥ���褦�����ꤵ��Ƥ��ޤ���\n"
 
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:382
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ ���ޥե������� --------\n"
 
-#: sys-utils/ipcs.c:355
+#: sys-utils/ipcs.c:386
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "��������� = %d\n"
 
-#: sys-utils/ipcs.c:356
+#: sys-utils/ipcs.c:387
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "������κ��祻�ޥե��� = %d\n"
 
-#: sys-utils/ipcs.c:357
+#: sys-utils/ipcs.c:388
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "�����ƥ����Τκ��祻�ޥե��� = %d\n"
 
-#: sys-utils/ipcs.c:358
+#: sys-utils/ipcs.c:389
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "semop �ƤӽФ���κ���̿��� = %d\n"
 
-#: sys-utils/ipcs.c:359
+#: sys-utils/ipcs.c:390
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "���ޥե������� = %d\n"
 
-#: sys-utils/ipcs.c:363
+#: sys-utils/ipcs.c:394
 msgid "------ Semaphore Status --------\n"
 msgstr "------ ���ޥե��ξ��� --------\n"
 
-#: sys-utils/ipcs.c:364
+#: sys-utils/ipcs.c:395
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "��������� = %d\n"
 
-#: sys-utils/ipcs.c:365
+#: sys-utils/ipcs.c:396
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "���ݤ��줿���ޥե��� = %d\n"
 
-#: sys-utils/ipcs.c:369
+#: sys-utils/ipcs.c:400
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ ���ޥե����� ������/��ͭ�� --------\n"
 
-#: sys-utils/ipcs.c:371 sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:375
+#: sys-utils/ipcs.c:406
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "------ ���������ɥ��� ̿��/�ѹ���� --------\n"
 
-#: sys-utils/ipcs.c:376
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:408
 msgid "last-op"
 msgstr "last-op"
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:408
 msgid "last-changed"
 msgstr "last-changed"
 
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:415
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ ���ޥե����� --------\n"
 
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:417
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:447
+#: sys-utils/ipcs.c:478
 msgid "------ Messages: Limits --------\n"
 msgstr "------ ��å�����: ���� --------\n"
 
-#: sys-utils/ipcs.c:448
+#: sys-utils/ipcs.c:479
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "�����ƥ����ΤǤκ��祭�塼�� = %d\n"
 
-#: sys-utils/ipcs.c:449
+#: sys-utils/ipcs.c:480
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "�����å����������� (�Х���) = %d\n"
 
-#: sys-utils/ipcs.c:450
+#: sys-utils/ipcs.c:481
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr "���塼�����������ͤν���� (�Х���) = %d\n"
 
-#: sys-utils/ipcs.c:454
+#: sys-utils/ipcs.c:485
 msgid "------ Messages: Status --------\n"
 msgstr "------ ��å�����: ���� --------\n"
 
-#: sys-utils/ipcs.c:455
+#: sys-utils/ipcs.c:486
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "���ݺѤߥ��塼�� = %d\n"
 
-#: sys-utils/ipcs.c:456
+#: sys-utils/ipcs.c:487
 #, c-format
 msgid "used headers = %d\n"
 msgstr "���Ѻѥإå� = %d\n"
 
-#: sys-utils/ipcs.c:457
+#: sys-utils/ipcs.c:488
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "���ѺѶ��� = %d �Х���\n"
 
-#: sys-utils/ipcs.c:461
+#: sys-utils/ipcs.c:492
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr "------ ��å��������塼: ������/��ͭ�� --------\n"
 
-#: sys-utils/ipcs.c:463 sys-utils/ipcs.c:469 sys-utils/ipcs.c:474
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:467
+#: sys-utils/ipcs.c:498
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr "------ ��å��������塼 ����/����/�ѹ���� --------\n"
 
-#: sys-utils/ipcs.c:468
+#: sys-utils/ipcs.c:499
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:469
+#: sys-utils/ipcs.c:500
 msgid "send"
 msgstr "����"
 
-#: sys-utils/ipcs.c:469
+#: sys-utils/ipcs.c:500
 msgid "recv"
 msgstr "����"
 
-#: sys-utils/ipcs.c:469
+#: sys-utils/ipcs.c:500
 msgid "change"
 msgstr "�ѹ�"
 
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:504
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ ��å��������塼 PIDs --------\n"
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:505
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:505
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:478
+#: sys-utils/ipcs.c:509
 msgid "------ Message Queues --------\n"
 msgstr "------ ��å��������塼 --------\n"
 
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:511
 msgid "used-bytes"
 msgstr "���ѥХ��ȿ�"
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:511
 msgid "messages"
 msgstr "��å�����"
 
-#: sys-utils/ipcs.c:539
+#: sys-utils/ipcs.c:570
 #, c-format
 msgid ""
 "\n"
@@ -8007,41 +8310,41 @@ msgstr ""
 "\n"
 "���������ɥ��ꥻ������ shmid=%d\n"
 
-#: sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:571
 #, 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:542
+#: sys-utils/ipcs.c:573
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "�⡼��=%#o\t����������=%#o\n"
 
-#: sys-utils/ipcs.c:543
+#: sys-utils/ipcs.c:574
 #, c-format
 msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 
-#: sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:577
 #, c-format
 msgid "att_time=%s"
 msgstr "att_time=%s"
 
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
 msgid "Not set\n"
 msgstr "���åȤ���Ƥ��ޤ���\n"
 
-#: sys-utils/ipcs.c:548
+#: sys-utils/ipcs.c:579
 #, c-format
 msgid "det_time=%s"
 msgstr "det_time=%s"
 
-#: sys-utils/ipcs.c:550
+#: sys-utils/ipcs.c:581
 #, c-format
 msgid "change_time=%s"
 msgstr "�ѹ����=%s"
 
-#: sys-utils/ipcs.c:566
+#: sys-utils/ipcs.c:597
 #, c-format
 msgid ""
 "\n"
@@ -8050,26 +8353,26 @@ msgstr ""
 "\n"
 "��å��������塼 msqid=%d\n"
 
-#: sys-utils/ipcs.c:567
+#: sys-utils/ipcs.c:598
 #, 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:569
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "send_time=%srcv_time=%schange_time=%s"
 msgstr "�������=%s�������=%s�ѹ����=%s"
 
-#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:574 sys-utils/ipcs.c:575
+#: sys-utils/ipcs.c:604 sys-utils/ipcs.c:605 sys-utils/ipcs.c:606
 msgid "Not Set\n"
 msgstr "���åȤ���Ƥ��ޤ���\n"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:623
 #, c-format
 msgid ""
 "\n"
@@ -8078,113 +8381,113 @@ msgstr ""
 "\n"
 "���ޥե����� semid=%d\n"
 
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:624
 #, 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:595
+#: sys-utils/ipcs.c:626
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "�⡼��=%#o, ����������=%#o\n"
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "nsems = %d\n"
 msgstr "nsems = %d\n"
 
-#: sys-utils/ipcs.c:597
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "otime = %s"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:630
 #, c-format
 msgid "ctime = %s"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:632
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:632
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:632
 msgid "value"
 msgstr "��"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:632
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:602
+#: sys-utils/ipcs.c:633
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:602
+#: sys-utils/ipcs.c:633
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:67
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr ""
 "�Ȥ���: rdev [ -rsv ] [ -o ���ե��å� ] [ ���᡼�� [ �� [ ���ե��å� ] ] ]"
 
-#: sys-utils/rdev.c:69
+#: sys-utils/rdev.c:68
 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:70
+#: sys-utils/rdev.c:69
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
 msgstr "  rdev /dev/fd0 /dev/hda2         �롼�Ȥ� /dev/hda2 ������"
 
-#: sys-utils/rdev.c:71
+#: sys-utils/rdev.c:70
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr "  rdev -R /dev/fd0 1              �롼�ȥե饰������ (�ɹ����Ѿ���)"
 
-#: sys-utils/rdev.c:72
+#: sys-utils/rdev.c:71
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
 msgstr "  rdev -s /dev/fd0 /dev/hda2      ����åץǥХ���������"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:72
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
 msgstr "  rdev -r /dev/fd0 627            RAM �ǥ�����������������"
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:73
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr "  rdev -v /dev/fd0 1              �֡��Ȼ��Υӥǥ��⡼�ɤ�����"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:74
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   �Х��ȥ��ե��å� N ������"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:75
 msgid "  rootflags ...                   same as rdev -R"
 msgstr "  rootflags ...                   rdev -R ��Ʊ��"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:76
 msgid "  swapdev ...                     same as rdev -s"
 msgstr "  swapdev ...                     rdev -s ��Ʊ��"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr "  ramsize ...                     rdev -r ��Ʊ��"
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     rdev -v ��Ʊ��"
 
-#: sys-utils/rdev.c:80
+#: sys-utils/rdev.c:79
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
 "����: �ӥǥ��⡼�ɤ�: -3=�Ҥͤ�, -2=��ĥ, -1=�̾�Vga, 1=����1, 2=����2,..."
 
-#: sys-utils/rdev.c:81
+#: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr ""
 "      �롼�Ȥ��ɹ����ѥޥ���Ȥ���ˤ� -R 1 ��-R 0 ���ɤ߽񤭥ޥ���ȡ�"
@@ -8288,77 +8591,78 @@ msgstr ""
 msgid "malloc error"
 msgstr "malloc ���顼"
 
-#: sys-utils/tunelp.c:101
-msgid "sscanf error"
-msgstr "sscanf ���顼"
+#: sys-utils/tunelp.c:102
+#, c-format
+msgid "%s: bad value\n"
+msgstr "%s: �������ͤǤ�\n"
 
-#: sys-utils/tunelp.c:239
+#: sys-utils/tunelp.c:241
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s �� lp �ǥХ����ǤϤ���ޤ���\n"
 
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:262
 #, c-format
 msgid "%s status is %d"
 msgstr "%s �ξ��֤� %d �Ǥ�"
 
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:263
 msgid ", busy"
 msgstr ", �ӥ���"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:264
 msgid ", ready"
 msgstr ", �����Ǥ��Ƥ��ޤ�"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:265
 msgid ", out of paper"
 msgstr ", �ѻ椬����ޤ���"
 
-#: sys-utils/tunelp.c:264
+#: sys-utils/tunelp.c:266
 msgid ", on-line"
 msgstr ", �Ĥʤ��äƤ��ޤ�"
 
-#: sys-utils/tunelp.c:265
+#: sys-utils/tunelp.c:267
 msgid ", error"
 msgstr ", ���顼"
 
-#: sys-utils/tunelp.c:282
+#: sys-utils/tunelp.c:284
 msgid "LPGETIRQ error"
 msgstr "LPGETIRQ ���顼"
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:290
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s �� IRQ %d ��Ȥ��ޤ�\n"
 
-#: sys-utils/tunelp.c:290
+#: sys-utils/tunelp.c:292
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s �ϥݡ���󥰤�Ԥ��ޤ�\n"
 
-#: text-utils/col.c:153
+#: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col: ������ -l �ΰ��� %s �Ǥ���\n"
 
-#: text-utils/col.c:516
-msgid "usage: col [-bfx] [-l nline]\n"
-msgstr "�Ȥ���: col [-bfx] [-l �Կ�]\n"
+#: text-utils/col.c:521
+msgid "usage: col [-bfpx] [-l nline]\n"
+msgstr "�Ȥ���: col [-bfpx] [-l �Կ�]\n"
 
-#: text-utils/col.c:522
+#: text-utils/col.c:527
 msgid "col: write error.\n"
 msgstr "col: �񤭹��ߥ��顼��\n"
 
-#: text-utils/col.c:529
+#: text-utils/col.c:534
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr "col: �ٹ�: %s�Хå����åפǤ��ޤ���\n"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "past first line"
 msgstr "�ǽ�ι԰�����"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "-- line already flushed"
 msgstr "�Ԥϴ��˽񤭹��ޤ줿�Τ�"
 
@@ -8367,11 +8671,11 @@ msgstr "�Ԥϴ��˽񤭹��ޤ줿�Τ�"
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "�Ȥ���: %s [ - ] [ -2 ] [ �ե����� ... ]\n"
 
-#: text-utils/column.c:302
+#: text-utils/column.c:300
 msgid "line too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: text-utils/column.c:379
+#: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
 msgstr "�Ȥ���: column [-tx] [-c ������] [�ե����� ...]\n"
 
@@ -8389,12 +8693,12 @@ msgid ""
 msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 
-#: text-utils/more.c:329
+#: text-utils/more.c:330
 #, c-format
 msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "�Ȥ���: %s [-dfln] [+���ֹ� | +/�ѥ�����] ̾��1 ̾��2 ...\n"
 
-#: text-utils/more.c:504
+#: text-utils/more.c:505
 #, c-format
 msgid ""
 "\n"
@@ -8406,7 +8710,7 @@ msgstr ""
 "\n"
 
 #. simple ELF detection
-#: text-utils/more.c:543
+#: text-utils/more.c:544
 #, c-format
 msgid ""
 "\n"
@@ -8421,30 +8725,30 @@ msgstr ""
 msgid "[Use q or Q to quit]"
 msgstr "[��λ����ˤ� q �� Q �򲡤��Ʋ�����]"
 
-#: text-utils/more.c:833
+#: text-utils/more.c:826
 msgid "--More--"
 msgstr "--³����--"
 
-#: text-utils/more.c:835
+#: text-utils/more.c:828
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(���Υե�����: %s)"
 
-#: text-utils/more.c:841
+#: text-utils/more.c:834
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[���ڡ��������򲡤���³����'q' �ǽ�λ��]"
 
-#: text-utils/more.c:1139
+#: text-utils/more.c:1132
 #, c-format
 msgid "...back %d page"
 msgstr "... %d �ڡ������ޤ�"
 
-#: text-utils/more.c:1185
+#: text-utils/more.c:1178
 #, c-format
 msgid "...skipping %d line"
 msgstr "...%d �����Ф��ޤ�"
 
-#: text-utils/more.c:1226
+#: text-utils/more.c:1219
 msgid ""
 "\n"
 "***Back***\n"
@@ -8454,37 +8758,37 @@ msgstr ""
 "***���***\n"
 "\n"
 
-#: text-utils/more.c:1264
+#: text-utils/more.c:1257
 msgid "Can't open help file"
 msgstr "�إ�ץե�����򳫤��ޤ���"
 
-#: text-utils/more.c:1285 text-utils/more.c:1289
+#: text-utils/more.c:1278 text-utils/more.c:1282
 msgid "[Press 'h' for instructions.]"
 msgstr "['h' �����������ˡ]"
 
-#: text-utils/more.c:1324
+#: text-utils/more.c:1316
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" %d ��"
 
-#: text-utils/more.c:1326
+#: text-utils/more.c:1318
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[��ե�����] %d ��"
 
-#: text-utils/more.c:1410
+#: text-utils/more.c:1402
 msgid "  Overflow\n"
 msgstr "  �礭����\n"
 
-#: text-utils/more.c:1457
+#: text-utils/more.c:1449
 msgid "...skipping\n"
 msgstr "...���Ф��Ƥ��ޤ�\n"
 
-#: text-utils/more.c:1487
+#: text-utils/more.c:1479
 msgid "Regular expression botch"
 msgstr "����ɽ�����ޥ���"
 
-#: text-utils/more.c:1499
+#: text-utils/more.c:1491
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -8492,15 +8796,15 @@ msgstr ""
 "\n"
 "�ѥ����󤬸��Ĥ���ޤ���\n"
 
-#: text-utils/more.c:1502
+#: text-utils/more.c:1494
 msgid "Pattern not found"
 msgstr "�ѥ����󤬸��Ĥ���ޤ���"
 
-#: text-utils/more.c:1563
+#: text-utils/more.c:1555
 msgid "can't fork\n"
 msgstr "�ҥץ�������ư�Ǥ��ޤ���\n"
 
-#: text-utils/more.c:1602
+#: text-utils/more.c:1594
 msgid ""
 "\n"
 "...Skipping "
@@ -8508,23 +8812,23 @@ msgstr ""
 "\n"
 "...���Ф��Ƥ��ޤ� "
 
-#: text-utils/more.c:1606
+#: text-utils/more.c:1598
 msgid "...Skipping "
 msgstr "...���Ф��Ƥ��ޤ�"
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "to file "
 msgstr "���Υե����� "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "back to file "
 msgstr "���Υե����� "
 
-#: text-utils/more.c:1846
+#: text-utils/more.c:1835
 msgid "Line too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: text-utils/more.c:1890
+#: text-utils/more.c:1878
 msgid "No previous command to substitute for"
 msgstr "���ΤΤ���ΰ����Υ��ޥ�ɤ�����ޤ���"
 
@@ -8573,11 +8877,11 @@ msgstr "hexdump: �����ʽ� {%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: �������Ѵ�����饯�� %%%s��\n"
 
-#: text-utils/rev.c:114
+#: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
 msgstr "�Хåե����֤���ݤǤ��ޤ���\n"
 
-#: text-utils/rev.c:173
+#: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
 msgstr "�Ȥ���: rev [ �ե����� ...]\n"
 
@@ -8599,19 +8903,70 @@ msgstr "̤�ΤΥ��������ץ������󥹤����Ϥ���ޤ���: %o, %o\n"
 msgid "Unable to allocate buffer.\n"
 msgstr "�Хåե��γ��ݤ��Ǥ��ޤ���\n"
 
-#: text-utils/ul.c:555
+#: text-utils/ul.c:553
 msgid "Input line too long.\n"
 msgstr "���ϹԤ�Ĺ�����ޤ���\n"
 
-#: text-utils/ul.c:568
+#: text-utils/ul.c:566
 msgid "Out of memory when growing buffer.\n"
 msgstr "�Хåե�����礹��Ȥ��˥��꤬��ʤ��ʤ�ޤ�����\n"
 
-#: kbd/kbdrate.c:139 kbd/kbdrate.c:271
+#: kbd/kbdrate.c:138 kbd/kbdrate.c:276
 #, c-format
 msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
 msgstr "������ԡ���®�٤� %.1f cps �˥��åȤ��ޤ��� (�������Ȥ� %d ms)\n"
 
-#: kbd/kbdrate.c:247
+#: kbd/kbdrate.c:222
+msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
+msgstr "�Ȥ���: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
+
+#: kbd/kbdrate.c:252
 msgid "Cannot open /dev/port"
 msgstr "/dev/port �򳫤��ޤ���"
+
+#~ msgid "Writing disklabel to %s%d.\n"
+#~ msgstr "%s%d �˥ǥ�������٥��񤭹��ߤޤ���\n"
+
+#~ msgid "%s%d contains no disklabel.\n"
+#~ msgstr "%s%d �ϥǥ�������٥��ޤ�Ǥ��ޤ���\n"
+
+#~ msgid "Bootstrap installed on %s%d.\n"
+#~ msgstr "�֡��ȥ��ȥ�åפ� %s%d �˥��󥹥ȡ��뤵��ޤ�����\n"
+
+#~ msgid "%s: unknown geometry\n"
+#~ msgstr "%s: ̤�ΤΥ�����ȥ�\n"
+
+#~ msgid "exec rc failed\n"
+#~ msgstr "rc �μ¹Ԥ˼���\n"
+
+#~ msgid "fork of rc shell failed\n"
+#~ msgstr "rc ������� fork �˼��Ԥ��ޤ���\n"
+
+#~ msgid "Cannot get loop info"
+#~ msgstr "loop �ξ��������Ǥ��ޤ���"
+
+#~ msgid "mount: block device %s is not permitted on its filesystem"
+#~ msgstr "mount: �֥��å��ǥХ��� %s �Ϥ��Υե����륷���ƥ��ǵ��Ĥ���ޤ���"
+
+#~ msgid ""
+#~ "Usage: mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
+#~ msgstr ""
+#~ "�Ȥ���: mount [-hV]\n"
+#~ "        mount -a [-nfFrsvw] [-t �ե����륷���ƥ෿]\n"
+#~ "        mount [-nfrsvw] [-o ���ץ����] special | node\n"
+#~ "        mount [-nfrsvw] [-t �ե����륷���ƥ෿] [-o ���ץ����] special "
+#~ "node\n"
+#~ "        ���ڥ����ǥХ�����  -L ��٥�  ����  -U uuid �ǻؼ��Ǥ��ޤ���\n"
+
+#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
+#~ msgstr "mount: %s:%s �����ԡ������С��������ͳ: %s\n"
+
+#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
+#~ msgstr "\\�Ȥ���: %s [-shm | -msg | -sem] id\n"
+
+#~ msgid "sscanf error"
+#~ msgstr "sscanf ���顼"
diff --git a/po/nl.po b/po/nl.po
index 0c53ffd6ed..be5dc44b5f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,63 +6,96 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.9n\n"
-"POT-Creation-Date: 1999-09-25 13:07+0200\n"
+"POT-Creation-Date: 2000-10-16 16:44+0200\n"
 "PO-Revision-Date: 1999-02-25 20:46+0100\n"
 "Last-Translator: Andries Brouwer <aeb@cwi.nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: clock/cmos.c:146
+#: clock/cmos.c:157
 msgid "booted from MILO\n"
-msgstr ""
+msgstr "met MILO gestart\n"
 
-#: clock/cmos.c:154
+#: clock/cmos.c:166
 msgid "Ruffian BCD clock\n"
-msgstr ""
+msgstr "Ruffian BCD klok\n"
 
-#: clock/cmos.c:170
+#: clock/cmos.c:182
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
-msgstr ""
+msgstr "klokpoort aangepast, nu 0x%x\n"
 
-#: clock/cmos.c:180
+#: clock/cmos.c:192
 msgid "funky TOY!\n"
-msgstr ""
+msgstr "gekke TOY!\n"
 
-#: clock/cmos.c:234
+#: clock/cmos.c:246
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr ""
 
-#: clock/cmos.c:558
-#, fuzzy, c-format
+#: clock/cmos.c:570
+#, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr "Kan schijf niet openen"
+msgstr "Kan /dev/port niet openen: %s"
 
-#: clock/cmos.c:565
+#: clock/cmos.c:577
 msgid "I failed to get permission because I didnt try.\n"
 msgstr ""
 
-#: clock/cmos.c:568
+#: clock/cmos.c:580
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
 
-#: clock/cmos.c:571
+#: clock/cmos.c:583
 msgid "Probably you need root privileges.\n"
 msgstr ""
 
-#: clock/hwclock.c:253
+#: clock/hwclock.c:219
+#, c-format
+msgid "Assuming hardware clock is kept in %s time.\n"
+msgstr ""
+
+#: clock/hwclock.c:220 clock/hwclock.c:309
+msgid "UTC"
+msgstr ""
+
+#: clock/hwclock.c:220 clock/hwclock.c:308
+#, fuzzy
+msgid "local"
+msgstr "Logische"
+
+#: clock/hwclock.c:292
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr ""
+
+#: clock/hwclock.c:294
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr ""
+
+#: clock/hwclock.c:303
 #, c-format
 msgid "Last drift adjustment done at %d seconds after 1969\n"
 msgstr ""
 
-#: clock/hwclock.c:255
+#: clock/hwclock.c:305
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
 msgstr ""
 
+#: clock/hwclock.c:307
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr ""
+
+#: clock/hwclock.c:309
+#, fuzzy
+msgid "unknown"
+msgstr "Onbekend"
+
 #. -----------------------------------------------------------------------------
 #. Wait until the falling edge of the Hardware Clock's update flag so
 #. that any time that is read from the clock immediately after we
@@ -77,46 +110,46 @@ msgstr ""
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:278
+#: clock/hwclock.c:331
 msgid "Waiting for clock tick...\n"
 msgstr ""
 
-#: clock/hwclock.c:282
+#: clock/hwclock.c:335
 msgid "...got clock tick\n"
 msgstr ""
 
-#: clock/hwclock.c:334
+#: clock/hwclock.c:386
 #, c-format
-msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr ""
 
-#: clock/hwclock.c:343
+#: clock/hwclock.c:394
 #, c-format
-msgid "Hw clock time : %.2d:%.2d:%.2d = %d seconds since 1969\n"
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr ""
 
-#: clock/hwclock.c:369
+#: clock/hwclock.c:422
 #, c-format
-msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr ""
 
-#: clock/hwclock.c:395
+#: clock/hwclock.c:449
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
 msgstr ""
 
-#: clock/hwclock.c:401
+#: clock/hwclock.c:455
 msgid "Clock not changed - testing only.\n"
 msgstr ""
 
-#: clock/hwclock.c:449
+#: clock/hwclock.c:503
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
 "Delaying further to reach the next full second.\n"
 msgstr ""
 
-#: clock/hwclock.c:473
+#: clock/hwclock.c:527
 msgid ""
 "The Hardware Clock registers contain values that are either invalid (e.g. "
 "50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
@@ -128,39 +161,39 @@ msgstr ""
 #.
 #. Compute display value for time
 #. Cut off trailing newline
-#: clock/hwclock.c:485
+#: clock/hwclock.c:539
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr ""
 
-#: clock/hwclock.c:519
+#: clock/hwclock.c:573
 #, fuzzy
 msgid "No --date option specified.\n"
 msgstr "Maak geen partitie"
 
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:524
+#: clock/hwclock.c:578
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
 
-#: clock/hwclock.c:530
+#: clock/hwclock.c:584
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr ""
 
-#: clock/hwclock.c:534
+#: clock/hwclock.c:588
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
 msgstr ""
 
-#: clock/hwclock.c:540
+#: clock/hwclock.c:594
 #, c-format
 msgid "response from date command = %s\n"
 msgstr ""
 
-#: clock/hwclock.c:542
+#: clock/hwclock.c:596
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -170,67 +203,67 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: clock/hwclock.c:551
+#: clock/hwclock.c:605
 #, c-format
 msgid ""
-"The date command issued by %s returnedsomething other than an integer where "
-"the convertedtime value was expected.\n"
+"The date command issued by %s returned something other than an integer where "
+"the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
 
-#: clock/hwclock.c:561
+#: clock/hwclock.c:615
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr ""
 
-#: clock/hwclock.c:596
+#: clock/hwclock.c:647
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
 
-#: clock/hwclock.c:612
+#: clock/hwclock.c:669
 msgid "Calling settimeofday:\n"
 msgstr ""
 
-#: clock/hwclock.c:613
+#: clock/hwclock.c:670
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr ""
 
-#: clock/hwclock.c:615
+#: clock/hwclock.c:672
 #, c-format
-msgid "\ttz.tz_minuteswest = %ld\n"
+msgid "\ttz.tz_minuteswest = %d\n"
 msgstr ""
 
-#: clock/hwclock.c:618
+#: clock/hwclock.c:675
 msgid "Not setting system clock because running in test mode.\n"
 msgstr ""
 
-#: clock/hwclock.c:630
+#: clock/hwclock.c:683
 msgid "Must be superuser to set system clock.\n"
 msgstr ""
 
-#: clock/hwclock.c:632
+#: clock/hwclock.c:685
 msgid "settimeofday() failed"
 msgstr ""
 
-#: clock/hwclock.c:665
+#: clock/hwclock.c:718
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
 
-#: clock/hwclock.c:669
+#: clock/hwclock.c:722
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
 
-#: clock/hwclock.c:678
+#: clock/hwclock.c:731
 #, c-format
 msgid ""
 "Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
@@ -238,55 +271,55 @@ msgid ""
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 
-#: clock/hwclock.c:729
+#: clock/hwclock.c:782
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr ""
 
-#: clock/hwclock.c:731
+#: clock/hwclock.c:784
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
 msgstr ""
 
-#: clock/hwclock.c:759
+#: clock/hwclock.c:813
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr ""
 
-#: clock/hwclock.c:760
+#: clock/hwclock.c:814
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
 
-#: clock/hwclock.c:784
+#: clock/hwclock.c:838
 msgid "Drift adjustment parameters not updated.\n"
 msgstr ""
 
-#: clock/hwclock.c:825
+#: clock/hwclock.c:879
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
 msgstr ""
 
-#: clock/hwclock.c:849
+#: clock/hwclock.c:903
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr ""
 
-#: clock/hwclock.c:875
+#: clock/hwclock.c:929
 #, c-format
 msgid "Using %s.\n"
 msgstr ""
 
-#: clock/hwclock.c:877
+#: clock/hwclock.c:931
 msgid "No usable clock interface found.\n"
 msgstr ""
 
-#: clock/hwclock.c:965
+#: clock/hwclock.c:1026
 #, fuzzy
 msgid "Unable to set system clock.\n"
 msgstr "Kan het bestand '%s' niet positioneren\n"
 
-#: clock/hwclock.c:994
+#: clock/hwclock.c:1055
 msgid ""
 "The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
 "machine.\n"
@@ -294,64 +327,110 @@ msgid ""
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
 
-#: clock/hwclock.c:1003
+#: clock/hwclock.c:1064
 msgid "Unable to get the epoch value from the kernel.\n"
 msgstr ""
 
-#: clock/hwclock.c:1005
+#: clock/hwclock.c:1066
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr ""
 
-#: clock/hwclock.c:1008
+#: clock/hwclock.c:1069
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
 
-#: clock/hwclock.c:1011
+#: clock/hwclock.c:1072
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr ""
 
-#: clock/hwclock.c:1014
+#: clock/hwclock.c:1075
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
-#: clock/hwclock.c:1094
+#: clock/hwclock.c:1104
+#, c-format
+msgid ""
+"hwclock - query and set the hardware clock (RTC)\n"
+"\n"
+"Usage: hwclock [function] [options...]\n"
+"\n"
+"Functions:\n"
+"  --help        show this help\n"
+"  --show        read hardware clock and print result\n"
+"  --set         set the rtc to the time given with --date\n"
+"  --hctosys     set the system time from the hardware clock\n"
+"  --systohc     set the hardware clock to the current system time\n"
+"  --adjust      adjust the rtc to account for systematic drift since \n"
+"                the clock was last set or adjusted\n"
+"  --getepoch    print out the kernel's hardware clock epoch value\n"
+"  --setepoch    set the kernel's hardware clock epoch value to the \n"
+"                value given with --epoch\n"
+"  --version     print out the version of hwclock to stdout\n"
+"\n"
+"Options: \n"
+"  --utc         the hardware clock is kept in coordinated universal time\n"
+"  --localtime   the hardware clock is kept in local time\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
+"  --badyear     ignore rtc's year because the bios is broken\n"
+"  --date        specifies the time to which to set the hardware clock\n"
+"  --epoch=year  specifies the year which is the beginning of the \n"
+"                hardware clock's epoch value\n"
+msgstr ""
+
+#: clock/hwclock.c:1129
+msgid ""
+"  --jensen, --arc, --srm, --funky-toy\n"
+"                tell hwclock the type of alpha you have (see hwclock(8))\n"
+msgstr ""
+
+#: clock/hwclock.c:1227
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: clock/hwclock.c:1102
+#: clock/hwclock.c:1237
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
 
-#: clock/hwclock.c:1115
+#: clock/hwclock.c:1243
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr ""
+
+#: clock/hwclock.c:1256
 msgid "No usable set-to time.  Cannot set clock.\n"
 msgstr ""
 
-#: clock/hwclock.c:1130
+#: clock/hwclock.c:1271
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr ""
 
-#: clock/hwclock.c:1134
+#: clock/hwclock.c:1275
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr ""
+
+#: clock/hwclock.c:1279
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
 msgstr ""
 
-#: clock/hwclock.c:1150
-msgid ""
-"Cannot access the Hardware Clock via any known method.  Use --debug option "
-"to see the details of our search for an access method.\n"
+#: clock/hwclock.c:1299
+msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
 
-#: clock/hwclock.c:1164
-#, c-format
-msgid "%s: %s, errno=%d: %s.\n"
+#: clock/hwclock.c:1302
+msgid ""
+"Use the --debug option to see the details of our search for an access "
+"method.\n"
 msgstr ""
 
 #: clock/kd.c:41
@@ -362,7 +441,7 @@ msgstr ""
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr ""
 
-#: clock/kd.c:65 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
 msgstr ""
 
@@ -382,98 +461,106 @@ msgstr ""
 msgid "KDGHWCLK ioctl failed"
 msgstr ""
 
-#: clock/kd.c:161
+#: clock/kd.c:163
 #, fuzzy
 msgid "Can't open /dev/tty1"
 msgstr "Kan schijf niet openen"
 
-#: clock/rtc.c:98
-msgid "ioctl() to /dev/rtc to read the time failed.\n"
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
 msgstr ""
 
-#: clock/rtc.c:129
-msgid "Waiting in loop for time from /dev/rtc to change\n"
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
 msgstr ""
 
-#: clock/rtc.c:165 clock/rtc.c:222
-msgid "open() of /dev/rtc failed"
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
 msgstr ""
 
-#. This rtc device doesn't have interrupt functions.  This is typical
-#. on an Alpha, where the Hardware Clock interrupts are used by the
-#. kernel for the system clock, so aren't at the user's disposal.
-#.
-#: clock/rtc.c:182
-msgid "/dev/rtc does not have interrupt functions. "
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
 msgstr ""
 
-#: clock/rtc.c:191
-msgid "read() to /dev/rtc to wait for clock tick failed"
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
 msgstr ""
 
-#: clock/rtc.c:199
-msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
 
-#: clock/rtc.c:202
-msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
 
-#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
-#, fuzzy
-msgid "Unable to open /dev/rtc"
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, fuzzy, c-format
+msgid "Unable to open %s"
 msgstr "Kan het bestand '%s' niet openen\n"
 
-#: clock/rtc.c:268
-msgid "ioctl() to /dev/rtc to set the time failed.\n"
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
 msgstr ""
 
-#: clock/rtc.c:272
+#: clock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr ""
 
-#: clock/rtc.c:302
-msgid "Open of /dev/rtc failed"
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
 msgstr ""
 
-#: clock/rtc.c:320 clock/rtc.c:365
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
 msgid ""
 "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file /dev/rtc.  This file does not "
-"exist on this system.\n"
+"device driver via the device special file %s.  This file does not exist on "
+"this system.\n"
 msgstr ""
 
-#: clock/rtc.c:331
-msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgstr ""
 
-#: clock/rtc.c:337
+#: clock/rtc.c:344
 #, c-format
-msgid "we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n"
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
 msgstr ""
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: clock/rtc.c:357
+#: clock/rtc.c:364
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr ""
 
-#: clock/rtc.c:374
+#: clock/rtc.c:381
 #, c-format
-msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
 msgstr ""
 
-#: clock/rtc.c:379
+#: clock/rtc.c:386
+#, c-format
 msgid ""
-"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
-"ioctl.\n"
+"The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
 msgstr ""
 
-#: clock/rtc.c:382
-msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgstr ""
 
 #: clock/shhopt.c:255 clock/shhopt.c:281
@@ -506,28 +593,85 @@ msgstr ""
 msgid "unrecognized option `-%c'\n"
 msgstr ""
 
-#: disk-utils/fdformat.c:33
+#: disk-utils/blockdev.c:47
+msgid "set read-only"
+msgstr ""
+
+#: disk-utils/blockdev.c:48
+msgid "set read-write"
+msgstr ""
+
+#: disk-utils/blockdev.c:51
+msgid "get read-only"
+msgstr ""
+
+#: disk-utils/blockdev.c:54
+#, fuzzy
+msgid "get sectorsize"
+msgstr "Sectoren"
+
+#: disk-utils/blockdev.c:57
+msgid "get size"
+msgstr ""
+
+#: disk-utils/blockdev.c:60
+msgid "set readahead"
+msgstr ""
+
+#: disk-utils/blockdev.c:63
+msgid "get readahead"
+msgstr ""
+
+#: disk-utils/blockdev.c:66
+msgid "flush buffers"
+msgstr ""
+
+#: disk-utils/blockdev.c:70
+#, fuzzy
+msgid "reread partition table"
+msgstr "Geef alleen de partitietabel"
+
+#: disk-utils/blockdev.c:79
+#, fuzzy, c-format
+msgid "Usage: %s [-V] [-v|-q] commands devices\n"
+msgstr "aanroep: %s [ -n ] apparaat\n"
+
+#: disk-utils/blockdev.c:80
+msgid "Available commands:\n"
+msgstr ""
+
+#: disk-utils/blockdev.c:180
+#, fuzzy, c-format
+msgid "%s: Unknown command: %s\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: disk-utils/blockdev.c:191
+#, c-format
+msgid "%s requires an argument\n"
+msgstr ""
+
+#: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Aan het formatteren ... "
 
-#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
 msgstr "klaar\n"
 
-#: disk-utils/fdformat.c:62
+#: disk-utils/fdformat.c:65
 msgid "Verifying ... "
 msgstr "Controle ... "
 
-#: disk-utils/fdformat.c:73
+#: disk-utils/fdformat.c:76
 msgid "Read: "
 msgstr "Lezen: "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:78
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
 msgstr "Probleem bij het lezen van cylinder %d, verwacht %d, gelezen %d\n"
 
-#: disk-utils/fdformat.c:81
+#: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
@@ -536,34 +680,42 @@ msgstr ""
 "rotte gegevens in cyl %d\n"
 "Ik ga verder ... "
 
-#: disk-utils/fdformat.c:96
+#: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
 msgstr "aanroep: %s [ -n ] apparaat\n"
 
-#: disk-utils/fdformat.c:122
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:448
+#: disk-utils/setfdprm.c:128 misc-utils/cal.c:172 misc-utils/ddate.c:181
+#: misc-utils/kill.c:192
+#, c-format
+msgid "%s from %s\n"
+msgstr ""
+
+#: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
 msgstr "%s: dit apparaat is geen floppy\n"
 
-#: disk-utils/fdformat.c:128
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
 msgstr "Kon niet bepalen wat het huidige formaat is"
 
-#: disk-utils/fdformat.c:129
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "%szijdig, %d sporen, %d sectoren/spoor. Totale capaciteit %d kB.\n"
 
-#: disk-utils/fdformat.c:130
+#: disk-utils/fdformat.c:142
 msgid "Double"
 msgstr "Dubbel"
 
-#: disk-utils/fdformat.c:130
+#: disk-utils/fdformat.c:142
 msgid "Single"
 msgstr "Enkel"
 
-#: disk-utils/fsck.minix.c:198
+#: disk-utils/fsck.minix.c:197
 #, fuzzy, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "aanroep: %s [ -n ] apparaat\n"
@@ -609,7 +761,7 @@ msgstr ""
 "Interne fout: probeer een slecht blok te beschrijven\n"
 "Schrijfopdracht genegeerd\n"
 
-#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:290
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
 msgid "seek failed in write_block"
 msgstr ""
 
@@ -621,7 +773,7 @@ msgstr "Schrijffout: slecht blok in bestand '"
 msgid "seek failed in write_super_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:277
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr ""
 
@@ -704,22 +856,22 @@ msgstr "Kan het bestand '%s' niet lezen\n"
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Waarschuwing: Eerstezone != Norm_eerstezone\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:528
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:529
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blokken\n"
 
-#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:530
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:531
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonegrootte=%d\n"
@@ -741,176 +893,176 @@ msgid ""
 "\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:692
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
 msgid "Inode %d marked not used, but used for file '"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:696
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:716
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:721
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
 msgid "Warning: inode count too big.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:791
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
 msgid "Block has been used before. Now in file `"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:760 disk-utils/fsck.minix.c:794
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1175 disk-utils/fsck.minix.c:1184
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
 msgid "Clear"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:772 disk-utils/fsck.minix.c:806
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
 msgid " contains a bad inode number for file '"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:958 disk-utils/fsck.minix.c:1022
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:972 disk-utils/fsck.minix.c:1036
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
 msgid ": bad directory: '.' isn't first\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:979 disk-utils/fsck.minix.c:1044
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
 msgid ": bad directory: '..' isn't second\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1076
+#: disk-utils/fsck.minix.c:1070
 #, fuzzy
 msgid "internal error"
 msgstr "Interne fout"
 
-#: disk-utils/fsck.minix.c:1079
+#: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1174
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1183
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1189
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1196
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 msgid "Set i_nlinks to count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1208
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1209
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1161 disk-utils/fsck.minix.c:1213
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
 #, c-format
 msgid "Zone %d: %sin use, counted=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1214
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1190
+#: disk-utils/fsck.minix.c:1182
 msgid "Set"
 msgstr "Zet op 1"
 
-#: disk-utils/fsck.minix.c:1254 disk-utils/mkfs.minix.c:637
-#: disk-utils/mkfs.minix.c:640
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
 msgid "bad inode size"
 msgstr "foute inode grootte"
 
-#: disk-utils/fsck.minix.c:1257
+#: disk-utils/fsck.minix.c:1256
 #, fuzzy
 msgid "bad v2 inode size"
 msgstr "foute inode grootte"
 
-#: disk-utils/fsck.minix.c:1283
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1287
+#: disk-utils/fsck.minix.c:1286
 #, fuzzy, c-format
 msgid "unable to open '%s'"
 msgstr "kan het bestand '%s' niet openen"
 
-#: disk-utils/fsck.minix.c:1304
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1308
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1310
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1339
+#: disk-utils/fsck.minix.c:1336
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1344
+#: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1346
-#, c-format
+#: disk-utils/fsck.minix.c:1343
+#, c-format, ycp-format
 msgid ""
 "\n"
 "%6d regular files\n"
@@ -923,211 +1075,221 @@ msgid ""
 "%6d files\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1359
+#: disk-utils/fsck.minix.c:1356
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
 "----------------------------\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:66
+#: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 
-#: disk-utils/mkfs.c:80 fdisk/cfdisk.c:370 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:195
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Geheugen is vol!\n"
 
-#: disk-utils/mkfs.c:89
+#: disk-utils/mkfs.c:99
 #, fuzzy, c-format
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs versie "
 
-#: disk-utils/mkfs.minix.c:186
+#: disk-utils/mkfs.minix.c:179
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr ""
 "Aanroep: %s [-c | -l bestand] [-nXX] [-iXX] /dev/naam [blokkenaantal]\n"
 
-#: disk-utils/mkfs.minix.c:210
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:271
+#: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:273
+#: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:275
+#: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:279
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:281
+#: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:283
+#: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:292
+#: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
 msgstr ""
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:300 disk-utils/mkfs.minix.c:374
-#: disk-utils/mkfs.minix.c:425
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
 msgid "too many bad blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:308
+#: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:517
+#: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:526
+#: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:532
+#: disk-utils/mkfs.minix.c:528
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:554
+#: disk-utils/mkfs.minix.c:550
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:585 disk-utils/mkswap.c:231
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
 msgid "seek failed in check_blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:594
+#: disk-utils/mkfs.minix.c:590
 msgid "bad blocks before data-area: cannot make fs"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:600 disk-utils/mkfs.minix.c:622
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
-msgstr "%ld slechte blokken\n"
+msgstr "%d slechte blokken\n"
 
-#: disk-utils/mkfs.minix.c:602 disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
 msgstr "1 slecht blok\n"
 
-#: disk-utils/mkfs.minix.c:614
+#: disk-utils/mkfs.minix.c:608
 msgid "can't open file of bad blocks"
 msgstr "kan het slechte-blokken-bestand niet openen"
 
-#: disk-utils/mkfs.minix.c:669
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:685
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol fout: geen goede specificatie van het aantal blokken"
 
-#: disk-utils/mkfs.minix.c:717
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
 msgstr "kan het bestand '%s' niet openen"
 
-#: disk-utils/mkfs.minix.c:719
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:723
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkswap.c:101
+#: disk-utils/mkswap.c:174
+#, c-format
+msgid "Bad user-specified page size %d\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:183
 #, c-format
-msgid "Assuming pages of size %d\n"
+msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:185
+#: disk-utils/mkswap.c:187
+#, c-format
+msgid "Assuming pages of size %d (not %d)\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:312
 #, fuzzy, c-format
-msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
+msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
 msgstr ""
 "Aanroep: %s [-c | -l bestand] [-nXX] [-iXX] /dev/naam [blokkenaantal]\n"
 
-#: disk-utils/mkswap.c:208
+#: disk-utils/mkswap.c:335
 #, fuzzy
 msgid "too many bad pages"
 msgstr "Slechte primaire partitie"
 
-#: disk-utils/mkswap.c:222 misc-utils/look.c:170 misc-utils/setterm.c:1153
-#: text-utils/more.c:1863 text-utils/more.c:1874
+#: disk-utils/mkswap.c:349 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1851 text-utils/more.c:1862
 msgid "Out of memory"
 msgstr ""
 
-#: disk-utils/mkswap.c:239
+#: disk-utils/mkswap.c:366
 #, fuzzy
 msgid "one bad page\n"
 msgstr "1 slecht blok\n"
 
-#: disk-utils/mkswap.c:241
+#: disk-utils/mkswap.c:368
 #, fuzzy, c-format
 msgid "%d bad pages\n"
 msgstr "%ld slechte blokken\n"
 
-#: disk-utils/mkswap.c:345
+#: disk-utils/mkswap.c:488
 #, c-format
 msgid "%s: error: Nowhere to set up swap on?\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:354
+#: disk-utils/mkswap.c:506
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:372
+#: disk-utils/mkswap.c:525
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:378
+#: disk-utils/mkswap.c:531
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:397
+#: disk-utils/mkswap.c:550
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:409
+#: disk-utils/mkswap.c:562
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr ""
 
-#: disk-utils/mkswap.c:418 disk-utils/mkswap.c:439
+#: disk-utils/mkswap.c:571 disk-utils/mkswap.c:592
 msgid "fatal: first page unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:424
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1136,26 +1298,26 @@ msgid ""
 "the -f option to force it.\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:448
+#: disk-utils/mkswap.c:601
 msgid "Unable to set up swap-space: unreadable"
 msgstr ""
 
-#: disk-utils/mkswap.c:449
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "Setting up swapspace version %d, size = %ld bytes\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:455
+#: disk-utils/mkswap.c:608
 #, fuzzy
 msgid "unable to rewind swap-device"
 msgstr "kan het bestand '%s' niet openen"
 
-#: disk-utils/mkswap.c:458
+#: disk-utils/mkswap.c:611
 #, fuzzy
 msgid "unable to write signature page"
 msgstr "Kan het bestand '%s' niet schrijven\n"
 
-#: disk-utils/mkswap.c:465
+#: disk-utils/mkswap.c:619
 msgid "fsync failed"
 msgstr ""
 
@@ -1195,46 +1357,46 @@ msgstr ""
 msgid "       %s [ -c | -y | -n ] dev\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1900
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
 msgid "Unusable"
 msgstr "Onbruikbaar"
 
-#: fdisk/cfdisk.c:397 fdisk/cfdisk.c:1902
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
 msgid "Free Space"
 msgstr "Vrij"
 
-#: fdisk/cfdisk.c:400
+#: fdisk/cfdisk.c:398
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:402 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:405
+#: fdisk/cfdisk.c:403
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:407
+#: fdisk/cfdisk.c:405
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:411
+#: fdisk/cfdisk.c:409
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:422
+#: fdisk/cfdisk.c:420
 msgid "Disk has been changed.\n"
 msgstr "De schijfinhoud is gewijzigd.\n"
 
-#: fdisk/cfdisk.c:423
+#: fdisk/cfdisk.c:421
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr ""
 "Herstart het systeem om er zeker van te zijn dat de partitietabel correct "
 "aangepast is\n"
 
-#: fdisk/cfdisk.c:426
+#: fdisk/cfdisk.c:424
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1245,754 +1407,754 @@ msgstr ""
 "WAARSCHUWING: Mocht U DOS 6.x partities hebben aangemaakt of gewijzigd,\n"
 "lees dan de cfdisk man pagina - vaak is nog een dd commando nodig.\n"
 
-#: fdisk/cfdisk.c:521
+#: fdisk/cfdisk.c:519
 msgid "FATAL ERROR"
 msgstr "FATALE FOUT"
 
-#: fdisk/cfdisk.c:530
+#: fdisk/cfdisk.c:528
 #, fuzzy
 msgid "Press any key to exit cfdisk"
 msgstr "Druk op een toets om fdisk te verlaten"
 
-#: fdisk/cfdisk.c:566 fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
 msgid "Cannot seek on disk drive"
 msgstr "Positioneeropdracht faalde"
 
-#: fdisk/cfdisk.c:568
+#: fdisk/cfdisk.c:566
 msgid "Cannot read disk drive"
 msgstr "Leesopdracht faalde"
 
-#: fdisk/cfdisk.c:576
+#: fdisk/cfdisk.c:574
 msgid "Cannot write disk drive"
 msgstr "Schrijfopdracht faalde"
 
-#: fdisk/cfdisk.c:815
+#: fdisk/cfdisk.c:814
 msgid "Too many partitions"
 msgstr "Te veel partities"
 
-#: fdisk/cfdisk.c:820
+#: fdisk/cfdisk.c:819
 msgid "Partition begins before sector 0"
 msgstr "Partitie begint voor sector 0"
 
-#: fdisk/cfdisk.c:825
+#: fdisk/cfdisk.c:824
 msgid "Partition ends before sector 0"
 msgstr "Partitie eindigt voor sector 0"
 
-#: fdisk/cfdisk.c:830
+#: fdisk/cfdisk.c:829
 msgid "Partition begins after end-of-disk"
 msgstr "Partitie begint voorbij het einde van de schijf"
 
-#: fdisk/cfdisk.c:835
+#: fdisk/cfdisk.c:834
 msgid "Partition ends after end-of-disk"
 msgstr "Partitie eindigt voorbij het einde van de schijf"
 
-#: fdisk/cfdisk.c:859
+#: fdisk/cfdisk.c:858
 msgid "logical partitions not in disk order"
 msgstr ""
 
-#: fdisk/cfdisk.c:862
+#: fdisk/cfdisk.c:861
 #, fuzzy
 msgid "logical partitions overlap"
 msgstr "Slechte logische partitie"
 
-#: fdisk/cfdisk.c:864
+#: fdisk/cfdisk.c:863
 #, fuzzy
 msgid "enlarged logical partitions overlap"
 msgstr "Slechte logische partitie"
 
-#: fdisk/cfdisk.c:894
+#: fdisk/cfdisk.c:893
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr "!!!! Interne cfdisk fout - logische partitie niet in uitgebreide??"
 
-#: fdisk/cfdisk.c:905 fdisk/cfdisk.c:917
+#: fdisk/cfdisk.c:904 fdisk/cfdisk.c:916
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Ik kan hier geen logische partitie maken -- dan zouden er twee uitgebreide "
 "partities komen"
 
-#: fdisk/cfdisk.c:1067
+#: fdisk/cfdisk.c:1066
 msgid "Menu item too long. Menu may look odd."
 msgstr "Menuelement te lang. Misschien ziet het menu er vreemd uit."
 
-#: fdisk/cfdisk.c:1123
+#: fdisk/cfdisk.c:1122
 msgid "Menu without direction. Defaulting horizontal."
 msgstr "Menu zonder aangegeven richting. Laat ik horizontaal nemen."
 
-#: fdisk/cfdisk.c:1253
+#: fdisk/cfdisk.c:1252
 msgid "Illegal key"
 msgstr "Niet herkende toets"
 
-#: fdisk/cfdisk.c:1276
+#: fdisk/cfdisk.c:1275
 msgid "Press a key to continue"
 msgstr "Sla een toets aan om verder te gaan"
 
-#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2396
-#: fdisk/cfdisk.c:2398
+#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2400
+#: fdisk/cfdisk.c:2402
 msgid "Primary"
 msgstr "Primaire"
 
-#: fdisk/cfdisk.c:1323
+#: fdisk/cfdisk.c:1322
 msgid "Create a new primary partition"
 msgstr "Maak een nieuwe primaire partitie"
 
-#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2395
-#: fdisk/cfdisk.c:2398
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2399
+#: fdisk/cfdisk.c:2402
 msgid "Logical"
 msgstr "Logische"
 
-#: fdisk/cfdisk.c:1324
+#: fdisk/cfdisk.c:1323
 msgid "Create a new logical partition"
 msgstr "Maak een nieuwe logische partitie"
 
-#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380 fdisk/cfdisk.c:2075
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2074
 msgid "Cancel"
 msgstr "Breek af"
 
-#: fdisk/cfdisk.c:1325 fdisk/cfdisk.c:1380
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379
 msgid "Don't create a partition"
 msgstr "Maak geen partitie"
 
-#: fdisk/cfdisk.c:1341
+#: fdisk/cfdisk.c:1340
 msgid "!!! Internal error !!!"
 msgstr "Interne fout"
 
-#: fdisk/cfdisk.c:1344
+#: fdisk/cfdisk.c:1343
 msgid "Size (in MB): "
 msgstr "Grootte (in MB)"
 
-#: fdisk/cfdisk.c:1378
+#: fdisk/cfdisk.c:1377
 msgid "Beginning"
 msgstr "Begin"
 
-#: fdisk/cfdisk.c:1378
+#: fdisk/cfdisk.c:1377
 msgid "Add partition at beginning of free space"
 msgstr "Zet de partitie aan het begin van de vrije ruimte"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1378
 msgid "End"
 msgstr "Einde"
 
-#: fdisk/cfdisk.c:1379
+#: fdisk/cfdisk.c:1378
 msgid "Add partition at end of free space"
 msgstr "Zet de partitie aan het eind van de vrije ruimte"
 
-#: fdisk/cfdisk.c:1397
+#: fdisk/cfdisk.c:1396
 msgid "No room to create the extended partition"
 msgstr "Geen ruimte voor een uitgebreide partitie"
 
-#: fdisk/cfdisk.c:1436
+#: fdisk/cfdisk.c:1435
 #, fuzzy
 msgid "Bad signature on partition table"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/cfdisk.c:1474
+#: fdisk/cfdisk.c:1473
 msgid "You specified more cylinders than fit on disk"
 msgstr ""
 
-#: fdisk/cfdisk.c:1504
+#: fdisk/cfdisk.c:1503
 msgid "Cannot open disk drive"
 msgstr "Kan schijf niet openen"
 
-#: fdisk/cfdisk.c:1506 fdisk/cfdisk.c:1687
+#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1686
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Kan de schijf alleen lezen - heb geen permissie om te schrijven"
 
-#: fdisk/cfdisk.c:1527
+#: fdisk/cfdisk.c:1526
 #, fuzzy
 msgid "Cannot get disk size"
 msgstr "Leesopdracht faalde"
 
 #. avoid snprintf - it does not exist on ancient systems
-#: fdisk/cfdisk.c:1553
+#: fdisk/cfdisk.c:1552
 msgid "Bad primary partition"
 msgstr "Slechte primaire partitie"
 
 #. avoid snprintf
-#: fdisk/cfdisk.c:1584
+#: fdisk/cfdisk.c:1583
 msgid "Bad logical partition"
 msgstr "Slechte logische partitie"
 
-#: fdisk/cfdisk.c:1699
+#: fdisk/cfdisk.c:1698
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Waarschuwing!!  Dit kan gegevens op uw schijf vernietigen!"
 
-#: fdisk/cfdisk.c:1703
+#: fdisk/cfdisk.c:1702
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
 "Weet U zeker dat de partitietabel weggeschreven moet worden? (ja of nee): "
 
-#: fdisk/cfdisk.c:1709
+#: fdisk/cfdisk.c:1708
 msgid "no"
 msgstr ""
 
-#: fdisk/cfdisk.c:1710
+#: fdisk/cfdisk.c:1709
 msgid "Did not write partition table to disk"
 msgstr "Heb de partitietabel niet naar schijf geschreven"
 
-#: fdisk/cfdisk.c:1712
+#: fdisk/cfdisk.c:1711
 msgid "yes"
 msgstr ""
 
-#: fdisk/cfdisk.c:1715
+#: fdisk/cfdisk.c:1714
 msgid "Please enter `yes' or `no'"
 msgstr "Antwoord `ja' of `nee'"
 
-#: fdisk/cfdisk.c:1719
+#: fdisk/cfdisk.c:1718
 msgid "Writing partition table to disk..."
 msgstr "Schrijf nu de partitietabel naar schijf..."
 
-#: fdisk/cfdisk.c:1744 fdisk/cfdisk.c:1748
+#: fdisk/cfdisk.c:1743 fdisk/cfdisk.c:1747
 msgid "Wrote partition table to disk"
 msgstr "Partitietabel is weggeschreven"
 
-#: fdisk/cfdisk.c:1746
+#: fdisk/cfdisk.c:1745
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr "Partitietabel is weggeschreven, maar het teruglezen faalde. Reboot."
 
-#: fdisk/cfdisk.c:1756
+#: fdisk/cfdisk.c:1755
 msgid ""
 "Not precisely one primary partition is bootable. DOS MBR cannot boot this."
 msgstr ""
 "Er is niet precies 1 startbare primaire partitie. DOS MBR kan dit niet "
 "booten."
 
-#: fdisk/cfdisk.c:1814 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
+#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1931 fdisk/cfdisk.c:2015
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Geef een bestandsnaam of Enter om uitvoer naar het scherm te krijgen"
 
-#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
+#: fdisk/cfdisk.c:1821 fdisk/cfdisk.c:1939 fdisk/cfdisk.c:2023
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Kan het bestand '%s' niet openen"
 
-#: fdisk/cfdisk.c:1833
+#: fdisk/cfdisk.c:1832
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Schijf: %s\n"
 
-#: fdisk/cfdisk.c:1835
+#: fdisk/cfdisk.c:1834
 msgid "Sector 0:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:1842
+#: fdisk/cfdisk.c:1841
 #, c-format
 msgid "Sector %d:\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:1862
+#: fdisk/cfdisk.c:1861
 msgid "   None   "
 msgstr "   Geen   "
 
-#: fdisk/cfdisk.c:1864
+#: fdisk/cfdisk.c:1863
 msgid "   Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:1866
+#: fdisk/cfdisk.c:1865
 msgid "   Primary"
 msgstr "  Primaire"
 
-#: fdisk/cfdisk.c:1868
+#: fdisk/cfdisk.c:1867
 msgid "   Logical"
 msgstr "  Logische"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1072 fdisk/fdisk.c:1221
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1213 fdisk/fdisk.c:1437
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: fdisk/cfdisk.c:1912
+#: fdisk/cfdisk.c:1911
 #, c-format
 msgid "Boot (%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2404
+#: fdisk/cfdisk.c:1913 fdisk/cfdisk.c:2408
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Onbekend (%02X)"
 
-#: fdisk/cfdisk.c:1916
+#: fdisk/cfdisk.c:1915
 #, c-format
 msgid "None (%02X)"
 msgstr "Geen (%02X)"
 
-#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
+#: fdisk/cfdisk.c:1950 fdisk/cfdisk.c:2034
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitietabel voor %s\n"
 
-#: fdisk/cfdisk.c:1953
+#: fdisk/cfdisk.c:1952
 msgid "            First    Last\n"
 msgstr "           Eerste  Laatste\n"
 
-#: fdisk/cfdisk.c:1954
+#: fdisk/cfdisk.c:1953
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Type     Sector   Sector   Offset  Lengte   Filesysteem type (ID)  "
 "Vlaggen\n"
 
-#: fdisk/cfdisk.c:1955
+#: fdisk/cfdisk.c:1954
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2037
+#: fdisk/cfdisk.c:2036
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         ---Start---         ---End---         Start Aantal\n"
 
-#: fdisk/cfdisk.c:2038
+#: fdisk/cfdisk.c:2037
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
 msgstr " # Vlaggen Kop Sect Cyl ID  Kop Sect Cyl     Sector  Sectoren\n"
 
-#: fdisk/cfdisk.c:2039
+#: fdisk/cfdisk.c:2038
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr ""
 
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2071
 msgid "Raw"
 msgstr "Ruw"
 
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2071
 msgid "Print the table using raw data format"
 msgstr "Geef de tabel in ruw formaat"
 
-#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2072 fdisk/cfdisk.c:2174
 msgid "Sectors"
 msgstr "Sectoren"
 
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2072
 msgid "Print the table ordered by sectors"
 msgstr "Geef de tabel geordend naar sectoren"
 
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2073
 msgid "Table"
 msgstr "Tabel"
 
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2073
 msgid "Just print the partition table"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/cfdisk.c:2075
+#: fdisk/cfdisk.c:2074
 msgid "Don't print the table"
 msgstr "Geef geen tabel"
 
-#: fdisk/cfdisk.c:2103
+#: fdisk/cfdisk.c:2102
 #, fuzzy
 msgid "Help Screen for cfdisk"
 msgstr "Hulpscherm voor cfdisk"
 
-#: fdisk/cfdisk.c:2105
+#: fdisk/cfdisk.c:2104
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Dit is cfdisk, een schijfpartitieprogramma dat U in staat stelt"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2105
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "partities te maken, te verwijderen en te veranderen op uw harde"
 
-#: fdisk/cfdisk.c:2107
+#: fdisk/cfdisk.c:2106
 msgid "disk drive."
 msgstr "schijf"
 
-#: fdisk/cfdisk.c:2109
+#: fdisk/cfdisk.c:2108
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr ""
 
-#: fdisk/cfdisk.c:2111
+#: fdisk/cfdisk.c:2110
 msgid "Command      Meaning"
 msgstr "Commando     Betekenis"
 
-#: fdisk/cfdisk.c:2112
+#: fdisk/cfdisk.c:2111
 msgid "-------      -------"
 msgstr ""
 
-#: fdisk/cfdisk.c:2113
+#: fdisk/cfdisk.c:2112
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Maak de huidige partitie (wel/niet) startbaar"
 
-#: fdisk/cfdisk.c:2114
+#: fdisk/cfdisk.c:2113
 msgid "  d          Delete the current partition"
 msgstr "  d          Verwijder de huidige partitie"
 
-#: fdisk/cfdisk.c:2115
+#: fdisk/cfdisk.c:2114
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Verander het aantal cylinders, koppen, sectoren/spoor"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2115
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             WAARSCHUWING: Dit is alleen voor experts."
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2116
 msgid "             know what they are doing."
 msgstr ""
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2117
 msgid "  h          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:2118
 msgid "  m          Maximize disk usage of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2120
+#: fdisk/cfdisk.c:2119
 msgid "             Note: This may make the partition incompatible with"
 msgstr ""
 
-#: fdisk/cfdisk.c:2121
+#: fdisk/cfdisk.c:2120
 msgid "             DOS, OS/2, ..."
 msgstr ""
 
-#: fdisk/cfdisk.c:2122
+#: fdisk/cfdisk.c:2121
 msgid "  n          Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2123
+#: fdisk/cfdisk.c:2122
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:2123
 msgid "             There are several different formats for the partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2125
+#: fdisk/cfdisk.c:2124
 msgid "             that you can choose from:"
 msgstr ""
 
-#: fdisk/cfdisk.c:2126
+#: fdisk/cfdisk.c:2125
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:2126
 msgid "                s - Table ordered by sectors"
 msgstr ""
 
-#: fdisk/cfdisk.c:2128
+#: fdisk/cfdisk.c:2127
 msgid "                t - Table in raw format"
 msgstr ""
 
-#: fdisk/cfdisk.c:2129
+#: fdisk/cfdisk.c:2128
 msgid "  q          Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2130
+#: fdisk/cfdisk.c:2129
 msgid "  t          Change the filesystem type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2131
+#: fdisk/cfdisk.c:2130
 msgid "  u          Change units of the partition size display"
 msgstr ""
 
-#: fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:2131
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2133
+#: fdisk/cfdisk.c:2132
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2134
+#: fdisk/cfdisk.c:2133
 msgid "             Since this might destroy data on the disk, you must"
 msgstr ""
 
-#: fdisk/cfdisk.c:2135
+#: fdisk/cfdisk.c:2134
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr ""
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2135
 msgid "             `no'"
 msgstr ""
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2136
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2137
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2139
+#: fdisk/cfdisk.c:2138
 msgid "CTRL-L       Redraws the screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2140
+#: fdisk/cfdisk.c:2139
 msgid "  ?          Print this screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2141
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr ""
 
-#: fdisk/cfdisk.c:2143
+#: fdisk/cfdisk.c:2142
 msgid "case letters (except for Writes)."
 msgstr ""
 
-#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2490 fdisk/fdisksunlabel.c:305
-#: fdisk/fdisksunlabel.c:307
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr ""
 
-#: fdisk/cfdisk.c:2173
+#: fdisk/cfdisk.c:2172
 msgid "Change cylinder geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr ""
 
-#: fdisk/cfdisk.c:2174
+#: fdisk/cfdisk.c:2173
 msgid "Change head geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2174
 msgid "Change sector geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2175
 msgid "Done"
 msgstr ""
 
-#: fdisk/cfdisk.c:2176
+#: fdisk/cfdisk.c:2175
 msgid "Done with changing geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2189
+#: fdisk/cfdisk.c:2188
 msgid "Enter the number of cylinders: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2758
+#: fdisk/cfdisk.c:2200 fdisk/cfdisk.c:2762
 msgid "Illegal cylinders value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2207
+#: fdisk/cfdisk.c:2206
 msgid "Enter the number of heads: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2768
+#: fdisk/cfdisk.c:2213 fdisk/cfdisk.c:2772
 msgid "Illegal heads value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2220
+#: fdisk/cfdisk.c:2219
 msgid "Enter the number of sectors per track: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2775
+#: fdisk/cfdisk.c:2226 fdisk/cfdisk.c:2779
 msgid "Illegal sectors value"
 msgstr ""
 
-#: fdisk/cfdisk.c:2330
+#: fdisk/cfdisk.c:2329
 msgid "Enter filesystem type: "
 msgstr ""
 
-#: fdisk/cfdisk.c:2348
+#: fdisk/cfdisk.c:2347
 msgid "Cannot change FS Type to empty"
 msgstr ""
 
-#: fdisk/cfdisk.c:2350
+#: fdisk/cfdisk.c:2349
 msgid "Cannot change FS Type to extended"
 msgstr ""
 
-#: fdisk/cfdisk.c:2373 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2377 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr ""
 
-#: fdisk/cfdisk.c:2375
+#: fdisk/cfdisk.c:2379
 #, c-format
 msgid "Unk(%02X)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2378 fdisk/cfdisk.c:2381
+#: fdisk/cfdisk.c:2382 fdisk/cfdisk.c:2385
 msgid ", NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2386 fdisk/cfdisk.c:2389
+#: fdisk/cfdisk.c:2390 fdisk/cfdisk.c:2393
 msgid "NC"
 msgstr ""
 
-#: fdisk/cfdisk.c:2397
+#: fdisk/cfdisk.c:2401
 msgid "Pri/Log"
 msgstr ""
 
-#: fdisk/cfdisk.c:2473
+#: fdisk/cfdisk.c:2477
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Schijf: %s"
 
-#: fdisk/cfdisk.c:2476
+#: fdisk/cfdisk.c:2480
 #, c-format
 msgid "Size: %lld bytes"
 msgstr ""
 
-#: fdisk/cfdisk.c:2478
+#: fdisk/cfdisk.c:2482
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "%d koppen   %d sectoren/spoor   %d cylinders"
 
-#: fdisk/cfdisk.c:2482
+#: fdisk/cfdisk.c:2486
 msgid "Name"
 msgstr "Naam"
 
-#: fdisk/cfdisk.c:2483
+#: fdisk/cfdisk.c:2487
 msgid "Flags"
 msgstr "Vlaggen"
 
-#: fdisk/cfdisk.c:2484
+#: fdisk/cfdisk.c:2488
 msgid "Part Type"
 msgstr "type"
 
-#: fdisk/cfdisk.c:2485
+#: fdisk/cfdisk.c:2489
 msgid "FS Type"
 msgstr "FS type"
 
-#: fdisk/cfdisk.c:2486
+#: fdisk/cfdisk.c:2490
 msgid "[Label]"
 msgstr ""
 
-#: fdisk/cfdisk.c:2488
+#: fdisk/cfdisk.c:2492
 msgid "  Sectors"
 msgstr "  sectoren"
 
-#: fdisk/cfdisk.c:2492
+#: fdisk/cfdisk.c:2496
 msgid "Size (MB)"
 msgstr "Grootte (MB)"
 
-#: fdisk/cfdisk.c:2494
+#: fdisk/cfdisk.c:2498
 #, fuzzy
 msgid "Size (GB)"
 msgstr "Grootte (MB)"
 
-#: fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2553
 msgid "Bootable"
 msgstr "Startbaar"
 
-#: fdisk/cfdisk.c:2549
+#: fdisk/cfdisk.c:2553
 msgid "Toggle bootable flag of the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2550
+#: fdisk/cfdisk.c:2554
 msgid "Delete"
 msgstr ""
 
-#: fdisk/cfdisk.c:2550
+#: fdisk/cfdisk.c:2554
 msgid "Delete the current partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2555
 msgid "Geometry"
 msgstr ""
 
-#: fdisk/cfdisk.c:2551
+#: fdisk/cfdisk.c:2555
 msgid "Change disk geometry (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2552
+#: fdisk/cfdisk.c:2556
 msgid "Help"
 msgstr ""
 
-#: fdisk/cfdisk.c:2552
+#: fdisk/cfdisk.c:2556
 msgid "Print help screen"
 msgstr ""
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2557
 msgid "Maximize"
 msgstr ""
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2557
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2558
 msgid "New"
 msgstr ""
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2558
 msgid "Create new partition from free space"
 msgstr ""
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2559
 msgid "Print"
 msgstr ""
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2559
 msgid "Print partition table to the screen or to a file"
 msgstr ""
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2560
 msgid "Quit"
 msgstr ""
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2560
 msgid "Quit program without writing partition table"
 msgstr ""
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2561
 msgid "Type"
 msgstr ""
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2561
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2562
 msgid "Units"
 msgstr ""
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2562
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2563
 msgid "Write"
 msgstr ""
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2563
 msgid "Write partition table to disk (this might destroy data)"
 msgstr ""
 
-#: fdisk/cfdisk.c:2605
+#: fdisk/cfdisk.c:2609
 msgid "Cannot make this partition bootable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2615
+#: fdisk/cfdisk.c:2619
 msgid "Cannot delete an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2635 fdisk/cfdisk.c:2637
+#: fdisk/cfdisk.c:2639 fdisk/cfdisk.c:2641
 msgid "Cannot maximize this partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2645
+#: fdisk/cfdisk.c:2649
 msgid "This partition is unusable"
 msgstr ""
 
-#: fdisk/cfdisk.c:2647
+#: fdisk/cfdisk.c:2651
 msgid "This partition is already in use"
 msgstr ""
 
-#: fdisk/cfdisk.c:2664
+#: fdisk/cfdisk.c:2668
 msgid "Cannot change the type of an empty partition"
 msgstr ""
 
-#: fdisk/cfdisk.c:2691 fdisk/cfdisk.c:2697
+#: fdisk/cfdisk.c:2695 fdisk/cfdisk.c:2701
 msgid "No more partitions"
 msgstr ""
 
-#: fdisk/cfdisk.c:2704
+#: fdisk/cfdisk.c:2708
 msgid "Illegal command"
 msgstr ""
 
-#: fdisk/cfdisk.c:2714
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+#: fdisk/cfdisk.c:2718
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 msgstr ""
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
-#: fdisk/cfdisk.c:2721
+#: fdisk/cfdisk.c:2725
 #, c-format
 msgid ""
 "\n"
@@ -2012,7 +2174,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:247
+#: fdisk/fdisk.c:204
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2024,7 +2186,7 @@ msgid ""
 "-b 2048: (for certain MO drives) use 2048-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:259
+#: fdisk/fdisk.c:216
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2034,256 +2196,266 @@ msgid ""
 "  ...\n"
 msgstr ""
 
-#: fdisk/fdisk.c:267
+#: fdisk/fdisk.c:224
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Kan het bestand '%s' niet openen\n"
 
-#: fdisk/fdisk.c:270
+#: fdisk/fdisk.c:227
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Kan het bestand '%s' niet lezen\n"
 
-#: fdisk/fdisk.c:273
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Kan het bestand '%s' niet positioneren\n"
 
-#: fdisk/fdisk.c:276
+#: fdisk/fdisk.c:233
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Kan het bestand '%s' niet schrijven\n"
 
-#: fdisk/fdisk.c:279
+#: fdisk/fdisk.c:236
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:283
+#: fdisk/fdisk.c:240
 msgid "Unable to allocate any more memory\n"
 msgstr "Kan niet meer geheugen krijgen\n"
 
-#: fdisk/fdisk.c:285
+#: fdisk/fdisk.c:242
 msgid "Fatal error\n"
 msgstr "Fatale fout\n"
 
-#: fdisk/fdisk.c:296 fdisk/fdisk.c:315 fdisk/fdisk.c:333 fdisk/fdisk.c:340
-#: fdisk/fdisk.c:363 fdisk/fdisk.c:381 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:348 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:378 fdisk/fdisk.c:396 fdisk/fdisk.c:412 fdisk/fdisk.c:428
+#: fdisk/fdiskbsdlabel.c:124
 #, fuzzy
 msgid "Command action"
 msgstr "Commando     Betekenis"
 
-#: fdisk/fdisk.c:297
+#: fdisk/fdisk.c:312
 msgid "   a   toggle a read only flag"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:298 fdisk/fdisk.c:342
+#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
 msgid "   b   edit bsd disklabel"
 msgstr ""
 
-#: fdisk/fdisk.c:299
+#: fdisk/fdisk.c:314
 msgid "   c   toggle the mountable flag"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
 msgid "   d   delete a partition"
 msgstr "   d          Verwijder partitie"
 
-#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:345
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
 msgid "   l   list known partition types"
 msgstr "   l   geef alle bekende partitietypen"
 
 #. sun
-#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:334 fdisk/fdisk.c:346
-#: fdisk/fdisk.c:371 fdisk/fdisk.c:388 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:349 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:386 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr ""
 
-#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:347
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
 msgid "   n   add a new partition"
 msgstr "   n   maak een nieuwe partitie"
 
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:335 fdisk/fdisk.c:348
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
 #, fuzzy
 msgid "   o   create a new empty DOS partition table"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:349 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:389
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:364 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
 #, fuzzy
 msgid "   p   print the partition table"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:351 fdisk/fdisk.c:365
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr ""
 
-#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:337 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
 msgid "   s   create a new empty Sun disklabel"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 #, fuzzy
 msgid "   t   change a partition's system id"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
 msgid "   u   change display/entry units"
 msgstr ""
 
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 #, fuzzy
 msgid "   v   verify the partition table"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:330 fdisk/fdisk.c:355 fdisk/fdisk.c:377
-#: fdisk/fdisk.c:394
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   w   write table to disk and exit"
 msgstr ""
 
-#: fdisk/fdisk.c:312 fdisk/fdisk.c:356
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
 msgid "   x   extra functionality (experts only)"
 msgstr ""
 
-#: fdisk/fdisk.c:316
+#: fdisk/fdisk.c:331
 #, fuzzy
 msgid "   a   select bootable partition"
 msgstr "  d          Verwijder de huidige partitie"
 
 #. sgi flavour
-#: fdisk/fdisk.c:317
+#: fdisk/fdisk.c:332
 msgid "   b   edit bootfile entry"
 msgstr ""
 
 #. sgi
-#: fdisk/fdisk.c:318
+#: fdisk/fdisk.c:333
 #, fuzzy
 msgid "   c   select sgi swap partition"
 msgstr "  d          Verwijder de huidige partitie"
 
-#: fdisk/fdisk.c:341
+#: fdisk/fdisk.c:356
 msgid "   a   toggle a bootable flag"
 msgstr ""
 
-#: fdisk/fdisk.c:343
+#: fdisk/fdisk.c:358
 msgid "   c   toggle the dos compatibility flag"
 msgstr ""
 
-#: fdisk/fdisk.c:364
+#: fdisk/fdisk.c:379
 msgid "   a   change number of alternate cylinders"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
 msgid "   c   change number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:366 fdisk/fdisk.c:384
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
 #, fuzzy
 msgid "   d   print the raw data in the partition table"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/fdisk.c:367
+#: fdisk/fdisk.c:382
 msgid "   e   change number of extra sectors per cylinder"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:368 fdisk/fdisk.c:387
+#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
 msgid "   h   change number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:384
 msgid "   i   change interleave factor"
 msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:370
+#: fdisk/fdisk.c:385
 msgid "   o   change rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:391 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr ""
 
-#: fdisk/fdisk.c:375 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
 msgid "   s   change number of sectors/track"
 msgstr ""
 
-#: fdisk/fdisk.c:378
+#: fdisk/fdisk.c:393
 msgid "   y   change number of physical cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:382
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
 msgid "   b   move beginning of data in a partition"
 msgstr ""
 
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
 #, fuzzy
 msgid "   e   list extended partitions"
 msgstr "Geen ruimte voor een uitgebreide partitie"
 
 #. !sun
-#: fdisk/fdisk.c:386
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
 #, fuzzy
 msgid "   g   create an IRIX partition table"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/fdisk.c:482
+#. !sun
+#: fdisk/fdisk.c:433
+#, fuzzy
+msgid "   f   fix partition order"
+msgstr "Geef alleen de partitietabel"
+
+#: fdisk/fdisk.c:532
 msgid "You must set"
 msgstr ""
 
-#: fdisk/fdisk.c:496
+#: fdisk/fdisk.c:546
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:498 fdisk/fdisk.c:906 fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:548 fdisk/fdisk.c:1046 fdisk/sfdisk.c:864
 #, fuzzy
 msgid "sectors"
 msgstr "Sectoren"
 
-#: fdisk/fdisk.c:500 fdisk/fdisk.c:906 fdisk/fdiskbsdlabel.c:441
-#: fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:550 fdisk/fdisk.c:1046 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
 #, fuzzy
 msgid "cylinders"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:554
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:505
+#: fdisk/fdisk.c:555
 msgid " and "
 msgstr ""
 
-#: fdisk/fdisk.c:539
+#: fdisk/fdisk.c:595
 #, fuzzy
 msgid "Bad offset in primary extended partition\n"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/fdisk.c:546
+#: fdisk/fdisk.c:609
 #, fuzzy, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/fdisk.c:567
+#: fdisk/fdisk.c:625
 #, fuzzy, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/fdisk.c:575
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: ignoring extra data in partition table %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:601
+#: fdisk/fdisk.c:677
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -2291,107 +2463,107 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:637
-#, fuzzy
-msgid "You will not be able to write the partition table.\n"
-msgstr "Geef alleen de partitietabel"
-
-#: fdisk/fdisk.c:646
+#: fdisk/fdisk.c:701
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:694
+#: fdisk/fdisk.c:783
+#, fuzzy
+msgid "You will not be able to write the partition table.\n"
+msgstr "Geef alleen de partitietabel"
+
+#: fdisk/fdisk.c:811
 msgid ""
-"Device contains neither a valid DOS partition table, nor Sun or SGI "
+"Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
 msgstr ""
 
-#: fdisk/fdisk.c:710
+#: fdisk/fdisk.c:827
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Interne fout"
 
-#: fdisk/fdisk.c:720
+#: fdisk/fdisk.c:849
 #, fuzzy, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Geen ruimte voor een uitgebreide partitie"
 
-#: fdisk/fdisk.c:727
+#: fdisk/fdisk.c:861
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
 "w(rite)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:748
+#: fdisk/fdisk.c:883
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
 
-#: fdisk/fdisk.c:785
+#: fdisk/fdisk.c:921
 msgid "Hex code (type L to list codes): "
 msgstr ""
 
-#: fdisk/fdisk.c:824
+#: fdisk/fdisk.c:960
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr ""
 
-#: fdisk/fdisk.c:878
+#: fdisk/fdisk.c:1014
 #, c-format
 msgid "Using default value %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:882
+#: fdisk/fdisk.c:1018
 msgid "Value out of range.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:1028
 #, fuzzy
 msgid "Partition number"
 msgstr "Partitietabel voor %s\n"
 
-#: fdisk/fdisk.c:897
+#: fdisk/fdisk.c:1037
 #, fuzzy, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Schrijf nu de partitietabel naar schijf..."
 
-#: fdisk/fdisk.c:904
+#: fdisk/fdisk.c:1044
 #, fuzzy
 msgid "cylinder"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdisk.c:904
+#: fdisk/fdisk.c:1044
 #, fuzzy
 msgid "sector"
 msgstr "Sectoren"
 
-#: fdisk/fdisk.c:913
+#: fdisk/fdisk.c:1053
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:923
+#: fdisk/fdisk.c:1064
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr ""
 
-#: fdisk/fdisk.c:936
+#: fdisk/fdisk.c:1075
 msgid "DOS Compatibility flag is set\n"
 msgstr ""
 
-#: fdisk/fdisk.c:940
+#: fdisk/fdisk.c:1079
 msgid "DOS Compatibility flag is not set\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1026
+#: fdisk/fdisk.c:1167
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1031
+#: fdisk/fdisk.c:1172
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2399,72 +2571,72 @@ msgid ""
 "a partition using the `d' command.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1040
+#: fdisk/fdisk.c:1181
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1049
+#: fdisk/fdisk.c:1190
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1055
+#: fdisk/fdisk.c:1196
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1069
+#: fdisk/fdisk.c:1210
 #, c-format
 msgid "Changed system type of partition %d to %x (%s)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1122
+#: fdisk/fdisk.c:1261
 #, c-format
 msgid "Partition %d has different physical/logical beginnings (non-Linux?):\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132 fdisk/fdisk.c:1141 fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1263 fdisk/fdisk.c:1271 fdisk/fdisk.c:1280 fdisk/fdisk.c:1289
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr ""
 
-#: fdisk/fdisk.c:1125 fdisk/fdisk.c:1133
+#: fdisk/fdisk.c:1264 fdisk/fdisk.c:1272
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1130
+#: fdisk/fdisk.c:1269
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1139
+#: fdisk/fdisk.c:1278
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1142
+#: fdisk/fdisk.c:1281
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1148
+#: fdisk/fdisk.c:1287
 #, c-format
 msgid "Partition %i does not end on cylinder boundary:\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1151
+#: fdisk/fdisk.c:1290
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1158
+#: fdisk/fdisk.c:1297
 #, c-format
 msgid ""
 "\n"
@@ -2473,18 +2645,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#. FIXME! let's see how this shows up with other languagues
-#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1195
+#: fdisk/fdisk.c:1342
+msgid ""
+"Nothing to do. Ordering is correct already.\n"
+"\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1408
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1196 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1409 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
 msgid "Device"
 msgstr ""
 
-#: fdisk/fdisk.c:1236
+#: fdisk/fdisk.c:1446
+msgid ""
+"\n"
+"Partition table entries are not in disk order\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1456
 #, c-format
 msgid ""
 "\n"
@@ -2492,105 +2674,105 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1238
+#: fdisk/fdisk.c:1458
 #, fuzzy
-msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl   Start    Size ID\n"
+msgid "Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n"
 msgstr " # Vlaggen Kop Sect Cyl ID  Kop Sect Cyl     Sector  Sectoren\n"
 
-#: fdisk/fdisk.c:1277
+#: fdisk/fdisk.c:1502
 #, fuzzy, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Schrijf nu de partitietabel naar schijf..."
 
-#: fdisk/fdisk.c:1280
+#: fdisk/fdisk.c:1505
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1283
+#: fdisk/fdisk.c:1508
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1286
+#: fdisk/fdisk.c:1511
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1515
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1320
+#: fdisk/fdisk.c:1547
 #, fuzzy, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/fdisk.c:1328
+#: fdisk/fdisk.c:1555
 #, fuzzy, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Schrijf nu de partitietabel naar schijf..."
 
-#: fdisk/fdisk.c:1346
+#: fdisk/fdisk.c:1575
 #, fuzzy, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Schrijf nu de partitietabel naar schijf..."
 
-#: fdisk/fdisk.c:1351
+#: fdisk/fdisk.c:1580
 #, c-format
 msgid "Logical partition %d not entirely in partition %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1357
+#: fdisk/fdisk.c:1586
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1360
+#: fdisk/fdisk.c:1589
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1372 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1602 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1393 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
-#: fdisk/fdisksunlabel.c:494
+#: fdisk/fdisk.c:1623 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdisk.c:1408 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1638 fdisk/fdisksunlabel.c:542
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1440
+#: fdisk/fdisk.c:1674
 msgid "No free sectors available\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1450 fdisk/fdiskbsdlabel.c:256 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1682 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
 
-#: fdisk/fdisk.c:1480
+#: fdisk/fdisk.c:1715
 #, fuzzy, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
 msgstr "Partitie eindigt voorbij het einde van de schijf"
 
-#: fdisk/fdisk.c:1517 fdisk/fdiskbsdlabel.c:590
+#: fdisk/fdisk.c:1755 fdisk/fdiskbsdlabel.c:611
 msgid "The maximum number of partitions has been created\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1527
+#: fdisk/fdisk.c:1765
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1531
+#: fdisk/fdisk.c:1769
 #, c-format
 msgid ""
 "Command action\n"
@@ -2598,36 +2780,32 @@ msgid ""
 "   p   primary partition (1-4)\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1533
+#: fdisk/fdisk.c:1771
 msgid "l   logical (5 or over)"
 msgstr ""
 
-#: fdisk/fdisk.c:1533
+#: fdisk/fdisk.c:1771
 msgid "e   extended"
 msgstr ""
 
-#: fdisk/fdisk.c:1550
+#: fdisk/fdisk.c:1788
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1582
+#: fdisk/fdisk.c:1823
 #, fuzzy
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr "Partitietabel is weggeschreven"
 
-#: fdisk/fdisk.c:1584
+#: fdisk/fdisk.c:1832
 #, fuzzy
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/fdisk.c:1601
-msgid "Syncing disks.\n"
-msgstr ""
-
-#: fdisk/fdisk.c:1606
+#: fdisk/fdisk.c:1848
 #, fuzzy, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2636,7 +2814,7 @@ msgstr ""
 "Herstart het systeem om er zeker van te zijn dat de partitietabel correct "
 "aangepast is\n"
 
-#: fdisk/fdisk.c:1612
+#: fdisk/fdisk.c:1854
 #, fuzzy
 msgid ""
 "\n"
@@ -2648,90 +2826,111 @@ msgstr ""
 "WAARSCHUWING: Mocht U DOS 6.x partities hebben aangemaakt of gewijzigd,\n"
 "lees dan de cfdisk man pagina - vaak is nog een dd commando nodig.\n"
 
-#: fdisk/fdisk.c:1643
+#: fdisk/fdisk.c:1861
+msgid "Syncing disks.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:1892
 #, fuzzy, c-format
 msgid "Device: %s\n"
 msgstr "Schijf: %s\n"
 
-#: fdisk/fdisk.c:1658
+#: fdisk/fdisk.c:1908
 #, fuzzy, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitie eindigt voor sector 0"
 
-#: fdisk/fdisk.c:1664
+#: fdisk/fdisk.c:1913
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:1678
+#: fdisk/fdisk.c:1929
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:1689
+#: fdisk/fdisk.c:1942
 #, fuzzy
 msgid "Number of cylinders"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdisk.c:1710
+#: fdisk/fdisk.c:1968
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:1735
+#: fdisk/fdisk.c:1993
 #, fuzzy
 msgid "Number of sectors"
 msgstr "  sectoren"
 
-#: fdisk/fdisk.c:1738
+#: fdisk/fdisk.c:1996
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1800
+#: fdisk/fdisk.c:2058
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1814
+#: fdisk/fdisk.c:2072
 #, fuzzy, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan het bestand '%s' niet openen"
 
-#: fdisk/fdisk.c:1879
+#: fdisk/fdisk.c:2089
+#, fuzzy, c-format
+msgid "cannot open %s\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: fdisk/fdisk.c:2110
+#, c-format
+msgid "%c: unknown command\n"
+msgstr ""
+
+#: fdisk/fdisk.c:2161
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1882
+#: fdisk/fdisk.c:2164
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1940
+#: fdisk/fdisk.c:2227
+#, c-format
+msgid ""
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
+msgstr ""
+
+#: fdisk/fdisk.c:2236
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:1954
+#: fdisk/fdisk.c:2252
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1956
+#: fdisk/fdisk.c:2254
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:1958
+#: fdisk/fdisk.c:2256
 #, fuzzy
 msgid "Boot file unchanged\n"
 msgstr "De schijfinhoud is gewijzigd.\n"
 
-#: fdisk/fdisk.c:2018
+#: fdisk/fdisk.c:2320
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdiskaixlabel.c:29
+#: fdisk/fdiskaixlabel.c:28
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -2747,370 +2946,364 @@ msgid ""
 "\t   machine.  (Otherwise you become an AIXpert)."
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:117
 #, c-format
 msgid ""
 "\n"
 "BSD label for device: %s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:125
 #, fuzzy
 msgid "   d   delete a BSD partition"
 msgstr "  d          Verwijder de huidige partitie"
 
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:130
 #, fuzzy
 msgid "   n   add a new BSD partition"
 msgstr "Maak een nieuwe primaire partitie"
 
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:131
 #, fuzzy
 msgid "   p   print BSD partition table"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   u   change units (cylinders/sectors)"
+msgstr ""
+
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   x   link BSD partition to non-BSD partition"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:146
+#: fdisk/fdiskbsdlabel.c:168
 #, fuzzy, c-format
-msgid "Partition %s%d has invalid starting sector 0.\n"
+msgid "Partition %s has invalid starting sector 0.\n"
 msgstr "Partitie eindigt voor sector 0"
 
-#: fdisk/fdiskbsdlabel.c:150
-#, c-format
-msgid "Reading disklabel of %s%d at sector %d.\n"
-msgstr ""
+#: fdisk/fdiskbsdlabel.c:172
+#, fuzzy, c-format
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "Partitietabel voor %s\n"
 
-#: fdisk/fdiskbsdlabel.c:159
+#: fdisk/fdiskbsdlabel.c:182
 #, fuzzy, c-format
 msgid "There is no *BSD partition on %s.\n"
 msgstr "Heb de partitietabel niet naar schijf geschreven"
 
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:286
+#: fdisk/fdiskbsdlabel.c:310
 #, c-format
 msgid "type: %s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:312
 #, c-format
 msgid "type: %d\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:289
+#: fdisk/fdiskbsdlabel.c:313
 #, fuzzy, c-format
 msgid "disk: %.*s\n"
 msgstr "Schijf: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:315
 #, fuzzy
 msgid "flags:"
 msgstr "Vlaggen"
 
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:317
 #, fuzzy
 msgid " removable"
 msgstr "Startbaar"
 
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
 msgstr ""
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:301
+#: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:302
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:329
 #, fuzzy, c-format
 msgid "cylinders: %ld\n"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:333
 #, fuzzy, c-format
 msgid "cylinderskew: %d\n"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:321
+#: fdisk/fdiskbsdlabel.c:347
 #, fuzzy, c-format
 msgid ""
 "\n"
 "%d partitions:\n"
 msgstr "Maak geen partitie"
 
-#: fdisk/fdiskbsdlabel.c:322
-msgid "#        size   offset    fstype   [fsize bsize   cpg]\n"
+#: fdisk/fdiskbsdlabel.c:348
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:378
-#, fuzzy, c-format
-msgid "Writing disklabel to %s%d.\n"
-msgstr "Partitietabel voor %s\n"
-
-#: fdisk/fdiskbsdlabel.c:381
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, fuzzy, c-format
 msgid "Writing disklabel to %s.\n"
 msgstr "Partitietabel voor %s\n"
 
-#: fdisk/fdiskbsdlabel.c:392
-#, c-format
-msgid "%s%d contains no disklabel.\n"
-msgstr ""
-
-#: fdisk/fdiskbsdlabel.c:395
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:399
+#: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:438
+#: fdisk/fdiskbsdlabel.c:458
 #, fuzzy
 msgid "bytes/sector"
 msgstr "Sectoren"
 
-#: fdisk/fdiskbsdlabel.c:439
+#: fdisk/fdiskbsdlabel.c:459
 #, fuzzy
 msgid "sectors/track"
 msgstr "Sectoren"
 
-#: fdisk/fdiskbsdlabel.c:440
+#: fdisk/fdiskbsdlabel.c:460
 #, fuzzy
 msgid "tracks/cylinder"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdiskbsdlabel.c:448
+#: fdisk/fdiskbsdlabel.c:468
 #, fuzzy
 msgid "sectors/cylinder"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdiskbsdlabel.c:452
+#: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:454
+#: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:456
+#: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:477
 #, fuzzy
 msgid "cylinderskew"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:500
+#: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:526
+#: fdisk/fdiskbsdlabel.c:546
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:547
-#, c-format
-msgid "Bootstrap installed on %s%d.\n"
-msgstr ""
-
-#: fdisk/fdiskbsdlabel.c:549
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:570
+#: fdisk/fdiskbsdlabel.c:591
 #, c-format
 msgid "Partition (a-%c): "
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:601
+#: fdisk/fdiskbsdlabel.c:622
 #, fuzzy
 msgid "This partition already exists.\n"
 msgstr "Partitietabel is weggeschreven"
 
-#: fdisk/fdiskbsdlabel.c:723
+#: fdisk/fdiskbsdlabel.c:742
 #, fuzzy, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Schrijf nu de partitietabel naar schijf..."
 
-#: fdisk/fdiskbsdlabel.c:769
+#: fdisk/fdiskbsdlabel.c:789
 msgid ""
 "\n"
 "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:56
+#: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:57
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI trkrepl"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:58
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI secrepl"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:59
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI raw"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:60
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI bsd"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:61
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI sysv"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:62
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI volume"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:63
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI efs"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:64
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI lvol"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:65
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI rlvol"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:66
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI xfs"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:67
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xlvol"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:68
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI rxlvol"
 msgstr ""
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:143
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+#, fuzzy
+msgid "Linux LVM"
+msgstr "Linux"
+
+#: fdisk/fdisksgilabel.c:158
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:162
+#: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:186
+#: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
 "\n"
@@ -3122,7 +3315,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:199
+#: fdisk/fdisksgilabel.c:213
 #, c-format
 msgid ""
 "\n"
@@ -3131,14 +3324,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:205
+#: fdisk/fdisksgilabel.c:219
 #, c-format
 msgid ""
 "----- partitions -----\n"
 "%*s  Info      Start       End   Sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:227
+#: fdisk/fdisksgilabel.c:241
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3146,12 +3339,12 @@ msgid ""
 "----- directory entries -----\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:237
+#: fdisk/fdisksgilabel.c:251
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:298
+#: fdisk/fdisksgilabel.c:305
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3159,26 +3352,26 @@ msgid ""
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:312
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:310
+#: fdisk/fdisksgilabel.c:317
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:315
+#: fdisk/fdisksgilabel.c:322
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
 "\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:343
+#: fdisk/fdisksgilabel.c:350
 #, c-format
 msgid ""
 "\n"
@@ -3189,7 +3382,7 @@ msgstr ""
 msgid "More than one entire disk entry present.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:478
 #, fuzzy
 msgid "No partitions defined\n"
 msgstr "Maak geen partitie"
@@ -3274,51 +3467,51 @@ msgid ""
 msgstr ""
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:621
+#: fdisk/fdisksgilabel.c:607
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:691
+#: fdisk/fdisksgilabel.c:669
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:698
+#: fdisk/fdisksgilabel.c:676
 msgid "The entire disk is already covered with partitions.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:703
+#: fdisk/fdisksgilabel.c:681
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:728
+#: fdisk/fdisksgilabel.c:706
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:711
 #, c-format
 msgid " Last %s"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:756
+#: fdisk/fdisksgilabel.c:733
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
-"content will be unrecoverable lost.\n"
+"content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:784
+#: fdisk/fdisksgilabel.c:761
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:786
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr ""
@@ -3355,7 +3548,7 @@ msgstr ""
 msgid "SunOS home"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:122
+#: fdisk/fdisksunlabel.c:129
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
@@ -3363,12 +3556,12 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:215
+#: fdisk/fdisksunlabel.c:228
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:242
+#: fdisk/fdisksunlabel.c:255
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -3376,88 +3569,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:253
+#: fdisk/fdisksunlabel.c:266
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:263
+#: fdisk/fdisksunlabel.c:276
 msgid "Select type (? for auto, 0 for custom): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:275
+#: fdisk/fdisksunlabel.c:288
 msgid "Autoconfigure failed.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:303
+#: fdisk/fdisksunlabel.c:316
 #, fuzzy
 msgid "Sectors/track"
 msgstr "Sectoren"
 
-#: fdisk/fdisksunlabel.c:310
+#: fdisk/fdisksunlabel.c:323
 #, fuzzy
 msgid "Alternate cylinders"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdisksunlabel.c:313
+#: fdisk/fdisksunlabel.c:326
 #, fuzzy
 msgid "Physical cylinders"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
 #, fuzzy
 msgid "Extra sectors per cylinder"
 msgstr "%ld inodes\n"
 
-#: fdisk/fdisksunlabel.c:334
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:418
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:438
+#: fdisk/fdisksunlabel.c:461
 #, fuzzy, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "Partitie eindigt voor sector 0"
 
-#: fdisk/fdisksunlabel.c:460
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:512
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksunlabel.c:570
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3465,14 +3658,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:567
+#: fdisk/fdisksunlabel.c:590
 #, 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:580
+#: fdisk/fdisksunlabel.c:603
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3481,7 +3674,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:634
 #, c-format
 msgid ""
 "\n"
@@ -3493,7 +3686,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:648
 #, c-format
 msgid ""
 "\n"
@@ -3502,16 +3695,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:653
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:655
+#: fdisk/fdisksunlabel.c:678
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:688
+#: fdisk/fdisksunlabel.c:711
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -3624,279 +3817,306 @@ msgid "NEC DOS"
 msgstr ""
 
 #: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:33
 #, fuzzy
 msgid "PartitionMagic recovery"
 msgstr "Partitie begint voor sector 0"
 
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:36
 msgid "SFS"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
 msgstr ""
 
 #. (or Novell)
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr ""
 
 #. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:44
+#: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
 msgstr ""
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
-#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:82
+#: fdisk/i386_sys_types.c:85 fdisk/i386_sys_types.c:86
 #, fuzzy
 msgid "SpeedStor"
 msgstr "Sectoren"
 
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
 msgstr ""
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:52
+#: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:53
+#: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
 msgstr ""
 
 #. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
 msgstr ""
 
 #. (bad block table)
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:65
+msgid "BSD/OS"
+msgstr ""
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16)"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
 msgid "Syrinx"
 msgstr ""
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:76
+msgid "Non-FS data"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:77
 msgid "CP/M / CTOS / ..."
 msgstr ""
 
-#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:74
+#. CP/M or Concurrent CP/M or
+#. Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:79
 msgid "DOS access"
 msgstr ""
 
-#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:75
+#. DOS access or SpeedStor 12-bit FAT
+#. extended partition
+#: fdisk/i386_sys_types.c:81
 msgid "DOS R/O"
 msgstr ""
 
-#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:77
+#. SpeedStor 16-bit FAT extended
+#. partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:84
 msgid "BeOS fs"
 msgstr ""
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:80
+#: fdisk/i386_sys_types.c:87
 msgid "DOS secondary"
 msgstr ""
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:88
 msgid "Linux raid autodetect"
 msgstr ""
 
-#. New (2.2.x) raid partition with autodetect
-#. using persistent superblock
-#: fdisk/i386_sys_types.c:83
+#. New (2.2.x) raid partition with
+#. autodetect using persistent
+#. superblock
+#: fdisk/i386_sys_types.c:91
 msgid "LANstep"
 msgstr ""
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:92
 msgid "BBT"
 msgstr ""
 
-#: fdisk/sfdisk.c:147
+#: fdisk/sfdisk.c:152
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:157
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:198
+#: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:218
+#: fdisk/sfdisk.c:224
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:235
+#: fdisk/sfdisk.c:241
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:273
+#: fdisk/sfdisk.c:279
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:297
 #, c-format
 msgid "write error on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:309
+#: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:320
 msgid "partition restore file has wrong size - not restoring\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:318
+#: fdisk/sfdisk.c:324
 msgid "out of memory?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:336
 #, c-format
 msgid "error reading %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:337
+#: fdisk/sfdisk.c:343
 #, fuzzy, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "Kan schijf niet openen"
 
-#: fdisk/sfdisk.c:349
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:415
+#: fdisk/sfdisk.c:406
+#, fuzzy, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
 "Warning: start=%d - this looks like a partition rather than\n"
@@ -3904,164 +4124,159 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:421
+#: fdisk/sfdisk.c:442
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:424
+#: fdisk/sfdisk.c:445
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:427
+#: fdisk/sfdisk.c:449
 #, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:431
-#, c-format
-msgid "Disk %s: cannot get geometry\n"
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:433
+#: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%d) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:437
+#: fdisk/sfdisk.c:457
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:539
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:544
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:527
+#: fdisk/sfdisk.c:549
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %d (should be in "
 "0-%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:566
+#: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:719
+#: fdisk/sfdisk.c:741
 #, fuzzy
 msgid "Re-reading the partition table ...\n"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/sfdisk.c:725
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:730
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:768
+#: fdisk/sfdisk.c:790
 #, fuzzy, c-format
 msgid "%s: no such partition\n"
 msgstr "Slechte logische partitie"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:830
+#: fdisk/sfdisk.c:852
 #, fuzzy, c-format
 msgid "# partition table of %s\n"
 msgstr "Partitietabel voor %s\n"
 
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:845
+#: fdisk/sfdisk.c:867
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:875
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:855
+#: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:880
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:860
+#: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:885
 #, c-format
 msgid ""
 "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:865
+#: fdisk/sfdisk.c:887
 msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1019
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1004
+#: fdisk/sfdisk.c:1026
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1007
+#: fdisk/sfdisk.c:1029
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1018
+#: fdisk/sfdisk.c:1040
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1025
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid ""
 "Warning: The first partition looks like it was made\n"
@@ -4069,862 +4284,879 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1097
 #, fuzzy
 msgid "no partition table present.\n"
 msgstr "Partitietabel is weggeschreven"
 
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1108
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1111
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1092
+#: fdisk/sfdisk.c:1114
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1103
+#: fdisk/sfdisk.c:1125
 #, fuzzy, c-format
 msgid "Warning: partition %s "
 msgstr "Schrijf nu de partitietabel naar schijf..."
 
-#: fdisk/sfdisk.c:1104
+#: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
 msgstr ""
 
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, fuzzy, c-format
 msgid "Warning: partition %s contains part of "
 msgstr "Schrijf nu de partitietabel naar schijf..."
 
-#: fdisk/sfdisk.c:1128
+#: fdisk/sfdisk.c:1150
 #, fuzzy, c-format
 msgid "the partition table (sector %lu),\n"
 msgstr "Partitietabel is weggeschreven"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1164
 #, fuzzy, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Partitie eindigt voorbij het einde van de schijf"
 
-#: fdisk/sfdisk.c:1156
+#: fdisk/sfdisk.c:1178
 msgid "Among the primary partitions, at most one can be extended\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1174
+#: fdisk/sfdisk.c:1196
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1180
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1220
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1211
+#: fdisk/sfdisk.c:1233
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1228
+#: fdisk/sfdisk.c:1250
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1237
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1240
+#: fdisk/sfdisk.c:1262
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#: fdisk/sfdisk.c:1287
+#, fuzzy, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "Slechte primaire partitie"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1291
+#, fuzzy
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr "Partitie eindigt voor sector 0"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1288
+#: fdisk/sfdisk.c:1324
 #, fuzzy
 msgid "tree of partitions?\n"
 msgstr "Maak geen partitie"
 
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1426
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1458
+#: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1470
+#: fdisk/sfdisk.c:1536
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1483
+#: fdisk/sfdisk.c:1549
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1488
+#: fdisk/sfdisk.c:1554
 #, fuzzy, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Heb de partitietabel niet naar schijf geschreven"
 
-#: fdisk/sfdisk.c:1565
+#: fdisk/sfdisk.c:1631
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1601
+#: fdisk/sfdisk.c:1667
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1608
+#: fdisk/sfdisk.c:1674
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1614
+#: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1646
+#: fdisk/sfdisk.c:1712
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1650
+#: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1766
+#: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1799
+#: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1850
+#: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
 msgstr ""
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1884
+#: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1903
+#: fdisk/sfdisk.c:1969
 #, fuzzy
 msgid "Illegal type\n"
 msgstr "Niet herkende toets"
 
-#: fdisk/sfdisk.c:1935
+#: fdisk/sfdisk.c:2001
 #, c-format
-msgid "Warning: exceeds max allowable size (%lu)\n"
+msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1940
+#: fdisk/sfdisk.c:2007
 #, fuzzy
 msgid "Warning: empty partition\n"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/sfdisk.c:1954
+#: fdisk/sfdisk.c:2021
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1967
+#: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2008
+#: fdisk/sfdisk.c:2075
 #, fuzzy
 msgid "Extended partition not where expected\n"
 msgstr "Zet de partitie aan het eind van de vrije ruimte"
 
-#: fdisk/sfdisk.c:2040
+#: fdisk/sfdisk.c:2107
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2062
+#: fdisk/sfdisk.c:2129
 #, fuzzy
 msgid "too many partitions\n"
 msgstr "Slechte primaire partitie"
 
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2162
 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:2115
+#: fdisk/sfdisk.c:2182
 msgid "version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2188
 #, fuzzy, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "aanroep: %s [ -n ] apparaat\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2189
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr ""
 
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2190
 msgid "useful options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2191
 msgid "    -s [or --show-size]: list size of a partition"
 msgstr ""
 
-#: fdisk/sfdisk.c:2125
+#: fdisk/sfdisk.c:2192
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr ""
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2193
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr ""
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2194
 msgid "    -d [or --dump]:      idem, but in a format suitable for later input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2195
 msgid "    -i [or --increment]: number cylinders etc. from 1 instead of from 0"
 msgstr ""
 
-#: fdisk/sfdisk.c:2129
+#: fdisk/sfdisk.c:2196
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of "
 "sectors/blocks/cylinders/MB"
 msgstr ""
 
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2197
 msgid "    -T [or --list-types]:list the known partition types"
 msgstr ""
 
-#: fdisk/sfdisk.c:2131
+#: fdisk/sfdisk.c:2198
 msgid "    -D [or --DOS]:       for DOS-compatibility: waste a little space"
 msgstr ""
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2199
 msgid "    -R [or --re-read]:   make kernel reread partition table"
 msgstr ""
 
-#: fdisk/sfdisk.c:2133
+#: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
 msgstr ""
 
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
 msgstr ""
 
-#: fdisk/sfdisk.c:2135
+#: fdisk/sfdisk.c:2202
 msgid ""
 "    -O file :            save the sectors that will be overwritten to file"
 msgstr ""
 
-#: fdisk/sfdisk.c:2136
+#: fdisk/sfdisk.c:2203
 msgid "    -I file :            restore these sectors again"
 msgstr ""
 
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
 msgstr ""
 
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
 msgstr ""
 
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2207
 msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 msgstr ""
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
 
-#: fdisk/sfdisk.c:2143
+#: fdisk/sfdisk.c:2210
 msgid ""
 "    -L  [or --Linux]:      do not complain about things irrelevant for Linux"
 msgstr ""
 
-#: fdisk/sfdisk.c:2144
+#: fdisk/sfdisk.c:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr ""
 
-#: fdisk/sfdisk.c:2145
+#: fdisk/sfdisk.c:2212
 msgid "    You can override the detected geometry using:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2146
+#: fdisk/sfdisk.c:2213
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2147
+#: fdisk/sfdisk.c:2214
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2148
+#: fdisk/sfdisk.c:2215
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr ""
 
-#: fdisk/sfdisk.c:2149
+#: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2217
 msgid "    -f  [or --force]:      do what I say, even if it is stupid"
 msgstr ""
 
-#: fdisk/sfdisk.c:2156
+#: fdisk/sfdisk.c:2223
 msgid "Usage:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2157
+#: fdisk/sfdisk.c:2224
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2158
+#: fdisk/sfdisk.c:2225
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2159
+#: fdisk/sfdisk.c:2226
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2278
+#: fdisk/sfdisk.c:2346
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2471
 #, fuzzy, c-format
 msgid "total: %d blocks\n"
 msgstr "%ld blokken\n"
 
-#: fdisk/sfdisk.c:2438
+#: fdisk/sfdisk.c:2508
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2440
+#: fdisk/sfdisk.c:2510
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2442
+#: fdisk/sfdisk.c:2512
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2449
+#: fdisk/sfdisk.c:2519
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 #, fuzzy, c-format
 msgid "cannot open %s %s\n"
 msgstr "Kan het bestand '%s' niet openen"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "read-write"
 msgstr ""
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "for reading"
 msgstr ""
 
-#: fdisk/sfdisk.c:2499
+#: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2586
 #, c-format
-msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2519
-#, c-format
-msgid "%s: unknown geometry\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2535
+#: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2612
+#: fdisk/sfdisk.c:2680
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
+#: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2638
+#: fdisk/sfdisk.c:2706
 #, 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:2652
+#: fdisk/sfdisk.c:2720
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2708
+#: fdisk/sfdisk.c:2777
 #, c-format
 msgid "Bad Id %x\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2723
+#: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2812
 #, fuzzy, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "%s: dit apparaat is geen floppy\n"
 
-#: fdisk/sfdisk.c:2749
+#: fdisk/sfdisk.c:2818
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2751
+#: fdisk/sfdisk.c:2820
 msgid ""
 "\n"
-"This disk is currently in use - repartitioning is probably a bad idea.Umount "
-"all file systems, and swapoff all swap partitions on this disk.Use the "
-"--no-reread flag to suppress this check.\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2755
+#: fdisk/sfdisk.c:2824
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2759
-msgid "OK"
+#: fdisk/sfdisk.c:2828
+msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2768
+#: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2772
+#: fdisk/sfdisk.c:2841
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2780
+#: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2854
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2788
+#: fdisk/sfdisk.c:2857
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2793
+#: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:2800
+#: fdisk/sfdisk.c:2869
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2802
+#: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2808
+#: fdisk/sfdisk.c:2877
 #, fuzzy
 msgid "Please answer one of y,n,q\n"
 msgstr "Antwoord `ja' of `nee'"
 
-#: fdisk/sfdisk.c:2816
+#: fdisk/sfdisk.c:2885
 #, fuzzy
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr "Geef alleen de partitietabel"
 
-#: fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2891
 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 ""
 
-#: games/banner.c:1048
+#: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
 msgstr ""
 
-#: games/banner.c:1068
+#: games/banner.c:1065
 msgid "Message: "
 msgstr ""
 
-#: games/banner.c:1102
+#: games/banner.c:1099
 #, c-format
 msgid "The character '%c' is not in my character set"
 msgstr ""
 
-#: games/banner.c:1110
+#: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:229
+#: getopt-1.1.0a/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:295
+#: getopt-1.1.0a/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:315
+#: getopt-1.1.0a/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:320
+#: getopt-1.1.0a/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:321
+#: getopt-1.1.0a/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:322
+#: getopt-1.1.0a/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:323
+#: getopt-1.1.0a/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parameters\n"
 
-#: getopt-1.0.3b/getopt.c:324
+#: getopt-1.1.0a/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:325
+#: getopt-1.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:326
+#: getopt-1.1.0a/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:327
+#: getopt-1.1.0a/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:328
+#: getopt-1.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:329
+#: getopt-1.1.0a/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:330
+#: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:331
+#: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:332
+#: getopt-1.1.0a/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:333
+#: getopt-1.1.0a/getopt.c:337
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr ""
+
+#: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:433
-msgid "getopt (enhanced) 1.0.3\n"
+#: getopt-1.1.0a/getopt.c:441
+msgid "getopt (enhanced) 1.1.0\n"
 msgstr ""
 
-#: getopt-1.0.3b/getopt.c:439
+#: getopt-1.1.0a/getopt.c:447
 msgid "internal error, contact the author."
 msgstr ""
 
-#: login-utils/agetty.c:303
+#: login-utils/agetty.c:306
 msgid "calling open_tty\n"
 msgstr ""
 
 #. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
-#: login-utils/agetty.c:316
+#: login-utils/agetty.c:319
 msgid "calling termio_init\n"
 msgstr ""
 
-#: login-utils/agetty.c:321
+#: login-utils/agetty.c:324
 msgid "writing init string\n"
 msgstr ""
 
 #. Optionally detect the baud rate from the modem status message.
-#: login-utils/agetty.c:331
+#: login-utils/agetty.c:334
 msgid "before autobaud\n"
 msgstr ""
 
-#: login-utils/agetty.c:343
+#: login-utils/agetty.c:346
 msgid "waiting for cr-lf\n"
 msgstr ""
 
-#: login-utils/agetty.c:347
+#: login-utils/agetty.c:350
 #, c-format
 msgid "read %c\n"
 msgstr ""
 
 #. Read the login name.
-#: login-utils/agetty.c:356
+#: login-utils/agetty.c:359
 msgid "reading login name\n"
 msgstr ""
 
-#: login-utils/agetty.c:377
+#: login-utils/agetty.c:380
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr ""
 
-#: login-utils/agetty.c:397
+#: login-utils/agetty.c:400
 msgid "can't malloc initstring"
 msgstr ""
 
-#: login-utils/agetty.c:459
+#: login-utils/agetty.c:465
 #, c-format
 msgid "bad timeout value: %s"
 msgstr ""
 
-#: login-utils/agetty.c:468
+#: login-utils/agetty.c:474
 msgid "after getopt loop\n"
 msgstr ""
 
-#: login-utils/agetty.c:486
+#: login-utils/agetty.c:492
 msgid "exiting parseargs\n"
 msgstr ""
 
-#: login-utils/agetty.c:499
+#: login-utils/agetty.c:504
 msgid "entered parse_speeds\n"
 msgstr ""
 
-#: login-utils/agetty.c:502
+#: login-utils/agetty.c:507
 #, c-format
 msgid "bad speed: %s"
 msgstr ""
 
-#: login-utils/agetty.c:504
+#: login-utils/agetty.c:509
 msgid "too many alternate speeds"
 msgstr ""
 
-#: login-utils/agetty.c:506
+#: login-utils/agetty.c:511
 msgid "exiting parsespeeds\n"
 msgstr ""
 
-#: login-utils/agetty.c:579
+#: login-utils/agetty.c:584
 #, c-format
 msgid "%s: open for update: %m"
 msgstr ""
 
-#: login-utils/agetty.c:595
+#: login-utils/agetty.c:602
 #, c-format
 msgid "%s: no utmp entry"
 msgstr ""
 
-#: login-utils/agetty.c:624
+#: login-utils/agetty.c:631
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr ""
 
-#: login-utils/agetty.c:628
+#: login-utils/agetty.c:635
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr ""
 
 #. ignore close(2) errors
-#: login-utils/agetty.c:635
+#: login-utils/agetty.c:642
 msgid "open(2)\n"
 msgstr ""
 
-#: login-utils/agetty.c:637
+#: login-utils/agetty.c:644
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr ""
 
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:654
 #, c-format
 msgid "%s: not open for read/write"
 msgstr ""
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:651
+#: login-utils/agetty.c:658
 msgid "duping\n"
 msgstr ""
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:653
+#: login-utils/agetty.c:660
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr ""
 
-#: login-utils/agetty.c:723
+#: login-utils/agetty.c:730
 msgid "term_io 2\n"
 msgstr ""
 
-#: login-utils/agetty.c:905
+#: login-utils/agetty.c:915
 msgid "user"
 msgstr ""
 
-#: login-utils/agetty.c:905
+#: login-utils/agetty.c:915
 msgid "users"
 msgstr ""
 
-#: login-utils/agetty.c:993
+#: login-utils/agetty.c:1003
 #, c-format
 msgid "%s: read: %m"
 msgstr ""
 
-#: login-utils/agetty.c:1039
+#: login-utils/agetty.c:1049
 #, c-format
 msgid "%s: input overrun"
 msgstr ""
 
-#: login-utils/agetty.c:1163
+#: login-utils/agetty.c:1173
 #, c-format
 msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] "
-"baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] line "
-"baud_rate,... [termtype]\n"
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
+"login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
+"line baud_rate,... [termtype]\n"
 msgstr ""
 
-#: login-utils/checktty.c:46
+#: login-utils/checktty.c:41
 #, c-format
 msgid "badlogin: %s\n"
 msgstr ""
 
-#: login-utils/checktty.c:52
+#: login-utils/checktty.c:47
 #, c-format
 msgid "sleepexit %d\n"
 msgstr ""
 
-#: login-utils/checktty.c:108 login-utils/checktty.c:130
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
 msgstr ""
 
-#: login-utils/checktty.c:109
+#: login-utils/checktty.c:104
 msgid "can't malloc for ttyclass"
 msgstr ""
 
-#: login-utils/checktty.c:131
+#: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
 msgstr ""
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:431
+#: login-utils/checktty.c:426
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr ""
@@ -4933,219 +5165,219 @@ msgstr ""
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:442
+#: login-utils/checktty.c:437
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr ""
 
-#: login-utils/chfn.c:135 login-utils/chsh.c:118
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr ""
 
-#: login-utils/chfn.c:142 login-utils/chsh.c:125
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr ""
 
-#: login-utils/chfn.c:147 login-utils/chsh.c:130
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr ""
 
-#: login-utils/chfn.c:159
+#: login-utils/chfn.c:145
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr ""
 
-#: login-utils/chfn.c:165 login-utils/chfn.c:169 login-utils/chfn.c:176
-#: login-utils/chfn.c:180 login-utils/chsh.c:154 login-utils/chsh.c:158
-#: login-utils/chsh.c:165 login-utils/chsh.c:169
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
 msgid "Password error."
 msgstr ""
 
-#: login-utils/chfn.c:189 login-utils/chsh.c:178 login-utils/login.c:678
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:115 mount/losetup.c:121
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:266 mount/lomount.c:221
+#: mount/lomount.c:227
 msgid "Password: "
 msgstr ""
 
-#: login-utils/chfn.c:192 login-utils/chsh.c:181
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr ""
 
-#: login-utils/chfn.c:203
+#: login-utils/chfn.c:189
 msgid "Finger information not changed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:306
+#: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr ""
 
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
 
-#: login-utils/chfn.c:308
+#: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
 msgstr ""
 
-#: login-utils/chfn.c:377 login-utils/chsh.c:294
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
 msgid ""
 "\n"
 "Aborted.\n"
 msgstr ""
 
-#: login-utils/chfn.c:410
+#: login-utils/chfn.c:398
 msgid "field is too long.\n"
 msgstr ""
 
-#: login-utils/chfn.c:418
+#: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:423
+#: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:488
+#: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
 msgstr ""
 
-#: login-utils/chfn.c:491
+#: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
 msgstr ""
 
-#: login-utils/chfn.c:505 login-utils/chsh.c:412 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
 msgid "malloc failed"
 msgstr ""
 
-#: login-utils/chsh.c:141
+#: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
 msgstr ""
 
-#: login-utils/chsh.c:148
+#: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr ""
 
-#: login-utils/chsh.c:189
+#: login-utils/chsh.c:178
 msgid "New shell"
 msgstr ""
 
-#: login-utils/chsh.c:196
+#: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
 msgstr "Shell ongewijzigd.\n"
 
-#: login-utils/chsh.c:203
+#: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
 msgstr "Shell *NIET* gewijzigd.  Probeer later nog eens.\n"
 
-#: login-utils/chsh.c:206
+#: login-utils/chsh.c:195
 msgid "Shell changed.\n"
 msgstr "Shell gewijzigd.\n"
 
-#: login-utils/chsh.c:274
+#: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
 msgstr ""
 
-#: login-utils/chsh.c:275
+#: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
 msgstr ""
 
-#: login-utils/chsh.c:276
+#: login-utils/chsh.c:265
 msgid "       [ username ]\n"
 msgstr ""
 
-#: login-utils/chsh.c:320
+#: login-utils/chsh.c:309
 #, c-format
 msgid "%s: shell must be a full path name.\n"
 msgstr ""
 
-#: login-utils/chsh.c:324
+#: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr ""
 
-#: login-utils/chsh.c:328
+#: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr ""
 
-#: login-utils/chsh.c:335
+#: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr ""
 
-#: login-utils/chsh.c:346
+#: login-utils/chsh.c:335
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr ""
 
-#: login-utils/chsh.c:348
+#: login-utils/chsh.c:337
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr ""
 
-#: login-utils/chsh.c:350
+#: login-utils/chsh.c:339
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr ""
 
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:345
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr ""
 
-#: login-utils/chsh.c:357
+#: login-utils/chsh.c:346
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr ""
 
-#: login-utils/chsh.c:378
+#: login-utils/chsh.c:367
 msgid "No known shells.\n"
 msgstr ""
 
-#: login-utils/cryptocard.c:70
+#: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
 msgstr ""
 
-#: login-utils/cryptocard.c:75
+#: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
 msgstr ""
 
-#: login-utils/cryptocard.c:98
+#: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
 msgstr ""
 
-#: login-utils/cryptocard.c:102
+#: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
 msgstr ""
 
-#: login-utils/cryptocard.c:108
+#: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
 msgstr ""
 
-#: login-utils/cryptocard.c:113
+#: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
 msgstr ""
 
-#: login-utils/islocal.c:36
+#: login-utils/islocal.c:37
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr ""
@@ -5174,242 +5406,252 @@ msgid "last: gethostname"
 msgstr ""
 
 #: login-utils/last.c:469
-#, c-format
+#, c-format, ycp-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
 
-#: login-utils/login.c:377
+#: login-utils/login.c:373
 msgid "login: -h for super-user only.\n"
 msgstr ""
 
-#: login-utils/login.c:402
+#: login-utils/login.c:398
 msgid "usage: login [-fp] [username]\n"
 msgstr ""
 
-#: login-utils/login.c:504
+#: login-utils/login.c:501
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr ""
 
-#: login-utils/login.c:506
+#: login-utils/login.c:503
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr ""
 
-#: login-utils/login.c:546
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
+#: login-utils/login.c:519
+msgid "login: "
+msgstr ""
+
+#: login-utils/login.c:553
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:548
+#: login-utils/login.c:555
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
 
-#: login-utils/login.c:557
+#: login-utils/login.c:564
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:561
+#: login-utils/login.c:568
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr ""
 
-#: login-utils/login.c:564
+#: login-utils/login.c:571
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:613
+#: login-utils/login.c:620
 msgid "Illegal username"
 msgstr "Niet-toegestane gebruikersnaam"
 
-#: login-utils/login.c:656
+#: login-utils/login.c:663
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr ""
 
-#: login-utils/login.c:661
+#: login-utils/login.c:668
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:665
+#: login-utils/login.c:672
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr ""
 
-#: login-utils/login.c:717
+#: login-utils/login.c:725
 msgid "Login incorrect\n"
 msgstr ""
 
-#: login-utils/login.c:739
+#: login-utils/login.c:747
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
 msgstr ""
 
-#: login-utils/login.c:743
+#: login-utils/login.c:751
 msgid "You have too many processes running.\n"
 msgstr ""
 
-#: login-utils/login.c:789
+#: login-utils/login.c:797
 msgid "Warning: no Kerberos tickets issued\n"
 msgstr ""
 
-#: login-utils/login.c:801
+#: login-utils/login.c:809
 msgid "Sorry -- your password has expired.\n"
 msgstr ""
 
-#: login-utils/login.c:807
+#: login-utils/login.c:815
 #, c-format
-msgid "Warning: your password expires on %s %d, %d\n"
+msgid "Warning: your password expires on %d %s %d.\n"
 msgstr ""
 
-#: login-utils/login.c:815
+#: login-utils/login.c:823
 msgid "Sorry -- your account has expired.\n"
 msgstr ""
 
-#: login-utils/login.c:821
+#: login-utils/login.c:829
 #, c-format
-msgid "Warning: your account expires on %s %d, %d\n"
+msgid "Warning: your account expires on %d %s %d.\n"
 msgstr ""
 
-#: login-utils/login.c:1055
+#: login-utils/login.c:1066
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1062
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1065
+#: login-utils/login.c:1076
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr ""
 
-#: login-utils/login.c:1068
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr ""
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1082
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr ""
 
-#: login-utils/login.c:1083
+#: login-utils/login.c:1094
 #, c-format
 msgid "You have %smail.\n"
 msgstr ""
 
-#: login-utils/login.c:1084
+#: login-utils/login.c:1095
 msgid "new "
 msgstr ""
 
 #. error in fork()
-#: login-utils/login.c:1102
+#: login-utils/login.c:1113
 #, c-format
 msgid "login: failure forking: %s"
 msgstr ""
 
-#: login-utils/login.c:1117
+#: login-utils/login.c:1128
 msgid "setuid() failed"
 msgstr ""
 
-#: login-utils/login.c:1123
+#: login-utils/login.c:1134
 #, c-format
 msgid "No directory %s!\n"
 msgstr ""
 
-#: login-utils/login.c:1127
+#: login-utils/login.c:1138
 msgid "Logging in with home = \"/\".\n"
 msgstr ""
 
-#: login-utils/login.c:1135
+#: login-utils/login.c:1146
 msgid "login: no memory for shell script.\n"
 msgstr ""
 
-#: login-utils/login.c:1163
+#: login-utils/login.c:1174
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1166
+#: login-utils/login.c:1177
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr ""
 
-#: login-utils/login.c:1182
+#: login-utils/login.c:1191
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: login-utils/login.c:1193
+#: login-utils/login.c:1202
 msgid "login name much too long.\n"
 msgstr ""
 
-#: login-utils/login.c:1194
+#: login-utils/login.c:1203
 msgid "NAME too long"
 msgstr ""
 
-#: login-utils/login.c:1201
+#: login-utils/login.c:1210
 msgid "login names may not start with '-'.\n"
 msgstr ""
 
-#: login-utils/login.c:1211
+#: login-utils/login.c:1220
 msgid "too many bare linefeeds.\n"
 msgstr ""
 
-#: login-utils/login.c:1212
+#: login-utils/login.c:1221
 msgid "EXCESSIVE linefeeds"
 msgstr ""
 
-#: login-utils/login.c:1223
+#: login-utils/login.c:1231
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr ""
 
-#: login-utils/login.c:1323
+#: login-utils/login.c:1325
 #, c-format
 msgid "Last login: %.*s "
 msgstr ""
 
-#: login-utils/login.c:1327
+#: login-utils/login.c:1329
 #, c-format
 msgid "from %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1330
+#: login-utils/login.c:1332
 #, c-format
 msgid "on %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1353
+#: login-utils/login.c:1355
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1356
+#: login-utils/login.c:1358
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1360
+#: login-utils/login.c:1362
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1363
+#: login-utils/login.c:1365
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr ""
@@ -5450,315 +5692,319 @@ msgstr ""
 msgid "No shell"
 msgstr ""
 
-#: login-utils/passwd.c:163
+#: login-utils/passwd.c:159
 msgid "The password must have at least 6 characters, try again.\n"
 msgstr ""
 
-#: login-utils/passwd.c:176
+#: login-utils/passwd.c:172
 msgid "The password must contain characters out of two of the following\n"
 msgstr ""
 
-#: login-utils/passwd.c:177
+#: login-utils/passwd.c:173
 msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
 msgstr ""
 
-#: login-utils/passwd.c:178
+#: login-utils/passwd.c:174
 msgid "characters. See passwd(1) for more information.\n"
 msgstr ""
 
-#: login-utils/passwd.c:183
+#: login-utils/passwd.c:179
 msgid "You cannot reuse the old password.\n"
 msgstr ""
 
-#: login-utils/passwd.c:188
+#: login-utils/passwd.c:184
 msgid "Please don't use something like your username as password!\n"
 msgstr ""
 
-#: login-utils/passwd.c:199 login-utils/passwd.c:206
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
 msgid "Please don't use something like your realname as password!\n"
 msgstr ""
 
-#: login-utils/passwd.c:223
+#: login-utils/passwd.c:220
 msgid "Usage: passwd [username [password]]\n"
 msgstr ""
 
-#: login-utils/passwd.c:224
+#: login-utils/passwd.c:221
 msgid "Only root may use the one and two argument forms.\n"
 msgstr ""
 
-#: login-utils/passwd.c:280
+#: login-utils/passwd.c:275
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr ""
 
-#: login-utils/passwd.c:301
+#: login-utils/passwd.c:296
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr ""
 
-#: login-utils/passwd.c:312
+#: login-utils/passwd.c:307
 msgid "Cannot find login name"
 msgstr ""
 
-#: login-utils/passwd.c:319 login-utils/passwd.c:326
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
 msgid "Only root can change the password for others.\n"
 msgstr ""
 
-#: login-utils/passwd.c:334
+#: login-utils/passwd.c:329
 msgid "Too many arguments.\n"
 msgstr ""
 
-#: login-utils/passwd.c:339
+#: login-utils/passwd.c:334
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
 msgstr ""
 
-#: login-utils/passwd.c:343
+#: login-utils/passwd.c:338
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr ""
 
-#: login-utils/passwd.c:349
+#: login-utils/passwd.c:344
 msgid "UID and username does not match, imposter!"
 msgstr ""
 
-#: login-utils/passwd.c:354
+#: login-utils/passwd.c:349
 #, c-format
 msgid "Changing password for %s\n"
 msgstr ""
 
-#: login-utils/passwd.c:358
+#: login-utils/passwd.c:353
 msgid "Enter old password: "
 msgstr ""
 
-#: login-utils/passwd.c:360
+#: login-utils/passwd.c:355
 msgid "Illegal password, imposter."
 msgstr ""
 
-#: login-utils/passwd.c:372
+#: login-utils/passwd.c:367
 msgid "Enter new password: "
 msgstr ""
 
-#: login-utils/passwd.c:374
+#: login-utils/passwd.c:369
 msgid "Password not changed."
 msgstr ""
 
-#: login-utils/passwd.c:384
+#: login-utils/passwd.c:379
 msgid "Re-type new password: "
 msgstr ""
 
-#: login-utils/passwd.c:387
+#: login-utils/passwd.c:382
 msgid "You misspelled it. Password not changed."
 msgstr ""
 
-#: login-utils/passwd.c:402
+#: login-utils/passwd.c:397
 #, c-format
 msgid "password changed, user %s"
 msgstr ""
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:400
 msgid "ROOT PASSWORD CHANGED"
 msgstr ""
 
-#: login-utils/passwd.c:407
+#: login-utils/passwd.c:402
 #, c-format
 msgid "password changed by root, user %s"
 msgstr ""
 
-#: login-utils/passwd.c:414
+#: login-utils/passwd.c:409
 msgid "calling setpwnam to set password.\n"
 msgstr ""
 
-#: login-utils/passwd.c:418
+#: login-utils/passwd.c:413
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr ""
 
-#: login-utils/passwd.c:424
+#: login-utils/passwd.c:419
 msgid "Password changed.\n"
 msgstr ""
 
-#: login-utils/shutdown.c:85
+#: login-utils/shutdown.c:87
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 msgstr ""
 
-#: login-utils/shutdown.c:103
+#: login-utils/shutdown.c:105
 msgid "Shutdown process aborted"
 msgstr ""
 
-#: login-utils/shutdown.c:125
+#: login-utils/shutdown.c:131
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
 msgstr ""
 
-#: login-utils/shutdown.c:219
+#: login-utils/shutdown.c:225
 msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr ""
 
-#: login-utils/shutdown.c:271
+#: login-utils/shutdown.c:277
 msgid "for maintenance; bounce, bounce"
 msgstr ""
 
-#: login-utils/shutdown.c:275
+#: login-utils/shutdown.c:281
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr ""
 
-#: login-utils/shutdown.c:300
+#: login-utils/shutdown.c:306
 msgid "The system is being shut down within 5 minutes"
 msgstr ""
 
-#: login-utils/shutdown.c:304
+#: login-utils/shutdown.c:310
 msgid "Login is therefore prohibited."
 msgstr ""
 
-#: login-utils/shutdown.c:325
+#: login-utils/shutdown.c:331
 #, c-format
 msgid "%s by %s: %s"
 msgstr ""
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "rebooted"
 msgstr ""
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "halted"
 msgstr ""
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:377
+#: login-utils/shutdown.c:387
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
 
-#: login-utils/shutdown.c:379
+#: login-utils/shutdown.c:389
 msgid ""
 "\n"
 "Now you can turn off the power..."
 msgstr ""
 
-#: login-utils/shutdown.c:394
+#: login-utils/shutdown.c:404
 msgid "Calling kernel power-off facility...\n"
 msgstr ""
 
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:407
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr ""
 
-#: login-utils/shutdown.c:405
+#: login-utils/shutdown.c:415
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr ""
 
-#: login-utils/shutdown.c:408
+#: login-utils/shutdown.c:418
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr ""
 
-#: login-utils/shutdown.c:431
+#: login-utils/shutdown.c:441
 #, c-format
 msgid "URGENT: broadcast message from %s:"
 msgstr ""
 
-#: login-utils/shutdown.c:437
+#: login-utils/shutdown.c:447
 msgid "System going down IMMEDIATELY!\n"
 msgstr ""
 
-#: login-utils/shutdown.c:440
+#: login-utils/shutdown.c:450
 #, c-format
 msgid "System going down in %d hour%s %d minutes"
 msgstr ""
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
 msgid "s"
 msgstr ""
 
-#: login-utils/shutdown.c:443
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "System going down in %d minute%s\n"
 msgstr ""
 
-#: login-utils/shutdown.c:449
+#: login-utils/shutdown.c:459
 #, c-format
 msgid "\t... %s ...\n"
 msgstr ""
 
-#: login-utils/shutdown.c:506
+#: login-utils/shutdown.c:516
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr ""
 
-#: login-utils/shutdown.c:514
+#: login-utils/shutdown.c:524
 msgid "Cannot exec swapoff, hoping umount will do the trick."
 msgstr ""
 
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:543
 msgid "Cannot fork for umount, trying manually."
 msgstr ""
 
-#: login-utils/shutdown.c:542
+#: login-utils/shutdown.c:552
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr ""
 
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:556
 msgid "Cannot exec umount, giving up on umount."
 msgstr ""
 
-#: login-utils/shutdown.c:551
+#: login-utils/shutdown.c:561
 msgid "Unmounting any remaining filesystems..."
 msgstr ""
 
-#: login-utils/shutdown.c:587
+#: login-utils/shutdown.c:595
 #, c-format
-msgid "shutdown: Couldn't umount %s\n"
+msgid "shutdown: Couldn't umount %s: %s\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:79
+#: login-utils/simpleinit.c:109
 msgid "Booting to single user mode.\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:83
+#: login-utils/simpleinit.c:113
 msgid "exec of single user shell failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:87
+#: login-utils/simpleinit.c:117
 msgid "fork of single user shell failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:226
+#: login-utils/simpleinit.c:166
+msgid "error opening fifo\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:271
 msgid ""
 "\n"
 "Wrong password.\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:252
-msgid "exec rc failed\n"
-msgstr ""
-
-#: login-utils/simpleinit.c:255
-msgid "open of rc file failed\n"
+#: login-utils/simpleinit.c:341
+msgid "stat of path failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:261
-msgid "fork of rc shell failed\n"
+#: login-utils/simpleinit.c:348
+msgid "open of directory failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:273
+#: login-utils/simpleinit.c:415
 msgid "fork failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+#: login-utils/simpleinit.c:445 text-utils/more.c:1541
 msgid "exec failed\n"
 msgstr ""
 
-#: login-utils/simpleinit.c:324
+#: login-utils/simpleinit.c:469
 #, fuzzy
 msgid "cannot open inittab\n"
 msgstr "Kan schijf niet openen"
 
-#: login-utils/simpleinit.c:362
+#: login-utils/simpleinit.c:529
 msgid "no TERM or cannot stat tty\n"
 msgstr ""
 
+#: login-utils/simpleinit.c:753 login-utils/simpleinit.c:854
+msgid "error running programme\n"
+msgstr ""
+
 #: login-utils/ttymsg.c:81
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr ""
@@ -5781,37 +6027,37 @@ msgstr ""
 msgid "%s: BAD ERROR"
 msgstr ""
 
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:145
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr ""
 
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr ""
 
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:167
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr ""
 
-#: login-utils/vipw.c:193
+#: login-utils/vipw.c:188
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 
-#: login-utils/vipw.c:217
+#: login-utils/vipw.c:211
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr ""
 
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:251
 #, fuzzy, c-format
 msgid "%s: %s unchanged\n"
 msgstr "De schijfinhoud is gewijzigd.\n"
 
-#: login-utils/vipw.c:300
+#: login-utils/vipw.c:294
 #, c-format
 msgid "%s: no changes made\n"
 msgstr ""
@@ -5846,74 +6092,74 @@ msgstr ""
 msgid "%s: can't read temporary file.\n"
 msgstr ""
 
-#: misc-utils/cal.c:184
+#: misc-utils/cal.c:186
 msgid "illegal month value: use 1-12"
 msgstr ""
 
-#: misc-utils/cal.c:188
+#: misc-utils/cal.c:190
 msgid "illegal year value: use 1-9999"
 msgstr ""
 
-#: misc-utils/cal.c:484
-msgid "usage: cal [-mjy] [[month] year]\n"
+#: misc-utils/cal.c:486
+msgid "usage: cal [-mjyV] [[month] year]\n"
 msgstr ""
 
-#: misc-utils/ddate.c:184
+#: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr ""
 
 #. handle St. Tib's Day
-#: misc-utils/ddate.c:230
+#: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
 msgstr ""
 
-#: misc-utils/kill.c:199
+#: misc-utils/kill.c:210
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr ""
 
-#: misc-utils/kill.c:261
+#: misc-utils/kill.c:272
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr ""
 
-#: misc-utils/kill.c:303
+#: misc-utils/kill.c:316
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr ""
 
-#: misc-utils/kill.c:343
+#: misc-utils/kill.c:356
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr ""
 
-#: misc-utils/kill.c:344
+#: misc-utils/kill.c:357
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr ""
 
-#: misc-utils/logger.c:144
+#: misc-utils/logger.c:139
 #, c-format
 msgid "logger: %s: %s.\n"
 msgstr ""
 
-#: misc-utils/logger.c:241
+#: misc-utils/logger.c:243
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr ""
 
-#: misc-utils/logger.c:253
+#: misc-utils/logger.c:255
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr ""
 
-#: misc-utils/logger.c:280
+#: misc-utils/logger.c:282
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
 
-#: misc-utils/look.c:340
+#: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr ""
 
@@ -5927,370 +6173,351 @@ msgstr "Kan het bestand '%s' niet openen"
 msgid "Got %d bytes from %s\n"
 msgstr ""
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:100
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr ""
 
-#: misc-utils/namei.c:118
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr ""
 
-#: misc-utils/namei.c:128
+#: misc-utils/namei.c:120
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr ""
 
-#: misc-utils/namei.c:157
+#: misc-utils/namei.c:145
 msgid "namei: could not chdir to root!\n"
 msgstr ""
 
-#: misc-utils/namei.c:164
+#: misc-utils/namei.c:152
 msgid "namei: could not stat root!\n"
 msgstr ""
 
-#: misc-utils/namei.c:219
+#: misc-utils/namei.c:207
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr ""
 
-#: misc-utils/namei.c:248
+#: misc-utils/namei.c:236
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr ""
 
-#: misc-utils/namei.c:258
-msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***"
+#: misc-utils/namei.c:246
+msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr ""
 
-#: misc-utils/namei.c:294
+#: misc-utils/namei.c:283
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr ""
 
-#: misc-utils/script.c:109
-msgid "usage: script [-a] [file]\n"
-msgstr ""
+#: misc-utils/script.c:118
+#, fuzzy
+msgid "usage: script [-a] [-f] [file]\n"
+msgstr "aanroep: %s [ -n ] apparaat\n"
 
-#: misc-utils/script.c:129
+#: misc-utils/script.c:139
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:198
+#: misc-utils/script.c:205
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:269
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: misc-utils/script.c:281
+#: misc-utils/script.c:288
 msgid "openpty failed\n"
 msgstr ""
 
-#: misc-utils/script.c:315
+#: misc-utils/script.c:322
 msgid "Out of pty's\n"
 msgstr ""
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:743
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr ""
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:748
 msgid "  [ -initialize ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:749
 msgid "  [ -cursor [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:751
 msgid "  [ -snow [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:752
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:755
-msgid "  [ -keyboard pc|olivetti|dutch|extended ]\n"
-msgstr ""
-
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:754
 msgid "  [ -repeat [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:755
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:756
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:757
 msgid "  [ -default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:758
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:762 misc-utils/setterm.c:764
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:760
 msgid "  [ -background black|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:765
+#: misc-utils/setterm.c:762
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:766 misc-utils/setterm.c:768 misc-utils/setterm.c:770
-#: misc-utils/setterm.c:772
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 msgid "|red|magenta|yellow|white ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:767
+#: misc-utils/setterm.c:764
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:769
+#: misc-utils/setterm.c:766
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:771
+#: misc-utils/setterm.c:768
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr ""
 
-#: misc-utils/setterm.c:774
+#: misc-utils/setterm.c:771
 msgid "  [ -standout [ attr ] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:776
+#: misc-utils/setterm.c:773
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:777
+#: misc-utils/setterm.c:774
 msgid "  [ -bold [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:778
+#: misc-utils/setterm.c:775
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:779
+#: misc-utils/setterm.c:776
 msgid "  [ -blink [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:780
+#: misc-utils/setterm.c:777
 msgid "  [ -reverse [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:781
+#: misc-utils/setterm.c:778
 msgid "  [ -underline [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:782
+#: misc-utils/setterm.c:779
 msgid "  [ -store ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:783
+#: misc-utils/setterm.c:780
 msgid "  [ -clear [all|rest] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:784
+#: misc-utils/setterm.c:781
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:785
+#: misc-utils/setterm.c:782
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr ""
 
-#: misc-utils/setterm.c:786
+#: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:787
+#: misc-utils/setterm.c:784
 msgid "  [ -blank [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:788
+#: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:789
+#: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:790
+#: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:791
+#: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:792
+#: misc-utils/setterm.c:789
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:793
+#: misc-utils/setterm.c:790
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:794
+#: misc-utils/setterm.c:791
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:795
+#: misc-utils/setterm.c:792
 msgid "  [ -blength [0-2000] ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:796
+#: misc-utils/setterm.c:793
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr ""
 
-#: misc-utils/setterm.c:841
-msgid "keyboard.pc"
-msgstr ""
-
-#: misc-utils/setterm.c:844
-msgid "keyboard.olivetti"
-msgstr ""
-
-#: misc-utils/setterm.c:847
-msgid "keyboard.dutch"
-msgstr ""
-
-#: misc-utils/setterm.c:850
-msgid "keyboard.extended"
-msgstr ""
-
-#: misc-utils/setterm.c:884
+#: misc-utils/setterm.c:862
 msgid "snow.on"
 msgstr ""
 
-#: misc-utils/setterm.c:886
+#: misc-utils/setterm.c:864
 msgid "snow.off"
 msgstr ""
 
-#: misc-utils/setterm.c:892
+#: misc-utils/setterm.c:870
 msgid "softscroll.on"
 msgstr ""
 
-#: misc-utils/setterm.c:894
+#: misc-utils/setterm.c:872
 msgid "softscroll.off"
 msgstr ""
 
-#: misc-utils/setterm.c:1069
+#: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1108 misc-utils/setterm.c:1116
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1157
+#: misc-utils/setterm.c:1133
 #, c-format
 msgid "Error reading %s\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1172
+#: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1186
+#: misc-utils/setterm.c:1162
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr ""
 
-#: misc-utils/setterm.c:1251
+#: misc-utils/setterm.c:1227
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr ""
 
-#: misc-utils/tsort.c:119
+#: misc-utils/tsort.c:117
 msgid "usage: tsort [ inputfile ]\n"
 msgstr ""
 
-#: misc-utils/tsort.c:156
+#: misc-utils/tsort.c:154
 msgid "tsort: odd data count.\n"
 msgstr ""
 
-#: misc-utils/tsort.c:321
+#: misc-utils/tsort.c:305
 msgid "tsort: cycle in data.\n"
 msgstr ""
 
-#: misc-utils/tsort.c:334
+#: misc-utils/tsort.c:318
 msgid "tsort: internal error -- could not find cycle.\n"
 msgstr ""
 
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:155
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr ""
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:100
 msgid "write: can't find your tty's name\n"
 msgstr ""
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:111
 msgid "write: you have write permission turned off.\n"
 msgstr ""
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:132
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr ""
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:140
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr ""
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:147
 msgid "usage: write user [tty]\n"
 msgstr ""
 
-#: misc-utils/write.c:245
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr ""
 
-#: misc-utils/write.c:254
+#: misc-utils/write.c:255
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr ""
 
-#: misc-utils/write.c:258
+#: misc-utils/write.c:259
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr ""
 
-#: misc-utils/write.c:325
+#: misc-utils/write.c:323
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr ""
@@ -6312,60 +6539,68 @@ msgstr ""
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system? Filesystem full?
-#: mount/fstab.c:375
+#. Too many files open in the system?
+#. Filesystem full?
+#: mount/fstab.c:376
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:387
+#: mount/fstab.c:388
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:399
+#: mount/fstab.c:400
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
 
-#: mount/fstab.c:414
+#: mount/fstab.c:415
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:425
+#: mount/fstab.c:428
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr ""
 
-#: mount/fstab.c:427
+#: mount/fstab.c:430
 msgid "timed out"
 msgstr ""
 
-#: mount/fstab.c:472 mount/fstab.c:480
+#: mount/fstab.c:437
+#, c-format
+msgid ""
+"Cannot create link %s\n"
+"Perhaps there is a stale lock file?\n"
+msgstr ""
+
+#: mount/fstab.c:483 mount/fstab.c:491
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr ""
 
-#: mount/fstab.c:505
+#: mount/fstab.c:519
 msgid "mount: warning: cannot change mounted device with a remount\n"
 msgstr ""
 
-#: mount/fstab.c:510
+#: mount/fstab.c:524
 msgid "mount: warning: cannot change filesystem type with a remount\n"
 msgstr ""
 
-#: mount/fstab.c:518 mount/fstab.c:524
+#: mount/fstab.c:533 mount/fstab.c:539
 #, c-format
 msgid "error writing %s: %s"
 msgstr ""
 
-#: mount/fstab.c:531
+#: mount/fstab.c:546
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr ""
 
-#: mount/fstab.c:538
+#: mount/fstab.c:553
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
@@ -6380,22 +6615,22 @@ msgstr ""
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:89 mount/losetup.c:74
+#: mount/lomount.c:89
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 msgstr ""
 
-#: mount/lomount.c:143
+#: mount/lomount.c:148
 msgid "mount: could not find any device /dev/loop#"
 msgstr ""
 
-#: mount/lomount.c:147
+#: mount/lomount.c:152
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
 msgstr ""
 
-#: mount/lomount.c:151
+#: mount/lomount.c:156
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -6403,60 +6638,60 @@ msgid ""
 "       (If so, then recompile or `insmod loop.o'.)"
 msgstr ""
 
-#: mount/lomount.c:156
+#: mount/lomount.c:162
 msgid ""
 "mount: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
 "       maybe /dev/loop# has the wrong major number?"
 msgstr ""
 
-#: mount/lomount.c:160
+#: mount/lomount.c:166
 msgid "mount: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:191 mount/losetup.c:106
+#: mount/lomount.c:197
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr ""
 
-#: mount/lomount.c:210 mount/losetup.c:125
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr ""
+
+#: mount/lomount.c:231
 msgid "Init (up to 16 hex digits): "
 msgstr ""
 
-#: mount/lomount.c:217 mount/losetup.c:132
+#: mount/lomount.c:238
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr ""
 
-#: mount/lomount.c:223 mount/losetup.c:138
+#: mount/lomount.c:245
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
 msgstr ""
 
-#: mount/lomount.c:239
+#: mount/lomount.c:261
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr ""
 
-#: mount/lomount.c:250
+#: mount/lomount.c:272
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:260
+#: mount/lomount.c:282
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:268
+#: mount/lomount.c:290
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/losetup.c:70
-msgid "Cannot get loop info"
-msgstr ""
-
-#: mount/losetup.c:174
+#: mount/lomount.c:327
 #, c-format
 msgid ""
 "usage:\n"
@@ -6465,7 +6700,11 @@ msgid ""
 "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
 
-#: mount/losetup.c:231
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr ""
+
+#: mount/lomount.c:416
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
 
@@ -6483,410 +6722,468 @@ msgstr ""
 msgid "; rest of file ignored"
 msgstr ""
 
-#: mount/mount.c:333
+#: mount/mount.c:351
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
 msgstr ""
 
-#: mount/mount.c:336
+#: mount/mount.c:354
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
 msgstr ""
 
-#: mount/mount.c:357
+#: mount/mount.c:375
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr ""
 
-#: mount/mount.c:372 mount/mount.c:644
+#: mount/mount.c:390 mount/mount.c:593
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr ""
 
-#: mount/mount.c:379
+#: mount/mount.c:397
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr ""
 
-#: mount/mount.c:473
+#: mount/mount.c:442
+#, c-format
+msgid "%s looks like swapspace - not mounted"
+msgstr ""
+
+#: mount/mount.c:485
 msgid "mount failed"
 msgstr ""
 
-#: mount/mount.c:475
+#: mount/mount.c:487
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr ""
 
-#: mount/mount.c:503
+#: mount/mount.c:515
 msgid "mount: loop device specified twice"
 msgstr ""
 
-#: mount/mount.c:509
+#: mount/mount.c:520
 msgid "mount: type specified twice"
 msgstr ""
 
-#: mount/mount.c:521
+#: mount/mount.c:532
 msgid "mount: skipping the setup of a loop device\n"
 msgstr ""
 
-#: mount/mount.c:530
+#: mount/mount.c:541
 #, c-format
 msgid "mount: going to use the loop device %s\n"
 msgstr ""
 
-#: mount/mount.c:534
+#: mount/mount.c:545
 msgid "mount: failed setting up loop device\n"
 msgstr ""
 
-#: mount/mount.c:538
+#: mount/mount.c:549
 msgid "mount: setup loop device successfully\n"
 msgstr ""
 
-#: mount/mount.c:551
-msgid "mount: this version was compiled without support for the type `nfs'"
+#: mount/mount.c:588
+#, c-format
+msgid "mount: can't open %s: %s"
 msgstr ""
 
-#: mount/mount.c:601 mount/mount.c:1026
+#: mount/mount.c:611
 #, c-format
-msgid "mount: cannot fork: %s"
+msgid "mount: cannot not open %s for setting speed"
 msgstr ""
 
-#: mount/mount.c:639
+#: mount/mount.c:614
+#, fuzzy, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: mount/mount.c:675 mount/mount.c:1202
 #, c-format
-msgid "mount: can't open %s: %s"
+msgid "mount: cannot fork: %s"
+msgstr ""
+
+#: mount/mount.c:749
+msgid "mount: this version was compiled without support for the type `nfs'"
 msgstr ""
 
-#: mount/mount.c:667
+#: mount/mount.c:789
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
+msgstr ""
+
+#: mount/mount.c:800
+msgid ""
+"mount: I could not determine the filesystem type, and none was specified"
+msgstr ""
+
+#: mount/mount.c:803
 msgid "mount: you must specify the filesystem type"
 msgstr ""
 
-#: mount/mount.c:674 mount/mount.c:709
+#. should not happen
+#: mount/mount.c:806
+msgid "mount: mount failed"
+msgstr ""
+
+#: mount/mount.c:812 mount/mount.c:847
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr ""
 
-#: mount/mount.c:676
+#: mount/mount.c:814
 msgid "mount: permission denied"
 msgstr ""
 
-#: mount/mount.c:678
+#: mount/mount.c:816
 msgid "mount: must be superuser to use mount"
 msgstr ""
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:682 mount/mount.c:686
+#: mount/mount.c:820 mount/mount.c:824
 #, c-format
 msgid "mount: %s is busy"
 msgstr ""
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:688
+#: mount/mount.c:826
 msgid "mount: proc already mounted"
 msgstr ""
 
-#: mount/mount.c:690
+#: mount/mount.c:828
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr ""
 
-#: mount/mount.c:696
+#: mount/mount.c:834
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr ""
 
-#: mount/mount.c:698
+#: mount/mount.c:836
 #, c-format
 msgid "mount: mount point %s is a symbolic link to nowhere"
 msgstr ""
 
-#: mount/mount.c:701
+#: mount/mount.c:839
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr ""
 
-#: mount/mount.c:711
+#: mount/mount.c:849
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
 
-#: mount/mount.c:723
+#: mount/mount.c:862
 #, c-format
 msgid "mount: %s not mounted already, or bad option"
 msgstr ""
 
-#: mount/mount.c:725
+#: mount/mount.c:864
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
 
-#: mount/mount.c:740
+#: mount/mount.c:898
 msgid "mount table full"
 msgstr ""
 
-#: mount/mount.c:742
+#: mount/mount.c:900
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr ""
 
-#: mount/mount.c:745
+#: mount/mount.c:904
 #, c-format
-msgid "mount: %s has wrong major or minor number"
+msgid "mount: %s: unknown device"
 msgstr ""
 
-#: mount/mount.c:750
+#: mount/mount.c:909
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr ""
 
-#: mount/mount.c:762
+#: mount/mount.c:921
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr ""
 
-#: mount/mount.c:764
+#: mount/mount.c:923
 msgid "mount: maybe you meant iso9660 ?"
 msgstr ""
 
-#: mount/mount.c:767
+#: mount/mount.c:926
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
 
 #. strange ...
-#: mount/mount.c:772
+#: mount/mount.c:932
 #, c-format
 msgid "mount: %s is not a block device, and stat fails?"
 msgstr ""
 
-#: mount/mount.c:774
+#: mount/mount.c:934
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
 
-#: mount/mount.c:777
+#: mount/mount.c:937
 #, c-format
 msgid "mount: %s is not a block device (maybe try `-o loop'?)"
 msgstr ""
 
-#: mount/mount.c:780
+#: mount/mount.c:940
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr ""
 
-#: mount/mount.c:783
+#: mount/mount.c:943
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr ""
 
-#: mount/mount.c:787
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:946
+msgid "block device "
+msgstr ""
+
+#: mount/mount.c:948
 #, c-format
-msgid "mount: block device %s is not permitted on its filesystem"
+msgid "mount: cannot mount %s%s read-only"
 msgstr ""
 
-#: mount/mount.c:803
+#: mount/mount.c:952
 #, c-format
-msgid "mount: %s%s is write-protected, mounting read-only"
+msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
 
-#: mount/mount.c:804
-msgid "block device "
+#: mount/mount.c:968
+#, c-format
+msgid "mount: %s%s is write-protected, mounting read-only"
 msgstr ""
 
-#: mount/mount.c:890
+#: mount/mount.c:1057
 #, c-format
-msgid "mount: consider mounting %s by %s\n"
+msgid "mount: going to mount %s by %s\n"
 msgstr ""
 
-#: mount/mount.c:891
+#: mount/mount.c:1058
 msgid "UUID"
 msgstr ""
 
-#: mount/mount.c:891
+#: mount/mount.c:1058
 #, fuzzy
 msgid "label"
 msgstr "Tabel"
 
-#: mount/mount.c:893 mount/mount.c:1209
+#: mount/mount.c:1060 mount/mount.c:1430
 msgid "mount: no such partition found"
 msgstr ""
 
-#: mount/mount.c:901
+#: mount/mount.c:1068
 msgid "mount: no type was given - I'll assume nfs because of the colon\n"
 msgstr ""
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:917
+#: mount/mount.c:1084
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:928
+#: mount/mount.c:1095
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr ""
 
-#: mount/mount.c:977
+#: mount/mount.c:1153
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr ""
 
-#: mount/mount.c:1088
-msgid ""
-"Usage: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       A special device can be indicated by  -L label  or  -U uuid .\n"
-msgstr ""
-
-#: mount/mount.c:1194
+#: mount/mount.c:1270
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+
+#: mount/mount.c:1414
 msgid "mount: only root can do that"
 msgstr ""
 
-#: mount/mount.c:1199
+#: mount/mount.c:1419
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr ""
 
-#: mount/mount.c:1211
+#: mount/mount.c:1432
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr ""
 
-#: mount/mount.c:1220
+#: mount/mount.c:1441
 msgid "not mounted anything"
 msgstr ""
 
-#: mount/mount.c:1233
+#: mount/mount.c:1456
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr ""
 
-#: mount/mount.c:1247
+#: mount/mount.c:1471
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr ""
 
-#: mount/mount_by_label.c:141
+#: mount/mount_by_label.c:99
+#, c-format
+msgid ""
+"mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr ""
+
+#: mount/mount_by_label.c:201
 msgid "mount: bad UUID"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:195
+#: mount/mount_guess_fstype.c:257
 #, c-format
 msgid "mount: you didn't specify a filesystem type for %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:198
+#: mount/mount_guess_fstype.c:260
+#, c-format
+msgid "       I will try all types mentioned in %s or %s\n"
+msgstr ""
+
+#: mount/mount_guess_fstype.c:263
+msgid "       and it looks like this is swapspace\n"
+msgstr ""
+
+#: mount/mount_guess_fstype.c:265
 #, c-format
 msgid "       I will try type %s\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:200
+#: mount/mount_guess_fstype.c:329
 #, c-format
-msgid "       I will try all types mentioned in %s or %s\n"
+msgid "Trying %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:157
+#: mount/nfsmount.c:225
 msgid "mount: excessively long host:dir argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:170
+#: mount/nfsmount.c:238
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr ""
 
-#: mount/nfsmount.c:174
+#: mount/nfsmount.c:242
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr ""
 
-#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#: mount/nfsmount.c:253 mount/nfsmount.c:510
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr ""
 
-#: mount/nfsmount.c:191
+#: mount/nfsmount.c:259
 msgid "mount: got bad hp->h_length\n"
 msgstr ""
 
-#: mount/nfsmount.c:208
+#: mount/nfsmount.c:276
 msgid "mount: excessively long option argument\n"
 msgstr ""
 
-#: mount/nfsmount.c:299
+#: mount/nfsmount.c:368
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr ""
 
-#: mount/nfsmount.c:306
+#: mount/nfsmount.c:375
 msgid "Warning: Option namlen is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:310
+#: mount/nfsmount.c:379
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr ""
 
-#: mount/nfsmount.c:345
+#: mount/nfsmount.c:414
 msgid "Warning: option nolock is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:348
+#: mount/nfsmount.c:419
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr ""
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:516
 msgid "mount: got bad hp->h_length?\n"
 msgstr ""
 
-#: mount/nfsmount.c:528
-#, c-format
-msgid "mount: %s:%s failed, reason given by server: %s\n"
-msgstr ""
-
-#: mount/nfsmount.c:539
+#: mount/nfsmount.c:692
 msgid "NFS over TCP is not supported.\n"
 msgstr ""
 
-#: mount/nfsmount.c:546
+#: mount/nfsmount.c:699
 msgid "nfs socket"
 msgstr ""
 
-#: mount/nfsmount.c:550
+#: mount/nfsmount.c:703
 msgid "nfs bindresvport"
 msgstr ""
 
-#: mount/nfsmount.c:561
+#: mount/nfsmount.c:714
 msgid "used portmapper to find NFS port\n"
 msgstr ""
 
-#: mount/nfsmount.c:565
+#: mount/nfsmount.c:718
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr ""
 
-#: mount/nfsmount.c:576
+#: mount/nfsmount.c:729
 msgid "nfs connect"
 msgstr ""
 
-#: mount/nfsmount.c:665
+#: mount/nfsmount.c:816
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr ""
 
-#: mount/sundries.c:40 mount/sundries.c:55
-msgid "not enough memory"
-msgstr ""
-
-#: mount/sundries.c:65
+#: mount/sundries.c:66
 msgid "bug in xstrndup call"
 msgstr ""
 
@@ -6924,141 +7221,141 @@ msgstr ""
 msgid "%s: cannot open %s: %s\n"
 msgstr "Kan het bestand '%s' niet openen"
 
-#: mount/umount.c:65
+#: mount/umount.c:69
 msgid "umount: compiled without support for -f\n"
 msgstr ""
 
-#: mount/umount.c:115
+#: mount/umount.c:121
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr ""
 
-#: mount/umount.c:132
+#: mount/umount.c:138
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr ""
 
-#: mount/umount.c:137
+#: mount/umount.c:143
 msgid "umount: got bad hostp->h_length\n"
 msgstr ""
 
-#: mount/umount.c:175
+#: mount/umount.c:181
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr ""
 
-#: mount/umount.c:177
+#: mount/umount.c:183
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr ""
 
-#: mount/umount.c:179
+#: mount/umount.c:185
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr ""
 
 #. Let us hope fstab has a line "proc /proc ..."
 #. and not "none /proc ..."
-#: mount/umount.c:183
+#: mount/umount.c:189
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr ""
 
-#: mount/umount.c:185
+#: mount/umount.c:191
 #, c-format
 msgid "umount: %s: not found"
 msgstr ""
 
-#: mount/umount.c:187
+#: mount/umount.c:193
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr ""
 
-#: mount/umount.c:189
+#: mount/umount.c:195
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
 
-#: mount/umount.c:191
+#: mount/umount.c:197
 #, c-format
 msgid "umount: %s: %s"
 msgstr ""
 
-#: mount/umount.c:235
+#: mount/umount.c:241
 msgid "no umount2, trying umount...\n"
 msgstr ""
 
-#: mount/umount.c:248
+#: mount/umount.c:254
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr ""
 
-#: mount/umount.c:264
+#: mount/umount.c:272
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr ""
 
-#: mount/umount.c:272
+#: mount/umount.c:282
 #, c-format
 msgid "umount: could not remount %s read-only\n"
 msgstr ""
 
-#: mount/umount.c:280
+#: mount/umount.c:290
 #, c-format
 msgid "%s umounted\n"
 msgstr ""
 
-#: mount/umount.c:363
+#: mount/umount.c:374
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr ""
 
-#: mount/umount.c:392
+#: mount/umount.c:403
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
 
-#: mount/umount.c:453
+#: mount/umount.c:464
 msgid "umount: only root can do that"
 msgstr ""
 
-#: mount/umount.c:468
+#: mount/umount.c:479
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr ""
 
-#: mount/umount.c:472
+#: mount/umount.c:483
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr ""
 
-#: mount/umount.c:476
+#: mount/umount.c:487
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr ""
 
-#: mount/umount.c:478
+#: mount/umount.c:489
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr ""
 
-#: mount/umount.c:490
+#: mount/umount.c:501
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr ""
 
-#: mount/umount.c:493
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr ""
 
-#: mount/umount.c:514
+#: mount/umount.c:525
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:536
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr ""
@@ -7071,14 +7368,14 @@ msgstr ""
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr ""
 
-#: sys-utils/cytune.c:118
+#: sys-utils/cytune.c:120
 #, c-format
 msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
 
-#: sys-utils/cytune.c:129
+#: sys-utils/cytune.c:131
 #, c-format
 msgid ""
 "File %s, For threshold value %lu and timrout value %lu, Maximum characters "
@@ -7201,63 +7498,73 @@ msgstr ""
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:37
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:46
+#: sys-utils/ipcrm.c:59
+#, c-format
+msgid "invalid id: %s\n"
+msgstr ""
+
+#: sys-utils/ipcrm.c:77
+#, fuzzy, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "Kan het bestand '%s' niet openen"
+
+#: sys-utils/ipcrm.c:91
 #, c-format
-msgid "usage: %s [shm | msg | sem] id\n"
+msgid "usage: %s {shm | msg | sem} id ...\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:70
+#: sys-utils/ipcrm.c:124
 #, c-format
-msgid "usage: %s [-shm | -msg | -sem] id\n"
+msgid "unknown resource type: %s\n"
 msgstr ""
 
-#: sys-utils/ipcrm.c:73
-msgid "resource deleted\n"
+#: sys-utils/ipcrm.c:128
+msgid "resource(s) deleted\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:91
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
 msgstr ""
 
-#: sys-utils/ipcs.c:92
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:93
+#: sys-utils/ipcs.c:124
 #, c-format
 msgid "\t%s -h for help.\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:99
+#: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
 msgstr ""
 
-#: sys-utils/ipcs.c:100
+#: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:101
+#: sys-utils/ipcs.c:132
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
 "\t-q : messages\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:102
+#: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:103
+#: sys-utils/ipcs.c:134
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
@@ -7265,553 +7572,553 @@ msgid ""
 "\t-c : creator\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:104
+#: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:105
+#: sys-utils/ipcs.c:136
 msgid "-i id [-s -q -m] : details on resource identified by id\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:237 sys-utils/ipcs.c:439
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
 msgid "kernel not configured for shared memory\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:243
+#: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:246
+#: sys-utils/ipcs.c:277
 #, c-format
 msgid "max number of segments = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:247
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max seg size (kbytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:248
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max total shared memory (kbytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:249
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "min seg size (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:253
+#: sys-utils/ipcs.c:284
 msgid "------ Shared Memory Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:254
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "segments allocated %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:255
+#: sys-utils/ipcs.c:286
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:256
+#: sys-utils/ipcs.c:287
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:257
+#: sys-utils/ipcs.c:288
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:258
+#: sys-utils/ipcs.c:289
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:263
+#: sys-utils/ipcs.c:294
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:264 sys-utils/ipcs.c:370 sys-utils/ipcs.c:462
+#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:271 sys-utils/ipcs.c:276
-#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:302 sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:408
 msgid "shmid"
 msgstr ""
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:282 sys-utils/ipcs.c:371
-#: sys-utils/ipcs.c:386 sys-utils/ipcs.c:463 sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:494 sys-utils/ipcs.c:511
 msgid "perms"
 msgstr ""
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cuid"
 msgstr ""
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cgid"
 msgstr ""
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:371 sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "uid"
 msgstr ""
 
-#: sys-utils/ipcs.c:265 sys-utils/ipcs.c:463
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
 msgid "gid"
 msgstr ""
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:270
+#: sys-utils/ipcs.c:301
 #, c-format
 msgid "%-10s%-10s  %-20s%-20s%-20s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:271 sys-utils/ipcs.c:276 sys-utils/ipcs.c:282
-#: sys-utils/ipcs.c:377 sys-utils/ipcs.c:386 sys-utils/ipcs.c:469
-#: sys-utils/ipcs.c:474 sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:307 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:417 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505 sys-utils/ipcs.c:511
 msgid "owner"
 msgstr ""
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:302
 msgid "attached"
 msgstr ""
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:302
 msgid "detached"
 msgstr ""
 
-#: sys-utils/ipcs.c:271
+#: sys-utils/ipcs.c:302
 msgid "changed"
 msgstr ""
 
-#: sys-utils/ipcs.c:275
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:276 sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:307
 msgid "cpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:276
+#: sys-utils/ipcs.c:307
 msgid "lpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:311
 msgid "------ Shared Memory Segments --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:312
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:281 sys-utils/ipcs.c:386 sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
 msgid "key"
 msgstr ""
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:313
 msgid "bytes"
 msgstr ""
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:313
 msgid "nattch"
 msgstr ""
 
-#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
 msgid "status"
 msgstr ""
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:303 sys-utils/ipcs.c:304
-#: sys-utils/ipcs.c:407 sys-utils/ipcs.c:408 sys-utils/ipcs.c:500
-#: sys-utils/ipcs.c:501 sys-utils/ipcs.c:502
+#: sys-utils/ipcs.c:333 sys-utils/ipcs.c:334 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:438 sys-utils/ipcs.c:439 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:533
 msgid "Not set"
 msgstr ""
 
-#: sys-utils/ipcs.c:324
+#: sys-utils/ipcs.c:355
 msgid "dest"
 msgstr ""
 
-#: sys-utils/ipcs.c:325
+#: sys-utils/ipcs.c:356
 msgid "locked"
 msgstr ""
 
-#: sys-utils/ipcs.c:345
+#: sys-utils/ipcs.c:376
 msgid "kernel not configured for semaphores\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:382
 msgid "------ Semaphore Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:355
+#: sys-utils/ipcs.c:386
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:356
+#: sys-utils/ipcs.c:387
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:357
+#: sys-utils/ipcs.c:388
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:358
+#: sys-utils/ipcs.c:389
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:359
+#: sys-utils/ipcs.c:390
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:363
+#: sys-utils/ipcs.c:394
 msgid "------ Semaphore Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:364
+#: sys-utils/ipcs.c:395
 #, c-format
 msgid "used arrays = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:365
+#: sys-utils/ipcs.c:396
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:369
+#: sys-utils/ipcs.c:400
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:371 sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
 msgid "semid"
 msgstr ""
 
-#: sys-utils/ipcs.c:375
+#: sys-utils/ipcs.c:406
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:376
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:408
 msgid "last-op"
 msgstr ""
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:408
 msgid "last-changed"
 msgstr ""
 
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:415
 msgid "------ Semaphore Arrays --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:417
 msgid "nsems"
 msgstr ""
 
-#: sys-utils/ipcs.c:447
+#: sys-utils/ipcs.c:478
 msgid "------ Messages: Limits --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:448
+#: sys-utils/ipcs.c:479
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:449
+#: sys-utils/ipcs.c:480
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:450
+#: sys-utils/ipcs.c:481
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:454
+#: sys-utils/ipcs.c:485
 msgid "------ Messages: Status --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:455
+#: sys-utils/ipcs.c:486
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:456
+#: sys-utils/ipcs.c:487
 #, c-format
 msgid "used headers = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:457
+#: sys-utils/ipcs.c:488
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:461
+#: sys-utils/ipcs.c:492
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:463 sys-utils/ipcs.c:469 sys-utils/ipcs.c:474
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 msgid "msqid"
 msgstr ""
 
-#: sys-utils/ipcs.c:467
+#: sys-utils/ipcs.c:498
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:468
+#: sys-utils/ipcs.c:499
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:469
+#: sys-utils/ipcs.c:500
 msgid "send"
 msgstr ""
 
-#: sys-utils/ipcs.c:469
+#: sys-utils/ipcs.c:500
 msgid "recv"
 msgstr ""
 
-#: sys-utils/ipcs.c:469
+#: sys-utils/ipcs.c:500
 msgid "change"
 msgstr ""
 
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:504
 msgid "------ Message Queues PIDs --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:505
 msgid "lspid"
 msgstr ""
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:505
 msgid "lrpid"
 msgstr ""
 
-#: sys-utils/ipcs.c:478
+#: sys-utils/ipcs.c:509
 msgid "------ Message Queues --------\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:511
 msgid "used-bytes"
 msgstr ""
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:511
 msgid "messages"
 msgstr ""
 
-#: sys-utils/ipcs.c:539
+#: sys-utils/ipcs.c:570
 #, c-format
 msgid ""
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:540
+#: sys-utils/ipcs.c:571
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:542
+#: sys-utils/ipcs.c:573
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:543
+#: sys-utils/ipcs.c:574
 #, c-format
 msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:546
+#: sys-utils/ipcs.c:577
 #, c-format
 msgid "att_time=%s"
 msgstr ""
 
-#: sys-utils/ipcs.c:547 sys-utils/ipcs.c:549 sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
 msgid "Not set\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:548
+#: sys-utils/ipcs.c:579
 #, c-format
 msgid "det_time=%s"
 msgstr ""
 
-#: sys-utils/ipcs.c:550
+#: sys-utils/ipcs.c:581
 #, c-format
 msgid "change_time=%s"
 msgstr ""
 
-#: sys-utils/ipcs.c:566
+#: sys-utils/ipcs.c:597
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:567
+#: sys-utils/ipcs.c:598
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:569
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "send_time=%srcv_time=%schange_time=%s"
 msgstr ""
 
-#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:574 sys-utils/ipcs.c:575
+#: sys-utils/ipcs.c:604 sys-utils/ipcs.c:605 sys-utils/ipcs.c:606
 msgid "Not Set\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:623
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:624
 #, c-format
 msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:595
+#: sys-utils/ipcs.c:626
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "nsems = %d\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:597
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "otime = %s"
 msgstr ""
 
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:630
 #, c-format
 msgid "ctime = %s"
 msgstr ""
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:632
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr ""
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:632
 msgid "semnum"
 msgstr ""
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:632
 #, fuzzy
 msgid "value"
 msgstr "Tabel"
 
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:632
 msgid "ncount"
 msgstr ""
 
-#: sys-utils/ipcs.c:602
+#: sys-utils/ipcs.c:633
 msgid "zcount"
 msgstr ""
 
-#: sys-utils/ipcs.c:602
+#: sys-utils/ipcs.c:633
 msgid "pid"
 msgstr ""
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:67
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr ""
 
-#: sys-utils/rdev.c:69
+#: sys-utils/rdev.c:68
 msgid ""
 "  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
 msgstr ""
 
-#: sys-utils/rdev.c:70
+#: sys-utils/rdev.c:69
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
 msgstr ""
 
-#: sys-utils/rdev.c:71
+#: sys-utils/rdev.c:70
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr ""
 
-#: sys-utils/rdev.c:72
+#: sys-utils/rdev.c:71
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
 msgstr ""
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:72
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
 msgstr ""
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:73
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr ""
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:74
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr ""
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:75
 msgid "  rootflags ...                   same as rdev -R"
 msgstr ""
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:76
 msgid "  swapdev ...                     same as rdev -s"
 msgstr ""
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr ""
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
 msgstr ""
 
-#: sys-utils/rdev.c:80
+#: sys-utils/rdev.c:79
 msgid ""
 "Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."
 msgstr ""
 
-#: sys-utils/rdev.c:81
+#: sys-utils/rdev.c:80
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr ""
 
@@ -7902,77 +8209,78 @@ msgstr ""
 msgid "malloc error"
 msgstr ""
 
-#: sys-utils/tunelp.c:101
-msgid "sscanf error"
-msgstr ""
+#: sys-utils/tunelp.c:102
+#, fuzzy, c-format
+msgid "%s: bad value\n"
+msgstr "%ld slechte blokken\n"
 
-#: sys-utils/tunelp.c:239
+#: sys-utils/tunelp.c:241
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr ""
 
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:262
 #, c-format
 msgid "%s status is %d"
 msgstr ""
 
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:263
 msgid ", busy"
 msgstr ""
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:264
 msgid ", ready"
 msgstr ""
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:265
 msgid ", out of paper"
 msgstr ""
 
-#: sys-utils/tunelp.c:264
+#: sys-utils/tunelp.c:266
 msgid ", on-line"
 msgstr ""
 
-#: sys-utils/tunelp.c:265
+#: sys-utils/tunelp.c:267
 msgid ", error"
 msgstr ""
 
-#: sys-utils/tunelp.c:282
+#: sys-utils/tunelp.c:284
 msgid "LPGETIRQ error"
 msgstr ""
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:290
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr ""
 
-#: sys-utils/tunelp.c:290
+#: sys-utils/tunelp.c:292
 #, c-format
 msgid "%s using polling\n"
 msgstr ""
 
-#: text-utils/col.c:153
+#: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr ""
 
-#: text-utils/col.c:516
-msgid "usage: col [-bfx] [-l nline]\n"
+#: text-utils/col.c:521
+msgid "usage: col [-bfpx] [-l nline]\n"
 msgstr ""
 
-#: text-utils/col.c:522
+#: text-utils/col.c:527
 msgid "col: write error.\n"
 msgstr ""
 
-#: text-utils/col.c:529
+#: text-utils/col.c:534
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr ""
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "past first line"
 msgstr ""
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "-- line already flushed"
 msgstr ""
 
@@ -7981,11 +8289,11 @@ msgstr ""
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr ""
 
-#: text-utils/column.c:302
+#: text-utils/column.c:300
 msgid "line too long"
 msgstr ""
 
-#: text-utils/column.c:379
+#: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
 msgstr ""
 
@@ -8002,12 +8310,12 @@ msgid ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
 
-#: text-utils/more.c:329
+#: text-utils/more.c:330
 #, c-format
 msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
 
-#: text-utils/more.c:504
+#: text-utils/more.c:505
 #, c-format
 msgid ""
 "\n"
@@ -8016,7 +8324,7 @@ msgid ""
 msgstr ""
 
 #. simple ELF detection
-#: text-utils/more.c:543
+#: text-utils/more.c:544
 #, c-format
 msgid ""
 "\n"
@@ -8028,105 +8336,105 @@ msgstr ""
 msgid "[Use q or Q to quit]"
 msgstr ""
 
-#: text-utils/more.c:833
+#: text-utils/more.c:826
 msgid "--More--"
 msgstr ""
 
-#: text-utils/more.c:835
+#: text-utils/more.c:828
 #, c-format
 msgid "(Next file: %s)"
 msgstr ""
 
-#: text-utils/more.c:841
+#: text-utils/more.c:834
 #, fuzzy
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "Sla een toets aan om verder te gaan"
 
-#: text-utils/more.c:1139
+#: text-utils/more.c:1132
 #, c-format
 msgid "...back %d page"
 msgstr ""
 
-#: text-utils/more.c:1185
+#: text-utils/more.c:1178
 #, c-format
 msgid "...skipping %d line"
 msgstr ""
 
-#: text-utils/more.c:1226
+#: text-utils/more.c:1219
 msgid ""
 "\n"
 "***Back***\n"
 "\n"
 msgstr ""
 
-#: text-utils/more.c:1264
+#: text-utils/more.c:1257
 #, fuzzy
 msgid "Can't open help file"
 msgstr "Kan het bestand '%s' niet openen"
 
-#: text-utils/more.c:1285 text-utils/more.c:1289
+#: text-utils/more.c:1278 text-utils/more.c:1282
 msgid "[Press 'h' for instructions.]"
 msgstr ""
 
-#: text-utils/more.c:1324
+#: text-utils/more.c:1316
 #, c-format
 msgid "\"%s\" line %d"
 msgstr ""
 
-#: text-utils/more.c:1326
+#: text-utils/more.c:1318
 #, c-format
 msgid "[Not a file] line %d"
 msgstr ""
 
-#: text-utils/more.c:1410
+#: text-utils/more.c:1402
 msgid "  Overflow\n"
 msgstr ""
 
-#: text-utils/more.c:1457
+#: text-utils/more.c:1449
 msgid "...skipping\n"
 msgstr ""
 
-#: text-utils/more.c:1487
+#: text-utils/more.c:1479
 msgid "Regular expression botch"
 msgstr ""
 
-#: text-utils/more.c:1499
+#: text-utils/more.c:1491
 msgid ""
 "\n"
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1502
+#: text-utils/more.c:1494
 msgid "Pattern not found"
 msgstr ""
 
-#: text-utils/more.c:1563
+#: text-utils/more.c:1555
 msgid "can't fork\n"
 msgstr ""
 
-#: text-utils/more.c:1602
+#: text-utils/more.c:1594
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1606
+#: text-utils/more.c:1598
 msgid "...Skipping "
 msgstr ""
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "to file "
 msgstr ""
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1599
 msgid "back to file "
 msgstr ""
 
-#: text-utils/more.c:1846
+#: text-utils/more.c:1835
 msgid "Line too long"
 msgstr ""
 
-#: text-utils/more.c:1890
+#: text-utils/more.c:1878
 msgid "No previous command to substitute for"
 msgstr ""
 
@@ -8162,6 +8470,7 @@ msgid "hexdump: bad byte count for conversion character %s.\n"
 msgstr ""
 
 #: text-utils/parse.c:497
+#, ycp-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
 msgstr ""
 
@@ -8174,11 +8483,11 @@ msgstr ""
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr ""
 
-#: text-utils/rev.c:114
+#: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
 msgstr ""
 
-#: text-utils/rev.c:173
+#: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
 msgstr ""
 
@@ -8200,20 +8509,24 @@ msgstr ""
 msgid "Unable to allocate buffer.\n"
 msgstr ""
 
-#: text-utils/ul.c:555
+#: text-utils/ul.c:553
 msgid "Input line too long.\n"
 msgstr ""
 
-#: text-utils/ul.c:568
+#: text-utils/ul.c:566
 msgid "Out of memory when growing buffer.\n"
 msgstr ""
 
-#: kbd/kbdrate.c:139 kbd/kbdrate.c:271
+#: kbd/kbdrate.c:138 kbd/kbdrate.c:276
 #, c-format
 msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
 msgstr ""
 
-#: kbd/kbdrate.c:247
+#: kbd/kbdrate.c:222
+msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
+msgstr ""
+
+#: kbd/kbdrate.c:252
 #, fuzzy
 msgid "Cannot open /dev/port"
 msgstr "Kan schijf niet openen"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5bbee86ef3..bcd4f86240 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,96 +1,104 @@
 # Portuguese translation of the util-linux messages.
 # Copyright (C) 2000 Free Software Foundation, Inc.
+# Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1999-2000
+# Ricardo Stefani <ricardos@francanet.com.br>, 1999
+# Marcus Moreira <marcusms@frb.br>
+# Paulo Henrique R Pinheiro <nulo@sul.com.br>
 # <support@turbolinux.com>, 2000.
-msgid ""
-msgstr ""
-"Project-Id-Version: util-linux 2.10f\n"
-"POT-Creation-Date: 2000-03-21 14:47-0800\n"
-"PO-Revision-Date: 2000-03-30 18:00-0300\n"
-"Last-Translator: Alvaro Antunes <alvaro@netpar.com.br>\n"
-"Language-Team: <support@turbolinux.com>\n"
+# Alvaro Antunes <alvaro@netpar.com.br>, 2000
+# Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2000
+#
+# Free redistribution is permitted.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: util-linux 2.10o\n"
+"POT-Creation-Date: 2000-10-20 01:22+0200\n"
+"PO-Revision-Date: 2000-10-27 14:53+02:00\n"
+"Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
+"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:146
+#: clock/cmos.c:157
 msgid "booted from MILO\n"
 msgstr "boot executado do MILO\n"
 
-#: clock/cmos.c:155
+#: clock/cmos.c:166
 msgid "Ruffian BCD clock\n"
 msgstr "Rel�gio BCD Ruffian\n"
 
-#: clock/cmos.c:171
+#: clock/cmos.c:182
 #, c-format
 msgid "clockport adjusted to 0x%x\n"
 msgstr "porta do rel�gio ajustada para 0x%x\n"
 
-#: clock/cmos.c:181
+#: clock/cmos.c:192
 msgid "funky TOY!\n"
 msgstr "funky TOY!\n"
 
-#: clock/cmos.c:235
+#: clock/cmos.c:246
 #, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
 msgstr "%s: %s at�mico falhou por 1000 itera��es!"
 
-#: clock/cmos.c:559
+#: clock/cmos.c:570
 #, c-format
 msgid "Cannot open /dev/port: %s"
 msgstr "N�o � poss�vel abrir /dev/port: %s"
 
-#: clock/cmos.c:566
+#: clock/cmos.c:577
 msgid "I failed to get permission because I didnt try.\n"
 msgstr "N�o consegui obter permiss�o porque n�o tentei.\n"
 
-#: clock/cmos.c:569
+#: clock/cmos.c:580
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
-msgstr ""
-"%s � incapaz de obter acesso � porta de E/S: a chamada iopl(3) falhou.\n"
+msgstr "%s � incapaz de obter acesso � porta de E/S: a chamada iopl(3) falhou.\n"
 
-#: clock/cmos.c:572
+#: clock/cmos.c:583
 msgid "Probably you need root privileges.\n"
 msgstr "Provavelmente s�o necess�rios privil�gios de root.\n"
 
-#: clock/hwclock.c:213
+#: clock/hwclock.c:219
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "Pressupondo que o rel�gio de hardware � mantido na hora %s.\n"
 
-#: clock/hwclock.c:214 clock/hwclock.c:303
+#: clock/hwclock.c:220 clock/hwclock.c:309
 msgid "UTC"
 msgstr "UTC"
 
-#: clock/hwclock.c:214 clock/hwclock.c:302
+#: clock/hwclock.c:220 clock/hwclock.c:308
 msgid "local"
 msgstr "local"
 
-#: clock/hwclock.c:286
+#: clock/hwclock.c:292
 #, c-format
 msgid "%s: Warning: unrecognized third line in adjtime file\n"
 msgstr "%s: Aviso: a terceira linha do arquivo adjtime n�o foi reconhecida\n"
 
-#: clock/hwclock.c:288
+#: clock/hwclock.c:294
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
 msgstr "(Esperado: `UTC', `LOCAL'  ou nada.)\n"
 
-#: clock/hwclock.c:297
+#: clock/hwclock.c:303
 #, c-format
 msgid "Last drift adjustment done at %d seconds after 1969\n"
 msgstr "�ltimo ajuste de varia��o feito %d segundos ap�s 1969\n"
 
-#: clock/hwclock.c:299
+#: clock/hwclock.c:305
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
 msgstr "�ltima calibra��o feita %d segundos ap�s 1969\n"
 
-#: clock/hwclock.c:301
+#: clock/hwclock.c:307
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "O rel�gio de hardware est� na hora %s\n"
 
-#: clock/hwclock.c:303
+#: clock/hwclock.c:309
 msgid "unknown"
 msgstr "desconhecida"
 
@@ -108,44 +116,39 @@ msgstr "desconhecida"
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:325
+#: clock/hwclock.c:331
 msgid "Waiting for clock tick...\n"
 msgstr "Aguardando tique do rel�gio...\n"
 
-#: clock/hwclock.c:329
+#: clock/hwclock.c:335
 msgid "...got clock tick\n"
 msgstr "... tique do rel�gio obtido\n"
 
-#: clock/hwclock.c:380
+#: clock/hwclock.c:386
 #, c-format
-msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr ""
-"Valores inv�lidos no rel�gio de hardware: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr "Valores inv�lidos no rel�gio de hardware: %4d/%.4d/%.2d %.2d:%.2d:%.2d\n"
 
-#: clock/hwclock.c:389
+#: clock/hwclock.c:394
 #, c-format
-msgid "Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d seconds since 1969\n"
-msgstr ""
-"Hora do rel�gio de hardware: %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d segundos "
-"desde 1969\n"
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr "Hora do rel�gio de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos desde 1969\n"
 
-#: clock/hwclock.c:417
+#: clock/hwclock.c:422
 #, c-format
-msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
-msgstr "Hora lida do rel�gio de hardware: %02d:%02d:%02d\n"
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Hora lida do rel�gio de Hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: clock/hwclock.c:443
+#: clock/hwclock.c:449
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n"
-msgstr ""
-"Configurando o rel�gio de hardware para %.2d:%.2d:%.2d = %d segundos desde "
-"1969\n"
+msgstr "Configurando o rel�gio de hardware para %.2d:%.2d:%.2d = %d segundos desde 1969\n"
 
-#: clock/hwclock.c:449
+#: clock/hwclock.c:455
 msgid "Clock not changed - testing only.\n"
 msgstr "Rel�gio n�o alterado - apenas testando.\n"
 
-#: clock/hwclock.c:497
+#: clock/hwclock.c:503
 #, c-format
 msgid ""
 "Time elapsed since reference time has been %.6f seconds.\n"
@@ -154,14 +157,9 @@ msgstr ""
 "O tempo decorrido desde o hor�rio de refer�ncia foi de %.6f segundos.\n"
 " Atrasando mais para chegar ao pr�ximo segundo cheio.\n"
 
-#: clock/hwclock.c:521
-msgid ""
-"The Hardware Clock registers contain values that are either invalid (e.g. "
-"50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
-msgstr ""
-"Os registradores do rel�gio de hardware cont�m valores inv�lidos (p. ex., "
-"50� dia do m�s) ou al�m do intervalo que podemos manipular (p.ex., ano "
-"2095).\n"
+#: clock/hwclock.c:527
+msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095).\n"
+msgstr "Os registradores do rel�gio de hardware cont�m valores inv�lidos (p. ex., 50� dia do m�s) ou al�m do intervalo que podemos manipular (p.ex., ano 2095).\n"
 
 #. Address of static storage containing time string
 #. For some strange reason, ctime() is designed to include a newline
@@ -169,18 +167,18 @@ msgstr ""
 #.
 #. Compute display value for time
 #. Cut off trailing newline
-#: clock/hwclock.c:533
+#: clock/hwclock.c:539
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f segundos\n"
 
-#: clock/hwclock.c:567
+#: clock/hwclock.c:573
 msgid "No --date option specified.\n"
 msgstr "N�o. Op��o --date especificada\n"
 
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:572
+#: clock/hwclock.c:578
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
@@ -188,22 +186,21 @@ msgstr ""
 "O valor da op��o --date n�o � uma data v�lida.\n"
 "Especificamente, ele cont�m aspas.\n"
 
-#: clock/hwclock.c:578
+#: clock/hwclock.c:584
 #, c-format
 msgid "Issuing date command: %s\n"
 msgstr "Emitindo comando date: %s\n"
 
-#: clock/hwclock.c:582
+#: clock/hwclock.c:588
 msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
-msgstr ""
-"N�o foi poss�vel executar o programa 'date' no shell /bin/sh: popen() falhou"
+msgstr "N�o foi poss�vel executar o programa 'date' no shell /bin/sh: popen() falhou"
 
-#: clock/hwclock.c:588
+#: clock/hwclock.c:594
 #, c-format
 msgid "response from date command = %s\n"
 msgstr "resposta do comando date = %s\n"
 
-#: clock/hwclock.c:590
+#: clock/hwclock.c:596
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -218,185 +215,154 @@ msgstr ""
 "A resposta foi:\n"
 "  %s\n"
 
-#: clock/hwclock.c:599
+#: clock/hwclock.c:605
 #, c-format
 msgid ""
-"The date command issued by %s returnedsomething other than an integer where "
-"the convertedtime value was expected.\n"
+"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
-"O comando date emitido por %s retornou um valor diferente de um inteiro onde "
-"o valor de hora convertido era esperado.\n"
+"O comando date emitido por %s retornou um valor diferente de um inteiro onde o valor de hora convertido era esperado.\n"
 "O comando foi:\n"
 "  %s\n"
 "A resposta foi:\n"
 "  %s\n"
 
-#: clock/hwclock.c:609
+#: clock/hwclock.c:615
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr "String de date %s equivale a %d segundos desde 1969.\n"
 
-#: clock/hwclock.c:641
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot set the "
-"System Time from it.\n"
-msgstr ""
-"O rel�gio de hardware n�o cont�m uma hora v�lida. Em fun��o disso, n�o � "
-"poss�vel configurar a hora do sistema a partir dele.\n"
+#: clock/hwclock.c:647
+msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it.\n"
+msgstr "O rel�gio de hardware n�o cont�m uma hora v�lida. Em fun��o disso, n�o � poss�vel configurar a hora do sistema a partir dele.\n"
 
-#: clock/hwclock.c:654
+#: clock/hwclock.c:669
 msgid "Calling settimeofday:\n"
 msgstr "Chamando settimeofday:\n"
 
-#: clock/hwclock.c:655
+#: clock/hwclock.c:670
 #, c-format
 msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
 
-#: clock/hwclock.c:657
+#: clock/hwclock.c:672
 #, c-format
-msgid "\ttz.tz_minuteswest = %ld\n"
-msgstr "\ttz.tz_minuteswest = %ld\n"
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: clock/hwclock.c:660
+#: clock/hwclock.c:675
 msgid "Not setting system clock because running in test mode.\n"
-msgstr ""
-"O rel�gio do sistema n�o est� sendo ajustado: executando em modo de teste.\n"
+msgstr "O rel�gio do sistema n�o est� sendo ajustado: executando em modo de teste.\n"
 
-#: clock/hwclock.c:673
+#: clock/hwclock.c:683
 msgid "Must be superuser to set system clock.\n"
 msgstr "� necess�rio ser superusu�rio para ajustar o rel�gio do sistema.\n"
 
-#: clock/hwclock.c:675
+#: clock/hwclock.c:685
 msgid "settimeofday() failed"
 msgstr "settimeofday() falhou"
 
-#: clock/hwclock.c:708
-msgid ""
-"Not adjusting drift factor because the Hardware Clock previously contained "
-"garbage.\n"
-msgstr ""
-"O fator de varia��o n�o est� sendo ajustado porque o rel�gio de hardware "
-"continha lixo anteriormente.\n"
+#: clock/hwclock.c:718
+msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
+msgstr "O fator de varia��o n�o est� sendo ajustado porque o rel�gio de hardware continha lixo anteriormente.\n"
 
-#: clock/hwclock.c:712
-msgid ""
-"Not adjusting drift factor because it has been less than a day since the "
-"last calibration.\n"
-msgstr ""
-"O fator de varia��o n�o est� sendo ajustado porque menos de um dia se passou "
-"desde a �ltima calibra��o.\n"
+#: clock/hwclock.c:722
+msgid "Not adjusting drift factor because it has been less than a day since the last calibration.\n"
+msgstr "O fator de varia��o n�o est� sendo ajustado porque menos de um dia se passou desde a �ltima calibra��o.\n"
 
-#: clock/hwclock.c:721
+#: clock/hwclock.c:731
 #, c-format
 msgid ""
-"Clock drifted %d seconds in the past %d seconds in spite of a drift factor "
-"of %f seconds/day.\n"
+"Clock drifted %d seconds in the past %d seconds in spite of a drift factor of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
-"O rel�gio variou %d segundos nos �ltimos %d segundos, apesar de um fator de "
-"varia��o de %f segundos/dia.\n"
+"O rel�gio variou %d segundos nos �ltimos %d segundos, apesar de um fator de varia��o de %f segundos/dia.\n"
 "Ajustando o fator de varia��o em %f segundos/dia.\n"
 
-#: clock/hwclock.c:772
+#: clock/hwclock.c:782
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
 msgstr "O tempo desde o �ltimo ajuste � de %d segundos\n"
 
-#: clock/hwclock.c:774
+#: clock/hwclock.c:784
 #, c-format
 msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
-msgstr ""
-"� necess�rio inserir %d segundos e referenciar a hora de %.6f segundos "
-"atr�s\n"
+msgstr "� necess�rio inserir %d segundos e referenciar a hora de %.6f segundos atr�s\n"
 
-#: clock/hwclock.c:803
+#: clock/hwclock.c:813
 msgid "Not updating adjtime file because of testing mode.\n"
 msgstr "O arquivo adjtime n�o est� sendo atualizado: modo de teste.\n"
 
-#: clock/hwclock.c:804
+#: clock/hwclock.c:814
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
 "Teria gravado o seguinte em %s:\n"
-"%s%s"
+"%s"
 
-#: clock/hwclock.c:828
+#: clock/hwclock.c:838
 msgid "Drift adjustment parameters not updated.\n"
 msgstr "Par�metros de ajuste de varia��o n�o atualizados.\n"
 
-#: clock/hwclock.c:869
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
-msgstr ""
-"O rel�gio de hardware n�o cont�m uma hora v�lida, portanto n�o � poss�vel "
-"ajust�-lo.\n"
+#: clock/hwclock.c:879
+msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr "O rel�gio de hardware n�o cont�m uma hora v�lida, portanto n�o � poss�vel ajust�-lo.\n"
 
-#: clock/hwclock.c:893
+#: clock/hwclock.c:903
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr ""
-"O ajuste necess�rio � menor do que um segundo, portanto o rel�gio n�o ser� "
-"ajustado.\n"
+msgstr "O ajuste necess�rio � menor do que um segundo, portanto o rel�gio n�o ser� ajustado.\n"
 
-#: clock/hwclock.c:919
+#: clock/hwclock.c:929
 #, c-format
 msgid "Using %s.\n"
 msgstr "Usando %s.\n"
 
-#: clock/hwclock.c:921
+#: clock/hwclock.c:931
 msgid "No usable clock interface found.\n"
 msgstr "N�o foi encontrada uma interface de rel�gio utiliz�vel.\n"
 
-#: clock/hwclock.c:1016
+#: clock/hwclock.c:1026
 msgid "Unable to set system clock.\n"
 msgstr "N�o � poss�vel ajustar o rel�gio do sistema.\n"
 
-#: clock/hwclock.c:1045
+#: clock/hwclock.c:1055
 msgid ""
-"The kernel keeps an epoch value for the Hardware Clock only on an Alpha "
-"machine.\n"
+"The kernel keeps an epoch value for the Hardware Clock only on an Alpha machine.\n"
 "This copy of hwclock was built for a machine other than Alpha\n"
 "(and thus is presumably not running on an Alpha now).  No action taken.\n"
 msgstr ""
-"O kernel mant�m um valor de epoch para o rel�gio de hardware somente em uma "
-"m�quina Alpha.\n"
-"Esta c�pia de hwclock foi compilada para uma m�quina diferente de Alpha (e, "
-"assim, sup�e-se que n�o est� sendo executada em uma Alpha no momento).  "
-"Nenhuma a��o foi realizada.\n"
+"O kernel mant�m um valor de epoch para o rel�gio de hardware somente em uma m�quina Alpha.\n"
+"Esta c�pia de hwclock foi compilada para uma m�quina diferente de Alpha (e, assim, sup�e-se que n�o est� sendo executada em uma Alpha no momento).  Nenhuma a��o foi realizada.\n"
 
-#: clock/hwclock.c:1054
+#: clock/hwclock.c:1064
 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"
 
-#: clock/hwclock.c:1056
+#: clock/hwclock.c:1066
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "O kernel est� pressupondo um valor de epoch de %lu\n"
 
-#: clock/hwclock.c:1059
-msgid ""
-"To set the epoch value, you must use the 'epoch' option to tell to what "
-"value to set it.\n"
-msgstr ""
-"Para configurar o valor de epoch, � necess�rio usar a op��o 'epoch' para "
-"informar para que valor configur�-lo.\n"
+#: clock/hwclock.c:1069
+msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it.\n"
+msgstr "Para configurar o valor de epoch, � necess�rio usar a op��o 'epoch' para informar para que valor configur�-lo.\n"
 
-#: clock/hwclock.c:1062
+#: clock/hwclock.c:1072
 #, c-format
 msgid "Not setting the epoch to %d - testing only.\n"
 msgstr "Epoch n�o configurado para %d; apenas testando.\n"
 
-#: clock/hwclock.c:1065
+#: clock/hwclock.c:1075
 msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "N�o � poss�vel configurar o valor de epoch no kernel.\n"
 
-#: clock/hwclock.c:1088
+#: clock/hwclock.c:1104
+#, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -418,7 +384,7 @@ msgid ""
 "Options: \n"
 "  --utc         the hardware clock is kept in coordinated universal time\n"
 "  --localtime   the hardware clock is kept in local time\n"
-"  --directisa   access the ISA bus directly instead of /dev/rtc\n"
+"  --directisa   access the ISA bus directly instead of %s\n"
 "  --badyear     ignore rtc's year because the bios is broken\n"
 "  --date        specifies the time to which to set the hardware clock\n"
 "  --epoch=year  specifies the year which is the beginning of the \n"
@@ -432,45 +398,38 @@ msgstr ""
 "  --help        Mostra esta ajuda.\n"
 "  --show        L� o rel�gio de hardware e imprime o resultado.\n"
 "  --set         Configura o RTC para a hora fornecida com --date.\n"
-"  --hctosys     Configura a hora do sistema a partir do rel�gio de "
-"hardware.\n"
-"  --systohc     Configura o rel�gio de hardware para a hora atual do "
-"sistema.\n"
-"  --adjust      Ajusta o RTC para levar em conta varia��o sistem�tica desde "
-"\n"
+"  --hctosys     Configura a hora do sistema a partir do rel�gio de hardware.\n"
+"  --systohc     Configura o rel�gio de hardware para a hora atual do sistema.\n"
+"  --adjust      Ajusta o RTC para levar em conta varia��o sistem�tica desde \n"
 "                que o rel�gio foi ajustado ou configurado da �ltima vez.\n"
 "  --getepoch    Exibe o valor de epoch do rel�gio de hardware do kernel.\n"
-"  --setepoch    Configura o valor de epoch do rel�gio de hardware do kernel "
-"para o \n"
+"  --setepoch    Configura o valor de epoch do rel�gio de hardware do kernel para o \n"
 "                valor fornecido com --epoch.\n"
 "  --version     Coloca a vers�o de hwclock em stdout.\n"
 "\n"
 "Op��es: \n"
-"  --utc         O rel�gio de hardware � mantido em UTC (hora universal "
-"coordenada).\n"
+"  --utc         O rel�gio de hardware � mantido em UTC (hora universal coordenada).\n"
 "  --localtime   O rel�gio de hardware � mantido em hora local.\n"
-"  --directisa   Acessa o barramento ISA diretamente, em vez de /dev/rtc.\n"
+"  --directisa   Acessa o barramento ISA diretamente, em vez de %s.\n"
 "  --badyear     Ignora o ano do RTC, pois a BIOS est� com problemas.\n"
-"  --date        Especifica a hora para a qual configurar o rel�gio de "
-"hardware.\n"
+"  --date        Especifica a hora para a qual configurar o rel�gio de hardware.\n"
 "  --epoch=ano  Especifica o ano inicial do valor \n"
 "                de epoch do rel�gio de hardware.\n"
 
-#: clock/hwclock.c:1113
+#: clock/hwclock.c:1129
 msgid ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                tell hwclock the type of alpha you have (see hwclock(8))\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
-"                informa a hwclock o tipo de Alpha que voc� tem (consulte "
-"hwclock(8))\n"
+"                informa a hwclock o tipo de Alpha que voc� tem (consulte hwclock(8))\n"
 
-#: clock/hwclock.c:1209
+#: clock/hwclock.c:1227
 #, 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"
 
-#: clock/hwclock.c:1219
+#: clock/hwclock.c:1237
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
@@ -478,40 +437,34 @@ msgstr ""
 "Voc� especificou m�ltiplas op��es de fun��o.\n"
 "Voc� s� pode executar uma fun��o por vez.\n"
 
-#: clock/hwclock.c:1225
+#: clock/hwclock.c:1243
 #, c-format
-msgid ""
-"%s: The --utc and --localtime options are mutually exclusive.  You specified "
-"both.\n"
-msgstr ""
-"%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
-"especificou ambas.\n"
+msgid "%s: The --utc and --localtime options are mutually exclusive.  You specified both.\n"
+msgstr "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� especificou ambas.\n"
 
-#: clock/hwclock.c:1238
+#: clock/hwclock.c:1256
 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"
+msgstr "N�o h� um hor�rio para ajuste utiliz�vel. N�o � poss�vel ajustar o rel�gio.\n"
 
-#: clock/hwclock.c:1253
+#: clock/hwclock.c:1271
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
 msgstr "Somente o superusu�rio pode alterar o rel�gio de hardware.\n"
 
-#: clock/hwclock.c:1257
-msgid ""
-"Sorry, only the superuser can change the Hardware Clock epoch in the "
-"kernel.\n"
-msgstr ""
-"Somente o superusu�rio pode alterar o epoch do rel�gio de hardware no "
-"kernel.\n"
-
 #: clock/hwclock.c:1275
-msgid ""
-"Cannot access the Hardware Clock via any known method.  Use --debug option "
-"to see the details of our search for an access method.\n"
-msgstr ""
-"N�o � poss�vel acessar o rel�gio de hardware atrav�s de qualquer m�todo "
-"conhecido.  Use a op��o --debug para consultar os detalhes de nossa busca "
-"por um m�todo de acesso.\n"
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "Somente o superusu�rio pode alterar o rel�gio de hardware.\n"
+
+#: clock/hwclock.c:1279
+msgid "Sorry, only the superuser can change the Hardware Clock epoch in the kernel.\n"
+msgstr "Somente o superusu�rio pode alterar o epoch do rel�gio de hardware no kernel.\n"
+
+#: clock/hwclock.c:1299
+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"
+
+#: clock/hwclock.c:1302
+msgid "Use the --debug option to see the details of our search for an access method.\n"
+msgstr "Use a op��o --debug para consultar os detalhes de nossa busca por um m�todo de acesso.\n"
 
 #: clock/kd.c:41
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
@@ -521,7 +474,7 @@ msgstr "Aguardando em la�o at� que a hora de KDGHWCLK mude.\n"
 msgid "KDGHWCLK ioctl to read time failed"
 msgstr "ioctl KDGHWCLK para ler a hora falhou"
 
-#: clock/kd.c:65 clock/rtc.c:144
+#: clock/kd.c:65 clock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
 msgstr "Tempo esgotado enquanto aguardava a hora mudar.\n"
 
@@ -541,104 +494,102 @@ msgstr "ioctl() para abrir /dev/tty1 falhou"
 msgid "KDGHWCLK ioctl failed"
 msgstr "ioctl KDGHWCLK falhou"
 
-#: clock/kd.c:161
+#: clock/kd.c:163
 msgid "Can't open /dev/tty1"
 msgstr "N�o foi poss�vel abrir /dev/tty1"
 
-#: clock/rtc.c:98
-msgid "ioctl() to /dev/rtc to read the time failed.\n"
-msgstr "ioctl() para /dev/rtc para ler a hora falhou.\n"
+#: clock/rtc.c:105
+#, c-format
+msgid "ioctl() to %s to read the time failed.\n"
+msgstr "ioctl() para %s para ler a hora falhou.\n"
 
-#: clock/rtc.c:129
-msgid "Waiting in loop for time from /dev/rtc to change\n"
-msgstr "Aguardando em la�o at� que a hora de /dev/rtc mude\n"
+#: clock/rtc.c:136
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Aguardando em la�o at� que a hora de %s mude.\n"
 
-#: clock/rtc.c:165 clock/rtc.c:222
-msgid "open() of /dev/rtc failed"
-msgstr "open() de /dev/rtc falhou"
+#: clock/rtc.c:172 clock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() de %s falhou"
 
-#. This rtc device doesn't have interrupt functions.  This is typical
-#. on an Alpha, where the Hardware Clock interrupts are used by the
-#. kernel for the system clock, so aren't at the user's disposal.
-#.
-#: clock/rtc.c:182
-msgid "/dev/rtc does not have interrupt functions. "
-msgstr "/dev/rtc n�o possui fun��es de interrup��o. "
+#: clock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s n�o possui fun��es de interrup��o. "
 
-#: clock/rtc.c:191
-msgid "read() to /dev/rtc to wait for clock tick failed"
-msgstr "read() para /dev/rtc para aguardar tique do rel�gio falhou"
+#: clock/rtc.c:198
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "read() para %s para aguardar tique do rel�gio falhou"
 
-#: clock/rtc.c:199
-msgid "ioctl() to /dev/rtc to turn off update interrupts failed"
-msgstr "ioctl() para /dev/rtc para desligar interrup��es de atualiza��o falhou"
+#: clock/rtc.c:206
+#, c-format
+msgid "ioctl() to %s to turn off update interrupts failed"
+msgstr "ioctl() para %s para desligar interrup��es de atualiza��o falhou"
 
-#: clock/rtc.c:202
-msgid "ioctl() to /dev/rtc to turn on update interrupts failed unexpectedly"
-msgstr ""
-"ioctl() para /dev/rtc para ligar interrup��es de atualiza��o falhou "
-"inesperadamente"
+#: clock/rtc.c:209
+#, c-format
+msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
+msgstr "ioctl() para %s para ligar interrup��es de atualiza��o falhou inesperadamente"
 
-#: clock/rtc.c:245 clock/rtc.c:324 clock/rtc.c:369
-msgid "Unable to open /dev/rtc"
-msgstr "N�o foi poss�vel abrir /dev/rtc"
+#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "N�o foi poss�vel abrir %s"
 
-#: clock/rtc.c:268
-msgid "ioctl() to /dev/rtc to set the time failed.\n"
-msgstr "ioctl() para /dev/rtc para ajustar a hora falhou.\n"
+#: clock/rtc.c:275
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "ioctl() para %s para ajustar a hora falhou.\n"
 
-#: clock/rtc.c:272
+#: clock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) teve �xito.\n"
 
-#: clock/rtc.c:302
-msgid "Open of /dev/rtc failed"
-msgstr "A abertura de /dev/rtc falhou"
+#: clock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "A abertura de %s falhou"
 
-#: clock/rtc.c:320 clock/rtc.c:365
-msgid ""
-"To manipulate the epoch value in the kernel, we must access the Linux 'rtc' "
-"device driver via the device special file /dev/rtc.  This file does not "
-"exist on this system.\n"
-msgstr ""
-"Para manipular o valor de epoch no kernel, � necess�rio acessar o driver de "
-"dispositivo 'rtc' do Linux, atrav�s do arquivo de dispositivo especial "
-"/dev/rtc.  No entanto, esse arquivo n�o existe neste sistema.\n"
+#: clock/rtc.c:327 clock/rtc.c:372
+#, c-format
+msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file %s.  This file does not exist on this system.\n"
+msgstr "Para manipular o valor de epoch no kernel, � necess�rio acessar o driver de dispositivo 'rtc' do Linux, atrav�s do arquivo de dispositivo especial %s.  No entanto, esse arquivo n�o existe neste sistema.\n"
 
-#: clock/rtc.c:331
-msgid "ioctl(RTC_EPOCH_READ) to /dev/rtc failed"
-msgstr "ioctl(RTC_EPOCH_READ) para /dev/rtc falhou"
+#: clock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "ioctl(RTC_EPOCH_READ) para %s falhou"
 
-#: clock/rtc.c:337
+#: clock/rtc.c:344
 #, c-format
-msgid "we have read epoch %ld from /dev/rtc with RTC_EPOCH_READ ioctl.\n"
-msgstr "lemos epoch %ld de /dev/rtc com ioctl RTC_EPOCH_READ.\n"
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "lemos epoch %ld de %s com ioctl RTC_EPOCH_READ.\n"
 
 #. kernel would not accept this epoch value
 #. Hmm - bad habit, deciding not to do what the user asks
 #. just because one believes that the kernel might not like it.
-#: clock/rtc.c:357
+#: clock/rtc.c:364
 #, c-format
 msgid "The epoch value may not be less than 1900.  You requested %ld\n"
 msgstr "O valor de epoch n�o pode ser menor que 1900.  Voc� solicitou %ld.\n"
 
-#: clock/rtc.c:374
+#: clock/rtc.c:381
 #, c-format
-msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to /dev/rtc.\n"
-msgstr "Configurando epoch como %ld com ioctl RTC_EPOCH_SET para /dev/rtc.\n"
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr "Configurando epoch como %ld com ioctl RTC_EPOCH_SET para %s.\n"
 
-#: clock/rtc.c:379
-msgid ""
-"The kernel device driver for /dev/rtc does not have the RTC_EPOCH_SET "
-"ioctl.\n"
-msgstr ""
-"O driver de dispositivo do kernel para /dev/rtc n�o possui o ioctl "
-"RTC_EPOCH_SET.\n"
+#: clock/rtc.c:386
+#, c-format
+msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n"
+msgstr "O driver de dispositivo do kernel para %s n�o possui o ioctl RTC_EPOCH_SET.\n"
 
-#: clock/rtc.c:382
-msgid "ioctl(RTC_EPOCH_SET) to /dev/rtc failed"
-msgstr "ioctl(RTC_EPOCH_SET) para /dev/rtc falhou"
+#: clock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "ioctl(RTC_EPOCH_SET) para %s falhou"
 
 #: clock/shhopt.c:255 clock/shhopt.c:281
 #, c-format
@@ -670,83 +621,83 @@ msgstr "a op��o `%s' n�o permite um argumento\n"
 msgid "unrecognized option `-%c'\n"
 msgstr "op��o `-%c' n�o reconhecida\n"
 
-#: disk-utils/blockdev.c:34
+#: disk-utils/blockdev.c:47
 msgid "set read-only"
 msgstr "configurar somente leitura"
 
-#: disk-utils/blockdev.c:35
+#: disk-utils/blockdev.c:48
 msgid "set read-write"
 msgstr "configurar leitura/grava��o"
 
-#: disk-utils/blockdev.c:38
+#: disk-utils/blockdev.c:51
 msgid "get read-only"
 msgstr "obter somente leitura"
 
-#: disk-utils/blockdev.c:41
+#: disk-utils/blockdev.c:54
 msgid "get sectorsize"
 msgstr "obter tamanho de setor"
 
-#: disk-utils/blockdev.c:44
+#: disk-utils/blockdev.c:57
 msgid "get size"
 msgstr "obter tamanho"
 
-#: disk-utils/blockdev.c:47
+#: disk-utils/blockdev.c:60
 msgid "set readahead"
 msgstr "configurar readahead"
 
-#: disk-utils/blockdev.c:50
+#: disk-utils/blockdev.c:63
 msgid "get readahead"
 msgstr "obter readahead"
 
-#: disk-utils/blockdev.c:53
+#: disk-utils/blockdev.c:66
 msgid "flush buffers"
 msgstr "descarregar buffers"
 
-#: disk-utils/blockdev.c:57
+#: disk-utils/blockdev.c:70
 msgid "reread partition table"
 msgstr "ler novamente tabela de parti��es"
 
-#: disk-utils/blockdev.c:66
+#: disk-utils/blockdev.c:79
 #, c-format
 msgid "Usage: %s [-V] [-v|-q] commands devices\n"
 msgstr "Uso: %s [-V] [-v|-q] comandos dispositivos\n"
 
-#: disk-utils/blockdev.c:67
+#: disk-utils/blockdev.c:80
 msgid "Available commands:\n"
 msgstr "Comandos dispon�veis:\n"
 
-#: disk-utils/blockdev.c:167
+#: disk-utils/blockdev.c:180
 #, c-format
 msgid "%s: Unknown command: %s\n"
 msgstr "%s: comando desconhecido: %s\n"
 
-#: disk-utils/blockdev.c:178
+#: disk-utils/blockdev.c:191
 #, c-format
 msgid "%s requires an argument\n"
 msgstr "%s exige um argumento\n"
 
-#: disk-utils/fdformat.c:33
+#: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Formatando..."
 
-#: disk-utils/fdformat.c:51 disk-utils/fdformat.c:86
+#: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
 msgstr "conclu�do\n"
 
-#: disk-utils/fdformat.c:62
+#: disk-utils/fdformat.c:65
 msgid "Verifying ... "
 msgstr "Verificando..."
 
-#: disk-utils/fdformat.c:73
+#: disk-utils/fdformat.c:76
 msgid "Read: "
 msgstr "Ler: "
 
-#: disk-utils/fdformat.c:75
+#: disk-utils/fdformat.c:78
 #, c-format
 msgid "Problem reading cylinder %d, expected %d, read %d\n"
 msgstr "Problema ao ler o cilindro %d: esperado %d, lido %d\n"
 
-#: disk-utils/fdformat.c:81
+#: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
@@ -755,80 +706,80 @@ msgstr ""
 "Dados inv�lidos no cilindro %d\n"
 "Continuando..."
 
-#: disk-utils/fdformat.c:96
+#: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
 msgstr "Uso: %s [ -n ] dispositivo\n"
 
-#: disk-utils/fdformat.c:117 disk-utils/fsck.minix.c:1255 disk-utils/mkfs.c:55
-#: disk-utils/mkfs.minix.c:650 disk-utils/mkswap.c:351
-#: disk-utils/setfdprm.c:128 misc-utils/cal.c:175 misc-utils/ddate.c:172
-#: misc-utils/kill.c:191
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:448
+#: disk-utils/setfdprm.c:127 misc-utils/cal.c:203 misc-utils/ddate.c:181
+#: misc-utils/kill.c:192
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
 
-#: disk-utils/fdformat.c:131
+#: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
 msgstr "%s: n�o � um dispositivo de disquetes\n"
 
-#: disk-utils/fdformat.c:137
+#: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
 msgstr "N�o foi poss�vel determinar o tipo de formata��o atual"
 
-#: disk-utils/fdformat.c:138
+#: disk-utils/fdformat.c:141
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "%s faces, %d trilhas, %d setores/trilha. Capacidade total de %d Kb.\n"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Double"
 msgstr "Dupla"
 
-#: disk-utils/fdformat.c:139
+#: disk-utils/fdformat.c:142
 msgid "Single"
 msgstr "Simples"
 
-#: disk-utils/fsck.minix.c:196
+#: disk-utils/fsck.minix.c:197
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uso: %s [ -larvsmf] dispositivo\n"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:296
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s est� montado.\t"
 
-#: disk-utils/fsck.minix.c:296
+#: disk-utils/fsck.minix.c:298
 msgid "Do you really want to continue"
 msgstr "Voc� realmente deseja continuar?"
 
-#: disk-utils/fsck.minix.c:300
+#: disk-utils/fsck.minix.c:302
 msgid "check aborted.\n"
 msgstr "verifica��o anulada.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:337
+#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
 msgid "Zone nr < FIRSTZONE in file `"
 msgstr "N�mero de zona menor que FIRSTZONE no arquivo `"
 
-#: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
+#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
 msgid "Zone nr >= ZONES in file `"
 msgstr "N�mero de zona maior ou igual a ZONES no arquivo `"
 
-#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
 msgid "Remove block"
 msgstr "Remover bloco"
 
-#: disk-utils/fsck.minix.c:362
+#: disk-utils/fsck.minix.c:364
 msgid "Read error: unable to seek to block in file '"
 msgstr "Erro de leitura: n�o foi poss�vel buscar bloco no arquivo '"
 
-#: disk-utils/fsck.minix.c:368
+#: disk-utils/fsck.minix.c:370
 msgid "Read error: bad block in file '"
 msgstr "Erro de leitura: bloco defeituoso no arquivo '"
 
-#: disk-utils/fsck.minix.c:384
+#: disk-utils/fsck.minix.c:386
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -836,300 +787,290 @@ msgstr ""
 "Erro interno: tentando gravar bloco defeituoso.\n"
 "Solicita��o de grava��o ignorada.\n"
 
-#: disk-utils/fsck.minix.c:390 disk-utils/mkfs.minix.c:289
+#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
 msgid "seek failed in write_block"
 msgstr "busca falhou em write_block"
 
-#: disk-utils/fsck.minix.c:392
+#: disk-utils/fsck.minix.c:394
 msgid "Write error: bad block in file '"
 msgstr "Erro de grava��o: bloco defeituoso no arquivo '"
 
-#: disk-utils/fsck.minix.c:511
+#: disk-utils/fsck.minix.c:513
 msgid "seek failed in write_super_block"
 msgstr "busca falhou em write_super_block"
 
-#: disk-utils/fsck.minix.c:513 disk-utils/mkfs.minix.c:276
+#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr "n�o foi poss�vel gravar superbloco"
 
-#: disk-utils/fsck.minix.c:523
+#: disk-utils/fsck.minix.c:525
 msgid "Unable to write inode map"
 msgstr "N�o foi poss�vel gravar mapa de inode"
 
-#: disk-utils/fsck.minix.c:525
+#: disk-utils/fsck.minix.c:527
 msgid "Unable to write zone map"
 msgstr "N�o foi poss�vel gravar mapa de zona"
 
-#: disk-utils/fsck.minix.c:527
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inodes"
 msgstr "N�o foi poss�vel gravar inodes"
 
-#: disk-utils/fsck.minix.c:556
+#: disk-utils/fsck.minix.c:558
 msgid "seek failed"
 msgstr "busca falhou"
 
-#: disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.minix.c:560
 msgid "unable to read super block"
 msgstr "n�o foi poss�vel ler superbloco"
 
-#: disk-utils/fsck.minix.c:578
+#: disk-utils/fsck.minix.c:580
 msgid "bad magic number in super-block"
 msgstr "n�mero m�gico inv�lido no superbloco"
 
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:582
 msgid "Only 1k blocks/zones supported"
 msgstr "Somente 1K blocos/zonas suportados"
 
-#: disk-utils/fsck.minix.c:582
+#: disk-utils/fsck.minix.c:584
 msgid "bad s_imap_blocks field in super-block"
 msgstr "campo s_imap_blocks inv�lido no superbloco"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:586
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "campo s_zmap_blocks inv�lido no superbloco"
 
-#: disk-utils/fsck.minix.c:591
+#: disk-utils/fsck.minix.c:593
 msgid "Unable to allocate buffer for inode map"
 msgstr "N�o foi poss�vel alocar buffer para mapa de inodes"
 
-#: disk-utils/fsck.minix.c:599
+#: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inodes"
 msgstr "N�o foi poss�vel alocar buffer para inodes"
 
-#: disk-utils/fsck.minix.c:602
+#: disk-utils/fsck.minix.c:604
 msgid "Unable to allocate buffer for inode count"
 msgstr "N�o foi poss�vel alocar buffer para contagem de inodes"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:607
 msgid "Unable to allocate buffer for zone count"
 msgstr "N�o foi poss�vel alocar buffer para contagem de zonas"
 
-#: disk-utils/fsck.minix.c:607
+#: disk-utils/fsck.minix.c:609
 msgid "Unable to read inode map"
 msgstr "N�o foi poss�vel ler mapa de inodes"
 
-#: disk-utils/fsck.minix.c:609
+#: disk-utils/fsck.minix.c:611
 msgid "Unable to read zone map"
 msgstr "N�o foi poss�vel ler mapa de zonas"
 
-#: disk-utils/fsck.minix.c:611
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to read inodes"
 msgstr "N�o foi poss�vel ler inodes"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:615
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Aviso: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:532
+#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:533
+#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocos\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primeira zona de dados = %ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tamanho da zona = %d\n"
 
-#: disk-utils/fsck.minix.c:622
+#: disk-utils/fsck.minix.c:624
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Tamanho m�ximo = %ld\n"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:625
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estado do sistema de arquivos = %d\n"
 
-#: disk-utils/fsck.minix.c:624
+#: disk-utils/fsck.minix.c:626
 #, c-format
-msgid ""
-"namelen=%d\n"
-"\n"
-msgstr ""
-"Comprimento do nome = %d\n"
-"\n"
+msgid "namelen=%d\n\n"
+msgstr "Comprimento do nome = %d\n\n"
 
-#: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:690
+#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
 msgid "Inode %d marked not used, but used for file '"
 msgstr "Inode %d marcado como n�o utilizado, mas usado pelo arquivo '"
 
-#: disk-utils/fsck.minix.c:643 disk-utils/fsck.minix.c:694
+#: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
 msgstr "Marca em uso"
 
-#: disk-utils/fsck.minix.c:665 disk-utils/fsck.minix.c:714
+#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
 msgstr " tem modo %05o\n"
 
-#: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719
+#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
 msgid "Warning: inode count too big.\n"
 msgstr "Aviso: contagem de inodes grande demais.\n"
 
-#: disk-utils/fsck.minix.c:732
+#: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
 msgstr "inode raiz n�o � um diret�rio"
 
-#: disk-utils/fsck.minix.c:755 disk-utils/fsck.minix.c:789
+#: disk-utils/fsck.minix.c:756 disk-utils/fsck.minix.c:790
 msgid "Block has been used before. Now in file `"
 msgstr "O bloco j� foi usado. Agora no arquivo `"
 
-#: disk-utils/fsck.minix.c:758 disk-utils/fsck.minix.c:792
-#: disk-utils/fsck.minix.c:1120 disk-utils/fsck.minix.c:1129
-#: disk-utils/fsck.minix.c:1173 disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:759 disk-utils/fsck.minix.c:793
+#: disk-utils/fsck.minix.c:1115 disk-utils/fsck.minix.c:1124
+#: disk-utils/fsck.minix.c:1167 disk-utils/fsck.minix.c:1176
 msgid "Clear"
 msgstr "Limpar"
 
-#: disk-utils/fsck.minix.c:767 disk-utils/fsck.minix.c:801
+#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
 msgstr "O bloco %d no arquivo `"
 
-#: disk-utils/fsck.minix.c:769 disk-utils/fsck.minix.c:803
+#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
 msgstr "' est� marcado como n�o utilizado."
 
-#: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
+#: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
 msgstr "Correto"
 
-#: disk-utils/fsck.minix.c:954 disk-utils/fsck.minix.c:1018
+#: disk-utils/fsck.minix.c:951 disk-utils/fsck.minix.c:1014
 msgid " contains a bad inode number for file '"
 msgstr " cont�m um n�mero de inode inv�lido para o arquivo '"
 
-#: disk-utils/fsck.minix.c:956 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
 msgstr " Remover"
 
-#: disk-utils/fsck.minix.c:970 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
 msgid ": bad directory: '.' isn't first\n"
 msgstr ": diret�rio inv�lido: '.' n�o � o primeiro\n"
 
-#: disk-utils/fsck.minix.c:977 disk-utils/fsck.minix.c:1042
+#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
 msgid ": bad directory: '..' isn't second\n"
 msgstr ": diret�rio inv�lido: '..' n�o � o segundo\n"
 
-#: disk-utils/fsck.minix.c:1074
+#: disk-utils/fsck.minix.c:1070
 msgid "internal error"
 msgstr "erro interno"
 
-#: disk-utils/fsck.minix.c:1077
+#: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
 msgstr ": diret�rio inv�lido: tamanho < 32"
 
-#: disk-utils/fsck.minix.c:1096
+#: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
 msgstr ": diret�rio inv�lido: tamanho < 32"
 
-#: disk-utils/fsck.minix.c:1109
+#: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
 msgstr "busca falhou em bad_zone"
 
-#: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1172
+#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "O modo do inode %d n�o foi limpo."
 
-#: disk-utils/fsck.minix.c:1128 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
 #, c-format
 msgid "Inode %d not used, marked used in the bitmap."
-msgstr ""
-"O inode %d n�o est� sendo usado, mas est� marcado como em uso no bitmap."
+msgstr "O inode %d n�o est� sendo usado, mas est� marcado como em uso no bitmap."
 
-#: disk-utils/fsck.minix.c:1134 disk-utils/fsck.minix.c:1187
+#: disk-utils/fsck.minix.c:1129 disk-utils/fsck.minix.c:1181
 #, c-format
 msgid "Inode %d used, marked unused in the bitmap."
-msgstr ""
-"O inode %d est� sendo usado, mas est� marcado como n�o utilizado no bitmap."
+msgstr "O inode %d est� sendo usado, mas est� marcado como n�o utilizado no bitmap."
 
-#: disk-utils/fsck.minix.c:1140 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1135 disk-utils/fsck.minix.c:1186
 #, c-format
 msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modo = %07o), i_nlinks = %d, contados = %d."
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1194
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 msgid "Set i_nlinks to count"
 msgstr "Configurar i_nlinks para contagem"
 
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
 #, c-format
 msgid "Zone %d: marked in use, no file uses it."
 msgstr "Zona %d marcada em uso, mas nenhum arquivo a usa."
 
-#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1207
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
 msgstr "Desmarcar"
 
-#: disk-utils/fsck.minix.c:1159 disk-utils/fsck.minix.c:1211
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
 #, c-format
 msgid "Zone %d: %sin use, counted=%d\n"
 msgstr "Zona %d: %s em uso, contados = %d\n"
 
-#: disk-utils/fsck.minix.c:1160 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
 msgstr "n�o "
 
-#: disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1182
 msgid "Set"
 msgstr "Configurar"
 
-#: disk-utils/fsck.minix.c:1260 disk-utils/mkfs.minix.c:655
-#: disk-utils/mkfs.minix.c:658
+#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/mkfs.minix.c:648
 msgid "bad inode size"
 msgstr "tamanho de inode inv�lido"
 
-#: disk-utils/fsck.minix.c:1263
+#: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
 msgstr "tamanho de inode v2 inv�lido"
 
-#: disk-utils/fsck.minix.c:1289
+#: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
 msgstr "� necess�rio um terminal para reparos interativos"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
 msgstr "n�o foi poss�vel abrir '%s'"
 
-#: disk-utils/fsck.minix.c:1308
+#: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s est� limpo; sem verifica��o.\n"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "For�ando verifica��o do sistema de arquivos em %s.\n"
 
-#: disk-utils/fsck.minix.c:1314
+#: disk-utils/fsck.minix.c:1307
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "O sistema de arquivos em %s est� sujo: precisa de verifica��o\n"
 
-#: disk-utils/fsck.minix.c:1343
-msgid ""
-"\n"
-"%6ld inodes used (%ld%%)\n"
-msgstr ""
-"\n"
-"%6ld inodes usados (%ld%%)\n"
+#: disk-utils/fsck.minix.c:1336
+msgid "\n%6ld inodes used (%ld%%)\n"
+msgstr "\n%6ld inodes usados (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1348
+#: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zonas usadas (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1343
 #, c-format
 msgid ""
 "\n"
@@ -1152,7 +1093,7 @@ msgstr ""
 "------\n"
 "%6d arquivos\n"
 
-#: disk-utils/fsck.minix.c:1363
+#: disk-utils/fsck.minix.c:1356
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -1164,11 +1105,10 @@ msgstr ""
 
 #: disk-utils/mkfs.c:76
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
-msgstr ""
-"Uso: mkfs [-V] [-t tipoSistArq] [op��es-sistArq] dispositivo [tamanho]\n"
+msgstr "Uso: mkfs [-V] [-t tipoSistArq] [op��es-sistArq] dispositivo [tamanho]\n"
 
-#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.0.3b/getopt.c:85
-#: getopt-1.0.3b/getopt.c:95 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: mem�ria insuficiente!\n"
@@ -1178,201 +1118,193 @@ msgstr "%s: mem�ria insuficiente!\n"
 msgid "mkfs version %s (%s)\n"
 msgstr "mkfs vers�o %s (%s)\n"
 
-#: disk-utils/mkfs.minix.c:185
+#: disk-utils/mkfs.minix.c:179
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c | -l NomeArquivo] [-nXX] [-iXX] dispositivo [blocos]\n"
 
-#: disk-utils/mkfs.minix.c:209
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s est� montado; n�o criar� um sistema de arquivos aqui!"
 
-#: disk-utils/mkfs.minix.c:270
+#: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
 msgstr "busca de bloco de boot falhou em write_tables"
 
-#: disk-utils/mkfs.minix.c:272
+#: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
 msgstr "n�o foi poss�vel limpar o setor de boot"
 
-#: disk-utils/mkfs.minix.c:274
+#: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
 msgstr "busca falhou em write_tables"
 
-#: disk-utils/mkfs.minix.c:278
+#: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
 msgstr "n�o foi poss�vel gravar mapa de inodes"
 
-#: disk-utils/mkfs.minix.c:280
+#: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
 msgstr "n�o foi poss�vel gravar mapa de zonas"
 
-#: disk-utils/mkfs.minix.c:282
+#: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
 msgstr "n�o foi poss�vel gravar inodes"
 
-#: disk-utils/mkfs.minix.c:291
+#: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
 msgstr "grava��o falhou em write_block"
 
 #. Could make triple indirect block here
-#: disk-utils/mkfs.minix.c:299 disk-utils/mkfs.minix.c:373
-#: disk-utils/mkfs.minix.c:424
+#: disk-utils/mkfs.minix.c:293 disk-utils/mkfs.minix.c:367
+#: disk-utils/mkfs.minix.c:417
 msgid "too many bad blocks"
 msgstr "n�mero excessivo de blocos defeituosos"
 
-#: disk-utils/mkfs.minix.c:307
+#: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
 msgstr "n�o h� blocos sem problemas suficientes"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
 msgstr "n�o foi poss�vel alocar buffers para mapas"
 
-#: disk-utils/mkfs.minix.c:530
+#: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
 msgstr "n�o foi poss�vel alocar buffers para inodes"
 
-#: disk-utils/mkfs.minix.c:536
+#: disk-utils/mkfs.minix.c:528
 #, c-format
-msgid ""
-"Maxsize=%ld\n"
-"\n"
-msgstr ""
-"Tamanho m�ximo = %ld\n"
-"\n"
+msgid "Maxsize=%ld\n\n"
+msgstr "Tamanho m�ximo = %ld\n\n"
 
-#: disk-utils/mkfs.minix.c:550
+#: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
 msgstr "busca falhou durante teste de blocos"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:550
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores estranhos em do_check: provavelmente erros\n"
 
-#: disk-utils/mkfs.minix.c:589 disk-utils/mkswap.c:261
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
 msgid "seek failed in check_blocks"
 msgstr "busca falhou em check_blocks"
 
-#: disk-utils/mkfs.minix.c:598
+#: disk-utils/mkfs.minix.c:590
 msgid "bad blocks before data-area: cannot make fs"
-msgstr ""
-"blocos defeituosos antes da �rea de dados: n�o � poss�vel criar sistema de "
-"arquivos"
+msgstr "blocos defeituosos antes da �rea de dados: n�o � poss�vel criar sistema de arquivos"
 
-#: disk-utils/mkfs.minix.c:604 disk-utils/mkfs.minix.c:626
+#: disk-utils/mkfs.minix.c:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d blocos defeituosos\n"
 
-#: disk-utils/mkfs.minix.c:606 disk-utils/mkfs.minix.c:628
+#: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
 msgstr "um bloco defeituoso\n"
 
-#: disk-utils/mkfs.minix.c:618
+#: disk-utils/mkfs.minix.c:608
 msgid "can't open file of bad blocks"
 msgstr "n�o foi poss�vel abrir arquivo de blocos defeituosos"
 
-#: disk-utils/mkfs.minix.c:687
+#: disk-utils/mkfs.minix.c:677
 #, c-format
 msgid "%s: not compiled with minix v2 support\n"
 msgstr "%s: n�o compilado com suporte a minix v2\n"
 
-#: disk-utils/mkfs.minix.c:703
+#: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
 msgstr "erro de strtol: n�mero de blocos n�o especificado"
 
-#: disk-utils/mkfs.minix.c:735
+#: disk-utils/mkfs.minix.c:725
 #, c-format
 msgid "unable to open %s"
 msgstr "n�o foi poss�vel abrir %s"
 
-#: disk-utils/mkfs.minix.c:737
+#: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
 msgstr "n�o foi poss�vel stat %s"
 
-#: disk-utils/mkfs.minix.c:741
+#: disk-utils/mkfs.minix.c:731
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "n�o ser� tentado criar sistema de arquivos em '%s'"
 
-#: disk-utils/mkswap.c:117
+#: disk-utils/mkswap.c:174
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Tamanho de p�gina especificado pelo usu�rio %d inv�lido\n"
 
-#: disk-utils/mkswap.c:126
+#: disk-utils/mkswap.c:183
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
-msgstr ""
-"Usando tamanho de p�gina especificado pelo usu�rio %d, em vez dos valores do "
-"sistema %d/%d\n"
+msgstr "Usando tamanho de p�gina especificado pelo usu�rio %d, em vez dos valores do sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:130
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Assuming pages of size %d (not %d)\n"
 msgstr "Assumindo p�ginas de tamanho %d (n�o %d)\n"
 
-#: disk-utils/mkswap.c:215
+#: disk-utils/mkswap.c:312
 #, c-format
 msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n"
 msgstr "Uso: %s [-c] [-v0|-v1] [-pTamP�g] dispositivo [blocos]\n"
 
-#: disk-utils/mkswap.c:238
+#: disk-utils/mkswap.c:335
 msgid "too many bad pages"
 msgstr "n�mero excessivo de p�ginas inv�lidas"
 
-#: disk-utils/mkswap.c:252 misc-utils/look.c:170 misc-utils/setterm.c:1100
-#: text-utils/more.c:1863 text-utils/more.c:1874
+#: disk-utils/mkswap.c:349 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1864 text-utils/more.c:1875
 msgid "Out of memory"
 msgstr "Mem�ria insuficiente"
 
-#: disk-utils/mkswap.c:269
+#: disk-utils/mkswap.c:366
 msgid "one bad page\n"
 msgstr "uma p�gina inv�lida\n"
 
-#: disk-utils/mkswap.c:271
+#: disk-utils/mkswap.c:368
 #, c-format
 msgid "%d bad pages\n"
 msgstr "%d p�ginas inv�lidas\n"
 
-#: disk-utils/mkswap.c:391
+#: disk-utils/mkswap.c:488
 #, 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:409
+#: disk-utils/mkswap.c:506
 #, c-format
 msgid "%s: error: size %ld is larger than device size %d\n"
 msgstr "%s: erro - tamanho %ld � maior do que o tamanho do dispositivo %d\n"
 
-#: disk-utils/mkswap.c:427
+#: disk-utils/mkswap.c:525
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s - erro: vers�o %d desconhecida\n"
 
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:531
 #, c-format
 msgid "%s: error: swap area needs to be at least %ldkB\n"
 msgstr "%s - erro: a �rea de permuta (swap) precisa ter pelo menos %ld kB\n"
 
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:550
 #, c-format
 msgid "%s: warning: truncating swap area to %ldkB\n"
 msgstr "%s -- aviso: reduzindo �rea de permuta (swap) para %ld kB\n"
 
-#: disk-utils/mkswap.c:464
+#: disk-utils/mkswap.c:562
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
 msgstr "N�o ser� tentado criar dispositivo de permuta (swap) em '%s'"
 
-#: disk-utils/mkswap.c:473 disk-utils/mkswap.c:494
+#: disk-utils/mkswap.c:571 disk-utils/mkswap.c:592
 msgid "fatal: first page unreadable"
 msgstr "fatal: primeira p�gina ileg�vel"
 
-#: disk-utils/mkswap.c:479
+#: disk-utils/mkswap.c:577
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1381,44 +1313,42 @@ msgid ""
 "the -f option to force it.\n"
 msgstr ""
 "%s: o dispositivo '%s' cont�m um r�tulo de disco Sun v�lido.\n"
-" Isto provavelmente significa que criar a permuta (swap) v0 destruir� sua "
-"tabela de parti��es.\n"
-" Nenhuma permuta criada. Se voc� realmente deseja criar uma permuta v0 nesse "
-"dispositivo, use\n"
+" Isto provavelmente significa que criar a permuta (swap) v0 destruir� sua tabela de parti��es.\n"
+" Nenhuma permuta criada. Se voc� realmente deseja criar uma permuta v0 nesse dispositivo, use\n"
 "a op��o -f para for�ar a cria��o.\n"
 
-#: disk-utils/mkswap.c:503
+#: disk-utils/mkswap.c:601
 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:504
+#: disk-utils/mkswap.c:602
 #, c-format
 msgid "Setting up swapspace version %d, size = %ld bytes\n"
 msgstr "Configurando espa�o de permuta (swap) vers�o %d, tamanho = %ld bytes\n"
 
-#: disk-utils/mkswap.c:510
+#: disk-utils/mkswap.c:608
 msgid "unable to rewind swap-device"
 msgstr "N�o foi poss�vel rebobinar o dispositivo de permuta (swap)"
 
-#: disk-utils/mkswap.c:513
+#: disk-utils/mkswap.c:611
 msgid "unable to write signature page"
 msgstr "N�o foi poss�vel gravar a p�gina de assinatura"
 
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:619
 msgid "fsync failed"
 msgstr "fsync falhou"
 
-#: disk-utils/setfdprm.c:30
+#: disk-utils/setfdprm.c:31
 #, c-format
 msgid "Invalid number: %s\n"
 msgstr "N�mero inv�lido: %s\n"
 
-#: disk-utils/setfdprm.c:80
+#: disk-utils/setfdprm.c:81
 #, c-format
 msgid "Syntax error: '%s'\n"
 msgstr "Erro de sintaxe: '%s'\n"
 
-#: disk-utils/setfdprm.c:90
+#: disk-utils/setfdprm.c:91
 #, c-format
 msgid "No such parameter set: '%s'\n"
 msgstr "N�o h� tal par�metro definido: '%s'\n"
@@ -1430,11 +1360,8 @@ msgstr "Uso: %s [ -p ] dispositivo\n"
 
 #: disk-utils/setfdprm.c:101
 #, c-format
-msgid ""
-"       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
-msgstr ""
-"       %s [ -p ] disp tam set cabe� trilhas ext   interv taxa spec1 "
-"fmt_interv\n"
+msgid "       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n"
+msgstr "       %s [ -p ] disp tam set cabe� trilhas ext   interv taxa spec1 fmt_interv\n"
 
 #: disk-utils/setfdprm.c:104
 #, c-format
@@ -1446,46 +1373,44 @@ msgstr "       %s [ -c | -y | -n | -d ] disp\n"
 msgid "       %s [ -c | -y | -n ] dev\n"
 msgstr "       %s [ -c | -y | -n ] disp\n"
 
-#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
 msgid "Unusable"
 msgstr "Inutiliz�vel"
 
-#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
 msgid "Free Space"
 msgstr "Espa�o livre"
 
-#: fdisk/cfdisk.c:399
+#: fdisk/cfdisk.c:398
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:56
+#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:404
+#: fdisk/cfdisk.c:403
 msgid "OS/2 HPFS"
 msgstr "HPFS do OS/2"
 
-#: fdisk/cfdisk.c:406
+#: fdisk/cfdisk.c:405
 msgid "OS/2 IFS"
 msgstr "IFS do OS/2"
 
-#: fdisk/cfdisk.c:410
+#: fdisk/cfdisk.c:409
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:420
 msgid "Disk has been changed.\n"
 msgstr "O disco foi alterado.\n"
 
-#: fdisk/cfdisk.c:422
+#: fdisk/cfdisk.c:421
 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"
+msgstr "Reinicialize o sistema para assegurar que a tabela de parti��es seja atualizada corretamente.\n"
 
-#: fdisk/cfdisk.c:425
+#: fdisk/cfdisk.c:424
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1497,23 +1422,23 @@ msgstr ""
 "parti��o DOS 6.x, consulte a p�gina de manual\n"
 "do cfdisk para obter informa��es adicionais.\n"
 
-#: fdisk/cfdisk.c:520
+#: fdisk/cfdisk.c:519
 msgid "FATAL ERROR"
 msgstr "ERRO FATAL"
 
-#: fdisk/cfdisk.c:529
+#: fdisk/cfdisk.c:528
 msgid "Press any key to exit cfdisk"
 msgstr "Pressione qualquer tecla para sair do cfdisk"
 
-#: fdisk/cfdisk.c:565 fdisk/cfdisk.c:573
+#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
 msgid "Cannot seek on disk drive"
 msgstr "N�o foi poss�vel realizar busca na unidade de disco"
 
-#: fdisk/cfdisk.c:567
+#: fdisk/cfdisk.c:566
 msgid "Cannot read disk drive"
 msgstr "N�o foi poss�vel ler a unidade de disco"
 
-#: fdisk/cfdisk.c:575
+#: fdisk/cfdisk.c:574
 msgid "Cannot write disk drive"
 msgstr "N�o foi poss�vel gravar na unidade de disco"
 
@@ -1550,15 +1475,12 @@ msgid "enlarged logical partitions overlap"
 msgstr "parti��es l�gicas aumentadas sobrepostas"
 
 #: fdisk/cfdisk.c:893
-msgid ""
-"!!!! Internal error creating logical drive with no extended partition !!!!"
+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:904 fdisk/cfdisk.c:916
-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"
+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:1066
 msgid "Menu item too long. Menu may look odd."
@@ -1636,8 +1558,7 @@ msgstr "Assinatura inv�lida na tabela de parti��es"
 
 #: fdisk/cfdisk.c:1473
 msgid "You specified more cylinders than fit on disk"
-msgstr ""
-"Foram especificados mais cilindros do que a quantidade que cabe no disco"
+msgstr "Foram especificados mais cilindros do que a quantidade que cabe no disco"
 
 #: fdisk/cfdisk.c:1503
 msgid "Cannot open disk drive"
@@ -1667,9 +1588,7 @@ msgstr "Aviso!! Isto pode destruir dados existentes no disco!"
 
 #: fdisk/cfdisk.c:1702
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
-msgstr ""
-"Tem certeza de que deseja gravar a tabela de parti��es no disco? (sim ou "
-"nao):"
+msgstr "Tem certeza de que deseja gravar a tabela de parti��es no disco? (sim ou nao):"
 
 #: fdisk/cfdisk.c:1708
 msgid "no"
@@ -1696,18 +1615,12 @@ msgid "Wrote partition table to disk"
 msgstr "A tabela de parti��es foi gravada no disco"
 
 #: fdisk/cfdisk.c:1745
-msgid ""
-"Wrote partition table, but re-read table failed.  Reboot to update table."
-msgstr ""
-"Tabela de parti��es gravada, mas a releitura da tabela falhou. Reinicialize "
-"para atualizar a tabela."
+msgid "Wrote partition table, but re-read table failed.  Reboot to update table."
+msgstr "Tabela de parti��es gravada, mas a releitura da tabela falhou. Reinicialize para atualizar a tabela."
 
 #: fdisk/cfdisk.c:1755
-msgid ""
-"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
-msgstr ""
-"N�o exatamente uma parti��o prim�ria inicializ�vel. O MBR do DOS n�o pode "
-"inicializar nesta situa��o."
+msgid "Not precisely one primary partition is bootable. DOS MBR cannot boot this."
+msgstr "N�o exatamente uma parti��o prim�ria inicializ�vel. O MBR do DOS n�o pode inicializar nesta situa��o."
 
 #: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1931 fdisk/cfdisk.c:2015
 msgid "Enter filename or press RETURN to display on screen: "
@@ -1751,8 +1664,8 @@ msgstr "   L�gica"
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1071 fdisk/fdisk.c:1220
-#: fdisk/fdisksgilabel.c:224 fdisk/fdisksunlabel.c:646 fdisk/sfdisk.c:559
+#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1235 fdisk/fdisk.c:1459
+#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -1781,19 +1694,12 @@ msgid "            First    Last\n"
 msgstr "            Prim.    �lt.\n"
 
 #: fdisk/cfdisk.c:1953
-msgid ""
-" # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
-msgstr ""
-" # Tipo     Setor    Setor    Desloc. Compr.   Tipo sist. arqs. (ID)  "
-"Op��es\n"
+msgid " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
+msgstr " # Tipo     Setor    Setor    Desloc. Compr.   Tipo sist. arqs. (ID)  Op��es\n"
 
 #: fdisk/cfdisk.c:1954
-msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
-msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+msgid "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
+msgstr "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
 
 #: fdisk/cfdisk.c:2036
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
@@ -1841,8 +1747,7 @@ msgstr "Tela de ajuda do cfdisk"
 
 #: fdisk/cfdisk.c:2104
 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 "
+msgstr "Este � o cfdisk, um programa de particionamento de disco baseado em fun��es "
 
 #: fdisk/cfdisk.c:2105
 msgid "allows you to create, delete and modify partitions on your hard"
@@ -1874,8 +1779,7 @@ msgstr "  d          Exclui a parti��o atual."
 
 #: fdisk/cfdisk.c:2114
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
-msgstr ""
-"  g          Altera par�metros de cilindros, cabe�as, setores por trilha"
+msgstr "  g          Altera par�metros de cilindros, cabe�as, setores por trilha"
 
 #: fdisk/cfdisk.c:2115
 msgid "             WARNING: This option should only be used by people who"
@@ -1919,8 +1823,7 @@ msgstr "             uma parti��o:"
 
 #: fdisk/cfdisk.c:2125
 msgid "                r - Raw data (exactly what would be written to disk)"
-msgstr ""
-"                r - Dados brutos (exatamente o que seria gravado no disco)."
+msgstr "                r - Dados brutos (exatamente o que seria gravado no disco)."
 
 #: fdisk/cfdisk.c:2126
 msgid "                s - Table ordered by sectors"
@@ -1948,9 +1851,7 @@ msgstr "             Alterna entre MB, setores e cilindros."
 
 #: fdisk/cfdisk.c:2132
 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)."
+msgstr "  W          Grava tabela de parti��es no disco (� necess�rio usar W mai�sculo)."
 
 #: fdisk/cfdisk.c:2133
 msgid "             Since this might destroy data on the disk, you must"
@@ -1988,8 +1889,8 @@ msgstr "Nota: Todos os comandos podem ser digitados em letras mai�sculas ou"
 msgid "case letters (except for Writes)."
 msgstr "min�sculas (exceto W)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:305
-#: fdisk/fdisksunlabel.c:307
+#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindros"
 
@@ -1997,7 +1898,7 @@ msgstr "Cilindros"
 msgid "Change cylinder geometry"
 msgstr "Alterar geometria dos cilindros"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:302
+#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Cabe�as"
 
@@ -2159,9 +2060,7 @@ msgstr "Maximize"
 
 #: fdisk/cfdisk.c:2557
 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)"
+msgstr "Maximizar o uso de disco para a parti��o atual (somente para usu�rios avan�ados)"
 
 #: fdisk/cfdisk.c:2558
 msgid "New"
@@ -2201,9 +2100,7 @@ msgstr "Unidades"
 
 #: fdisk/cfdisk.c:2562
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr ""
-"Mudar unidades mostradas para o tamanho das parti��es (MB, setores, "
-"cilindros)"
+msgstr "Mudar unidades mostradas para o tamanho das parti��es (MB, setores, cilindros)"
 
 #: fdisk/cfdisk.c:2563
 msgid "Write"
@@ -2246,8 +2143,8 @@ msgid "Illegal command"
 msgstr "Comando inv�lido"
 
 #: fdisk/cfdisk.c:2718
-msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb\n"
+msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
+msgstr "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
 
 #. Unfortunately, xgettext does not handle multi-line strings
 #. so, let's use explicit \n's instead
@@ -2281,14 +2178,12 @@ msgstr ""
 "\n"
 "Op��es:\n"
 "-a: Usar seta em vez de realce.\n"
-"-z: Iniciar com uma tabela de zero parti��es, em vez de ler a tabela do "
-"disco.\n"
-"-c C -h H -s S: Sobrepor as suposi��es do kernel quanto a n�mero de "
-"cilindros,\n"
+"-z: Iniciar com uma tabela de zero parti��es, em vez de ler a tabela do disco.\n"
+"-c C -h H -s S: Sobrepor as suposi��es do kernel quanto a n�mero de cilindros,\n"
 "                n�mero de cabe�as e n�mero de setores/trilha.\n"
 "\n"
 
-#: fdisk/fdisk.c:246
+#: fdisk/fdisk.c:205
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
 "       fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n"
@@ -2301,15 +2196,14 @@ msgid ""
 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 -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:258
+#: fdisk/fdisk.c:217
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2322,217 +2216,225 @@ msgstr ""
 "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"
+" ou : fdisk /dev/rd/c0d0  ou : fdisk /dev/ida/c0d0  (para dispositivos RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:266
+#: fdisk/fdisk.c:225
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:269
+#: fdisk/fdisk.c:228
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "N�o foi poss�vel ler %s\n"
 
-#: fdisk/fdisk.c:272
+#: fdisk/fdisk.c:231
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "N�o foi poss�vel realizar busca em %s\n"
 
-#: fdisk/fdisk.c:275
+#: fdisk/fdisk.c:234
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "N�o foi poss�vel gravar em %s\n"
 
-#: fdisk/fdisk.c:278
+#: fdisk/fdisk.c:237
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE  falhou em %s\n"
 
-#: fdisk/fdisk.c:282
+#: fdisk/fdisk.c:241
 msgid "Unable to allocate any more memory\n"
 msgstr "N�o foi poss�vel alocar mais qualquer mem�ria\n"
 
-#: fdisk/fdisk.c:284
+#: fdisk/fdisk.c:243
 msgid "Fatal error\n"
 msgstr "Erro fatal\n"
 
-#: fdisk/fdisk.c:295 fdisk/fdisk.c:314 fdisk/fdisk.c:332 fdisk/fdisk.c:339
-#: fdisk/fdisk.c:362 fdisk/fdisk.c:380 fdisk/fdiskbsdlabel.c:105
+#: fdisk/fdisk.c:312 fdisk/fdisk.c:331 fdisk/fdisk.c:349 fdisk/fdisk.c:356
+#: fdisk/fdisk.c:379 fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
+#: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
 msgstr "Comando - a��o"
 
-#: fdisk/fdisk.c:296
+#: fdisk/fdisk.c:313
 msgid "   a   toggle a read only flag"
 msgstr "   a   alterna uma op��o de somente leitura"
 
 #. sun
-#: fdisk/fdisk.c:297 fdisk/fdisk.c:341
+#: fdisk/fdisk.c:314 fdisk/fdisk.c:358
 msgid "   b   edit bsd disklabel"
 msgstr "   b   edita r�tulo BSD no disco"
 
-#: fdisk/fdisk.c:298
+#: fdisk/fdisk.c:315
 msgid "   c   toggle the mountable flag"
 msgstr "   c   alterna a op��o \"mont�vel\""
 
 #. sun
-#: fdisk/fdisk.c:299 fdisk/fdisk.c:318 fdisk/fdisk.c:343
+#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
 msgid "   d   delete a partition"
 msgstr "   d   exclui uma parti��o"
 
-#: fdisk/fdisk.c:300 fdisk/fdisk.c:319 fdisk/fdisk.c:344
+#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:361
 msgid "   l   list known partition types"
 msgstr "   l   lista os tipos de parti��o conhecidos"
 
 #. sun
-#: fdisk/fdisk.c:301 fdisk/fdisk.c:320 fdisk/fdisk.c:333 fdisk/fdisk.c:345
-#: fdisk/fdisk.c:370 fdisk/fdisk.c:387 fdisk/fdiskbsdlabel.c:110
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:350 fdisk/fdisk.c:362
+#: fdisk/fdisk.c:387 fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:437
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   mostra este menu"
 
-#: fdisk/fdisk.c:302 fdisk/fdisk.c:321 fdisk/fdisk.c:346
+#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:363
 msgid "   n   add a new partition"
 msgstr "   n   cria uma nova parti��o"
 
-#: fdisk/fdisk.c:303 fdisk/fdisk.c:322 fdisk/fdisk.c:334 fdisk/fdisk.c:347
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:351 fdisk/fdisk.c:364
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   cria uma nova tabela de parti��es DOS vazia"
 
-#: fdisk/fdisk.c:304 fdisk/fdisk.c:323 fdisk/fdisk.c:348 fdisk/fdisk.c:371
-#: fdisk/fdisk.c:388
+#: fdisk/fdisk.c:321 fdisk/fdisk.c:340 fdisk/fdisk.c:365 fdisk/fdisk.c:388
+#: fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:438
 msgid "   p   print the partition table"
 msgstr "   p   mostra a tabela de parti��es"
 
-#: fdisk/fdisk.c:305 fdisk/fdisk.c:324 fdisk/fdisk.c:335 fdisk/fdisk.c:349
-#: fdisk/fdisk.c:372 fdisk/fdisk.c:389 fdisk/fdiskbsdlabel.c:113
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr "   q   sai sem salvar as altera��es"
 
-#: fdisk/fdisk.c:306 fdisk/fdisk.c:325 fdisk/fdisk.c:336 fdisk/fdisk.c:350
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:353 fdisk/fdisk.c:367
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   cria um novo r�tulo de disco Sun vazio"
 
 #. sun
-#: fdisk/fdisk.c:307 fdisk/fdisk.c:326 fdisk/fdisk.c:351
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
 msgid "   t   change a partition's system id"
 msgstr "   t   altera a identifica��o da parti��o para o sistema"
 
-#: fdisk/fdisk.c:308 fdisk/fdisk.c:327 fdisk/fdisk.c:352
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369
 msgid "   u   change display/entry units"
 msgstr "   u   altera as unidades das entradas mostradas"
 
-#: fdisk/fdisk.c:309 fdisk/fdisk.c:328 fdisk/fdisk.c:353 fdisk/fdisk.c:375
-#: fdisk/fdisk.c:392
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:370 fdisk/fdisk.c:392
+#: fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   v   verify the partition table"
 msgstr "   v   verifica a tabela de parti��es"
 
-#: fdisk/fdisk.c:310 fdisk/fdisk.c:329 fdisk/fdisk.c:354 fdisk/fdisk.c:376
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371 fdisk/fdisk.c:393
+#: fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 msgid "   w   write table to disk and exit"
 msgstr "   w   grava a tabela no disco e sai"
 
-#: fdisk/fdisk.c:311 fdisk/fdisk.c:355
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:372
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   funcionalidade adicional (somente para usu�rios avan�ados)"
 
-#: fdisk/fdisk.c:315
+#: fdisk/fdisk.c:332
 msgid "   a   select bootable partition"
 msgstr "   a   torna a parti��o inicializ�vel"
 
 #. sgi flavour
-#: fdisk/fdisk.c:316
+#: fdisk/fdisk.c:333
 msgid "   b   edit bootfile entry"
 msgstr "   b   edita uma entrada de arquivo de inicializa��o"
 
 #. sgi
-#: fdisk/fdisk.c:317
+#: fdisk/fdisk.c:334
 msgid "   c   select sgi swap partition"
 msgstr "   c   seleciona uma parti��o de permuta (swap) sgi"
 
-#: fdisk/fdisk.c:340
+#: fdisk/fdisk.c:357
 msgid "   a   toggle a bootable flag"
 msgstr "   a   alterna a op��o \"inicializ�vel\""
 
-#: fdisk/fdisk.c:342
+#: fdisk/fdisk.c:359
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   alterna a op��o \"compatibilidade\""
 
-#: fdisk/fdisk.c:363
+#: fdisk/fdisk.c:380
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   alterar n�mero de cilindros alternativos"
 
 #. sun
-#: fdisk/fdisk.c:364 fdisk/fdisk.c:382
+#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
 msgid "   c   change number of cylinders"
 msgstr "   c   alterar n�mero de cilindros"
 
-#: fdisk/fdisk.c:365 fdisk/fdisk.c:383
+#: fdisk/fdisk.c:382 fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
 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:366
+#: fdisk/fdisk.c:383
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   alterar n�mero de setores extras por cilindro"
 
 #. sun
-#: fdisk/fdisk.c:367 fdisk/fdisk.c:386
+#: fdisk/fdisk.c:384 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
 msgid "   h   change number of heads"
 msgstr "   h   alterar n�mero de cabe�as"
 
-#: fdisk/fdisk.c:368
+#: fdisk/fdisk.c:385
 msgid "   i   change interleave factor"
 msgstr "   i   alterar fator de \"interleave\""
 
 #. sun
-#: fdisk/fdisk.c:369
+#: fdisk/fdisk.c:386
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   alterar velocidade de rota��o (RPM)"
 
-#: fdisk/fdisk.c:373 fdisk/fdisk.c:390 fdisk/fdiskbsdlabel.c:115
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   voltar ao menu principal"
 
-#: fdisk/fdisk.c:374 fdisk/fdisk.c:391
+#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   s   change number of sectors/track"
 msgstr "   s   alterar n�mero de setores/trilha"
 
-#: fdisk/fdisk.c:377
+#: fdisk/fdisk.c:394
 msgid "   y   change number of physical cylinders"
 msgstr "   y   alterar n�mero de cilindros f�sicos"
 
-#: fdisk/fdisk.c:381
+#: fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   mover in�cio dos dados em uma parti��o"
 
-#: fdisk/fdisk.c:384
+#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
 msgid "   e   list extended partitions"
 msgstr "   e   listar parti��es estendidas"
 
 #. !sun
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
 msgid "   g   create an IRIX partition table"
 msgstr "   g   criar uma tabela de parti��es IRIX"
 
-#: fdisk/fdisk.c:481
+#. !sun
+#: fdisk/fdisk.c:434
+msgid "   f   fix partition order"
+msgstr "   f   corrige ordem de parti��o"
+
+#: fdisk/fdisk.c:533
 msgid "You must set"
 msgstr "Voc� precisa configurar"
 
-#: fdisk/fdisk.c:495
+#: fdisk/fdisk.c:547
 msgid "heads"
 msgstr "cabe�as"
 
-#: fdisk/fdisk.c:497 fdisk/fdisk.c:905 fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:549 fdisk/fdisk.c:1068 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "setores"
 
-#: fdisk/fdisk.c:499 fdisk/fdisk.c:905 fdisk/fdiskbsdlabel.c:444
-#: fdisk/sfdisk.c:842
+#: fdisk/fdisk.c:551 fdisk/fdisk.c:1068 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cilindros"
 
-#: fdisk/fdisk.c:503
+#: fdisk/fdisk.c:555
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2541,30 +2443,30 @@ msgstr ""
 "%s%s.\n"
 "Voc� pode fazer isto a partir do menu de fun��es extras.\n"
 
-#: fdisk/fdisk.c:504
+#: fdisk/fdisk.c:556
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:538
+#: fdisk/fdisk.c:596
 msgid "Bad offset in primary extended partition\n"
 msgstr "Deslocamento inv�lido em uma parti��o prim�ria estendida\n"
 
-#: fdisk/fdisk.c:545
+#: fdisk/fdisk.c:610
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Aviso: excluindo parti��es ap�s %d\n"
 
-#: fdisk/fdisk.c:566
+#: fdisk/fdisk.c:626
 #, 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:574
+#: fdisk/fdisk.c:634
 #, 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:600
+#: fdisk/fdisk.c:678
 msgid ""
 "Building a new DOS disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -2576,108 +2478,96 @@ msgstr ""
 "o conte�do anterior n�o poder� mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisk.c:636
-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:645
+#: fdisk/fdisk.c:722
 #, 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:693
-msgid ""
-"Device contains neither a valid DOS partition table, nor Sun or SGI "
-"disklabel\n"
-msgstr ""
-"O dispositivo n�o cont�m nem uma tabela de parti��es DOS v�lida nem um "
-"r�tulo de disco Sun ou SGI\n"
+#: fdisk/fdisk.c:805
+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:833
+msgid "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel\n"
+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:709
+#: fdisk/fdisk.c:849
 msgid "Internal error\n"
 msgstr "Erro interno\n"
 
-#: fdisk/fdisk.c:719
+#: fdisk/fdisk.c:871
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorando parti��o estendida extra %d\n"
 
-#: fdisk/fdisk.c:726
+#: fdisk/fdisk.c:883
 #, c-format
-msgid ""
-"Warning: invalid flag 0x%04x of partition table %d will be corrected by "
-"w(rite)\n"
-msgstr ""
-"Aviso: a op��o inv�lida 0x%04x da tabela de parti��es %d ser� corrigida por "
-"grava��o (w)\n"
+msgid "Warning: invalid flag 0x%04x of partition table %d will be corrected by w(rite)\n"
+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:747
-msgid ""
-"\n"
-"got EOF thrice - exiting..\n"
-msgstr ""
-"\n"
-"EOF (fim de arquivo) recebido tr�s vezes - saindo...\n"
+#: fdisk/fdisk.c:905
+msgid "\ngot EOF thrice - exiting..\n"
+msgstr "\nEOF (fim de arquivo) recebido tr�s vezes - saindo...\n"
 
-#: fdisk/fdisk.c:784
+#: fdisk/fdisk.c:943
 msgid "Hex code (type L to list codes): "
 msgstr "C�digo hexadecimal (digite L para listar os c�digos): "
 
-#: fdisk/fdisk.c:823
+#: fdisk/fdisk.c:982
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, padr�o %d):"
 
-#: fdisk/fdisk.c:877
+#: fdisk/fdisk.c:1036
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Usando valor padr�o %d\n"
 
-#: fdisk/fdisk.c:881
+#: fdisk/fdisk.c:1040
 msgid "Value out of range.\n"
 msgstr "Valor fora do intervalo.\n"
 
-#: fdisk/fdisk.c:888
+#: fdisk/fdisk.c:1050
 msgid "Partition number"
 msgstr "N�mero da parti��o"
 
-#: fdisk/fdisk.c:896
+#: fdisk/fdisk.c:1059
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Aviso: a parti��o %d possui tipo vazio\n"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1066
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:903
+#: fdisk/fdisk.c:1066
 msgid "sector"
 msgstr "setor"
 
-#: fdisk/fdisk.c:912
+#: fdisk/fdisk.c:1075
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Mudando as unidades das entradas mostradas para %s\n"
 
-#: fdisk/fdisk.c:922
+#: fdisk/fdisk.c:1086
 #, 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:935
+#: fdisk/fdisk.c:1097
 msgid "DOS Compatibility flag is set\n"
 msgstr "A op��o de compatibilidade DOS est� ativada\n"
 
-#: fdisk/fdisk.c:939
+#: fdisk/fdisk.c:1101
 msgid "DOS Compatibility flag is not set\n"
 msgstr "A op��o de compatibilidade DOS n�o est� ativada\n"
 
-#: fdisk/fdisk.c:1025
+#: fdisk/fdisk.c:1189
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "A parti��o %d ainda n�o existe!\n"
 
-#: fdisk/fdisk.c:1030
+#: fdisk/fdisk.c:1194
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2689,7 +2579,7 @@ msgstr ""
 "tipo 0 n�o � recomend�vel. Voc� pode excluir\n"
 "uma parti��o usando o comando `d'.\n"
 
-#: fdisk/fdisk.c:1039
+#: fdisk/fdisk.c:1203
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2697,7 +2587,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:1048
+#: fdisk/fdisk.c:1212
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2707,7 +2597,7 @@ msgstr ""
 "uma vez que o SunOS/Solaris espera isto e at� mesmo o Linux gosta disto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1054
+#: fdisk/fdisk.c:1218
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2717,52 +2607,52 @@ msgstr ""
 "e a parti��o 11 como um volume inteiro (6), uma vez que o IRIX espera isto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1068
+#: fdisk/fdisk.c:1232
 #, 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:1121
+#: fdisk/fdisk.c:1283
 #, 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:1123 fdisk/fdisk.c:1131 fdisk/fdisk.c:1140 fdisk/fdisk.c:1149
+#: fdisk/fdisk.c:1285 fdisk/fdisk.c:1293 fdisk/fdisk.c:1302 fdisk/fdisk.c:1311
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     f�s. = (%d, %d, %d) "
 
-#: fdisk/fdisk.c:1124 fdisk/fdisk.c:1132
+#: fdisk/fdisk.c:1286 fdisk/fdisk.c:1294
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "l�gico = (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1129
+#: fdisk/fdisk.c:1291
 #, 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:1138
+#: fdisk/fdisk.c:1300
 #, 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:1141
+#: fdisk/fdisk.c:1303
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "deveria ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1147
+#: fdisk/fdisk.c:1309
 #, c-format
 msgid "Partition %i does not end on cylinder boundary:\n"
 msgstr "A parti��o %i n�o termina em um limite de cilindro:\n"
 
-#: fdisk/fdisk.c:1150
+#: fdisk/fdisk.c:1312
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1157
+#: fdisk/fdisk.c:1319
 #, c-format
 msgid ""
 "\n"
@@ -2775,131 +2665,126 @@ msgstr ""
 "Unidades = %s de %d * %d bytes\n"
 "\n"
 
-#. FIXME! let's see how this shows up with other languagues
-#. acme@conectiva.com.br
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1364
+msgid "Nothing to do. Ordering is correct already.\n\n"
+msgstr "Nada a fazer. Ordem j� est� correta\n\n"
+
+#: fdisk/fdisk.c:1430
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Boot    In�cio      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1195 fdisk/fdisksgilabel.c:207 fdisk/fdisksunlabel.c:631
+#: fdisk/fdisk.c:1431 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1235
+#: fdisk/fdisk.c:1468
+msgid "\nPartition table entries are not in disk order\n"
+msgstr "\nParti��es l�gicas fora da ordem do disco\n"
+
+#: fdisk/fdisk.c:1478
 #, c-format
-msgid ""
-"\n"
-"Disk %s: %d heads, %d sectors, %d cylinders\n"
-"\n"
-msgstr ""
-"\n"
-"Disco %s: %d cabe�as, %d setores, %d cilindros\n"
-"\n"
+msgid "\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"
+msgstr "\nDisco %s: %d cabe�as, %d setores, %d cilindros\n\n"
 
-#: fdisk/fdisk.c:1237
+#: fdisk/fdisk.c:1480
 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:1276
+#: fdisk/fdisk.c:1524
 #, 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:1279
+#: fdisk/fdisk.c:1527
 #, 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:1282
+#: fdisk/fdisk.c:1530
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
 msgstr "Parti��o %d: o setor %d � maior do que o m�ximo: %d\n"
 
-#: fdisk/fdisk.c:1285
+#: fdisk/fdisk.c:1533
 #, 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:1289
+#: fdisk/fdisk.c:1537
 #, 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"
+msgstr "Parti��o %d: os setores anteriores %d n�o est�o de acordo com o total: %d\n"
 
-#: fdisk/fdisk.c:1319
+#: fdisk/fdisk.c:1569
 #, 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:1327
+#: fdisk/fdisk.c:1577
 #, 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:1345
+#: fdisk/fdisk.c:1597
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Aviso: a parti��o %d est� vazia\n"
 
-#: fdisk/fdisk.c:1350
+#: fdisk/fdisk.c:1602
 #, 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:1356
+#: fdisk/fdisk.c:1608
 #, c-format
 msgid "Total allocated sectors %d greater than the maximum %d\n"
 msgstr "O total de setores alocados, %d, � maior do que o m�ximo: %d\n"
 
-#: fdisk/fdisk.c:1359
+#: fdisk/fdisk.c:1611
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d setores n�o alocados\n"
 
-#: fdisk/fdisk.c:1371 fdisk/fdisksgilabel.c:684 fdisk/fdisksunlabel.c:479
+#: fdisk/fdisk.c:1624 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
-msgstr ""
-"A parti��o %d j� est� definida. Exclua essa parti��o antes de adicion�-la "
-"novamente.\n"
+msgstr "A parti��o %d j� est� definida. Exclua essa parti��o antes de adicion�-la novamente.\n"
 
-#: fdisk/fdisk.c:1392 fdisk/fdiskbsdlabel.c:252 fdisk/fdisksgilabel.c:706
-#: fdisk/fdisksunlabel.c:494
+#: fdisk/fdisk.c:1645 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
+#: fdisk/fdisksunlabel.c:517
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdisk.c:1407 fdisk/fdisksunlabel.c:519
+#: fdisk/fdisk.c:1660 fdisk/fdisksunlabel.c:542
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: fdisk/fdisk.c:1439
+#: fdisk/fdisk.c:1696
 msgid "No free sectors available\n"
 msgstr "N�o h� setores livres dispon�veis\n"
 
-#: fdisk/fdisk.c:1449 fdisk/fdiskbsdlabel.c:259 fdisk/fdisksunlabel.c:529
+#: fdisk/fdisk.c:1704 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "�ltimo %s ou +tamanho ou +tamanho M ou  +tamanho K"
 
-#: fdisk/fdisk.c:1479
+#: fdisk/fdisk.c:1737
 #, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
 msgstr "Aviso: a parti��o %d possui um n�mero �mpar de setores.\n"
 
-#: fdisk/fdisk.c:1516 fdisk/fdiskbsdlabel.c:593
+#: fdisk/fdisk.c:1777 fdisk/fdiskbsdlabel.c:611
 msgid "The maximum number of partitions has been created\n"
 msgstr "O n�mero m�ximo de parti��es foi criado\n"
 
-#: fdisk/fdisk.c:1526
+#: fdisk/fdisk.c:1787
 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"
+msgstr "Voc� precisa excluir alguma parti��o e adicionar uma parti��o estendida antes\n"
 
-#: fdisk/fdisk.c:1530
+#: fdisk/fdisk.c:1791
 #, c-format
 msgid ""
 "Command action\n"
@@ -2910,42 +2795,37 @@ msgstr ""
 "   %s\n"
 "   p   parti��o prim�ria (1-4)\n"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1793
 msgid "l   logical (5 or over)"
 msgstr "l   l�gica (5 ou superior)"
 
-#: fdisk/fdisk.c:1532
+#: fdisk/fdisk.c:1793
 msgid "e   extended"
 msgstr "e   estendida"
 
-#: fdisk/fdisk.c:1549
+#: fdisk/fdisk.c:1810
 #, 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:1581
-msgid ""
-"The partition table has been altered!\n"
-"\n"
-msgstr ""
-"A tabela de parti��es foi alterada!\n"
-"\n"
+#: fdisk/fdisk.c:1845
+msgid "The partition table has been altered!\n\n"
+msgstr "A tabela de parti��es foi alterada!\n\n"
 
-#: fdisk/fdisk.c:1590
+#: fdisk/fdisk.c:1854
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chamando ioctl() para reler tabela de parti��es.\n"
 
-#: fdisk/fdisk.c:1606
+#: fdisk/fdisk.c:1870
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
 "Reboot your system to ensure the partition table is updated.\n"
 msgstr ""
 "A releitura da tabela de parti��es falhou. Erro %d: %s.\n"
-"Reinicialize o sistema para assegurar-se de que a tabela de parti��es seja "
-"atualizada.\n"
+"Reinicialize o sistema para assegurar-se de que a tabela de parti��es seja atualizada.\n"
 
-#: fdisk/fdisk.c:1612
+#: fdisk/fdisk.c:1876
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2957,107 +2837,103 @@ msgstr ""
 "parti��o DOS 6.x, consulte a p�gina de manual\n"
 "do fdisk para obter informa��es adicionais.\n"
 
-#: fdisk/fdisk.c:1619
+#: fdisk/fdisk.c:1883
 msgid "Syncing disks.\n"
 msgstr "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:1650
+#: fdisk/fdisk.c:1914
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
 
-#: fdisk/fdisk.c:1665
+#: fdisk/fdisk.c:1930
 #, 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:1671
+#: fdisk/fdisk.c:1935
 msgid "New beginning of data"
 msgstr "Novo in�cio dos dados"
 
-#: fdisk/fdisk.c:1685
+#: fdisk/fdisk.c:1951
 msgid "Expert command (m for help): "
 msgstr "Comando avan�ado (m para ajuda): "
 
-#: fdisk/fdisk.c:1696
+#: fdisk/fdisk.c:1964
 msgid "Number of cylinders"
 msgstr "N�mero de cilindros"
 
-#: fdisk/fdisk.c:1717
+#: fdisk/fdisk.c:1990
 msgid "Number of heads"
 msgstr "N�mero de cabe�as"
 
-#: fdisk/fdisk.c:1742
+#: fdisk/fdisk.c:2015
 msgid "Number of sectors"
 msgstr "N�mero de setores"
 
-#: fdisk/fdisk.c:1745
+#: fdisk/fdisk.c:2018
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr ""
-"Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
+msgstr "Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
 
-#: fdisk/fdisk.c:1807
+#: fdisk/fdisk.c:2080
 #, 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:1821
+#: fdisk/fdisk.c:2094
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:1838
+#: fdisk/fdisk.c:2111
 #, c-format
 msgid "cannot open %s\n"
 msgstr "n�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:1911
+#: fdisk/fdisk.c:2132
+#, c-format
+msgid "%c: unknown command\n"
+msgstr "%c: comando desconhecido:\n"
+
+#: fdisk/fdisk.c:2182
 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"
+msgstr "Este kernel localiza o tamanho de setor por conta pr�pria - op��o -b ignorada\n"
 
-#: fdisk/fdisk.c:1914
+#: fdisk/fdisk.c:2185
+msgid "Warning: the -b (set sector size) option should be used with one specified device\n"
+msgstr "Aviso: a op��o -b (configurar tamanho de setor) deve ser usada com um dispositivo especificado\n"
+
+#: fdisk/fdisk.c:2248
+#, c-format
 msgid ""
-"Warning: the -b (set sector size) option should be used with one specified "
-"device\n"
+"Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
+"To return to DOS partition table mode, use the 'r' command.\n"
 msgstr ""
-"Aviso: a op��o -b (configurar tamanho de setor) deve ser usada com um "
-"dispositivo especificado\n"
+"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:1973
+#: fdisk/fdisk.c:2257
 msgid "Command (m for help): "
 msgstr "Comando (m para ajuda): "
 
-#: fdisk/fdisk.c:1987
+#: fdisk/fdisk.c:2273
 #, c-format
-msgid ""
-"\n"
-"The current boot file is: %s\n"
-msgstr ""
-"\n"
-"O arquivo de boot atual �: %s\n"
+msgid "\nThe current boot file is: %s\n"
+msgstr "\nO arquivo de boot atual �: %s\n"
 
-#: fdisk/fdisk.c:1989
+#: fdisk/fdisk.c:2275
 msgid "Please enter the name of the new boot file: "
 msgstr "Informe o nome do novo arquivo de boot: "
 
-#: fdisk/fdisk.c:1991
+#: fdisk/fdisk.c:2277
 msgid "Boot file unchanged\n"
 msgstr "Arquivo de boot inalterado\n"
 
-#: fdisk/fdisk.c:2051
-msgid ""
-"\n"
-"\tSorry, no experts menu for SGI partition tables available.\n"
-"\n"
-msgstr ""
-"\n"
-"\tDesculpe. N�o h� um menu avan�ado dispon�vel para tabelas de parti��o "
-"SGI.\n"
-"\n"
+#: fdisk/fdisk.c:2341
+msgid "\n\tSorry, no experts menu for SGI partition tables available.\n\n"
+msgstr "\n\tDesculpe. N�o h� um menu avan�ado dispon�vel para tabelas de parti��o SGI.\n\n"
 
-#: fdisk/fdiskaixlabel.c:29
+#: fdisk/fdiskaixlabel.c:28
 msgid ""
 "\n"
 "\tThere is a valid AIX label on this disk.\n"
@@ -3085,367 +2961,344 @@ msgstr ""
 "\t   remover o disco logicamente de sua m�quina AIX\n"
 "\t   (do contr�rio voc� ir� se tornar um AIXpert)."
 
-#: fdisk/fdiskbsdlabel.c:97
+#: fdisk/fdiskbsdlabel.c:117
 #, c-format
-msgid ""
-"\n"
-"BSD label for device: %s\n"
-msgstr ""
-"\n"
-"R�tulo BSD do dispositivo: %s\n"
+msgid "\nBSD label for device: %s\n"
+msgstr "\nR�tulo BSD do dispositivo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:106
+#: fdisk/fdiskbsdlabel.c:125
 msgid "   d   delete a BSD partition"
 msgstr "   d   exclui uma parti��o BSD"
 
-#: fdisk/fdiskbsdlabel.c:107
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
 msgstr "   e   edita dados do disco"
 
-#: fdisk/fdiskbsdlabel.c:108
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
 msgstr "   i   instala c�digo de inicializa��o (bootstrap)"
 
-#: fdisk/fdiskbsdlabel.c:109
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
 msgstr "   l   lista os tipos de sistemas de arquivos conhecidos"
 
-#: fdisk/fdiskbsdlabel.c:111
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   n   add a new BSD partition"
 msgstr "   n   cria uma nova parti��o BSD"
 
-#: fdisk/fdiskbsdlabel.c:112
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   p   print BSD partition table"
 msgstr "   p   mostra a tabela de parti��es BSD"
 
-#: fdisk/fdiskbsdlabel.c:117
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
 msgstr "   s   mostra o r�tulo do disco completo"
 
-#: fdisk/fdiskbsdlabel.c:118
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
 msgstr "   t   altera a identifica��o do sistema de arquivos"
 
-#: fdisk/fdiskbsdlabel.c:119
+#: fdisk/fdiskbsdlabel.c:136
+msgid "   u   change units (cylinders/sectors)"
+msgstr "   u   altera unidades (cilindros/setores)"
+
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
 msgstr "   w   grava o r�tulo do disco no disco"
 
-#: fdisk/fdiskbsdlabel.c:121
+#: fdisk/fdiskbsdlabel.c:139
 msgid "   x   link BSD partition to non-BSD partition"
 msgstr "   x   vincula parti��o BSD a parti��o n�o BSD"
 
-#: fdisk/fdiskbsdlabel.c:146
+#: fdisk/fdiskbsdlabel.c:168
 #, c-format
-msgid "Partition %s%d has invalid starting sector 0.\n"
-msgstr "A parti��o %s%d possui setor inicial 0 inv�lido.\n"
+msgid "Partition %s has invalid starting sector 0.\n"
+msgstr "A parti��o %s possui setor inicial 0 inv�lido.\n"
 
-#: fdisk/fdiskbsdlabel.c:150
+#: fdisk/fdiskbsdlabel.c:172
 #, c-format
-msgid "Reading disklabel of %s%d at sector %d.\n"
-msgstr "Lendo r�tulo de disco de %s%d no setor %d.\n"
+msgid "Reading disklabel of %s at sector %d.\n"
+msgstr "Lendo r�tulo de disco de %s no setor %d.\n"
 
-#: fdisk/fdiskbsdlabel.c:159
+#: fdisk/fdiskbsdlabel.c:182
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
 msgstr "N�o existe parti��o %BSD em %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:174
+#: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
 msgstr "Comando para r�tulo de disco BSD (tecle m para obter ajuda): "
 
-#: fdisk/fdiskbsdlabel.c:288
+#: fdisk/fdiskbsdlabel.c:310
 #, c-format
 msgid "type: %s\n"
 msgstr "tipo: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:290
+#: fdisk/fdiskbsdlabel.c:312
 #, c-format
 msgid "type: %d\n"
 msgstr "tipo: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:291
+#: fdisk/fdiskbsdlabel.c:313
 #, c-format
 msgid "disk: %.*s\n"
 msgstr "disco: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:292
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
 msgstr "r�tulo: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:293
+#: fdisk/fdiskbsdlabel.c:315
 msgid "flags:"
 msgstr "op��es:"
 
-#: fdisk/fdiskbsdlabel.c:295
+#: fdisk/fdiskbsdlabel.c:317
 msgid " removable"
 msgstr " removable"
 
-#: fdisk/fdiskbsdlabel.c:297
+#: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
 msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:299
+#: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
 msgstr " badsect"
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
-#: fdisk/fdiskbsdlabel.c:303
+#: fdisk/fdiskbsdlabel.c:325
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr "bytes/setor: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:304
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr "setores/trilha: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:305
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr "trilhas/cilindro: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:306
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr "setores/cilindro: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:307
+#: fdisk/fdiskbsdlabel.c:329
 #, c-format
 msgid "cylinders: %ld\n"
 msgstr "cilindros: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:308
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
 msgstr "RPM: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:309
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
 msgstr "interleave: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "trackskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:311
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "cylinderskew: %d\n"
 msgstr "cylinderskew: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr "headswitch: %ld\t\t# milissegundos\n"
 
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr "busca trilha a trilha: %ld\t# milissegundos\n"
 
-#: fdisk/fdiskbsdlabel.c:314
+#: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
 msgstr "drivedata: "
 
-#: fdisk/fdiskbsdlabel.c:323
+#: fdisk/fdiskbsdlabel.c:347
 #, c-format
-msgid ""
-"\n"
-"%d partitions:\n"
-msgstr ""
-"\n"
-"d parti��es:\n"
-
-#: fdisk/fdiskbsdlabel.c:324
-msgid "#        size   offset    fstype   [fsize bsize   cpg]\n"
-msgstr "No.      tam    desloc    tipoSA   [fsize bsize   cpg]\n"
+msgid "\n%d partitions:\n"
+msgstr "\n%d parti��es:\n"
 
-#: fdisk/fdiskbsdlabel.c:380
-#, c-format
-msgid "Writing disklabel to %s%d.\n"
-msgstr "Gravando r�tulo de disco em %s%d.\n"
+#: fdisk/fdiskbsdlabel.c:348
+msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
+msgstr "#       in�cio      fim      tamanho  tipoSA   [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:383
+#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, c-format
 msgid "Writing disklabel to %s.\n"
 msgstr "Gravando r�tulo de disco em %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:395
-#, c-format
-msgid "%s%d contains no disklabel.\n"
-msgstr "%s%d n�o cont�m um r�tulo de disco.\n"
-
-#: fdisk/fdiskbsdlabel.c:398
+#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
 msgstr "%s n�o cont�m um r�tulo de disco.\n"
 
-#: fdisk/fdiskbsdlabel.c:402
+#: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
 msgstr "Voc� deseja criar um r�tulo de disco? (s/n) "
 
-#: fdisk/fdiskbsdlabel.c:441
+#: fdisk/fdiskbsdlabel.c:458
 msgid "bytes/sector"
 msgstr "bytes/setor"
 
-#: fdisk/fdiskbsdlabel.c:442
+#: fdisk/fdiskbsdlabel.c:459
 msgid "sectors/track"
 msgstr "setores/trilha"
 
-#: fdisk/fdiskbsdlabel.c:443
+#: fdisk/fdiskbsdlabel.c:460
 msgid "tracks/cylinder"
 msgstr "trilhas/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:451
+#: fdisk/fdiskbsdlabel.c:468
 msgid "sectors/cylinder"
 msgstr "setores/cilindro"
 
-#: fdisk/fdiskbsdlabel.c:455
+#: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr "Precisa ser <= setores/trilha * trilhas/cilindro (padr�o).\n"
 
-#: fdisk/fdiskbsdlabel.c:457
+#: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
 msgstr "RPM"
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
 msgstr "interleave"
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
 msgstr "trackskew"
 
-#: fdisk/fdiskbsdlabel.c:460
+#: fdisk/fdiskbsdlabel.c:477
 msgid "cylinderskew"
 msgstr "cylinderskew"
 
-#: fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
 msgstr "headswitch"
 
-#: fdisk/fdiskbsdlabel.c:462
+#: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
 msgstr "busca trilha a trilha"
 
-#: fdisk/fdiskbsdlabel.c:503
+#: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "Bootstrap (c�digo de inicializa��o): %sboot -> boot%s (%s): "
 
-#: fdisk/fdiskbsdlabel.c:529
+#: fdisk/fdiskbsdlabel.c:546
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr "Bootstrap (c�digo de inicializa��o) sobreposto ao r�tulo do disco!\n"
 
-#: fdisk/fdiskbsdlabel.c:550
-#, c-format
-msgid "Bootstrap installed on %s%d.\n"
-msgstr "Bootstrap (c�digo de inicializa��o) instalado em %s%d.\n"
-
-#: fdisk/fdiskbsdlabel.c:552
+#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr "Bootstrap (c�digo de inicializa��o) instalado em %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:573
+#: fdisk/fdiskbsdlabel.c:591
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Parti��o (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:604
+#: fdisk/fdiskbsdlabel.c:622
 msgid "This partition already exists.\n"
 msgstr "Esta parti��o j� existe.\n"
 
-#: fdisk/fdiskbsdlabel.c:726
+#: fdisk/fdiskbsdlabel.c:742
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Aviso: n�mero de parti��es excessivo (%d; o m�ximo  � %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:772
-msgid ""
-"\n"
-"Syncing disks.\n"
-msgstr ""
-"\n"
-"Sincronizando discos.\n"
+#: fdisk/fdiskbsdlabel.c:789
+msgid "\nSyncing disks.\n"
+msgstr "\nSincronizando discos.\n"
 
-#: fdisk/fdisksgilabel.c:56
+#: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
 msgstr "volhdr SGI"
 
-#: fdisk/fdisksgilabel.c:57
+#: fdisk/fdisksgilabel.c:80
 msgid "SGI trkrepl"
 msgstr "trkrepl SGI"
 
-#: fdisk/fdisksgilabel.c:58
+#: fdisk/fdisksgilabel.c:81
 msgid "SGI secrepl"
 msgstr "secrepl SGI"
 
-#: fdisk/fdisksgilabel.c:59
+#: fdisk/fdisksgilabel.c:82
 msgid "SGI raw"
 msgstr "raw SGI"
 
-#: fdisk/fdisksgilabel.c:60
+#: fdisk/fdisksgilabel.c:83
 msgid "SGI bsd"
 msgstr "bsd SGI"
 
-#: fdisk/fdisksgilabel.c:61
+#: fdisk/fdisksgilabel.c:84
 msgid "SGI sysv"
 msgstr "sysv SGI"
 
-#: fdisk/fdisksgilabel.c:62
+#: fdisk/fdisksgilabel.c:85
 msgid "SGI volume"
 msgstr "volume SGI"
 
-#: fdisk/fdisksgilabel.c:63
+#: fdisk/fdisksgilabel.c:86
 msgid "SGI efs"
 msgstr "efs SGI"
 
-#: fdisk/fdisksgilabel.c:64
+#: fdisk/fdisksgilabel.c:87
 msgid "SGI lvol"
 msgstr "lvol SGI"
 
-#: fdisk/fdisksgilabel.c:65
+#: fdisk/fdisksgilabel.c:88
 msgid "SGI rlvol"
 msgstr "rlvol SGI"
 
-#: fdisk/fdisksgilabel.c:66
+#: fdisk/fdisksgilabel.c:89
 msgid "SGI xfs"
 msgstr "xfs SGI"
 
-#: fdisk/fdisksgilabel.c:67
+#: fdisk/fdisksgilabel.c:90
 msgid "SGI xlvol"
 msgstr "xlvol SGI"
 
-#: fdisk/fdisksgilabel.c:68
+#: fdisk/fdisksgilabel.c:91
 msgid "SGI rxlvol"
 msgstr "rxlvol SGI"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:69 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:55
+#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:70 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:143
-msgid ""
-"According to MIPS Computer Systems, Inc the Label must not contain more than "
-"512 bytes\n"
-msgstr ""
-"De acordo com a MIPS Computer Systems, Inc., o r�tulo n�o pode conter mais "
-"do que 512 bytes\n"
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:158
+msgid "According to MIPS Computer Systems, Inc the Label must not contain more than 512 bytes\n"
+msgstr "De acordo com a MIPS Computer Systems, Inc., o r�tulo n�o pode conter mais do que 512 bytes\n"
 
-#: fdisk/fdisksgilabel.c:162
+#: fdisk/fdisksgilabel.c:177
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Detectado r�tulo de disco SGI com soma de verifica��o incorreta.\n"
 
-#: fdisk/fdisksgilabel.c:186
+#: fdisk/fdisksgilabel.c:200
 #, c-format
 msgid ""
 "\n"
@@ -3464,7 +3317,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:199
+#: fdisk/fdisksgilabel.c:213
 #, c-format
 msgid ""
 "\n"
@@ -3477,7 +3330,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:205
+#: fdisk/fdisksgilabel.c:219
 #, c-format
 msgid ""
 "----- partitions -----\n"
@@ -3486,7 +3339,7 @@ msgstr ""
 "----- parti��es -----\n"
 "%*s  Info      In�cio      Fim   Setores  Id  Sistema\n"
 
-#: fdisk/fdisksgilabel.c:227
+#: fdisk/fdisksgilabel.c:241
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3497,12 +3350,12 @@ msgstr ""
 "Arquivo de inicializa��o: %s\n"
 "----- entradas de diret�rio -----\n"
 
-#: fdisk/fdisksgilabel.c:237
+#: fdisk/fdisksgilabel.c:251
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s setor %5u tamanho %8u\n"
 
-#: fdisk/fdisksgilabel.c:298
+#: fdisk/fdisksgilabel.c:305
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3514,24 +3367,15 @@ msgstr ""
 "\tO arquivo de inicializa��o precisa corresponder a um caminho \n"
 "\tdiferente de zero; por exemplo, \"/unix\" ou \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:305
-msgid ""
-"\n"
-"\tName of Bootfile too long:  16 bytes maximum.\n"
-msgstr ""
-"\n"
-"\tNome de arquivo de inicializa��o longo demais: o m�ximo permitido � de 16 "
-"bytes.\n"
+#: fdisk/fdisksgilabel.c:312
+msgid "\n\tName of Bootfile too long:  16 bytes maximum.\n"
+msgstr "\n\tNome de arquivo de inicializa��o longo demais: o m�ximo permitido � de 16 bytes.\n"
 
-#: fdisk/fdisksgilabel.c:310
-msgid ""
-"\n"
-"\tBootfile must have a fully qualified pathname.\n"
-msgstr ""
-"\n"
-"\tO arquivo de inicializa��o precisa ter um caminho totalmente qualificado.\n"
+#: fdisk/fdisksgilabel.c:317
+msgid "\n\tBootfile must have a fully qualified pathname.\n"
+msgstr "\n\tO arquivo de inicializa��o precisa ter um caminho totalmente qualificado.\n"
 
-#: fdisk/fdisksgilabel.c:315
+#: fdisk/fdisksgilabel.c:322
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3539,23 +3383,18 @@ msgid ""
 msgstr ""
 "\n"
 "\tEsteja ciente de que a exist�ncia do arquivo de inicializa��o n�o\n"
-"\t � conferida. O padr�o da SGI � \"/unix\" e, para o backup, "
-"\"/unix.save\".\n"
+"\t � conferida. O padr�o da SGI � \"/unix\" e, para o backup, \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:343
+#: fdisk/fdisksgilabel.c:350
 #, c-format
-msgid ""
-"\n"
-"\tBootfile is changed to \"%s\".\n"
-msgstr ""
-"\n"
-"\tArquivo de inicializa��o alterado para \"%s\".\n"
+msgid "\n\tBootfile is changed to \"%s\".\n"
+msgstr "\n\tArquivo de inicializa��o alterado para \"%s\".\n"
 
 #: fdisk/fdisksgilabel.c:448
 msgid "More than one entire disk entry present.\n"
 msgstr "Mais do que uma entrada de disco inteiro presente.\n"
 
-#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:455
+#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:478
 msgid "No partitions defined\n"
 msgstr "Nenhuma parti��o definida\n"
 
@@ -3606,28 +3445,16 @@ msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
 msgstr "Intervalo n�o utilizado de %8d setores - setores %8d - %d\n"
 
 #: fdisk/fdisksgilabel.c:545
-msgid ""
-"\n"
-"The boot partition does not exist.\n"
-msgstr ""
-"\n"
-"A parti��o de inicializa��o n�o existe.\n"
+msgid "\nThe boot partition does not exist.\n"
+msgstr "\nA parti��o de inicializa��o n�o existe.\n"
 
 #: fdisk/fdisksgilabel.c:549
-msgid ""
-"\n"
-"The swap partition does not exist.\n"
-msgstr ""
-"\n"
-"A parti��o de permuta n�o existe.\n"
+msgid "\nThe swap partition does not exist.\n"
+msgstr "\nA parti��o de permuta n�o existe.\n"
 
 #: fdisk/fdisksgilabel.c:554
-msgid ""
-"\n"
-"The swap partition has no swap type.\n"
-msgstr ""
-"\n"
-"A parti��o de permuta n�o possui tipo de permuta.\n"
+msgid "\nThe swap partition has no swap type.\n"
+msgstr "\nA parti��o de permuta n�o possui tipo de permuta.\n"
 
 #: fdisk/fdisksgilabel.c:558
 msgid "\tYou have chosen an unusual boot file name.\n"
@@ -3635,8 +3462,7 @@ msgstr "\tVoc� escolheu um nome de arquivo de inicializa��o incomum.\n"
 
 #: fdisk/fdisksgilabel.c:569
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr ""
-"Desculpe. Voc� pode alterar apenas a etiqueta de parti��es n�o vazias.\n"
+msgstr "Desculpe. Voc� pode alterar apenas a etiqueta de parti��es n�o vazias.\n"
 
 #: fdisk/fdisksgilabel.c:576
 msgid ""
@@ -3650,27 +3476,26 @@ msgstr ""
 "tipo \"volhdr SGI\", j� que o sistema IRIX ir� us�-la para recuperar\n"
 "de seu diret�rio ferramentas independentes como o sash e o fx.\n"
 "Somente a se��o de disco inteiro \"volume SGI\" pode violar isto.\n"
-"Digite SIM se tiver certeza de que deseja etiquetar esta parti��o de modo "
-"diferente.\n"
+"Digite SIM se tiver certeza de que deseja etiquetar esta parti��o de modo diferente.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:621
+#: fdisk/fdisksgilabel.c:607
 msgid "Do You know, You got a partition overlap on the disk?\n"
 msgstr "Voc� sabia que tem uma sobreposi��o de parti��es no disco?\n"
 
-#: fdisk/fdisksgilabel.c:691
+#: fdisk/fdisksgilabel.c:669
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Tentando gerar entrada de disco inteiro automaticamente.\n"
 
-#: fdisk/fdisksgilabel.c:698
+#: fdisk/fdisksgilabel.c:676
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "O disco inteiro j� est� coberto com parti��es.\n"
 
-#: fdisk/fdisksgilabel.c:703
+#: fdisk/fdisksgilabel.c:681
 msgid "You got a partition overlap on the disk. Fix it first!\n"
 msgstr "Existe uma sobreposi��o de parti��es no disco. Corrija-a antes!\n"
 
-#: fdisk/fdisksgilabel.c:712 fdisk/fdisksgilabel.c:741
+#: fdisk/fdisksgilabel.c:690 fdisk/fdisksgilabel.c:719
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3678,20 +3503,20 @@ msgstr ""
 "Recomenda-se fortemente que a parti��o 11\n"
 "cubra todo o disco e seja do tipo `volume SGI'\n"
 
-#: fdisk/fdisksgilabel.c:728
+#: fdisk/fdisksgilabel.c:706
 msgid "You will get a partition overlap on the disk. Fix it first!\n"
 msgstr "Haver� uma sobreposi��o de parti��es no disco. Corrija-a antes!\n"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:711
 #, c-format
 msgid " Last %s"
 msgstr " �ltimo %s"
 
-#: fdisk/fdisksgilabel.c:756
+#: fdisk/fdisksgilabel.c:733
 msgid ""
 "Building a new SGI disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
-"content will be unrecoverable lost.\n"
+"content will be unrecoverably lost.\n"
 "\n"
 msgstr ""
 "Criando um novo r�tulo de disco SGI. As altera��es permanecer�o\n"
@@ -3699,12 +3524,12 @@ msgstr ""
 "o conte�do anterior n�o poder� mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:784
+#: fdisk/fdisksgilabel.c:761
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
 msgstr "Tentando manter os par�metros da parti��o %d.\n"
 
-#: fdisk/fdisksgilabel.c:786
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tIN�CIO=%d\tCOMPRIMENTO=%d\n"
@@ -3741,7 +3566,7 @@ msgstr "var SunOS"
 msgid "SunOS home"
 msgstr "home SunOS"
 
-#: fdisk/fdisksunlabel.c:122
+#: fdisk/fdisksunlabel.c:129
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
@@ -3749,16 +3574,15 @@ msgid ""
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
 "Detectado r�tulo de disco Sun com soma de verifica��o incorreta.\n"
-"Provavelmente ser� necess�rio configurar todos os valores, isto �, cabe�as, "
-"setores e\n"
+"Provavelmente ser� necess�rio configurar todos os valores, isto �, cabe�as, setores e\n"
 "parti��es ou for�ar um r�tulo novo (comando s no menu principal).\n"
 
-#: fdisk/fdisksunlabel.c:215
+#: fdisk/fdisksunlabel.c:228
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "A configura��o autom�tica encontrou um(a) %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:242
+#: fdisk/fdisksunlabel.c:255
 msgid ""
 "Building a new sun disklabel. Changes will remain in memory only,\n"
 "until you decide to write them. After that, of course, the previous\n"
@@ -3770,7 +3594,7 @@ msgstr ""
 "o conte�do anterior n�o poder� mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:253
+#: fdisk/fdisksunlabel.c:266
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3780,71 +3604,71 @@ msgstr ""
 "   ?   configura��o autom�tica\n"
 "   0   personalizada (com padr�es detectados por hardware)"
 
-#: fdisk/fdisksunlabel.c:263
+#: fdisk/fdisksunlabel.c:276
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Selecione o tipo (? para autom�tica, 0 para personalizada): "
 
-#: fdisk/fdisksunlabel.c:275
+#: fdisk/fdisksunlabel.c:288
 msgid "Autoconfigure failed.\n"
 msgstr "A configura��o autom�tica falhou.\n"
 
-#: fdisk/fdisksunlabel.c:303
+#: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
 msgstr "Setores/trilha"
 
-#: fdisk/fdisksunlabel.c:310
+#: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
 msgstr "Cilindros Alternativos"
 
-#: fdisk/fdisksunlabel.c:313
+#: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
 msgstr "Cilindros f�sicos"
 
-#: fdisk/fdisksunlabel.c:316 fdisk/fdisksunlabel.c:681
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
 msgid "Rotation speed (rpm)"
 msgstr "Velocidade de rota��o (RPM)"
 
-#: fdisk/fdisksunlabel.c:318 fdisk/fdisksunlabel.c:674
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
 msgid "Interleave factor"
 msgstr "Fator de \"Interleave\""
 
-#: fdisk/fdisksunlabel.c:321 fdisk/fdisksunlabel.c:667
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
 msgid "Extra sectors per cylinder"
 msgstr "Setores extras por cilindro: "
 
-#: fdisk/fdisksunlabel.c:334
+#: fdisk/fdisksunlabel.c:348
 msgid "You may change all the disk params from the x menu"
 msgstr "Voc� pode alterar todos os par�metros do disco a partir do menu x"
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "3,5\" floppy"
 msgstr "Disquete de 3,5 pol."
 
-#: fdisk/fdisksunlabel.c:337
+#: fdisk/fdisksunlabel.c:354
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:418
+#: fdisk/fdisksunlabel.c:441
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "A parti��o %d n�o termina em um limite de cilindro\n"
 
-#: fdisk/fdisksunlabel.c:438
+#: fdisk/fdisksunlabel.c:461
 #, c-format
 msgid "Partition %d overlaps with others in sectors %d-%d\n"
 msgstr "A parti��o %d sobrep�e-se a outras nos setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:460
+#: fdisk/fdisksunlabel.c:483
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervalo n�o utilizado - setores 0 - %d\n"
 
-#: fdisk/fdisksunlabel.c:462 fdisk/fdisksunlabel.c:466
+#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervalo n�o utilizado - setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:512
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3852,7 +3676,7 @@ msgstr ""
 "Outras parti��es j� cobrem o disco inteiro.\n"
 "Exclua ou reduza algumas antes de tentar novamente.\n"
 
-#: fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksunlabel.c:570
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3863,7 +3687,7 @@ msgstr ""
 "%d %s cobre alguma outra parti��o. Sua entrada foi alterada\n"
 "para %d %s\n"
 
-#: fdisk/fdisksunlabel.c:567
+#: fdisk/fdisksunlabel.c:590
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3872,7 +3696,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:580
+#: fdisk/fdisksunlabel.c:603
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3884,10 +3708,9 @@ msgstr ""
 "seja do tipo UFS, sistema de arquivos EXT2FS ou permuta SunOs.\n"
 "Colocar a permuta do Linux ali pode destruir a tabela de parti��es e\n"
 "travar a inicializa��o.\n"
-"Digite SIM se tiver certeza de que deseja rotular esta parti��o como 82 "
-"(permuta do Linux): "
+"Digite SIM se tiver certeza de que deseja rotular esta parti��o como 82 (permuta do Linux): "
 
-#: fdisk/fdisksunlabel.c:611
+#: fdisk/fdisksunlabel.c:634
 #, c-format
 msgid ""
 "\n"
@@ -3906,7 +3729,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:625
+#: fdisk/fdisksunlabel.c:648
 #, c-format
 msgid ""
 "\n"
@@ -3919,16 +3742,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:630
+#: fdisk/fdisksunlabel.c:653
 #, 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:655
+#: fdisk/fdisksunlabel.c:678
 msgid "Number of alternate cylinders"
 msgstr "N�mero de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:688
+#: fdisk/fdisksunlabel.c:711
 msgid "Number of physical cylinders"
 msgstr "N�mero de cilindros f�sicos"
 
@@ -4040,280 +3863,304 @@ msgid "NEC DOS"
 msgstr "DOS NEC"
 
 #: fdisk/i386_sys_types.c:32
+msgid "Plan 9"
+msgstr "Plan 9"
+
+#: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
 msgstr "Recupera��o do PartitionMagic"
 
-#: fdisk/i386_sys_types.c:33
+#: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
 msgstr "Venix 80286"
 
-#: fdisk/i386_sys_types.c:34
+#: fdisk/i386_sys_types.c:35
 msgid "PPC PReP Boot"
 msgstr "Boot PReP PPC"
 
-#: fdisk/i386_sys_types.c:35
+#: fdisk/i386_sys_types.c:36
 msgid "SFS"
 msgstr "SFS"
 
-#: fdisk/i386_sys_types.c:36
+#: fdisk/i386_sys_types.c:37
 msgid "QNX4.x"
 msgstr "QNX4.x"
 
-#: fdisk/i386_sys_types.c:37
+#: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
 msgstr "QNX4.x 2� parte"
 
-#: fdisk/i386_sys_types.c:38
+#: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
 msgstr "QNX4.x 3� parte"
 
-#: fdisk/i386_sys_types.c:39
+#: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
 msgstr "DM OnTrack"
 
-#: fdisk/i386_sys_types.c:40
+#: fdisk/i386_sys_types.c:41
 msgid "OnTrack DM6 Aux1"
 msgstr "DM6 OnTrack Aux1"
 
 #. (or Novell)
-#: fdisk/i386_sys_types.c:41
+#: fdisk/i386_sys_types.c:42
 msgid "CP/M"
 msgstr "CP/M"
 
 #. CP/M or Microport SysV/AT
-#: fdisk/i386_sys_types.c:42
+#: fdisk/i386_sys_types.c:43
 msgid "OnTrack DM6 Aux3"
 msgstr "DM6 OnTrack Aux3"
 
-#: fdisk/i386_sys_types.c:43
+#: fdisk/i386_sys_types.c:44
 msgid "OnTrackDM6"
 msgstr "DM6 OnTrack"
 
-#: fdisk/i386_sys_types.c:44
+#: fdisk/i386_sys_types.c:45
 msgid "EZ-Drive"
 msgstr "EZ-Drive"
 
-#: fdisk/i386_sys_types.c:45
+#: fdisk/i386_sys_types.c:46
 msgid "Golden Bow"
 msgstr "Golden Bow"
 
-#: fdisk/i386_sys_types.c:46
+#: fdisk/i386_sys_types.c:47
 msgid "Priam Edisk"
 msgstr "Edisk Priam"
 
 #. DOS R/O or SpeedStor
-#: fdisk/i386_sys_types.c:47 fdisk/i386_sys_types.c:76
-#: fdisk/i386_sys_types.c:78 fdisk/i386_sys_types.c:79
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:82
+#: fdisk/i386_sys_types.c:85 fdisk/i386_sys_types.c:86
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
-#: fdisk/i386_sys_types.c:48
+#: fdisk/i386_sys_types.c:49
 msgid "GNU HURD or SysV"
 msgstr "GNU HURD ou SysV"
 
 #. GNU HURD or Mach or Sys V/386 (such as ISC UNIX)
-#: fdisk/i386_sys_types.c:49
+#: fdisk/i386_sys_types.c:50
 msgid "Novell Netware 286"
 msgstr "Novell Netware 286"
 
-#: fdisk/i386_sys_types.c:50
+#: fdisk/i386_sys_types.c:51
 msgid "Novell Netware 386"
 msgstr "Novell Netware 386"
 
-#: fdisk/i386_sys_types.c:51
+#: fdisk/i386_sys_types.c:52
 msgid "DiskSecure Multi-Boot"
 msgstr "Multi-Boot DiskSecure"
 
-#: fdisk/i386_sys_types.c:52
+#: fdisk/i386_sys_types.c:53
 msgid "PC/IX"
 msgstr "PC/IX"
 
-#: fdisk/i386_sys_types.c:53
+#: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
 msgstr "Minix antigo"
 
 #. Minix 1.4a and earlier
-#: fdisk/i386_sys_types.c:54
+#: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
 msgstr "Linux antigo/Minix"
 
-#: fdisk/i386_sys_types.c:57
+#: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
 msgstr "Unidade C: OS/2 oculta"
 
-#: fdisk/i386_sys_types.c:58
+#: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
 msgstr "Estendida Linux"
 
-#: fdisk/i386_sys_types.c:59 fdisk/i386_sys_types.c:60
+#: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
 msgstr "Conjunto de volumes NTFS"
 
-#: fdisk/i386_sys_types.c:61
+#: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
 msgstr "Amoeba"
 
-#: fdisk/i386_sys_types.c:62
+#: fdisk/i386_sys_types.c:64
 msgid "Amoeba BBT"
 msgstr "Amoeba BBT"
 
 #. (bad block table)
-#: fdisk/i386_sys_types.c:63
+#: fdisk/i386_sys_types.c:65
+msgid "BSD/OS"
+msgstr "BSD/OS"
+
+#. BSDI
+#: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
 msgstr "Hiberna��o IBM Thinkpad"
 
-#: fdisk/i386_sys_types.c:64
+#: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
 msgstr "BSD/386"
 
-#: fdisk/i386_sys_types.c:65
+#: fdisk/i386_sys_types.c:68
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: fdisk/i386_sys_types.c:66
+#: fdisk/i386_sys_types.c:69
 msgid "NeXTSTEP"
 msgstr "NeXTSTEP"
 
-#: fdisk/i386_sys_types.c:67
+#: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
 msgstr "sist. arq. BSDI"
 
-#: fdisk/i386_sys_types.c:68
+#: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
 msgstr "permuta BSDI"
 
-#: fdisk/i386_sys_types.c:69
+#: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
 msgstr "DRDOS/sec (FAT12)"
 
-#: fdisk/i386_sys_types.c:70
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr "DRDOS/sec (FAT16 < 32 M)"
 
-#: fdisk/i386_sys_types.c:71
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16)"
 msgstr "DRDOS/sec (FAT16)"
 
-#: fdisk/i386_sys_types.c:72
+#: fdisk/i386_sys_types.c:75
 msgid "Syrinx"
 msgstr "Syrinx"
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:76
+msgid "Non-FS data"
+msgstr "Dados N�o-FS"
+
+#: fdisk/i386_sys_types.c:77
 msgid "CP/M / CTOS / ..."
 msgstr "CP/M / CTOS / ..."
 
-#. CP/M or Concurrent CP/M or Concurrent DOS or CTOS
-#: fdisk/i386_sys_types.c:74
+#. CP/M or Concurrent CP/M or
+#. Concurrent DOS or CTOS
+#: fdisk/i386_sys_types.c:79
 msgid "DOS access"
 msgstr "Acesso DOS"
 
-#. DOS access or SpeedStor 12-bit FAT extended partition
-#: fdisk/i386_sys_types.c:75
+#. DOS access or SpeedStor 12-bit FAT
+#. extended partition
+#: fdisk/i386_sys_types.c:81
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
-#. SpeedStor 16-bit FAT extended partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:77
+#. SpeedStor 16-bit FAT extended
+#. partition < 1024 cyl.
+#: fdisk/i386_sys_types.c:84
 msgid "BeOS fs"
 msgstr "sist. arq. BeOS"
 
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:80
+#: fdisk/i386_sys_types.c:87
 msgid "DOS secondary"
 msgstr "DOS secund�rio"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:88
 msgid "Linux raid autodetect"
 msgstr "Detec��o autom�tica de RAID Linux"
 
-#. New (2.2.x) raid partition with autodetect
-#. using persistent superblock
-#: fdisk/i386_sys_types.c:83
+#. New (2.2.x) raid partition with
+#. autodetect using persistent
+#. superblock
+#: fdisk/i386_sys_types.c:91
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:92
 msgid "BBT"
 msgstr "BBT"
 
-#: fdisk/sfdisk.c:147
+#: fdisk/sfdisk.c:152
 #, c-format
 msgid "seek error on %s - cannot seek to %lu\n"
 msgstr "erro de busca em %s - n�o foi poss�vel buscar at� %lu\n"
 
-#: fdisk/sfdisk.c:152
+#: fdisk/sfdisk.c:157
 #, c-format
 msgid "seek error: wanted 0x%08x%08x, got 0x%08x%08x\n"
 msgstr "erro de busca: desejado 0x%08x%08x, obtido 0x%08x%08x\n"
 
-#: fdisk/sfdisk.c:198
+#: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
 msgstr "mem�ria insuficiente - desistindo\n"
 
-#: fdisk/sfdisk.c:202 fdisk/sfdisk.c:285
+#: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
 #, c-format
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "erro de leitura em %s - n�o foi poss�vel ler o setor %lu\n"
 
-#: fdisk/sfdisk.c:218
+#: fdisk/sfdisk.c:224
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "ERRO: o setor %lu n�o possui uma assinatura MS-DOS\n"
 
-#: fdisk/sfdisk.c:235
+#: fdisk/sfdisk.c:241
 #, c-format
 msgid "write error on %s - cannot write sector %lu\n"
 msgstr "erro de grava��o em %s - n�o foi poss�vel gravar no setor %lu\n"
 
-#: fdisk/sfdisk.c:273
+#: fdisk/sfdisk.c:279
 #, c-format
 msgid "cannot open partition sector save file (%s)\n"
-msgstr ""
-"n�o foi poss�vel abrir o arquivo de salvamento de setor da parti��o (%s)\n"
+msgstr "n�o foi poss�vel abrir o arquivo de salvamento de setor da parti��o (%s)\n"
 
-#: fdisk/sfdisk.c:291
+#: fdisk/sfdisk.c:297
 #, c-format
 msgid "write error on %s\n"
 msgstr "erro de grava��o em %s\n"
 
-#: fdisk/sfdisk.c:309
+#: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
 msgstr "n�o foi poss�vel stat arquivo de restaura��o de parti��o (%s)\n"
 
-#: fdisk/sfdisk.c:314
+#: fdisk/sfdisk.c:320
 msgid "partition restore file has wrong size - not restoring\n"
-msgstr ""
-"o arquivo de restaura��o da parti��o possui tamanho incorreto - n�o "
-"restaurando\n"
+msgstr "o arquivo de restaura��o da parti��o possui tamanho incorreto - n�o restaurando\n"
 
-#: fdisk/sfdisk.c:318
+#: fdisk/sfdisk.c:324
 msgid "out of memory?\n"
 msgstr "mem�ria insuficiente?\n"
 
-#: fdisk/sfdisk.c:324
+#: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
 msgstr "n�o foi poss�vel abrir o arquivo de restaura��o de parti��o (%s)\n"
 
-#: fdisk/sfdisk.c:330
+#: fdisk/sfdisk.c:336
 #, c-format
 msgid "error reading %s\n"
 msgstr "erro na leitura de %s\n"
 
-#: fdisk/sfdisk.c:337
+#: fdisk/sfdisk.c:343
 #, c-format
 msgid "cannot open device %s for writing\n"
 msgstr "n�o foi poss�vel abrir o dispositivo %s para grava��o\n"
 
-#: fdisk/sfdisk.c:349
+#: fdisk/sfdisk.c:355
 #, c-format
 msgid "error writing sector %lu on %s\n"
 msgstr "erro na grava��o do setor %lu em %s\n"
 
-#: fdisk/sfdisk.c:415
+#: fdisk/sfdisk.c:406
+#, c-format
+msgid "Disk %s: cannot get size\n"
+msgstr "Disco %s: n�o foi poss�vel obter o tamanho\n"
+
+#: fdisk/sfdisk.c:411
+#, c-format
+msgid "Disk %s: cannot get geometry\n"
+msgstr "Disco %s: n�o foi poss�vel obter a geometria\n"
+
+#: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
 "Warning: start=%d - this looks like a partition rather than\n"
@@ -4324,83 +4171,59 @@ msgstr ""
 "inteiro. Usar fdisk nela provavelmente n�o trar� qualquer resultado\n"
 "(use a op��o --force se realmente quiser realizar esta opera��o).\n"
 
-#: fdisk/sfdisk.c:421
+#: fdisk/sfdisk.c:442
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d heads\n"
 msgstr "Aviso: HDIO_GETGEO informa que h� %d cabe�as\n"
 
-#: fdisk/sfdisk.c:424
+#: fdisk/sfdisk.c:445
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
 msgstr "Aviso: HDIO_GETGEO informa que h� %d setores\n"
 
-#: fdisk/sfdisk.c:427
+#: fdisk/sfdisk.c:449
 #, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d cylinders\n"
-msgstr "Aviso: HDIO_GETGEO informa que h� %d cilindros\n"
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
+msgstr "Aviso: BLKGETSIZE/HDIO_GETGEO informa que h� %d cilindros\n"
 
-#: fdisk/sfdisk.c:431
-#, c-format
-msgid "Disk %s: cannot get geometry\n"
-msgstr "Disco %s: n�o foi poss�vel obter a geometria\n"
-
-#: fdisk/sfdisk.c:433
+#: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%d) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 "Aviso: n�mero de setores improv�vel (%d) - normalmente no m�ximo 63.\n"
-"Isto causar� problemas a todo software que usar endere�amento "
-"Cil/Cab/Setor.\n"
+"Isto causar� problemas a todo software que usar endere�amento Cil/Cab/Setor.\n"
 
-#: fdisk/sfdisk.c:437
+#: fdisk/sfdisk.c:457
 #, c-format
-msgid ""
-"\n"
-"Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
-msgstr ""
-"\n"
-"Disco %s: %lu cilindros, %lu cabe�as, %lu setores/trilha\n"
+msgid "\nDisk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
+msgstr "\nDisco %s: %lu cilindros, %lu cabe�as, %lu setores/trilha\n"
 
-#: fdisk/sfdisk.c:517
+#: fdisk/sfdisk.c:539
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
-msgstr ""
-"%s da parti��o %s possui valor imposs�vel para cabe�a: %d (deveria estar "
-"entre 0 e %d)\n"
+msgid "%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
+msgstr "%s da parti��o %s possui valor imposs�vel para cabe�a: %d (deveria estar entre 0 e %d)\n"
 
-#: fdisk/sfdisk.c:522
+#: fdisk/sfdisk.c:544
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
-msgstr ""
-"%s da parti��o %s possui valor imposs�vel para setor: %d (deveria estar "
-"entre 0 e %d)\n"
+msgid "%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
+msgstr "%s da parti��o %s possui valor imposs�vel para setor: %d (deveria estar entre 0 e %d)\n"
 
-#: fdisk/sfdisk.c:527
+#: fdisk/sfdisk.c:549
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for cylinders: %d (should be in "
-"0-%d)\n"
-msgstr ""
-"%s da parti��o %s possui valor imposs�vel para o cilindro: %d (deveria estar "
-"entre 0 e %d)\n"
+msgid "%s of partition %s has impossible value for cylinders: %d (should be in 0-%d)\n"
+msgstr "%s da parti��o %s possui valor imposs�vel para o cilindro: %d (deveria estar entre 0 e %d)\n"
 
-#: fdisk/sfdisk.c:566
-msgid ""
-"Id  Name\n"
-"\n"
-msgstr ""
-"Nome Id\n"
-"\n"
+#: fdisk/sfdisk.c:588
+msgid "Id  Name\n\n"
+msgstr "Nome Id\n\n"
 
-#: fdisk/sfdisk.c:719
+#: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
 msgstr "Relendo a tabela de parti��es...\n"
 
-#: fdisk/sfdisk.c:725
+#: fdisk/sfdisk.c:747
 msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
@@ -4408,106 +4231,86 @@ msgstr ""
 "O comando para reler a tabela de parti��es falhou.\n"
 "Reinicialize o sistema agora, antes de usar o mkfs.\n"
 
-#: fdisk/sfdisk.c:730
+#: fdisk/sfdisk.c:752
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erro no fechamento de %s\n"
 
-#: fdisk/sfdisk.c:768
+#: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: parti��o inexistente\n"
 
-#: fdisk/sfdisk.c:791
+#: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
 msgstr "formato n�o reconhecido - usando setores\n"
 
-#: fdisk/sfdisk.c:830
+#: fdisk/sfdisk.c:852
 #, c-format
 msgid "# partition table of %s\n"
 msgstr "# tabela de parti��o de %s\n"
 
-#: fdisk/sfdisk.c:841
+#: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato n�o implementado - usando %s\n"
 
-#: fdisk/sfdisk.c:845
+#: fdisk/sfdisk.c:867
 #, c-format
-msgid ""
-"Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
-"\n"
-msgstr ""
-"Unidades = cilindros de %lu bytes, blocos de 1024 bytes, contando a partir "
-"de %d\n"
-"\n"
+msgid "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\n"
+msgstr "Unidades = cilindros de %lu bytes, blocos de 1024 bytes, contando a partir de %d\n\n"
 
-#: fdisk/sfdisk.c:848
+#: fdisk/sfdisk.c:870
 msgid "   Device Boot Start     End   #cyls   #blocks   Id  System\n"
 msgstr "   Disp   Boot In�cio    Fim   Cils    Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:853
+#: fdisk/sfdisk.c:875
 #, c-format
-msgid ""
-"Units = sectors of 512 bytes, counting from %d\n"
-"\n"
-msgstr ""
-"Unidades = setores de 512 bytes, contando a partir de %d\n"
-"\n"
+msgid "Units = sectors of 512 bytes, counting from %d\n\n"
+msgstr "Unidades = setores de 512 bytes, contando a partir de %d\n\n"
 
-#: fdisk/sfdisk.c:855
+#: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
 msgstr "   Disp   Boot    In�cio      Fim  Setores   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:858
+#: fdisk/sfdisk.c:880
 #, c-format
-msgid ""
-"Units = blocks of 1024 bytes, counting from %d\n"
-"\n"
-msgstr ""
-"Unidades = blocos de 1024 bytes, contando a partir de %d\n"
-"\n"
+msgid "Units = blocks of 1024 bytes, counting from %d\n\n"
+msgstr "Unidades = blocos de 1024 bytes, contando a partir de %d\n\n"
 
-#: fdisk/sfdisk.c:860
+#: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
 msgstr "   Disp   Boot   In�cio      Fim   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:863
+#: fdisk/sfdisk.c:885
 #, c-format
-msgid ""
-"Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
-"\n"
-msgstr ""
-"Unidades = megabytes de 1048576 bytes, blocos of 1024 bytes, contando a "
-"partir de %d\n"
-"\n"
+msgid "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\n"
+msgstr "Unidades = megabytes de 1048576 bytes, blocos of 1024 bytes, contando a partir de %d\n\n"
 
-#: fdisk/sfdisk.c:865
+#: fdisk/sfdisk.c:887
 msgid "   Device Boot Start   End     MB   #blocks   Id  System\n"
 msgstr "   Disp   Boot In�cio  Fim     MB   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:997
+#: fdisk/sfdisk.c:1019
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"\t\tin�cio: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
+msgstr "\t\tin�cio: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1004
+#: fdisk/sfdisk.c:1026
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"\t\tfim: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
+msgstr "\t\tfim: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1007
+#: fdisk/sfdisk.c:1029
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a parti��o termina no cilindro %ld, al�m do final do disco\n"
 
-#: fdisk/sfdisk.c:1018
+#: fdisk/sfdisk.c:1040
 msgid "No partitions found\n"
 msgstr "Nenhuma parti��o encontrada\n"
 
-#: fdisk/sfdisk.c:1025
+#: fdisk/sfdisk.c:1047
 #, c-format
 msgid ""
 "Warning: The first partition looks like it was made\n"
@@ -4518,104 +4321,101 @@ msgstr ""
 " para Cil/Cab/Set = */%ld/%ld (em vez de %ld/%ld/%ld).\n"
 "Para esta listagem ser� assumida aquela geometria.\n"
 
-#: fdisk/sfdisk.c:1075
+#: fdisk/sfdisk.c:1097
 msgid "no partition table present.\n"
 msgstr "nenhuma tabela de parti��es presente.\n"
 
-#: fdisk/sfdisk.c:1077
+#: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "estranho, somente %d parti��es est�o definidas.\n"
 
-#: fdisk/sfdisk.c:1086
+#: fdisk/sfdisk.c:1108
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
-msgstr ""
-"Aviso: a parti��o %s possui tamanho 0, mas n�o est� marcada como vazia\n"
+msgstr "Aviso: a parti��o %s possui tamanho 0, mas n�o est� marcada como vazia\n"
 
-#: fdisk/sfdisk.c:1089
+#: fdisk/sfdisk.c:1111
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Aviso: a parti��o %s possui tamanho 0 e � inicializ�vel\n"
 
-#: fdisk/sfdisk.c:1092
+#: fdisk/sfdisk.c:1114
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Aviso: a parti��o %s possui tamanho 0 e in�cio diferente de zero\n"
 
-#: fdisk/sfdisk.c:1103
+#: fdisk/sfdisk.c:1125
 #, c-format
 msgid "Warning: partition %s "
 msgstr "Aviso: a parti��o %s "
 
-#: fdisk/sfdisk.c:1104
+#: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
 msgstr "n�o est� contida na parti��o %s\n"
 
-#: fdisk/sfdisk.c:1115
+#: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
 msgstr "Aviso: as parti��es %s "
 
-#: fdisk/sfdisk.c:1116
+#: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
 msgstr "e %s se sobrep�em\n"
 
-#: fdisk/sfdisk.c:1127
+#: fdisk/sfdisk.c:1149
 #, c-format
 msgid "Warning: partition %s contains part of "
 msgstr "Aviso: a parti��o %s cont�m parte da "
 
-#: fdisk/sfdisk.c:1128
+#: fdisk/sfdisk.c:1150
 #, c-format
 msgid "the partition table (sector %lu),\n"
 msgstr "tabela de parti��es (setor %lu) \n"
 
-#: fdisk/sfdisk.c:1129
+#: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
 msgstr "e destruir� a tabela quando cheia\n"
 
-#: fdisk/sfdisk.c:1138
+#: fdisk/sfdisk.c:1160
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Aviso: a parti��o %s come�a no setor 0\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1164
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Aviso: a parti��o %s se estende al�m do fim do disco\n"
 
-#: fdisk/sfdisk.c:1156
+#: fdisk/sfdisk.c:1178
 msgid "Among the primary partitions, at most one can be extended\n"
 msgstr "Dentre as parti��es prim�rias, pelo menos uma pode ser estendida\n"
 
-#: fdisk/sfdisk.c:1157
+#: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
 msgstr " (embora isto n�o seja um problema no Linux)\n"
 
-#: fdisk/sfdisk.c:1174
+#: fdisk/sfdisk.c:1196
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Aviso: a parti��o %s n�o inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1180
+#: fdisk/sfdisk.c:1202
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Aviso: a parti��o %s n�o termina em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1198
+#: fdisk/sfdisk.c:1220
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
-"Aviso: mais de uma parti��o prim�ria est� marcada como inicializ�vel "
-"(ativa).\n"
-"Isto n�o faz diferen�a para o LILO, mas o MBR DOS n�o inicializar� este "
-"disco.\n"
+"Aviso: mais de uma parti��o prim�ria est� marcada como inicializ�vel (ativa).\n"
+"Isto n�o faz diferen�a para o LILO, mas o MBR DOS n�o inicializar� este disco.\n"
 
-#: fdisk/sfdisk.c:1205
+#: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4623,270 +4423,267 @@ msgstr ""
 "Aviso: normalmente o boot pode ser dado somente de parti��es prim�rias.\n"
 "O LILO desconsidera o flag `inicializ�vel'.\n"
 
-#: fdisk/sfdisk.c:1211
+#: fdisk/sfdisk.c:1233
 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 ""
 "Aviso: nenhuma parti��o prim�ria est� marcada como inicializ�vel (ativa).\n"
-"Isto n�o faz diferen�a para o LILO, mas o MBR DOS n�o inicializar� este "
-"disco.\n"
+"Isto n�o faz diferen�a para o LILO, mas o MBR DOS n�o inicializar� este disco.\n"
 
-#: fdisk/sfdisk.c:1228
+#: fdisk/sfdisk.c:1250
 #, c-format
-msgid ""
-"partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"parti��o %s - in�cio: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado "
-"(%ld,%ld,%ld)\n"
+msgid "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
+msgstr "parti��o %s - in�cio: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1237
+#: fdisk/sfdisk.c:1259
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
-msgstr ""
-"parti��o %s - fim: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado "
-"(%ld,%ld,%ld)\n"
+msgstr "parti��o %s - fim: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1240
+#: fdisk/sfdisk.c:1262
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a parti��o %s termina no cilindro %ld, al�m do fim do disco\n"
 
-#: fdisk/sfdisk.c:1273 fdisk/sfdisk.c:1350
+#: fdisk/sfdisk.c:1287
+#, c-format
+msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
+msgstr "Aviso: deslocamento inicia na parti��o extd de  %ld para %ld\n"
+
+#: fdisk/sfdisk.c:1289
+msgid "(For listing purposes only. Do not change its contents.)\n"
+msgstr "(Para prop�sitos somente de listagem. N�o altere seu conte�do.)\n"
+
+#: fdisk/sfdisk.c:1291
+msgid "Warning: extended partition does not start at a cylinder boundary.\n"
+msgstr "Aviso: a parti��o extendida n�o inicia em um limite de cilindro\n"
+
+#: fdisk/sfdisk.c:1293
+msgid "DOS and Linux will interpret the contents differently.\n"
+msgstr "DOS e Linux v�o interpretar seu conte�do diferentemente.\n"
+
+#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "n�mero excessivo de parti��es - ignorando aquelas al�m do n� %d\n"
 
-#: fdisk/sfdisk.c:1288
+#: fdisk/sfdisk.c:1324
 msgid "tree of partitions?\n"
 msgstr "�rvore de parti��es?\n"
 
-#: fdisk/sfdisk.c:1392
+#: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gerenciador de disco detectado - n�o � poss�vel tratar\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
 msgstr "Assinatura DM6 encontrada - desistindo\n"
 
-#: fdisk/sfdisk.c:1419
+#: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estranho... uma parti��o estendida de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1426
+#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estranho... uma parti��o BSD de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1458
+#: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr " %s: parti��o n�o reconhecida\n"
 
-#: fdisk/sfdisk.c:1470
+#: fdisk/sfdisk.c:1536
 msgid "-n flag was given: Nothing changed\n"
 msgstr "a op��o -n foi fornecida: nada foi alterado\n"
 
-#: fdisk/sfdisk.c:1483
+#: fdisk/sfdisk.c:1549
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "N�o foi poss�vel salvar os setores antigos - abortando\n"
 
-#: fdisk/sfdisk.c:1488
+#: fdisk/sfdisk.c:1554
 #, 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:1565
+#: fdisk/sfdisk.c:1631
 msgid "long or incomplete input line - quitting\n"
 msgstr "linha de entrada longa demais ou incompleta - encerrando\n"
 
-#: fdisk/sfdisk.c:1601
+#: fdisk/sfdisk.c:1667
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erro de entrada: `=' esperado ap�s o campo %s\n"
 
-#: fdisk/sfdisk.c:1608
+#: fdisk/sfdisk.c:1674
 #, 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:1614
+#: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrada n�o reconhecida: %s\n"
 
-#: fdisk/sfdisk.c:1646
+#: fdisk/sfdisk.c:1712
 msgid "number too big\n"
 msgstr "n�mero grande demais\n"
 
-#: fdisk/sfdisk.c:1650
+#: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
 msgstr "lixo ap�s o n�mero\n"
 
-#: fdisk/sfdisk.c:1766
+#: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
 msgstr "sem espa�o para o descritor da parti��o\n"
 
-#: fdisk/sfdisk.c:1799
+#: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
 msgstr "n�o foi poss�vel criar a parti��o estendida envolt�ria\n"
 
-#: fdisk/sfdisk.c:1850
+#: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
 msgstr "n�mero excessivo de campos de entrada\n"
 
 #. no free blocks left - don't read any further
-#: fdisk/sfdisk.c:1884
+#: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
 msgstr "N�o h� espa�o para mais\n"
 
-#: fdisk/sfdisk.c:1903
+#: fdisk/sfdisk.c:1969
 msgid "Illegal type\n"
 msgstr "Tipo inv�lido\n"
 
-#: fdisk/sfdisk.c:1935
+#: fdisk/sfdisk.c:2001
 #, c-format
-msgid "Warning: exceeds max allowable size (%lu)\n"
-msgstr "Aviso: excede o tamanho m�ximo permitido (%lu)\n"
+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:1940
+#: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
 msgstr "Aten��o: parti��o vazia\n"
 
-#: fdisk/sfdisk.c:1954
+#: fdisk/sfdisk.c:2021
 #, 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:1967
+#: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "op��o de inicializa��o n�o reconhecida: selecione - ou *\n"
 
-#: fdisk/sfdisk.c:1984 fdisk/sfdisk.c:1997
+#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
 msgstr "especifica��o cil,cab,set parcial?\n"
 
-#: fdisk/sfdisk.c:2008
+#: fdisk/sfdisk.c:2075
 msgid "Extended partition not where expected\n"
 msgstr "Parti��o estendida n�o est� no lugar esperado\n"
 
-#: fdisk/sfdisk.c:2040
+#: fdisk/sfdisk.c:2107
 msgid "bad input\n"
 msgstr "entrada inv�lida\n"
 
-#: fdisk/sfdisk.c:2062
+#: fdisk/sfdisk.c:2129
 msgid "too many partitions\n"
 msgstr "N�mero excessivo de parti��es\n"
 
-#: fdisk/sfdisk.c:2095
+#: fdisk/sfdisk.c:2162
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 "Entrada no formato a seguir; campos ausentes recebem valor padr�o.\n"
-"<in�cio> <tamanho> <tipo [E,S,L,X,hexa]> <inicializ�vel [-,*]> <cil,cab,set> "
-"<cil,cab,set>\n"
-"Normalmente s� � necess�rio especificar <in�cio> e <tamanho> (e, talvez, "
-"<tipo>).\n"
+"<in�cio> <tamanho> <tipo [E,S,L,X,hexa]> <inicializ�vel [-,*]> <cil,cab,set> <cil,cab,set>\n"
+"Normalmente s� � necess�rio especificar <in�cio> e <tamanho> (e, talvez, <tipo>).\n"
 
-#: fdisk/sfdisk.c:2115
+#: fdisk/sfdisk.c:2182
 msgid "version"
 msgstr "vers�o"
 
-#: fdisk/sfdisk.c:2121
+#: fdisk/sfdisk.c:2188
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2122
+#: fdisk/sfdisk.c:2189
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "dispositivo: algo como /dev/hda ou /dev/sda"
 
-#: fdisk/sfdisk.c:2123
+#: fdisk/sfdisk.c:2190
 msgid "useful options:"
 msgstr "op��es �teis:"
 
-#: fdisk/sfdisk.c:2124
+#: fdisk/sfdisk.c:2191
 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:2125
+#: fdisk/sfdisk.c:2192
 msgid "    -c [or --id]:        print or change partition Id"
 msgstr "    -c [ou --id]:        mostra ou altera a ID da parti��o"
 
-#: fdisk/sfdisk.c:2126
+#: fdisk/sfdisk.c:2193
 msgid "    -l [or --list]:      list partitions of each device"
 msgstr "    -l [ou --list]:      lista as parti��es de cada dispositivo"
 
-#: fdisk/sfdisk.c:2127
+#: fdisk/sfdisk.c:2194
 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"
+msgstr "    -d [ou --dump]:      idem, mas em um formato adequado para entrada posterior"
 
-#: fdisk/sfdisk.c:2128
+#: fdisk/sfdisk.c:2195
 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"
+msgstr "    -i [ou --increment]: numera os cilindros, etc. a partir de 1, em vez de 0"
 
-#: fdisk/sfdisk.c:2129
-msgid ""
-"    -uS, -uB, -uC, -uM:  accept/report in units of "
-"sectors/blocks/cylinders/MB"
-msgstr ""
-"    -uS, -uB, -uC, -uM:  aceita/informa em unidades de "
-"setores/blocos/cilindros/MB"
+#: fdisk/sfdisk.c:2196
+msgid "    -uS, -uB, -uC, -uM:  accept/report in units of sectors/blocks/cylinders/MB"
+msgstr "    -uS, -uB, -uC, -uM:  aceita/informa em unidades de setores/blocos/cilindros/MB"
 
-#: fdisk/sfdisk.c:2130
+#: fdisk/sfdisk.c:2197
 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:2131
+#: fdisk/sfdisk.c:2198
 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"
+msgstr "    -D [ou --DOS]:       para compatibilidade com DOS: desperdi�a um pouco de espa�o"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2199
 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:2133
+#: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                altera somente a parti��o de n�mero #"
 
-#: fdisk/sfdisk.c:2134
+#: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 n�o grava no disco, realmente"
 
-#: fdisk/sfdisk.c:2135
-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:2202
+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:2136
+#: fdisk/sfdisk.c:2203
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I arquivo :         restaura os setores gravados em arquivo"
 
-#: fdisk/sfdisk.c:2137
+#: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [ou --version]:   mostra a vers�o"
 
-#: fdisk/sfdisk.c:2138
+#: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [ou --help]:      mostra esta mensagem"
 
-#: fdisk/sfdisk.c:2139
+#: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
 msgstr "op��es perigosas:"
 
-#: fdisk/sfdisk.c:2140
+#: fdisk/sfdisk.c:2207
 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"
+msgstr "    -g [ou --show-geometry]: mostra a suposi��o do kernel sobre a geometria"
 
-#: fdisk/sfdisk.c:2141
+#: fdisk/sfdisk.c:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4894,135 +4691,122 @@ 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:2143
-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:2210
+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:2144
+#: fdisk/sfdisk.c:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [ou --quiet]:      suprime mensagens de aviso"
 
-#: fdisk/sfdisk.c:2145
+#: fdisk/sfdisk.c:2212
 msgid "    You can override the detected geometry using:"
 msgstr "    Voc� pode anular a geometria detectada usando:"
 
-#: fdisk/sfdisk.c:2146
+#: fdisk/sfdisk.c:2213
 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:2147
+#: fdisk/sfdisk.c:2214
 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:2148
+#: fdisk/sfdisk.c:2215
 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:2149
+#: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
 msgstr "Voc� pode desativar todas as verifica��es de consist�ncia com:"
 
-#: fdisk/sfdisk.c:2150
+#: fdisk/sfdisk.c:2217
 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:2156
+#: fdisk/sfdisk.c:2223
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2157
+#: fdisk/sfdisk.c:2224
 #, 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:2158
+#: fdisk/sfdisk.c:2225
 #, 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"
+msgstr "%s dispositivo n1 n2... ativa as parti��es n1..., deixando inativas as demais\n"
 
-#: fdisk/sfdisk.c:2159
+#: fdisk/sfdisk.c:2226
 #, 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:2278
+#: fdisk/sfdisk.c:2346
 msgid "no command?\n"
 msgstr "nenhum comando?\n"
 
-#: fdisk/sfdisk.c:2401
+#: fdisk/sfdisk.c:2471
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "total: %d blocos\n"
 
-#: fdisk/sfdisk.c:2438
+#: fdisk/sfdisk.c:2508
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id dispositivo n�mero-parti��o\n"
 
-#: fdisk/sfdisk.c:2440
+#: fdisk/sfdisk.c:2510
 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:2442
+#: fdisk/sfdisk.c:2512
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id dispositivo n�mero-parti��o [ID]\n"
 
-#: fdisk/sfdisk.c:2449
+#: fdisk/sfdisk.c:2519
 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:2474
+#: fdisk/sfdisk.c:2544
 #, c-format
 msgid "cannot open %s %s\n"
 msgstr "n�o foi poss�vel abrir %s %s\n"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "read-write"
 msgstr "leitura/grava��o"
 
-#: fdisk/sfdisk.c:2474
+#: fdisk/sfdisk.c:2544
 msgid "for reading"
 msgstr "para leitura"
 
-#: fdisk/sfdisk.c:2499
+#: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2516
+#: fdisk/sfdisk.c:2586
 #, c-format
-msgid "%s: %d cylinders, %d heads, %d sectors/track\n"
-msgstr "%s: %d cilindros, %d cabe�as, %d setores/trilha\n"
+msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
+msgstr "%s: %ld cilindros, %ld cabe�as, %ld setores/trilha\n"
 
-#: fdisk/sfdisk.c:2519
-#, c-format
-msgid "%s: unknown geometry\n"
-msgstr "%s: geometria desconhecida\n"
-
-#: fdisk/sfdisk.c:2535
+#: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "ioctl BLKGETSIZE falhou para %s\n"
 
-#: fdisk/sfdisk.c:2612
+#: fdisk/sfdisk.c:2680
 #, 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:2629 fdisk/sfdisk.c:2682 fdisk/sfdisk.c:2712
-msgid ""
-"Done\n"
-"\n"
-msgstr ""
-"Conclu�do\n"
-"\n"
+#: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
+msgid "Done\n\n"
+msgstr "Conclu�do\n\n"
 
-#: fdisk/sfdisk.c:2638
+#: fdisk/sfdisk.c:2706
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5031,69 +4815,64 @@ 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:2652
+#: fdisk/sfdisk.c:2720
 #, 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:2708
+#: fdisk/sfdisk.c:2777
 #, c-format
 msgid "Bad Id %x\n"
 msgstr "ID inv�lida: %x\n"
 
-#: fdisk/sfdisk.c:2723
+#: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
 msgstr "Este disco est� atualmente sendo usado.\n"
 
-#: fdisk/sfdisk.c:2740
+#: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erro fatal: n�o foi poss�vel encontrar %s\n"
 
-#: fdisk/sfdisk.c:2743
+#: fdisk/sfdisk.c:2812
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Aviso: %s n�o � um dispositivo de blocos\n"
 
-#: fdisk/sfdisk.c:2749
+#: fdisk/sfdisk.c:2818
 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:2751
+#: fdisk/sfdisk.c:2820
 msgid ""
 "\n"
-"This disk is currently in use - repartitioning is probably a bad idea.Umount "
-"all file systems, and swapoff all swap partitions on this disk.Use the "
-"--no-reread flag to suppress this check.\n"
-msgstr ""
-"\n"
-"Este disco est� sendo usado no momento. Reparticion�-lo provavelmente "
-"causar� problemas. Desmonte todos os sistemas de arquivos e fa�a  swapoff  "
-"de todas as parti��es de permuta deste disco. Use a op��o --no-reread para "
-"suprimir esta verifica��o.\n"
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"Umount all file systems, and swapoff all swap partitions on this disk.\n"
+"Use the --no-reread flag to suppress this check.\n"
+msgstr "\nEste disco est� sendo usado no momento. Reparticion�-lo provavelmente n�o � uma boa id�ia. Desmonte todos os sistemas de arquivos e fa�a  swapoff  de todas as parti��es de permuta deste disco. Use a op��o --no-reread para suprimir esta verifica��o.\n"
 
-#: fdisk/sfdisk.c:2755
+#: fdisk/sfdisk.c:2824
 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:2759
-msgid "OK"
-msgstr "OK"
+#: fdisk/sfdisk.c:2828
+msgid "OK\n"
+msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2768
+#: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
 msgstr "Situa��o antiga:\n"
 
-#: fdisk/sfdisk.c:2772
+#: fdisk/sfdisk.c:2841
 #, 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:2780
+#: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
 msgstr "Situa��o nova:\n"
 
-#: fdisk/sfdisk.c:2785
+#: fdisk/sfdisk.c:2854
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5101,157 +4880,143 @@ 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:2788
+#: fdisk/sfdisk.c:2857
 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:2793
+#: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Voc� est� satisfeito com isto? [ynq] "
 
-#: fdisk/sfdisk.c:2795
+#: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Deseja gravar isto no disco? [ynq] "
 
-#: fdisk/sfdisk.c:2800
-msgid ""
-"\n"
-"sfdisk: premature end of input\n"
-msgstr ""
-"\n"
-"sfdisk: final de entrada prematuro\n"
+#: fdisk/sfdisk.c:2869
+msgid "\nsfdisk: premature end of input\n"
+msgstr "\nsfdisk: final de entrada prematuro\n"
 
-#: fdisk/sfdisk.c:2802
+#: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
 msgstr "Saindo - nada foi alterado\n"
 
-#: fdisk/sfdisk.c:2808
+#: fdisk/sfdisk.c:2877
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda y, n ou q\n"
 
-#: fdisk/sfdisk.c:2816
-msgid ""
-"Successfully wrote the new partition table\n"
-"\n"
-msgstr ""
-"Nova tabela de parti��es gravada com sucesso\n"
-"\n"
+#: fdisk/sfdisk.c:2885
+msgid "Successfully wrote the new partition table\n\n"
+msgstr "Nova tabela de parti��es gravada com sucesso\n\n"
 
-#: fdisk/sfdisk.c:2822
+#: fdisk/sfdisk.c:2891
 msgid ""
 "If you created or changed a DOS partition, /dev/foo7, say, then use dd(1)\n"
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Se voc� criou ou alterou uma parti��o DOS, por exemplo, /dev/foo7, use "
-"dd(1)\n"
-"para zerar os primeiros 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 "
-"count=1\n"
+"Se voc� criou ou alterou uma parti��o DOS, por exemplo, /dev/foo7, use dd(1)\n"
+"para zerar os primeiros 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(consulte fdisk(8)).\n"
 
-#: games/banner.c:1048
+#: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
 msgstr "Uso: banner [-w largura]\n"
 
-#: games/banner.c:1068
+#: games/banner.c:1065
 msgid "Message: "
 msgstr "Mensagem: "
 
-#: games/banner.c:1102
+#: games/banner.c:1099
 #, c-format
 msgid "The character '%c' is not in my character set"
 msgstr "O caractere '%c' n�o faz parte do meu conjunto de caracteres"
 
-#: games/banner.c:1110
+#: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
 msgstr "A mensagem '%s' est� OK\n"
 
-#: getopt-1.0.3b/getopt.c:229
+#: getopt-1.1.0a/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Tente `getopt --help' para maiores informa��es.\n"
 
-#: getopt-1.0.3b/getopt.c:295
+#: getopt-1.1.0a/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "op��o longa vazia depois de argumento -l ou --long"
 
-#: getopt-1.0.3b/getopt.c:315
+#: getopt-1.1.0a/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "interpretador de comandos desconhecido ap�s argumento -s ou --shell"
 
-#: getopt-1.0.3b/getopt.c:320
+#: getopt-1.1.0a/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Uso: getopt texto_op��es par�metros\n"
 
-#: getopt-1.0.3b/getopt.c:321
+#: getopt-1.1.0a/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [op��es] [--] texto_op��es par�metros\n"
 
-#: getopt-1.0.3b/getopt.c:322
+#: getopt-1.1.0a/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [op��es] -o|--op��es texto_op��es [op��es] [--]\n"
 
-#: getopt-1.0.3b/getopt.c:323
+#: getopt-1.1.0a/getopt.c:327
 msgid "              parameters\n"
 msgstr "              par�metros\n"
 
-#: getopt-1.0.3b/getopt.c:324
-msgid ""
-"  -a, --alternative            Allow long options starting with single -\n"
-msgstr ""
-"  -a, --alternative            Permite op��es longas iniciando com um �nico "
-"-\n"
+#: getopt-1.1.0a/getopt.c:328
+msgid "  -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative            Permite op��es longas iniciando com um �nico -\n"
 
-#: getopt-1.0.3b/getopt.c:325
+#: getopt-1.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Mostra este pequeno guia de uso\n"
 
-#: getopt-1.0.3b/getopt.c:326
+#: getopt-1.1.0a/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=ops_longas Op��es longas a serem reconhecidas\n"
 
-#: getopt-1.0.3b/getopt.c:327
-msgid ""
-"  -n, --name=progname          The name under which errors are reported\n"
-msgstr ""
-"  -n, --name=nome_prog         O nome sob o qual erros s�o reportados\n"
+#: getopt-1.1.0a/getopt.c:331
+msgid "  -n, --name=progname          The name under which errors are reported\n"
+msgstr "  -n, --name=nome_prog         O nome sob o qual erros s�o reportados\n"
 
-#: getopt-1.0.3b/getopt.c:328
+#: getopt-1.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=texto_op��es     Op��es curtas a serem reconhecidas\n"
 
-#: getopt-1.0.3b/getopt.c:329
+#: getopt-1.1.0a/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-msgstr ""
-"  -q, --quiet                  Desativa a exibi��o de erros por getopt(3)\n"
+msgstr "  -q, --quiet                  Desativa a exibi��o de erros por getopt(3)\n"
 
-#: getopt-1.0.3b/getopt.c:330
+#: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Sem sa�da normal\n"
 
-#: getopt-1.0.3b/getopt.c:331
+#: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr ""
-"  -s, --shell=shell            Configura as conven��es de aspas do "
-"interpretador de comandos\n"
+msgstr "  -s, --shell=shell            Configura as conven��es de aspas do interpretador de comandos\n"
 
-#: getopt-1.0.3b/getopt.c:332
+#: getopt-1.1.0a/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Teste de vers�o de getopt(1)\n"
 
-#: getopt-1.0.3b/getopt.c:333
+#: getopt-1.1.0a/getopt.c:337
+msgid "  -u, --unqote                 Do not quote the output\n"
+msgstr "  -u, --unqote                 N�o quota a sa�da\n"
+
+#: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Mostra informa��es de vers�o\n"
 
-#: getopt-1.0.3b/getopt.c:387 getopt-1.0.3b/getopt.c:445
+#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
 msgstr "faltou o argumento texto_op��es"
 
-#: getopt-1.0.3b/getopt.c:433
-msgid "getopt (enhanced) 1.0.3\n"
-msgstr "getopt (melhorado) 1.0.3)\n"
+#: getopt-1.1.0a/getopt.c:441
+msgid "getopt (enhanced) 1.1.0\n"
+msgstr "getopt (melhorado) 1.1.0)\n"
 
-#: getopt-1.0.3b/getopt.c:439
+#: getopt-1.1.0a/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "erro interno, entre em contato com o autor."
 
@@ -5305,132 +5070,128 @@ msgstr "bad timeout value: %s"
 msgid "after getopt loop\n"
 msgstr "after getopt loop\n"
 
-#: login-utils/agetty.c:492
+#: login-utils/agetty.c:524
 msgid "exiting parseargs\n"
 msgstr "exiting parseargs\n"
 
-#: login-utils/agetty.c:505
+#: login-utils/agetty.c:536
 msgid "entered parse_speeds\n"
 msgstr "entered parse_speeds\n"
 
-#: login-utils/agetty.c:508
+#: login-utils/agetty.c:539
 #, c-format
 msgid "bad speed: %s"
 msgstr "velocidade inv�lida: %s"
 
-#: login-utils/agetty.c:510
+#: login-utils/agetty.c:541
 msgid "too many alternate speeds"
 msgstr "n�mero excessivo de velocidades alternativas"
 
-#: login-utils/agetty.c:512
+#: login-utils/agetty.c:543
 msgid "exiting parsespeeds\n"
 msgstr "exiting parsespeeds\n"
 
-#: login-utils/agetty.c:587
+#: login-utils/agetty.c:616
 #, c-format
 msgid "%s: open for update: %m"
 msgstr "%s: aberto para atualiza��o: %m"
 
-#: login-utils/agetty.c:605
+#: login-utils/agetty.c:634
 #, c-format
 msgid "%s: no utmp entry"
 msgstr "%s: entrada utmp inexistente"
 
-#: login-utils/agetty.c:634
+#: login-utils/agetty.c:663
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "/dev: chdir() falhou: %m"
 
-#: login-utils/agetty.c:638
+#: login-utils/agetty.c:667
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s n�o � um dispositivo de caracteres"
 
 #. ignore close(2) errors
-#: login-utils/agetty.c:645
+#: login-utils/agetty.c:674
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:647
+#: login-utils/agetty.c:676
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: n�o foi poss�vel abrir como entrada padr�o: %m"
 
-#: login-utils/agetty.c:657
+#: login-utils/agetty.c:686
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: n�o est� aberto para leitura/grava��o"
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:661
+#: login-utils/agetty.c:690
 msgid "duping\n"
 msgstr "duping\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:663
+#: login-utils/agetty.c:692
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problema de dup: %m"
 
-#: login-utils/agetty.c:733
+#: login-utils/agetty.c:762
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:947
 msgid "user"
 msgstr "usu�rio"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:947
 msgid "users"
 msgstr "usu�rios"
 
-#: login-utils/agetty.c:1003
+#: login-utils/agetty.c:1035
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: leitura: %m"
 
-#: login-utils/agetty.c:1049
+#: login-utils/agetty.c:1081
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: entrada excedida"
 
-#: login-utils/agetty.c:1173
+#: login-utils/agetty.c:1205
 #, c-format
 msgid ""
-"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
-"login_host] baud_rate,... line [termtype]\n"
-"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
-"line baud_rate,... [termtype]\n"
+"Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
+"or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] line baud_rate,... [termtype]\n"
 msgstr ""
-"Uso: %s [-hiLmw] [-l programa_login] [-t tempo_limite] [-I string_inic] [-H "
-"host_login] taxa_baud,... linha [tipo_term]\n"
-"ou\t[-hiLmw] [-l programa_login] [-t tempo_limite] [-I string_inic] [-H "
-"host_login] linha taxa_baud,... [tipo_term]\n"
+"Uso: %s [-hiLmw] [-l programa_login] [-t tempo_limite] [-I string_inic] [-H host_login] taxa_baud,... linha [tipo_term]\n"
+"ou\t[-hiLmw] [-l programa_login] [-t tempo_limite] [-I string_inic] [-H host_login] linha taxa_baud,... [tipo_term]\n"
 
-#: login-utils/checktty.c:46
+#: login-utils/checktty.c:41
 #, c-format
 msgid "badlogin: %s\n"
 msgstr "login inv�lido: %s\n"
 
-#: login-utils/checktty.c:52
+#: login-utils/checktty.c:47
 #, c-format
 msgid "sleepexit %d\n"
 msgstr "sleepexit %d\n"
 
-#: login-utils/checktty.c:108 login-utils/checktty.c:130
+#: login-utils/checktty.c:103 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
 msgstr "login: pouca mem�ria; o login pode falhar\n"
 
-#: login-utils/checktty.c:109
+#: login-utils/checktty.c:104
 msgid "can't malloc for ttyclass"
 msgstr "n�o foi poss�vel malloc para ttyclass"
 
-#: login-utils/checktty.c:131
+#: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
 msgstr "n�o foi poss�vel malloc para grplist"
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:431
+#: login-utils/checktty.c:426
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login em %s de %s negado como padr�o.\n"
@@ -5439,57 +5200,57 @@ msgstr "Login em %s de %s negado como padr�o.\n"
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:442
+#: login-utils/checktty.c:437
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login em %s de %s negado.\n"
 
-#: login-utils/chfn.c:134 login-utils/chsh.c:117
+#: login-utils/chfn.c:121 login-utils/chsh.c:107
 #, c-format
 msgid "%s: you (user %d) don't exist.\n"
 msgstr "%s: voc� (usu�rio %d) n�o existe.\n"
 
-#: login-utils/chfn.c:141 login-utils/chsh.c:124
+#: login-utils/chfn.c:128 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
 msgstr "%s: usu�rio \"%s\" n�o existe.\n"
 
-#: login-utils/chfn.c:146 login-utils/chsh.c:129
+#: login-utils/chfn.c:133 login-utils/chsh.c:119
 #, c-format
 msgid "%s: can only change local entries; use yp%s instead.\n"
 msgstr "%s: s� pode alterar entradas locais; use yp%s, em vez disso.\n"
 
-#: login-utils/chfn.c:158
+#: login-utils/chfn.c:145
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Alterando informa��es de finger de %s.\n"
 
-#: login-utils/chfn.c:164 login-utils/chfn.c:168 login-utils/chfn.c:175
-#: login-utils/chfn.c:179 login-utils/chsh.c:153 login-utils/chsh.c:157
-#: login-utils/chsh.c:164 login-utils/chsh.c:168
+#: login-utils/chfn.c:151 login-utils/chfn.c:155 login-utils/chfn.c:162
+#: login-utils/chfn.c:166 login-utils/chsh.c:143 login-utils/chsh.c:147
+#: login-utils/chsh.c:154 login-utils/chsh.c:158
 msgid "Password error."
 msgstr "Erro de senha."
 
-#: login-utils/chfn.c:188 login-utils/chsh.c:177 login-utils/login.c:684
-#: login-utils/newgrp.c:47 login-utils/simpleinit.c:219 mount/lomount.c:200
-#: mount/lomount.c:206 mount/losetup.c:116 mount/losetup.c:122
+#: login-utils/chfn.c:175 login-utils/chsh.c:167 login-utils/login.c:685
+#: login-utils/newgrp.c:47 login-utils/simpleinit.c:266 mount/lomount.c:221
+#: mount/lomount.c:227
 msgid "Password: "
 msgstr "Senha:"
 
-#: login-utils/chfn.c:191 login-utils/chsh.c:180
+#: login-utils/chfn.c:178 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
-#: login-utils/chfn.c:202
+#: login-utils/chfn.c:189
 msgid "Finger information not changed.\n"
 msgstr "Informa��es de finger n�o alteradas.\n"
 
-#: login-utils/chfn.c:305
+#: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
 msgstr "Uso: %s [ -f nome_completo ] [ -o local_de_trabalho ] "
 
-#: login-utils/chfn.c:306
+#: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
@@ -5497,170 +5258,161 @@ msgstr ""
 "[ -p telefone_comercial ]\n"
 "\t[ -h telefone_residencial ] "
 
-#: login-utils/chfn.c:307
+#: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ --version ]\n"
 
-#: login-utils/chfn.c:376 login-utils/chsh.c:293
-msgid ""
-"\n"
-"Aborted.\n"
-msgstr ""
-"\n"
-"Abortado.\n"
+#: login-utils/chfn.c:365 login-utils/chsh.c:283
+msgid "\nAborted.\n"
+msgstr "\nAbortado.\n"
 
-#: login-utils/chfn.c:409
+#: login-utils/chfn.c:398
 msgid "field is too long.\n"
 msgstr "campo longo demais.\n"
 
-#: login-utils/chfn.c:417
+#: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
 msgstr "'%c' n�o � permitido.\n"
 
-#: login-utils/chfn.c:422
+#: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
 msgstr "Caracteres de controle n�o s�o permitidos.\n"
 
-#: login-utils/chfn.c:487
+#: login-utils/chfn.c:476
 msgid "Finger information *NOT* changed.  Try again later.\n"
-msgstr ""
-"As informa��es de finger *N�O* foram alteradas. Tente novamente mais tarde.\n"
+msgstr "As informa��es de finger *N�O* foram alteradas. Tente novamente mais tarde.\n"
 
-#: login-utils/chfn.c:490
+#: login-utils/chfn.c:479
 msgid "Finger information changed.\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: login-utils/chfn.c:504 login-utils/chsh.c:411 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
 msgid "malloc failed"
 msgstr "malloc falhou"
 
-#: login-utils/chsh.c:140
+#: login-utils/chsh.c:130
 #, c-format
 msgid "%s: Your shell is not in /etc/shells, shell change denied\n"
-msgstr ""
-"%s: Seu interpretador de comandos n�o est� em /etc/shells; mudan�a de "
-"interpretador de comandos negada.\n"
+msgstr "%s: Seu interpretador de comandos n�o est� em /etc/shells; mudan�a de interpretador de comandos negada.\n"
 
-#: login-utils/chsh.c:147
+#: login-utils/chsh.c:137
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "Alterando o interpretador de comandos para o usu�rio %s.\n"
 
-#: login-utils/chsh.c:188
+#: login-utils/chsh.c:178
 msgid "New shell"
 msgstr "Novo interpretador de comandos"
 
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
 msgstr "O interpretador de comandos N�O foi alterado.\n"
 
-#: login-utils/chsh.c:202
+#: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr ""
-"O interpretador de comandos *N�O* foi alterado. Tente novamente mais tarde.\n"
+msgstr "O interpretador de comandos *N�O* foi alterado. Tente novamente mais tarde.\n"
 
-#: login-utils/chsh.c:205
+#: login-utils/chsh.c:195
 msgid "Shell changed.\n"
 msgstr "Interpretador de comandos alterado.\n"
 
-#: login-utils/chsh.c:273
+#: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
 msgstr "Uso: %s [ -s interpretador_de_comandos ] "
 
-#: login-utils/chsh.c:274
+#: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
 msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
-#: login-utils/chsh.c:275
+#: login-utils/chsh.c:265
 msgid "       [ username ]\n"
 msgstr "       [ nome_usu�rio ]\n"
 
-#: login-utils/chsh.c:319
+#: login-utils/chsh.c:309
 #, c-format
 msgid "%s: shell must be a full path name.\n"
-msgstr ""
-"%s: o interpretador de comandos precisa ser um nome de caminho completo.\n"
+msgstr "%s: o interpretador de comandos precisa ser um nome de caminho completo.\n"
 
-#: login-utils/chsh.c:323
+#: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" n�o existe.\n"
 
-#: login-utils/chsh.c:327
+#: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" n�o � execut�vel.\n"
 
-#: login-utils/chsh.c:334
+#: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' n�o � permitido.\n"
 
-#: login-utils/chsh.c:338
+#: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: caracteres de controle n�o s�o permitidos.\n"
 
-#: login-utils/chsh.c:345
+#: login-utils/chsh.c:335
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells\n"
 msgstr "Aviso:  \"%s\" n�o est� listado em /etc/shells\n"
 
-#: login-utils/chsh.c:347
+#: login-utils/chsh.c:337
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" n�o est� listado em /etc/shells\n"
 
-#: login-utils/chsh.c:349
+#: login-utils/chsh.c:339
 #, c-format
 msgid "%s: use -l option to see list\n"
 msgstr "%s: use a op��o -l para ver a lista\n"
 
-#: login-utils/chsh.c:355
+#: login-utils/chsh.c:345
 #, c-format
 msgid "Warning: \"%s\" is not listed in /etc/shells.\n"
 msgstr "Aviso:  \"%s\" n�o est� listado em /etc/shells.\n"
 
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:346
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Use %s -l para ver a lista.\n"
 
-#: login-utils/chsh.c:377
+#: login-utils/chsh.c:367
 msgid "No known shells.\n"
 msgstr "Nenhum interpretador de comandos conhecido.\n"
 
-#: login-utils/cryptocard.c:70
+#: login-utils/cryptocard.c:68
 msgid "couldn't open /dev/urandom"
 msgstr "n�o foi poss�vel abrir /dev/urandom"
 
-#: login-utils/cryptocard.c:75
+#: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
 msgstr "n�o foi poss�vel ler dados aleat�rios de /dev/urandom"
 
-#: login-utils/cryptocard.c:98
+#: login-utils/cryptocard.c:96
 #, c-format
 msgid "can't open %s for reading"
 msgstr "n�o foi poss�vel abrir %s para leitura"
 
-#: login-utils/cryptocard.c:102
+#: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
 msgstr "n�o foi poss�vel stat(%s)"
 
-#: login-utils/cryptocard.c:108
+#: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
 msgstr "%s n�o possui os modos de arquivo corretos"
 
-#: login-utils/cryptocard.c:113
+#: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
 msgstr "n�o foi poss�vel ler dados de %s"
 
-#: login-utils/islocal.c:36
+#: login-utils/islocal.c:37
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "N�o foi poss�vel ler %s; saindo."
@@ -5675,12 +5427,8 @@ msgstr "  ainda conectado"
 
 #: login-utils/last.c:305
 #, c-format
-msgid ""
-"\n"
-"wtmp begins %s"
-msgstr ""
-"\n"
-"wtmp inicia %s"
+msgid "\nwtmp begins %s"
+msgstr "\nwtmp inicia %s"
 
 #: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
 msgid "last: malloc failure.\n"
@@ -5692,94 +5440,84 @@ msgstr "last: gethostname"
 
 #: login-utils/last.c:469
 #, c-format
-msgid ""
-"\n"
-"interrupted %10.10s %5.5s \n"
-msgstr ""
-"\n"
-"interrompido %10.10s %5.5s \n"
+msgid "\ninterrupted %10.10s %5.5s \n"
+msgstr "\ninterrompido %10.10s %5.5s \n"
 
-#: login-utils/login.c:377
+#: login-utils/login.c:373
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h somente pode ser especificado pelo superusu�rio.\n"
 
-#: login-utils/login.c:402
+#: login-utils/login.c:398
 msgid "usage: login [-fp] [username]\n"
 msgstr "Uso: login [-fp] [nome_usu�rio]\n"
 
-#: login-utils/login.c:504
+#: login-utils/login.c:501
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: falha de PAM; abortando: %s\n"
 
-#: login-utils/login.c:506
+#: login-utils/login.c:503
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "N�o foi poss�vel inicializar o PAM: %s"
 
-#. Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
-#. so that the "login: " prompt gets localized. Unfortunately,
-#. PAM doesn't have an interface to specify the "Password: " string (yet).
+#.
+#. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
+#. * so that the "login: " prompt gets localized. Unfortunately,
+#. * PAM doesn't have an interface to specify the "Password: " string
+#. * (yet).
+#.
 #: login-utils/login.c:519
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:552
+#: login-utils/login.c:553
 #, 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:554
-msgid ""
-"Login incorrect\n"
-"\n"
-msgstr ""
-"Login incorreto\n"
-"\n"
+#: login-utils/login.c:555
+msgid "Login incorrect\n\n"
+msgstr "Login incorreto\n\n"
 
-#: login-utils/login.c:563
+#: login-utils/login.c:564
 #, 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"
+msgstr "N�MERO EXCESSIVO DE TENTATIVAS DE LOGIN (%d) A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:567
+#: login-utils/login.c:568
 #, 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:570
-msgid ""
-"\n"
-"Login incorrect\n"
-msgstr ""
-"\n"
-"Login incorreto\n"
+#: login-utils/login.c:571
+msgid "\nLogin incorrect\n"
+msgstr "\nLogin incorreto\n"
 
-#: login-utils/login.c:619
+#: login-utils/login.c:620
 msgid "Illegal username"
 msgstr "Nome de usu�rio inv�lido"
 
-#: login-utils/login.c:662
+#: login-utils/login.c:663
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s: login recusado neste terminal.\n"
 
-#: login-utils/login.c:667
+#: login-utils/login.c:668
 #, 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:671
+#: login-utils/login.c:672
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s: LOGIN RECUSADO NO TTY %s"
 
-#: login-utils/login.c:723
+#: login-utils/login.c:725
 msgid "Login incorrect\n"
 msgstr "Login incorreto\n"
 
-#: login-utils/login.c:745
+#: login-utils/login.c:747
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5787,165 +5525,160 @@ msgstr ""
 "N�mero m�ximo de usu�rios j� conectados.\n"
 "Tente novamente mais tarde.\n"
 
-#: login-utils/login.c:749
+#: login-utils/login.c:751
 msgid "You have too many processes running.\n"
 msgstr "N�mero excessivo de processos em execu��o.\n"
 
-#: login-utils/login.c:795
+#: login-utils/login.c:797
 msgid "Warning: no Kerberos tickets issued\n"
 msgstr "Aviso: nenhum bilhete Kerberos emitido\n"
 
-#: login-utils/login.c:807
+#: login-utils/login.c:809
 msgid "Sorry -- your password has expired.\n"
 msgstr "Sua senha expirou.\n"
 
-#: login-utils/login.c:813
+#: login-utils/login.c:815
 #, c-format
-msgid "Warning: your password expires on %s %d, %d\n"
-msgstr "Aviso: sua senha ir� expirar em %d de %s de %d\n"
+msgid "Warning: your password expires on %d %s %d.\n"
+msgstr "Aten��o: sua senha ir� expirar em %d %s %d.\n"
 
-#: login-utils/login.c:821
+#: login-utils/login.c:823
 msgid "Sorry -- your account has expired.\n"
 msgstr "Sua conta expirou.\n"
 
-#: login-utils/login.c:827
+#: login-utils/login.c:829
 #, c-format
-msgid "Warning: your account expires on %s %d, %d\n"
-msgstr "Aviso: sua conta perder� a validade em %d de %s de %d\n"
+msgid "Warning: your account expires on %d %s %d.\n"
+msgstr "Aten��o: sua conta perder� a validade em %d %s %d.\n"
 
-#: login-utils/login.c:1061
+#: login-utils/login.c:1066
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DISCAGEM EM %s POR %s"
 
-#: login-utils/login.c:1068
+#: login-utils/login.c:1073
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN COMO ROOT EM %s A PARTIR DE %s"
 
-#: login-utils/login.c:1071
+#: login-utils/login.c:1076
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN COMO ROOT EM %s"
 
-#: login-utils/login.c:1074
+#: login-utils/login.c:1079
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN EM %s POR %s A PARTIR DE %s"
 
-#: login-utils/login.c:1077
+#: login-utils/login.c:1082
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN EM %s POR %s"
 
-#: login-utils/login.c:1089
+#: login-utils/login.c:1094
 #, c-format
 msgid "You have %smail.\n"
 msgstr "Voc� tem mensagens %s na caixa de correio.\n"
 
-#: login-utils/login.c:1090
+#: login-utils/login.c:1095
 msgid "new "
 msgstr "novas "
 
 #. error in fork()
-#: login-utils/login.c:1108
+#: login-utils/login.c:1113
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: falha em fork: %s"
 
-#: login-utils/login.c:1123
+#: login-utils/login.c:1128
 msgid "setuid() failed"
 msgstr "setuid() falhou"
 
-#: login-utils/login.c:1129
+#: login-utils/login.c:1134
 #, c-format
 msgid "No directory %s!\n"
 msgstr "O diret�rio %s n�o existe!\n"
 
-#: login-utils/login.c:1133
+#: login-utils/login.c:1138
 msgid "Logging in with home = \"/\".\n"
 msgstr "Fazendo login com home = \"/\".\n"
 
-#: login-utils/login.c:1141
+#: login-utils/login.c:1146
 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:1169
+#: login-utils/login.c:1174
 #, 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"
+msgstr "login: n�o foi poss�vel executar o script do interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1172
+#: login-utils/login.c:1177
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: n�o existe interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1188
+#: login-utils/login.c:1191
 #, c-format
-msgid ""
-"\n"
-"%s login: "
-msgstr ""
-"\n"
-"%s usu�rio: "
+msgid "\n%s login: "
+msgstr "\n%s usu�rio: "
 
-#: login-utils/login.c:1199
+#: login-utils/login.c:1202
 msgid "login name much too long.\n"
 msgstr "nome de login longo demais.\n"
 
-#: login-utils/login.c:1200
+#: login-utils/login.c:1203
 msgid "NAME too long"
 msgstr "NOME longo demais"
 
-#: login-utils/login.c:1207
+#: login-utils/login.c:1210
 msgid "login names may not start with '-'.\n"
 msgstr "nomes de login n�o podem iniciar com '-'.\n"
 
-#: login-utils/login.c:1217
+#: login-utils/login.c:1220
 msgid "too many bare linefeeds.\n"
 msgstr "N�mero excessivo de saltos de linha.\n"
 
-#: login-utils/login.c:1218
+#: login-utils/login.c:1221
 msgid "EXCESSIVE linefeeds"
 msgstr "Saltos de linha EXCESSIVOS"
 
-#: login-utils/login.c:1229
+#: login-utils/login.c:1231
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Tempo de login esgotado ap�s %d segundos\n"
 
-#: login-utils/login.c:1329
+#: login-utils/login.c:1325
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ltimo login: %.*s "
 
-#: login-utils/login.c:1333
+#: login-utils/login.c:1329
 #, c-format
 msgid "from %.*s\n"
 msgstr "a partir de %.*s\n"
 
-#: login-utils/login.c:1336
+#: login-utils/login.c:1332
 #, c-format
 msgid "on %.*s\n"
 msgstr "em: %.*s\n"
 
-#: login-utils/login.c:1359
+#: login-utils/login.c:1355
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "FALHA DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1362
+#: login-utils/login.c:1358
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "FALHA DE LOGIN EM %s, %s"
 
-#: login-utils/login.c:1366
+#: login-utils/login.c:1362
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALHAS DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1369
+#: login-utils/login.c:1365
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALHAS DE LOGIN EM %s, %s"
@@ -5986,323 +5719,313 @@ msgstr "newgrp: setuid"
 msgid "No shell"
 msgstr "Interpretador de comandos inexistente"
 
-#: login-utils/passwd.c:161
+#: login-utils/passwd.c:159
 msgid "The password must have at least 6 characters, try again.\n"
 msgstr "A senha deve ter pelo menos 6 caracteres; tente novamente.\n"
 
-#: login-utils/passwd.c:174
+#: login-utils/passwd.c:172
 msgid "The password must contain characters out of two of the following\n"
 msgstr "A senha deve conter caracteres de uma das duas classes seguintes:\n"
 
-#: login-utils/passwd.c:175
+#: login-utils/passwd.c:173
 msgid "classes:  upper and lower case letters, digits and non alphanumeric\n"
-msgstr ""
-"letras mai�sculas e min�sculas, d�gitos e caracteres n�o alfanum�ricos.\n"
+msgstr "letras mai�sculas e min�sculas, d�gitos e caracteres n�o alfanum�ricos.\n"
 
-#: login-utils/passwd.c:176
+#: login-utils/passwd.c:174
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "Consulte passwd(1) para maiores informa��es.\n"
 
-#: login-utils/passwd.c:181
+#: login-utils/passwd.c:179
 msgid "You cannot reuse the old password.\n"
 msgstr "Voc� n�o pode reutilizar a senha antiga.\n"
 
-#: login-utils/passwd.c:186
+#: login-utils/passwd.c:184
 msgid "Please don't use something like your username as password!\n"
 msgstr "N�o use algo como seu nome de usu�rio como senha!\n"
 
-#: login-utils/passwd.c:197 login-utils/passwd.c:204
+#: login-utils/passwd.c:195 login-utils/passwd.c:202
 msgid "Please don't use something like your realname as password!\n"
 msgstr "N�o use algo como seu nome real como senha!\n"
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:220
 msgid "Usage: passwd [username [password]]\n"
 msgstr "Uso: passwd [nome_usu�rio [senha]]\n"
 
-#: login-utils/passwd.c:222
+#: login-utils/passwd.c:221
 msgid "Only root may use the one and two argument forms.\n"
 msgstr "Somente root pode usar os formatos de um e dois argumentos.\n"
 
-#: login-utils/passwd.c:278
+#: login-utils/passwd.c:275
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "Uso: passwd [-foqsvV] [nome_usu�rio [senha]]\n"
 
-#: login-utils/passwd.c:299
+#: login-utils/passwd.c:296
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "N�o foi poss�vel exec %s: %s\n"
 
-#: login-utils/passwd.c:310
+#: login-utils/passwd.c:307
 msgid "Cannot find login name"
 msgstr "N�o foi poss�vel localizar o nome de login"
 
-#: login-utils/passwd.c:317 login-utils/passwd.c:324
+#: login-utils/passwd.c:314 login-utils/passwd.c:321
 msgid "Only root can change the password for others.\n"
 msgstr "Somente root pode alterar senhas de terceiros.\n"
 
-#: login-utils/passwd.c:332
+#: login-utils/passwd.c:329
 msgid "Too many arguments.\n"
 msgstr "N�mero excessivo de argumentos.\n"
 
-#: login-utils/passwd.c:337
+#: login-utils/passwd.c:334
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr ""
-"N�o foi poss�vel encontrar o nome de usu�rio em nenhum lugar. `%s' realmente "
-"� um nome de usu�rio?"
+msgstr "N�o foi poss�vel encontrar o nome de usu�rio em nenhum lugar. `%s' realmente � um nome de usu�rio?"
 
-#: login-utils/passwd.c:341
+#: login-utils/passwd.c:338
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr "Eu s� posso alterar senhas locais. Use yppasswd."
 
-#: login-utils/passwd.c:347
+#: login-utils/passwd.c:344
 msgid "UID and username does not match, imposter!"
 msgstr "Nome de usu�rio e UID n�o correspondem, impostor!"
 
-#: login-utils/passwd.c:352
+#: login-utils/passwd.c:349
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "Alterando a senha para o usu�rio %s\n"
 
-#: login-utils/passwd.c:356
+#: login-utils/passwd.c:353
 msgid "Enter old password: "
 msgstr "Informe a senha anterior: "
 
-#: login-utils/passwd.c:358
+#: login-utils/passwd.c:355
 msgid "Illegal password, imposter."
 msgstr "Senha incorreta, impostor."
 
-#: login-utils/passwd.c:370
+#: login-utils/passwd.c:367
 msgid "Enter new password: "
 msgstr "Informe a nova senha: "
 
-#: login-utils/passwd.c:372
+#: login-utils/passwd.c:369
 msgid "Password not changed."
 msgstr "A senha N�O foi alterada."
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:379
 msgid "Re-type new password: "
 msgstr "Redigite a nova senha: "
 
-#: login-utils/passwd.c:385
+#: login-utils/passwd.c:382
 msgid "You misspelled it. Password not changed."
 msgstr "Voc� n�o a informou corretamente. A senha n�o foi alterada."
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:397
 #, c-format
 msgid "password changed, user %s"
 msgstr "senha alterada, usu�rio %s"
 
-#: login-utils/passwd.c:403
+#: login-utils/passwd.c:400
 msgid "ROOT PASSWORD CHANGED"
 msgstr "A SENHA DO ROOT FOI ALTERADA"
 
-#: login-utils/passwd.c:405
+#: login-utils/passwd.c:402
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "senha alterada pelo root, usu�rio %s"
 
-#: login-utils/passwd.c:412
+#: login-utils/passwd.c:409
 msgid "calling setpwnam to set password.\n"
 msgstr "chamando setpwnam para definir a senha.\n"
 
-#: login-utils/passwd.c:416
+#: login-utils/passwd.c:413
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "A senha *N�O* foi alterada. Tente novamente mais tarde.\n"
 
-#: login-utils/passwd.c:422
+#: login-utils/passwd.c:419
 msgid "Password changed.\n"
 msgstr "Senha alterada.\n"
 
-#: login-utils/shutdown.c:85
+#: login-utils/shutdown.c:87
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 msgstr "Uso: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
 
-#: login-utils/shutdown.c:103
+#: login-utils/shutdown.c:105
 msgid "Shutdown process aborted"
 msgstr "Processo de desligamento abortado"
 
-#: login-utils/shutdown.c:125
+#: login-utils/shutdown.c:131
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
 msgstr "%s: somente o root pode desligar um sistema.\n"
 
-#: login-utils/shutdown.c:219
+#: login-utils/shutdown.c:225
 msgid "That must be tomorrow, can't you wait till then?\n"
 msgstr "Isto precisa ser amanh�. Voc� pode esperar?\n"
 
-#: login-utils/shutdown.c:271
+#: login-utils/shutdown.c:277
 msgid "for maintenance; bounce, bounce"
 msgstr "para manuten��o; bounce, bounce"
 
-#: login-utils/shutdown.c:275
+#: login-utils/shutdown.c:281
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#: login-utils/shutdown.c:300
+#: login-utils/shutdown.c:306
 msgid "The system is being shut down within 5 minutes"
 msgstr "O sistema ser� desligado dentro de 5 minutos"
 
-#: login-utils/shutdown.c:304
+#: login-utils/shutdown.c:310
 msgid "Login is therefore prohibited."
 msgstr "Assim, logins est�o proibidos."
 
-#: login-utils/shutdown.c:325
+#: login-utils/shutdown.c:331
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%s por %s: %s"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "rebooted"
 msgstr "reinicializado"
 
-#: login-utils/shutdown.c:326
+#: login-utils/shutdown.c:332
 msgid "halted"
 msgstr "parado"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:377
-msgid ""
-"\n"
-"Why am I still alive after reboot?"
-msgstr ""
-"\n"
-"Por que eu ainda estou vivo ap�s a reinicializa��o?"
+#: login-utils/shutdown.c:387
+msgid "\nWhy am I still alive after reboot?"
+msgstr "\nPor que eu ainda estou vivo ap�s a reinicializa��o?"
 
-#: login-utils/shutdown.c:379
-msgid ""
-"\n"
-"Now you can turn off the power..."
-msgstr ""
-"\n"
-"Agora voc� pode desligar a energia..."
+#: login-utils/shutdown.c:389
+msgid "\nNow you can turn off the power..."
+msgstr "\nAgora voc� pode desligar a energia..."
 
-#: login-utils/shutdown.c:394
+#: login-utils/shutdown.c:404
 msgid "Calling kernel power-off facility...\n"
 msgstr "Chamando recurso de desligamento do kernel...\n"
 
-#: login-utils/shutdown.c:397
+#: login-utils/shutdown.c:407
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "Erro ao desligar\t%s\n"
 
-#: login-utils/shutdown.c:405
+#: login-utils/shutdown.c:415
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "Executando o programa \"%s\" ...\n"
 
-#: login-utils/shutdown.c:408
+#: login-utils/shutdown.c:418
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "Erro ao executar\t%s\n"
 
-#: login-utils/shutdown.c:431
+#: login-utils/shutdown.c:441
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "URGENTE: mensagem de broadcast de %s:"
+msgstr "URGENT: broadcast message from %s:"
 
-#: login-utils/shutdown.c:437
+#: login-utils/shutdown.c:441 login-utils/shutdown.c:447
+#, c-format
 msgid "System going down IMMEDIATELY!\n"
 msgstr "O sistema ser� desligado IMEDIATAMENTE!\n"
 
-#: login-utils/shutdown.c:440
+#: login-utils/shutdown.c:450
 #, c-format
 msgid "System going down in %d hour%s %d minutes"
 msgstr "O sistema ser� desligado em %d hora%s e %d minuto(s)"
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:444
+#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
 msgid "s"
 msgstr "s"
 
-#: login-utils/shutdown.c:443
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "System going down in %d minute%s\n"
-msgstr "O sistema ser� desligado em minuto%s\n"
+msgstr "O sistema ser� desligado em %d minuto%s\n"
 
-#: login-utils/shutdown.c:449
+#: login-utils/shutdown.c:459
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:506
+#: login-utils/shutdown.c:516
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "N�o � poss�vel fazer fork para swapoff. Droga!"
 
-#: login-utils/shutdown.c:514
+#: login-utils/shutdown.c:524
 msgid "Cannot exec swapoff, hoping umount will do the trick."
 msgstr "N�o � poss�vel exec swapoff. Esperando que umount resolva o problema."
 
-#: login-utils/shutdown.c:533
+#: login-utils/shutdown.c:543
 msgid "Cannot fork for umount, trying manually."
 msgstr "N�o � poss�vel fazer fork para umount; tentando manualmente."
 
-#: login-utils/shutdown.c:542
+#: login-utils/shutdown.c:552
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr "N�o � poss�vel exec %s; tentando umount.\n"
 
-#: login-utils/shutdown.c:546
+#: login-utils/shutdown.c:556
 msgid "Cannot exec umount, giving up on umount."
 msgstr "N�o � poss�vel exec umount; desistindo de umount."
 
-#: login-utils/shutdown.c:551
+#: login-utils/shutdown.c:561
 msgid "Unmounting any remaining filesystems..."
 msgstr "Desmontando quaisquer sistemas de arquivos remanescentes..."
 
-#: login-utils/shutdown.c:587
+#: login-utils/shutdown.c:595
 #, c-format
-msgid "shutdown: Couldn't umount %s\n"
-msgstr "shutdown: n�o foi poss�vel desmontar %s.\n"
+msgid "shutdown: Couldn't umount %s: %s\n"
+msgstr "shutdown: n�o foi poss�vel desmontar %s: %s\n"
 
-#: login-utils/simpleinit.c:79
+#: login-utils/simpleinit.c:109
 msgid "Booting to single user mode.\n"
 msgstr "Inicializando em modo monousu�rio.\n"
 
-#: login-utils/simpleinit.c:83
+#: login-utils/simpleinit.c:113
 msgid "exec of single user shell failed\n"
 msgstr "exec de interpretador de comandos monousu�rio falhou\n"
 
-#: login-utils/simpleinit.c:87
+#: login-utils/simpleinit.c:117
 msgid "fork of single user shell failed\n"
 msgstr "fork de interpretador de comandos monousu�rio falhou\n"
 
-#: login-utils/simpleinit.c:226
-msgid ""
-"\n"
-"Wrong password.\n"
-msgstr ""
-"\n"
-"Senha incorreta.\n"
+#: login-utils/simpleinit.c:166
+msgid "error opening fifo\n"
+msgstr "erro abrindo fifo\n"
 
-#: login-utils/simpleinit.c:252
-msgid "exec rc failed\n"
-msgstr "exec rc falhou\n"
+#: login-utils/simpleinit.c:271
+msgid "\nWrong password.\n"
+msgstr "\nSenha incorreta.\n"
 
-#: login-utils/simpleinit.c:255
-msgid "open of rc file failed\n"
-msgstr "a abertura de arquivo de rc falhou\n"
+#: login-utils/simpleinit.c:341
+msgid "stat of path failed\n"
+msgstr "estado da rota falhou\n"
 
-#: login-utils/simpleinit.c:261
-msgid "fork of rc shell failed\n"
-msgstr "o fork de interpretador de comandos de rc falhou\n"
+#: login-utils/simpleinit.c:348
+msgid "open of directory failed\n"
+msgstr "abertura do diret�rio falhou\n"
 
-#: login-utils/simpleinit.c:273
+#: login-utils/simpleinit.c:415
 msgid "fork failed\n"
 msgstr "o fork falhou\n"
 
-#: login-utils/simpleinit.c:302 text-utils/more.c:1549
+#: login-utils/simpleinit.c:445 text-utils/more.c:1554
 msgid "exec failed\n"
 msgstr "exec falhou\n"
 
-#: login-utils/simpleinit.c:324
+#: login-utils/simpleinit.c:469
 msgid "cannot open inittab\n"
 msgstr "n�o foi poss�vel abrir inittab\n"
 
-#: login-utils/simpleinit.c:362
+#: login-utils/simpleinit.c:529
 msgid "no TERM or cannot stat tty\n"
 msgstr "sem TERM ou n�o � poss�vel stat tty\n"
 
+#: login-utils/simpleinit.c:753 login-utils/simpleinit.c:854
+msgid "error running programme\n"
+msgstr "erro executando programa\n"
+
 #: login-utils/ttymsg.c:81
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr "n�mero excessivo de iovs (altere o c�digo de wall/ttymsg.c)"
@@ -6325,38 +6048,37 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR"
 msgstr "%s: ERRO GRAVE"
 
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:145
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s: o arquivo %s est� ocupado.\n"
 
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
 msgstr "%s: o arquivo %s est� ocupado (%s presente).\n"
 
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:167
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: n�o foi poss�vel vincular %s: %s\n"
 
-#: login-utils/vipw.c:193
+#: login-utils/vipw.c:188
 #, c-format
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
-msgstr ""
-"%s: n�o foi poss�vel desbloquear %s: %s (as altera��es ainda est�o em %s)\n"
+msgstr "%s: n�o foi poss�vel desbloquear %s: %s (as altera��es ainda est�o em %s)\n"
 
-#: login-utils/vipw.c:217
+#: login-utils/vipw.c:211
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: n�o foi poss�vel realizar fork\n"
 
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:251
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s inalterado\n"
 
-#: login-utils/vipw.c:300
+#: login-utils/vipw.c:294
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: nenhuma altera��o realizada\n"
@@ -6391,76 +6113,73 @@ 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:189
+#: misc-utils/cal.c:217
 msgid "illegal month value: use 1-12"
 msgstr "valor de m�s inv�lido: use 1-12"
 
-#: misc-utils/cal.c:193
+#: misc-utils/cal.c:221
 msgid "illegal year value: use 1-9999"
 msgstr "valor de ano inv�lido: use 1-9999"
 
-#: misc-utils/cal.c:489
+#: misc-utils/cal.c:581
 msgid "usage: cal [-mjyV] [[month] year]\n"
 msgstr "Uso: cal [-mjyV] [[m�s] ano]\n"
 
-#: misc-utils/ddate.c:192
+#: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
 msgstr "Uso: %s [+formato] [dia m�s ano]\n"
 
 #. handle St. Tib's Day
-#: misc-utils/ddate.c:238
+#: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
 msgstr "Dia de S�o Tib"
 
-#: misc-utils/kill.c:209
+#: misc-utils/kill.c:210
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: sinal desconhecido %s\n"
 
-#: misc-utils/kill.c:271
+#: misc-utils/kill.c:272
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr "%s: n�o foi poss�vel localizar o processo \"%s\"\n"
 
-#: misc-utils/kill.c:315
+#: misc-utils/kill.c:316
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: sinal desconhecido %s; sinais v�lidos:\n"
 
-#: misc-utils/kill.c:355
+#: misc-utils/kill.c:356
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Uso: %s [ -s sinal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:356
+#: misc-utils/kill.c:357
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ sinal ]\n"
 
-#: misc-utils/logger.c:144
+#: misc-utils/logger.c:140
 #, c-format
 msgid "logger: %s: %s.\n"
 msgstr "logger: %s: %s.\n"
 
-#: misc-utils/logger.c:248
+#: misc-utils/logger.c:247
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr "logger: nome de recurso desconhecido: %s.\n"
 
-#: misc-utils/logger.c:260
+#: misc-utils/logger.c:259
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr "logger: nome de prioridade desconhecido: %s.\n"
 
-#: misc-utils/logger.c:287
-msgid ""
-"usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
-msgstr ""
-"Uso: logger [-is] [-f arquivo] [-p prioridade] [-t etiqueta] [-u soquete] [ "
-"mensagem ... ]\n"
+#: misc-utils/logger.c:286
+msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
+msgstr "Uso: logger [-is] [-f arquivo] [-p prioridade] [-t etiqueta] [-u soquete] [ mensagem ... ]\n"
 
-#: misc-utils/look.c:336
+#: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
 msgstr "Uso: look [-dfa] [-t char] string [arquivo]\n"
 
@@ -6474,352 +6193,348 @@ msgstr "N�o foi poss�vel abrir %s\n"
 msgid "Got %d bytes from %s\n"
 msgstr "Obtidos %d bytes de %s\n"
 
-#: misc-utils/namei.c:107
+#: misc-utils/namei.c:100
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr "namei: n�o foi poss�vel obter o diret�rio atual - %s\n"
 
-#: misc-utils/namei.c:118
+#: misc-utils/namei.c:111
 #, c-format
 msgid "namei: unable to chdir to %s - %s (%d)\n"
 msgstr "namei: n�o foi poss�vel mudar para o diret�rio %s - %s (%d)\n"
 
-#: misc-utils/namei.c:128
+#: misc-utils/namei.c:120
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr "Uso: namei [-mx] nome_caminho [nome_caminho ...]\n"
 
-#: misc-utils/namei.c:157
+#: misc-utils/namei.c:145
 msgid "namei: could not chdir to root!\n"
 msgstr "namei: n�o foi poss�vel mudar para o diret�rio raiz!\n"
 
-#: misc-utils/namei.c:164
+#: misc-utils/namei.c:152
 msgid "namei: could not stat root!\n"
 msgstr "namei: n�o foi poss�vel stat raiz!\n"
 
-#: misc-utils/namei.c:219
+#: misc-utils/namei.c:207
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
 msgstr " ? n�o foi poss�vel mudar para o diret�rio %s - %s (%d)\n"
 
-#: misc-utils/namei.c:248
+#: misc-utils/namei.c:236
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
 msgstr " ? problemas ao ler link simb�lico %s - %s (%d)\n"
 
-#: misc-utils/namei.c:258
+#: misc-utils/namei.c:246
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr "  *** LIMITE DE LINKS SIMB�LICOS DO UNIX EXCEDIDO ***\n"
 
-#: misc-utils/namei.c:295
+#: misc-utils/namei.c:283
 #, c-format
 msgid "namei: unknown file type 0%06o on file %s\n"
 msgstr "namei: tipo de arquivo desconhecido 0%06o no arquivo %s\n"
 
-#: misc-utils/script.c:109
-msgid "usage: script [-a] [file]\n"
-msgstr "Uso: script [-a] [arquivo]\n"
+#: misc-utils/script.c:118
+msgid "usage: script [-a] [-f] [file]\n"
+msgstr "Uso: script [-a] [-f] [arquivo]\n"
 
-#: misc-utils/script.c:129
+#: misc-utils/script.c:139
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado, o arquivo � %s\n"
 
-#: misc-utils/script.c:198
+#: misc-utils/script.c:205
 #, c-format
-msgid "Script started on %s\n"
-msgstr "Script iniciado em %s\n"
+msgid "Script started on %s"
+msgstr "Script iniciado em %s"
 
-#: misc-utils/script.c:264
+#: misc-utils/script.c:269
 #, c-format
-msgid ""
-"\n"
-"Script done on %s"
-msgstr ""
-"\n"
-"Script conclu�do em %s"
+msgid "\nScript done on %s"
+msgstr "\nScript conclu�do em %s"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:277
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script conclu�do, o arquivo � %s\n"
 
-#: misc-utils/script.c:281
+#: misc-utils/script.c:288
 msgid "openpty failed\n"
 msgstr "openpty falhou\n"
 
-#: misc-utils/script.c:315
+#: misc-utils/script.c:322
 msgid "Out of pty's\n"
 msgstr "ptys esgotados\n"
 
 #. Print error message about arguments, and the command's syntax.
-#: misc-utils/setterm.c:713
+#: misc-utils/setterm.c:743
 #, c-format
 msgid "%s: Argument error, usage\n"
 msgstr "%s: erro de argumento; uso\n"
 
-#: misc-utils/setterm.c:716
+#: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
 msgstr "  [ -term nome_terminal ]\n"
 
-#: misc-utils/setterm.c:717
+#: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
 msgstr "  [ -reset ]\n"
 
-#: misc-utils/setterm.c:718
+#: misc-utils/setterm.c:748
 msgid "  [ -initialize ]\n"
 msgstr "  [ -initialize ]\n"
 
-#: misc-utils/setterm.c:719
+#: misc-utils/setterm.c:749
 msgid "  [ -cursor [on|off] ]\n"
 msgstr "  [ -cursor [on|off] ]\n"
 
-#: misc-utils/setterm.c:721
+#: misc-utils/setterm.c:751
 msgid "  [ -snow [on|off] ]\n"
 msgstr "  [ -snow [on|off] ]\n"
 
-#: misc-utils/setterm.c:722
+#: misc-utils/setterm.c:752
 msgid "  [ -softscroll [on|off] ]\n"
 msgstr "  [ -softscroll [on|off] ]\n"
 
-#: misc-utils/setterm.c:724
+#: misc-utils/setterm.c:754
 msgid "  [ -repeat [on|off] ]\n"
 msgstr "  [ -repeat [on|off] ]\n"
 
-#: misc-utils/setterm.c:725
+#: misc-utils/setterm.c:755
 msgid "  [ -appcursorkeys [on|off] ]\n"
 msgstr "  [ -appcursorkeys [on|off] ]\n"
 
-#: misc-utils/setterm.c:726
+#: misc-utils/setterm.c:756
 msgid "  [ -linewrap [on|off] ]\n"
 msgstr "  [ -linewrap [on|off] ]\n"
 
-#: misc-utils/setterm.c:727
+#: misc-utils/setterm.c:757
 msgid "  [ -default ]\n"
 msgstr "  [ -default ]\n"
 
-#: misc-utils/setterm.c:728
+#: misc-utils/setterm.c:758
 msgid "  [ -foreground black|blue|green|cyan"
 msgstr "  [ -foreground black|blue|green|cyan"
 
-#: misc-utils/setterm.c:729 misc-utils/setterm.c:731
+#: misc-utils/setterm.c:759 misc-utils/setterm.c:761
 msgid "|red|magenta|yellow|white|default ]\n"
 msgstr "|red|magenta|yellow|white|default ]\n"
 
-#: misc-utils/setterm.c:730
+#: misc-utils/setterm.c:760
 msgid "  [ -background black|blue|green|cyan"
 msgstr "  [ -background black|blue|green|cyan"
 
-#: misc-utils/setterm.c:732
+#: misc-utils/setterm.c:762
 msgid "  [ -ulcolor black|grey|blue|green|cyan"
 msgstr "  [ -ulcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:733 misc-utils/setterm.c:735 misc-utils/setterm.c:737
-#: misc-utils/setterm.c:739
+#: misc-utils/setterm.c:763 misc-utils/setterm.c:765 misc-utils/setterm.c:767
+#: misc-utils/setterm.c:769
 msgid "|red|magenta|yellow|white ]\n"
 msgstr "|red|magenta|yellow|white ]\n"
 
-#: misc-utils/setterm.c:734
+#: misc-utils/setterm.c:764
 msgid "  [ -ulcolor bright blue|green|cyan"
 msgstr "  [ -ulcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:736
+#: misc-utils/setterm.c:766
 msgid "  [ -hbcolor black|grey|blue|green|cyan"
 msgstr "  [ -hbcolor black|grey|blue|green|cyan"
 
-#: misc-utils/setterm.c:738
+#: misc-utils/setterm.c:768
 msgid "  [ -hbcolor bright blue|green|cyan"
 msgstr "  [ -hbcolor bright blue|green|cyan"
 
-#: misc-utils/setterm.c:741
+#: misc-utils/setterm.c:771
 msgid "  [ -standout [ attr ] ]\n"
 msgstr "  [ -standout [ attr ] ]\n"
 
-#: misc-utils/setterm.c:743
+#: misc-utils/setterm.c:773
 msgid "  [ -inversescreen [on|off] ]\n"
 msgstr "  [ -inversescreen [on|off] ]\n"
 
-#: misc-utils/setterm.c:744
+#: misc-utils/setterm.c:774
 msgid "  [ -bold [on|off] ]\n"
 msgstr "  [ -bold [on|off] ]\n"
 
-#: misc-utils/setterm.c:745
+#: misc-utils/setterm.c:775
 msgid "  [ -half-bright [on|off] ]\n"
 msgstr "  [ -half-bright [on|off] ]\n"
 
-#: misc-utils/setterm.c:746
+#: misc-utils/setterm.c:776
 msgid "  [ -blink [on|off] ]\n"
 msgstr "  [ -blink [on|off] ]\n"
 
-#: misc-utils/setterm.c:747
+#: misc-utils/setterm.c:777
 msgid "  [ -reverse [on|off] ]\n"
 msgstr "  [ -reverse [on|off] ]\n"
 
-#: misc-utils/setterm.c:748
+#: misc-utils/setterm.c:778
 msgid "  [ -underline [on|off] ]\n"
 msgstr "  [ -underline [on|off] ]\n"
 
-#: misc-utils/setterm.c:749
+#: misc-utils/setterm.c:779
 msgid "  [ -store ]\n"
 msgstr "  [ -store ]\n"
 
-#: misc-utils/setterm.c:750
+#: misc-utils/setterm.c:780
 msgid "  [ -clear [all|rest] ]\n"
 msgstr "  [ -clear [all|rest] ]\n"
 
-#: misc-utils/setterm.c:751
+#: misc-utils/setterm.c:781
 msgid "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 msgstr "  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:752
+#: misc-utils/setterm.c:782
 msgid "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
 
-#: misc-utils/setterm.c:753
+#: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
 msgstr "  [ -regtabs [1-160] ]\n"
 
-#: misc-utils/setterm.c:754
+#: misc-utils/setterm.c:784
 msgid "  [ -blank [0-60] ]\n"
 msgstr "  [ -blank [0-60] ]\n"
 
-#: misc-utils/setterm.c:755
+#: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
 msgstr "  [ -dump   [1-NUM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:756
+#: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
 msgstr "  [ -append [1-NUM_CONSOLES] ]\n"
 
-#: misc-utils/setterm.c:757
+#: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
 msgstr "  [ -file arquivo_descarga ]\n"
 
-#: misc-utils/setterm.c:758
+#: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
 msgstr "  [ -msg [on|off] ]\n"
 
-#: misc-utils/setterm.c:759
+#: misc-utils/setterm.c:789
 msgid "  [ -msglevel [0-8] ]\n"
 msgstr "  [ -msglevel [0-8] ]\n"
 
-#: misc-utils/setterm.c:760
+#: misc-utils/setterm.c:790
 msgid "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 msgstr "  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
 
-#: misc-utils/setterm.c:761
+#: misc-utils/setterm.c:791
 msgid "  [ -powerdown [0-60] ]\n"
 msgstr "  [ -powerdown [0-60] ]\n"
 
-#: misc-utils/setterm.c:762
+#: misc-utils/setterm.c:792
 msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
-#: misc-utils/setterm.c:763
+#: misc-utils/setterm.c:793
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq num_freq ]\n"
 
-#: misc-utils/setterm.c:831
+#: misc-utils/setterm.c:862
 msgid "snow.on"
 msgstr "snow.on"
 
-#: misc-utils/setterm.c:833
+#: misc-utils/setterm.c:864
 msgid "snow.off"
 msgstr "snow.off"
 
-#: misc-utils/setterm.c:839
+#: misc-utils/setterm.c:870
 msgid "softscroll.on"
 msgstr "softscroll.on"
 
-#: misc-utils/setterm.c:841
+#: misc-utils/setterm.c:872
 msgid "softscroll.off"
 msgstr "softscroll.off"
 
-#: misc-utils/setterm.c:1016
+#: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr "n�o � poss�vel alterar o estado do modo de conserva��o de energia\n"
 
-#: misc-utils/setterm.c:1055 misc-utils/setterm.c:1063
+#: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
 msgstr "erro de klogctl: %s\n"
 
-#: misc-utils/setterm.c:1104
+#: misc-utils/setterm.c:1133
 #, c-format
 msgid "Error reading %s\n"
 msgstr "Erro ao ler %s\n"
 
-#: misc-utils/setterm.c:1119
+#: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
 msgstr "Erro ao gravar descarga de tela\n"
 
-#: misc-utils/setterm.c:1133
+#: misc-utils/setterm.c:1162
 #, c-format
 msgid "couldn't read %s, and cannot ioctl dump\n"
 msgstr "n�o foi poss�vel ler %s e n�o � poss�vel realizar ioctl da descarga\n"
 
-#: misc-utils/setterm.c:1198
+#: misc-utils/setterm.c:1227
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM indefinido.\n"
 
-#: misc-utils/tsort.c:120
+#: misc-utils/tsort.c:117
 msgid "usage: tsort [ inputfile ]\n"
 msgstr "Uso: tsort [ arquivo_entrada ]\n"
 
-#: misc-utils/tsort.c:157
+#: misc-utils/tsort.c:154
 msgid "tsort: odd data count.\n"
 msgstr "tsort: contagem de dados incomum.\n"
 
-#: misc-utils/tsort.c:320
+#: misc-utils/tsort.c:305
 msgid "tsort: cycle in data.\n"
 msgstr "tsort: ciclo nos dados.\n"
 
-#: misc-utils/tsort.c:333
+#: misc-utils/tsort.c:318
 msgid "tsort: internal error -- could not find cycle.\n"
 msgstr "tsort: erro interno -- n�o foi poss�vel localizar o ciclo.\n"
 
-#: misc-utils/whereis.c:158
+#: misc-utils/whereis.c:155
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nome...\n"
 
-#: misc-utils/write.c:99
+#: misc-utils/write.c:100
 msgid "write: can't find your tty's name\n"
 msgstr "write: n�o foi poss�vel localizar o nome do tty\n"
 
-#: misc-utils/write.c:110
+#: misc-utils/write.c:111
 msgid "write: you have write permission turned off.\n"
 msgstr "write: sua permiss�o de grava��o est� desativada.\n"
 
-#: misc-utils/write.c:131
+#: misc-utils/write.c:132
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
 msgstr "write: %s n�o est� conectado em %s.\n"
 
-#: misc-utils/write.c:139
+#: misc-utils/write.c:140
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr "write: %s - mensagens desativadas em %s\n"
 
-#: misc-utils/write.c:146
+#: misc-utils/write.c:147
 msgid "usage: write user [tty]\n"
 msgstr "Uso: write usu�rio [tty]\n"
 
-#: misc-utils/write.c:245
+#: misc-utils/write.c:246
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write: %s n�o est� conectado.\n"
 
-#: misc-utils/write.c:254
+#: misc-utils/write.c:255
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr "write: %s - mensagens desativadas\n"
 
-#: misc-utils/write.c:258
+#: misc-utils/write.c:259
 #, c-format
 msgid "write: %s is logged in more than once; writing to %s\n"
 msgstr "write: %s est� conectado mais de uma vez; escrevendo para %s\n"
 
-#: misc-utils/write.c:325
+#: misc-utils/write.c:323
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Mensagem de %s@%s em %s em %s ..."
@@ -6841,43 +6556,38 @@ msgstr "mount: n�o foi poss�vel abrir %s - usando %s\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
-#. Too many files open in the system? Filesystem full?
-#: mount/fstab.c:375
+#. Too many files open in the system?
+#. Filesystem full?
+#: mount/fstab.c:376
 #, c-format
 msgid "can't create lock file %s: %s (use -n flag to override)"
-msgstr ""
-"n�o foi poss�vel criar o arquivo de bloqueio %s: %s (use a op��o -n para "
-"anular)"
+msgstr "n�o foi poss�vel criar o arquivo de bloqueio %s: %s (use a op��o -n para anular)"
 
-#: mount/fstab.c:387
+#: mount/fstab.c:388
 #, c-format
 msgid "can't link lock file %s: %s (use -n flag to override)"
-msgstr ""
-"n�o foi poss�vel vincular o arquivo de bloqueio %s: %s (use a op��o -n para "
-"anular)"
+msgstr "n�o foi poss�vel vincular o arquivo de bloqueio %s: %s (use a op��o -n para anular)"
 
-#: mount/fstab.c:399
+#: mount/fstab.c:400
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
-msgstr ""
-"n�o foi poss�vel abrir o arquivo de bloqueio %s: %s (use a op��o -n para "
-"anular)"
+msgstr "n�o foi poss�vel abrir o arquivo de bloqueio %s: %s (use a op��o -n para anular)"
 
-#: mount/fstab.c:414
+#: mount/fstab.c:415
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "N�o foi poss�vel bloquear o arquivo de bloqueio %s: %s\n"
 
-#: mount/fstab.c:427
+#: mount/fstab.c:428
 #, c-format
-msgid "can't lock lock file %s: %s\n"
-msgstr "n�o foi poss�vel bloquear o arquivo de bloqueio %s: %s\n"
+msgid "can't lock lock file %s: %s"
+msgstr "n�o foi poss�vel bloquear o arquivo de bloqueio %s: %s"
 
-#: mount/fstab.c:429
+#: mount/fstab.c:430
 msgid "timed out"
 msgstr "tempo esgotado"
 
-#: mount/fstab.c:436
+#: mount/fstab.c:437
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -6886,34 +6596,30 @@ msgstr ""
 "N�o foi poss�vel criar o v�nculo %s\n"
 "Talvez haja um arquivo de bloqueio vencido?\n"
 
-#: mount/fstab.c:482 mount/fstab.c:490
+#: mount/fstab.c:483 mount/fstab.c:491
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "N�o foi poss�vel abrir %s (%s) - mtab n�o atualizado"
 
-#: mount/fstab.c:515
+#: mount/fstab.c:519
 msgid "mount: warning: cannot change mounted device with a remount\n"
-msgstr ""
-"mount: aviso: n�o � poss�vel alterar um dispositivo montado com uma "
-"remontagem\n"
+msgstr "mount: aviso: n�o � poss�vel alterar um dispositivo montado com uma remontagem\n"
 
-#: mount/fstab.c:520
+#: mount/fstab.c:524
 msgid "mount: warning: cannot change filesystem type with a remount\n"
-msgstr ""
-"mount: aviso: n�o � poss�vel alterar um tipo de sistema de arquivos com uma "
-"remontagem\n"
+msgstr "mount: aviso: n�o � poss�vel alterar um tipo de sistema de arquivos com uma remontagem\n"
 
-#: mount/fstab.c:528 mount/fstab.c:534
+#: mount/fstab.c:533 mount/fstab.c:539
 #, c-format
 msgid "error writing %s: %s"
 msgstr "erro ao gravar %s: %s"
 
-#: mount/fstab.c:541
+#: mount/fstab.c:546
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: mount/fstab.c:548
+#: mount/fstab.c:553
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "n�o foi poss�vel renomear %s para %s: %s\n"
@@ -6928,16 +6634,16 @@ msgstr "loop: n�o foi poss�vel abrir o dispositivo %s: %s\n"
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: n�o foi poss�vel obter informa��es sobre o dispositivo %s: %s\n"
 
-#: mount/lomount.c:89 mount/losetup.c:74
+#: mount/lomount.c:89
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
 msgstr "%s: [%04x]:%ld (%s) deslocamento %d, criptografia %s\n"
 
-#: mount/lomount.c:143
+#: mount/lomount.c:148
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: n�o foi poss�vel localizar qualquer dispositivo /dev/loop#"
 
-#: mount/lomount.c:147
+#: mount/lomount.c:152
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -6945,78 +6651,74 @@ msgstr ""
 "mount: N�o foi poss�vel localizar nenhum dispositivo de la�o.\n"
 "       Talvez dev/loop# tenha um n�mero principal incorreto?"
 
-#: mount/lomount.c:151
+#: mount/lomount.c:156
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
 "       this kernel does not know about the loop device.\n"
 "       (If so, then recompile or `insmod loop.o'.)"
 msgstr ""
-"mount: N�o foi poss�vel localizar nenhum dispositivo de la�o e, de acordo "
-"com %s,\n"
+"mount: N�o foi poss�vel localizar nenhum dispositivo de la�o e, de acordo com %s,\n"
 "       este kernel n�o conhece o dispositivo de la�o\n"
 "       (se for este o caso, recompile ou use `insmod loop.o')."
 
-#: mount/lomount.c:156
+#: mount/lomount.c:162
 msgid ""
 "mount: Could not find any loop device. Maybe this kernel does not know\n"
 "       about the loop device (then recompile or `insmod loop.o'), or\n"
 "       maybe /dev/loop# has the wrong major number?"
 msgstr ""
-"mount: N�o foi poss�vel localizar nenhum dispositivo de la�o. Talvez este "
-"kernel\n"
-"       n�o conhe�a o dispositivo de la�o (se for este o caso, recompile ou "
-"use `insmod loop.o')\n"
+"mount: N�o foi poss�vel localizar nenhum dispositivo de la�o. Talvez este kernel\n"
+"       n�o conhe�a o dispositivo de la�o (se for este o caso, recompile ou use `insmod loop.o')\n"
 "       ou talvez dev/loop# tenha um n�mero principal incorreto?"
 
-#: mount/lomount.c:160
+#: mount/lomount.c:166
 msgid "mount: could not find any free loop device"
 msgstr "mount: n�o foi poss�vel localizar nenhum dispositivo de la�o livre"
 
-#: mount/lomount.c:191 mount/losetup.c:106
+#: mount/lomount.c:197
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Tipo de criptografia n�o suportado: %s\n"
 
-#: mount/lomount.c:210 mount/losetup.c:126
+#: mount/lomount.c:211
+msgid "Couldn't lock into memory, exiting.\n"
+msgstr "N�o � poss�vel bloquear (lock) na mem�ria, saindo\n"
+
+#: mount/lomount.c:231
 msgid "Init (up to 16 hex digits): "
 msgstr "Inicializa��o (at� 16 d�gitos hexadecimais):"
 
-#: mount/lomount.c:217 mount/losetup.c:133
+#: mount/lomount.c:238
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Digito n�o hexadecimal '%c'.\n"
 
-#: mount/lomount.c:223 mount/losetup.c:140
+#: mount/lomount.c:245
 #, c-format
 msgid "Don't know how to get key for encryption system %d\n"
-msgstr ""
-"O modo de obter a chave para o sistema de criptografia %d n�o � conhecido\n"
+msgstr "O modo de obter a chave para o sistema de criptografia %d n�o � conhecido\n"
 
-#: mount/lomount.c:239
+#: mount/lomount.c:261
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d): sucesso\n"
 
-#: mount/lomount.c:250
+#: mount/lomount.c:272
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: n�o foi poss�vel excluir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:260
+#: mount/lomount.c:282
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): sucesso\n"
 
-#: mount/lomount.c:268
+#: mount/lomount.c:290
 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/losetup.c:70
-msgid "Cannot get loop info"
-msgstr "N�o � poss�vel obter informa��es de loop."
-
-#: mount/losetup.c:176
+#: mount/lomount.c:327
 #, c-format
 msgid ""
 "usage:\n"
@@ -7025,14 +6727,15 @@ msgid ""
 "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
 "usage:\n"
-"  %s dispositivo_la�o                                                 # d� "
-"informa��es\n"
-"  %s -d dispositivo_la�o                                              # "
-"exclui\n"
-"  %s [ -e criptografia ] [ -o deslocamento ] dispositivo_la�o arquivo # "
-"configura��o\n"
-
-#: mount/losetup.c:234
+"  %s dispositivo_la�o                                                 # d� informa��es\n"
+"  %s -d dispositivo_la�o                                              # exclui\n"
+"  %s [ -e criptografia ] [ -o deslocamento ] dispositivo_la�o arquivo # configura��o\n"
+
+#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+msgid "not enough memory"
+msgstr "n�o h� mem�ria suficiente"
+
+#: mount/lomount.c:416
 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"
 
@@ -7050,147 +6753,160 @@ msgstr "[mntent]: linha %d em %s tem %s inv�lido(a)\n"
 msgid "; rest of file ignored"
 msgstr "; resto do arquivo ignorado"
 
-#: mount/mount.c:333
+#: mount/mount.c:351
 #, 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:336
+#: mount/mount.c:355
 #, 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:357
+#: mount/mount.c:376
 #, 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:372 mount/mount.c:654
+#: mount/mount.c:391 mount/mount.c:594
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erro ao gravar %s: %s"
 
-#: mount/mount.c:379
+#: mount/mount.c:398
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: erro ao alterar modo de %s: %s"
 
-#: mount/mount.c:413
+#: mount/mount.c:443
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espa�o de permuta - n�o montado"
 
-#: mount/mount.c:481
+#: mount/mount.c:486
 msgid "mount failed"
 msgstr "mount falhou"
 
-#: mount/mount.c:483
+#: mount/mount.c:488
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: somente o root pode montar %s em %s"
 
-#: mount/mount.c:511
+#: mount/mount.c:516
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de la�o especificado duas vezes"
 
-#: mount/mount.c:517
+#: mount/mount.c:521
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado duas vezes"
 
-#: mount/mount.c:529
+#: mount/mount.c:533
 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:538
+#: mount/mount.c:542
 #, 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:542
+#: mount/mount.c:546
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: falha ao configurar dispositivo de la�o\n"
 
-#: mount/mount.c:546
+#: mount/mount.c:550
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configura��o de dispositivo de la�o realizada com sucesso\n"
 
-#: mount/mount.c:559
-msgid "mount: this version was compiled without support for the type `nfs'"
-msgstr "mount: esta vers�o foi compilada sem suporte ao tipo `nfs'"
+#: mount/mount.c:589
+#, c-format
+msgid "mount: can't open %s: %s"
+msgstr "mount: n�o foi poss�vel abrir %s: %s"
 
-#: mount/mount.c:610 mount/mount.c:1043
+#: mount/mount.c:612
+#, c-format
+msgid "mount: cannot not open %s for setting speed"
+msgstr "mount: n�o foi poss�vel abrir %s para configura��o da velocidade"
+
+#: mount/mount.c:615
+#, c-format
+msgid "mount: cannot set speed: %s"
+msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
+
+#: mount/mount.c:676 mount/mount.c:1203
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: n�o foi poss�vel realizar fork: %s"
 
-#: mount/mount.c:649
-#, c-format
-msgid "mount: can't open %s: %s"
-msgstr "mount: n�o foi poss�vel abrir %s: %s"
+#: mount/mount.c:750
+msgid "mount: this version was compiled without support for the type `nfs'"
+msgstr "mount: esta vers�o foi compilada sem suporte ao tipo `nfs'"
 
-#: mount/mount.c:678
-msgid ""
-"mount: I could not determine the filesystem type, and none was specified"
+#: mount/mount.c:790
+msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
-"mount: n�o foi poss�vel determinar o tipo do sistema de arquivos e nenhum "
-"foi especificado"
+"mount: falhou com o mount do nfs vers�o 4, tentando com o 3..\n"
+" \n"
+
+#: mount/mount.c:801
+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:681
+#: mount/mount.c:804
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: voc� precisa especificar o tipo do sistema de arquivos"
 
 #. should not happen
-#: mount/mount.c:684
+#: mount/mount.c:807
 msgid "mount: mount failed"
 msgstr "mount: a montagem falhou"
 
-#: mount/mount.c:690 mount/mount.c:725
+#: mount/mount.c:813 mount/mount.c:848
 #, 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:692
+#: mount/mount.c:815
 msgid "mount: permission denied"
 msgstr "mount: permiss�o negada"
 
-#: mount/mount.c:694
+#: mount/mount.c:817
 msgid "mount: must be superuser to use mount"
 msgstr "mount: � necess�rio ser superusu�rio para montar"
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:698 mount/mount.c:702
+#: mount/mount.c:821 mount/mount.c:825
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s est� ocupado"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:704
+#: mount/mount.c:827
 msgid "mount: proc already mounted"
 msgstr "mount: proc j� montado"
 
-#: mount/mount.c:706
+#: mount/mount.c:829
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s j� montado ou %s ocupado"
 
-#: mount/mount.c:712
+#: mount/mount.c:835
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: o ponto de montagem %s n�o existe"
 
-#: mount/mount.c:714
+#: mount/mount.c:837
 #, 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:717
+#: mount/mount.c:840
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: o dispositivo especial %s n�o existe"
 
-#: mount/mount.c:727
+#: mount/mount.c:850
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7199,63 +6915,60 @@ msgstr ""
 "mount: o dispositivo especial %s n�o existe\n"
 "       (um prefixo de caminho n�o � um diret�rio)\n"
 
-#: mount/mount.c:739
+#: mount/mount.c:863
 #, 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:741
+#: mount/mount.c:865
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
-"mount: tipo de sistema de arquivos incorreto, op��o inv�lida, superbloco "
-"inv�lido em %s,\n"
+"mount: tipo de sistema de arquivos incorreto, op��o inv�lida, superbloco inv�lido em %s,\n"
 "       ou n�mero excessivo de sistemas de arquivos montados"
 
-#: mount/mount.c:756
+#: mount/mount.c:899
 msgid "mount table full"
 msgstr "tabela de montagem cheia"
 
-#: mount/mount.c:758
+#: mount/mount.c:901
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: n�o foi poss�vel ler o superbloco"
 
-#: mount/mount.c:761
+#: mount/mount.c:905
 #, c-format
-msgid "mount: %s has wrong major or minor number"
-msgstr "mount: %s possui n�mero principal ou secund�rio incorreto"
+msgid "mount: %s: unknown device"
+msgstr "mount: %s: dispositivo de blocos desconhecido"
 
-#: mount/mount.c:766
+#: mount/mount.c:910
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: o tipo de sistema de arquivos %s n�o � suportado pelo kernel"
 
-#: mount/mount.c:778
+#: mount/mount.c:922
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: provavelmente voc� queria dizer %s"
 
-#: mount/mount.c:780
+#: mount/mount.c:924
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: talvez voc� quisesse dizer iso9660?"
 
-#: mount/mount.c:783
+#: mount/mount.c:927
 #, 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"
+msgstr "mount: %s possui n�mero de dispositivo incorreto ou o tipo de sistema de arquivos %s n�o � suportado"
 
 #. strange ...
-#: mount/mount.c:788
+#: mount/mount.c:933
 #, 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:790
+#: mount/mount.c:935
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7264,237 +6977,270 @@ msgstr ""
 "mount: o kernel n�o reconhece %s como dispositivo de blocos\n"
 "       (talvez `insmod driver'?)"
 
-#: mount/mount.c:793
+#: mount/mount.c:938
 #, 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:796
+#: mount/mount.c:941
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s n�o � um dispositivo de blocos"
 
-#: mount/mount.c:799
+#: mount/mount.c:944
 #, 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:803
+#. pre-linux 1.1.38, 1.1.41 and later
+#. linux 1.1.38 and later
+#: mount/mount.c:947
+msgid "block device "
+msgstr "dispositivo de blocos "
+
+#: mount/mount.c:949
 #, c-format
-msgid "mount: block device %s is not permitted on its filesystem"
-msgstr ""
-"mount: o dispositivo de blocos %s n�o � permitido neste sistema de arquivos"
+msgid "mount: cannot mount %s%s read-only"
+msgstr "mount: n�o foi poss�vel montar %s%s somente para leitura"
+
+#: mount/mount.c:953
+#, 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:819
+#: mount/mount.c:969
 #, 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:820
-msgid "block device "
-msgstr "dispositivo de blocos "
-
-#: mount/mount.c:907
+#: mount/mount.c:1058
 #, c-format
-msgid "mount: consider mounting %s by %s\n"
-msgstr "mount: considere montar %s por %s\n"
+msgid "mount: going to mount %s by %s\n"
+msgstr "mount: montando %s por %s\n"
 
-#: mount/mount.c:908
+#: mount/mount.c:1059
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:908
+#: mount/mount.c:1059
 msgid "label"
 msgstr "r�tulo"
 
-#: mount/mount.c:910 mount/mount.c:1226
+#: mount/mount.c:1061 mount/mount.c:1431
 msgid "mount: no such partition found"
 msgstr "mount: tal parti��o n�o foi encontrada"
 
-#: mount/mount.c:918
+#: mount/mount.c:1069
 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"
+msgstr "mount: nenhum tipo foi fornecido - supondo nfs por causa dos dois-pontos\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:934
+#: mount/mount.c:1085
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: tentando montar em segundo plano \"%s\"\n"
 
-#: mount/mount.c:945
+#: mount/mount.c:1096
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: desistindo de \"%s\"\n"
 
-#: mount/mount.c:994
+#: mount/mount.c:1154
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s j� montado em %s\n"
 
-#: mount/mount.c:1105
-msgid ""
-"Usage: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t vfstypes]\n"
-"       mount [-nfrsvw] [-o options] special | node\n"
-"       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
-"       A special device can be indicated by  -L label  or  -U uuid .\n"
-msgstr ""
-"Uso: mount [-hV]\n"
-"       mount -a [-nfFrsvw] [-t tipos_sist_arq_virt]\n"
-"       mount [-nfrsvw] [-o op��es ] especial | n�\n"
-"       mount [-nfrsvw] [-t vfstype] [-o op��es ] especial n�\n"
-"       Um dispositivo especial pode ser indicado por  -L r�tulo ou  -U uuid "
-".\n"
-
-#: mount/mount.c:1211
+#: mount/mount.c:1271
+msgid ""
+"Usage: mount -V                 : print version\n"
+"       mount -h                 : print this help\n"
+"       mount                    : list mounted filesystems\n"
+"       mount -l                 : idem, including volume labels\n"
+"So far the informational part. Next the mounting.\n"
+"The command is `mount [-t fstype] something somewhere'.\n"
+"Details found in /etc/fstab may be omitted.\n"
+"       mount -a                 : mount all stuff from /etc/fstab\n"
+"       mount device             : mount device at the known place\n"
+"       mount directory          : mount known device here\n"
+"       mount -t type dev dir    : ordinary mount command\n"
+"Note that one does not really mount a device, one mounts\n"
+"a filesystem (of the given type) found on the device.\n"
+"One can also mount an already visible directory tree elsewhere:\n"
+"       mount --bind olddir newdir\n"
+"A device can be given by name, say /dev/hda1 or /dev/cdrom,\n"
+"or by label, using  -L label  or by uuid, using  -U uuid .\n"
+"Union or stack mounts are specified using one of\n"
+"       --replace, --after, --before, --over\n"
+"Other options: [-nfFrsvw] [-o options].\n"
+"For many more details, say  man 8 mount .\n"
+msgstr ""
+"Uso:   mount -V                 : mostra vers�o\n"
+"       mount -h                 : mostra esta ajuda\n"
+"       mount                    : lista sistemas de arquivos montados\n"
+"       mount -l                 : idem, incluindo r�tulos de volumes\n"
+"Estas eram as op��es de informa��o. Agora as de montagem.\n"
+"O comando � `mount [-t tipoSA] alguma-coisa algum-lugar'.\n"
+"Detalhes encontrados em /etc/fstab podem ser omitidos.\n"
+"       mount -a                 : monta tudo contido em /etc/fstab\n"
+"       mount dispositivo        : monta dispositivo no lugar conhecido\n"
+"       mount diret�rio          : monta dispositivo conhecido aqui\n"
+"       mount -t tipo dev dir    : comando normal de montagem\n"
+"Note que n�o se monta realmente um dispositivo, monta-se um\n"
+"sistema de arquivos (de um determinado tipo) encontrado no dispositivo.\n"
+"Pode-se montar tamb�m em outro lugar uma �rvore de diret�rios \n"
+"anteriormente vis�vel:\n"
+"       mount --bind dir-antigo dir-novo\n"
+"Um dispositivo pode ser informado pelo nome, digamos /dev/hda1 ou /dev/cdrom,\n"
+"ou por um r�tulo, usando -L r�tulo ou por uuid, usando -U uuid.\n"
+"Uni�es ou \"stack mounts\" s�o especificados usando uma das op��es\n"
+"       --replace, --after, --before, --over\n"
+"Outras op��es: [-nfFrsvw] [-o op��es].\n"
+"Para mais detalhes, consulte `man 8 mount'.\n"
+
+#: mount/mount.c:1415
 msgid "mount: only root can do that"
 msgstr "mount: opera��o exclusiva de root"
 
-#: mount/mount.c:1216
+#: mount/mount.c:1420
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1228
+#: mount/mount.c:1433
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1237
+#: mount/mount.c:1442
 msgid "not mounted anything"
 msgstr "nada foi montado"
 
-#: mount/mount.c:1250
+#: mount/mount.c:1457
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: n�o foi poss�vel localizar %s em %s"
 
-#: mount/mount.c:1264
+#: mount/mount.c:1472
 #, 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_by_label.c:141
+#: mount/mount_by_label.c:99
+#, c-format
+msgid "mount: could not open %s, so UUID and LABEL conversion cannot be done.\n"
+msgstr "mount: n�o foi poss�vel abrir %s - convers�es de UUID e LABEL n�o podem ser feitas\n"
+
+#: mount/mount_by_label.c:201
 msgid "mount: bad UUID"
 msgstr "mount: UUID inv�lida"
 
-#: mount/mount_guess_fstype.c:251
+#: mount/mount_guess_fstype.c:257
 #, 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_guess_fstype.c:254
+#: mount/mount_guess_fstype.c:260
 #, 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_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:263
 msgid "       and it looks like this is swapspace\n"
 msgstr "       e parece ser um espa�o de permuta\n"
 
-#: mount/mount_guess_fstype.c:259
+#: mount/mount_guess_fstype.c:265
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       experimentarei o tipo %s\n"
 
-#: mount/mount_guess_fstype.c:321
+#: mount/mount_guess_fstype.c:329
 #, c-format
 msgid "Trying %s\n"
 msgstr "Experimentando %s\n"
 
-#: mount/nfsmount.c:157
+#: mount/nfsmount.c:225
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argumento host:dir excessivamente longo\n"
 
-#: mount/nfsmount.c:170
+#: mount/nfsmount.c:238
 msgid "mount: warning: multiple hostnames not supported\n"
 msgstr "mount: aviso: nomes de host m�ltiplos n�o s�o suportados\n"
 
-#: mount/nfsmount.c:174
+#: mount/nfsmount.c:242
 msgid "mount: directory to mount not in host:dir format\n"
 msgstr "mount: diret�rio a montar n�o est� no formato host:dir\n"
 
-#: mount/nfsmount.c:185 mount/nfsmount.c:420
+#: mount/nfsmount.c:253 mount/nfsmount.c:510
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount: n�o � poss�vel obter endere�o para %s\n"
 
-#: mount/nfsmount.c:191
+#: mount/nfsmount.c:259
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: obtido hp->h_length inv�lido\n"
 
-#: mount/nfsmount.c:208
+#: mount/nfsmount.c:276
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argumento de op��o excessivamente longo\n"
 
-#: mount/nfsmount.c:299
+#: mount/nfsmount.c:368
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Aviso: op��o proto= n�o reconhecida.\n"
 
-#: mount/nfsmount.c:306
+#: mount/nfsmount.c:375
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Aviso: a op��o namlen n�o � suportada.\n"
 
-#: mount/nfsmount.c:310
+#: mount/nfsmount.c:379
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "par�metro de montagem de nfs desconhecido: %s=%d\n"
 
-#: mount/nfsmount.c:345
+#: mount/nfsmount.c:414
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Aviso: a op��o nolock n�o � suportada.\n"
 
-#: mount/nfsmount.c:348
+#: mount/nfsmount.c:419
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "op��o de montagem de nfs desconhecida: %s%s\n"
 
-#: mount/nfsmount.c:426
+#: mount/nfsmount.c:516
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: obtido hp->h_length inv�lido?\n"
 
-#: mount/nfsmount.c:528
-#, c-format
-msgid "mount: %s:%s failed, reason given by server: %s\n"
-msgstr "mount: %s:%s falhou. Raz�o dada pelo servidor: %s.\n"
-
-#: mount/nfsmount.c:539
+#: mount/nfsmount.c:692
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sobre TCP n�o � suportado.\n"
 
-#: mount/nfsmount.c:546
+#: mount/nfsmount.c:699
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:550
+#: mount/nfsmount.c:703
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:561
+#: mount/nfsmount.c:714
 msgid "used portmapper to find NFS port\n"
 msgstr "usado portmapper para localizar porta NFS\n"
 
-#: mount/nfsmount.c:565
+#: mount/nfsmount.c:718
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "usando porta %d para o daemon do nfs\n"
 
-#: mount/nfsmount.c:576
+#: mount/nfsmount.c:729
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:665
+#: mount/nfsmount.c:816
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valor de retorno de status de nfs desconhecido: %d"
 
-#: mount/sundries.c:41 mount/sundries.c:56
-msgid "not enough memory"
-msgstr "n�o h� mem�ria suficiente"
-
 #: mount/sundries.c:66
 msgid "bug in xstrndup call"
 msgstr "erro na chamada a xstrndup"
@@ -7590,8 +7336,7 @@ msgstr "umount: %s: precisa ser superusu�rio para desmontar"
 #: mount/umount.c:195
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
-msgstr ""
-"umount: %s: dispositivos de blocos n�o permitidos no sistema de arquivos"
+msgstr "umount: %s: dispositivos de blocos n�o permitidos no sistema de arquivos"
 
 #: mount/umount.c:197
 #, c-format
@@ -7607,28 +7352,26 @@ msgstr "n�o existe umount2, tentando umount...\n"
 msgid "could not umount %s - trying %s instead\n"
 msgstr "n�o foi poss�vel efetuar umount em %s - tentando %s em vez dele\n"
 
-#: mount/umount.c:270
+#: mount/umount.c:272
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s est� ocupado - remontado somente para leitura\n"
 
-#: mount/umount.c:278
+#: mount/umount.c:282
 #, 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:286
+#: mount/umount.c:290
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmontado\n"
 
-#: mount/umount.c:369
+#: mount/umount.c:374
 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"
+msgstr "umount: n�o foi poss�vel localizar a lista de sistemas de arquivos a desmontar"
 
-#: mount/umount.c:398
+#: mount/umount.c:403
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7638,78 +7381,74 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t tipos_sist_arq_virt]\n"
 "       umount [-f] [-r] [-n] [-v] especial | n�...\n"
 
-#: mount/umount.c:459
+#: mount/umount.c:464
 msgid "umount: only root can do that"
 msgstr "umount: opera��o exclusiva de root"
 
-#: mount/umount.c:474
+#: mount/umount.c:479
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentando desmontar %s\n"
 
-#: mount/umount.c:478
+#: mount/umount.c:483
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "N�o foi poss�vel localizar %s em mtab\n"
 
-#: mount/umount.c:482
+#: mount/umount.c:487
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr "umount: % n�o est� montado (de acordo com mtab)"
+msgstr "umount: %s n�o est� montado (de acordo com mtab)"
 
-#: mount/umount.c:484
+#: mount/umount.c:489
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount: parece que % est� montado m�ltiplas vezes"
+msgstr "umount: parece que %s est� montado m�ltiplas vezes"
 
-#: mount/umount.c:496
+#: mount/umount.c:501
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
-msgstr "umount: % n�o est� em fstab (e voc� n�o � root)"
+msgstr "umount: %s n�o est� na fstab (e voc� n�o � root)"
 
-#: mount/umount.c:499
+#: mount/umount.c:504
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr "umount: a montagem de % n�o est� de acordo com fstab"
+msgstr "umount: a montagem de %s n�o est� de acordo com a fstab"
 
-#: mount/umount.c:520
+#: mount/umount.c:525
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: somente root pode desmontar %s de %s"
 
-#: mount/umount.c:531
+#: mount/umount.c:536
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "umount: somente %s pode desmontar %s de %s"
 
 #: sys-utils/ctrlaltdel.c:26
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr ""
-"� necess�rio ser root para configurar o comportamento de Ctrl-Alt-Del.\n"
+msgstr "� necess�rio ser root para configurar o comportamento de Ctrl-Alt-Del.\n"
 
 #: sys-utils/ctrlaltdel.c:41
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "Uso: ctrlaltdel hard|soft\n"
 
-#: sys-utils/cytune.c:118
+#: sys-utils/cytune.c:120
 #, c-format
 msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Arquivo %s, para o valor de limiar de %lu, o n�mero m�ximo de caracteres em "
-"fifo era de %d\n"
+"Arquivo %s, para o valor de limiar de %lu, o n�mero m�ximo de caracteres em fifo era de %d\n"
 "e a taxa de transfer�ncia m�xima, em caracteres por segundo, era de %f.\n"
 
-#: sys-utils/cytune.c:129
+#: sys-utils/cytune.c:131
 #, c-format
 msgid ""
-"File %s, For threshold value %lu and timrout value %lu, Maximum characters "
-"in fifo were %d,\n"
+"File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Arquivo %s, para o valor de limiar de %lu e valor de tempo-limite de %lu, o "
-"n�mero m�ximo de caracteres em fifo era de %d\n"
+"Arquivo %s, para o valor de limiar de %lu e valor de tempo-limite de %lu, o n�mero m�ximo de caracteres em fifo era de %d\n"
 "e a taxa de transfer�ncia m�xima, em caracteres por segundo, era de %f.\n"
 
 #: sys-utils/cytune.c:196
@@ -7739,12 +7478,8 @@ msgstr "Valor padr�o de hor�rio inv�lido: %s\n"
 
 #: sys-utils/cytune.c:245
 #, c-format
-msgid ""
-"Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
-"[-g|-G] file [file...]\n"
-msgstr ""
-"Uso: %s [-q [-i intervalo]] ([-s valor]|[-S valor]) ([-t valor]|[-T valor]) "
-"[-g|-G] arquivo [arquivo...]\n"
+msgid "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) [-g|-G] file [file...]\n"
+msgstr "Uso: %s [-q [-i intervalo]] ([-s valor]|[-S valor]) ([-t valor]|[-T valor]) [-g|-G] arquivo [arquivo...]\n"
 
 #: sys-utils/cytune.c:257 sys-utils/cytune.c:275 sys-utils/cytune.c:294
 #: sys-utils/cytune.c:342
@@ -7775,7 +7510,7 @@ msgstr "N�o foi poss�vel obter o tempo-limite para %s: %s\n"
 #: sys-utils/cytune.c:309
 #, c-format
 msgid "%s: %ld %s threshold and %ld %s timeout\n"
-msgstr "%s: limiar %s = %ld e tempo-limite %s = %ld\n"
+msgstr "%s: %ld � o limiar %s e %ld � o tempo-limite %s\n"
 
 #: sys-utils/cytune.c:311 sys-utils/cytune.c:313
 msgid "current"
@@ -7820,61 +7555,68 @@ msgstr "   %f int/s; %f recebidos, %f enviados (char/s)\n"
 
 #: sys-utils/cytune.c:433
 #, c-format
-msgid ""
-"%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
-msgstr ""
-"%s: %lu ints, %lu chars; fifo: %lu limiar, %lu tempo-limite, %lu m�x, %lu "
-"agora\n"
+msgid "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
+msgstr "%s: %lu ints, %lu chars; fifo: %lu limiar, %lu tempo-limite, %lu m�x, %lu agora\n"
 
 #: sys-utils/cytune.c:438
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/s; %f recebidos (char/s)\n"
 
-#: sys-utils/dmesg.c:38
+#: sys-utils/dmesg.c:37
 #, c-format
 msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
 msgstr "Uso: %s [-c] [-n n�vel] [-s tamanho_buffer]\n"
 
-#: sys-utils/ipcrm.c:46
+#: sys-utils/ipcrm.c:59
+#, c-format
+msgid "invalid id: %s\n"
+msgstr "id inv�lido: %s\n"
+
+#: sys-utils/ipcrm.c:77
+#, c-format
+msgid "cannot remove id %s (%s)\n"
+msgstr "n�o foi poss�vel remover id %s (%s)\n"
+
+#: sys-utils/ipcrm.c:91
 #, c-format
-msgid "usage: %s [shm | msg | sem] id\n"
-msgstr "Uso: %s [shm | msg | sem] id\n"
+msgid "usage: %s {shm | msg | sem} id ...\n"
+msgstr "Uso: %s [shm | msg | sem] id...\n"
 
-#: sys-utils/ipcrm.c:70
+#: sys-utils/ipcrm.c:124
 #, c-format
-msgid "usage: %s [-shm | -msg | -sem] id\n"
-msgstr "Uso: %s [-shm | -msg | -sem] id\n"
+msgid "unknown resource type: %s\n"
+msgstr "tipo de recurso desconhecido: %s\n"
 
-#: sys-utils/ipcrm.c:73
-msgid "resource deleted\n"
-msgstr "recurso exclu�do\n"
+#: sys-utils/ipcrm.c:128
+msgid "resource(s) deleted\n"
+msgstr "recurso(s) exclu�do\n"
 
-#: sys-utils/ipcs.c:117
+#: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
 msgstr "Uso : %s -asmq -tclup \n"
 
-#: sys-utils/ipcs.c:118
+#: sys-utils/ipcs.c:123
 #, c-format
 msgid "\t%s [-s -m -q] -i id\n"
 msgstr "\t%s [-s -m -q] -i id\n"
 
-#: sys-utils/ipcs.c:119
+#: sys-utils/ipcs.c:124
 #, c-format
 msgid "\t%s -h for help.\n"
 msgstr "\t%s -h para ajuda.\n"
 
-#: sys-utils/ipcs.c:125
+#: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
 msgstr "%s fornece informa��es sobre recursos do ipc para"
 
-#: sys-utils/ipcs.c:126
+#: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
 msgstr " os quais voc� tem acesso de leitura.\n"
 
-#: sys-utils/ipcs.c:127
+#: sys-utils/ipcs.c:132
 msgid ""
 "Resource Specification:\n"
 "\t-m : shared_mem\n"
@@ -7884,7 +7626,7 @@ msgstr ""
 "\t-m : mem�ria compartilhada\n"
 "\t-q : mensagens\n"
 
-#: sys-utils/ipcs.c:128
+#: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
@@ -7892,7 +7634,7 @@ msgstr ""
 "\t-s : sem�foros\n"
 "\t-a : tudo (padr�o)\n"
 
-#: sys-utils/ipcs.c:129
+#: sys-utils/ipcs.c:134
 msgid ""
 "Output Format:\n"
 "\t-t : time\n"
@@ -7904,7 +7646,7 @@ msgstr ""
 "\t-p : pid\n"
 "\t-c : criador\n"
 
-#: sys-utils/ipcs.c:130
+#: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
@@ -7912,565 +7654,540 @@ msgstr ""
 "\t-l : limites\n"
 "\t-u : resumo\n"
 
-#: sys-utils/ipcs.c:131
+#: sys-utils/ipcs.c:136
 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"
 
-#: sys-utils/ipcs.c:263 sys-utils/ipcs.c:465
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
 msgid "kernel not configured for shared memory\n"
 msgstr "o kernel n�o est� configurado para mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:269
+#: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
 msgstr "- Limites da mem�ria compartilhada -\n"
 
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:277
 #, c-format
 msgid "max number of segments = %d\n"
 msgstr "n�mero m�ximo de segmentos: %d\n"
 
-#: sys-utils/ipcs.c:273
+#: sys-utils/ipcs.c:278
 #, c-format
 msgid "max seg size (kbytes) = %d\n"
 msgstr "tamanho m�ximo do segmento (Kb): %d\n"
 
-#: sys-utils/ipcs.c:274
+#: sys-utils/ipcs.c:279
 #, c-format
 msgid "max total shared memory (kbytes) = %d\n"
 msgstr "mem�ria compartilhada total m�xima (Kb): %d\n"
 
-#: sys-utils/ipcs.c:275
+#: sys-utils/ipcs.c:280
 #, c-format
 msgid "min seg size (bytes) = %d\n"
 msgstr "tamanho m�nimo do segmento (bytes): %d\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:284
 msgid "------ Shared Memory Status --------\n"
 msgstr "- Status da mem�ria compartilhada -\n"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:285
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "segmentos alocados: %d\n"
 
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:286
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "p�ginas alocadas %ld\n"
 
-#: sys-utils/ipcs.c:282
+#: sys-utils/ipcs.c:287
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "p�ginas residentes: %ld\n"
 
-#: sys-utils/ipcs.c:283
+#: sys-utils/ipcs.c:288
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "p�ginas permutadas: %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:289
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
 msgstr "Desempenho de permuta: %ld tentativas\t %ld sucessos\n"
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:294
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "Criadores/donos de segmentos de mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:290 sys-utils/ipcs.c:396 sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:297 sys-utils/ipcs.c:302
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:302 sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:408
 msgid "shmid"
 msgstr "shmid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:308 sys-utils/ipcs.c:397
-#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:489 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:494 sys-utils/ipcs.c:511
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:397 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:291 sys-utils/ipcs.c:489
+#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:300
 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:296
+#: sys-utils/ipcs.c:301
 #, c-format
 msgid "%-10s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:297 sys-utils/ipcs.c:302 sys-utils/ipcs.c:308
-#: sys-utils/ipcs.c:403 sys-utils/ipcs.c:412 sys-utils/ipcs.c:495
-#: sys-utils/ipcs.c:500 sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:307 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:408 sys-utils/ipcs.c:417 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505 sys-utils/ipcs.c:511
 msgid "owner"
 msgstr "propriet�rio"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "attached"
 msgstr "anexado"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "detached"
 msgstr "destacado"
 
-#: sys-utils/ipcs.c:297
+#: sys-utils/ipcs.c:302
 msgid "changed"
 msgstr "alterado"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "Criador/�ltima op da mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:307
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:311
 msgid "------ Shared Memory Segments --------\n"
 msgstr "- Segmentos da mem�ria compartilhada -\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:312
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:412 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
 msgid "key"
 msgstr "chave"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "bytes"
 msgstr "bytes"
 
-#: sys-utils/ipcs.c:308
+#: sys-utils/ipcs.c:313
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
 msgid "status"
 msgstr "status"
 
-#: sys-utils/ipcs.c:328 sys-utils/ipcs.c:329 sys-utils/ipcs.c:330
-#: sys-utils/ipcs.c:433 sys-utils/ipcs.c:434 sys-utils/ipcs.c:526
-#: sys-utils/ipcs.c:527 sys-utils/ipcs.c:528
+#: sys-utils/ipcs.c:333 sys-utils/ipcs.c:334 sys-utils/ipcs.c:335
+#: sys-utils/ipcs.c:438 sys-utils/ipcs.c:439 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:532 sys-utils/ipcs.c:533
 msgid "Not set"
 msgstr "N�o definido"
 
-#: sys-utils/ipcs.c:350
+#: sys-utils/ipcs.c:355
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:351
+#: sys-utils/ipcs.c:356
 msgid "locked"
 msgstr "bloqueado"
 
-#: sys-utils/ipcs.c:371
+#: sys-utils/ipcs.c:376
 msgid "kernel not configured for semaphores\n"
 msgstr "o kernel n�o est� configurado para sem�foros\n"
 
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:382
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Limites de sem�foro ------\n"
 
-#: sys-utils/ipcs.c:381
+#: sys-utils/ipcs.c:386
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "n�mero m�ximo de arrays: %d\n"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:387
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "m�ximo de sem�foros por array: %d\n"
 
-#: sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:388
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "m�ximo geral de sem�foros do sistema: %d\n"
 
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:389
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "m�ximo de ops por chamada semop: %d\n"
 
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:390
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valor m�ximo de sem�foro: %d\n"
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:394
 msgid "------ Semaphore Status --------\n"
 msgstr "----- Status de sem�foro -------\n"
 
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:395
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "arrays usados: %d\n"
 
-#: sys-utils/ipcs.c:391
+#: sys-utils/ipcs.c:396
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "sem�foros alocados: %d\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:400
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "----- Criadores/donos de arrays de sem�foros -----\n"
 
-#: sys-utils/ipcs.c:397 sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:401
+#: sys-utils/ipcs.c:406
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "Hor�rios de opera��o/altera��o de mem�ria compartilhada\n"
 
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-op"
 msgstr "�ltima-op"
 
-#: sys-utils/ipcs.c:403
+#: sys-utils/ipcs.c:408
 msgid "last-changed"
 msgstr "�tima-altera��o"
 
-#: sys-utils/ipcs.c:410
+#: sys-utils/ipcs.c:415
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Arrays de sem�foros ------\n"
 
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:416
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:417
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:478
 msgid "------ Messages: Limits --------\n"
 msgstr "----- Mensagens: limites -------\n"
 
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:479
 #, 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:475
+#: sys-utils/ipcs.c:480
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "tamanho m�ximo da mensagem (bytes): %d\n"
 
-#: sys-utils/ipcs.c:476
+#: sys-utils/ipcs.c:481
 #, 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:480
+#: sys-utils/ipcs.c:485
 msgid "------ Messages: Status --------\n"
 msgstr "----- Mensagens: status -------\n"
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:486
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "filas alocadas: %d\n"
 
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:487
 #, c-format
 msgid "used headers = %d\n"
 msgstr "cabe�alhos usados: %d\n"
 
-#: sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:488
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "espa�o usado: %d bytes\n"
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:492
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr "---- Filas de mensagens: criadores/donos ----\n"
 
-#: sys-utils/ipcs.c:489 sys-utils/ipcs.c:495 sys-utils/ipcs.c:500
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:498
 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:494
+#: sys-utils/ipcs.c:499
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "send"
 msgstr "envio"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "recv"
 msgstr "recebimento"
 
-#: sys-utils/ipcs.c:495
+#: sys-utils/ipcs.c:500
 msgid "change"
 msgstr "altera��o"
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:504
 msgid "------ Message Queues PIDs --------\n"
 msgstr "--- PIDs de filas de mensagens ---\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:505
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:509
 msgid "------ Message Queues --------\n"
 msgstr "----- Filas de mensagens ------\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:510
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "used-bytes"
 msgstr "bytes usados"
 
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:511
 msgid "messages"
 msgstr "mensagens"
 
-#: sys-utils/ipcs.c:565
+#: sys-utils/ipcs.c:570
 #, c-format
-msgid ""
-"\n"
-"Shared memory Segment shmid=%d\n"
-msgstr ""
-"\n"
-"Mem�ria compartilhada: shmid de segmento = %d\n"
+msgid "\nShared memory Segment shmid=%d\n"
+msgstr "\nMem�ria compartilhada: shmid de segmento = %d\n"
 
-#: sys-utils/ipcs.c:566
+#: sys-utils/ipcs.c:571
 #, 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:568
+#: sys-utils/ipcs.c:573
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:569
+#: sys-utils/ipcs.c:574
 #, c-format
 msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
 
-#: sys-utils/ipcs.c:572
+#: sys-utils/ipcs.c:577
 #, c-format
 msgid "att_time=%s"
 msgstr "att_time=%s"
 
-#: sys-utils/ipcs.c:573 sys-utils/ipcs.c:575 sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
 msgid "Not set\n"
 msgstr "N�o definido\n"
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:579
 #, c-format
 msgid "det_time=%s"
 msgstr "det_time=%s"
 
-#: sys-utils/ipcs.c:576
+#: sys-utils/ipcs.c:581
 #, c-format
 msgid "change_time=%s"
 msgstr "change_time=%s"
 
-#: sys-utils/ipcs.c:592
+#: sys-utils/ipcs.c:597
 #, c-format
-msgid ""
-"\n"
-"Message Queue msqid=%d\n"
-msgstr ""
-"\n"
-"msqid da fila de mensagens: %d\n"
+msgid "\nMessage Queue msqid=%d\n"
+msgstr "\nmsqid da fila de mensagens: %d\n"
 
-#: sys-utils/ipcs.c:593
+#: sys-utils/ipcs.c:598
 #, 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:595
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 msgstr "cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "send_time=%srcv_time=%schange_time=%s"
 msgstr "send_time=%srcv_time=%schange_time=%s"
 
-#: sys-utils/ipcs.c:599 sys-utils/ipcs.c:600 sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:604 sys-utils/ipcs.c:605 sys-utils/ipcs.c:606
 msgid "Not Set\n"
 msgstr "N�o definido\n"
 
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:623
 #, c-format
-msgid ""
-"\n"
-"Semaphore Array semid=%d\n"
-msgstr ""
-"\n"
-"semid de array de sem�foros: %d\n"
+msgid "\nSemaphore Array semid=%d\n"
+msgstr "\nsemid de array de sem�foros: %d\n"
 
-#: sys-utils/ipcs.c:619
+#: sys-utils/ipcs.c:624
 #, 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:621
+#: sys-utils/ipcs.c:626
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:622
+#: sys-utils/ipcs.c:627
 #, c-format
 msgid "nsems = %d\n"
 msgstr "nsems = %d\n"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "otime = %s"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:630
 #, c-format
 msgid "ctime = %s"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "value"
 msgstr "valor"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:632
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:633
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:67
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr ""
-"Uso: rdev [ -rsv ] [ -o DESLOCAMENTO ] [ IMAGEM [ VALOR [ DESLOCAMENTO] ] ]"
+msgstr "Uso: rdev [ -rsv ] [ -o DESLOCAMENTO ] [ IMAGEM [ VALOR [ DESLOCAMENTO] ] ]"
 
-#: sys-utils/rdev.c:69
-msgid ""
-"  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"
+#: sys-utils/rdev.c:68
+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:70
+#: sys-utils/rdev.c:69
 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:71
+#: sys-utils/rdev.c:70
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
-msgstr ""
-"  rdev -R /dev/fd0 1              define ROOTFLAGS (status de somente "
-"leitura)"
+msgstr "  rdev -R /dev/fd0 1              define ROOTFLAGS (status de somente leitura)"
 
-#: sys-utils/rdev.c:72
+#: sys-utils/rdev.c:71
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
-msgstr ""
-"  rdev -s /dev/fd0 /dev/hda2      define o dispositivo de SWAP (permuta)"
+msgstr "  rdev -s /dev/fd0 /dev/hda2      define o dispositivo de SWAP (permuta)"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:72
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr ""
-"  rdev -r /dev/fd0 627            define o tamanho do RAMDISK (disco de RAM)"
+msgstr "  rdev -r /dev/fd0 627            define o tamanho do RAMDISK (disco de RAM)"
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:73
 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"
+msgstr "  rdev -v /dev/fd0 1              define o VIDEOMODE (modo de v�deo) de inicializa��o"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:74
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   usa o deslocamento de bytes N"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:75
 msgid "  rootflags ...                   same as rdev -R"
 msgstr "  rootflags ...                   o mesmo que rdev -R"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:76
 msgid "  swapdev ...                     same as rdev -s"
 msgstr "  swapdev ...                     o mesmo que rdev -s"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr "  ramsize ...                     o mesmo que rdev -r"
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:78
 msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     o mesmo que rdev -v"
 
-#: sys-utils/rdev.c:80
-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:79
+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:81
+#: sys-utils/rdev.c:80
 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."
+msgstr "      use -R 1 para montar a raiz somente para leitura, -R 0 for leitura/grava��o."
 
 #: sys-utils/readprofile.c:52
 #, c-format
@@ -8522,10 +8239,8 @@ msgid "total"
 msgstr "total"
 
 #: sys-utils/renice.c:67
-msgid ""
-"usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
-msgstr ""
-"renice prioridade [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usu�rios ]\n"
+msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
+msgstr "renice prioridade [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] usu�rios ]\n"
 
 #: sys-utils/renice.c:94
 #, c-format
@@ -8555,7 +8270,7 @@ msgstr "%d: prioridade antiga = %d; prioridade nova = %d\n"
 msgid "usage: %s program [arg ...]\n"
 msgstr "Uso: %s programa [arg ...]\n"
 
-#: sys-utils/tunelp.c:73
+#: sys-utils/tunelp.c:74
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8566,82 +8281,82 @@ msgstr ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:89
+#: sys-utils/tunelp.c:90
 msgid "malloc error"
 msgstr "erro de malloc"
 
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:102
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s: valor inv�lido\n"
 
-#: sys-utils/tunelp.c:237
+#: sys-utils/tunelp.c:241
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s n�o � um dispositivo lp.\n"
 
-#: sys-utils/tunelp.c:258
+#: sys-utils/tunelp.c:262
 #, c-format
 msgid "%s status is %d"
 msgstr "o status de %s � %d"
 
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:263
 msgid ", busy"
 msgstr ", ocupado"
 
-#: sys-utils/tunelp.c:260
+#: sys-utils/tunelp.c:264
 msgid ", ready"
 msgstr ", pronto"
 
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:265
 msgid ", out of paper"
 msgstr ", sem papel"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:266
 msgid ", on-line"
 msgstr ", on-line"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:267
 msgid ", error"
 msgstr ", erro"
 
-#: sys-utils/tunelp.c:280
+#: sys-utils/tunelp.c:284
 msgid "LPGETIRQ error"
 msgstr "erro LPGETIRQ"
 
-#: sys-utils/tunelp.c:286
+#: sys-utils/tunelp.c:290
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s usando IRQ %d\n"
 
-#: sys-utils/tunelp.c:288
+#: sys-utils/tunelp.c:292
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s usando consulta (polling)\n"
 
-#: text-utils/col.c:153
+#: text-utils/col.c:154
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col: argumento inv�lido para -l %s.\n"
 
-#: text-utils/col.c:516
-msgid "usage: col [-bfx] [-l nline]\n"
-msgstr "Uso: col [-bfx] [-l nlinha]\n"
+#: text-utils/col.c:521
+msgid "usage: col [-bfpx] [-l nline]\n"
+msgstr "Uso: col [-bfpx] [-l nlinha]\n"
 
-#: text-utils/col.c:522
+#: text-utils/col.c:527
 msgid "col: write error.\n"
 msgstr "col: erro de grava��o.\n"
 
-#: text-utils/col.c:529
+#: text-utils/col.c:534
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr "col: aviso: n�o � poss�vel fazer backup de %s.\n"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "past first line"
 msgstr "al�m da primeira linha"
 
-#: text-utils/col.c:530
+#: text-utils/col.c:535
 msgid "-- line already flushed"
 msgstr "-- linha j� descarregada"
 
@@ -8650,11 +8365,11 @@ msgstr "-- linha j� descarregada"
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "Uso: %s [ - ] [ -2 ] [ arquivo ... ]\n"
 
-#: text-utils/column.c:302
+#: text-utils/column.c:300
 msgid "line too long"
 msgstr "linha longa demais"
 
-#: text-utils/column.c:379
+#: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
 msgstr "Uso: column [-tx] [-c colunas] [arquivo ...]\n"
 
@@ -8667,148 +8382,119 @@ msgid "hexdump: bad skip value.\n"
 msgstr "hexdump: valor para pular incorreto.\n"
 
 #: text-utils/hexsyntax.c:129
-msgid ""
-"hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
-msgstr ""
-"hexdump: [-bcdovx] [-e fmt] [-f arq_fmt] [-n compr] [-s pular] [arquivo "
-"...]\n"
+msgid "hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
+msgstr "hexdump: [-bcdovx] [-e fmt] [-f arq_fmt] [-n compr] [-s pular] [arquivo ...]\n"
 
-#: text-utils/more.c:329
+#: text-utils/more.c:262
 #, c-format
-msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "Uso: %s [-dfln] [+n�mero_da_linha | +/padr�o] nome1 nome2 ...\n"
+msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "Uso: %s [-dflpcsu] [+n�mero_da_linha | +/padr�o] nome1 nome2 ...\n"
 
-#: text-utils/more.c:504
+#: text-utils/more.c:518
 #, c-format
-msgid ""
-"\n"
-"*** %s: directory ***\n"
-"\n"
-msgstr ""
-"\n"
-"*** %s: diret�rio ***\n"
-"\n"
+msgid "\n*** %s: directory ***\n\n"
+msgstr "\n*** %s: diret�rio ***\n\n"
 
 #. simple ELF detection
-#: text-utils/more.c:543
+#: text-utils/more.c:557
 #, c-format
-msgid ""
-"\n"
-"******** %s: Not a text file ********\n"
-"\n"
-msgstr ""
-"\n"
-"******** %s: n�o � um arquivo de texto ********\n"
-"\n"
+msgid "\n******** %s: Not a text file ********\n\n"
+msgstr "\n******** %s: n�o � um arquivo de texto ********\n\n"
 
-#: text-utils/more.c:647
+#: text-utils/more.c:660
 msgid "[Use q or Q to quit]"
 msgstr "[Use q ou Q para sair]"
 
-#: text-utils/more.c:833
+#: text-utils/more.c:839
 msgid "--More--"
 msgstr "--Mais--"
 
-#: text-utils/more.c:835
+#: text-utils/more.c:841
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: text-utils/more.c:841
+#: text-utils/more.c:847
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Pressione espa�o para continuar, 'q' para sair.]"
 
-#: text-utils/more.c:1139
+#: text-utils/more.c:1145
 #, c-format
 msgid "...back %d page"
 msgstr "...voltar %d p�gina(s)"
 
-#: text-utils/more.c:1185
+#: text-utils/more.c:1191
 #, c-format
 msgid "...skipping %d line"
 msgstr "... pulando %d linha(s)"
 
-#: text-utils/more.c:1226
-msgid ""
-"\n"
-"***Back***\n"
-"\n"
-msgstr ""
-"\n"
-"***Voltar***\n"
-"\n"
+#: text-utils/more.c:1232
+msgid "\n***Back***\n\n"
+msgstr "\n***Voltar***\n\n"
 
-#: text-utils/more.c:1264
+#: text-utils/more.c:1270
 msgid "Can't open help file"
 msgstr "N�o foi poss�vel abrir o arquivo de ajuda"
 
-#: text-utils/more.c:1285 text-utils/more.c:1289
+#: text-utils/more.c:1291 text-utils/more.c:1295
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pressione 'h' para obter instru��es.]"
 
-#: text-utils/more.c:1324
+#: text-utils/more.c:1329
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linha %d"
 
-#: text-utils/more.c:1326
+#: text-utils/more.c:1331
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[N�o � um arquivo] linha %d"
 
-#: text-utils/more.c:1410
+#: text-utils/more.c:1415
 msgid "  Overflow\n"
 msgstr "  Estouro\n"
 
-#: text-utils/more.c:1457
+#: text-utils/more.c:1462
 msgid "...skipping\n"
 msgstr "...pulando\n"
 
-#: text-utils/more.c:1487
+#: text-utils/more.c:1492
 msgid "Regular expression botch"
 msgstr "Express�o regular malformada"
 
-#: text-utils/more.c:1499
-msgid ""
-"\n"
-"Pattern not found\n"
-msgstr ""
-"\n"
-"Padr�o n�o encontrado\n"
+#: text-utils/more.c:1504
+msgid "\nPattern not found\n"
+msgstr "\nPadr�o n�o encontrado\n"
 
-#: text-utils/more.c:1502
+#: text-utils/more.c:1507
 msgid "Pattern not found"
 msgstr "Padr�o n�o encontrado"
 
-#: text-utils/more.c:1563
+#: text-utils/more.c:1568
 msgid "can't fork\n"
 msgstr "n�o foi poss�vel realizar fork\n"
 
-#: text-utils/more.c:1602
-msgid ""
-"\n"
-"...Skipping "
-msgstr ""
-"\n"
-"...Pulando "
+#: text-utils/more.c:1607
+msgid "\n...Skipping "
+msgstr "\n...Pulando "
 
-#: text-utils/more.c:1606
+#: text-utils/more.c:1611
 msgid "...Skipping "
 msgstr "...Pulando "
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1612
 msgid "to file "
 msgstr "para o arquivo"
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1612
 msgid "back to file "
 msgstr "de volta ao arquivo"
 
-#: text-utils/more.c:1846
+#: text-utils/more.c:1848
 msgid "Line too long"
 msgstr "Linha longa demais"
 
-#: text-utils/more.c:1890
+#: text-utils/more.c:1891
 msgid "No previous command to substitute for"
 msgstr "N�o h� comando anterior para ser substitu�do"
 
@@ -8819,7 +8505,7 @@ msgstr "od: od(1) foi depreciado para hexdump(1).\n"
 #: text-utils/odsyntax.c:136
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
-msgstr "od: a compatibilidade com hexdump(1) n�o suporta a(s) op��o(�es) -%c\n"
+msgstr "od: a compatibilidade com hexdump(1) n�o suporta a op��o -%c%s\n"
 
 #: text-utils/odsyntax.c:137
 msgid "; see strings(1)."
@@ -8856,11 +8542,11 @@ msgstr "hexdump: formato inv�lido{%s}\n"
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: caractere de convers�o inv�lido %%%s.\n"
 
-#: text-utils/rev.c:114
+#: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
 msgstr "N�o foi poss�vel alocar espa�o em buffer\n"
 
-#: text-utils/rev.c:173
+#: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
 msgstr "Uso: rev [arquivo ...]\n"
 
@@ -8882,11 +8568,11 @@ msgstr "Seq��ncia de escape desconhecida na entrada: %o, %o\n"
 msgid "Unable to allocate buffer.\n"
 msgstr "N�o foi poss�vel alocar buffer.\n"
 
-#: text-utils/ul.c:555
+#: text-utils/ul.c:553
 msgid "Input line too long.\n"
 msgstr "Linha de entrada longa demais.\n"
 
-#: text-utils/ul.c:568
+#: text-utils/ul.c:566
 msgid "Out of memory when growing buffer.\n"
 msgstr "Falta mem�ria quando o buffer cresce.\n"
 
@@ -8902,3 +8588,58 @@ msgstr "Uso: kbdrate [-V] [-s] [-r velocidade] [-d intervalo]\n"
 #: kbd/kbdrate.c:252
 msgid "Cannot open /dev/port"
 msgstr "N�o foi poss�vel abrir /dev/port"
+
+#~ msgid "Waiting in loop for time from /dev/rtc to change\n"
+#~ msgstr "Aguardando em la�o at� que a hora de /dev/rtc mude\n"
+
+#~ msgid "Unable to open /dev/rtc"
+#~ msgstr "N�o foi poss�vel abrir /dev/rtc"
+
+#~ msgid "Writing disklabel to %s%d.\n"
+#~ msgstr "Gravando r�tulo de disco em %s%d.\n"
+
+#~ msgid "%s%d contains no disklabel.\n"
+#~ msgstr "%s%d n�o cont�m um r�tulo de disco.\n"
+
+#~ msgid "Bootstrap installed on %s%d.\n"
+#~ msgstr "Bootstrap (c�digo de inicializa��o) instalado em %s%d.\n"
+
+#~ msgid "%s: unknown geometry\n"
+#~ msgstr "%s: geometria desconhecida\n"
+
+#~ msgid "\aURGENT: broadcast message from %s:"
+#~ msgstr "\aURGENTE: mensagem de broadcast de %s:"
+
+#~ msgid "exec rc failed\n"
+#~ msgstr "exec rc falhou\n"
+
+#~ msgid "fork of rc shell failed\n"
+#~ msgstr "o fork de interpretador de comandos de rc falhou\n"
+
+#~ msgid "Cannot get loop info"
+#~ msgstr "N�o � poss�vel obter informa��es de loop."
+
+#~ msgid "mount: %s has wrong major or minor number"
+#~ msgstr "mount: %s possui n�mero principal ou secund�rio incorreto"
+
+#~ msgid "mount: block device %s is not permitted on its filesystem"
+#~ msgstr "mount: o dispositivo de blocos %s n�o � permitido neste sistema de arquivos"
+
+#~ msgid ""
+#~ "Usage: mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t vfstypes]\n"
+#~ "       mount [-nfrsvw] [-o options] special | node\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o options] special node\n"
+#~ "       A special device can be indicated by  -L label  or  -U uuid .\n"
+#~ msgstr ""
+#~ "Uso: mount [-hV]\n"
+#~ "       mount -a [-nfFrsvw] [-t tipos_sist_arq_virt]\n"
+#~ "       mount [-nfrsvw] [-o op��es ] especial | n�\n"
+#~ "       mount [-nfrsvw] [-t vfstype] [-o op��es ] especial n�\n"
+#~ "       Um dispositivo especial pode ser indicado por  -L r�tulo ou  -U uuid .\n"
+
+#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
+#~ msgstr "mount: %s:%s falhou. Raz�o dada pelo servidor: %s.\n"
+
+#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
+#~ msgstr "Uso: %s [-shm | -msg | -sem] id\n"
diff --git a/sys-utils/Makefile b/sys-utils/Makefile
index 837ecd30eb..66f913a62b 100644
--- a/sys-utils/Makefile
+++ b/sys-utils/Makefile
@@ -37,7 +37,7 @@ SBIN:=$(SBIN) sln
 endif
 endif
 
-ifeq "$(CPU)" "intel"
+ifeq "$(ARCH)" "intel"
 MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 swapdev.8 vidmode.8
 USRSBIN:=$(USRSBIN) rdev
 endif
@@ -83,7 +83,7 @@ install: all
 	$(INSTALLBIN) $(BIN) $(BINDIR)
 	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
 	$(INSTALLBIN) $(USRSBIN) $(USRSBINDIR)
-ifeq "$(CPU)" "intel"
+ifeq "$(ARCH)" "intel"
 	(cd $(USRSBINDIR); ln -sf rdev swapdev)
 	(cd $(USRSBINDIR); ln -sf rdev ramsize)
 	(cd $(USRSBINDIR); ln -sf rdev vidmode)
diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index 5a0ac9ffbc..91b67bc8b1 100644
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -9,6 +9,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 #include "linux_reboot.h"
 #include "nls.h"
diff --git a/sys-utils/cytune.c b/sys-utils/cytune.c
index 0bc0c5cb19..63ca0e4e22 100644
--- a/sys-utils/cytune.c
+++ b/sys-utils/cytune.c
@@ -101,21 +101,21 @@ static int global_argc, global_optind;
 static char ***global_argv;
 
 static void
-summary(int signal) {
+summary(int sig) {
   struct cyclades_control *cc;
 
-  int argc, optind;
+  int argc, local_optind;
   char **argv;
 
   int i,j;
 
   argc = global_argc;
   argv = *global_argv;
-  optind = global_optind;
+  local_optind = global_optind;
 
-  if (signal > 0) {
-    for(i = optind; i < argc; i ++) {
-      j = i - optind;
+  if (sig > 0) {
+    for(i = local_optind; i < argc; i ++) {
+      j = i - local_optind;
       cc = &cmon[cmon_index];
       fprintf(stderr, _("File %s, For threshold value %lu, Maximum characters in fifo were %d,\nand the maximum transfer rate in characters/second was %f\n"), 
 	      argv[i],
@@ -127,9 +127,9 @@ summary(int signal) {
     exit(0);
   }
   cc = &cmon[cmon_index];
-  if (cc->threshold_value > 0 && signal != -1) {
+  if (cc->threshold_value > 0 && sig != -1) {
     fprintf(stderr, _("File %s, For threshold value %lu and timrout value %lu, Maximum characters in fifo were %d,\nand the maximum transfer rate in characters/second was %f\n"),
-	    argv[cmon_index+optind],
+	    argv[cmon_index+local_optind],
 	    cc->threshold_value,
 	    cc->timeout_value,
 	    cc->maxmax,
@@ -170,8 +170,6 @@ int main(int argc, char *argv[]) {
   struct cyclades_monitor cywork;
   
   int i;
-  extern char *optarg;
-  extern int optind;
   unsigned long threshold_value;
   unsigned long timeout_value;
   double xfer_rate;
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index 3990ad3fa1..d74fa359e1 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -274,10 +274,16 @@ void do_shm (char format)
 		printf (_("------ Shared Memory Limits --------\n"));
 		if ((shmctl (0, IPC_INFO, (struct shmid_ds *) &shminfo)) < 0 )
 			return;
-		printf (_("max number of segments = %d\n"), shminfo.shmmni);
-		printf (_("max seg size (kbytes) = %d\n"), shminfo.shmmax >> 10);
-		printf (_("max total shared memory (kbytes) = %d\n"), shminfo.shmall << 2);
-		printf (_("min seg size (bytes) = %d\n"), shminfo.shmmin);
+		/* glibc 2.1.3 and all earlier libc's have ints as fields
+		   of struct shminfo; glibc 2.1.91 has unsigned long; ach */
+		printf (_("max number of segments = %ld\n"),
+			(long) shminfo.shmmni);
+		printf (_("max seg size (kbytes) = %ld\n"),
+			(long) (shminfo.shmmax >> 10));
+		printf (_("max total shared memory (kbytes) = %ld\n"),
+			(long) shminfo.shmall << 2);
+		printf (_("min seg size (bytes) = %ld\n"),
+			(long) shminfo.shmmin);
 		return;
 
 	case STATUS:
@@ -349,9 +355,14 @@ void do_shm (char format)
 				printf ("%-10d%-10.10s", shmid, pw->pw_name);
 			else
 				printf ("%-10d%-10d", shmid, ipcp->uid);
-			printf ("%-10o%-10d%-10d%-6s%-6s\n", 
-				ipcp->mode & 0777, 
-				shmseg.shm_segsz, shmseg.shm_nattch,
+			printf ("%-10o%-10d%-10ld%-6s%-6s\n", 
+				ipcp->mode & 0777,
+				shmseg.shm_segsz,
+				/*
+				 * glibc-2.1.3 and earlier has unsigned short;
+				 * Austin has shmatt_t
+				 */
+				(long) shmseg.shm_nattch,
 				ipcp->mode & SHM_DEST ? _("dest") : " ",
 				ipcp->mode & SHM_LOCKED ? _("locked") : " ");
 			break;
@@ -447,9 +458,15 @@ void do_sem (char format)
 				printf ("%-10d%-10.9s", semid, pw->pw_name);
 			else
 				printf ("%-10d%-9d", semid, ipcp->uid);
-			printf ("%-10o%-10d\n", 
+			printf ("%-10o%-10ld\n",
 				ipcp->mode & 0777,
-				semary.sem_nsems);
+				/*
+				 * glibc-2.1.3 and earlier has unsigned short;
+				 * glibc-2.1.91 has variation between
+				 * unsigned short and unsigned long
+				 * Austin prescribes unsigned short.
+				 */
+				(long) semary.sem_nsems);
 			break;
 		}
 	}
@@ -547,9 +564,16 @@ void do_msg (char format)
 				printf ("%-10d%-10.10s", msqid, pw->pw_name);
 			else
 				printf ("%-10d%-10d", msqid, ipcp->uid);
-			printf ("%-10o%-12d%-12d\n", 
-			ipcp->mode & 0777, msgque.msg_cbytes,
-				msgque.msg_qnum);
+			printf ("%-10o%-12ld%-12ld\n",
+				ipcp->mode & 0777,
+				/*
+				 * glibc-2.1.3 and earlier has unsigned short;
+				 * glibc-2.1.91 has variation between
+				 * unsigned short, unsigned long
+				 * Austin has msgqnum_t
+				 */
+				(long) msgque.msg_cbytes,
+				(long) msgque.msg_qnum);
 			break;
 		}
 	}
@@ -570,10 +594,11 @@ void print_shm (int shmid)
 	printf (_("\nShared memory Segment shmid=%d\n"), shmid);
 	printf (_("uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"),
 		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid);
-	printf (_("mode=%#o\taccess_perms=%#o\n"), ipcp->mode, ipcp->mode & 0777);
-	printf (_("bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"), 
+	printf (_("mode=%#o\taccess_perms=%#o\n"),
+		ipcp->mode, ipcp->mode & 0777);
+	printf (_("bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"), 
 		shmds.shm_segsz, shmds.shm_lpid, shmds.shm_cpid, 
-		shmds.shm_nattch);
+		(long) shmds.shm_nattch);
 	printf (_("att_time=%s"), shmds.shm_atime ? ctime (&shmds.shm_atime) : 
 		_("Not set\n"));
 	printf (_("det_time=%s"), shmds.shm_dtime ? ctime (&shmds.shm_dtime) : 
@@ -597,9 +622,15 @@ void print_msg (int msqid)
 	printf (_("\nMessage Queue msqid=%d\n"), msqid);
 	printf (_("uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"),
 		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->mode);
-	printf (_("cbytes=%d\tqbytes=%d\tqnum=%d\tlspid=%d\tlrpid=%d\n"),
-		buf.msg_cbytes, buf.msg_qbytes, buf.msg_qnum, buf.msg_lspid, 
-		buf.msg_lrpid);
+	printf (_("cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"),
+		/*
+		 * glibc-2.1.3 and earlier has unsigned short;
+		 * glibc-2.1.91 has variation between
+		 * unsigned short, unsigned long
+		 * Austin has msgqnum_t (for msg_qbytes)
+		 */
+		(long) buf.msg_cbytes, (long) buf.msg_qbytes,
+		(long) buf.msg_qnum, buf.msg_lspid, buf.msg_lrpid);
 	printf (_("send_time=%srcv_time=%schange_time=%s"), 
 		buf.msg_rtime? ctime (&buf.msg_rtime) : _("Not Set\n"),
 		buf.msg_stime? ctime (&buf.msg_stime) : _("Not Set\n"),
@@ -623,14 +654,15 @@ void print_sem (int semid)
 	printf (_("\nSemaphore Array semid=%d\n"), semid);
 	printf (_("uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"),
 		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid);
-	printf (_("mode=%#o, access_perms=%#o\n"), ipcp->mode, ipcp->mode & 0777);
-	printf (_("nsems = %d\n"), semds.sem_nsems);
+	printf (_("mode=%#o, access_perms=%#o\n"),
+		ipcp->mode, ipcp->mode & 0777);
+	printf (_("nsems = %ld\n"), (long) semds.sem_nsems);
 	printf (_("otime = %s"), semds.sem_otime ? ctime (&semds.sem_otime) : 
 		_("Not set\n"));
 	printf (_("ctime = %s"), ctime (&semds.sem_ctime));	
 
-	printf (_("%-10s%-10s%-10s%-10s%-10s\n"), _("semnum"),_("value"),_("ncount"),
-		_("zcount"),_("pid"));
+	printf (_("%-10s%-10s%-10s%-10s%-10s\n"),
+		_("semnum"),_("value"),_("ncount"),_("zcount"),_("pid"));
 	arg.val = 0;
 	for (i=0; i< semds.sem_nsems; i++) {
 		int val, ncnt, zcnt, pid;
diff --git a/sys-utils/rdev.8 b/sys-utils/rdev.8
index 78a62355fb..0cf83d365c 100644
--- a/sys-utils/rdev.8
+++ b/sys-utils/rdev.8
@@ -45,14 +45,13 @@ will change these values.
 
 Typical values for the
 .I image
-parameter, which is a bootable Linux kernel image, are as follows:
+parameter, which is a bootable Linux kernel image, might be:
 
 .nf
 .RS
 /vmlinux
-/vmlinux.test
 /vmunix
-/vmunix.test
+/boot/bzImage-2.4.0
 /dev/fd0
 /dev/fd1
 .RE
@@ -62,14 +61,15 @@ When using the
 .BR rdev ", or " swapdev
 commands, the
 .IR root_device " or " swap_device
-parameter are as follows:
+parameter might be something like:
 
 .nf
 .RS
-/dev/hda[1-8]
-/dev/hdb[1-8]
-/dev/sda[1-8]
-/dev/sdb[1-8]
+/dev/hda1
+/dev/hdf13
+/dev/sda2
+/dev/sdc4
+/dev/ida/c0d0p1
 .RE
 .fi
 
diff --git a/sys-utils/rdev.c b/sys-utils/rdev.c
index 768d17c86c..d49da823c9 100644
--- a/sys-utils/rdev.c
+++ b/sys-utils/rdev.c
@@ -57,6 +57,7 @@ Wed Jun 22 21:12:29 1994: Applied patches from Dave
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "nls.h"
 
 /* rdev.c  -  query/set root device. */
@@ -95,32 +96,59 @@ usage(void) {
 #define DEFAULT_OFFSET 508
 
 
-static void die(char *msg)
-{
-    perror(msg);
-    exit(1);
+static void
+die(char *msg) {
+	perror(msg);
+	exit(1);
 }
 
+/* Earlier rdev fails on /dev/ida/c0d0p1 so we allow for
+   (limited) recursion in /dev. -- Paul Clements */
+
+#define MAX_DEPTH	1
+
+static int
+find_dev_recursive(char *dirnamebuf, int number, int depth) {
+	DIR *dp;
+	struct dirent *dir;
+	struct stat s;
+	int dirnamelen = 0;
+
+	if (depth < 0)
+		return 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, depth-1))
+			return 1;
+	}
+	dirnamebuf[dirnamelen] = 0;
+	return 0;
+}
 
-static char *find_dev(int number)
-{
-    DIR *dp;
-    struct dirent *dir;
-    static char name[PATH_MAX+1];
-    struct stat s;
-
-    if (!number) return "Boot device";
-    if ((dp = opendir("/dev")) == NULL) die("opendir /dev");
-    strcpy(name,"/dev/");
-    while ((dir = readdir(dp)) != NULL) {
-	strcpy(name+5,dir->d_name);
-	if (stat(name,&s) < 0)
-	    continue;
-	if ((s.st_mode & S_IFMT) == S_IFBLK && s.st_rdev == number)
-	    return name;
-    }
-    sprintf(name,"0x%04x",number);
-    return name;
+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, MAX_DEPTH))
+		return name;
+	sprintf(name, "0x%04x", number);
+	return name;
 }
 
 /* enum { RDEV, SDEV, RAMSIZE, VIDMODE }; */
@@ -131,60 +159,53 @@ char *desc[6] = { "Root device", "Video mode",  "Ramsize",  "Swap device",
 		  "", "Root flags"};
 #define shift(n) argv+=n,argc-=n
 
-int main(int argc,char **argv)
-{
-    int image,offset,dev_nr, i, newoffset=-1;
-    char *device, *ptr;
-    struct stat s;
-    int cmd = 0;
-
-    setlocale(LC_ALL, "");
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    textdomain(PACKAGE);
-
-    device = NULL;
-    if ((ptr = strrchr(argv[0],'/')) != NULL)
-    	ptr++;
-    else
-    	ptr = argv[0];
-    for (i=0; i<=5; i++)
-    	if (!strcmp(ptr,cmdnames[i]))
-	    break;
-    cmd = i;
-    if (cmd>5)
-    	cmd=RDEV;
-    offset = DEFAULT_OFFSET-cmd*2;
-
-    while (argc > 1)
-    { 
-    	if (argv[1][0] != '-')
-   	    break;
+int
+main(int argc, char **argv) {
+	int image, offset, dev_nr, i, newoffset=-1;
+	char *device, *ptr;
+	struct stat s;
+	int cmd = 0;
+
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	device = NULL;
+
+	/* use the command name to figure out what we have to do - ugly */
+	cmd = RDEV;
+	if ((ptr = strrchr(argv[0],'/')) != NULL)
+		ptr++;
 	else
-	    switch (argv[1][1])
-	    {
+		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;
-		        offset = DEFAULT_OFFSET-cmd*2;
-	    		shift(1);
+			cmd = ROOTFLAGS;
+			shift(1);
 			break;
-	    	case 'r': 
-	    		cmd=RAMSIZE;
-		        offset = DEFAULT_OFFSET-cmd*2;
-	    		shift(1);
+		case 'r': 
+			cmd = RAMSIZE;
+			shift(1);
 			break;
 		case 'v':
-	    		cmd=VIDMODE;
-		        offset = DEFAULT_OFFSET-cmd*2;
-	    		shift(1);
+			cmd = VIDMODE;
+			shift(1);
 			break;
 		case 's':
-	    		cmd=SDEV;
-		        offset = DEFAULT_OFFSET-cmd*2;
-	    		shift(1);
+			cmd = SDEV;
+			shift(1);
 			break;
 		case 'o':
-			if (argv[1][2])
-			{
+			if (argv[1][2]) {
 				newoffset=atoi(argv[1]+2);
 				shift(1);
 				break;
@@ -196,60 +217,59 @@ int main(int argc,char **argv)
 			/* Fall through. . . */
 		default:
 			usage();
-	     }
-    }
-    if (newoffset >= 0)
-	offset = newoffset;
-
-    if  ((cmd==RDEV) && (argc == 1 || argc > 4)) {
-	if (stat("/",&s) < 0) die("/");
-	printf("%s /\n",find_dev(s.st_dev));
-	exit(0);
-    } else if ((cmd != RDEV) && (argc == 1 || argc > 4)) usage();
-
-    if ((cmd==RDEV) || (cmd==SDEV))
-    {	
-	    if (argc == 4) {
-		device = argv[2];
-		offset = atoi(argv[3]);
-	    }
-	    else {
-		if (argc == 3) {
-		    if (isdigit(*argv[2])) offset = atoi(argv[2]);
-		    else device = argv[2];
 		}
-	    }
-    }
-    else
-    {
-    	if (argc>=3)
-		device = argv[2];
-    	if (argc==4)
-		offset = atoi(argv[3]);
-    }
-    if (device) {
-    	if ((cmd==SDEV) || (cmd==RDEV))
-	{	if (stat(device,&s) < 0) die(device);
-	} else
-		s.st_rdev=atoi(device);
-	if ((image = open(argv[1],O_WRONLY)) < 0) die(argv[1]);
-	if (lseek(image,offset,0) < 0) die("lseek");
-	if (write(image,(char *)&s.st_rdev,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");
-	printf(desc[cmd]);
-	if ((cmd==SDEV) || (cmd==RDEV))
-		printf(" %s\n", find_dev(dev_nr));
-	else
-		printf(" %d\n", dev_nr);
-    }
-    return 0;
+	}
+
+	offset = DEFAULT_OFFSET-cmd*2;
+	if (newoffset >= 0)
+		offset = newoffset;
+
+	if  ((cmd == RDEV) && (argc == 1 || argc > 4)) {
+		if (stat("/",&s) < 0) die("/");
+		printf("%s /\n", find_dev(s.st_dev));
+		exit(0);
+	} else if ((cmd != RDEV) && (argc == 1 || argc > 4))
+		usage();
+
+	if ((cmd == RDEV) || (cmd == SDEV)) {	
+		if (argc == 4) {
+			device = argv[2];
+			offset = atoi(argv[3]);
+		} else {
+			if (argc == 3) {
+				if (isdigit(*argv[2]))
+					offset = atoi(argv[2]);
+				else
+					device = argv[2];
+			}
+		}
+	} else {
+		if (argc>=3)
+			device = argv[2];
+		if (argc==4)
+			offset = atoi(argv[3]);
+	}
+	if (device) {
+		if ((cmd == SDEV) || (cmd == RDEV)) {
+			if (stat(device,&s) < 0)
+				die(device);
+		} else
+			s.st_rdev=atoi(device);
+		if ((image = open(argv[1],O_WRONLY)) < 0) die(argv[1]);
+		if (lseek(image,offset,0) < 0) die("lseek");
+		if (write(image,(char *)&s.st_rdev,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 == SDEV) || (cmd == RDEV))
+			printf(" %s\n", find_dev(dev_nr));
+		else
+			printf(" %d\n", dev_nr);
+	}
+	return 0;
 }
-
-
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index 551b2cbf4e..b531fa90a5 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -81,7 +81,7 @@ main (int argc, char **argv) {
   FILE *map;
   int proFd;
   char *mapFile, *proFile;
-  unsigned long len=0, add0=0, index=0;
+  unsigned long len=0, add0=0, indx=0;
   unsigned int step;
   unsigned int *buf, total, fn_len;
   unsigned long fn_add, next_add;           /* current and next address */
@@ -201,8 +201,8 @@ main (int argc, char **argv) {
     if (*mode == 'A' && total == 0) continue;
     if (*mode!='T' && *mode!='t') break; /* only text is profiled */
 
-    while (index < (next_add-add0)/step)
-      this += buf[index++];
+    while (indx < (next_add-add0)/step)
+      this += buf[indx++];
     total += this;
 
     fn_len = next_add-fn_add;
diff --git a/sys-utils/renice.c b/sys-utils/renice.c
index 6bc83f9920..cd1fa87a07 100644
--- a/sys-utils/renice.c
+++ b/sys-utils/renice.c
@@ -42,6 +42,7 @@
 #include <stdio.h>
 #include <pwd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include "nls.h"
 
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index b04d868b4c..4453de748f 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -57,6 +57,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include "lp.h"
diff --git a/text-utils/Makefile b/text-utils/Makefile
index 3c4343bfbc..2cead324d1 100644
--- a/text-utils/Makefile
+++ b/text-utils/Makefile
@@ -17,6 +17,8 @@ BIN=            more
 
 USRBIN=		col colcrt colrm column hexdump rev
 
+MAYBE=		ul
+
 ifeq "$(HAVE_NCURSES)" "yes"
 USRBIN:=$(USRBIN) ul
 MAN1:=$(MAN1) ul.1
@@ -78,6 +80,6 @@ install install.shadow install.text-utils: all
 
 .PHONY: clean distclean
 clean:
-	-rm -f *.o *~ core $(BIN) $(USRBIN)
+	-rm -f *.o *~ core $(BIN) $(USRBIN) $(MAYBE)
 
 distclean: clean
diff --git a/text-utils/col.c b/text-utils/col.c
index 1f740f4257..2e1552a7a2 100644
--- a/text-utils/col.c
+++ b/text-utils/col.c
@@ -78,6 +78,7 @@ typedef struct char_str {
 	short		c_column;	/* column character is in */
 	CSET		c_set;		/* character set (currently only 2) */
 	wchar_t		c_char;		/* character in question */
+	int		c_width;	/* character width */
 } CHAR;
 
 typedef struct line_str LINE;
@@ -225,6 +226,11 @@ int main(int argc, char **argv)
 				cur_line -= 2;
 				continue;
 			}
+			if (iswspace(ch)) {
+				if (wcwidth(ch) > 0)
+					cur_col += wcwidth(ch);
+				continue;
+			}
 			if (!pass_unknown_seqs)
 				continue;
 		}
@@ -297,6 +303,7 @@ int main(int argc, char **argv)
 		c->c_char = ch;
 		c->c_set = cur_set;
 		c->c_column = cur_col;
+		c->c_width = wcwidth(ch);
 		/*
 		 * If things are put in out of order, they will need sorting
 		 * when it is flushed.
@@ -305,7 +312,8 @@ int main(int argc, char **argv)
 			l->l_needs_sort = 1;
 		else
 			l->l_max_col = cur_col;
-		cur_col++;
+		if (c->c_width > 0)
+			cur_col += c->c_width;
 	}
 	/* goto the last line that had a character on it */
 	for (; l->l_next; l = l->l_next)
@@ -435,8 +443,12 @@ void flush_line(LINE *l)
 		} while (--nchars > 0 && this_col == endc->c_column);
 
 		/* if -b only print last character */
-		if (no_backspaces)
+		if (no_backspaces) {
 			c = endc - 1;
+			if (nchars > 0 &&
+			    this_col + c->c_width > endc->c_column)
+				continue;
+		}
 
 		if (this_col > last_col) {
 			int nspace = this_col - last_col;
@@ -455,7 +467,6 @@ void flush_line(LINE *l)
 				PUTC(' ');
 			last_col = this_col;
 		}
-		last_col++;
 
 		for (;;) {
 			if (c->c_set != last_set) {
@@ -469,10 +480,15 @@ void flush_line(LINE *l)
 				last_set = c->c_set;
 			}
 			PUTC(c->c_char);
+			if ((c+1) < endc) {
+				int i;
+				for (i=0; i < c->c_width; i++)
+					PUTC('\b');
+			}
 			if (++c >= endc)
 				break;
-			PUTC('\b');
 		}
+		last_col += (c-1)->c_width;
 	}
 }
 
diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index 55138f161c..efb176f318 100644
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -39,6 +39,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>		/* for close() */
 #include <string.h>
 #include "nls.h"
@@ -72,13 +73,11 @@ char	suppresul;
 char	printall;
 
 char	*progname;
+void colcrt(FILE *f);
 
 int
-main(int argc, char **argv)
-{
+main(int argc, char **argv) {
 	FILE *f;
-	wint_t c;
-	wchar_t *cp, *dp;
 
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
@@ -113,78 +112,7 @@ main(int argc, char **argv)
 			argc--;
 			argv++;
 		}
-		for (;;) {
-			c = getwc(f);
-			if (c == -1) {
-				pflush(outline);
-				fflush(stdout);
-				break;
-			}
-			switch (c) {
-				case '\n':
-					if (outline >= 265)
-						pflush(62);
-					outline += 2;
-					outcol = 0;
-					continue;
-				case '\016':
-					case '\017':
-					continue;
-				case 033:
-					c = getwc(f);
-					switch (c) {
-						case '9':
-							if (outline >= 266)
-								pflush(62);
-							outline++;
-							continue;
-						case '8':
-							if (outline >= 1)
-								outline--;
-							continue;
-						case '7':
-							outline -= 2;
-							if (outline < 0)
-								outline = 0;
-							continue;
-						default:
-							continue;
-					}
-				case '\b':
-					if (outcol)
-						outcol--;
-					continue;
-				case '\t':
-					outcol += 8;
-					outcol &= ~7;
-					outcol--;
-					c = ' ';
-				default:
-					if (outcol >= 132) {
-						outcol++;
-						continue;
-					}
-					cp = &page[outline][outcol];
-					outcol++;
-					if (c == '_') {
-						if (suppresul)
-							continue;
-						cp += 132;
-						c = '-';
-					}
-					if (*cp == 0) {
-						*cp = c;
-						dp = cp - outcol;
-						for (cp--; cp >= dp && *cp == 0; cp--)
-							*cp = ' ';
-					} else
-						if (plus(c, *cp) || plus(*cp, c))
-							*cp = '+';
-						else if (*cp == ' ' || *cp == 0)
-							*cp = c;
-					continue;
-			}
-		}
+		colcrt(f);
 		if (f != stdin)
 			fclose(f);
 	} while (argc > 0);
@@ -194,6 +122,95 @@ main(int argc, char **argv)
 	return 0;
 }
 
+void
+colcrt(FILE *f) {
+	wint_t c;
+	wchar_t *cp, *dp;
+	int i, w;
+
+	for (;;) {
+		c = getwc(f);
+		if (c == WEOF) {
+			pflush(outline);
+			fflush(stdout);
+			break;
+		}
+		switch (c) {
+		case '\n':
+			if (outline >= 265)
+				pflush(62);
+			outline += 2;
+			outcol = 0;
+			continue;
+		case '\016':
+		case '\017':
+			continue;
+		case 033:
+			c = getwc(f);
+			switch (c) {
+			case '9':
+				if (outline >= 266)
+					pflush(62);
+				outline++;
+				continue;
+			case '8':
+				if (outline >= 1)
+					outline--;
+				continue;
+			case '7':
+				outline -= 2;
+				if (outline < 0)
+					outline = 0;
+				continue;
+			default:
+				continue;
+			}
+		case '\b':
+			if (outcol)
+				outcol--;
+			continue;
+		case '\t':
+			outcol += 8;
+			outcol &= ~7;
+			outcol--;
+			c = ' ';
+		default:
+			w = wcwidth(c);
+			if (outcol + w > 132) {
+				outcol++;
+				continue;
+			}
+			cp = &page[outline][outcol];
+			outcol += w;
+			if (c == '_') {
+				if (suppresul)
+					continue;
+				cp += 132;
+				c = '-';
+			}
+			if (*cp == 0) {
+				/* trick! */
+				for (i=0; i<w; i++)
+					cp[i] = c;
+				dp = cp - (outcol-w);
+				for (cp--; cp >= dp && *cp == 0; cp--)
+					*cp = ' ';
+			} else {
+				if (plus(c, *cp) || plus(*cp, c))
+					*cp = '+';
+				else if (*cp == ' ' || *cp == 0) {
+					for (i=1; i<w; i++)
+						if (cp[i] != ' ' && cp[i] != 0)
+							continue;
+					for (i=0; i<w; i++)
+						cp[i] = c;
+				}
+			}
+			continue;
+		}
+	}
+}
+
 int plus(wchar_t c, wchar_t d)
 {
 
@@ -207,7 +224,7 @@ void pflush(int ol)
 	register int i;
 	register wchar_t *cp;
 	char lastomit;
-	int l;
+	int l, w;
 
 	l = ol;
 	lastomit = 0;
@@ -226,7 +243,13 @@ void pflush(int ol)
 			continue;
 		}
 		lastomit = 0;
-		fputws(cp, stdout);
+		while (*cp) {
+			if ((w = wcwidth(*cp)) > 0) {
+				putwchar(*cp);
+				cp += w;
+			} else
+				cp++;
+		}
 		putwchar('\n');
 	}
 	bcopy(page[ol], page, (267 - ol) * 132 * sizeof(wchar_t));
diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index 0297ccb538..1b90fe4ab5 100644
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -54,6 +54,8 @@ main(int argc, char **argv)
 {
 	register int ct, first, last;
 	register wint_t c;
+	int i, w;
+	int padding;
 
 	setlocale(LC_ALL, "");
 
@@ -71,11 +73,15 @@ loop1:
 	if (feof(stdin))
 		goto fin;
 	if (c == '\t')
-		ct = (ct + 8) & ~7;
+		w = ((ct + 8) & ~7) - ct;
 	else if (c == '\b')
-		ct = ct ? ct - 1 : 0;
-	else
-		ct++;
+		w = (ct ? ct - 1 : 0) - ct;
+	else {
+		w = wcwidth(c);
+		if (w < 0)
+			w = 0;
+	}
+	ct += w;
 	if (c == '\n') {
 		putwc(c, stdout);
 		goto start;
@@ -84,6 +90,8 @@ loop1:
 		putwc(c, stdout);
 		goto loop1;
 	}
+	for (i = ct-w+1; i < first; i++)
+		putwc(' ', stdout);
 
 /* Loop getting rid of characters */
 	while (!last || ct < last) {
@@ -98,18 +106,31 @@ loop1:
 			ct = (ct + 8) & ~7;
 		else if (c == '\b')
 			ct = ct ? ct - 1 : 0;
-		else
-			ct++;
+		else {
+			w = wcwidth(c);
+			if (w < 0)
+				w = 0;
+			ct += w;
+		}
 	}
 
+	padding = 0;
+
 /* Output last of the line */
 	for (;;) {
 		c = getwc(stdin);
 		if (feof(stdin))
 			break;
-		putwc(c, stdout);
-		if (c == '\n')
+		if (c == '\n') {
+			putwc(c, stdout);
 			goto start;
+		}
+		if (padding == 0 && last < ct) {
+			for (i = last; i <ct; i++)
+				putwc(' ', stdout);
+			padding = 1;
+		}
+		putwc(c, stdout);
 	}
 fin:
 	fflush(stdout);
diff --git a/text-utils/column.c b/text-utils/column.c
index cfea89fb7b..79ebb115b7 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -302,7 +302,7 @@ input(fp)
 			continue;
 		}
 		*p = '\0';
-		len = p - buf;
+		len = wcs_width(buf);	/* len = p - buf; */
 		if (maxlength < len)
 			maxlength = len;
 		if (entries == maxentry) {
diff --git a/text-utils/display.c b/text-utils/display.c
index 481d2b1aeb..1455088138 100644
--- a/text-utils/display.c
+++ b/text-utils/display.c
@@ -209,7 +209,6 @@ static char **_argv;
 static u_char *
 get(void)
 {
-	extern enum _vflag vflag;
 	extern int length;
 	static int ateof = 1;
 	static u_char *curp, *savp;
@@ -341,19 +340,16 @@ doskip(char *fname, int statok)
 }
 
 char *
-emalloc(int size)
-{
+emalloc(int sz) {
 	char *p;
 
-	if (!(p = malloc((u_int)size)))
+	if (!(p = malloc((u_int)sz)))
 		nomem();
-	bzero(p, size);
+	bzero(p, sz);
 	return(p);
 }
 
-void nomem()
-{
-
+void nomem() {
 	(void)fprintf(stderr, "hexdump: %s.\n", strerror(errno));
 	exit(1);
 }
diff --git a/text-utils/more.c b/text-utils/more.c
index b7c9d76a21..79dc626dda 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -62,7 +62,7 @@
 #undef _REGEX_RE_COMP
 
 /* #define MOREHELPFILE "/usr/lib/more.help" */
-#define VI		"/usr/bin/vi"
+#define VI		"vi"	/* found on the user's path */
 
 #define Fopen(s,m)	(Currline = 0,file_pos=0,fopen(s,m))
 #define Ftell(f)	file_pos
@@ -83,7 +83,7 @@ void error (char *mess);
 void do_shell (char *filename);
 int  colon (char *filename, int cmd, int nlines);
 int  expand (char **outbuf, char *inbuf);
-void argscan(char *s);
+void argscan(char *s,char *argv0);
 void rdline (register FILE *f);
 void copy_file(register FILE *f);
 void search(char buf[], FILE *file, register int n);
@@ -142,9 +142,8 @@ char		**fnames;	/* The list of file names */
 int		nfiles;		/* Number of files left to process */
 char		*shell;		/* The name of the shell to use */
 int		shellp;		/* A previous shell command exists */
-char		ch;
 sigjmp_buf	restore;
-char		Line[LINSIZ];	/* Line buffer */
+char		Line[LINSIZ+2];	/* Line buffer */
 int		Lpp = 24;	/* lines per page */
 char		*Clear;		/* clear screen */
 char		*eraseln;	/* erase line */
@@ -256,6 +255,14 @@ idummy(int *kk) {}
 static void
 Fdummy(FILE **ff) {}
 
+static void
+usage(char *s) {
+	char *p = strrchr(s, '/');
+	fprintf(stderr,
+		_("usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"),
+		p ? p + 1 : s);
+}
+
 int main(int argc, char **argv) {
     FILE	*f;
     char	*s;
@@ -286,10 +293,10 @@ int main(int argc, char **argv) {
     nscroll = Lpp/2 - 1;
     if (nscroll <= 0)
 	nscroll = 1;
-    if((s = getenv("MORE")) != NULL) argscan(s);
+    if((s = getenv("MORE")) != NULL) argscan(s,argv[0]);
     while (--nfiles > 0) {
 	if ((ch = (*++fnames)[0]) == '-') {
-	    argscan(*fnames+1);
+	    argscan(*fnames+1,argv[0]);
 	}
 	else if (ch == '+') {
 	    s = *fnames;
@@ -326,10 +333,7 @@ int main(int argc, char **argv) {
     if (nfiles > 1)
 	prnames++;
     if (!no_intty && nfiles == 0) {
-	p = strrchr(argv[0], '/');
-	fprintf(stderr,
-		_("usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"),
-		p ? p + 1 : argv[0]);
+	usage(argv[0]);
 	exit(1);
     }
     else
@@ -439,7 +443,7 @@ int main(int argc, char **argv) {
     exit(0);
 }
 
-void argscan(char *s) {
+void argscan(char *s, char *argv0) {
 	int seen_num = 0;
 
 	while (*s != '\0') {
@@ -475,6 +479,16 @@ void argscan(char *s) {
 		  case 'u':
 			ul_opt = 0;
 			break;
+		  case '-': case ' ': case '\t':
+			break;
+		  default:
+			fputs(argv0,stderr);
+			fputs(": unknown option \"-",stderr);
+			putc(*s,stderr);
+			fputs("\"\n",stderr);
+			usage(argv0);
+			exit(1);
+			break;
 		}
 		s++;
 	}
@@ -645,8 +659,9 @@ void onquit(int dummy) {
 	    Pause++;
     }
     else if (!dum_opt && notell) {
-	errwrite(_("[Use q or Q to quit]"));
-	promptlen += 20;
+	char *s = _("[Use q or Q to quit]");
+	errwrite(s);
+	promptlen += strlen(s);
 	notell = 0;
     }
     signal(SIGQUIT, onquit);
@@ -705,11 +720,10 @@ void copy_file(register FILE *f) {
 
 /* Simplified printf function */
 
-int xprintf (char *fmt, ...)
-{
+int xprintf (char *fmt, ...) {
 	va_list ap;
-	register char ch;
-	register int ccount;
+	char ch;
+	int ccount;
 
 	ccount = 0;
 	va_start(ap, fmt);
@@ -801,8 +815,8 @@ static int tailequ (char *path, register char *string)
 	register char *tail;
 
 	tail = path + strlen(path);
-	while (tail >= path)
-		if (*(--tail) == '/')
+	while (--tail >= path)
+		if (*tail == '/')
 			break;
 	++tail;
 	while (*tail++ == *string++)
@@ -818,19 +832,19 @@ static void prompt (char *filename)
     else if (promptlen > 0)
 	kill_line ();
     if (!hard) {
-	promptlen = 8;
+	promptlen = 0;
 	if (Senter && Sexit) {
 	    my_putstring (Senter);
 	    promptlen += (2 * soglitch);
 	}
 	if (clreol)
 	    cleareol ();
-	pr(_("--More--"));
+	promptlen += pr(_("--More--"));
 	if (filename != NULL) {
 	    promptlen += xprintf (_("(Next file: %s)"), filename);
-	}
-	else if (!no_intty) {
-	    promptlen += xprintf ("(%d%%)", (int)((file_pos * 100) / file_size));
+	} else if (!no_intty) {
+	    promptlen += xprintf ("(%d%%)",
+				  (int)((file_pos * 100) / file_size));
 	}
 	if (dum_opt) {
 	    promptlen += pr(_("[Press space to continue, 'q' to quit.]"));
@@ -879,6 +893,20 @@ int get_line(register FILE *f, int *length)
 	    break;
 	}
 	*p++ = c;
+#if 0
+	if (c == '\033') {      /* ESC */
+		c = Getc(f);
+		while (c > ' ' && c < '0' && p < &Line[LINSIZ - 1]) {
+			*p++ = c;
+			c = Getc(f);
+		}
+		if (c >= '0' && c < '\177' && p < &Line[LINSIZ - 1]) {
+			*p++ = c;
+			c = Getc(f);
+			continue;
+		}
+	}
+#endif
 	if (c == '\t') {
 	    if (!hardtabs || (column < promptlen && !hard)) {
 		if (hardtabs && eraseln && !dumb) {
@@ -917,9 +945,31 @@ int get_line(register FILE *f, int *length)
 	    *length = p - Line;
 	    return (column);
 	}
+#if 0
+	else {
+		char ch[2]; /* for mblen() */
+
+		ch[0] = c;
+		ch[1] = '\0';
+		if (mblen(ch, 1) <= 0) {    /* multibyte, maybe 2 columns */
+			if (column == Mcol-1 && fold_opt) {
+				p--;
+				Ungetc(c, f);
+				break;
+			}
+			*p++ = Getc(f);
+			column += 2;
+		} else if (c & 0x80) {      /* maybe SJIS KANA, or utf-8 ? */
+			column++;
+		} else if (isprint(c))
+			column++;
+	}
+#else
 	else if (isprint(c))
-	    column++;
-	if (column >= Mcol && fold_opt) break;
+		column++;
+#endif
+	if (column >= Mcol && fold_opt)
+		break;
 	c = Getc (f);
     }
     if (column >= Mcol && Mcol > 0) {
@@ -1255,7 +1305,26 @@ int command (char *filename, register FILE *f)
 	    break;
 	case '?':
 	case 'h':
-	    if ((helpf = fopen (MOREHELPFILE, "r")) == NULL)
+	    helpf = NULL;
+	    {
+		    char *lang;
+		    char hlpfile[sizeof(MOREHELPFILE)+4];
+
+		    lang = getenv("LANGUAGE");
+		    if (!lang || *lang == '\0')
+			    lang = setlocale(LC_MESSAGES, "");
+		    if (!lang || *lang == '\0')
+			    lang = getenv("LANG");
+		    if (lang && strlen(lang) > 1) {
+			    strcpy(hlpfile, MOREHELPFILE);
+			    strcat(hlpfile, ".");
+			    strncat(hlpfile, lang, 2);
+			    helpf = fopen (hlpfile, "r");
+		    }
+	    }
+	    if (helpf == NULL)
+		    helpf = fopen (MOREHELPFILE, "r");
+	    if (helpf == NULL)
 		error (_("Can't open help file"));
 	    if (noscroll) doclear ();
 	    copy_file (helpf);
@@ -1264,13 +1333,22 @@ int command (char *filename, register FILE *f)
 	    break;
 	case 'v':	/* This case should go right before default */
 	    if (!no_intty) {
-		kill_line ();
-		cmdbuf[0] = '+';
-		scanstr (Currline - dlines < 0 ? 0
-				: Currline - (dlines + 1) / 2, &cmdbuf[1]);
-		pr ("vi "); pr (cmdbuf); putchar (' '); pr (fnames[fnum]);
-		execute (filename, VI, "vi", cmdbuf, fnames[fnum], 0);
-		break;
+		    char *editor;
+
+		    editor = getenv("VISUAL");
+		    if (editor == NULL || *editor == '\0')
+			    editor = getenv("EDITOR");
+		    if (editor == NULL || *editor == '\0')
+			    editor = VI;
+
+		    kill_line ();
+		    cmdbuf[0] = '+';
+		    scanstr (Currline - dlines <= 0 ? 1
+			     : Currline - (dlines + 1) / 2, &cmdbuf[1]);
+		    pr (editor); putchar (' ');
+		    pr (cmdbuf); putchar (' '); pr (fnames[fnum]);
+		    execute (filename, editor, editor, cmdbuf, fnames[fnum], 0);
+		    break;
 	    }
 	default:
 	    if (dum_opt) {
@@ -1297,7 +1375,7 @@ endsw:
     return (retval);
 }
 
-char ch;
+static char ch;
 
 /*
  * Execute a colon-prefixed command.
@@ -1305,8 +1383,7 @@ char ch;
  * more of the file to be printed.
  */
 
-int colon (char *filename, int cmd, int nlines)
-{
+int colon (char *filename, int cmd, int nlines) {
 	if (cmd == 0)
 		ch = readch ();
 	else
@@ -1540,7 +1617,7 @@ void execute (char * filename, char * cmd, ...)
 	    }
 	    va_end(argp);
 	
-	    execv (cmd, args);
+	    execvp (cmd, args);
 	    errwrite(_("exec failed\n"));
 	    exit (1);
 	}
@@ -1678,7 +1755,7 @@ retry:
 	    bad_so = my_tgetflag ("xs","xhp");
 	    eraseln = my_tgetstr("ce","el");
 	    Clear = my_tgetstr("cl","clear");
-	    Senter = my_tgetstr("co","smso");
+	    Senter = my_tgetstr("so","smso");
 	    Sexit = my_tgetstr("se","rmso");
 	    if ((soglitch = my_tgetnum("sg","xmc")) < 0)
 		soglitch = 0;
@@ -1738,18 +1815,17 @@ retry:
     }
 }
 
-int readch ()
-{
-	char ch;
+int readch () {
+	char c;
 
 	errno = 0;
-	if (read (2, &ch, 1) <= 0) {
+	if (read (2, &c, 1) <= 0) {
 		if (errno != EINTR)
 			end_it(0);
 		else
-			ch = otty.c_cc[VKILL];
+			c = otty.c_cc[VKILL];
 	}
-	return (ch);
+	return (c);
 }
 
 static char *BS = "\b";
@@ -1761,28 +1837,27 @@ static char *CARAT = "^";
     else \
 	errwrite(BS);
 
-void ttyin (char buf[], register int nmax, char pchar)
-{
-    register char *sptr;
-    register char ch;
-    register int slash = 0;
+void ttyin (char buf[], register int nmax, char pchar) {
+    char *sp;
+    char c;
+    int slash = 0;
     int	maxlen;
     char cbuf;
 
-    sptr = buf;
+    sp = buf;
     maxlen = 0;
-    while (sptr - buf < nmax) {
+    while (sp - buf < nmax) {
 	if (promptlen > maxlen) maxlen = promptlen;
-	ch = readch ();
-	if (ch == '\\') {
+	c = readch ();
+	if (c == '\\') {
 	    slash++;
 	}
-	else if (((cc_t) ch == otty.c_cc[VERASE]) && !slash) {
-	    if (sptr > buf) {
+	else if (((cc_t) c == otty.c_cc[VERASE]) && !slash) {
+	    if (sp > buf) {
 		--promptlen;
 		ERASEONECHAR
-		--sptr;
-		if ((*sptr < ' ' && *sptr != '\n') || *sptr == RUBOUT) {
+		--sp;
+		if ((*sp < ' ' && *sp != '\n') || *sp == RUBOUT) {
 		    --promptlen;
 		    ERASEONECHAR
 		}
@@ -1793,9 +1868,9 @@ void ttyin (char buf[], register int nmax, char pchar)
 		siglongjmp (restore, 1);
 	    }
 	}
-	else if (((cc_t) ch == otty.c_cc[VKILL]) && !slash) {
+	else if (((cc_t) c == otty.c_cc[VKILL]) && !slash) {
 	    if (hard) {
-		show (ch);
+		show (c);
 		putchar ('\n');
 		putchar (pchar);
 	    }
@@ -1809,43 +1884,42 @@ void ttyin (char buf[], register int nmax, char pchar)
 			errwrite(BSB);
 		promptlen = 1;
 	    }
-	    sptr = buf;
+	    sp = buf;
 	    fflush (stdout);
 	    continue;
 	}
-	if (slash && ((cc_t) ch == otty.c_cc[VKILL]
-		   || (cc_t) ch == otty.c_cc[VERASE])) {
+	if (slash && ((cc_t) c == otty.c_cc[VKILL]
+		   || (cc_t) c == otty.c_cc[VERASE])) {
 	    ERASEONECHAR
-	    --sptr;
+	    --sp;
 	}
-	if (ch != '\\')
+	if (c != '\\')
 	    slash = 0;
-	*sptr++ = ch;
-	if ((ch < ' ' && ch != '\n' && ch != ESC) || ch == RUBOUT) {
-	    ch += ch == RUBOUT ? -0100 : 0100;
+	*sp++ = c;
+	if ((c < ' ' && c != '\n' && c != ESC) || c == RUBOUT) {
+	    c += (c == RUBOUT) ? -0100 : 0100;
 	    errwrite(CARAT);
 	    promptlen++;
 	}
-	cbuf = ch;
-	if (ch != '\n' && ch != ESC) {
+	cbuf = c;
+	if (c != '\n' && c != ESC) {
 	    errwrite1(&cbuf);
 	    promptlen++;
 	}
 	else
 	    break;
     }
-    *--sptr = '\0';
+    *--sp = '\0';
     if (!eraseln) promptlen = maxlen;
-    if (sptr - buf >= nmax - 1)
+    if (sp - buf >= nmax - 1)
 	error (_("Line too long"));
 }
 
 /* return: 0 - unchanged, 1 - changed, -1 - overflow (unchanged) */
-int expand (char **outbuf, char *inbuf)
-{
-    char *instr;
+int expand (char **outbuf, char *inbuf) {
+    char *inpstr;
     char *outstr;
-    char ch;
+    char c;
     char *temp;
     int changed = 0;
     int tempsz, xtra, offset;
@@ -1857,9 +1931,9 @@ int expand (char **outbuf, char *inbuf)
 	    error (_("Out of memory"));
 	    return -1;
     }
-    instr = inbuf;
+    inpstr = inbuf;
     outstr = temp;
-    while ((ch = *instr++) != '\0'){
+    while ((c = *inpstr++) != '\0'){
 	offset = outstr-temp;
 	if (tempsz-offset-1 < xtra) {
 		tempsz += 200 + xtra;
@@ -1870,14 +1944,14 @@ int expand (char **outbuf, char *inbuf)
 		}
 		outstr = temp + offset;
 	}
-	switch (ch) {
+	switch (c) {
 	case '%':
 	    if (!no_intty) {
 		strcpy (outstr, fnames[fnum]);
 		outstr += strlen (fnames[fnum]);
 		changed++;
 	    } else
-		*outstr++ = ch;
+		*outstr++ = c;
 	    break;
 	case '!':
 	    if (!shellp)
@@ -1887,12 +1961,12 @@ int expand (char **outbuf, char *inbuf)
 	    changed++;
 	    break;
 	case '\\':
-	    if (*instr == '%' || *instr == '!') {
-		*outstr++ = *instr++;
+	    if (*inpstr == '%' || *inpstr == '!') {
+		*outstr++ = *inpstr++;
 		break;
 	    }
 	default:
-	    *outstr++ = ch;
+	    *outstr++ = c;
 	}
     }
     *outstr++ = '\0';
@@ -1900,16 +1974,15 @@ int expand (char **outbuf, char *inbuf)
     return (changed);
 }
 
-void show (register char ch)
-{
+void show (char c) {
     char cbuf;
 
-    if ((ch < ' ' && ch != '\n' && ch != ESC) || ch == RUBOUT) {
-	ch += ch == RUBOUT ? -0100 : 0100;
+    if ((c < ' ' && c != '\n' && c != ESC) || c == RUBOUT) {
+	c += (c == RUBOUT) ? -0100 : 0100;
 	errwrite(CARAT);
 	promptlen++;
     }
-    cbuf = ch;
+    cbuf = c;
     errwrite1(&cbuf);
     promptlen++;
 }
@@ -1944,20 +2017,20 @@ void error (char *mess)
 }
 
 
-void set_tty ()
-{
+void set_tty () {
 	otty.c_lflag &= ~(ICANON|ECHO);
 	otty.c_cc[VMIN] = 1;	/* read at least 1 char */
 	otty.c_cc[VTIME] = 0;	/* no timeout */
 	stty(fileno(stderr), &otty);
 }
 
-static int ourputch(int ch) {
-    return putc(ch, stdout);
+static int
+ourputch(int c) {
+    return putc(c, stdout);
 }
 
-void reset_tty ()
-{
+void
+reset_tty () {
     if (no_tty)
 	return;
     if (pstate) {
diff --git a/text-utils/more.help.ja b/text-utils/more.help.ja
new file mode 100644
index 0000000000..3654e89d38
--- /dev/null
+++ b/text-utils/more.help.ja
@@ -0,0 +1,24 @@
+
+���ޥ�ɤ�¿�������˿���(k)���դ��뤳�Ȥ��Ǥ��ޤ���[] ����ͤ��ǥե���ȤǤ���
+����(*)�ϥǥե���Ȥ��ѹ�����뤳�Ȥ򼨤��ޤ���
+-------------------------------------------------------------------------------
+<space>			���� k �Ԥ�ɽ������ [���ߤβ��̥�����]
+z			���� k �Ԥ�ɽ������ [���ߤβ��̥�����]*
+<return>		���� k �Ԥ�ɽ������ [1]*
+d or ctrl-D		k �ԥ��������뤹�� [���ߤΥ���������Կ� ����ͤ� 11]*
+q or Q or <interrupt>	more ��λ����
+s			���� k �Ԥ��ɤ����Ф� [1]
+f			���� k ���̤��ɤ����Ф� [1]
+b or ctrl-B		k ������� [1]
+'			����θ����򳫻Ϥ������֤����
+=			���ߤι��ֹ��ɽ������
+/<����ɽ��>		����ɽ���򸡺�����k ���ܤΰ��֤����� [1]
+n			����θ�����Ƽ¹Ԥ���k ���ܤΰ��֤����� [1]
+!<cmd> or :!<cmd>	���֥������ <cmd> ��¹Ԥ���
+v			vi ��ư����
+ctrl-L			���̤�����褹��
+:n			���� k ���ܤΥե������ɽ������ [1]
+:p			���� k ���ܤΥե������ɽ������ [1]
+:f			���ߤΥե�����̾�ȹ��ֹ��ɽ������
+.			ľ���Υ��ޥ�ɤ򷫤��֤�
+-------------------------------------------------------------------------------
diff --git a/text-utils/ul.c b/text-utils/ul.c
index 419efc938a..570c4f47dd 100644
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -71,9 +71,10 @@ void initbuf(void);
 void fwd(void);
 void reverse(void);
 void initinfo(void);
-void outc(wint_t c);
+void outc(wint_t c, int width);
 void setmode(int newmode);
-void setcol(int newcol);
+static void setcol(int newcol);
+static void needcol(int col);
 
 #define	IESC	'\033'
 #define	SO	'\016'
@@ -98,6 +99,7 @@ char	*CURS_UP, *CURS_RIGHT, *CURS_LEFT,
 struct	CHAR	{
 	char	c_mode;
 	wchar_t	c_char;
+	int	c_width;
 } ;
 
 struct	CHAR	*obuf;
@@ -180,6 +182,7 @@ int main(int argc, char **argv)
 void filter(FILE *f)
 {
 	wint_t c;
+	int i, w;
 
 	while ((c = getwc(f)) != WEOF) switch(c) {
 
@@ -245,10 +248,18 @@ void filter(FILE *f)
 		continue;
 
 	case '_':
-		if (obuf[col].c_char)
-			obuf[col].c_mode |= UNDERL | mode;
-		else
-			obuf[col].c_char = '_';
+		if (obuf[col].c_char || obuf[col].c_width < 0) {
+			while(col > 0 && obuf[col].c_width < 0)
+				col--;
+			w = obuf[col].c_width;
+			for (i = 0; i < w; i++)
+				obuf[col++].c_mode |= UNDERL | mode;
+			setcol(col);
+			continue;
+		}
+		obuf[col].c_char = '_';
+		obuf[col].c_width = 1;
+		/* fall through */
 	case ' ':
 		setcol(col + 1);
 		continue;
@@ -265,17 +276,31 @@ void filter(FILE *f)
 	default:
 		if (!iswprint(c))	/* non printing */
 			continue;
+		w = wcwidth(c);
+		needcol(col + w);
 		if (obuf[col].c_char == '\0') {
 			obuf[col].c_char = c;
-			obuf[col].c_mode = mode;
+			for (i = 0; i < w; i++)
+				obuf[col+i].c_mode = mode;
+			obuf[col].c_width = w;
+			for (i = 1; i < w; i++)
+				obuf[col+i].c_width = -1;
 		} else if (obuf[col].c_char == '_') {
 			obuf[col].c_char = c;
-			obuf[col].c_mode |= UNDERL|mode;
-		} else if (obuf[col].c_char == c)
-			obuf[col].c_mode |= BOLD|mode;
-		else
-			obuf[col].c_mode = mode;
-		setcol(col + 1);
+			for (i = 0; i < w; i++)
+				obuf[col+i].c_mode |= UNDERL|mode;
+			obuf[col].c_width = w;
+			for (i = 1; i < w; i++)
+				obuf[col+i].c_width = -1;
+		} else if (obuf[col].c_char == c) {
+			for (i = 0; i < w; i++)
+				obuf[col+i].c_mode |= BOLD|mode;
+		} else {
+			w = obuf[col].c_width;
+			for (i = 0; i < w; i++)
+				obuf[col+i].c_mode = mode;
+		}
+		setcol(col + w);
 		continue;
 	}
 	if (maxcol)
@@ -299,9 +324,11 @@ void flushln(void)
 			if (upln) {
 				PRINT(CURS_RIGHT);
 			} else
-				outc(' ');
+				outc(' ', 1);
 		} else
-			outc(obuf[i].c_char);
+			outc(obuf[i].c_char, obuf[i].c_width);
+		if (obuf[i].c_width > 1)
+			i += obuf[i].c_width -1;
 	}
 	if (lastmode != NORMAL) {
 		setmode(0);
@@ -344,6 +371,8 @@ void overstrike(void)
 			break;
 		case BOLD:
 			*cp++ = obuf[i].c_char;
+			if (obuf[i].c_width > 1)
+				i += obuf[i].c_width - 1;
 			hadbold=1;
 			break;
 		}
@@ -473,12 +502,16 @@ void initinfo(void)
 
 static int curmode = 0;
 
-void outc(wint_t c)
-{
+void
+outc(wint_t c, int width) {
+	int i;
+
 	putwchar(c);
 	if (must_use_uc && (curmode&UNDERL)) {
-		PRINT(CURS_LEFT);
-		PRINT(UNDER_CHAR);
+		for (i=0; i<width; i++)
+			PRINT(CURS_LEFT);
+		for (i=0; i<width; i++)
+			PRINT(UNDER_CHAR);
 	}
 }
 
@@ -533,39 +566,40 @@ void setmode(int newmode)
 	curmode = newmode;
 }
 
-
-
-
-void setcol(int newcol)
-{
+static void
+setcol(int newcol) {
 	col = newcol;
 
 	if (col < 0)
 		col = 0;
-	else if (col > maxcol) {
-		maxcol = col;
-
-		/* If col >= obuflen, expand obuf until obuflen > col. */
-		while (col >= obuflen) {
-			/* Paranoid check for obuflen == INT_MAX. */
-			if (obuflen == INT_MAX) {
-				fprintf(stderr,
-					_("Input line too long.\n"));
-				exit(1);
-			}
+	else if (col > maxcol)
+		needcol(col);
+}
 
-			/* Similar paranoia: double only up to INT_MAX. */
-			obuflen = ((INT_MAX / 2) < obuflen)
-				? INT_MAX
-				: obuflen * 2;
-
-			/* Now we can try to expand obuf. */
-			obuf = realloc(obuf, sizeof(struct CHAR) * obuflen);
-			if (obuf == NULL) {
-				fprintf(stderr,
-					_("Out of memory when growing buffer.\n"));
-				exit(1);
-			}
+static void
+needcol(int col) {
+	maxcol = col;
+
+	/* If col >= obuflen, expand obuf until obuflen > col. */
+	while (col >= obuflen) {
+		/* Paranoid check for obuflen == INT_MAX. */
+		if (obuflen == INT_MAX) {
+			fprintf(stderr,
+				_("Input line too long.\n"));
+			exit(1);
+		}
+
+		/* Similar paranoia: double only up to INT_MAX. */
+		obuflen = ((INT_MAX / 2) < obuflen)
+			? INT_MAX
+			: obuflen * 2;
+
+		/* Now we can try to expand obuf. */
+		obuf = realloc(obuf, sizeof(struct CHAR) * obuflen);
+		if (obuf == NULL) {
+			fprintf(stderr,
+				_("Out of memory when growing buffer.\n"));
+			exit(1);
 		}
 	}
 }