Imported from util-linux-2.11f tarball.

86 files changed, 11312 insertions, 10834 deletions

diff --git a/HISTORY b/HISTORY
index 92d6b89ec..aa7b46c5e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,85 @@
+util-linux 2.11f
+
+* Czech messages (Jiøí Pavlovský)
+* fdisk: fix for "reorder" expert command
+  (use of sfdisk afterwards is still recommended)
+* mount: minor fixes
+
+util-linux 2.11e
+
+* Danish messages (Claus Hindsgaul)
+* Brazilian Portuguese messages (Rodrigo Stulzer Lopes)
+* agetty: give tty mode 0600 instead of 0622
+* cal: improved manpage
+* cfdisk: add user-friendliness in case of empty disk (Matthew Wilcox)
+* dmesg: improved manpage
+* fdisk: SuperH fix (ISHIKAWA Mutsumi)
+* hwclock: accept alpha options in both upper and lower case
+  (so as to make the man page correct)
+* hwclock: add option --noadjtime (Henrique M Holschuh)
+* login: child must have controlling tty (Michal Moskal)
+* more: don't seek unseekable input (David Whedon)
+* mount: upon request by Richard Gooch: if the mount point is specified
+  as symlink, put symlink, not actual mount point in mtab.
+  (This avoids the long and ugly devfs names, but may break things.
+  Please complain in case of problems.)
+* mount: with mount -a -t nfs:
+  if we used fallback to nfs v3, don't do so for subsequent mounts
+* mount: add heuristics for ext3 (Andrew Morton)
+* mount: added quota info to mount.8
+* mount: allow comma-separated type lists, also in fstab
+* raw: small fix for ppc
+
+util-linux 2.11d
+
+* fdisk: fix for OSF (Will Woods)
+* chsh: compilation fix (Ronald Wahl)
+
+util-linux 2.11c
+
+* Czech messages (Jiøí Pavlovský)
+* German messages (Elrond)
+* Makefile/MCONFIG improvements (Peter Breitenlohner)
+* fdisk: added a few partition types
+* fdisk: correct partition numbering for sgi partitions (Nathan Scott)
+* fdisk: make it compile on hppa by arbitrarily treating hppa like powerpc
+  (Matt Taggart)
+* fsck.minix: improved localisation (Elrond)
+* getopt: updated to version 1.1.2 (Frodo Looijaard)
+* hwclock: fixes for IA64 (Thorsten Kukuk)
+* hwclock: use /dev/vc/1 when devfs is used (Thomas Koeller)
+* hwclock: more devfs support (e.g. /dev/misc/rtc)
+* ipcs: add spaces in output (DeWitt Clinton),
+  correct some error messages (Bobby de Vos)
+* login: fix TIOCNOTTY (Andreas Haumer, Adam J. Richter)
+* login: add btmp logging of unsuccessful login attempts (Erik Troan)
+* login: avoid a SIGHUP race with PAM enabled (Peter 'Luna' Runestig)
+* login: copy the static result returned by gethostbyname to avoid
+  corruption by pam_authenticate via pam_ldap (Andreas Damm)
+* login: removed the REDHAT_IGNORED_MAILSIZE hack
+* login: unconditionally do vhangup
+* login: zero PAM_USER when no username was given (Arkadiusz Miskiewicz)
+* look: dictionary now under /usr/share (Erik Troan)
+* mount: add sanitize_env() (Solar Designer)
+* mount: another heuristic for vfat (Michal Svec)
+* mount: xfs magic has only one endianness (Nathan Scott)
+* mount: return failure when tcp used and portmap returns 0 (H. J. Lu)
+* rdev: allow unlimited recursion to find the long devfs names
+  Also, allow major,minor pair the specify device (request by Russell Coker)
+* readprofile: array bound check (Andrew Morton)
+* script: transmit window changes to child (Joey Hess)
+* sfdisk: endian fix for ppc (Gregory Geiselhart)
+* sfdisk: new feature: sign is offset from default (Byron Stanoszek)
+* sfdisk: add some default devices to list (Luca Montecchiani)
+* sfdisk: no partition table on ide tape
+* shutdown: close files, unblock signals (Richard Gooch)
+* simpleinit: block signals in handlers; add no_reboot option (Richard Gooch)
+* swapdev: deleted, it was last used with Linux 0.12.
+* umount: mips does support umount2 (Maciej W. Rozycki)
+* umount: add sanitize_env() (Solar Designer)
+* umount: fix exit status
+* wall: do not forget 80th character (Thorsten Kukuk)
+
 util-linux 2.11b:
 
 * Danish messages (Claus Hindsgaul)
diff --git a/MAINTAINER b/MAINTAINER
index 7fdaafc12..62bbe82eb 100644
--- a/MAINTAINER
+++ b/MAINTAINER
@@ -1,4 +1,5 @@
 Maintainer: Andries Brouwer <aeb@cwi.nl>
 Maintainer address: util-linux@math.uio.no
 
+Maintainer of getopt: Frodo Looijaard <frodol@dds.nl>
 Maintainer of simpleinit: Richard Gooch <rgooch@atnf.csiro.au>
diff --git a/MCONFIG b/MCONFIG
index e53915ab5..51f3b9871 100644
--- a/MCONFIG
+++ b/MCONFIG
@@ -52,6 +52,11 @@ HAVE_SYSVINIT=yes
 # mesg, and wall from that package.)
 HAVE_SYSVINIT_UTILS=yes
 
+# If HAVE_WRITE is set to "yes", then write will not be built or
+# installed from the misc-utils subdirectory.
+# (There is a network aware write in netwrite from NetKit 0.16 or later.)
+HAVE_WRITE=no
+
 # If HAVE_GETTY is set to "yes", then agetty will not be built or
 # installed from the login-utils subdirectory.  Note that agetty can
 # co-exist with other gettys, so this option should never be used.
@@ -83,6 +88,9 @@ HAVE_SLN=no
 # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
 HAVE_FDUTILS=no
 
+# This enables building of raw
+# ADD_RAW=yes
+
 # Different optimizations for different cpus.
 ifeq "$(ARCH)" "intel"
   ifeq "$(CPU)" "i386"
@@ -114,37 +122,55 @@ ERR_O=$(LIB)/err.o
 #   (no extra definition required).
 LIBSLANG=-lslang
 
-DEVDIR=		$(DESTDIR)/dev
-ETCDIR=		$(DESTDIR)/etc
-SBINDIR=	$(DESTDIR)/sbin
-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
-MANDIR=		$(DESTDIR)/usr/man
+#
+# Paths used for compilation (not all are actually used, see CFLAGS below)
+#
+DEV_DIR=	/dev
+ETC_DIR=	/etc
+SBIN_DIR=	/sbin
+USRSBIN_DIR=	/usr/sbin
+USRLIB_DIR=	/usr/lib
+USRBIN_DIR=	/usr/bin
+USRGAMES_DIR=	/usr/games
+USRSHAREMISC_DIR=/usr/share/misc
+LOCALE_DIR=	/usr/share/locale
+BIN_DIR=        /bin
+VAR_PATH=	/var
+LOG_DIR=	/var/log
+MAN_DIR=	/usr/share/man
+INFO_DIR=	/usr/share/info
+
+# Directory for help file for more.  Used to be /usr/lib.
+MOREHELP_DIR=	$(USRSHAREMISC_DIR)
+
+#
+# Paths used for install
+#
+DEVDIR=		$(DESTDIR)$(DEV_DIR)
+ETCDIR=		$(DESTDIR)$(ETC_DIR)
+SBINDIR=	$(DESTDIR)$(SBIN_DIR)
+USRSBINDIR=	$(DESTDIR)$(USRSBIN_DIR)
+USRLIBDIR=      $(DESTDIR)$(USRLIB_DIR)
+USRBINDIR=      $(DESTDIR)$(USRBIN_DIR)
+USRGAMESDIR=    $(DESTDIR)$(USRGAMES_DIR)
+USRSHAREMISCDIR=$(DESTDIR)$(USRSHAREMISC_DIR)
+LOCALEDIR=      $(DESTDIR)$(LOCALE_DIR)
+BINDIR=         $(DESTDIR)$(BIN_DIR)
+VARPATH=	$(DESTDIR)$(VAR_PATH)
+LOGDIR=		$(DESTDIR)$(LOG_DIR)
+MANDIR=		$(DESTDIR)$(MAN_DIR)
 MAN1DIR=	$(MANDIR)/man1
 MAN3DIR=	$(MANDIR)/man3
 MAN5DIR=	$(MANDIR)/man5
 MAN6DIR=	$(MANDIR)/man6
 MAN8DIR=	$(MANDIR)/man8
-INFODIR=	$(DESTDIR)/usr/info
+INFODIR=	$(DESTDIR)$(INFO_DIR)
 
 # Directory for shutdown, halt, reboot, etc.
 SHUTDOWNDIR=	$(SBINDIR)
 
-# Directory for fsck
-FSCKDIR=	$(SBINDIR)
-
-# Directory for passwd
-PASSWDDIR=	$(USRBINDIR)
-
 # Directory for help file for more.  Used to be /usr/lib.
-MOREHELPDIR=	$(USRSHAREMISCDIR)
+MOREHELPDIR=	$(DESTDIR)$(MOREHELP_DIR)
 
 # Modes
 DIRMODE=	755
@@ -165,11 +191,11 @@ INSTALLSUID=    $(INSTALL) -m $(SUIDMODE) -o root
 CFLAGS    := $(CFLAGS) $(OPT) -I$(LIB) $(WARNFLAGS) \
 			$(CURSESFLAGS) $(SLANGFLAGS) \
 			-D_FILE_OFFSET_BITS=64 \
-			-DSBINDIR=\"$(SBINDIR)\" \
-			-DUSRSBINDIR=\"$(USRSBINDIR)\" \
-			-DLOGDIR=\"$(LOGDIR)\" \
-			-DVARPATH=\"$(VARPATH)\" \
-			-DLOCALEDIR=\"$(LOCALEDIR)\"
+			-DSBINDIR=\"$(SBIN_DIR)\" \
+			-DUSRSBINDIR=\"$(USRSBIN_DIR)\" \
+			-DLOGDIR=\"$(LOG_DIR)\" \
+			-DVARPATH=\"$(VAR_PATH)\" \
+			-DLOCALEDIR=\"$(LOCALE_DIR)\"
 
 
 %.o: %.c
diff --git a/Makefile b/Makefile
index 0cca84336..4423f4995 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ include ./MCONFIG
 
 SUBDIRS=po \
 	lib \
-	getopt-1.1.0a \
+	getopt-1.1.2 \
 	disk-utils \
 	games \
 	login-utils \
@@ -44,7 +44,7 @@ install:
 
 clean:
 	-rm -f *.o *~ omake conftest conftest.c core
-	@for subdir in $(SUBDIRS); do \
+	@for subdir in $(SUBDIRS) partx; do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \
 	done
 
diff --git a/VERSION b/VERSION
index 5b0f3c855..009a3e75c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11b
+2.11f
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index e36594aa2..7f5de7358 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -322,7 +322,7 @@ check_zone_nr(unsigned short * nr, int * corrected) {
 	else
 		return *nr;
 	print_current_name();
-	printf("'.");
+	printf(_("'."));
 	if (ask(_("Remove block"),1)) {
 		*nr = 0;
 		*corrected = 1;
@@ -342,7 +342,7 @@ check_zone_nr2 (unsigned int *nr, int *corrected) {
 	else
 		return *nr;
 	print_current_name ();
-	printf ("'.");
+	printf (_("'."));
 	if (ask (_("Remove block"), 1)) {
 		*nr = 0;
 		*corrected = 1;
@@ -363,13 +363,13 @@ read_block(unsigned int nr, char * addr) {
 	if (BLOCK_SIZE*nr != lseek(IN, BLOCK_SIZE*nr, SEEK_SET)) {
 		printf(_("Read error: unable to seek to block in file '"));
 		print_current_name();
-		printf("'\n");
+		printf(_("'\n"));
 		memset(addr,0,BLOCK_SIZE);
 		errors_uncorrected = 1;
 	} else if (BLOCK_SIZE != read(IN, addr, BLOCK_SIZE)) {
 		printf(_("Read error: bad block in file '"));
 		print_current_name();
-		printf("'\n");
+		printf(_("'\n"));
 		memset(addr,0,BLOCK_SIZE);
 		errors_uncorrected = 1;
 	}
@@ -393,7 +393,7 @@ write_block(unsigned int nr, char * addr) {
 	if (BLOCK_SIZE != write(IN, addr, BLOCK_SIZE)) {
 		printf(_("Write error: bad block in file '"));
 		print_current_name();
-		printf("'\n");
+		printf(_("'\n"));
 		errors_uncorrected = 1;
 	}
 }
@@ -637,10 +637,10 @@ get_inode(unsigned int nr) {
 	inode = Inode + nr;
 	if (!inode_count[nr]) {
 		if (!inode_in_use(nr)) {
-			printf(_("Inode %d marked not used, but used for file '"),
-				nr);
+			printf(_("Inode %d marked not used, "
+				 "but used for file '"), nr);
 			print_current_name();
-			printf("'\n");
+			printf(_("'\n"));
 			if (repair) {
 				if (ask(_("Mark in use"),1))
 					mark_inode(nr);
@@ -688,9 +688,10 @@ get_inode2 (unsigned int nr) {
 	inode = Inode2 + nr;
 	if (!inode_count[nr]) {
 		if (!inode_in_use (nr)) {
-			printf (_("Inode %d marked not used, but used for file '"), nr);
+			printf (_("Inode %d marked not used, "
+				  "but used for file '"), nr);
 			print_current_name ();
-			printf ("'\n");
+			printf (_("'\n"));
 			if (repair) {
 				if (ask (_("Mark in use"), 1))
 					mark_inode (nr);
@@ -755,7 +756,7 @@ add_zone(unsigned short * znr, int * corrected) {
 	if (zone_count[block]) {
 		printf(_("Block has been used before. Now in file `"));
 		print_current_name();
-		printf("'.");
+		printf(_("'."));
 		if (ask(_("Clear"),1)) {
 			*znr = 0;
 			block = 0;
@@ -789,7 +790,7 @@ add_zone2 (unsigned int *znr, int *corrected) {
 	if (zone_count[block]) {
 		printf (_("Block has been used before. Now in file `"));
 		print_current_name ();
-		printf ("'.");
+		printf (_("'."));
 		if (ask (_("Clear"), 1)) {
 			*znr = 0;
 			block = 0;
@@ -947,9 +948,10 @@ check_file(struct minix_inode * dir, unsigned int offset) {
 	name = blk + (offset % BLOCK_SIZE) + 2;
 	ino = * (unsigned short *) (name-2);
 	if (ino > INODES) {
+		printf(_("The directory '"));
 		print_current_name();
-		printf(_(" contains a bad inode number for file '"));
-		printf("%.*s'.",namelen,name);
+		printf(_("' contains a bad inode number for file '%.*s'."),
+		       namelen, name);
 		if (ask(_(" Remove"),1)) {
 			*(unsigned short *)(name-2) = 0;
 			write_block(block, blk);
@@ -982,7 +984,8 @@ check_file(struct minix_inode * dir, unsigned int offset) {
 	name_depth++;	
 	if (list) {
 		if (verbose)
-			printf("%6d %07o %3d ",ino,inode->i_mode,inode->i_nlinks);
+			printf("%6d %07o %3d ", ino,
+			       inode->i_mode, inode->i_nlinks);
 		print_current_name();
 		if (S_ISDIR(inode->i_mode))
 			printf(":\n");
@@ -1010,9 +1013,10 @@ check_file2 (struct minix2_inode *dir, unsigned int offset) {
 	name = blk + (offset % BLOCK_SIZE) + 2;
 	ino = *(unsigned short *) (name - 2);
 	if (ino > INODES) {
+		printf(_("The directory '"));
 		print_current_name ();
-		printf (_(" contains a bad inode number for file '"));
-		printf ("%.*s'.", namelen, name);
+		printf (_("' contains a bad inode number for file '%.*s'.",
+			  namelen, name);
 		if (ask (_(" Remove"), 1)) {
 			*(unsigned short *) (name - 2) = 0;
 			write_block (block, blk);
@@ -1070,7 +1074,7 @@ recursive_check(unsigned int ino) {
 		die(_("internal error"));
 	if (dir->i_size < 2 * dirsize) {
 		print_current_name();
-		printf(_(": bad directory: size<32"));
+		printf(_(": bad directory: size < 32"));
 		errors_uncorrected = 1;
 	}
 	for (offset = 0 ; offset < dir->i_size ; offset += dirsize)
diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index 4fc5e2470..6e20fe262 100644
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -58,7 +58,7 @@ static void usage(int err)
 
 int main(int argc, char *argv[])
 {
-	char c;
+	int  c;
 	char * raw_name;
 	char * block_name;
 	int  err;
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 8b5643e62..d9ef3f630 100644
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -1431,8 +1431,23 @@ get_partition_table_geometry(partition_table *bufp) {
     int bad = FALSE;
 
     if (bufp->p.magicflag[0] != PART_TABLE_FLAG0 ||
-	bufp->p.magicflag[1] != PART_TABLE_FLAG1)
-	fatal(_("Bad signature on partition table"), 3);
+	bufp->p.magicflag[1] != PART_TABLE_FLAG1) {
+	    /* Matthew Wilcox: slightly friendlier version of
+	       fatal(_("Bad signature on partition table"), 3);
+	    */
+	    int cont;
+	    mvaddstr(WARNING_START, 0,
+	      _("No partition table or unknown signature on partition table"));
+	    mvaddstr(WARNING_START+1, 0,
+	      _("Do you wish to start with a zero table [y/N] ?"));
+	    putchar(BELL);
+	    refresh();
+	    cont = getch();
+	    if ((cont != 'y') && (cont != 'Y'))
+		    die_x(3);
+	    zero_table = TRUE;
+	    return;
+    }
 
     hh = ss = 0;
     for (i=0; i<4; i++) {
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index a439f3273..0c57ed22e 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -517,8 +517,17 @@ clear_partition(struct partition *p) {
 }
 
 static void
-set_partition(int i, struct partition *p, uint start, uint stop,
-	      int sysid, uint offset) {
+set_partition(int i, int doext, uint start, uint stop, int sysid) {
+	struct partition *p;
+	uint offset;
+
+	if (doext) {
+		p = ptes[i].ext_pointer;
+		offset = extended_offset;
+	} else {
+		p = ptes[i].part_table;
+		offset = ptes[i].offset;
+	}
 	p->boot_ind = 0;
 	p->sys_ind = sysid;
 	set_start_sect(p, start - offset);
@@ -1157,14 +1166,7 @@ delete_partition(int i) {
 		if (i > 4) {
 			/* delete this link in the chain */
 			p = ptes[i-1].ext_pointer;
-			p->boot_ind = 0;
-			p->head = q->head;
-			p->sector = q->sector;
-			p->cyl = q->cyl;
-			p->sys_ind = EXTENDED;
-			p->end_head = q->end_head;
-			p->end_sector = q->end_sector;
-			p->end_cyl = q->end_cyl;
+			*p = *q;
 			set_start_sect(p, get_start_sect(q));
 			set_nr_sects(p, get_nr_sects(q));
 			ptes[i-1].changed = 1;
@@ -1370,9 +1372,72 @@ wrong_p_order(int *prev) {
 	return 0;
 }
 
+/*
+ * Fix the chain of logicals.
+ * extended_offset is unchanged, the set of sectors used is unchanged
+ * The chain is sorted so that sectors increase, and so that
+ * starting sectors increase.
+ *
+ * After this it may still be that cfdisk doesnt like the table.
+ * (This is because cfdisk considers expanded parts, from link to
+ * end of partition, and these may still overlap.)
+ * Now
+ *   sfdisk /dev/hda > ohda; sfdisk /dev/hda < ohda
+ * may help.
+ */
+static void
+fix_chain_of_logicals(void) {
+	int j, oj, ojj, sj, sjj;
+	struct partition *pj,*pjj,tmp;
+
+	/* Stage 1: sort sectors but leave sector of part 4 */
+	/* (Its sector is the global extended_offset.) */
+ stage1:
+	for(j = 5; j < partitions-1; j++) {
+		oj = ptes[j].offset;
+		ojj = ptes[j+1].offset;
+		if (oj > ojj) {
+			ptes[j].offset = ojj;
+			ptes[j+1].offset = oj;
+			pj = ptes[j].part_table;
+			set_start_sect(pj, get_start_sect(pj)+oj-ojj);
+			pjj = ptes[j+1].part_table;
+			set_start_sect(pjj, get_start_sect(pjj)+ojj-oj);
+			set_start_sect(ptes[j-1].ext_pointer,
+				       ojj-extended_offset);
+			set_start_sect(ptes[j].ext_pointer,
+				       oj-extended_offset);
+			goto stage1;
+		}
+	}
+
+	/* Stage 2: sort starting sectors */
+ stage2:
+	for(j = 4; j < partitions-1; j++) {
+		pj = ptes[j].part_table;
+		pjj = ptes[j+1].part_table;
+		sj = get_start_sect(pj);
+		sjj = get_start_sect(pjj);
+		oj = ptes[j].offset;
+		ojj = ptes[j+1].offset;
+		if (oj+sj > ojj+sjj) {
+			tmp = *pj;
+			*pj = *pjj;
+			*pjj = tmp;
+			set_start_sect(pj, ojj+sjj-oj);
+			set_start_sect(pjj, oj+sj-ojj);
+			goto stage2;
+		}
+	}
+
+	/* Probably something was changed */
+	for(j = 4; j < partitions; j++)
+		ptes[j].changed = 1;
+}
+
 static void
 fix_partition_table_order(void) {
-	struct pte *pei, *pek, ptebuf;
+	struct pte *pei, *pek;
 	int i,k;
 
 	if(!wrong_p_order(NULL)) {
@@ -1380,34 +1445,32 @@ fix_partition_table_order(void) {
 		return;
 	}
 
-	while ((i = wrong_p_order(&k)) != 0) {
+	while ((i = wrong_p_order(&k)) != 0 && i < 4) {
 		/* partition i should have come earlier, move it */
+		/* We have to move data in the MBR */
+		struct partition *pi, *pk, *pe, pbuf;
 		pei = &ptes[i];
 		pek = &ptes[k];
 
-		if (i < 4) {
-			/* We have to move data in the MBR */
-			struct partition *pi, *pk, *pe, pbuf;
+		pe = pei->ext_pointer;
+		pei->ext_pointer = pek->ext_pointer;
+		pek->ext_pointer = pe;
 
-			pe = pei->ext_pointer;
-			pei->ext_pointer = pek->ext_pointer;
-			pek->ext_pointer = pe;
+		pi = pei->part_table;
+		pk = pek->part_table;
 
-			pi = pei->part_table;
-			pk = pek->part_table;
+		memmove(&pbuf, pi, sizeof(struct partition));
+		memmove(pi, pk, sizeof(struct partition));
+		memmove(pk, &pbuf, sizeof(struct partition));
 
-			memmove(&pbuf, pi, sizeof(struct partition));
-			memmove(pi, pk, sizeof(struct partition));
-			memmove(pk, &pbuf, sizeof(struct partition));
-		} else {
-			/* Only change is change in numbering */
-			ptebuf = *pei;
-			*pei = *pek;
-			*pek = ptebuf;
-		}
 		pei->changed = pek->changed = 1;
-
 	}
+
+	if (i)
+		fix_chain_of_logicals();
+
+	printf("Done.\n");
+
 }
 
 static void
@@ -1637,7 +1700,7 @@ add_partition(int n, int sys) {
 
 	if (p && p->sys_ind) {
 		printf(_("Partition %d is already defined.  Delete "
-			"it before re-adding it.\n"), n + 1);
+			 "it before re-adding it.\n"), n + 1);
 		return;
 	}
 	fill_bounds(first, last);
@@ -1693,9 +1756,9 @@ add_partition(int n, int sys) {
 
 		pe->offset = start - sector_offset;
 		if (pe->offset == extended_offset) { /* must be corrected */
-		     pe->offset++;
-		     if (sector_offset == 1)
-			  start++;
+			pe->offset++;
+			if (sector_offset == 1)
+				start++;
 		}
 	}
 
@@ -1728,7 +1791,9 @@ add_partition(int n, int sys) {
 		}
 	}
 
-	set_partition(n, p, start, stop, sys, ptes[n].offset);
+	set_partition(n, 0, start, stop, sys);
+	if (n > 4)
+		set_partition(n - 1, 1, ptes[n].offset, stop, EXTENDED);
 
 	if (IS_EXTENDED (sys)) {
 		struct pte *pe4 = &ptes[4];
@@ -1743,16 +1808,6 @@ add_partition(int n, int sys) {
 		pe4->ext_pointer = pe4->part_table + 1;
 		pe4->changed = 1;
 		partitions = 5;
-	} else {
-		if (n > 4)
-			set_partition(n - 1, ptes[n-1].ext_pointer,
-				ptes[n].offset, stop, EXTENDED,
-				extended_offset);
-#if 0
-		if ((limit = get_nr_sects(p)) & 1)
-			printf(_("Warning: partition %d has an odd "
-				"number of sectors.\n"), n + 1);
-#endif
 	}
 }
 
diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
index 80efc36e6..0522d3651 100644
--- a/fdisk/fdiskbsdlabel.c
+++ b/fdisk/fdiskbsdlabel.c
@@ -104,6 +104,7 @@ static struct xbsd_disklabel xbsd_dlabel;
 
 int
 check_osf_label(void) {
+    osf_label = 0;
     if (xbsd_readlabel (NULL, &xbsd_dlabel) == 0)
 	return 0;
     osf_label = 1;
@@ -265,10 +266,10 @@ xbsd_new_part (void)
   if (!xbsd_check_new_partition (&i))
     return;
 
-#if !defined (__alpha__) && !defined (__powerpc__)
+#if !defined (__alpha__) && !defined (__powerpc__) && !defined (__hppa__)
   begin = get_start_sect(xbsd_part);
   end = begin + get_nr_sects(xbsd_part) - 1;
-#elif defined (__alpha__) || defined (__powerpc__)
+#else
   begin = 0;
   end = xbsd_dlabel.d_secperunit - 1;
 #endif
@@ -419,7 +420,7 @@ xbsd_create_disklabel (void) {
 		c = read_char (_("Do you want to create a disklabel? (y/n) "));
 		if (tolower(c) == 'y') {
 			if (xbsd_initlabel (
-#if defined (__alpha__) || defined (__powerpc__)
+#if defined (__alpha__) || defined (__powerpc__) || defined (__hppa__)
 				NULL, &xbsd_dlabel, 0
 #else
 				xbsd_part, &xbsd_dlabel, xbsd_part_index
@@ -548,7 +549,7 @@ xbsd_write_bootstrap (void)
 
   bcopy (&dl, d, sizeof (struct xbsd_disklabel));
 
-#if defined (__powerpc__)
+#if defined (__powerpc__) || defined (__hppa__)
   sector = 0;
 #elif defined (__alpha__)
   sector = 0;
@@ -748,9 +749,9 @@ xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d)
 {
   int sector;
 
-#if !defined (__alpha__) && !defined (__powerpc__)
+#if !defined (__alpha__) && !defined (__powerpc__) && !defined (__hppa__)
   sector = get_start_sect(p) + BSD_LABELSECTOR;
-#elif defined (__alpha__) || defined (__powerpc__)
+#else
   sector = BSD_LABELSECTOR;
 #endif
 
diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h
index e46e02614..c2e4bb989 100644
--- a/fdisk/fdiskbsdlabel.h
+++ b/fdisk/fdiskbsdlabel.h
@@ -43,10 +43,10 @@
 
 #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
 
-#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__)
+#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__)
 #define BSD_LABELSECTOR   1
 #define BSD_LABELOFFSET   0
-#elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__)
+#elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
 #define BSD_LABELSECTOR   0
 #define BSD_LABELOFFSET   64
 #else
diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 09296905d..88afcd86a 100644
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -193,12 +193,12 @@ check_sgi_label() {
 void
 sgi_list_table( int xtra ) {
     int i, w;
+    int kpi = 0;		/* kernel partition ID */
     char *type;
 
     w = strlen( disk_device );
 
-    if( xtra )
-    {
+    if( xtra ) {
 	printf(_("\nDisk %s (SGI disk label): %d heads, %d sectors\n"
 	       "%d cylinders, %d physical cylinders\n"
 	       "%d extra sects/cyl, interleave %d:1\n"
@@ -210,8 +210,7 @@ sgi_list_table( int xtra ) {
 	       SSWAP16(sgiparam.ilfact),
 	       (char *)sgilabel,
 	       str_units(PLURAL), units_per_sector);
-    } else
-    {
+    } else {
 	printf( _("\nDisk %s (SGI disk label): "
 		"%d heads, %d sectors, %d cylinders\n"
 		"Units = %s of %d * 512 bytes\n\n"),
@@ -219,17 +218,17 @@ sgi_list_table( int xtra ) {
 	        str_units(PLURAL), units_per_sector );
     }
     printf(_("----- partitions -----\n"
-	   "%*s  Info      Start       End   Sectors  Id  System\n"),
+	   "Pt# %*s  Info     Start       End   Sectors  Id  System\n"),
 	   w + 1, _("Device"));
-    for (i = 0 ; i < partitions; i++)
-    {
-	if( sgi_get_num_sectors(i) || debug )
-	{
+    for (i = 0 ; i < partitions; i++) {
+	    if( sgi_get_num_sectors(i) || debug ) {
 	    __u32 start = sgi_get_start_sector(i);
 	    __u32 len = sgi_get_num_sectors(i);
+	    kpi++;		/* only count nonempty partitions */
 	    printf(
-		"%*s%-2d %4s %9ld %9ld %9ld  %2x  %s\n",
-/* device */              w, disk_device, i + 1,
+		"%2d: %s %4s %9ld %9ld %9ld  %2x  %s\n",
+/* fdisk part number */   i+1,
+/* device */              partname(disk_device, kpi, w+2),
 /* flags */               (sgi_get_swappartition() == i) ? "swap" :
 /* flags */               (sgi_get_bootpartition() == i) ? "boot" : "    ", 
 /* start */               (long) scround(start),
@@ -240,8 +239,8 @@ sgi_list_table( int xtra ) {
 		    ? type : _("Unknown"));
 	}
     }
-    printf(_("----- bootinfo -----\nBootfile: %s\n"
-	     "----- directory entries -----\n"),
+    printf(_("----- Bootinfo -----\nBootfile: %s\n"
+	     "----- Directory Entries -----\n"),
 	   sgilabel->boot_file );
     for (i = 0 ; i < volumes; i++)
     {
@@ -735,11 +734,9 @@ create_sgilabel(void)
 	_("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"));
-#if BYTE_ORDER == LITTLE_ENDIAN
-    other_endian = 1;
-#else
-    other_endian = 0;
-#endif
+
+    other_endian = (BYTE_ORDER == LITTLE_ENDIAN);
+
 #ifdef HDIO_REQ
     if (!ioctl(fd, HDIO_REQ, &geometry))
 #else
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index 2a36852a5..ff54ed5b5 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -52,6 +52,9 @@ struct systypes sun_sys_types[] = {
 	{LINUX_SWAP, N_("Linux swap")},
 	{LINUX_NATIVE, N_("Linux native")},
 	{0x8e, N_("Linux LVM")},
+	{0xfd, N_("Linux raid autodetect")},/* New (2.2.x) raid partition
+					       with autodetect using
+					       persistent superblock */
 	{ 0, NULL }
 };
 
@@ -531,6 +534,22 @@ add_sun_partition(int n, int sys) {
 			printf ("\
 It is highly recommended that the third partition covers the whole disk\n\
 and is of type `Whole disk'\n");
+		/* ewt asks to add: "don't start a partition at cyl 0"
+		   However, edmundo@rano.demon.co.uk writes:
+		   "In addition to having a Sun partition table, to be able to
+		   boot from the disc, the first partition, /dev/sdX1, must
+		   start at cylinder 0. This means that /dev/sdX1 contains
+		   the partition table and the boot block, as these are the
+		   first two sectors of the disc. Therefore you must be
+		   careful what you use /dev/sdX1 for. In particular, you must
+		   not use a partition starting at cylinder 0 for Linux swap,
+		   as that would overwrite the partition table and the boot
+		   block. You may, however, use such a partition for a UFS
+		   or EXT2 file system, as these file systems leave the first
+		   1024 bytes undisturbed. */
+		/* On the other hand, one should not use partitions
+		   starting at block 0 in an md, or the label will
+		   be trashed. */
 		for (i = 0; i < partitions; i++)
 			if (lens[i] && starts[i] <= first
 			            && starts[i] + lens[i] > first)
diff --git a/fdisk/i386_sys_types.c b/fdisk/i386_sys_types.c
index ce01b189a..87639c6ba 100644
--- a/fdisk/i386_sys_types.c
+++ b/fdisk/i386_sys_types.c
@@ -24,7 +24,7 @@ struct systypes i386_sys_types[] = {
 	{0x14, N_("Hidden FAT16 <32M")},
 	{0x16, N_("Hidden FAT16")},
 	{0x17, N_("Hidden HPFS/NTFS")},
-	{0x18, N_("AST Windows swapfile")},
+	{0x18, N_("AST SmartSleep")},
 	{0x1b, N_("Hidden Win95 FAT32")},
 	{0x1c, N_("Hidden Win95 FAT32 (LBA)")},
 	{0x1e, N_("Hidden Win95 FAT16 (LBA)")},
@@ -69,6 +69,7 @@ struct systypes i386_sys_types[] = {
 	{0xa7, N_("NeXTSTEP")},
 	{0xb7, N_("BSDI fs")},
 	{0xb8, N_("BSDI swap")},
+	{0xbb, N_("Boot Wizard hidden")},
 	{0xc1, N_("DRDOS/sec (FAT-12)")},
 	{0xc4, N_("DRDOS/sec (FAT-16 < 32M)")},
 	{0xc6, N_("DRDOS/sec (FAT-16)")},
@@ -77,6 +78,7 @@ struct systypes i386_sys_types[] = {
 	{0xdb, N_("CP/M / CTOS / ...")},/* CP/M or Concurrent CP/M or
 					   Concurrent DOS or CTOS */
 	{0xde, N_("Dell Utility")},	/* Dell PowerEdge Server utilities */
+	{0xdf, N_("BootIt")},		/* BootIt EMBRM */
 	{0xe1, N_("DOS access")},	/* DOS access or SpeedStor 12-bit FAT
 					   extended partition */
 	{0xe3, N_("DOS R/O")},		/* DOS R/O or SpeedStor */
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index e60259849..db1b7f4dd 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -220,12 +220,12 @@ get_sector(char *dev, int fd, unsigned long sno) {
 
 static int
 msdos_signature (struct sector *s) {
-    if (*(unsigned short *) (s->data + 0x1fe) != 0xaa55) {
-	error(_("ERROR: sector %lu does not have an msdos signature\n"),
-	       s->sectornumber);
-	return 0;
-    }
-    return 1;
+    unsigned char *data = s->data;
+    if (data[510] == 0x55 && data[511] == 0xaa)
+	    return 1;
+    error(_("ERROR: sector %lu does not have an msdos signature\n"),
+	  s->sectornumber);
+    return 0;
 }
 
 static int
@@ -1146,9 +1146,10 @@ partitions_ok(struct disk_desc *z) {
         for (q = partitions; q < partitions+partno; q++)
           if (is_extended(q->p.sys_type))
             if (p->start <= q->start && p->start + p->size > q->start) {
-                warn(_("Warning: partition %s contains part of "), PNO(p));
-		warn(_("the partition table (sector %lu),\n"), q->start);
-		warn(_("and will destroy it when filled\n"));
+                warn(_("Warning: partition %s contains part of "
+		       "the partition table (sector %lu),\n"
+		       "and will destroy it when filled\n"),
+		     PNO(p), q->start);
 		return 0;
 	    }
 
@@ -1161,7 +1162,8 @@ partitions_ok(struct disk_desc *z) {
 	      return 0;
           }
           if (p->size && p->start + p->size > ds) {
-	      warn(_("Warning: partition %s extends past end of disk\n"), PNO(p));
+	      warn(_("Warning: partition %s extends past end of disk\n"),
+		   PNO(p));
 	      return 0;
           }
       }
@@ -1175,8 +1177,8 @@ partitions_ok(struct disk_desc *z) {
 	if (p->p.sys_type == EXTENDED_PARTITION)
 	  ect++;
       if (ect > 1 && !Linux) {
-	  warn(_("Among the primary partitions, at most one can be extended\n"));
-	  warn(_(" (although this is not a problem under Linux)\n"));
+	  warn(_("Among the primary partitions, at most one can be extended\n"
+		 " (although this is not a problem under Linux)\n"));
 	  return 0;
       }
     }
@@ -1284,13 +1286,15 @@ extended_partition(char *dev, int fd, struct part_desc *ep, struct disk_desc *z)
 	/* This is BAD */
 	if (DOS_extended) {
 	    here = start -= (start % B.cylindersize);
-	    printf(_("Warning: shifted start of the extd partition from %ld to %ld\n"),
+	    printf(_("Warning: shifted start of the extd partition "
+		     "from %ld to %ld\n"
+		     "(For listing purposes only. "
+		     "Do not change its contents.)\n"),
 		   ep->start, start);
-	    printf(_("(For listing purposes only. Do not change its contents.)\n"));
 	} else {
 	    printf(_("Warning: extended partition does not start at a "
-		     "cylinder boundary.\n"));
-	    printf(_("DOS and Linux will interpret the contents differently.\n"));
+		     "cylinder boundary.\n"
+		     "DOS and Linux will interpret the contents differently.\n"));
 	}
     }
 
@@ -1542,7 +1546,8 @@ write_partitions(char *dev, int fd, struct disk_desc *z) {
 	if (!s) return 0;
 	s->to_be_written = 1;
 	copy_from_part(&(p->p), s->data + p->offset);
-	*(unsigned short *)(&(s->data[0x1fe])) = 0xaa55;
+	s->data[510] = 0x55;
+	s->data[511] = 0xaa;
     }
     if (save_sector_file) {
 	if (!save_sectors(dev, fd)) {
@@ -1701,13 +1706,23 @@ read_stdin(unsigned char **fields, unsigned char *line, int fieldssize, int line
 }
 
 /* read a number, use default if absent */
+/* a sign gives an offset from the default */
 static int
 get_ul(char *u, unsigned long *up, unsigned long def, int base) {
     char *nu;
+    int sign = 0;
+    unsigned long val;
 
+    if (*u == '+') {
+	sign = 1;
+	u++;
+    } else if (*u == '-') {
+	sign = -1;
+	u++;
+    }
     if (*u) {
 	errno = 0;
-	*up = strtoul(u, &nu, base);
+	val = strtoul(u, &nu, base);
 	if (errno == ERANGE) {
 	    printf(_("number too big\n"));
 	    return -1;
@@ -1716,6 +1731,11 @@ get_ul(char *u, unsigned long *up, unsigned long def, int base) {
 	    printf(_("trailing junk after number\n"));
 	    return -1;
 	}
+	if (sign == 1)
+		val = def + val;
+	else if (sign == -1)
+		val = def - val;
+	*up = val;
     } else
       *up = def;
     return 0;
@@ -2277,18 +2297,27 @@ static const struct option long_opts[] = {
     { NULL, 0, NULL, 0 }
 };
 
-/* default devices to list */
+/* default devices to list - will be removed */
 static struct devd {
     char *pref, *letters;
 } defdevs[] = {
     { "hd", "abcdefgh" },
     { "sd", "abcde" },
     { "xd", "ab" },
-    { "ed", "abcd" }
+    { "ed", "abcd" },
+    /* Compaq's SMART Array Controllers */
+    { "cciss/c0d", "01234567" },
+    { "cciss/c1d", "01234567" },
+    /* Compaq's SMART2 Intelligent Disk Array Controllers */
+    { "ida/c0d", "01234567" },
+    { "ida/c1d", "01234567" },
+    /* Mylex DAC960/AcceleRAID/eXtremeRAID PCI RAID Controllers */
+    { "rd/c0d", "01234567" },
+    { "rd/c1d", "01234567" }
 };
 
 static int
-is_ide_cdrom(char *device) {
+is_ide_cdrom_or_tape(char *device) {
     /* No device was given explicitly, and we are trying some
        likely things.  But opening /dev/hdc may produce errors like
            "hdc: tray open or drive not ready"
@@ -2302,7 +2331,7 @@ is_ide_cdrom(char *device) {
     sprintf(buf, "/proc/ide/%s/media", device+5);
     procf = fopen(buf, "r");
     if (procf != NULL && fgets(buf, sizeof(buf), procf))
-	return  !strncmp(buf, "cdrom", 5);
+	return  !strncmp(buf, "cdrom", 5) || !strncmp(buf, "tape", 4);
 
     /* Now when this proc file does not exist, skip the
        device when it is read-only. */
@@ -2456,7 +2485,7 @@ main(int argc, char **argv) {
 	    lp = dp->letters;
 	    while(*lp) {
 		sprintf(device, "/dev/%s%c", dp->pref, *lp++);
-		if (!strcmp(dp->pref, "hd") && is_ide_cdrom(device))
+		if (!strcmp(dp->pref, "hd") && is_ide_cdrom_or_tape(device))
 		  continue;
 		if (opt_out_geom)
 		  do_geom(device, 1);
diff --git a/getopt-1.1.0a/COPYING b/getopt-1.1.2/COPYING
index a43ea2126..a43ea2126 100644
--- a/getopt-1.1.0a/COPYING
+++ b/getopt-1.1.2/COPYING
diff --git a/getopt-1.1.0a/Changelog b/getopt-1.1.2/Changelog
index 339c5bb16..339c5bb16 100644
--- a/getopt-1.1.0a/Changelog
+++ b/getopt-1.1.2/Changelog
diff --git a/getopt-1.1.0a/Makefile b/getopt-1.1.2/Makefile
index 6b50f849b..6b50f849b 100644
--- a/getopt-1.1.0a/Makefile
+++ b/getopt-1.1.2/Makefile
diff --git a/getopt-1.1.0a/README b/getopt-1.1.2/README
index 1d795f5e4..1d795f5e4 100644
--- a/getopt-1.1.0a/README
+++ b/getopt-1.1.2/README
diff --git a/getopt-1.1.0a/TODO b/getopt-1.1.2/TODO
index 70f2ea9cb..70f2ea9cb 100644
--- a/getopt-1.1.0a/TODO
+++ b/getopt-1.1.2/TODO
diff --git a/getopt-1.1.0a/getopt-1.0.6.lsm b/getopt-1.1.2/getopt-1.1.2.lsm
index 6323916c3..95be25918 100644
--- a/getopt-1.1.0a/getopt-1.0.6.lsm
+++ b/getopt-1.1.2/getopt-1.1.2.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: Getopt
-Version: 1.0.6
-Entered-date: 27JUN00
+Version: 1.1.2
+Entered-date: 29MAR01
 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
@@ -9,11 +9,11 @@ Description: An improved implementation of getopt(1), a program to parse
 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
+              28kB getopt-1.1.2.tar.gz
+              689  getopt-1.1.2.lsm
 Alternate-site: sunsite.unc.edu /pub/Linux/utils/shell
-              28kB getopt-1.0.6.tar.gz
-              600  getopt-1.0.6.lsm
+              28kB getopt-1.1.2.tar.gz
+              689  getopt-1.1.2.lsm
 Copying-policy: GPL
 End
 
diff --git a/getopt-1.1.0a/getopt.1 b/getopt-1.1.2/getopt.1
index b7e360315..b7e360315 100644
--- a/getopt-1.1.0a/getopt.1
+++ b/getopt-1.1.2/getopt.1
diff --git a/getopt-1.1.0a/getopt.c b/getopt-1.1.2/getopt.c
index e52c14903..95c3b34e4 100644
--- a/getopt-1.1.0a/getopt.c
+++ b/getopt-1.1.2/getopt.c
@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
 			quote=0;
 			break;
 		case 'V':
-			printf(_("getopt (enhanced) 1.1.0\n"));
+			printf(_("getopt (enhanced) 1.1.2\n"));
 			exit(0);
 		case '?':
 		case ':':
diff --git a/getopt-1.1.0a/gnu/getopt.c b/getopt-1.1.2/gnu/getopt.c
index 59b51cd67..59b51cd67 100644
--- a/getopt-1.1.0a/gnu/getopt.c
+++ b/getopt-1.1.2/gnu/getopt.c
diff --git a/getopt-1.1.0a/gnu/getopt.h b/getopt-1.1.2/gnu/getopt.h
index d6ceb0eee..d6ceb0eee 100644
--- a/getopt-1.1.0a/gnu/getopt.h
+++ b/getopt-1.1.2/gnu/getopt.h
diff --git a/getopt-1.1.0a/gnu/getopt1.c b/getopt-1.1.2/gnu/getopt1.c
index 4aa8de6f6..4aa8de6f6 100644
--- a/getopt-1.1.0a/gnu/getopt1.c
+++ b/getopt-1.1.2/gnu/getopt1.c
diff --git a/getopt-1.1.0a/parse.bash b/getopt-1.1.2/parse.bash
index 864fc0add..864fc0add 100644
--- a/getopt-1.1.0a/parse.bash
+++ b/getopt-1.1.2/parse.bash
diff --git a/getopt-1.1.0a/parse.tcsh b/getopt-1.1.2/parse.tcsh
index 2266d0e64..2266d0e64 100644
--- a/getopt-1.1.0a/parse.tcsh
+++ b/getopt-1.1.2/parse.tcsh
diff --git a/getopt-1.1.0a/test.bash b/getopt-1.1.2/test.bash
index 149e1f9b0..149e1f9b0 100644
--- a/getopt-1.1.0a/test.bash
+++ b/getopt-1.1.2/test.bash
diff --git a/getopt-1.1.0a/test.tcsh b/getopt-1.1.2/test.tcsh
index d661e767d..d661e767d 100644
--- a/getopt-1.1.0a/test.tcsh
+++ b/getopt-1.1.2/test.tcsh
diff --git a/hwclock/hwclock.8 b/hwclock/hwclock.8
index 07c4f8cdb..d8cf5b03e 100644
--- a/hwclock/hwclock.8
+++ b/hwclock/hwclock.8
@@ -20,7 +20,8 @@ hwclock \- query and set the hardware clock (RTC)
 .PP
 other options:
 .PP
-.B "[\-u|\-\-utc]  \-\-localtime \-\-directisa \-\-test \-\-debug"
+.B "[\-u|\-\-utc]  \-\-localtime  \-\-noadjfile \-\-directisa"
+.B "\-\-test [\-D|\-\-debug]"
 .PP
 and arcane options for DEC Alpha:
 .PP
@@ -28,9 +29,7 @@ and arcane options for DEC Alpha:
 .PP
 Minimum unique abbreviations of all options are acceptable.
 .PP
-Also, equivalent options \-r, \-w, \-s, \-a, \-v, \-u,
-\-D, \-A, \-J, \-S, and \-F are accepted for compatibility
-with the program "clock", while \-h asks for a help message.
+Also, \-h asks for a help message.
 
 .SH DESCRIPTION
 .B hwclock
@@ -172,6 +171,17 @@ options), as recorded in the adjtime file.  If the adjtime file doesn't
 exist, the default is local time.
 
 .TP
+.B \-\-noadjfile
+disables the facilities provided by
+.IR /etc/adjtime .
+.B hwclock
+will not read nor write to that file with this option. Either
+.B \-\-utc
+or
+.B \-\-localtime
+must be specified when using this option.
+
+.TP
 .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 
diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c
index 3a3a94e1a..ba6bc77c9 100644
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -259,6 +259,7 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
       char line1[81];           /* String: first line of adjtime file */
       char line2[81];           /* String: second line of adjtime file */
       char line3[81];           /* String: third line of adjtime file */
+      long timeval;
       
       line1[0] = '\0';          /* In case fgets fails */
       fgets(line1, sizeof(line1), adjfile);
@@ -274,13 +275,16 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
       adjtime_p->last_adj_time = 0;
       adjtime_p->not_adjusted = 0;
       adjtime_p->last_calib_time = 0;
+      timeval = 0;
       
-      sscanf(line1, "%f %d %f", 
+      sscanf(line1, "%f %ld %f", 
              &adjtime_p->drift_factor,
-             (int *) &adjtime_p->last_adj_time, 
+             &timeval, 
              &adjtime_p->not_adjusted);
-      
-      sscanf(line2, "%d", (int *) &adjtime_p->last_calib_time);
+      adjtime_p->last_adj_time = timeval;
+
+      sscanf(line2, "%ld", &timeval);
+      adjtime_p->last_calib_time = timeval;
 
       if (!strcmp(line3, "UTC\n"))
 	adjtime_p->local_utc = UTC;
@@ -300,10 +304,10 @@ read_adjtime(struct adjtime *adjtime_p, int *rc_p) {
     adjtime_p->dirty = FALSE;
 
     if (debug) {
-      printf(_("Last drift adjustment done at %d seconds after 1969\n"), 
-             (int) adjtime_p->last_adj_time);
-      printf(_("Last calibration done at %d seconds after 1969\n"),
-             (int) adjtime_p->last_calib_time);
+      printf(_("Last drift adjustment done at %ld seconds after 1969\n"), 
+             (long) adjtime_p->last_adj_time);
+      printf(_("Last calibration done at %ld seconds after 1969\n"),
+             (long) adjtime_p->last_calib_time);
       printf(_("Hardware clock is on %s time\n"),
 	     (adjtime_p->local_utc == LOCAL) ? _("local") :
 	     (adjtime_p->local_utc == UTC) ? _("UTC") : _("unknown"));
@@ -447,9 +451,9 @@ set_hardware_clock(const time_t newtime,
 
   if (debug) 
     printf(_("Setting Hardware Clock to %.2d:%.2d:%.2d "
-           "= %d seconds since 1969\n"), 
+           "= %ld seconds since 1969\n"), 
            new_broken_time.tm_hour, new_broken_time.tm_min, 
-           new_broken_time.tm_sec, (int) newtime);
+           new_broken_time.tm_sec, (long) newtime);
 
   if (testing)
     printf(_("Clock not changed - testing only.\n"));
@@ -597,8 +601,8 @@ interpret_date_string(const char *date_opt, time_t * const time_p) {
                 MYNAME, date_command, date_resp);
         retcode = 8;
       } else {
-        int seconds_since_epoch;
-        rc = sscanf(date_resp + sizeof(magic)-1, "%d", &seconds_since_epoch);
+        long seconds_since_epoch;
+        rc = sscanf(date_resp + sizeof(magic)-1, "%ld", &seconds_since_epoch);
         if (rc < 1) {
           fprintf(stderr, _("The date command issued by %s returned "
                   "something other than an integer where the converted "
@@ -610,8 +614,8 @@ interpret_date_string(const char *date_opt, time_t * const time_p) {
           retcode = 0;
           *time_p = seconds_since_epoch;
           if (debug) 
-            printf(_("date string %s equates to %d seconds since 1969.\n"),
-                   date_opt, (int) *time_p);
+            printf(_("date string %s equates to %ld seconds since 1969.\n"),
+                   date_opt, (long) *time_p);
         }
       }
       fclose(date_child_fp);
@@ -719,7 +723,7 @@ adjust_drift_factor(struct adjtime *adjtime_p,
     if (debug) 
       printf(_("Not adjusting drift factor because it has been less than a "
              "day since the last calibration.\n"));
-  } else {
+  } else if (adjtime_p->last_calib_time != 0) {
     const float factor_adjust = 
       ((float) (nowtime - hclocktime) 
        / (hclocktime - adjtime_p->last_calib_time))
@@ -931,7 +935,7 @@ determine_clock_access_method(const bool user_requests_ISA) {
 }
 
 static void
-manipulate_clock(const bool show, const bool adjust, 
+manipulate_clock(const bool show, const bool adjust, const bool noadjfile,
                  const bool set, const time_t set_time,
                  const bool hctosys, const bool systohc, 
                  const struct timeval startup_time, 
@@ -953,7 +957,7 @@ manipulate_clock(const bool show, const bool adjust,
 
   if (no_auth) *retcode_p = 1;
   else {
-    if (adjust || set || systohc || (!utc && !local_opt)) 
+    if (!noadjfile && (adjust || set || systohc || (!utc && !local_opt)))
       read_adjtime(&adjtime, &rc);
     else {
       /* A little trick to avoid reading the file if we don't have to */
@@ -1025,7 +1029,9 @@ manipulate_clock(const bool show, const bool adjust,
             *retcode_p = 1;
           } else *retcode_p = 0;
         }
-        save_adjtime(adjtime, testing);
+        if (!noadjfile) {
+         save_adjtime(adjtime, testing);
+       }
       }
     }
   }
@@ -1121,6 +1127,8 @@ usage( const char *fmt, ... ) {
     "  --date        specifies the time to which to set the hardware clock\n"
     "  --epoch=year  specifies the year which is the beginning of the \n"
     "                hardware clock's epoch value\n"
+    "  --noadjfile   do not access /etc/adjtime. Requires the use of\n"
+    "                either --utc or --localtime\n"
     ),RTC_DEV);
 #ifdef __alpha__
   fprintf( usageto, _(
@@ -1160,7 +1168,7 @@ main(int argc, char **argv) {
      may be modified after parsing is complete to effect an implied option.
      */
   bool help, show, set, systohc, hctosys, adjust, getepoch, setepoch, version;
-  bool ARCconsole, utc, testing, directisa, Jensen, SRM, funky_toy;
+  bool ARCconsole, utc, testing, directisa, Jensen, SRM, funky_toy, noadjfile;
   bool local_opt;
   char *date_opt;
 
@@ -1173,6 +1181,7 @@ main(int argc, char **argv) {
     { 0,   (char *) "getepoch",  OPT_FLAG,   &getepoch,  0 },
     { 0,   (char *) "setepoch",  OPT_FLAG,   &setepoch,  0 },
     { 'a', (char *) "adjust",    OPT_FLAG,   &adjust,    0 },
+    { 0,   (char *) "noadjfile", OPT_FLAG,   &noadjfile, 0 },
     { 'v', (char *) "version",   OPT_FLAG,   &version,   0 },
     { 'V', (char *) "version",   OPT_FLAG,   &version,   0 },
     { 0,   (char *) "date",      OPT_STRING, &date_opt,  0 },
@@ -1185,8 +1194,11 @@ main(int argc, char **argv) {
     { 'D', (char *) "debug",     OPT_FLAG,   &debug,     0 },
 #ifdef __alpha__
     { 'A', (char *) "ARC",       OPT_FLAG,   &ARCconsole,0 },
+    { 'A', (char *) "arc",       OPT_FLAG,   &ARCconsole,0 },
     { 'J', (char *) "Jensen",    OPT_FLAG,   &Jensen,    0 },
+    { 'J', (char *) "jensen",    OPT_FLAG,   &Jensen,    0 },
     { 'S', (char *) "SRM",       OPT_FLAG,   &SRM,       0 },
+    { 'S', (char *) "srm",       OPT_FLAG,   &SRM,       0 },
     { 'F', (char *) "funky-toy", OPT_FLAG,   &funky_toy, 0 },
 #endif
     { 0,   (char *) NULL,        OPT_END,    NULL,       0 }
@@ -1207,17 +1219,18 @@ main(int argc, char **argv) {
   textdomain(PACKAGE);
 
   /* set option defaults */
-  help = show = set = systohc = hctosys = adjust = getepoch = setepoch = 
-    version = utc = local_opt = ARCconsole = SRM = funky_toy =
-    directisa = badyear = Jensen = testing = debug = FALSE;
+  help = show = set = systohc = hctosys = adjust = noadjfile =
+    getepoch = setepoch = version = utc = local_opt =
+    ARCconsole = SRM = funky_toy = directisa = badyear = Jensen =
+    testing = debug = FALSE;
   date_opt = NULL;
 
   argc_parse = argc; argv_parse = argv;
   optParseOptions(&argc_parse, argv_parse, option_def, 0);
     /* Uses and sets argc_parse, argv_parse. 
        Sets show, systohc, hctosys, adjust, utc, local_opt, version,
-       testing, debug, set, date_opt, getepoch, setepoch, epoch_option
-       */
+       testing, debug, set, date_opt, getepoch, setepoch, epoch_option,
+       noadjtime */
     /* This is an ugly routine - for example, if I give an incorrect
        option, it only says "unrecognized option" without telling
        me what options are recognized. Rewrite with standard
@@ -1245,6 +1258,18 @@ main(int argc, char **argv) {
     exit(100);
   }
 
+  if (adjust && noadjfile) {
+    fprintf(stderr, _("%s: The --adjust and --noadjfile options are mutually "
+                     "exclusive.  You specified both.\n"), MYNAME);
+    exit(100);
+  }
+
+  if (noadjfile && !(utc || local_opt)) {
+    fprintf(stderr, _("%s: With --noadjfile, you must specify either "
+                     "--utc or --localtime\n"), MYNAME);
+    exit(100);
+  }
+
 #ifdef __alpha__
   set_cmos_epoch(ARCconsole, SRM);
   set_cmos_access(Jensen, funky_toy);
@@ -1302,8 +1327,9 @@ main(int argc, char **argv) {
 			_("Use the --debug option to see the details of our "
 			  "search for an access method.\n"));
       } else
-        manipulate_clock(show, adjust, set, set_time, hctosys, systohc, 
-                         startup_time, utc, local_opt, testing, &rc);
+        manipulate_clock(show, adjust, noadjfile, set, set_time,
+			 hctosys, systohc, startup_time, utc, local_opt,
+			 testing, &rc);
     }
   }
   exit(retcode);
diff --git a/hwclock/kd.c b/hwclock/kd.c
index a2f313f6d..f3327e1cc 100644
--- a/hwclock/kd.c
+++ b/hwclock/kd.c
@@ -9,6 +9,7 @@
 
 static int con_fd = -1;		/* opened by probe_for_kd_clock() */
 				/* never closed */
+static char *con_fd_filename;	/* usually "/dev/tty1" */
 
 /* Get defines for KDGHWCLK and KDSHWCLK (m68k) */
 #include <linux/kd.h>
@@ -88,7 +89,7 @@ read_hardware_clock_kd(struct tm *tm) {
   struct hwclk_time t;
 
   if (ioctl(con_fd, KDGHWCLK, &t) == -1) {
-    outsyserr(_("ioctl() failed to read time from  /dev/tty1"));
+    outsyserr(_("ioctl() failed to read time from %s"), con_fd_filename);
     exit(5);
   }
 
@@ -146,22 +147,29 @@ static struct clock_ops kd = {
 /* return &kd if KDGHWCLK works, NULL otherwise */
 struct clock_ops *
 probe_for_kd_clock() {
-    struct clock_ops *ret = NULL;
-    struct hwclk_time t;
-
-    if (con_fd < 0)
-      con_fd = open("/dev/tty1", O_RDONLY);
-    if (con_fd >= 0) {
-      if (ioctl( con_fd, KDGHWCLK, &t ) == -1) {
-        if (errno != EINVAL)
-	 outsyserr(_("KDGHWCLK ioctl failed"));
-      } else
-        ret = &kd;
-    } else {
-      /* probably KDGHWCLK exists on m68k only */
+	struct clock_ops *ret = NULL;
+	struct hwclk_time t;
+
+	if (con_fd < 0) {	/* first time here */
+		con_fd_filename = "/dev/tty1";
+		con_fd = open(con_fd_filename, O_RDONLY);
+	}
+	if (con_fd < 0) {
+		/* perhaps they are using devfs? */
+		con_fd_filename = "/dev/vc/1";
+		con_fd = open(con_fd_filename, O_RDONLY);
+	}
+	if (con_fd < 0) {
+		/* probably KDGHWCLK exists on m68k only */
 #ifdef __m68k__
-      outsyserr(_("Can't open /dev/tty1"));
+		outsyserr(_("Can't open /dev/tty1 or /dev/vc/1"));
 #endif
-    }
-    return ret;
+	} else {
+		if (ioctl(con_fd, KDGHWCLK, &t) == -1) {
+			if (errno != EINVAL)
+				outsyserr(_("KDGHWCLK ioctl failed"));
+		} else
+			ret = &kd;
+	}
+	return ret;
 }
diff --git a/hwclock/rtc.c b/hwclock/rtc.c
index 06ac4360f..2694d8663 100644
--- a/hwclock/rtc.c
+++ b/hwclock/rtc.c
@@ -18,13 +18,6 @@
  * 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. */
@@ -87,38 +80,67 @@ struct linux_rtc_time {
 #endif
 
 
+/* ia64 uses /dev/efirtc (char 10,136) */
+/* devfs uses /dev/misc/rtc */
+#if __ia64__
+#define RTC_DEVN	"efirtc"
+#else
+#define RTC_DEVN	"rtc"
+#endif
+
+static char rtc_dev_name[40];
+
+/* maybe we should not try /dev/misc/efirtc?
+   maybe we should reset rtc_dev_name to give better error messages */
+static int
+open_rtc(void) {
+	int rtc_fd;
+
+	sprintf(rtc_dev_name, "/dev/%s", RTC_DEVN);
+	rtc_fd = open(rtc_dev_name, O_RDONLY);
+	if (rtc_fd < 0) {
+		sprintf(rtc_dev_name, "/dev/misc/%s", RTC_DEVN);
+		rtc_fd = open(rtc_dev_name, O_RDONLY);
+	}
+	return rtc_fd;
+}
+
 static int
 do_rtc_read_ioctl(int rtc_fd, struct tm *tm) {
-  int rc;
-  char *ioctlname;
-#ifdef __sparc__
-  struct sparc_rtc_time stm;
+	int rc = -1;
+	char *ioctlname;
 
-  ioctlname = "RTCGET";
-  rc = ioctl(rtc_fd, RTCGET, &stm);
-#else
-  ioctlname = "RTC_RD_TIME";
-  rc = ioctl(rtc_fd, RTC_RD_TIME, tm);
-#endif
-  if (rc == -1) {
-    perror(ioctlname);
-    fprintf(stderr, _("ioctl() to %s to read the time failed.\n"),RTC_DEV);
-    exit(5);
-  }
 #ifdef __sparc__
-  tm->tm_sec = stm.sec;
-  tm->tm_min = stm.min;
-  tm->tm_hour = stm.hour;
-  tm->tm_mday = stm.dom;
-  tm->tm_mon = stm.month - 1;
-  tm->tm_year = stm.year - 1900;
-  tm->tm_wday = stm.dow - 1;
-  tm->tm_yday = -1;		/* day in the year */
+	/* some but not all sparcs use a different ioctl and struct */
+	struct sparc_rtc_time stm;
+
+	ioctlname = "RTCGET";
+	rc = ioctl(rtc_fd, RTCGET, &stm);
+	if (rc == 0) {
+		tm->tm_sec = stm.sec;
+		tm->tm_min = stm.min;
+		tm->tm_hour = stm.hour;
+		tm->tm_mday = stm.dom;
+		tm->tm_mon = stm.month - 1;
+		tm->tm_year = stm.year - 1900;
+		tm->tm_wday = stm.dow - 1;
+		tm->tm_yday = -1;		/* day in the year */
+	}
 #endif
-  tm->tm_isdst = -1;          /* don't know whether it's daylight */
-  return 0;
-}  
-
+	if (rc == -1) {		/* no sparc, or RTCGET failed */
+		ioctlname = "RTC_RD_TIME";
+		rc = ioctl(rtc_fd, RTC_RD_TIME, tm);
+	}
+	if (rc == -1) {
+		perror(ioctlname);
+		fprintf(stderr, _("ioctl() to %s to read the time failed.\n"),
+			rtc_dev_name);
+		exit(5);
+	}
+
+	tm->tm_isdst = -1;          /* don't know whether it's dst */
+	return 0;
+}
 
 static int
 busywait_for_rtc_clock_tick(const int rtc_fd) {
@@ -133,7 +155,8 @@ busywait_for_rtc_clock_tick(const int rtc_fd) {
   int rc;
 
   if (debug)
-    printf(_("Waiting in loop for time from %s to change\n"),RTC_DEV);
+    printf(_("Waiting in loop for time from %s to change\n"),
+	   rtc_dev_name);
 
   rc = do_rtc_read_ioctl(rtc_fd, &start_time);
   if (rc)
@@ -167,9 +190,9 @@ synchronize_to_clock_tick_rtc(void) {
 int rtc_fd;  /* File descriptor of /dev/rtc */
 int ret;
 
-  rtc_fd = open(RTC_DEV,O_RDONLY);
+  rtc_fd = open(rtc_dev_name, O_RDONLY);
   if (rtc_fd == -1) {
-    outsyserr(_("open() of %s failed"),RTC_DEV);
+    outsyserr(_("open() of %s failed"), rtc_dev_name);
     ret = 1;
   } else {
     int rc;  /* Return code from ioctl */
@@ -187,7 +210,8 @@ int ret;
          kernel for the system clock, so aren't at the user's disposal.
          */
       if (debug)
-	      printf(_("%s does not have interrupt functions. "),RTC_DEV);
+	      printf(_("%s does not have interrupt functions. "),
+		     rtc_dev_name);
       ret = busywait_for_rtc_clock_tick(rtc_fd);
     } else if (rc == 0) {
       unsigned long dummy;
@@ -195,7 +219,8 @@ int ret;
       /* this blocks until the next update interrupt */
       rc = read(rtc_fd, &dummy, sizeof(dummy));
       if (rc == -1) {
-        outsyserr(_("read() to %s to wait for clock tick failed"),RTC_DEV);
+        outsyserr(_("read() to %s to wait for clock tick failed"),
+		  rtc_dev_name);
         ret = 1;
       } else {
         ret = 0;
@@ -203,11 +228,11 @@ int ret;
       /* Turn off update interrupts */
       rc = ioctl(rtc_fd, RTC_UIE_OFF, 0);
       if (rc == -1)
-        outsyserr(_("ioctl() to %s to turn off update interrupts "
-		    "failed"),RTC_DEV);
+        outsyserr(_("ioctl() to %s to turn off update interrupts failed"),
+		  rtc_dev_name);
     } else {
       outsyserr(_("ioctl() to %s to turn on update interrupts "
-		"failed unexpectedly"),RTC_DEV);
+		"failed unexpectedly"), rtc_dev_name);
       ret = 1;
     }
     close(rtc_fd);
@@ -218,69 +243,70 @@ int ret;
 
 static int
 read_hardware_clock_rtc(struct tm *tm) {
-/*----------------------------------------------------------------------------
-  Read the hardware clock and return the current time via <tm>
-  argument.  Use ioctls to "rtc" device /dev/rtc.
------------------------------------------------------------------------------*/
-  int rtc_fd;  /* File descriptor of /dev/rtc */
+	int rtc_fd;
 
-  rtc_fd = open(RTC_DEV,O_RDONLY);
-  if (rtc_fd == -1) {
-    outsyserr(_("open() of %s failed"),RTC_DEV);
-    exit(5);
-  }
+	rtc_fd = open_rtc();
+	if (rtc_fd == -1) {
+		outsyserr(_("open() of %s failed"), rtc_dev_name);
+		exit(5);
+	}
 
-  /* Read the RTC time/date */
-  do_rtc_read_ioctl(rtc_fd, tm);
+	/* Read the RTC time/date, return answer via tm */
+	do_rtc_read_ioctl(rtc_fd, tm);
 
-  close(rtc_fd);
-  return 0;
+	close(rtc_fd);
+	return 0;
 }
 
 
 static int
 set_hardware_clock_rtc(const struct tm *new_broken_time) {
-/*----------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
   Set the Hardware Clock to the broken down time <new_broken_time>.
   Use ioctls to "rtc" device /dev/rtc.
-----------------------------------------------------------------------------*/
-  int rc;
-  int rtc_fd;
-
-  rtc_fd = open(RTC_DEV, O_RDONLY);
-  if (rtc_fd < 0) {
-    outsyserr(_("Unable to open %s"),RTC_DEV);
-    exit(5);
-  } else {
-    char *ioctlname;
+  -------------------------------------------------------------------------*/
+	int rc = -1;
+	int rtc_fd;
+	char *ioctlname;
+
+	rtc_fd = open_rtc();
+	if (rtc_fd < 0) {
+		outsyserr(_("Unable to open %s"), rtc_dev_name);
+		exit(5);
+	}
 #ifdef __sparc__
-    struct sparc_rtc_time stm;
-
-    stm.sec = new_broken_time->tm_sec;
-    stm.min = new_broken_time->tm_min;
-    stm.hour = new_broken_time->tm_hour;
-    stm.dom = new_broken_time->tm_mday;
-    stm.month = new_broken_time->tm_mon + 1;
-    stm.year = new_broken_time->tm_year + 1900;
-    stm.dow = new_broken_time->tm_wday + 1;
-
-    ioctlname = "RTCSET";
-    rc = ioctl(rtc_fd, RTCSET, &stm);
-#else
-    ioctlname = "RTC_SET_TIME";
-    rc = ioctl(rtc_fd, RTC_SET_TIME, new_broken_time);
+	{
+		struct sparc_rtc_time stm;
+
+		stm.sec = new_broken_time->tm_sec;
+		stm.min = new_broken_time->tm_min;
+		stm.hour = new_broken_time->tm_hour;
+		stm.dom = new_broken_time->tm_mday;
+		stm.month = new_broken_time->tm_mon + 1;
+		stm.year = new_broken_time->tm_year + 1900;
+		stm.dow = new_broken_time->tm_wday + 1;
+
+		ioctlname = "RTCSET";
+		rc = ioctl(rtc_fd, RTCSET, &stm);
+	}
 #endif
-    if (rc == -1) {
-      perror(ioctlname);
-      fprintf(stderr, _("ioctl() to %s to set the time failed.\n"),RTC_DEV);
-      exit(5);
-    } else {
-      if (debug)
-        printf(_("ioctl(%s) was successful.\n"), ioctlname);
-    }
-    close(rtc_fd);
-  }
-  return 0;
+	if (rc == -1) {		/* no sparc, or RTCSET failed */
+		ioctlname = "RTC_SET_TIME";
+		rc = ioctl(rtc_fd, RTC_SET_TIME, new_broken_time);
+	}
+
+	if (rc == -1) {
+		perror(ioctlname);
+		fprintf(stderr, _("ioctl() to %s to set the time failed.\n"),
+			rtc_dev_name);
+		exit(5);
+	}
+
+	if (debug)
+		printf(_("ioctl(%s) was successful.\n"), ioctlname);
+
+	close(rtc_fd);
+	return 0;
 }
 
 
@@ -290,7 +316,7 @@ get_permissions_rtc(void) {
 }
 
 static struct clock_ops rtc = {
-	RTC_DEV " interface to clock",
+	"/dev/" RTC_DEVN " interface to clock",
 	get_permissions_rtc,
 	read_hardware_clock_rtc,
 	set_hardware_clock_rtc,
@@ -300,14 +326,14 @@ 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(RTC_DEV, O_RDONLY);
-    if (rtc_fd > 0) {
-      close(rtc_fd);
-      return &rtc;
-    }
-    if (debug)
-      outsyserr(_("Open of %s failed"),RTC_DEV);
-    return NULL;
+	int rtc_fd = open_rtc();
+	if (rtc_fd > 0) {
+		close(rtc_fd);
+		return &rtc;
+	}
+	if (debug)
+		outsyserr(_("Open of %s failed"), rtc_dev_name);
+	return NULL;
 }
 
 
@@ -319,30 +345,31 @@ get_epoch_rtc(unsigned long *epoch_p, int silent) {
 ----------------------------------------------------------------------------*/
   int rtc_fd;
 
-  rtc_fd = open(RTC_DEV, O_RDONLY);
+  rtc_fd = open_rtc();
   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 %s.  This file does not exist on this system.\n"),RTC_DEV);
+                "file %s.  This file does not exist on this system.\n"),
+		rtc_dev_name);
       else 
-        outsyserr(_("Unable to open %s"),RTC_DEV);
+        outsyserr(_("Unable to open %s"), rtc_dev_name);
     }
     return 1;
   }
 
   if (ioctl(rtc_fd, RTC_EPOCH_READ, epoch_p) == -1) {
     if (!silent)
-      outsyserr(_("ioctl(RTC_EPOCH_READ) to %s failed"),RTC_DEV);
+      outsyserr(_("ioctl(RTC_EPOCH_READ) to %s failed"), rtc_dev_name);
     close(rtc_fd);
     return 1;
   }
 
   if (debug)
 	  printf(_("we have read epoch %ld from %s "
-		 "with RTC_EPOCH_READ ioctl.\n"), *epoch_p,RTC_DEV);
+		 "with RTC_EPOCH_READ ioctl.\n"), *epoch_p, rtc_dev_name);
 
   close(rtc_fd);
   return 0;
@@ -366,27 +393,28 @@ set_epoch_rtc(unsigned long epoch) {
     return 1;
   }
 
-  rtc_fd = open(RTC_DEV, O_RDONLY);
+  rtc_fd = open_rtc();
   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 %s.  This file does not exist on this system.\n"),RTC_DEV);
+              "file %s.  This file does not exist on this system.\n"),
+	      rtc_dev_name);
     else
-      outsyserr(_("Unable to open %s"),RTC_DEV);
+      outsyserr(_("Unable to open %s"), rtc_dev_name);
     return 1;
   }
 
   if (debug)
     printf(_("setting epoch to %ld "
-	   "with RTC_EPOCH_SET ioctl to %s.\n"), epoch, RTC_DEV);
+	   "with RTC_EPOCH_SET ioctl to %s.\n"), epoch, rtc_dev_name);
 
   if (ioctl(rtc_fd, RTC_EPOCH_SET, epoch) == -1) {
     if (errno == EINVAL)
       fprintf(stderr, _("The kernel device driver for %s "
-	      "does not have the RTC_EPOCH_SET ioctl.\n"),RTC_DEV);
+	      "does not have the RTC_EPOCH_SET ioctl.\n"), rtc_dev_name);
     else 
-      outsyserr(_("ioctl(RTC_EPOCH_SET) to %s failed"),RTC_DEV);
+      outsyserr(_("ioctl(RTC_EPOCH_SET) to %s failed"), rtc_dev_name);
     close(rtc_fd);
     return 1;
   }
diff --git a/lib/pathnames.h b/lib/pathnames.h
index 9f10a16d4..33886a5c6 100644
--- a/lib/pathnames.h
+++ b/lib/pathnames.h
@@ -148,5 +148,5 @@ Libc5 and glibc 2.0-2.1 have /var/spool/mail, but glibc 2.1.1 has /var/mail.
 #define _PATH_SHADOW_GTMPTMP    "/etc/sgtmptmp"
 
 /* used in misc-utils/look.c */
-#define _PATH_WORDS             "/usr/dict/words"
-#define _PATH_WORDS_ALT         "/usr/dict/web2"
+#define _PATH_WORDS             "/usr/share/dict/words"
+#define _PATH_WORDS_ALT         "/usr/share/dict/web2"
diff --git a/login-utils/Makefile b/login-utils/Makefile
index e6b37b8a1..dc96f8780 100644
--- a/login-utils/Makefile
+++ b/login-utils/Makefile
@@ -83,7 +83,7 @@ all-getty: $(SBIN.GETTY)
 all-misc: $(USRBIN.MISC)
 
 # Rules for everything else
-
+login.o: ../MCONFIG
 checktty.o login.o: login.h
 cryptocard.o login.o: cryptocard.h
 chfn.o chsh.o islocal.o passwd.o: islocal.h
diff --git a/login-utils/agetty.c b/login-utils/agetty.c
index 3a30b16ba..c7f0f3d26 100644
--- a/login-utils/agetty.c
+++ b/login-utils/agetty.c
@@ -683,8 +683,12 @@ open_tty(tty, tp, local)
      * access for group tty) after the login has succeeded.
      */
 
+    /*
+     * Let us use 0600 for Linux for the period between getty and login
+     */
+
     (void) chown(tty, 0, 0);			/* root, sys */
-    (void) chmod(tty, 0622);			/* crw--w--w- */
+    (void) chmod(tty, 0600);			/* 0622: crw--w--w- */
     errno = 0;					/* ignore above errors */
 }
 
diff --git a/login-utils/checktty.c b/login-utils/checktty.c
index e96647ea6..8171f44d2 100644
--- a/login-utils/checktty.c
+++ b/login-utils/checktty.c
@@ -33,7 +33,7 @@
 #include "xstrncpy.h"
 
 #ifdef TESTING
-struct hostent hostaddress;
+char hostaddress[4];
 char *hostname;
 
 void 
@@ -192,10 +192,10 @@ hnmatch(const char *hn, const char *pat)
 	mask = (((unsigned long)y1<<24)+((unsigned long)y2<<16)
 		+((unsigned long)y3<<8)+((unsigned long)y4));
 
-	if (!hostaddress.h_addr_list || !hostaddress.h_addr_list[0])
-	  return 0;
+	if (hostaddress[0] == 0)
+		return 0;
 
-	ha = (unsigned char *)hostaddress.h_addr_list[0];
+	ha = (unsigned char *)hostaddress;
 	a = (((unsigned long)ha[0]<<24)+((unsigned long)ha[1]<<16)
 	     +((unsigned long)ha[2]<<8)+((unsigned long)ha[3]));
 	return ((p & mask) == (a & mask));
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index fd9b5899e..4be7e555f 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -201,11 +201,8 @@ main (int argc, char *argv[]) {
  *	parse the command line arguments, and fill in "pinfo" with any
  *	information from the command line.
  */
-static void parse_argv (argc, argv, pinfo)
-    int argc;
-    char *argv[];
-    struct sinfo *pinfo;
-{
+static void
+parse_argv (int argc, char *argv[], struct sinfo *pinfo) {
     int index, c;
 
     static struct option long_options[] = {
@@ -257,22 +254,20 @@ static void parse_argv (argc, argv, pinfo)
  *  usage () --
  *	print out a usage message.
  */
-static void usage (fp)
-    FILE *fp;
-{
-    fprintf (fp, _("Usage: %s [ -s shell ] "), whoami);
-    fprintf (fp, _("[ --list-shells ] [ --help ] [ --version ]\n"));
-    fprintf (fp, _("       [ username ]\n"));
+static void
+usage (FILE *fp) {
+    fprintf (fp,
+	     _("Usage: %s [ -s shell ] [ --list-shells ] "
+	       "[ --help ] [ --version ]\n"
+	       "       [ username ]\n"), whoami);
 }
 
 /*
  *  prompt () --
  *	ask the user for a given field and return it.
  */
-static char *prompt (question, def_val)
-    char *question;
-    char *def_val;
-{
+static char *
+prompt (char *question, char *def_val) {
     int len;
     char *ans, *cp;
   
@@ -300,9 +295,8 @@ static char *prompt (question, def_val)
  *	an error and return (-1).
  *	if the shell is a bad idea, print a warning.
  */
-static int check_shell (shell)
-    char *shell;
-{
+static int
+check_shell (char *shell) {
     int i, c;
 
     if (*shell != '/') {
@@ -354,9 +348,8 @@ static int check_shell (shell)
  *	return true.  if not, return false.
  *	if the given shell is NULL, /etc/shells is outputted to stdout.
  */
-static boolean get_shell_list (shell_name)
-    char *shell_name;
-{
+static boolean
+get_shell_list (char *shell_name) {
     FILE *fp;
     boolean found;
     int len;
@@ -391,9 +384,8 @@ static boolean get_shell_list (shell_name)
 /*
  *  xmalloc () -- malloc that never fails.
  */
-static void *xmalloc (bytes)
-    int bytes;
-{
+static void *
+xmalloc (int bytes) {
     void *vp;
 
     vp = malloc (bytes);
diff --git a/login-utils/initctl.8 b/login-utils/initctl.8
index 1aa421a02..2fade3f5f 100644
--- a/login-utils/initctl.8
+++ b/login-utils/initctl.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000  Richard Gooch
+.\" Copyright (C) 2000-2001  Richard Gooch
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@
 .\" The postal address is:
 .\"   Richard Gooch, c/o ATNF, P. O. Box 76, Epping, N.S.W., 2121, Australia.
 .\"
-.\"	initctl.8		Richard Gooch	6-NOV-2000
+.\"	initctl.8		Richard Gooch	21-FEB-2001
 .\"
-.TH INITCTL 8 "6 Nov 2000" "Util-Linux Package"
+.TH INITCTL 8 "21 Feb 2001" "Util-Linux Package"
 .SH NAME
 initctl \- utility to control simpleinit(8)
 .SH SYNOPSIS
@@ -30,12 +30,12 @@ initctl \- utility to control simpleinit(8)
 \fBprovide service\fP
 .fi
 .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.
+The \fBinitctl\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
@@ -83,15 +83,15 @@ The exit code from \fBprovide\fP is 0 if the service may be provided,
 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
-it.
+\fBinitctl\fP(8) uses \fBSIGUSR1\fP, \fBSIGUSR2\fP and \fBSIGPOLL\fP
+for communication with \fBsimpleinit\fP(8). Don't send these signals
+to it.
 .SH FILES
 .PD 0
 .TP 20
 .BI /dev/initctl
 This is the control FIFO, created by \fBsimpleinit\fP(8), which
-\fBneed\fP(8) writes commands to.
+\fBinitctl\fP(8) writes commands to.
 .SH SEE ALSO
 .BR simpleinit (8),
 .BR init (8)
diff --git a/login-utils/login.c b/login-utils/login.c
index 1cf188fba..409507396 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -13,11 +13,7 @@
    - The program uses BSD command line options to be used
      in connection with e.g. 'rlogind' i.e. 'new login'.
    
-   - HP features left out:          logging of bad login attempts in /etc/btmp,
-                                    they are sent to syslog
-   
-				    password expiry
-   
+   - HP features left out:	    password expiry
 				    '*' as login shell, add it if you need it
 
    - BSD features left out:         quota checks
@@ -168,23 +164,6 @@
 #include "setproctitle.h"
 #endif
 
-/*
- * RedHat writes:
- * we've got a REAL HACK to avoid telling people that they have
- * mail because the imap server has left a turd in their inbox.
- * It works, but it sucks...
- * It turns out that the turd is always 523 bytes long, so we
- * just check for that size.
- */
-/*
- * If you want to turn this strange hack off, set
-	#define REDHAT_IGNORED_MAILSIZE 0
- * In case people complain, this may become a configuration option,
- * or perhaps this hack is thrown out again.
- * A better solution would be to check the contents of this file..
- */
-#define REDHAT_IGNORED_MAILSIZE	523
-
 #if 0
 /* from before we had a lastlog.h file in linux */
 struct  lastlog
@@ -243,24 +222,26 @@ int     timeout = 60;		/* used in cryptocard.c */
 #endif
 
 struct	passwd *pwd;		/* used in cryptocard.c */
-struct  hostent hostaddress;	/* used in checktty.c */
-char	term[64], *hostname, *username, *tty;
+char    hostaddress[4];		/* used in checktty.c */
+char	*hostname;		/* idem */
+static char	*username, *tty_name, *tty_number;
 static char	thishost[100];
 static int	failures = 1;
 
 #ifndef __linux__
 struct	sgttyb sgttyb;
 struct	tchars tc = {
-    CINTR, CQUIT, CSTART, CSTOP, CEOT, CBRK
-  };
+	CINTR, CQUIT, CSTART, CSTOP, CEOT, CBRK
+};
 struct	ltchars ltc = {
-    CSUSP, CDSUSP, CRPRNT, CFLUSH, CWERASE, CLNEXT
-  };
+	CSUSP, CDSUSP, CRPRNT, CFLUSH, CWERASE, CLNEXT
+};
 #endif
 
-const char *months[] =
-{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
-    "Sep", "Oct", "Nov", "Dec" };
+const char *months[] = {
+	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
 
 /* Nice and simple code provided by Linus Torvalds 16-Feb-93 */
 /* Nonblocking stuff by Maciej W. Rozycki, macro@ds2.pg.gda.pl, 1999.
@@ -271,8 +252,7 @@ const char *months[] =
    leaving the decision to make a connection to getty (where it actually
    belongs). */
 static void
-opentty(const char * tty)
-{
+opentty(const char * tty) {
     int i;
     int fd = open(tty, O_RDWR | O_NONBLOCK);
     int flags = fcntl(fd, F_GETFL);
@@ -290,8 +270,7 @@ opentty(const char * tty)
 
 /* true if the filedescriptor fd is a console tty, very Linux specific */
 static int
-consoletty(int fd)
-{
+consoletty(int fd) {
 #ifdef __linux__
     struct stat stb;
 
@@ -304,6 +283,47 @@ consoletty(int fd)
     return 0;
 }
 
+#if USE_PAM
+/*
+ * Log failed login attempts in _PATH_BTMP if that exists.
+ * Must be called only with username the name of an actual user.
+ * The most common login failure is to give password instead of username.
+ */
+#define	_PATH_BTMP	"/var/log/btmp"
+static void
+logbtmp(const char *line, const char *username, const char *hostname) {
+	struct utmp ut;
+
+	memset(&ut, 0, sizeof(ut));
+
+	strncpy(ut.ut_user, username ? username : "(unknown)",
+		sizeof(ut.ut_user));
+
+	strncpy(ut.ut_id, line + 3, sizeof(ut.ut_id));
+	xstrncpy(ut.ut_line, line, sizeof(ut.ut_line));
+
+#if defined(_HAVE_UT_TV)	    /* in <utmpbits.h> included by <utmp.h> */
+	gettimeofday(&ut.ut_tv, NULL);
+#else
+	{
+		time_t t;
+		time(&t);
+		ut.ut_time = t;	    /* ut_time is not always a time_t */
+	}
+#endif
+
+	ut.ut_type = LOGIN_PROCESS; /* XXX doesn't matter */
+	ut.ut_pid = getpid();
+	if (hostname) {
+		xstrncpy(ut.ut_host, hostname, sizeof(ut.ut_host));
+		if (hostaddress[0])
+			memcpy(&ut.ut_addr, hostaddress, sizeof(ut.ut_addr));
+	}
+#ifdef HAVE_updwtmp		/* bad luck for ancient systems */
+	updwtmp(_PATH_BTMP, &ut);
+#endif
+}
+#endif	/* USE_PAM */
 
 int
 main(int argc, char **argv)
@@ -363,7 +383,7 @@ main(int argc, char **argv)
     xstrncpy(thishost, tbuf, sizeof(thishost));
     domain = index(tbuf, '.');
     
-    username = tty = hostname = NULL;
+    username = tty_name = hostname = NULL;
     fflag = hflag = pflag = 0;
     passwd_req = 1;
 
@@ -383,14 +403,16 @@ main(int argc, char **argv)
 	  if (domain && (p = index(optarg, '.')) &&
 	      strcasecmp(p, domain) == 0)
 	    *p = 0;
+
 	  hostname = strdup(optarg); 	/* strdup: Ambrose C. Li */
-	  { 
-	      struct hostent *he = gethostbyname(hostname);
-	      if (he) {
-		  memcpy(&hostaddress, he, sizeof(hostaddress));
-	      } else {
-		  memset(&hostaddress, 0, sizeof(hostaddress));
-	      }
+	  {
+		  struct hostent *he = gethostbyname(hostname);
+
+		  /* he points to static storage; copy the part we use */
+		  hostaddress[0] = 0;
+		  if (he && he->h_addr_list && he->h_addr_list[0])
+			  memcpy(hostaddress, he->h_addr_list[0],
+				 sizeof(hostaddress));
 	  }
 	  break;
 	  
@@ -430,8 +452,7 @@ main(int argc, char **argv)
     ioctl(0, TIOCSETP, &sgttyb);
     
     /*
-     * Be sure that we're in
-     * blocking mode!!!
+     * Be sure that we're in blocking mode!!!
      * This is really for HPUX
      */
     ioctlval = 0;
@@ -448,16 +469,23 @@ main(int argc, char **argv)
 	ttyn = tname;
     }
 
-#ifdef CHOWNVCS
-    /* find names of Virtual Console devices, for later mode change */
-    {
+    if (strncmp(ttyn, "/dev/", 5) == 0)
+	tty_name = ttyn+5;
+    else
+	tty_name = ttyn;
+
+    if (strncmp(ttyn, "/dev/tty", 8) == 0)
+	tty_number = ttyn+8;
+    else {
 	char *p = ttyn;
-	/* find number of tty */
 	while (*p && !isdigit(*p)) p++;
-
-	strcpy(vcsn, "/dev/vcs"); strcat(vcsn, p);
-	strcpy(vcsan, "/dev/vcsa"); strcat(vcsan, p);
+	tty_number = p;
     }
+
+#ifdef CHOWNVCS
+    /* find names of Virtual Console devices, for later mode change */
+    snprintf(vcsn, sizeof(vcsn), "/dev/vcs%s", tty_number);
+    snprintf(vcsan, sizeof(vcsan), "/dev/vcsa%s", tty_number);
 #endif
 
     setpgrp();
@@ -469,12 +497,15 @@ main(int argc, char **argv)
 	ttt = tt;
 	ttt.c_cflag &= ~HUPCL;
 
-	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();
-	    signal(SIGHUP, SIG_DFL);
-	}
+	/* These can fail, e.g. with ttyn on a read-only filesystem */
+	chown(ttyn, 0, 0);
+	chmod(ttyn, TTY_MODE);
+
+	/* Kill processes left on this tty */
+	tcsetattr(0,TCSAFLUSH,&ttt);
+	signal(SIGHUP, SIG_IGN); /* so vhangup() wont kill us */
+	vhangup();
+	signal(SIGHUP, SIG_DFL);
 	
 	setsid();
 	
@@ -484,11 +515,6 @@ main(int argc, char **argv)
 	tcsetattr(0,TCSAFLUSH,&tt);
     }
 
-    if (strncmp(ttyn, "/dev/", 5) == 0)
-	tty = ttyn+5;
-    else
-	tty = ttyn;
-
     openlog("login", LOG_ODELAY, LOG_AUTHPRIV);
 
 #if 0
@@ -515,7 +541,7 @@ main(int argc, char **argv)
        depending on how much we know */
     retcode = pam_set_item(pamh, PAM_RHOST, hostname);
     PAM_FAIL_CHECK;
-    retcode = pam_set_item(pamh, PAM_TTY, tty);
+    retcode = pam_set_item(pamh, PAM_TTY, tty_name);
     PAM_FAIL_CHECK;
 
     /*
@@ -545,6 +571,11 @@ main(int argc, char **argv)
     if(passwd_req == 1) {
 	int failcount=0;
 
+	/* if we didn't get a user on the command line, set it to NULL */
+	pam_get_item(pamh,  PAM_USER, (const void **) &username);
+	if (!username)
+		pam_set_item(pamh, PAM_USER, NULL);
+
 	/* there may be better ways to deal with some of these
 	   conditions, but at least this way I don't think we'll
 	   be giving away information... */
@@ -558,8 +589,11 @@ main(int argc, char **argv)
 	       (retcode == PAM_CRED_INSUFFICIENT) ||
 	       (retcode == PAM_AUTHINFO_UNAVAIL))) {
 	    pam_get_item(pamh, PAM_USER, (const void **) &username);
+
 	    syslog(LOG_NOTICE,_("FAILED LOGIN %d FROM %s FOR %s, %s"),
-	    failcount, hostname, username, pam_strerror(pamh, retcode));
+		   failcount, hostname, username, pam_strerror(pamh, retcode));
+	    logbtmp(tty_name, username, hostname);
+
 	    fprintf(stderr,_("Login incorrect\n\n"));
 	    pam_set_item(pamh,PAM_USER,NULL);
 	    retcode = pam_authenticate(pamh, 0);
@@ -568,13 +602,14 @@ main(int argc, char **argv)
 	if (retcode != PAM_SUCCESS) {
 	    pam_get_item(pamh, PAM_USER, (const void **) &username);
 
-	    if (retcode == PAM_MAXTRIES) 
+	    if (retcode == PAM_MAXTRIES)
 		syslog(LOG_NOTICE,_("TOO MANY LOGIN TRIES (%d) FROM %s FOR "
 			"%s, %s"), failcount, hostname, username,
 			 pam_strerror(pamh, retcode));
 	    else
 		syslog(LOG_NOTICE,_("FAILED LOGIN SESSION FROM %s FOR %s, %s"),
 			hostname, username, pam_strerror(pamh, retcode));
+	    logbtmp(tty_name, username, hostname);
 
 	    fprintf(stderr,_("\nLogin incorrect\n"));
 	    pam_end(pamh, retcode);
@@ -651,7 +686,7 @@ main(int argc, char **argv)
 	
 	if (pwd) {
 	    initgroups(username, pwd->pw_gid);
-	    checktty(username, tty, pwd); /* in checktty.c */
+	    checktty(username, tty_name, pwd); /* in checktty.c */
 	}
 	
 	/* if user not super-user, check for disabled logins */
@@ -673,7 +708,7 @@ main(int argc, char **argv)
 	 * If trying to log in as root, but with insecure terminal,
 	 * refuse the login attempt.
 	 */
-	if (pwd && pwd->pw_uid == 0 && !rootterm(tty)) {
+	if (pwd && pwd->pw_uid == 0 && !rootterm(tty_name)) {
 	    fprintf(stderr,
 		    _("%s login refused on this terminal.\n"),
 		    pwd->pw_name);
@@ -681,11 +716,11 @@ main(int argc, char **argv)
 	    if (hostname)
 	      syslog(LOG_NOTICE,
 		     _("LOGIN %s REFUSED FROM %s ON TTY %s"),
-		     pwd->pw_name, hostname, tty);
+		     pwd->pw_name, hostname, tty_name);
 	    else
 	      syslog(LOG_NOTICE,
 		     _("LOGIN %s REFUSED ON TTY %s"),
-		     pwd->pw_name, tty);
+		     pwd->pw_name, tty_name);
 	    continue;
 	}
 
@@ -833,8 +868,8 @@ Michael Riepe <michael@stud.uni-hannover.de>
 	if (utp == NULL) {
 	     setutent();
 	     ut.ut_type = LOGIN_PROCESS;
-	     strncpy(ut.ut_id, ttyn + 8, sizeof(ut.ut_id));
-	     strncpy(ut.ut_line, ttyn + 5, sizeof(ut.ut_line));
+	     strncpy(ut.ut_id, tty_number, sizeof(ut.ut_id));
+	     strncpy(ut.ut_line, tty_name, sizeof(ut.ut_line));
 	     utp = getutid(&ut);
 	}
 	
@@ -846,27 +881,26 @@ Michael Riepe <michael@stud.uni-hannover.de>
 	}
 	
 	if (ut.ut_id[0] == 0)
-	  strncpy(ut.ut_id, ttyn + 8, sizeof(ut.ut_id));
+	  strncpy(ut.ut_id, tty_number, sizeof(ut.ut_id));
 	
 	strncpy(ut.ut_user, username, sizeof(ut.ut_user));
-	xstrncpy(ut.ut_line, ttyn + 5, sizeof(ut.ut_line));
+	xstrncpy(ut.ut_line, tty_name, sizeof(ut.ut_line));
 #ifdef _HAVE_UT_TV		/* in <utmpbits.h> included by <utmp.h> */
 	gettimeofday(&ut.ut_tv, NULL);
 #else
 	{
-	  time_t t;
-	  time(&t);
-	  ut.ut_time = t;	/* ut_time is not always a time_t */
+	    time_t t;
+	    time(&t);
+	    ut.ut_time = t;	/* ut_time is not always a time_t */
 				/* glibc2 #defines it as ut_tv.tv_sec */
 	}
 #endif
 	ut.ut_type = USER_PROCESS;
 	ut.ut_pid = mypid;
 	if (hostname) {
-	    xstrncpy(ut.ut_host, hostname, sizeof(ut.ut_host));
-	    if (hostaddress.h_addr_list)
-	      memcpy(&ut.ut_addr, hostaddress.h_addr_list[0],
-		     sizeof(ut.ut_addr));
+		xstrncpy(ut.ut_host, hostname, sizeof(ut.ut_host));
+		if (hostaddress[0])
+			memcpy(&ut.ut_addr, hostaddress, sizeof(ut.ut_addr));
 	}
 	
 	pututline(&ut);
@@ -980,14 +1014,12 @@ Michael Riepe <michael@stud.uni-hannover.de>
 #ifdef USE_PAM
     {
 	int i;
-	const char * const * env;
-
-	env = (const char * const *)pam_getenvlist(pamh);
+	char ** env = pam_getenvlist(pamh);
 
 	if (env != NULL) {
-	    for (i=0; env[i++]; ) {
-		putenv(env[i-1]);
-		/* D(("env[%d] = %s", i-1,env[i-1])); */
+	    for (i=0; env[i]; i++) {
+		putenv(env[i]);
+		/* D(("env[%d] = %s", i,env[i])); */
 	    }
 	}
     }
@@ -997,8 +1029,8 @@ Michael Riepe <michael@stud.uni-hannover.de>
     setproctitle("login", username);
 #endif
     
-    if (tty[sizeof("tty")-1] == 'S')
-      syslog(LOG_INFO, _("DIALUP AT %s BY %s"), tty, pwd->pw_name);
+    if (!strncmp(tty_name, "ttyS", 4))
+      syslog(LOG_INFO, _("DIALUP AT %s BY %s"), tty_name, pwd->pw_name);
     
     /* allow tracking of good logins.
        -steve philp (sphilp@mail.alliance.net) */
@@ -1006,15 +1038,15 @@ Michael Riepe <michael@stud.uni-hannover.de>
     if (pwd->pw_uid == 0) {
 	if (hostname)
 	  syslog(LOG_NOTICE, _("ROOT LOGIN ON %s FROM %s"),
-		 tty, hostname);
+		 tty_name, hostname);
 	else
-	  syslog(LOG_NOTICE, _("ROOT LOGIN ON %s"), tty);
+	  syslog(LOG_NOTICE, _("ROOT LOGIN ON %s"), tty_name);
     } else {
 	if (hostname) 
-	  syslog(LOG_INFO, _("LOGIN ON %s BY %s FROM %s"), tty, 
+	  syslog(LOG_INFO, _("LOGIN ON %s BY %s FROM %s"), tty_name, 
 		 pwd->pw_name, hostname);
 	else 
-	  syslog(LOG_INFO, _("LOGIN ON %s BY %s"), tty, 
+	  syslog(LOG_INFO, _("LOGIN ON %s BY %s"), tty_name, 
 		 pwd->pw_name);
     }
     
@@ -1024,8 +1056,7 @@ Michael Riepe <michael@stud.uni-hannover.de>
 	
 	motd();
 	mail = getenv("MAIL");
-	if (mail && stat(mail, &st) == 0 && st.st_size != 0
-		 && st.st_size != REDHAT_IGNORED_MAILSIZE) {
+	if (mail && stat(mail, &st) == 0 && st.st_size != 0) {
 		printf(_("You have %smail.\n"),
 		       (st.st_mtime > st.st_atime) ? _("new ") : "");
 	}
@@ -1034,7 +1065,6 @@ Michael Riepe <michael@stud.uni-hannover.de>
     signal(SIGALRM, SIG_DFL);
     signal(SIGQUIT, SIG_DFL);
     signal(SIGTSTP, SIG_IGN);
-    signal(SIGHUP, SIG_DFL);
 
 #ifdef USE_PAM
     /*
@@ -1048,6 +1078,8 @@ Michael Riepe <michael@stud.uni-hannover.de>
      * Solution: use TIOCNOTTY and setsid().
      */
     signal(SIGINT, SIG_IGN);
+    signal(SIGHUP, SIG_IGN);	/* ignore signal from TIOCNOTTY below */
+    
     childPid = fork();
     if (childPid < 0) {
        int errsv = errno;
@@ -1057,7 +1089,6 @@ Michael Riepe <michael@stud.uni-hannover.de>
        exit(0);
     } else if (childPid) {
        /* parent - wait for child to finish, then cleanup session */
-       signal(SIGHUP, SIG_IGN);		/* ignore signal from TIOCNOTTY */
        ioctl(0, TIOCNOTTY, NULL);
        signal(SIGHUP, SIG_DFL);
 
@@ -1067,7 +1098,10 @@ Michael Riepe <michael@stud.uni-hannover.de>
     }
     /* child */
     setsid();
+    /* reopen, as we need controlling tty in the child */
+    opentty(ttyn);
 #endif
+    signal(SIGHUP, SIG_DFL);
     signal(SIGINT, SIG_DFL);
     
     /* discard permissions last so can't get killed and drop core */
@@ -1192,7 +1226,7 @@ rootterm(char * ttyn)
 {
     struct ttyent *t;
     
-    return((t = getttynam(ttyn)) && t->ty_status&TTY_SECURE);
+    return((t = getttynam(ttyn)) && (t->ty_status&TTY_SECURE));
 }
 #else
 { 
@@ -1286,7 +1320,7 @@ dolastlog(int quiet) {
 	}
 	memset((char *)&ll, 0, sizeof(ll));
 	time(&ll.ll_time);
-	xstrncpy(ll.ll_line, tty, sizeof(ll.ll_line));
+	xstrncpy(ll.ll_line, tty_name, sizeof(ll.ll_line));
 	if (hostname)
 	    xstrncpy(ll.ll_host, hostname, sizeof(ll.ll_host));
 
@@ -1296,22 +1330,21 @@ dolastlog(int quiet) {
 }
 
 void
-badlogin(const char *name)
-{
+badlogin(const char *name) {
     if (failures == 1) {
 	if (hostname)
 	  syslog(LOG_NOTICE, _("LOGIN FAILURE FROM %s, %s"),
 		 hostname, name);
 	else
 	  syslog(LOG_NOTICE, _("LOGIN FAILURE ON %s, %s"),
-		 tty, name);
+		 tty_name, name);
     } else {
 	if (hostname)
 	  syslog(LOG_NOTICE, _("%d LOGIN FAILURES FROM %s, %s"),
 		 failures, hostname, name);
 	else
 	  syslog(LOG_NOTICE, _("%d LOGIN FAILURES ON %s, %s"),
-		 failures, tty, name);
+		 failures, tty_name, name);
     }
 }
 
diff --git a/login-utils/login.h b/login-utils/login.h
index 14b698e32..c64502dcc 100644
--- a/login-utils/login.h
+++ b/login-utils/login.h
@@ -1,7 +1,7 @@
 /* defined in login.c */
 extern void badlogin(const char *s);
 extern void sleepexit(int);
-extern struct hostent hostaddress;
+extern char hostaddress[4];
 extern char *hostname;
 
 /* defined in checktty.c */
diff --git a/login-utils/shutdown.c b/login-utils/shutdown.c
index 036064aad..c7efe746e 100644
--- a/login-utils/shutdown.c
+++ b/login-utils/shutdown.c
@@ -46,6 +46,9 @@
  * - do not unmount devfs (otherwise get harmless but annoying messages)
  * - created syncwait() for faster shutting down
  * - kill getty processes
+ * 2001-05-12 Richard Gooch <rgooch@atnf.csiro.au>
+ * - unblock all signals (sigmask from simpleinit(8) stopped sleep(3))
+ * - close all files
  */
 
 #include <stdio.h>
@@ -137,14 +140,18 @@ iswhitespace(int a) {
 int
 main(int argc, char *argv[])
 {
-	int c,i;	
-	int fd;
+	int c, i, fd;
 	char *ptr;
 
-	if (getpid () == 1) {
-		for (i = 0; i < getdtablesize (); i++) close (i);
-		while (1) wait (NULL);  /*  Grim reaper never stops  */
+	i = getdtablesize ();
+	for (fd = 3; fd < i; fd++) close (fd);
+	if (getpid () == 1)
+	{
+	    for (fd = 0; fd < 3; fd++) close (fd);
+	    while (1) wait (NULL);  /*  Grim reaper never stops  */
 	}
+	sigsetmask (0); /*  simpleinit(8) blocks all signals: undo for ALRM  */
+	for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
@@ -373,6 +380,7 @@ main(int argc, char *argv[])
 #ifndef DEBUGGING
 	/* a gentle kill of all other processes except init */
 	kill_mortals (SIGTERM);
+	for (fd = 0; fd < 3; fd++) close (fd);
 	stop_finalprog ();
 	sleep (1);                    /*  Time for saves to start           */
 	kill (1, SIGTERM);            /*  Tell init to kill spawned gettys  */
@@ -381,11 +389,10 @@ main(int argc, char *argv[])
 	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 */
+	kill (-1, SIGTERM);
+	sleep (2);                    /*  Default 2, some people need 5     */
 
-	/* now use brute force... */
-	kill(-1, SIGKILL);
+	kill (-1, SIGKILL);           /*  Now use brute force...            */
 
 	/* turn off accounting */
 	acct(NULL);
@@ -472,7 +479,8 @@ write_user(struct utmp *ut)
 	if((fd = open(term, O_WRONLY|O_NONBLOCK)) < 0)
 	        return;
 
-	sprintf(msg, _("\007URGENT: broadcast message from %s:"), whom);
+	msg[0] = '\007';	/* gettext crashes on \a */
+	sprintf(msg+1, _("URGENT: broadcast message from %s:"), whom);
 	WRCRLF;
 	WR(msg);
 	WRCRLF;
diff --git a/login-utils/simpleinit.8 b/login-utils/simpleinit.8
index f367f2f63..2c3e08b2b 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 "4 November 2000" "Linux 0.99" "Linux Programmer's Manual"
+.TH SIMPLEINIT 8 "25 February 2001" "Linux 0.99" "Linux Programmer's Manual"
 .SH NAME
 simpleinit \- process control initialization
 .SH SYNOPSIS
@@ -97,12 +97,15 @@ 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.
+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 and the boot programme is a directory, that directory is used.
+Finally, if the script cannot be found in this path, the standard
+\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
@@ -151,7 +154,7 @@ remount (read-only) the root filesystem, even if the old inode for the
 .BR getty (8),
 .BR agetty (8),
 .BR shutdown (8),
-.BR need (8)
+.BR initctl (8)
 .SH BUGS
 This program is called
 .B simpleinit
diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c
index 56f10455a..9c08a03a6 100644
--- a/login-utils/simpleinit.c
+++ b/login-utils/simpleinit.c
@@ -1,5 +1,5 @@
 /* simpleinit.c - poe@daimi.aau.dk */
-/* Version 2.0.1 */
+/* Version 2.0.2 */
 
 /* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  * - added Native Language Support
@@ -9,6 +9,10 @@
  * - fixed race when reading from pipe and reaping children
  * 2001-02-18 sam@quux.dropbear.id.au
  * - fixed bug in <get_path>: multiple INIT_PATH components did not work
+ * 2001-02-21 Richard Gooch <rgooch@atnf.csiro.au>
+ * - block signals in handlers, so that longjmp() doesn't kill context
+ * 2001-02-25 Richard Gooch <rgooch@atnf.csiro.au>
+ * - make default INIT_PATH the boot_prog (if it is a directory) - YECCH
  */
 
 #include <sys/types.h>
@@ -76,6 +80,8 @@ 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 int no_reboot = 0;
+static pid_t rc_child = -1;
 static const char *initctl_name = "/dev/initctl";
 static int initctl_fd = -1;
 static volatile int do_longjmp = 0;
@@ -89,9 +95,9 @@ 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);
 static void spawn (int i), read_inittab (void);
-static void hup_handler (int sig);
+static void sighup_handler (int sig);
 static void sigtstp_handler (int sig);
-static void int_handler (int sig);
+static void sigint_handler (int sig);
 static void sigchild_handler (int sig);
 static void sigquit_handler (int sig);
 static void sigterm_handler (int sig);
@@ -134,7 +140,7 @@ static void enter_single (void)
 
 int main(int argc, char *argv[])
 {
-	int			vec,i;
+	int			vec, i;
 	int			want_single = 0;
 	pid_t			pid;
 	struct sigaction	sa;
@@ -143,8 +149,10 @@ int main(int argc, char *argv[])
 #ifdef SET_TZ
 	set_tz();
 #endif
-	signal (SIGINT, int_handler);
-	sigemptyset (&sa.sa_mask);
+	sigfillset (&sa.sa_mask);  /*  longjmp and nested signals don't mix  */
+	sa.sa_flags = SA_ONESHOT;
+	sa.sa_handler = sigint_handler;
+	sigaction (SIGINT, &sa, NULL);
 	sa.sa_flags = 0;
 	sa.sa_handler = sigtstp_handler;
 	sigaction (SIGTSTP, &sa, NULL);
@@ -166,6 +174,7 @@ int main(int argc, char *argv[])
 	read_inittab ();
 	for (i = 1; i < argc; i++) {
 		if (strcmp (argv[i], "single") == 0) want_single = 1;
+		else if (strcmp (argv[i], "-noreboot") == 0) no_reboot = 1;
 		else {
 			char path[PATH_SIZE];
 
@@ -175,6 +184,17 @@ int main(int argc, char *argv[])
 				strcpy (boot_prog, path);
 		}
 	}
+	if (init_path[0] == '\0')
+	{
+	    struct stat statbuf;
+
+	    if ( (stat (boot_prog, &statbuf) == 0) && S_ISDIR (statbuf.st_mode) )
+	    {
+		strcpy (init_path, boot_prog);
+		i = strlen (init_path);
+		if (init_path[i - 1] == '/') init_path[i - 1] = '\0';
+	    }
+	}
 
 	if ( ( initctl_fd = open (initctl_name, O_RDWR, 0) ) < 0 ) {
 		mkfifo (initctl_name, S_IRUSR | S_IWUSR);
@@ -185,12 +205,12 @@ int main(int argc, char *argv[])
 	if ( want_single || (access (_PATH_SINGLE, R_OK) == 0) ) do_single ();
 
 	/*If we get a SIGTSTP before multi-user mode, do nothing*/
-	while(stopped)	
+	while (stopped)
 		pause();
 
 	if ( do_rc_tty (boot_prog) ) do_single ();
 
-	while(stopped)	/*Also if /etc/rc fails & we get SIGTSTP*/
+	while (stopped)  /*  Also if /etc/rc fails & we get SIGTSTP  */
 		pause();
 
 	write_wtmp();	/* write boottime record */
@@ -204,7 +224,7 @@ int main(int argc, char *argv[])
 	}
 	exit(0);
 #endif
-	signal(SIGHUP, hup_handler);
+	signal (SIGHUP, sighup_handler);  /* Better semantics with signal(2) */
 
 	for (i = 0; i < getdtablesize (); i++)
 		if (i != initctl_fd) close (i);
@@ -326,14 +346,14 @@ static void do_single (void)
 static int do_rc_tty (const char *path)
 {
     int status;
-    pid_t pid, child;
+    pid_t pid;
     sigset_t ss;
 
     if (caught_sigint) return 0;
     process_path (path, preload_file, 0);
     /*  Launch off a subprocess to start a new session (required for frobbing
 	the TTY) and capture control-C  */
-    switch ( child = fork () )
+    switch ( rc_child = fork () )
     {
       case 0:   /*  Child  */
 	for (status = 1; status < NSIG; status++) signal (status, SIG_DFL);
@@ -355,12 +375,12 @@ static int do_rc_tty (const char *path)
     process_path (path, run_file, 0);
     while (1)
     {
-	if ( ( pid = mywait (&status) ) == child )
+	if ( ( pid = mywait (&status) ) == rc_child )
 	    return (WTERMSIG (status) == SIGINT) ? 0 : 1;
 	if (pid < 0) break;
     }
-    kill (child, SIGKILL);
-    while (waitpid (child, NULL, 0) != child)  /*  Nothing  */;
+    kill (rc_child, SIGKILL);
+    while (waitpid (rc_child, NULL, 0) != rc_child)  /*  Nothing  */;
     return 0;
 }   /*  End Function do_rc_tty  */
 
@@ -601,17 +621,16 @@ static void read_inittab (void)
 		if (access (path, R_OK | X_OK) == 0)
 			strcpy (boot_prog, path);
 	}
-}
+}   /*  End Function read_inittab  */
 
-static void hup_handler (int sig)
+static void sighup_handler (int sig)
 {
 	int i,j;
 	int oldnum;
 	struct initline	savetab[NUMCMD];
 	int had_already;
 
-	(void) signal(SIGHUP, SIG_IGN);
-
+	signal (SIGHUP, SIG_IGN);
 	memcpy(savetab, inittab, NUMCMD * sizeof(struct initline));
 	oldnum = numcmd;		
 	read_inittab ();
@@ -625,16 +644,15 @@ static void hup_handler (int sig)
 					spawn(i);
 			}
 		}
-		if(!had_already) spawn(i);
+		if (!had_already) spawn (i);
 	}
-	
-	(void) signal(SIGHUP, hup_handler);
-}
+	signal (SIGHUP, sighup_handler);
+}   /*  End Function sighup_handler  */
 
 static void sigtstp_handler (int sig)
 {
     stopped = ~stopped;
-    if (!stopped) hup_handler (sig);
+    if (!stopped) sighup_handler (sig);
 }   /*  End Function sigtstp_handler  */
 
 static void sigterm_handler (int sig)
@@ -645,22 +663,23 @@ static void sigterm_handler (int sig)
 	if (inittab[i].pid > 0) kill (inittab[i].pid, SIGTERM);
 }   /*  End Function sigterm_handler  */
 
-static void int_handler (int sig)
+static void sigint_handler (int sig)
 {
-	pid_t pid;
-	
-	caught_sigint = 1;
-	sync();
-	sync();
-	pid = fork();
-	if (pid > 0)
-		return;
-	if (pid == 0) 	/* reboot properly... */
-		execl(_PATH_REBOOT, _PATH_REBOOT, (char *)0);
+    pid_t pid;
 
-	/* fork or exec failed, try the hard way... */
-	my_reboot(LINUX_REBOOT_CMD_RESTART);
-}
+    caught_sigint = 1;
+    kill (rc_child, SIGKILL);
+    if (no_reboot) _exit (1) /*kill (0, SIGKILL)*/;
+    sync ();
+    sync ();
+    pid = fork ();
+    if (pid > 0) return;  /*  Parent                     */
+    if (pid == 0) 	  /*  Child: reboot properly...  */
+	execl (_PATH_REBOOT, _PATH_REBOOT, (char *) 0);
+
+    /* fork or exec failed, try the hard way... */
+    my_reboot (LINUX_REBOOT_CMD_RESTART);
+}   /*  End Function sigint_handler  */
 
 static void sigchild_handler (int sig)
 {
@@ -708,7 +727,7 @@ static void write_wtmp (void)
 	flock(lf, LOCK_UN|LOCK_NB);
 	close(lf);
     }
-}     
+}   /*  End Function write_wtmp  */
 
 
 struct needer_struct
@@ -885,7 +904,9 @@ static void process_command (const struct command_struct *command)
 		dup2 (1, 2);
 		execlp (get_path (victim->first_service->name),
 			victim->first_service->name, "stop", NULL);
-		err ( _("error running programme\n") );
+		sprintf (txt, _("error stopping service: \"%s\""),
+			 victim->first_service->name);
+		err (txt);
 		_exit (SIG_NOT_STOPPED);
 	    }
 	    else if (pid == -1) break;      /*  Error   */
diff --git a/login-utils/wall.c b/login-utils/wall.c
index 3a13fe7ba..744c910f0 100644
--- a/login-utils/wall.c
+++ b/login-utils/wall.c
@@ -199,7 +199,8 @@ makemsg(fname)
 			exit(1);
 		}
 		if (!freopen(fname, "r", stdin)) {
-			fprintf(stderr, _("%s: can't read %s.\n"), progname, fname);
+			fprintf(stderr, _("%s: can't read %s.\n"),
+				progname, fname);
 			exit(1);
 		}
 	}
@@ -212,16 +213,16 @@ makemsg(fname)
 				putc('\r', fp);
 				putc('\n', fp);
 				cnt = 0;
-			} else {
-				carefulputc(ch, fp);
 			}
+			carefulputc(ch, fp);
 		}
 	}
-	(void)fprintf(fp, "%79s\r\n", " ");
+	fprintf(fp, "%79s\r\n", " ");
 	rewind(fp);
 
 	if (fstat(fd, &sbuf)) {
-		(void)fprintf(stderr, _("%s: can't stat temporary file.\n"), progname);
+		fprintf(stderr, _("%s: can't stat temporary file.\n"),
+			progname);
 		exit(1);
 	}
 	mbufsize = sbuf.st_size;
diff --git a/misc-utils/Makefile b/misc-utils/Makefile
index 9fedca66d..8edf14ed3 100644
--- a/misc-utils/Makefile
+++ b/misc-utils/Makefile
@@ -11,7 +11,7 @@ include ../MCONFIG
 
 MAN1= 		cal.1 chkdupexe.1 ddate.1 kill.1 \
 		logger.1 look.1 mcookie.1 namei.1 rename.1 script.1 \
-		whereis.1 write.1
+		whereis.1
 
 # Where to put binaries?
 # See the "install" rule for the links. . .
@@ -19,7 +19,7 @@ MAN1= 		cal.1 chkdupexe.1 ddate.1 kill.1 \
 BIN=            kill
 
 USRBIN=		cal chkdupexe ddate logger look mcookie \
-		namei rename script whereis write
+		namei rename script whereis
 
 MAYBE=		reset setterm
 
@@ -28,6 +28,11 @@ USRBIN:=$(USRBIN) reset
 MAN1:=$(MAN1) reset.1
 endif
 
+ifeq "$(HAVE_WRITE)" "no"
+USRBIN:=$(USRBIN) write
+MAN1:=$(MAN1) write.1
+endif
+
 ifeq "$(HAVE_NCURSES)" "yes"
 USRBIN:=$(USRBIN) setterm
 MAN1:=$(MAN1) setterm.1
@@ -89,10 +94,12 @@ install: all
 	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
 	$(INSTALLDIR) $(MAN1DIR) $(MAN8DIR)
 	$(INSTALLMAN) $(MAN1) $(MAN1DIR)
+ifeq "$(HAVE_WRITE)" "no"
 ifeq "$(USE_TTY_GROUP)" "yes"
 	chgrp tty $(USRBINDIR)/write
 	chmod g+s $(USRBINDIR)/write
 endif
+endif
 
 .PHONY:	clean
 clean:
diff --git a/misc-utils/cal.1 b/misc-utils/cal.1
index 9bade9d0b..d16d30500 100644
--- a/misc-utils/cal.1
+++ b/misc-utils/cal.1
@@ -43,7 +43,7 @@
 .Sh SYNOPSIS
 .Nm cal
 .Op Fl mjy13
-.Op Ar month Op Ar year
+.Op [ Ar month ] Ar year
 .Sh DESCRIPTION
 .Nm Cal
 displays a simple calendar.
diff --git a/misc-utils/look.1 b/misc-utils/look.1
index 2ab162c86..5233f700a 100644
--- a/misc-utils/look.1
+++ b/misc-utils/look.1
@@ -64,7 +64,7 @@ is invoked with).
 If
 .Ar file
 is not specified, the file
-.Pa /usr/dict/words
+.Pa /usr/share/dict/words
 is used, only alphanumeric characters are compared and the case of
 alphabetic characters is ignored.
 .Pp
@@ -77,7 +77,7 @@ are compared.
 Ignore the case of alphabetic characters.
 .It Fl a
 Use the alternate dictionary
-.Pa /usr/dict/web2
+.Pa /usr/share/dict/web2
 .It Fl t
 Specify a string termination character, i.e. only the characters
 in
@@ -92,10 +92,10 @@ The
 utility exits 0 if one or more lines were found and displayed,
 1 if no lines were found, and >1 if an error occurred.
 .Sh FILES
-.Bl -tag -width /usr/dict/words -compact
-.It Pa /usr/dict/words
+.Bl -tag -width /usr/share/dict/words -compact
+.It Pa /usr/share/dict/words
 the dictionary
-.It Pa /usr/dict/web2
+.It Pa /usr/share/dict/web2
 the alternate dictionary
 .El
 .Sh SEE ALSO
diff --git a/misc-utils/script.c b/misc-utils/script.c
index 951fc763d..de158cd35 100644
--- a/misc-utils/script.c
+++ b/misc-utils/script.c
@@ -67,6 +67,7 @@
 void finish(int);
 void done(void);
 void fail(void);
+void resize(int);
 void fixtty(void);
 void getmaster(void);
 void getslave(void);
@@ -189,7 +190,8 @@ main(int argc, char **argv) {
 			dooutput();
 		else
 			doshell();
-	}
+	} else
+		(void) signal(SIGWINCH, resize);
 	doinput();
 
 	return 0;
@@ -201,9 +203,7 @@ doinput() {
 	char ibuf[BUFSIZ];
 
 	(void) fclose(fscript);
-#ifdef HAVE_openpty
-	(void) close(slave);
-#endif
+
 	while ((cc = read(0, ibuf, BUFSIZ)) > 0)
 		(void) write(master, ibuf, cc);
 	done();
@@ -226,6 +226,15 @@ finish(int dummy) {
 }
 
 void
+resize(int dummy) {
+	/* transmit window change information to the child */
+	(void) ioctl(0, TIOCGWINSZ, (char *)&win);
+	(void) ioctl(slave, TIOCSWINSZ, (char *)&win);
+
+	kill(child, SIGWINCH);
+}
+
+void
 dooutput() {
 	register int cc;
 	time_t tvec;
diff --git a/mount/Makefile b/mount/Makefile
index ef65601f7..453b640ae 100644
--- a/mount/Makefile
+++ b/mount/Makefile
@@ -44,11 +44,11 @@ install: $(PROGS)
 
 mount: mount.o fstab.o sundries.o realpath.o mntent.o version.o \
        mount_guess_fstype.o mount_by_label.o getusername.o \
-       $(LIB)/setproctitle.o $(NFS_OBJS) $(LO_OBJS)
+       $(LIB)/setproctitle.o $(LIB)/env.o $(NFS_OBJS) $(LO_OBJS)
 	$(LINK) $^ -o $@
 
 umount: umount.o fstab.o sundries.o realpath.o mntent.o getusername.o \
-	version.o $(LO_OBJS)
+	version.o $(LIB)/env.o $(LO_OBJS)
 	$(LINK) $^ -o $@
 
 swapon:	swapon.o version.o
diff --git a/mount/linux_fs.h b/mount/linux_fs.h
index 043ac16a7..978573892 100644
--- a/mount/linux_fs.h
+++ b/mount/linux_fs.h
@@ -48,12 +48,18 @@ struct ext_super_block {
 
 #define EXT2_PRE_02B_MAGIC  0xEF51
 #define EXT2_SUPER_MAGIC    0xEF53
+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004
 struct ext2_super_block {
-	u_char   s_dummy1[56];
-	u_char   s_magic[2];
-	u_char   s_dummy2[46];
-	u_char   s_uuid[16];
-	u_char   s_volume_name[16];
+	u_char 	s_dummy1[56];
+	u_char 	s_magic[2];
+	u_char	s_dummy2[34];
+	u_char	s_feature_compat[4];
+	u_char	s_feature_incompat[4];
+	u_char	s_feature_ro_compat[4];
+	u_char	s_uuid[16];
+	u_char 	s_volume_name[16];
+	u_char	s_dummy3[88];
+	u_char	s_journal_inum[4];	/* ext3 only */
 };
 #define ext2magic(s)	((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8))
 
@@ -102,7 +108,6 @@ struct fat_super_block {
 };
 
 #define XFS_SUPER_MAGIC "XFSB"
-#define XFS_SUPER_MAGIC2 "BSFX"
 struct xfs_super_block {
     u_char    s_magic[4];
     u_char    s_dummy[28];
diff --git a/mount/mount.8 b/mount/mount.8
index 42a7a4a72..6f96457df 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -221,11 +221,7 @@ option below). It is possible to replace
 by a symbolic link to
 .IR /proc/mounts ,
 but some information is lost that way, and in particular
-working with the loop device will be less convenient. Also,
-pathnames containing spaces are handled correctly by
-.I /etc/mtab
-but not (yet) by
-.IR /proc/mounts .
+working with the loop device will be less convenient.
 
 .SH OPTIONS
 The full set of options used by an invocation of
@@ -442,7 +438,9 @@ flag followed by a comma separated string of options.
 Some of these options are only useful when they appear in the
 .I /etc/fstab
 file.  The following options apply to any file system that is being
-mounted:
+mounted (but not every file system actually honors them - e.g., the
+.B sync
+option today has effect only for ext2 and ufs):
 .RS
 .TP
 .B async
@@ -582,6 +580,8 @@ Give blocksize. Allowed values are 512, 1024, 2048, 4096.
 .TP
 .BR grpquota " / " noquota " / " quota " / " usrquota
 These options are accepted but ignored.
+(However, quota utilities may react to such strings in
+.IR /etc/fstab .)
 
 .SH "Mount options for coherent"
 None.
@@ -1149,7 +1149,7 @@ UFS is a file system widely used in different operating systems.
 The problem are differences among implementations. Features of some
 implementations are undocumented, so its hard to recognize the
 type of ufs automatically.
-That's why user must specify the type of ufs by mount option.
+That's why the user must specify the type of ufs by mount option.
 Possible values are:
 .RS
 .TP
diff --git a/mount/mount.c b/mount/mount.c
index dc7e9823f..8d62087eb 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -66,6 +66,7 @@
 #include "mount_guess_fstype.h"
 #include "mount_by_label.h"
 #include "getusername.h"
+#include "env.h"
 #include "nls.h"
 
 #define DO_PS_FIDDLING
@@ -244,7 +245,7 @@ print_one (const struct mntent *me) {
 
 /* Report on everything in mtab (of the specified types if any).  */
 static int
-print_all (string_list types) {
+print_all (char *types) {
      struct mntentchn *mc, *mc0;
 
      mc0 = mtab_head();
@@ -452,33 +453,51 @@ do_mount_syscall (struct mountargs *args) {
  *	Mount a single file system. Guess the type when unknown.
  * returns: 0: OK, -1: error in errno, 1: other error
  *	don't exit on non-fatal errors.
+ *	on return types is filled with the type used.
  */
 static int
-guess_fstype_and_mount (char *spec, char *node, char **type,
+guess_fstype_and_mount (char *spec, char *node, char **types,
 			int flags, char *mount_opts) {
    struct mountargs args = { spec, node, NULL, flags & ~MS_NOSYS, mount_opts };
    
-   if (*type && strcasecmp (*type, "auto") == 0)
-      *type = NULL;
+   if (*types && strcasecmp (*types, "auto") == 0)
+      *types = NULL;
 
-   if (!*type && (flags & (MS_BIND | MS_MOVE)))
-      *type = "none";		/* random, but not "bind" */
+   if (!*types && (flags & (MS_BIND | MS_MOVE)))
+      *types = "none";		/* random, but not "bind" */
 
-   if (!*type && !(flags & MS_REMOUNT)) {
-      *type = guess_fstype_from_superblock(spec);
-      if (*type && !strcmp(*type, "swap")) {
+   if (!*types && !(flags & MS_REMOUNT)) {
+      *types = guess_fstype_from_superblock(spec);
+      if (*types && !strcmp(*types, "swap")) {
 	  error(_("%s looks like swapspace - not mounted"), spec);
-	  *type = NULL;
+	  *types = NULL;
 	  return 1;
       }
    }
 
-   if (*type || (flags & MS_REMOUNT)) {
-      args.type = *type;
+   /* Accept a comma-separated list of types, and try them one by one */
+   /* A list like "nonfs,.." indicates types not to use */
+   if (*types && strncmp(*types, "no", 2) && index(*types,',')) {
+      char *t = strdup(*types);
+      char *p;
+
+      while((p = index(t,',')) != NULL) {
+	 *p = 0;
+	 args.type = *types = t;
+	 if(do_mount_syscall (&args) == 0)
+	    return 0;
+	 t = p+1;
+      }
+      /* do last type below */
+      *types = t;
+   }
+
+   if (*types || (flags & MS_REMOUNT)) {
+      args.type = *types;
       return do_mount_syscall (&args);
    }
 
-   return procfsloop(do_mount_syscall, &args, type);
+   return procfsloop(do_mount_syscall, &args, types);
 }
 
 /*
@@ -715,7 +734,7 @@ check_special_mountprog(char *spec, char *node, char *type, int flags,
  *      return status from wait
  */
 static int
-try_mount_one (const char *spec0, const char *node0, char *type0,
+try_mount_one (const char *spec0, const char *node0, char *types0,
 	       const char *opts0, int freq, int pass, int bg, int ro) {
   int res, status;
   int mnt5_res = 0;		/* only for gcc */
@@ -724,15 +743,16 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
   char *extra_opts;		/* written in mtab */
   char *mount_opts;		/* actually used on system call */
   const char *opts;
-  char *spec, *node, *type;
+  char *spec, *node, *types;
   char *user = 0;
   int loop = 0;
   char *loopdev = 0, *loopfile = 0;
   struct stat statbuf;
+  int nfs_mount_version = 0;	/* any version */
 
   spec = xstrdup(spec0);
   node = xstrdup(node0);
-  type = xstrdup(type0);
+  types = xstrdup(types0);
   opts = xstrdup(opts0);
 
   parse_opts (xstrdup (opts), &flags, &extra_opts);
@@ -753,22 +773,27 @@ try_mount_one (const char *spec0, const char *node0, char *type0,
        * stale assignments of files to loop devices. Nasty when used for
        * encryption.
        */
-      res = loop_check (&spec, &type, &flags, &loop, &loopdev, &loopfile);
+      res = loop_check (&spec, &types, &flags, &loop, &loopdev, &loopfile);
       if (res)
 	  return res;
   }
 
   /*
    * Call mount.TYPE for types that require a separate mount program.
-   * For the moment these types are ncp and smb.
+   * For the moment these types are ncp and smb. Maybe also vxfs.
+   * All such special things must occur isolated in the types string.
    */
-  if (check_special_mountprog (spec, node, type, flags, extra_opts, &status))
+  if (check_special_mountprog (spec, node, types, flags, extra_opts, &status))
       return status;
 
-  if (!fake && type && streq (type, "nfs")) {
+  /*
+   * Also nfs requires a separate program, but it is built in.
+   */
+  if (!fake && types && streq (types, "nfs")) {
 #ifdef HAVE_NFS
 retry_nfs:
-    mnt_err = nfsmount (spec, node, &flags, &extra_opts, &mount_opts, bg);
+    mnt_err = nfsmount (spec, node, &flags, &extra_opts, &mount_opts,
+			&nfs_mount_version, bg);
     if (mnt_err)
       return mnt_err;
 #else
@@ -780,7 +805,7 @@ retry_nfs:
   block_signals (SIG_BLOCK);
 
   if (!fake)
-    mnt5_res = guess_fstype_and_mount (spec, node, &type, flags & ~MS_NOSYS,
+    mnt5_res = guess_fstype_and_mount (spec, node, &types, flags & ~MS_NOSYS,
 				       mount_opts);
 
   if (fake || mnt5_res == 0) {
@@ -790,7 +815,7 @@ retry_nfs:
 
       update_mtab_entry(loop ? loopfile : spec,
 			node,
-			type ? type : "unknown",
+			types ? types : "unknown",
 			fix_opts_string (flags & ~MS_NOMTAB, extra_opts, user),
 			flags,
 			freq,
@@ -808,8 +833,7 @@ retry_nfs:
   block_signals (SIG_UNBLOCK);
 
 #ifdef HAVE_NFS
-  if (mnt_err && type && streq (type, "nfs")) {
-      extern int nfs_mount_version;
+  if (mnt_err && types && streq (types, "nfs")) {
       if (nfs_mount_version == 4) {
 	  if (verbose)
 	    printf(_("mount: failed with nfs mount version 4, trying 3..\n"));
@@ -821,7 +845,7 @@ retry_nfs:
 
   /* Mount failed, complain, but don't die.  */
 
-  if (type == 0) {
+  if (types == 0) {
     if (suid)
       error (_("mount: I could not determine the filesystem type, "
 	       "and none was specified"));
@@ -844,7 +868,7 @@ retry_nfs:
     case EBUSY:
       if (flags & MS_REMOUNT) {
 	error (_("mount: %s is busy"), node);
-      } else if (!strcmp(type, "proc") && !strcmp(node, "/proc")) {
+      } else if (!strcmp(types, "proc") && !strcmp(node, "/proc")) {
 	/* heuristic: if /proc/version exists, then probably proc is mounted */
 	if (stat ("/proc/version", &statbuf))   /* proc mounted? */
 	   error (_("mount: %s is busy"), node);   /* no */
@@ -926,16 +950,16 @@ retry_nfs:
       error (_("mount: %s: can't read superblock"), spec); break;
     case ENODEV:
     { int pfs;
-      if ((pfs = is_in_procfs(type)) == 1 || !strcmp(type, "guess"))
+      if ((pfs = is_in_procfs(types)) == 1 || !strcmp(types, "guess"))
         error(_("mount: %s: unknown device"), spec);
       else if (pfs == 0) {
 	char *lowtype, *p;
 	int u;
 
-	error (_("mount: fs type %s not supported by kernel"), type);
+	error (_("mount: fs type %s not supported by kernel"), types);
 
 	/* maybe this loser asked for FAT or ISO9660 or isofs */
-	lowtype = xstrdup(type);
+	lowtype = xstrdup(types);
 	u = 0;
 	for(p=lowtype; *p; p++) {
 	  if(tolower(*p) != *p) {
@@ -950,7 +974,7 @@ retry_nfs:
 	free(lowtype);
       } else
 	error (_("mount: %s has wrong device number or fs type %s not supported"),
-	       spec, type);
+	       spec, types);
       break;
     }
     case ENOTBLK:
@@ -981,7 +1005,7 @@ retry_nfs:
       } else {
 	 if (loop) {
 	     opts = opts0;
-	     type = type0;
+	     types = types0;
 	 }
          if (opts) {
 	     char *opts1 = realloc(xstrdup(opts), strlen(opts)+4);
@@ -989,11 +1013,11 @@ retry_nfs:
 	     opts = opts1;
          } else
              opts = "ro";
-	 if (type && !strcmp(type, "guess"))
-	     type = 0;
+	 if (types && !strcmp(types, "guess"))
+	     types = 0;
          error (_("mount: %s%s is write-protected, mounting read-only"),
 		bd, spec0);
-	 return try_mount_one (spec0, node0, type, opts, freq, pass, bg, 1);
+	 return try_mount_one (spec0, node0, types, opts, freq, pass, bg, 1);
       }
       break;
     }
@@ -1051,7 +1075,7 @@ usersubst(const char *opts) {
  * Return 0 for success (either mounted sth or -a and NOAUTO was given)
  */
 static int
-mount_one (const char *spec, const char *node, char *type, const char *opts,
+mount_one (const char *spec, const char *node, char *types, const char *opts,
 	   char *cmdlineopts, int freq, int pass) {
   int status;
   int status2;
@@ -1087,9 +1111,9 @@ mount_one (const char *spec, const char *node, char *type, const char *opts,
       /* if -a then we may be rescued by a noauto option */
   }
 
-  if (type == NULL && !mounttype) {
+  if (types == NULL && !mounttype) {
       if (strchr (spec, ':') != NULL) {
-	type = "nfs";
+	types = "nfs";
 	if (verbose)
 	  printf(_("mount: no type was given - "
 		 "I'll assume nfs because of the colon\n"));
@@ -1100,7 +1124,7 @@ mount_one (const char *spec, const char *node, char *type, const char *opts,
    * Try to mount the file system. When the exit status is EX_BG,
    * we will retry in the background. Otherwise, we're done.
    */
-  status = try_mount_one (spec, node, type, opts, freq, pass, 0, 0);
+  status = try_mount_one (spec, node, types, opts, freq, pass, 0, 0);
   if (status != EX_BG)
     return status;
 
@@ -1113,10 +1137,10 @@ mount_one (const char *spec, const char *node, char *type, const char *opts,
     return 0;			/* parent returns "success" */
   spec = xstrdup(spec);		/* arguments will be destroyed */
   node = xstrdup(node);		/* by set_proc_name()          */
-  type = xstrdup(type);
+  types = xstrdup(types);
   opts = xstrdup(opts);
   set_proc_name (spec);		/* make a nice "ps" listing */
-  status2 = try_mount_one (spec, node, type, opts, freq, pass, 1, 0);
+  status2 = try_mount_one (spec, node, types, opts, freq, pass, 1, 0);
   if (verbose && status2)
     printf (_("mount: giving up \"%s\"\n"), spec);
   exit (0);			/* child stops here */
@@ -1153,7 +1177,7 @@ mounted (char *spec, char *node) {
 #define DISKMAJOR(m)	(((int) m) & ~0xf)
 
 static int
-mount_all (string_list types, char *options) {
+mount_all (char *types, char *options) {
      struct mntentchn *mc, *mc0, *mtmp;
      int status = 0;
      struct stat statbuf;
@@ -1330,10 +1354,11 @@ main (int argc, char *argv[]) {
 	char *options = NULL, *spec, *node;
 	char *volumelabel = NULL;
 	char *uuid = NULL;
-	string_list types = NULL;
+	char *types = NULL;
 	struct mntentchn *mc;
 	int fd;
 
+	sanitize_env();
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
@@ -1387,7 +1412,7 @@ main (int argc, char *argv[]) {
 			sloppy = 1;
 			break;
 		case 't':		/* specify file system types */
-			types = parse_list (optarg);
+			types = optarg;
 			break;
 		case 'U':
 			uuid = optarg;
@@ -1472,7 +1497,7 @@ main (int argc, char *argv[]) {
 		/* mount -a */
 		result = mount_all (types, options);
 		if (result == 0 && verbose)
-			error(_("not mounted anything"));
+			error(_("nothing was mounted"));
 		break;
 
 	case 1:
@@ -1524,14 +1549,7 @@ main (int argc, char *argv[]) {
 			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);
+		result = mount_one (spec, node, types, NULL, options, 0, 0);
 		break;
       
 	default:
diff --git a/mount/mount_by_label.c b/mount/mount_by_label.c
index ad3b5ebd2..18344e4bd 100644
--- a/mount/mount_by_label.c
+++ b/mount/mount_by_label.c
@@ -58,8 +58,7 @@ get_label_uuid(const char *device, char **label, char *uuid) {
 	}
 	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)) {
+	    && (strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0)) {
 		memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid));
 		namesize = sizeof(xfsb.s_fname);
 		if ((*label = calloc(namesize + 1, 1)) != NULL)
diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c
index a87409295..8694213d0 100644
--- a/mount/mount_guess_fstype.c
+++ b/mount/mount_guess_fstype.c
@@ -57,6 +57,11 @@ swapped(unsigned short a) {
      return (a>>8) | (a<<8);
 }
 
+static inline int
+assemble4le(unsigned char *p) {
+	return (p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24));
+}
+
 /*
     char *guess_fstype_from_superblock(const char *device);
 
@@ -74,10 +79,11 @@ swapped(unsigned short a) {
     Added a very weak heuristic for vfat - aeb
     Added xfs - 2000-03-21 Martin K. Petersen <mkp@linuxcare.com>
     Added cramfs, hfs, hpfs, adfs - Sepp Wijnands <mrrazz@garbage-coderz.net>
+    Added ext3 - Andrew Morton
 */
 static char
 *magic_known[] = {
-	"adfs", "bfs", "cramfs", "ext", "ext2",
+	"adfs", "bfs", "cramfs", "ext", "ext2", "ext3",
 	"hfs", "hpfs", "iso9660", "minix", "ntfs",
 	"qnx4", "romfs", "swap", "udf", "ufs",
 	"xfs", "xiafs"
@@ -180,9 +186,16 @@ fstype(const char *device) {
        PPC ext2 systems */
     if (ext2magic(sb.e2s) == EXT2_SUPER_MAGIC
 	|| ext2magic(sb.e2s) == EXT2_PRE_02B_MAGIC
-	|| ext2magic(sb.e2s) == swapped(EXT2_SUPER_MAGIC))
+	|| ext2magic(sb.e2s) == swapped(EXT2_SUPER_MAGIC)) {
 	 type = "ext2";
 
+	 /* maybe even ext3? */
+	 if ((assemble4le(sb.e2s.s_feature_compat)
+	      & EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
+	     assemble4le(sb.e2s.s_journal_inum) != 0)
+		 type = "ext3,ext2";
+    }
+
     else if (minixmagic(sb.ms) == MINIX_SUPER_MAGIC
 	     || minixmagic(sb.ms) == MINIX_SUPER_MAGIC2
 	     || minixmagic(sb.ms) == swapped(MINIX_SUPER_MAGIC2))
@@ -200,8 +213,7 @@ fstype(const char *device) {
 	      type = "xiafs";
 	 else if(!strncmp(xsb.romfs_magic, "-rom1fs-", 8))
 	      type = "romfs";
-	 else if(!strncmp(xsb.xfsb.s_magic, XFS_SUPER_MAGIC, 4) ||
-		 !strncmp(xsb.xfsb.s_magic, XFS_SUPER_MAGIC2, 4))
+	 else if(!strncmp(xsb.xfsb.s_magic, XFS_SUPER_MAGIC, 4))
 	      type = "xfs";
 	 else if(!strncmp(xsb.qnx4fs_magic+4, "QNX4FS", 6))
 	      type = "qnx4fs";
@@ -216,7 +228,10 @@ fstype(const char *device) {
 		   !strncmp(xsb.fatsb.s_os, "MSWIN", 5) ||
 		   !strncmp(xsb.fatsb.s_os, "MTOOL", 5) ||
 		   !strncmp(xsb.fatsb.s_os, "mkdosfs", 7) ||
-		   !strncmp(xsb.fatsb.s_os, "kmkdosfs", 8))
+		   !strncmp(xsb.fatsb.s_os, "kmkdosfs", 8) ||
+		   /* Michal Svec: created by fdformat, old msdos utility for
+		      formatting large (1.7) floppy disks. */
+		   !strncmp(xsb.fatsb.s_os, "CH-FOR18", 8))
 		  && (!strncmp(xsb.fatsb.s_fs, "FAT12   ", 8) ||
 		      !strncmp(xsb.fatsb.s_fs, "FAT16   ", 8) ||
 		      !strncmp(xsb.fatsb.s_fs2, "FAT32   ", 8)))
@@ -363,19 +378,28 @@ is_in_procfs(const char *type) {
     return ret;
 }
 
+/* Try all types in FILESYSTEMS, except those in *types,
+   in case *types starts with "no" */
 /* return: 0: OK, -1: error in errno, 1: type not found */
-/* when 1 is returned, *type is NULL */
+/* when 0 or -1 is returned, *types contains the type used */
+/* when 1 is returned, *types is NULL */
 int
 procfsloop(int (*mount_fn)(struct mountargs *), struct mountargs *args,
-	   char **type) {
+	   char **types) {
 	char *files[2] = { ETC_FILESYSTEMS, PROC_FILESYSTEMS };
 	FILE *procfs;
 	char *fsname;
+	char *notypes = NULL;
+	int no = 0;
 	int ret = 1;
 	int errsv = 0;
 	int i;
 
-	*type = NULL;
+	if (!strncmp(*types, "no", 2)) {
+		no = 1;
+		notypes = (*types) + 2;
+	}
+	*types = NULL;
 
 	/* Use PROC_FILESYSTEMS only when ETC_FILESYSTEMS does not exist.
 	   In some cases trying a filesystem that the kernel knows about
@@ -396,18 +420,20 @@ procfsloop(int (*mount_fn)(struct mountargs *), struct mountargs *args,
 			}
 			if (tested (fsname))
 				continue;
+			if (no && matching_type(fsname, notypes))
+				continue;
 			args->type = fsname;
 			if (verbose) {
 				printf(_("Trying %s\n"), fsname);
 				fflush(stdout);
 			}
 			if ((*mount_fn) (args) == 0) {
-				*type = fsname;
+				*types = fsname;
 				ret = 0;
 				break;
 			} else if (errno != EINVAL &&
 				   is_in_procfs(fsname) == 1) {
-				*type = "guess";
+				*types = "guess";
 				ret = -1;
 				errsv = errno;
 				break;
diff --git a/mount/nfs.5 b/mount/nfs.5
index 6ffce6cdf..b29a8bdb0 100644
--- a/mount/nfs.5
+++ b/mount/nfs.5
@@ -143,6 +143,10 @@ NFS daemon on the remote host.  This option is useful
 for hosts that can run multiple NFS servers.
 The default value is version 2.
 .TP 1.5i
+.I nolock
+Disable NFS locking. This has to be used with some old NFS servers
+that don't support locking.
+.TP 1.5i
 .I bg
 If the first NFS mount attempt times out, retry the mount
 in the background.
diff --git a/mount/nfsmount.c b/mount/nfsmount.c
index 70298e0c6..d81c062e1 100644
--- a/mount/nfsmount.c
+++ b/mount/nfsmount.c
@@ -37,6 +37,7 @@
 #include <string.h>
 #include <errno.h>
 #include <netdb.h>
+#include <time.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
@@ -86,11 +87,6 @@ linux_version_code(void) {
 }
 
 /*
- * nfs_mount_version according to the sources seen at compile time.
- */
-int nfs_mount_version = NFS_MOUNT_VERSION;
-
-/*
  * Unfortunately, the kernel prints annoying console messages
  * in case of an unexpected nfs mount version (instead of
  * just returning some error).  Therefore we'll have to try
@@ -100,14 +96,13 @@ int nfs_mount_version = NFS_MOUNT_VERSION;
  *	NFS_MOUNT_VERSION: these nfsmount sources at compile time
  *	nfs_mount_version: version this source and running kernel can handle
  */
-static void
+static int
 find_kernel_nfs_mount_version(void) {
-	static int kernel_version = 0;
+	static int kernel_version = -1;
+	int nfs_mount_version = NFS_MOUNT_VERSION;
 
-	if (kernel_version)
-		return;
-
-	kernel_version = linux_version_code();
+	if (kernel_version == -1)
+		kernel_version = linux_version_code();
 
 	if (kernel_version) {
 	     if (kernel_version < MAKE_VERSION(2,1,32))
@@ -123,6 +118,7 @@ find_kernel_nfs_mount_version(void) {
 	}
 	if (nfs_mount_version > NFS_MOUNT_VERSION)
 	     nfs_mount_version = NFS_MOUNT_VERSION;
+	return nfs_mount_version;
 }
 
 static struct pmap *
@@ -130,7 +126,8 @@ get_mountport(struct sockaddr_in *server_addr,
       long unsigned prog,
       long unsigned version,
       long unsigned proto,
-      long unsigned port)
+      long unsigned port,
+      int nfs_mount_version)
 {
 	struct pmaplist *pmap;
 	static struct pmap p = {0, 0, 0, 0};
@@ -174,20 +171,19 @@ get_mountport(struct sockaddr_in *server_addr,
 }
 
 int nfsmount(const char *spec, const char *node, int *flags,
-	     char **extra_opts, char **mount_opts, int running_bg)
+	     char **extra_opts, char **mount_opts, int *nfs_mount_vers,
+	     int running_bg)
 {
 	static char *prev_bg_host;
 	char hostdir[1024];
 	CLIENT *mclient;
-	char *hostname;
-	char *dirname;
-	char *old_opts;
-	char *mounthost=NULL;
+	char *hostname, *dirname, *old_opts, *mounthost = NULL;
 	char new_opts[1024];
 	struct timeval total_timeout;
 	enum clnt_stat clnt_stat;
 	static struct nfs_mount_data data;
 	char *opt, *opteq;
+	int nfs_mount_version;
 	int val;
 	struct hostent *hp;
 	struct sockaddr_in server_addr;
@@ -201,29 +197,20 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	} status;
 	struct stat statbuf;
 	char *s;
-	int port;
-	int mountport;
-	int proto;
-	int bg;
-	int soft;
-	int intr;
-	int posix;
-	int nocto;
-	int noac;
-	int nolock;
-	int broken_suid;
-	int retry;
-	int tcp;
-	int mountprog;
-	int mountvers;
-	int nfsprog;
-	int nfsvers;
+	int port, mountport, proto, bg, soft, intr;
+	int posix, nocto, noac, nolock, broken_suid;
+	int retry, tcp;
+	int mountprog, mountvers, nfsprog, nfsvers;
 	int retval;
 	time_t t;
 	time_t prevt;
 	time_t timeout;
 
-	find_kernel_nfs_mount_version();
+	/* The version to try is either specified or 0
+	   In case it is 0 we tell the caller what we tried */
+	if (!*nfs_mount_vers)
+		*nfs_mount_vers = find_kernel_nfs_mount_version();
+	nfs_mount_version = *nfs_mount_vers;
 
 	retval = EX_FAIL;
 	msock = fsock = -1;
@@ -242,12 +229,14 @@ int nfsmount(const char *spec, const char *node, int *flags,
 		   until they can be fully supported. (mack@sgi.com) */
 		if ((s = strchr(hostdir, ','))) {
 			*s = '\0';
-			fprintf(stderr, _("mount: warning: "
-					  "multiple hostnames not supported\n"));
+			fprintf(stderr,
+				_("mount: warning: "
+				  "multiple hostnames not supported\n"));
 		}
 	} else {
-		fprintf(stderr, _("mount: "
-				  "directory to mount not in host:dir format\n"));
+		fprintf(stderr,
+			_("mount: "
+			  "directory to mount not in host:dir format\n"));
 		goto fail;
 	}
 
@@ -380,15 +369,14 @@ int nfsmount(const char *spec, const char *node, int *flags,
 				else
 #endif
 					printf(_("Warning: Option namlen is not supported.\n"));
-			} else if (!strcmp(opt, "addr"))
+			} else if (!strcmp(opt, "addr")) {
 				/* ignore */;
-			else {
+			} else {
 				printf(_("unknown nfs mount parameter: "
 					 "%s=%d\n"), opt, val);
 				goto fail;
 			}
-		}
-		else {
+		} else {
 			val = 1;
 			if (!strncmp(opt, "no", 2)) {
 				val = 0;
@@ -459,9 +447,8 @@ int nfsmount(const char *spec, const char *node, int *flags,
 	}
 	if (nfsvers && !mountvers)
 		mountvers = (nfsvers < 3) ? 1 : nfsvers;
-	if (nfsvers && nfsvers < mountvers) {
+	if (nfsvers && nfsvers < mountvers)
 		mountvers = nfsvers;
-	}
 
 	/* Adjust options if none specified */
 	if (!data.timeo)
@@ -515,7 +502,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
 		} else {
 			if ((hp = gethostbyname(mounthost)) == NULL) {
 				fprintf(stderr, _("mount: can't get address for %s\n"),
-					hostname);
+					mounthost);
 				goto fail;
 			} else {
 				if (hp->h_length > sizeof(struct in_addr)) {
@@ -573,7 +560,8 @@ int nfsmount(const char *spec, const char *node, int *flags,
 					       mountprog,
 					       mountvers,
 					       proto,
-					       mountport);
+					       mountport,
+					       nfs_mount_version);
 
 			/* contact the mount daemon via TCP */
 			mount_server_addr.sin_port = htons(pm_mnt->pm_port);
@@ -724,6 +712,18 @@ int nfsmount(const char *spec, const char *node, int *flags,
 		server_addr.sin_port = PMAPPORT;
 		port = pmap_getport(&server_addr, nfsprog, nfsvers,
 				    tcp ? IPPROTO_TCP : IPPROTO_UDP);
+#if 1
+		/* Here we check to see if user is mounting with the
+		 * tcp option.  If so, and if the portmap returns a
+		 * '0' for port (service unavailable), we then exit,
+		 * notifying the user, rather than hanging up mount.
+		 */
+		if (port == 0 && tcp == 1) {
+			perror(_("nfs server reported service unavailable"));
+			goto fail;
+		}
+#endif
+
 		if (port == 0)
 			port = NFS_PORT;
 #ifdef NFS_MOUNT_DEBUG
diff --git a/mount/realpath.c b/mount/realpath.c
index 374f8a3a2..61832efd2 100644
--- a/mount/realpath.c
+++ b/mount/realpath.c
@@ -13,12 +13,17 @@
  * GNU Library Public License for more details.
  */
 
+#undef resolve_symlinks
+
 /*
  * This routine is part of libc.  We include it nevertheless,
  * since the libc version has some security flaws.
  */
 
 #include <limits.h>		/* for PATH_MAX */
+#ifndef PATH_MAX
+#define PATH_MAX 8192
+#endif
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
@@ -30,10 +35,14 @@
 /* this leaks some memory - unimportant for mount */
 char *
 myrealpath(const char *path, char *resolved_path, int maxreslth) {
-	char *npath, *buf;
-	char link_path[PATH_MAX+1];
 	int readlinks = 0;
-	int m, n;
+	char *npath;
+	char link_path[PATH_MAX+1];
+	int n;
+#ifdef resolve_symlinks
+	char *buf;
+	int m;
+#endif
 
 	npath = resolved_path;
 
@@ -85,7 +94,7 @@ myrealpath(const char *path, char *resolved_path, int maxreslth) {
 			return NULL;
 		}
 
-		/* See if latest pathname component is a symlink. */
+		/* See if last pathname component is a symlink. */
 		*npath = '\0';
 		n = readlink(resolved_path, link_path, PATH_MAX);
 		if (n < 0) {
@@ -93,6 +102,7 @@ myrealpath(const char *path, char *resolved_path, int maxreslth) {
 			if (errno != EINVAL)
 				return NULL;
 		} else {
+#ifdef resolve_symlinks		/* Richard Gooch dislikes sl resolution */
 			/* Note: readlink doesn't add the null byte. */
 			link_path[n] = '\0';
 			if (*link_path == '/')
@@ -109,8 +119,8 @@ myrealpath(const char *path, char *resolved_path, int maxreslth) {
 			memcpy(buf, link_path, n);
 			memcpy(buf + n, path, m + 1);
 			path = buf;
+#endif
 		}
-
 		*npath++ = '/';
 	}
 	/* Delete trailing slash but don't whomp a lone slash. */
diff --git a/mount/sundries.c b/mount/sundries.c
index 1da3b666e..59b069678 100644
--- a/mount/sundries.c
+++ b/mount/sundries.c
@@ -18,17 +18,6 @@
 #include "nfsmount.h"
 #include "nls.h"
 
-/* String list constructor.  (car() and cdr() are defined in "sundries.h").  */
-string_list
-cons (char *a, const string_list b) {
-     string_list p;
-
-     p = xmalloc (sizeof *p);
-     car (p) = a;
-     cdr (p) = b;
-     return p;
-}
-
 void *
 xmalloc (size_t size) {
      void *t;
@@ -157,57 +146,43 @@ die (int err, const char *fmt, ...) {
      exit (err);
 }
 
-/* Parse a list of strings like str[,str]... into a string list.  */
-string_list
-parse_list (char *strings) {
-     string_list list;
-     char *s, *t;
-
-     if (strings == NULL)
-	  return NULL;
-
-     /* strtok() destroys its argument, so we have to use a copy */
-     s = xstrdup(strings);
-
-     list = cons (strtok (s, ","), NULL);
-
-     while ((t = strtok (NULL, ",")) != NULL)
-	  list = cons (t, list);
-
-     return list;
-}
-
 /* True if fstypes match.  Null *TYPES means match anything,
-   except that swap types always return false.
-   This routine has some ugliness to deal with ``no'' types.
-   Fixed bug: the `no' part comes at the end - aeb, 970216  */
+   except that swap types always return false. */
+/* Accept nonfs,proc,devpts and nonfs,noproc,nodevpts
+   with the same meaning. */
 int
-matching_type (const char *type, string_list types) {
-     char *notype;
-     int foundyes, foundno;
-     int no;			/* true if a "no" type match, eg -t nominix */
+matching_type (const char *type, const char *types) {
+     int no;			/* negated types list */
+     int len;
+     const char *p;
 
      if (streq (type, MNTTYPE_SWAP))
 	  return 0;
      if (types == NULL)
 	  return 1;
 
-     if ((notype = alloca (strlen (type) + 3)) == NULL)
-	  die (EX_SYSERR, _("%s: Out of memory!\n"), "mount");
-     sprintf (notype, "no%s", type);
-
-     foundyes = foundno = no = 0;
-     while (types != NULL) {
-	  if (cdr (types) == NULL)
-	       no = (car (types)[0] == 'n') && (car (types)[1] == 'o');
-	  if (streq (type, car (types)))
-	       foundyes = 1;
-	  else if (streq (notype, car (types)))
-	       foundno = 1;
-	  types = cdr (types);
+     no = 0;
+     if (!strncmp(types, "no", 2)) {
+	  no = 1;
+	  types += 2;
      }
 
-     return (foundno ? 0 : (no ^ foundyes));
+     /* Does type occur in types, separated by commas? */
+     len = strlen(type);
+     p = types;
+     while(1) {
+	     if (!strncmp(p, "no", 2) && !strncmp(p+2, type, len) &&
+		 (p[len+2] == 0 || p[len+2] == ','))
+		     return 0;
+	     if (strncmp(p, type, len) == 0 &&
+		 (p[len] == 0 || p[len] == ','))
+		     return !no;
+	     p = index(p,',');
+	     if (!p)
+		     break;
+	     p++;
+     }
+     return no;
 }
 
 /* Make a canonical pathname from PATH.  Returns a freshly malloced string.
diff --git a/mount/sundries.h b/mount/sundries.h
index 742d761f4..5b91ca1ee 100644
--- a/mount/sundries.h
+++ b/mount/sundries.h
@@ -19,26 +19,12 @@ extern int sloppy;
 
 #define streq(s, t)	(strcmp ((s), (t)) == 0)
 
-
-/* String list data structure.  */ 
-typedef struct string_list
-{
-  char *hd;
-  struct string_list *tl;
-} *string_list;
-
-#define car(p) ((p) -> hd)
-#define cdr(p) ((p) -> tl)
-
-string_list cons (char *a, const string_list);
-
 /* Functions in sundries.c that are used in mount.c and umount.c  */ 
 void block_signals (int how);
 char *canonicalize (const char *path);
 char *realpath (const char *path, char *resolved_path);
 void error (const char *fmt, ...);
-int matching_type (const char *type, string_list types);
-string_list parse_list (char *strings);
+int matching_type (const char *type, const char *types);
 void *xmalloc (size_t size);
 char *xstrdup (const char *s);
 char *xstrndup (const char *s, int n);
@@ -50,7 +36,7 @@ void die (int errcode, const char *fmt, ...);
 
 #ifdef HAVE_NFS
 int nfsmount (const char *spec, const char *node, int *flags,
-	      char **orig_opts, char **opt_args, int running_bg);
+	      char **orig_opts, char **opt_args, int *version, int running_bg);
 #endif
 
 /* exit status - bits below are ORed */
diff --git a/mount/swapon.c b/mount/swapon.c
index 829acadd4..b87a021ae 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -90,15 +90,22 @@ swap (const char *special, int prio)
   if (streq (program_name, "swapon")) {
     if (stat(special, &st) < 0) {
     	int errsv = errno;
-        fprintf (stderr, _("swapon: cannot stat %s: %s\n"), special, strerror (errsv));
+        fprintf (stderr, _("swapon: cannot stat %s: %s\n"),
+		 special, strerror (errsv));
 	return -1;
     }
 
     /* people generally dislike this warning - now it is printed
        only when `verbose' is set */
-    if (verbose && (st.st_mode & 07077) != 0) {
-        fprintf(stderr, _("swapon: warning: %s has insecure permissions %04o, "
-		        "0600 suggested\n"), special, st.st_mode & 07777);
+    if (verbose) {
+	int permMask = (S_ISBLK(st.st_mode) ? 07007 : 07077);
+
+	if ((st.st_mode & permMask) != 0) {
+            fprintf(stderr,
+		    _("swapon: warning: %s has insecure permissions %04o, "
+		      "%04o suggested\n"),
+		    special, st.st_mode & 07777, ~permMask & 0666);
+	}
     }
 
     /* test for holes by LBT */
diff --git a/mount/umount.c b/mount/umount.c
index 1843e08e5..92400875a 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -39,6 +39,7 @@
 #include "lomount.h"
 #include "loop.h"
 #include "fstab.h"
+#include "env.h"
 #include "nls.h"
 
 #ifdef HAVE_NFS
@@ -52,7 +53,7 @@
 #include <arpa/inet.h>
 #endif
 
-#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__) && !defined(__mips__)
+#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
 /* Interesting ... it seems libc knows about MNT_FORCE and presumably
    about umount2 as well -- need not do anything */
 #else /* MNT_FORCE */
@@ -100,6 +101,16 @@ int verbose = 0;
 /* True if ruid != euid.  */
 int suid = 0;
 
+#ifdef USE_SPECIAL_UMOUNTPROG
+/* unimplemented so far */
+static int
+check_special_umountprog() {
+	/* find type from command line or /etc/mtab;
+	   stat /sbin/umount.%s
+	   if it exists, use it */
+}
+#endif
+
 #ifdef HAVE_NFS
 static int xdr_dir(XDR *xdrsp, char *dirp)
 {
@@ -236,7 +247,6 @@ umount_one (const char *spec, const char *node, const char *type,
 		nfs_umount_rpc_call(spec, opts);
 #endif
  
-
 	umnt_err = umnt_err2 = 0;
 	if (force) {
 		/* completely untested;
@@ -383,7 +393,7 @@ umount_one_bw (const char *file, struct mntentchn *mc) {
    in any case it's important to umount mtab entries in reverse order
    to mount, e.g. /usr/spool before /usr.  */
 static int
-umount_all (string_list types) {
+umount_all (char *types) {
      struct mntentchn *mc, *hd;
      int errors = 0;
 
@@ -426,152 +436,195 @@ usage (FILE *fp, int n)
 
 int mount_quiet = 0;
 
-int
-main (int argc, char *argv[])
-{
-  int c;
-  int all = 0;
-  string_list types = NULL;
-  string_list options;
-  struct mntentchn *mc, *fs;
-  char *file;
-  int result = 0;
-
-  setlocale(LC_ALL, "");
-  bindtextdomain(PACKAGE, LOCALEDIR);
-  textdomain(PACKAGE);
-
-  while ((c = getopt_long (argc, argv, "afhnrt:vV",
-			   longopts, NULL)) != EOF)
-    switch (c) {
-      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;
-      case 'h':			/* help */
-	usage (stdout, 0);
-	break;
-      case 'n':			/* do not write in /etc/mtab */
-	++nomtab;
-	break;
-      case 'r':			/* remount read-only if umount fails */
-	++remount;
-	break;
-      case 'v':			/* make noise */
-	++verbose;
-	break;
-      case 'V':			/* version */
-	printf ("umount: %s\n", version);
-	exit (0);
-      case 't':			/* specify file system type */
-	types = parse_list (optarg);
-	break;
-      case 0:
-	break;
-      case '?':
-      default:
-	usage (stderr, 1);
-    }
-
-  if (getuid () != geteuid ())
-    {
-      suid = 1;
-      if (all || types || nomtab || force)
-	die (2, _("umount: only root can do that"));
-    }
-
-  argc -= optind;
-  argv += optind;
-
-  if (all) {
-       if (types == NULL)
-	  types = parse_list("noproc");
-       result = umount_all (types);
-  } else if (argc < 1) {
-       usage (stderr, 2);
-  } else while (argc--) {
-       file = canonicalize (*argv); /* mtab paths are canonicalized */
-       if (verbose > 1)
-	  printf(_("Trying to umount %s\n"), file);
-
-       mc = getmntfilesbackward (file, NULL);
-       if (!mc && verbose)
-	  printf(_("Could not find %s in mtab\n"), file);
-
-       if (suid) {
-	  if (!mc)
-	    die (2, _("umount: %s is not mounted (according to mtab)"), file);
-	  if (getmntfilesbackward (file, mc))
-	    die (2, _("umount: it seems %s is mounted multiple times"), file);
-
-	  /* If fstab contains the two lines
-	       /dev/sda1 /mnt/zip auto user,noauto  0 0
-	       /dev/sda4 /mnt/zip auto user,noauto  0 0
-	     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->m.mnt_fsname, mc->m.mnt_dir);
-	  if (!fs) {
-	    if (!getfsspec (file) && !getfsfile (file))
-	      die (2,
-		 _("umount: %s is not in the fstab (and you are not root)"),
-		 file);
-	    else
-	      die (2, _("umount: %s mount disagrees with the fstab"), file);
-	  }
+/*=======================================================================*/
+/* string list stuff - no longer used by mount - will disappear entirely */
+typedef struct string_list {
+	char *hd;
+	struct string_list *tl;
+} *string_list;
 
-	  /* User mounting and unmounting is allowed only
-	     if fstab contains the option `user' or `users' */
-	  /* The option `users' allows arbitrary users to mount
-	     and unmount - this may be a security risk. */
-	  /* The option `user' only allows unmounting by the user
-	     that mounted. */
-	  /* 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->m.mnt_opts);
-	  while (options) {
-	      if (streq (car (options), "user") ||
-		  streq (car (options), "users") ||
-		  streq (car (options), "owner"))
-		break;
-	      options = cdr (options);
-	  }
-	  if (!options)
-	    die (2, _("umount: only root can unmount %s from %s"),
-		 fs->m.mnt_fsname, fs->m.mnt_dir);
-	  if (streq (car (options), "user") ||
-	      streq (car (options), "owner")) {
-	      char *user = getusername();
-
-	      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->m.mnt_fsname, fs->m.mnt_dir);
-		      break;
-		  }
-		  options = cdr (options);
-	      }
-	  }
-       }
+#define car(p) ((p) -> hd)
+#define cdr(p) ((p) -> tl)
 
-       if (mc)
-	    result = umount_one_bw (file, mc);
-       else
-	    result = umount_one (*argv, *argv, *argv, *argv, NULL);
+static string_list
+cons (char *a, const string_list b) {
+	string_list p;
 
-       argv++;
+	p = xmalloc (sizeof *p);
+	car (p) = a;
+	cdr (p) = b;
+	return p;
+}
+
+/* Parse a list of strings like str[,str]... into a string list.  */
+static string_list
+parse_list (char *strings) {
+	string_list list;
+	char *s, *t;
+
+	if (strings == NULL)
+		return NULL;
+
+	/* strtok() destroys its argument, so we have to use a copy */
+	s = xstrdup(strings);
+
+	list = cons (strtok (s, ","), NULL);
+
+	while ((t = strtok (NULL, ",")) != NULL)
+		list = cons (t, list);
+
+	return list;
+}
+/*=======================================================================*/
+
+static int
+umount_file (char *arg) {
+	struct mntentchn *mc, *fs;
+	char *file;
+	string_list options;
+
+	file = canonicalize (arg); /* mtab paths are canonicalized */
+	if (verbose > 1)
+		printf(_("Trying to umount %s\n"), file);
+
+	mc = getmntfilesbackward (file, NULL);
+	if (!mc && verbose)
+		printf(_("Could not find %s in mtab\n"), file);
+
+	if (suid) {
+		if (!mc)
+			die (2, _("umount: %s is not mounted (according to mtab)"), file);
+		if (getmntfilesbackward (file, mc))
+			die (2, _("umount: it seems %s is mounted multiple times"), file);
+
+		/* If fstab contains the two lines
+		   /dev/sda1 /mnt/zip auto user,noauto  0 0
+		   /dev/sda4 /mnt/zip auto user,noauto  0 0
+		   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->m.mnt_fsname, mc->m.mnt_dir);
+		if (!fs) {
+			if (!getfsspec (file) && !getfsfile (file))
+				die (2,
+				     _("umount: %s is not in the fstab (and you are not root)"),
+				     file);
+			else
+				die (2, _("umount: %s mount disagrees with the fstab"), file);
+		}
+
+		/* User mounting and unmounting is allowed only
+		   if fstab contains the option `user' or `users' */
+		/* The option `users' allows arbitrary users to mount
+		   and unmount - this may be a security risk. */
+		/* The option `user' only allows unmounting by the user
+		   that mounted. */
+		/* 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->m.mnt_opts);
+		while (options) {
+			if (streq (car (options), "user") ||
+			    streq (car (options), "users") ||
+			    streq (car (options), "owner"))
+				break;
+			options = cdr (options);
+		}
+		if (!options)
+			die (2, _("umount: only root can unmount %s from %s"),
+			     fs->m.mnt_fsname, fs->m.mnt_dir);
+		if (streq (car (options), "user") ||
+		    streq (car (options), "owner")) {
+			char *user = getusername();
+
+			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->m.mnt_fsname, fs->m.mnt_dir);
+					break;
+				}
+				options = cdr (options);
+			}
+		}
+	}
+
+	if (mc)
+		return umount_one_bw (file, mc);
+	else
+		return umount_one (arg, arg, arg, arg, NULL);
 
-  }
-  exit (result);
 }
 
+int
+main (int argc, char *argv[]) {
+	int c;
+	int all = 0;
+	char *types = NULL;
+	int result = 0;
+
+	sanitize_env();
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	while ((c = getopt_long (argc, argv, "adfhnrt:vV",
+				 longopts, NULL)) != EOF)
+		switch (c) {
+		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;
+		case 'h':		/* help */
+			usage (stdout, 0);
+			break;
+		case 'n':		/* do not write in /etc/mtab */
+			++nomtab;
+			break;
+		case 'r':		/* remount read-only if umount fails */
+			++remount;
+			break;
+		case 'v':		/* make noise */
+			++verbose;
+			break;
+		case 'V':		/* version */
+			printf ("umount: %s\n", version);
+			exit (0);
+		case 't':		/* specify file system type */
+			types = optarg;
+			break;
+		case 0:
+			break;
+		case '?':
+		default:
+			usage (stderr, 1);
+		}
+
+	if (getuid () != geteuid ()) {
+		suid = 1;
+		if (all || types || nomtab || force)
+			die (2, _("umount: only root can do that"));
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (all) {
+		if (types == NULL)
+			types = "noproc";
+		result = umount_all (types);
+	} else if (argc < 1) {
+		usage (stderr, 2);
+	} else while (argc--) {
+		result += umount_file(*argv++);
+	}
+	exit (result);		/* nonzero on at least one failure */
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e9c9618b..31634f08d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,7 +20,7 @@ fdisk/llseek.c
 fdisk/partname.c
 fdisk/sfdisk.c
 games/banner.c
-getopt-1.1.0a/getopt.c
+getopt-1.1.2/getopt.c
 hwclock/clock-ppc.c
 hwclock/cmos.c
 hwclock/hwclock.c
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 1ce596969..a4e5a8fb7 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -43,81 +43,83 @@ Continuing ... ", 21},
   {"check aborted.\n", 32},
   {"Zone nr < FIRSTZONE in file `", 33},
   {"Zone nr >= ZONES in file `", 34},
-  {"Remove block", 35},
-  {"Read error: unable to seek to block in file '", 36},
-  {"Read error: bad block in file '", 37},
+  {"'.", 35},
+  {"Remove block", 36},
+  {"Read error: unable to seek to block in file '", 37},
+  {"'\n", 38},
+  {"Read error: bad block in file '", 39},
   {"\
 Internal error: trying to write bad block\n\
-Write request ignored\n", 38},
-  {"seek failed in write_block", 39},
-  {"Write error: bad block in file '", 40},
-  {"seek failed in write_super_block", 41},
-  {"unable to write super-block", 42},
-  {"Unable to write inode map", 43},
-  {"Unable to write zone map", 44},
-  {"Unable to write inodes", 45},
-  {"seek failed", 46},
-  {"unable to read super block", 47},
-  {"bad magic number in super-block", 48},
-  {"Only 1k blocks/zones supported", 49},
-  {"bad s_imap_blocks field in super-block", 50},
-  {"bad s_zmap_blocks field in super-block", 51},
-  {"Unable to allocate buffer for inode map", 52},
-  {"Unable to allocate buffer for inodes", 53},
-  {"Unable to allocate buffer for inode count", 54},
-  {"Unable to allocate buffer for zone count", 55},
-  {"Unable to read inode map", 56},
-  {"Unable to read zone map", 57},
-  {"Unable to read inodes", 58},
-  {"Warning: Firstzone != Norm_firstzone\n", 59},
-  {"%ld inodes\n", 60},
-  {"%ld blocks\n", 61},
-  {"Firstdatazone=%ld (%ld)\n", 62},
-  {"Zonesize=%d\n", 63},
-  {"Maxsize=%ld\n", 64},
-  {"Filesystem state=%d\n", 65},
+Write request ignored\n", 40},
+  {"seek failed in write_block", 41},
+  {"Write error: bad block in file '", 42},
+  {"seek failed in write_super_block", 43},
+  {"unable to write super-block", 44},
+  {"Unable to write inode map", 45},
+  {"Unable to write zone map", 46},
+  {"Unable to write inodes", 47},
+  {"seek failed", 48},
+  {"unable to read super block", 49},
+  {"bad magic number in super-block", 50},
+  {"Only 1k blocks/zones supported", 51},
+  {"bad s_imap_blocks field in super-block", 52},
+  {"bad s_zmap_blocks field in super-block", 53},
+  {"Unable to allocate buffer for inode map", 54},
+  {"Unable to allocate buffer for inodes", 55},
+  {"Unable to allocate buffer for inode count", 56},
+  {"Unable to allocate buffer for zone count", 57},
+  {"Unable to read inode map", 58},
+  {"Unable to read zone map", 59},
+  {"Unable to read inodes", 60},
+  {"Warning: Firstzone != Norm_firstzone\n", 61},
+  {"%ld inodes\n", 62},
+  {"%ld blocks\n", 63},
+  {"Firstdatazone=%ld (%ld)\n", 64},
+  {"Zonesize=%d\n", 65},
+  {"Maxsize=%ld\n", 66},
+  {"Filesystem state=%d\n", 67},
   {"\
 namelen=%d\n\
-\n", 66},
-  {"Inode %d marked not used, but used for file '", 67},
-  {"Mark in use", 68},
-  {" has mode %05o\n", 69},
-  {"Warning: inode count too big.\n", 70},
-  {"root inode isn't a directory", 71},
-  {"Block has been used before. Now in file `", 72},
-  {"Clear", 73},
-  {"Block %d in file `", 74},
-  {"' is marked not in use.", 75},
-  {"Correct", 76},
-  {" contains a bad inode number for file '", 77},
-  {" Remove", 78},
-  {": bad directory: '.' isn't first\n", 79},
-  {": bad directory: '..' isn't second\n", 80},
-  {"internal error", 81},
-  {": bad directory: size<32", 82},
-  {": bad directory: size < 32", 83},
-  {"seek failed in bad_zone", 84},
-  {"Inode %d mode not cleared.", 85},
-  {"Inode %d not used, marked used in the bitmap.", 86},
-  {"Inode %d used, marked unused in the bitmap.", 87},
-  {"Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", 88},
-  {"Set i_nlinks to count", 89},
-  {"Zone %d: marked in use, no file uses it.", 90},
-  {"Unmark", 91},
-  {"Zone %d: %sin use, counted=%d\n", 92},
-  {"not ", 93},
-  {"Set", 94},
-  {"bad inode size", 95},
-  {"bad v2 inode size", 96},
-  {"need terminal for interactive repairs", 97},
-  {"unable to open '%s'", 98},
-  {"%s is clean, no check.\n", 99},
-  {"Forcing filesystem check on %s.\n", 100},
-  {"Filesystem on %s is dirty, needs checking.\n", 101},
+\n", 68},
+  {"Inode %d marked not used, but used for file '", 69},
+  {"Mark in use", 70},
+  {" has mode %05o\n", 71},
+  {"Warning: inode count too big.\n", 72},
+  {"root inode isn't a directory", 73},
+  {"Block has been used before. Now in file `", 74},
+  {"Clear", 75},
+  {"Block %d in file `", 76},
+  {"' is marked not in use.", 77},
+  {"Correct", 78},
+  {"The directory '", 79},
+  {"' contains a bad inode number for file '%.*s'.", 80},
+  {" Remove", 81},
+  {": bad directory: '.' isn't first\n", 82},
+  {": bad directory: '..' isn't second\n", 83},
+  {"internal error", 84},
+  {": bad directory: size < 32", 85},
+  {"seek failed in bad_zone", 86},
+  {"Inode %d mode not cleared.", 87},
+  {"Inode %d not used, marked used in the bitmap.", 88},
+  {"Inode %d used, marked unused in the bitmap.", 89},
+  {"Inode %d (mode = %07o), i_nlinks=%d, counted=%d.", 90},
+  {"Set i_nlinks to count", 91},
+  {"Zone %d: marked in use, no file uses it.", 92},
+  {"Unmark", 93},
+  {"Zone %d: %sin use, counted=%d\n", 94},
+  {"not ", 95},
+  {"Set", 96},
+  {"bad inode size", 97},
+  {"bad v2 inode size", 98},
+  {"need terminal for interactive repairs", 99},
+  {"unable to open '%s'", 100},
+  {"%s is clean, no check.\n", 101},
+  {"Forcing filesystem check on %s.\n", 102},
+  {"Filesystem on %s is dirty, needs checking.\n", 103},
   {"\
 \n\
-%6ld inodes used (%ld%%)\n", 102},
-  {"%6ld zones used (%ld%%)\n", 103},
+%6ld inodes used (%ld%%)\n", 104},
+  {"%6ld zones used (%ld%%)\n", 105},
   {"\
 \n\
 %6d regular files\n\
@@ -127,306 +129,307 @@ namelen=%d\n\
 %6d links\n\
 %6d symbolic links\n\
 ------\n\
-%6d files\n", 104},
+%6d files\n", 106},
   {"\
 ----------------------------\n\
 FILE SYSTEM HAS BEEN CHANGED\n\
-----------------------------\n", 105},
-  {"%s: failed to open: %s\n", 106},
-  {"%s: seek error on %s\n", 107},
-  {"%s: read error on %s\n", 108},
-  {"sector count: %d, sector size: %d\n", 109},
-  {"%s: option parse error\n", 110},
-  {"Usage: %s [-x] [-d <num>] iso9660-image\n", 111},
+----------------------------\n", 107},
+  {"%s: failed to open: %s\n", 108},
+  {"%s: seek error on %s\n", 109},
+  {"%s: read error on %s\n", 110},
+  {"sector count: %d, sector size: %d\n", 111},
+  {"%s: option parse error\n", 112},
+  {"Usage: %s [-x] [-d <num>] iso9660-image\n", 113},
   {"\
 Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n\
-       [-F fsname] device [block-count]\n", 112},
-  {"volume name too long", 113},
-  {"fsname name too long", 114},
-  {"cannot stat device %s", 115},
-  {"%s is not a block special device", 116},
-  {"cannot open %s", 117},
-  {"cannot get size of %s", 118},
-  {"blocks argument too large, max is %lu", 119},
-  {"too many inodes - max is 512", 120},
-  {"not enough space, need at least %lu blocks", 121},
-  {"Device: %s\n", 122},
-  {"Volume: <%-6s>\n", 123},
-  {"FSname: <%-6s>\n", 124},
-  {"BlockSize: %d\n", 125},
-  {"Inodes: %d (in 1 block)\n", 126},
-  {"Inodes: %d (in %ld blocks)\n", 127},
-  {"Blocks: %ld\n", 128},
-  {"Inode end: %d, Data end: %d\n", 129},
-  {"error writing superblock", 130},
-  {"error writing root inode", 131},
-  {"error writing inode", 132},
-  {"seek error", 133},
-  {"error writing . entry", 134},
-  {"error writing .. entry", 135},
-  {"error closing %s", 136},
-  {"Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n", 137},
-  {"%s: Out of memory!\n", 138},
-  {"mkfs version %s (%s)\n", 139},
-  {"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", 140},
-  {"%s is mounted; will not make a filesystem here!", 141},
-  {"seek to boot block failed in write_tables", 142},
-  {"unable to clear boot sector", 143},
-  {"seek failed in write_tables", 144},
-  {"unable to write inode map", 145},
-  {"unable to write zone map", 146},
-  {"unable to write inodes", 147},
-  {"write failed in write_block", 148},
-  {"too many bad blocks", 149},
-  {"not enough good blocks", 150},
-  {"unable to allocate buffers for maps", 151},
-  {"unable to allocate buffer for inodes", 152},
+       [-F fsname] device [block-count]\n", 114},
+  {"volume name too long", 115},
+  {"fsname name too long", 116},
+  {"cannot stat device %s", 117},
+  {"%s is not a block special device", 118},
+  {"cannot open %s", 119},
+  {"cannot get size of %s", 120},
+  {"blocks argument too large, max is %lu", 121},
+  {"too many inodes - max is 512", 122},
+  {"not enough space, need at least %lu blocks", 123},
+  {"Device: %s\n", 124},
+  {"Volume: <%-6s>\n", 125},
+  {"FSname: <%-6s>\n", 126},
+  {"BlockSize: %d\n", 127},
+  {"Inodes: %d (in 1 block)\n", 128},
+  {"Inodes: %d (in %ld blocks)\n", 129},
+  {"Blocks: %ld\n", 130},
+  {"Inode end: %d, Data end: %d\n", 131},
+  {"error writing superblock", 132},
+  {"error writing root inode", 133},
+  {"error writing inode", 134},
+  {"seek error", 135},
+  {"error writing . entry", 136},
+  {"error writing .. entry", 137},
+  {"error closing %s", 138},
+  {"Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n", 139},
+  {"%s: Out of memory!\n", 140},
+  {"mkfs version %s (%s)\n", 141},
+  {"Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", 142},
+  {"%s is mounted; will not make a filesystem here!", 143},
+  {"seek to boot block failed in write_tables", 144},
+  {"unable to clear boot sector", 145},
+  {"seek failed in write_tables", 146},
+  {"unable to write inode map", 147},
+  {"unable to write zone map", 148},
+  {"unable to write inodes", 149},
+  {"write failed in write_block", 150},
+  {"too many bad blocks", 151},
+  {"not enough good blocks", 152},
+  {"unable to allocate buffers for maps", 153},
+  {"unable to allocate buffer for inodes", 154},
   {"\
 Maxsize=%ld\n\
-\n", 153},
-  {"seek failed during testing of blocks", 154},
-  {"Weird values in do_check: probably bugs\n", 155},
-  {"seek failed in check_blocks", 156},
-  {"bad blocks before data-area: cannot make fs", 157},
-  {"%d bad blocks\n", 158},
-  {"one bad block\n", 159},
-  {"can't open file of bad blocks", 160},
-  {"%s: not compiled with minix v2 support\n", 161},
-  {"strtol error: number of blocks not specified", 162},
-  {"unable to open %s", 163},
-  {"unable to stat %s", 164},
-  {"will not try to make filesystem on '%s'", 165},
-  {"Bad user-specified page size %d\n", 166},
-  {"Using user-specified page size %d, instead of the system values %d/%d\n", 167},
-  {"Assuming pages of size %d (not %d)\n", 168},
-  {"Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n", 169},
-  {"too many bad pages", 170},
-  {"Out of memory", 171},
-  {"one bad page\n", 172},
-  {"%d bad pages\n", 173},
-  {"%s: error: Nowhere to set up swap on?\n", 174},
-  {"%s: error: size %ld is larger than device size %d\n", 175},
-  {"%s: error: unknown version %d\n", 176},
-  {"%s: error: swap area needs to be at least %ldkB\n", 177},
-  {"%s: warning: truncating swap area to %ldkB\n", 178},
-  {"Will not try to make swapdevice on '%s'", 179},
-  {"fatal: first page unreadable", 180},
+\n", 155},
+  {"seek failed during testing of blocks", 156},
+  {"Weird values in do_check: probably bugs\n", 157},
+  {"seek failed in check_blocks", 158},
+  {"bad blocks before data-area: cannot make fs", 159},
+  {"%d bad blocks\n", 160},
+  {"one bad block\n", 161},
+  {"can't open file of bad blocks", 162},
+  {"%s: not compiled with minix v2 support\n", 163},
+  {"strtol error: number of blocks not specified", 164},
+  {"unable to open %s", 165},
+  {"unable to stat %s", 166},
+  {"will not try to make filesystem on '%s'", 167},
+  {"Bad user-specified page size %d\n", 168},
+  {"Using user-specified page size %d, instead of the system values %d/%d\n", 169},
+  {"Assuming pages of size %d (not %d)\n", 170},
+  {"Usage: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/name [blocks]\n", 171},
+  {"too many bad pages", 172},
+  {"Out of memory", 173},
+  {"one bad page\n", 174},
+  {"%d bad pages\n", 175},
+  {"%s: error: Nowhere to set up swap on?\n", 176},
+  {"%s: error: size %ld is larger than device size %d\n", 177},
+  {"%s: error: unknown version %d\n", 178},
+  {"%s: error: swap area needs to be at least %ldkB\n", 179},
+  {"%s: warning: truncating swap area to %ldkB\n", 180},
+  {"Will not try to make swapdevice on '%s'", 181},
+  {"fatal: first page unreadable", 182},
   {"\
 %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", 181},
-  {"Unable to set up swap-space: unreadable", 182},
-  {"Setting up swapspace version %d, size = %ld bytes\n", 183},
-  {"unable to rewind swap-device", 184},
-  {"unable to write signature page", 185},
-  {"fsync failed", 186},
-  {"Invalid number: %s\n", 187},
-  {"Syntax error: '%s'\n", 188},
-  {"No such parameter set: '%s'\n", 189},
-  {"usage: %s [ -p ] dev name\n", 190},
-  {"\
-       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n", 191},
-  {"       %s [ -c | -y | -n | -d ] dev\n", 192},
-  {"       %s [ -c | -y | -n ] dev\n", 193},
-  {"Unusable", 194},
-  {"Free Space", 195},
-  {"Linux ext2", 196},
-  {"Linux", 197},
-  {"OS/2 HPFS", 198},
-  {"OS/2 IFS", 199},
-  {"NTFS", 200},
-  {"Disk has been changed.\n", 201},
-  {"Reboot the system to ensure the partition table is correctly updated.\n", 202},
+the -f option to force it.\n", 183},
+  {"Unable to set up swap-space: unreadable", 184},
+  {"Setting up swapspace version %d, size = %ld bytes\n", 185},
+  {"unable to rewind swap-device", 186},
+  {"unable to write signature page", 187},
+  {"fsync failed", 188},
+  {"Invalid number: %s\n", 189},
+  {"Syntax error: '%s'\n", 190},
+  {"No such parameter set: '%s'\n", 191},
+  {"usage: %s [ -p ] dev name\n", 192},
+  {"\
+       %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n", 193},
+  {"       %s [ -c | -y | -n | -d ] dev\n", 194},
+  {"       %s [ -c | -y | -n ] dev\n", 195},
+  {"Unusable", 196},
+  {"Free Space", 197},
+  {"Linux ext2", 198},
+  {"Linux", 199},
+  {"OS/2 HPFS", 200},
+  {"OS/2 IFS", 201},
+  {"NTFS", 202},
+  {"Disk has been changed.\n", 203},
+  {"Reboot the system to ensure the partition table is correctly updated.\n", 204},
   {"\
 \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", 203},
-  {"FATAL ERROR", 204},
-  {"Press any key to exit cfdisk", 205},
-  {"Cannot seek on disk drive", 206},
-  {"Cannot read disk drive", 207},
-  {"Cannot write disk drive", 208},
-  {"Too many partitions", 209},
-  {"Partition begins before sector 0", 210},
-  {"Partition ends before sector 0", 211},
-  {"Partition begins after end-of-disk", 212},
-  {"Partition ends after end-of-disk", 213},
-  {"logical partitions not in disk order", 214},
-  {"logical partitions overlap", 215},
-  {"enlarged logical partitions overlap", 216},
-  {"\
-!!!! Internal error creating logical drive with no extended partition !!!!", 217},
-  {"\
-Cannot create logical drive here -- would create two extended partitions", 218},
-  {"Menu item too long. Menu may look odd.", 219},
-  {"Menu without direction. Defaulting horizontal.", 220},
-  {"Illegal key", 221},
-  {"Press a key to continue", 222},
-  {"Primary", 223},
-  {"Create a new primary partition", 224},
-  {"Logical", 225},
-  {"Create a new logical partition", 226},
-  {"Cancel", 227},
-  {"Don't create a partition", 228},
-  {"!!! Internal error !!!", 229},
-  {"Size (in MB): ", 230},
-  {"Beginning", 231},
-  {"Add partition at beginning of free space", 232},
-  {"End", 233},
-  {"Add partition at end of free space", 234},
-  {"No room to create the extended partition", 235},
-  {"Bad signature on partition table", 236},
-  {"You specified more cylinders than fit on disk", 237},
-  {"Cannot open disk drive", 238},
-  {"Opened disk read-only - you have no permission to write", 239},
-  {"Cannot get disk size", 240},
-  {"Bad primary partition", 241},
-  {"Bad logical partition", 242},
-  {"Warning!!  This may destroy data on your disk!", 243},
-  {"Are you sure you want write the partition table to disk? (yes or no): ", 244},
-  {"no", 245},
-  {"Did not write partition table to disk", 246},
-  {"yes", 247},
-  {"Please enter `yes' or `no'", 248},
-  {"Writing partition table to disk...", 249},
-  {"Wrote partition table to disk", 250},
-  {"\
-Wrote partition table, but re-read table failed.  Reboot to update table.", 251},
-  {"No primary partitions are marked bootable. DOS MBR cannot boot this.", 252},
-  {"\
-More than one primary partition is marked bootable. DOS MBR cannot boot this.", 253},
-  {"Enter filename or press RETURN to display on screen: ", 254},
-  {"Cannot open file '%s'", 255},
-  {"Disk Drive: %s\n", 256},
-  {"Sector 0:\n", 257},
-  {"Sector %d:\n", 258},
-  {"   None   ", 259},
-  {"   Pri/Log", 260},
-  {"   Primary", 261},
-  {"   Logical", 262},
-  {"Unknown", 263},
-  {"Boot (%02X)", 264},
-  {"Unknown (%02X)", 265},
-  {"None (%02X)", 266},
-  {"Partition Table for %s\n", 267},
-  {"            First    Last\n", 268},
-  {"\
- # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n", 269},
+page for additional information.\n", 205},
+  {"FATAL ERROR", 206},
+  {"Press any key to exit cfdisk", 207},
+  {"Cannot seek on disk drive", 208},
+  {"Cannot read disk drive", 209},
+  {"Cannot write disk drive", 210},
+  {"Too many partitions", 211},
+  {"Partition begins before sector 0", 212},
+  {"Partition ends before sector 0", 213},
+  {"Partition begins after end-of-disk", 214},
+  {"Partition ends after end-of-disk", 215},
+  {"logical partitions not in disk order", 216},
+  {"logical partitions overlap", 217},
+  {"enlarged logical partitions overlap", 218},
+  {"\
+!!!! Internal error creating logical drive with no extended partition !!!!", 219},
+  {"\
+Cannot create logical drive here -- would create two extended partitions", 220},
+  {"Menu item too long. Menu may look odd.", 221},
+  {"Menu without direction. Defaulting horizontal.", 222},
+  {"Illegal key", 223},
+  {"Press a key to continue", 224},
+  {"Primary", 225},
+  {"Create a new primary partition", 226},
+  {"Logical", 227},
+  {"Create a new logical partition", 228},
+  {"Cancel", 229},
+  {"Don't create a partition", 230},
+  {"!!! Internal error !!!", 231},
+  {"Size (in MB): ", 232},
+  {"Beginning", 233},
+  {"Add partition at beginning of free space", 234},
+  {"End", 235},
+  {"Add partition at end of free space", 236},
+  {"No room to create the extended partition", 237},
+  {"No partition table or unknown signature on partition table", 238},
+  {"Do you wish to start with a zero table [y/N] ?", 239},
+  {"You specified more cylinders than fit on disk", 240},
+  {"Cannot open disk drive", 241},
+  {"Opened disk read-only - you have no permission to write", 242},
+  {"Cannot get disk size", 243},
+  {"Bad primary partition", 244},
+  {"Bad logical partition", 245},
+  {"Warning!!  This may destroy data on your disk!", 246},
+  {"Are you sure you want write the partition table to disk? (yes or no): ", 247},
+  {"no", 248},
+  {"Did not write partition table to disk", 249},
+  {"yes", 250},
+  {"Please enter `yes' or `no'", 251},
+  {"Writing partition table to disk...", 252},
+  {"Wrote partition table to disk", 253},
+  {"\
+Wrote partition table, but re-read table failed.  Reboot to update table.", 254},
+  {"No primary partitions are marked bootable. DOS MBR cannot boot this.", 255},
+  {"\
+More than one primary partition is marked bootable. DOS MBR cannot boot this.", 256},
+  {"Enter filename or press RETURN to display on screen: ", 257},
+  {"Cannot open file '%s'", 258},
+  {"Disk Drive: %s\n", 259},
+  {"Sector 0:\n", 260},
+  {"Sector %d:\n", 261},
+  {"   None   ", 262},
+  {"   Pri/Log", 263},
+  {"   Primary", 264},
+  {"   Logical", 265},
+  {"Unknown", 266},
+  {"Boot (%02X)", 267},
+  {"Unknown (%02X)", 268},
+  {"None (%02X)", 269},
+  {"Partition Table for %s\n", 270},
+  {"            First    Last\n", 271},
+  {"\
+ # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n", 272},
   {"\
 -- ------- -------- --------- ------ --------- ---------------------- \
----------\n", 270},
-  {"         ---Starting---      ----Ending----    Start Number of\n", 271},
-  {" # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n", 272},
-  {"-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n", 273},
-  {"Raw", 274},
-  {"Print the table using raw data format", 275},
-  {"Sectors", 276},
-  {"Print the table ordered by sectors", 277},
-  {"Table", 278},
-  {"Just print the partition table", 279},
-  {"Don't print the table", 280},
-  {"Help Screen for cfdisk", 281},
-  {"This is cfdisk, a curses based disk partitioning program, which", 282},
-  {"allows you to create, delete and modify partitions on your hard", 283},
-  {"disk drive.", 284},
-  {"Copyright (C) 1994-1999 Kevin E. Martin & aeb", 285},
-  {"Command      Meaning", 286},
-  {"-------      -------", 287},
-  {"  b          Toggle bootable flag of the current partition", 288},
-  {"  d          Delete the current partition", 289},
-  {"  g          Change cylinders, heads, sectors-per-track parameters", 290},
-  {"             WARNING: This option should only be used by people who", 291},
-  {"             know what they are doing.", 292},
-  {"  h          Print this screen", 293},
-  {"  m          Maximize disk usage of the current partition", 294},
-  {"             Note: This may make the partition incompatible with", 295},
-  {"             DOS, OS/2, ...", 296},
-  {"  n          Create new partition from free space", 297},
-  {"  p          Print partition table to the screen or to a file", 298},
-  {"             There are several different formats for the partition", 299},
-  {"             that you can choose from:", 300},
-  {"                r - Raw data (exactly what would be written to disk)", 301},
-  {"                s - Table ordered by sectors", 302},
-  {"                t - Table in raw format", 303},
-  {"  q          Quit program without writing partition table", 304},
-  {"  t          Change the filesystem type", 305},
-  {"  u          Change units of the partition size display", 306},
-  {"             Rotates through MB, sectors and cylinders", 307},
-  {"  W          Write partition table to disk (must enter upper case W)", 308},
-  {"             Since this might destroy data on the disk, you must", 309},
-  {"             either confirm or deny the write by entering `yes' or", 310},
-  {"             `no'", 311},
-  {"Up Arrow     Move cursor to the previous partition", 312},
-  {"Down Arrow   Move cursor to the next partition", 313},
-  {"CTRL-L       Redraws the screen", 314},
-  {"  ?          Print this screen", 315},
-  {"Note: All of the commands can be entered with either upper or lower", 316},
-  {"case letters (except for Writes).", 317},
-  {"Cylinders", 318},
-  {"Change cylinder geometry", 319},
-  {"Heads", 320},
-  {"Change head geometry", 321},
-  {"Change sector geometry", 322},
-  {"Done", 323},
-  {"Done with changing geometry", 324},
-  {"Enter the number of cylinders: ", 325},
-  {"Illegal cylinders value", 326},
-  {"Enter the number of heads: ", 327},
-  {"Illegal heads value", 328},
-  {"Enter the number of sectors per track: ", 329},
-  {"Illegal sectors value", 330},
-  {"Enter filesystem type: ", 331},
-  {"Cannot change FS Type to empty", 332},
-  {"Cannot change FS Type to extended", 333},
-  {"Boot", 334},
-  {"Unk(%02X)", 335},
-  {", NC", 336},
-  {"NC", 337},
-  {"Pri/Log", 338},
-  {"Disk Drive: %s", 339},
-  {"Size: %lld bytes", 340},
-  {"Heads: %d   Sectors per Track: %d   Cylinders: %d", 341},
-  {"Name", 342},
-  {"Flags", 343},
-  {"Part Type", 344},
-  {"FS Type", 345},
-  {"[Label]", 346},
-  {"  Sectors", 347},
-  {"Size (MB)", 348},
-  {"Size (GB)", 349},
-  {"Bootable", 350},
-  {"Toggle bootable flag of the current partition", 351},
-  {"Delete", 352},
-  {"Delete the current partition", 353},
-  {"Geometry", 354},
-  {"Change disk geometry (experts only)", 355},
-  {"Help", 356},
-  {"Print help screen", 357},
-  {"Maximize", 358},
-  {"Maximize disk usage of the current partition (experts only)", 359},
-  {"New", 360},
-  {"Create new partition from free space", 361},
-  {"Print", 362},
-  {"Print partition table to the screen or to a file", 363},
-  {"Quit", 364},
-  {"Quit program without writing partition table", 365},
-  {"Type", 366},
-  {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 367},
-  {"Units", 368},
-  {"Change units of the partition size display (MB, sect, cyl)", 369},
-  {"Write", 370},
-  {"Write partition table to disk (this might destroy data)", 371},
-  {"Cannot make this partition bootable", 372},
-  {"Cannot delete an empty partition", 373},
-  {"Cannot maximize this partition", 374},
-  {"This partition is unusable", 375},
-  {"This partition is already in use", 376},
-  {"Cannot change the type of an empty partition", 377},
-  {"No more partitions", 378},
-  {"Illegal command", 379},
-  {"Copyright (C) 1994-2000 Kevin E. Martin & aeb\n", 380},
+---------\n", 273},
+  {"         ---Starting---      ----Ending----    Start Number of\n", 274},
+  {" # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n", 275},
+  {"-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n", 276},
+  {"Raw", 277},
+  {"Print the table using raw data format", 278},
+  {"Sectors", 279},
+  {"Print the table ordered by sectors", 280},
+  {"Table", 281},
+  {"Just print the partition table", 282},
+  {"Don't print the table", 283},
+  {"Help Screen for cfdisk", 284},
+  {"This is cfdisk, a curses based disk partitioning program, which", 285},
+  {"allows you to create, delete and modify partitions on your hard", 286},
+  {"disk drive.", 287},
+  {"Copyright (C) 1994-1999 Kevin E. Martin & aeb", 288},
+  {"Command      Meaning", 289},
+  {"-------      -------", 290},
+  {"  b          Toggle bootable flag of the current partition", 291},
+  {"  d          Delete the current partition", 292},
+  {"  g          Change cylinders, heads, sectors-per-track parameters", 293},
+  {"             WARNING: This option should only be used by people who", 294},
+  {"             know what they are doing.", 295},
+  {"  h          Print this screen", 296},
+  {"  m          Maximize disk usage of the current partition", 297},
+  {"             Note: This may make the partition incompatible with", 298},
+  {"             DOS, OS/2, ...", 299},
+  {"  n          Create new partition from free space", 300},
+  {"  p          Print partition table to the screen or to a file", 301},
+  {"             There are several different formats for the partition", 302},
+  {"             that you can choose from:", 303},
+  {"                r - Raw data (exactly what would be written to disk)", 304},
+  {"                s - Table ordered by sectors", 305},
+  {"                t - Table in raw format", 306},
+  {"  q          Quit program without writing partition table", 307},
+  {"  t          Change the filesystem type", 308},
+  {"  u          Change units of the partition size display", 309},
+  {"             Rotates through MB, sectors and cylinders", 310},
+  {"  W          Write partition table to disk (must enter upper case W)", 311},
+  {"             Since this might destroy data on the disk, you must", 312},
+  {"             either confirm or deny the write by entering `yes' or", 313},
+  {"             `no'", 314},
+  {"Up Arrow     Move cursor to the previous partition", 315},
+  {"Down Arrow   Move cursor to the next partition", 316},
+  {"CTRL-L       Redraws the screen", 317},
+  {"  ?          Print this screen", 318},
+  {"Note: All of the commands can be entered with either upper or lower", 319},
+  {"case letters (except for Writes).", 320},
+  {"Cylinders", 321},
+  {"Change cylinder geometry", 322},
+  {"Heads", 323},
+  {"Change head geometry", 324},
+  {"Change sector geometry", 325},
+  {"Done", 326},
+  {"Done with changing geometry", 327},
+  {"Enter the number of cylinders: ", 328},
+  {"Illegal cylinders value", 329},
+  {"Enter the number of heads: ", 330},
+  {"Illegal heads value", 331},
+  {"Enter the number of sectors per track: ", 332},
+  {"Illegal sectors value", 333},
+  {"Enter filesystem type: ", 334},
+  {"Cannot change FS Type to empty", 335},
+  {"Cannot change FS Type to extended", 336},
+  {"Boot", 337},
+  {"Unk(%02X)", 338},
+  {", NC", 339},
+  {"NC", 340},
+  {"Pri/Log", 341},
+  {"Disk Drive: %s", 342},
+  {"Size: %lld bytes", 343},
+  {"Heads: %d   Sectors per Track: %d   Cylinders: %d", 344},
+  {"Name", 345},
+  {"Flags", 346},
+  {"Part Type", 347},
+  {"FS Type", 348},
+  {"[Label]", 349},
+  {"  Sectors", 350},
+  {"Size (MB)", 351},
+  {"Size (GB)", 352},
+  {"Bootable", 353},
+  {"Toggle bootable flag of the current partition", 354},
+  {"Delete", 355},
+  {"Delete the current partition", 356},
+  {"Geometry", 357},
+  {"Change disk geometry (experts only)", 358},
+  {"Help", 359},
+  {"Print help screen", 360},
+  {"Maximize", 361},
+  {"Maximize disk usage of the current partition (experts only)", 362},
+  {"New", 363},
+  {"Create new partition from free space", 364},
+  {"Print", 365},
+  {"Print partition table to the screen or to a file", 366},
+  {"Quit", 367},
+  {"Quit program without writing partition table", 368},
+  {"Type", 369},
+  {"Change the filesystem type (DOS, Linux, OS/2 and so on)", 370},
+  {"Units", 371},
+  {"Change units of the partition size display (MB, sect, cyl)", 372},
+  {"Write", 373},
+  {"Write partition table to disk (this might destroy data)", 374},
+  {"Cannot make this partition bootable", 375},
+  {"Cannot delete an empty partition", 376},
+  {"Cannot maximize this partition", 377},
+  {"This partition is unusable", 378},
+  {"This partition is already in use", 379},
+  {"Cannot change the type of an empty partition", 380},
+  {"No more partitions", 381},
+  {"Illegal command", 382},
+  {"Copyright (C) 1994-2000 Kevin E. Martin & aeb\n", 383},
   {"\
 \n\
 Usage:\n\
@@ -442,7 +445,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", 381},
+\n", 384},
   {"\
 Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n\
        fdisk -l [-b SSZ] [-u] DISK  List partition table(s)\n\
@@ -451,65 +454,65 @@ 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", 382},
+-b 2048: (for certain MO drives) use 2048-byte sectors\n", 385},
   {"\
 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", 383},
-  {"Unable to open %s\n", 384},
-  {"Unable to read %s\n", 385},
-  {"Unable to seek on %s\n", 386},
-  {"Unable to write %s\n", 387},
-  {"BLKGETSIZE ioctl failed on %s\n", 388},
-  {"Unable to allocate any more memory\n", 389},
-  {"Fatal error\n", 390},
-  {"Command action", 391},
-  {"   a   toggle a read only flag", 392},
-  {"   b   edit bsd disklabel", 393},
-  {"   c   toggle the mountable flag", 394},
-  {"   d   delete a partition", 395},
-  {"   l   list known partition types", 396},
-  {"   m   print this menu", 397},
-  {"   n   add a new partition", 398},
-  {"   o   create a new empty DOS partition table", 399},
-  {"   p   print the partition table", 400},
-  {"   q   quit without saving changes", 401},
-  {"   s   create a new empty Sun disklabel", 402},
-  {"   t   change a partition's system id", 403},
-  {"   u   change display/entry units", 404},
-  {"   v   verify the partition table", 405},
-  {"   w   write table to disk and exit", 406},
-  {"   x   extra functionality (experts only)", 407},
-  {"   a   select bootable partition", 408},
-  {"   b   edit bootfile entry", 409},
-  {"   c   select sgi swap partition", 410},
-  {"   a   toggle a bootable flag", 411},
-  {"   c   toggle the dos compatibility flag", 412},
-  {"   a   change number of alternate cylinders", 413},
-  {"   c   change number of cylinders", 414},
-  {"   d   print the raw data in the partition table", 415},
-  {"   e   change number of extra sectors per cylinder", 416},
-  {"   h   change number of heads", 417},
-  {"   i   change interleave factor", 418},
-  {"   o   change rotation speed (rpm)", 419},
-  {"   r   return to main menu", 420},
-  {"   s   change number of sectors/track", 421},
-  {"   y   change number of physical cylinders", 422},
-  {"   b   move beginning of data in a partition", 423},
-  {"   e   list extended partitions", 424},
-  {"   g   create an IRIX partition table", 425},
-  {"   f   fix partition order", 426},
-  {"You must set", 427},
-  {"heads", 428},
-  {"sectors", 429},
-  {"cylinders", 430},
+  ...\n", 386},
+  {"Unable to open %s\n", 387},
+  {"Unable to read %s\n", 388},
+  {"Unable to seek on %s\n", 389},
+  {"Unable to write %s\n", 390},
+  {"BLKGETSIZE ioctl failed on %s\n", 391},
+  {"Unable to allocate any more memory\n", 392},
+  {"Fatal error\n", 393},
+  {"Command action", 394},
+  {"   a   toggle a read only flag", 395},
+  {"   b   edit bsd disklabel", 396},
+  {"   c   toggle the mountable flag", 397},
+  {"   d   delete a partition", 398},
+  {"   l   list known partition types", 399},
+  {"   m   print this menu", 400},
+  {"   n   add a new partition", 401},
+  {"   o   create a new empty DOS partition table", 402},
+  {"   p   print the partition table", 403},
+  {"   q   quit without saving changes", 404},
+  {"   s   create a new empty Sun disklabel", 405},
+  {"   t   change a partition's system id", 406},
+  {"   u   change display/entry units", 407},
+  {"   v   verify the partition table", 408},
+  {"   w   write table to disk and exit", 409},
+  {"   x   extra functionality (experts only)", 410},
+  {"   a   select bootable partition", 411},
+  {"   b   edit bootfile entry", 412},
+  {"   c   select sgi swap partition", 413},
+  {"   a   toggle a bootable flag", 414},
+  {"   c   toggle the dos compatibility flag", 415},
+  {"   a   change number of alternate cylinders", 416},
+  {"   c   change number of cylinders", 417},
+  {"   d   print the raw data in the partition table", 418},
+  {"   e   change number of extra sectors per cylinder", 419},
+  {"   h   change number of heads", 420},
+  {"   i   change interleave factor", 421},
+  {"   o   change rotation speed (rpm)", 422},
+  {"   r   return to main menu", 423},
+  {"   s   change number of sectors/track", 424},
+  {"   y   change number of physical cylinders", 425},
+  {"   b   move beginning of data in a partition", 426},
+  {"   e   list extended partitions", 427},
+  {"   g   create an IRIX partition table", 428},
+  {"   f   fix partition order", 429},
+  {"You must set", 430},
+  {"heads", 431},
+  {"sectors", 432},
+  {"cylinders", 433},
   {"\
 %s%s.\n\
-You can do this from the extra functions menu.\n", 431},
-  {" and ", 432},
+You can do this from the extra functions menu.\n", 434},
+  {" and ", 435},
   {"\
 \n\
 The number of cylinders for this disk is set to %d.\n\
@@ -517,152 +520,151 @@ 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", 433},
-  {"Bad offset in primary extended partition\n", 434},
-  {"Warning: deleting partitions after %d\n", 435},
-  {"Warning: extra link pointer in partition table %d\n", 436},
-  {"Warning: ignoring extra data in partition table %d\n", 437},
+   (e.g., DOS FDISK, OS/2 FDISK)\n", 436},
+  {"Bad offset in primary extended partition\n", 437},
+  {"Warning: deleting partitions after %d\n", 438},
+  {"Warning: extra link pointer in partition table %d\n", 439},
+  {"Warning: ignoring extra data in partition table %d\n", 440},
   {"\
 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", 438},
-  {"Note: sector size is %d (not %d)\n", 439},
-  {"You will not be able to write the partition table.\n", 440},
+\n", 441},
+  {"Note: sector size is %d (not %d)\n", 442},
+  {"You will not be able to write the partition table.\n", 443},
   {"\
 Device contains neither a valid DOS partition table, nor Sun, SGI or OSF \
-disklabel\n", 441},
-  {"Internal error\n", 442},
-  {"Ignoring extra extended partition %d\n", 443},
+disklabel\n", 444},
+  {"Internal error\n", 445},
+  {"Ignoring extra extended partition %d\n", 446},
   {"\
 Warning: invalid flag 0x%04x of partition table %d will be corrected by \
-w(rite)\n", 444},
+w(rite)\n", 447},
   {"\
 \n\
-got EOF thrice - exiting..\n", 445},
-  {"Hex code (type L to list codes): ", 446},
-  {"%s (%d-%d, default %d): ", 447},
-  {"Using default value %d\n", 448},
-  {"Value out of range.\n", 449},
-  {"Partition number", 450},
-  {"Warning: partition %d has empty type\n", 451},
-  {"cylinder", 452},
-  {"sector", 453},
-  {"Changing display/entry units to %s\n", 454},
-  {"WARNING: Partition %d is an extended partition\n", 455},
-  {"DOS Compatibility flag is set\n", 456},
-  {"DOS Compatibility flag is not set\n", 457},
-  {"Partition %d does not exist yet!\n", 458},
+got EOF thrice - exiting..\n", 448},
+  {"Hex code (type L to list codes): ", 449},
+  {"%s (%d-%d, default %d): ", 450},
+  {"Using default value %d\n", 451},
+  {"Value out of range.\n", 452},
+  {"Partition number", 453},
+  {"Warning: partition %d has empty type\n", 454},
+  {"cylinder", 455},
+  {"sector", 456},
+  {"Changing display/entry units to %s\n", 457},
+  {"WARNING: Partition %d is an extended partition\n", 458},
+  {"DOS Compatibility flag is set\n", 459},
+  {"DOS Compatibility flag is not set\n", 460},
+  {"Partition %d does not exist yet!\n", 461},
   {"\
 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", 459},
+a partition using the `d' command.\n", 462},
   {"\
 You cannot change a partition into an extended one or vice versa\n\
-Delete it first.\n", 460},
+Delete it first.\n", 463},
   {"\
 Consider leaving partition 3 as Whole disk (5),\n\
 as SunOS/Solaris expects it and even Linux likes it.\n\
-\n", 461},
+\n", 464},
   {"\
 Consider leaving partition 9 as volume header (0),\n\
 and partition 11 as entire volume (6)as IRIX expects it.\n\
-\n", 462},
-  {"Changed system type of partition %d to %x (%s)\n", 463},
-  {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 464},
-  {"     phys=(%d, %d, %d) ", 465},
-  {"logical=(%d, %d, %d)\n", 466},
-  {"Partition %d has different physical/logical endings:\n", 467},
-  {"Partition %i does not start on cylinder boundary:\n", 468},
-  {"should be (%d, %d, 1)\n", 469},
-  {"Partition %i does not end on cylinder boundary:\n", 470},
-  {"should be (%d, %d, %d)\n", 471},
+\n", 465},
+  {"Changed system type of partition %d to %x (%s)\n", 466},
+  {"Partition %d has different physical/logical beginnings (non-Linux?):\n", 467},
+  {"     phys=(%d, %d, %d) ", 468},
+  {"logical=(%d, %d, %d)\n", 469},
+  {"Partition %d has different physical/logical endings:\n", 470},
+  {"Partition %i does not start on cylinder boundary:\n", 471},
+  {"should be (%d, %d, 1)\n", 472},
+  {"Partition %i does not end on cylinder boundary:\n", 473},
+  {"should be (%d, %d, %d)\n", 474},
   {"\
 \n\
 Disk %s: %d heads, %d sectors, %d cylinders\n\
 Units = %s of %d * %d bytes\n\
-\n", 472},
+\n", 475},
   {"\
 Nothing to do. Ordering is correct already.\n\
-\n", 473},
-  {"%*s Boot    Start       End    Blocks   Id  System\n", 474},
-  {"Device", 475},
+\n", 476},
+  {"%*s Boot    Start       End    Blocks   Id  System\n", 477},
+  {"Device", 478},
   {"\
 \n\
-Partition table entries are not in disk order\n", 476},
+Partition table entries are not in disk order\n", 479},
   {"\
 \n\
 Disk %s: %d heads, %d sectors, %d cylinders\n\
-\n", 477},
-  {"Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n", 478},
-  {"Warning: partition %d contains sector 0\n", 479},
-  {"Partition %d: head %d greater than maximum %d\n", 480},
-  {"Partition %d: sector %d greater than maximum %d\n", 481},
-  {"Partitions %d: cylinder %d greater than maximum %d\n", 482},
-  {"Partition %d: previous sectors %d disagrees with total %d\n", 483},
-  {"Warning: bad start-of-data in partition %d\n", 484},
-  {"Warning: partition %d overlaps partition %d.\n", 485},
-  {"Warning: partition %d is empty\n", 486},
-  {"Logical partition %d not entirely in partition %d\n", 487},
-  {"Total allocated sectors %d greater than the maximum %d\n", 488},
-  {"%d unallocated sectors\n", 489},
-  {"Partition %d is already defined.  Delete it before re-adding it.\n", 490},
-  {"First %s", 491},
-  {"Sector %d is already allocated\n", 492},
-  {"No free sectors available\n", 493},
-  {"Last %s or +size or +sizeM or +sizeK", 494},
-  {"Warning: partition %d has an odd number of sectors.\n", 495},
-  {"The maximum number of partitions has been created\n", 496},
-  {"You must delete some partition and add an extended partition first\n", 497},
+\n", 480},
+  {"Nr AF  Hd Sec  Cyl  Hd Sec  Cyl    Start     Size ID\n", 481},
+  {"Warning: partition %d contains sector 0\n", 482},
+  {"Partition %d: head %d greater than maximum %d\n", 483},
+  {"Partition %d: sector %d greater than maximum %d\n", 484},
+  {"Partitions %d: cylinder %d greater than maximum %d\n", 485},
+  {"Partition %d: previous sectors %d disagrees with total %d\n", 486},
+  {"Warning: bad start-of-data in partition %d\n", 487},
+  {"Warning: partition %d overlaps partition %d.\n", 488},
+  {"Warning: partition %d is empty\n", 489},
+  {"Logical partition %d not entirely in partition %d\n", 490},
+  {"Total allocated sectors %d greater than the maximum %d\n", 491},
+  {"%d unallocated sectors\n", 492},
+  {"Partition %d is already defined.  Delete it before re-adding it.\n", 493},
+  {"First %s", 494},
+  {"Sector %d is already allocated\n", 495},
+  {"No free sectors available\n", 496},
+  {"Last %s or +size or +sizeM or +sizeK", 497},
+  {"The maximum number of partitions has been created\n", 498},
+  {"You must delete some partition and add an extended partition first\n", 499},
   {"\
 Command action\n\
    %s\n\
-   p   primary partition (1-4)\n", 498},
-  {"l   logical (5 or over)", 499},
-  {"e   extended", 500},
-  {"Invalid partition number for type `%c'\n", 501},
+   p   primary partition (1-4)\n", 500},
+  {"l   logical (5 or over)", 501},
+  {"e   extended", 502},
+  {"Invalid partition number for type `%c'\n", 503},
   {"\
 The partition table has been altered!\n\
-\n", 502},
-  {"Calling ioctl() to re-read partition table.\n", 503},
+\n", 504},
+  {"Calling ioctl() to re-read partition table.\n", 505},
   {"\
 Re-read table failed with error %d: %s.\n\
-Reboot your system to ensure the partition table is updated.\n", 504},
+Reboot your system to ensure the partition table is updated.\n", 506},
   {"\
 \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", 505},
-  {"Syncing disks.\n", 506},
-  {"Partition %d has no data area\n", 507},
-  {"New beginning of data", 508},
-  {"Expert command (m for help): ", 509},
-  {"Number of cylinders", 510},
-  {"Number of heads", 511},
-  {"Number of sectors", 512},
-  {"Warning: setting sector offset for DOS compatiblity\n", 513},
-  {"Disk %s doesn't contain a valid partition table\n", 514},
-  {"Cannot open %s\n", 515},
-  {"cannot open %s\n", 516},
-  {"%c: unknown command\n", 517},
-  {"This kernel finds the sector size itself - -b option ignored\n", 518},
+information.\n", 507},
+  {"Syncing disks.\n", 508},
+  {"Partition %d has no data area\n", 509},
+  {"New beginning of data", 510},
+  {"Expert command (m for help): ", 511},
+  {"Number of cylinders", 512},
+  {"Number of heads", 513},
+  {"Number of sectors", 514},
+  {"Warning: setting sector offset for DOS compatiblity\n", 515},
+  {"Disk %s doesn't contain a valid partition table\n", 516},
+  {"Cannot open %s\n", 517},
+  {"cannot open %s\n", 518},
+  {"%c: unknown command\n", 519},
+  {"This kernel finds the sector size itself - -b option ignored\n", 520},
   {"\
 Warning: the -b (set sector size) option should be used with one specified \
-device\n", 519},
+device\n", 521},
   {"\
 Detected an OSF/1 disklabel on %s, entering disklabel mode.\n\
-To return to DOS partition table mode, use the 'r' command.\n", 520},
-  {"Command (m for help): ", 521},
+To return to DOS partition table mode, use the 'r' command.\n", 522},
+  {"Command (m for help): ", 523},
   {"\
 \n\
-The current boot file is: %s\n", 522},
-  {"Please enter the name of the new boot file: ", 523},
-  {"Boot file unchanged\n", 524},
+The current boot file is: %s\n", 524},
+  {"Please enter the name of the new boot file: ", 525},
+  {"Boot file unchanged\n", 526},
   {"\
 \n\
 \tSorry, no experts menu for SGI partition tables available.\n\
-\n", 525},
+\n", 527},
   {"\
 \n\
 \tThere is a valid AIX label on this disk.\n\
@@ -675,94 +677,94 @@ The current boot file is: %s\n", 522},
 \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).", 526},
+\t   machine.  (Otherwise you become an AIXpert).", 528},
   {"\
 \n\
-BSD label for device: %s\n", 527},
-  {"   d   delete a BSD partition", 528},
-  {"   e   edit drive data", 529},
-  {"   i   install bootstrap", 530},
-  {"   l   list known filesystem types", 531},
-  {"   n   add a new BSD partition", 532},
-  {"   p   print BSD partition table", 533},
-  {"   s   show complete disklabel", 534},
-  {"   t   change a partition's filesystem id", 535},
-  {"   u   change units (cylinders/sectors)", 536},
-  {"   w   write disklabel to disk", 537},
-  {"   x   link BSD partition to non-BSD partition", 538},
-  {"Partition %s has invalid starting sector 0.\n", 539},
-  {"Reading disklabel of %s at sector %d.\n", 540},
-  {"There is no *BSD partition on %s.\n", 541},
-  {"BSD disklabel command (m for help): ", 542},
-  {"type: %s\n", 543},
-  {"type: %d\n", 544},
-  {"disk: %.*s\n", 545},
-  {"label: %.*s\n", 546},
-  {"flags:", 547},
-  {" removable", 548},
-  {" ecc", 549},
-  {" badsect", 550},
-  {"bytes/sector: %ld\n", 551},
-  {"sectors/track: %ld\n", 552},
-  {"tracks/cylinder: %ld\n", 553},
-  {"sectors/cylinder: %ld\n", 554},
-  {"cylinders: %ld\n", 555},
-  {"rpm: %d\n", 556},
-  {"interleave: %d\n", 557},
-  {"trackskew: %d\n", 558},
-  {"cylinderskew: %d\n", 559},
-  {"headswitch: %ld\t\t# milliseconds\n", 560},
-  {"track-to-track seek: %ld\t# milliseconds\n", 561},
-  {"drivedata: ", 562},
+BSD label for device: %s\n", 529},
+  {"   d   delete a BSD partition", 530},
+  {"   e   edit drive data", 531},
+  {"   i   install bootstrap", 532},
+  {"   l   list known filesystem types", 533},
+  {"   n   add a new BSD partition", 534},
+  {"   p   print BSD partition table", 535},
+  {"   s   show complete disklabel", 536},
+  {"   t   change a partition's filesystem id", 537},
+  {"   u   change units (cylinders/sectors)", 538},
+  {"   w   write disklabel to disk", 539},
+  {"   x   link BSD partition to non-BSD partition", 540},
+  {"Partition %s has invalid starting sector 0.\n", 541},
+  {"Reading disklabel of %s at sector %d.\n", 542},
+  {"There is no *BSD partition on %s.\n", 543},
+  {"BSD disklabel command (m for help): ", 544},
+  {"type: %s\n", 545},
+  {"type: %d\n", 546},
+  {"disk: %.*s\n", 547},
+  {"label: %.*s\n", 548},
+  {"flags:", 549},
+  {" removable", 550},
+  {" ecc", 551},
+  {" badsect", 552},
+  {"bytes/sector: %ld\n", 553},
+  {"sectors/track: %ld\n", 554},
+  {"tracks/cylinder: %ld\n", 555},
+  {"sectors/cylinder: %ld\n", 556},
+  {"cylinders: %ld\n", 557},
+  {"rpm: %d\n", 558},
+  {"interleave: %d\n", 559},
+  {"trackskew: %d\n", 560},
+  {"cylinderskew: %d\n", 561},
+  {"headswitch: %ld\t\t# milliseconds\n", 562},
+  {"track-to-track seek: %ld\t# milliseconds\n", 563},
+  {"drivedata: ", 564},
   {"\
 \n\
-%d partitions:\n", 563},
-  {"#       start       end      size     fstype   [fsize bsize   cpg]\n", 564},
-  {"Writing disklabel to %s.\n", 565},
-  {"%s contains no disklabel.\n", 566},
-  {"Do you want to create a disklabel? (y/n) ", 567},
-  {"bytes/sector", 568},
-  {"sectors/track", 569},
-  {"tracks/cylinder", 570},
-  {"sectors/cylinder", 571},
-  {"Must be <= sectors/track * tracks/cylinder (default).\n", 572},
-  {"rpm", 573},
-  {"interleave", 574},
-  {"trackskew", 575},
-  {"cylinderskew", 576},
-  {"headswitch", 577},
-  {"track-to-track seek", 578},
-  {"Bootstrap: %sboot -> boot%s (%s): ", 579},
-  {"Bootstrap overlaps with disk label!\n", 580},
-  {"Bootstrap installed on %s.\n", 581},
-  {"Partition (a-%c): ", 582},
-  {"This partition already exists.\n", 583},
-  {"Warning: too many partitions (%d, maximum is %d).\n", 584},
+%d partitions:\n", 565},
+  {"#       start       end      size     fstype   [fsize bsize   cpg]\n", 566},
+  {"Writing disklabel to %s.\n", 567},
+  {"%s contains no disklabel.\n", 568},
+  {"Do you want to create a disklabel? (y/n) ", 569},
+  {"bytes/sector", 570},
+  {"sectors/track", 571},
+  {"tracks/cylinder", 572},
+  {"sectors/cylinder", 573},
+  {"Must be <= sectors/track * tracks/cylinder (default).\n", 574},
+  {"rpm", 575},
+  {"interleave", 576},
+  {"trackskew", 577},
+  {"cylinderskew", 578},
+  {"headswitch", 579},
+  {"track-to-track seek", 580},
+  {"Bootstrap: %sboot -> boot%s (%s): ", 581},
+  {"Bootstrap overlaps with disk label!\n", 582},
+  {"Bootstrap installed on %s.\n", 583},
+  {"Partition (a-%c): ", 584},
+  {"This partition already exists.\n", 585},
+  {"Warning: too many partitions (%d, maximum is %d).\n", 586},
   {"\
 \n\
-Syncing disks.\n", 585},
-  {"SGI volhdr", 586},
-  {"SGI trkrepl", 587},
-  {"SGI secrepl", 588},
-  {"SGI raw", 589},
-  {"SGI bsd", 590},
-  {"SGI sysv", 591},
-  {"SGI volume", 592},
-  {"SGI efs", 593},
-  {"SGI lvol", 594},
-  {"SGI rlvol", 595},
-  {"SGI xfs", 596},
-  {"SGI xfslog", 597},
-  {"SGI xlv", 598},
-  {"SGI xvm", 599},
-  {"Linux swap", 600},
-  {"Linux native", 601},
-  {"Linux LVM", 602},
-  {"Linux RAID", 603},
+Syncing disks.\n", 587},
+  {"SGI volhdr", 588},
+  {"SGI trkrepl", 589},
+  {"SGI secrepl", 590},
+  {"SGI raw", 591},
+  {"SGI bsd", 592},
+  {"SGI sysv", 593},
+  {"SGI volume", 594},
+  {"SGI efs", 595},
+  {"SGI lvol", 596},
+  {"SGI rlvol", 597},
+  {"SGI xfs", 598},
+  {"SGI xfslog", 599},
+  {"SGI xlv", 600},
+  {"SGI xvm", 601},
+  {"Linux swap", 602},
+  {"Linux native", 603},
+  {"Linux LVM", 604},
+  {"Linux RAID", 605},
   {"\
 According to MIPS Computer Systems, Inc the Label must not contain more than \
-512 bytes\n", 604},
-  {"Detected sgi disklabel with wrong checksum.\n", 605},
+512 bytes\n", 606},
+  {"Detected sgi disklabel with wrong checksum.\n", 607},
   {"\
 \n\
 Disk %s (SGI disk label): %d heads, %d sectors\n\
@@ -770,139 +772,140 @@ 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", 606},
+\n", 608},
   {"\
 \n\
 Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n\
 Units = %s of %d * 512 bytes\n\
-\n", 607},
+\n", 609},
   {"\
 ----- partitions -----\n\
-%*s  Info      Start       End   Sectors  Id  System\n", 608},
+Pt# %*s  Info     Start       End   Sectors  Id  System\n", 610},
   {"\
------ bootinfo -----\n\
+----- Bootinfo -----\n\
 Bootfile: %s\n\
------ directory entries -----\n", 609},
-  {"%2d: %-10s sector%5u size%8u\n", 610},
+----- Directory Entries -----\n", 611},
+  {"%2d: %-10s sector%5u size%8u\n", 612},
   {"\
 \n\
 Invalid Bootfile!\n\
 \tThe bootfile must be an absolute non-zero pathname,\n\
-\te.g. \"/unix\" or \"/unix.save\".\n", 611},
+\te.g. \"/unix\" or \"/unix.save\".\n", 613},
   {"\
 \n\
-\tName of Bootfile too long:  16 bytes maximum.\n", 612},
+\tName of Bootfile too long:  16 bytes maximum.\n", 614},
   {"\
 \n\
-\tBootfile must have a fully qualified pathname.\n", 613},
+\tBootfile must have a fully qualified pathname.\n", 615},
   {"\
 \n\
 \tBe aware, that the bootfile is not checked for existence.\n\
-\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 614},
+\tSGI's default is \"/unix\" and for backup \"/unix.save\".\n", 616},
   {"\
 \n\
-\tBootfile is changed to \"%s\".\n", 615},
-  {"More than one entire disk entry present.\n", 616},
-  {"No partitions defined\n", 617},
-  {"IRIX likes when Partition 11 covers the entire disk.\n", 618},
+\tBootfile is changed to \"%s\".\n", 617},
+  {"More than one entire disk entry present.\n", 618},
+  {"No partitions defined\n", 619},
+  {"IRIX likes when Partition 11 covers the entire disk.\n", 620},
   {"\
 The entire disk partition should start at block 0,\n\
-not at diskblock %d.\n", 619},
+not at diskblock %d.\n", 621},
   {"\
 The entire disk partition is only %d diskblock large,\n\
-but the disk is %d diskblocks long.\n", 620},
-  {"One Partition (#11) should cover the entire disk.\n", 621},
-  {"Partition %d does not start on cylinder boundary.\n", 622},
-  {"Partition %d does not end on cylinder boundary.\n", 623},
-  {"The Partition %d and %d overlap by %d sectors.\n", 624},
-  {"Unused gap of %8d sectors - sectors %8d-%d\n", 625},
+but the disk is %d diskblocks long.\n", 622},
+  {"One Partition (#11) should cover the entire disk.\n", 623},
+  {"Partition %d does not start on cylinder boundary.\n", 624},
+  {"Partition %d does not end on cylinder boundary.\n", 625},
+  {"The Partition %d and %d overlap by %d sectors.\n", 626},
+  {"Unused gap of %8d sectors - sectors %8d-%d\n", 627},
   {"\
 \n\
-The boot partition does not exist.\n", 626},
+The boot partition does not exist.\n", 628},
   {"\
 \n\
-The swap partition does not exist.\n", 627},
+The swap partition does not exist.\n", 629},
   {"\
 \n\
-The swap partition has no swap type.\n", 628},
-  {"\tYou have chosen an unusual boot file name.\n", 629},
-  {"Sorry You may change the Tag of non-empty partitions.\n", 630},
+The swap partition has no swap type.\n", 630},
+  {"\tYou have chosen an unusual boot file name.\n", 631},
+  {"Sorry You may change the Tag of non-empty partitions.\n", 632},
   {"\
 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", 631},
-  {"Do You know, You got a partition overlap on the disk?\n", 632},
-  {"Attempting to generate entire disk entry automatically.\n", 633},
-  {"The entire disk is already covered with partitions.\n", 634},
-  {"You got a partition overlap on the disk. Fix it first!\n", 635},
+Type YES if you are sure about tagging this partition differently.\n", 633},
+  {"Do You know, You got a partition overlap on the disk?\n", 634},
+  {"Attempting to generate entire disk entry automatically.\n", 635},
+  {"The entire disk is already covered with partitions.\n", 636},
+  {"You got a partition overlap on the disk. Fix it first!\n", 637},
   {"\
 It is highly recommended that eleventh partition\n\
-covers the entire disk and is of type `SGI volume'\n", 636},
-  {"You will get a partition overlap on the disk. Fix it first!\n", 637},
-  {" Last %s", 638},
+covers the entire disk and is of type `SGI volume'\n", 638},
+  {"You will get a partition overlap on the disk. Fix it first!\n", 639},
+  {" Last %s", 640},
   {"\
 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", 639},
-  {"Trying to keep parameters of partition %d.\n", 640},
-  {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 641},
-  {"Empty", 642},
-  {"SunOS root", 643},
-  {"SunOS swap", 644},
-  {"SunOS usr", 645},
-  {"Whole disk", 646},
-  {"SunOS stand", 647},
-  {"SunOS var", 648},
-  {"SunOS home", 649},
+\n", 641},
+  {"Trying to keep parameters of partition %d.\n", 642},
+  {"ID=%02x\tSTART=%d\tLENGTH=%d\n", 643},
+  {"Empty", 644},
+  {"SunOS root", 645},
+  {"SunOS swap", 646},
+  {"SunOS usr", 647},
+  {"Whole disk", 648},
+  {"SunOS stand", 649},
+  {"SunOS var", 650},
+  {"SunOS home", 651},
+  {"Linux raid autodetect", 652},
   {"\
 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", 650},
-  {"Autoconfigure found a %s%s%s\n", 651},
+or force a fresh label (s command in main menu)\n", 653},
+  {"Autoconfigure found a %s%s%s\n", 654},
   {"\
 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", 652},
+\n", 655},
   {"\
 Drive type\n\
    ?   auto configure\n\
-   0   custom (with hardware detected defaults)", 653},
-  {"Select type (? for auto, 0 for custom): ", 654},
-  {"Autoconfigure failed.\n", 655},
-  {"Sectors/track", 656},
-  {"Alternate cylinders", 657},
-  {"Physical cylinders", 658},
-  {"Rotation speed (rpm)", 659},
-  {"Interleave factor", 660},
-  {"Extra sectors per cylinder", 661},
-  {"You may change all the disk params from the x menu", 662},
-  {"3,5\" floppy", 663},
-  {"Linux custom", 664},
-  {"Partition %d doesn't end on cylinder boundary\n", 665},
-  {"Partition %d overlaps with others in sectors %d-%d\n", 666},
-  {"Unused gap - sectors 0-%d\n", 667},
-  {"Unused gap - sectors %d-%d\n", 668},
+   0   custom (with hardware detected defaults)", 656},
+  {"Select type (? for auto, 0 for custom): ", 657},
+  {"Autoconfigure failed.\n", 658},
+  {"Sectors/track", 659},
+  {"Alternate cylinders", 660},
+  {"Physical cylinders", 661},
+  {"Rotation speed (rpm)", 662},
+  {"Interleave factor", 663},
+  {"Extra sectors per cylinder", 664},
+  {"You may change all the disk params from the x menu", 665},
+  {"3,5\" floppy", 666},
+  {"Linux custom", 667},
+  {"Partition %d doesn't end on cylinder boundary\n", 668},
+  {"Partition %d overlaps with others in sectors %d-%d\n", 669},
+  {"Unused gap - sectors 0-%d\n", 670},
+  {"Unused gap - sectors %d-%d\n", 671},
   {"\
 Other partitions already cover the whole disk.\n\
-Delete some/shrink them before retry.\n", 669},
+Delete some/shrink them before retry.\n", 672},
   {"\
 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", 670},
+to %d %s\n", 673},
   {"\
 If you want to maintain SunOS/Solaris compatibility, consider leaving this\n\
-partition as Whole disk (5), starting at 0, with %u sectors\n", 671},
+partition as Whole disk (5), starting at 0, with %u sectors\n", 674},
   {"\
 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): ", 672},
+tagged with 82 (Linux swap): ", 675},
   {"\
 \n\
 Disk %s (Sun disk label): %d heads, %d sectors, %d rpm\n\
@@ -910,451 +913,455 @@ 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", 673},
+\n", 676},
   {"\
 \n\
 Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n\
 Units = %s of %d * 512 bytes\n\
-\n", 674},
-  {"%*s Flag    Start       End    Blocks   Id  System\n", 675},
-  {"Number of alternate cylinders", 676},
-  {"Number of physical cylinders", 677},
-  {"FAT12", 678},
-  {"XENIX root", 679},
-  {"XENIX usr", 680},
-  {"FAT16 <32M", 681},
-  {"Extended", 682},
-  {"FAT16", 683},
-  {"HPFS/NTFS", 684},
-  {"AIX", 685},
-  {"AIX bootable", 686},
-  {"OS/2 Boot Manager", 687},
-  {"Win95 FAT32", 688},
-  {"Win95 FAT32 (LBA)", 689},
-  {"Win95 FAT16 (LBA)", 690},
-  {"Win95 Ext'd (LBA)", 691},
-  {"OPUS", 692},
-  {"Hidden FAT12", 693},
-  {"Compaq diagnostics", 694},
-  {"Hidden FAT16 <32M", 695},
-  {"Hidden FAT16", 696},
-  {"Hidden HPFS/NTFS", 697},
-  {"AST Windows swapfile", 698},
-  {"Hidden Win95 FAT32", 699},
-  {"Hidden Win95 FAT32 (LBA)", 700},
-  {"Hidden Win95 FAT16 (LBA)", 701},
-  {"NEC DOS", 702},
-  {"Plan 9", 703},
-  {"PartitionMagic recovery", 704},
-  {"Venix 80286", 705},
-  {"PPC PReP Boot", 706},
-  {"SFS", 707},
-  {"QNX4.x", 708},
-  {"QNX4.x 2nd part", 709},
-  {"QNX4.x 3rd part", 710},
-  {"OnTrack DM", 711},
-  {"OnTrack DM6 Aux1", 712},
-  {"CP/M", 713},
-  {"OnTrack DM6 Aux3", 714},
-  {"OnTrackDM6", 715},
-  {"EZ-Drive", 716},
-  {"Golden Bow", 717},
-  {"Priam Edisk", 718},
-  {"SpeedStor", 719},
-  {"GNU HURD or SysV", 720},
-  {"Novell Netware 286", 721},
-  {"Novell Netware 386", 722},
-  {"DiskSecure Multi-Boot", 723},
-  {"PC/IX", 724},
-  {"Old Minix", 725},
-  {"Minix / old Linux", 726},
-  {"OS/2 hidden C: drive", 727},
-  {"Linux extended", 728},
-  {"NTFS volume set", 729},
-  {"Amoeba", 730},
-  {"Amoeba BBT", 731},
-  {"BSD/OS", 732},
-  {"IBM Thinkpad hibernation", 733},
-  {"BSD/386", 734},
-  {"OpenBSD", 735},
-  {"NeXTSTEP", 736},
-  {"BSDI fs", 737},
-  {"BSDI swap", 738},
-  {"DRDOS/sec (FAT-12)", 739},
-  {"DRDOS/sec (FAT-16 < 32M)", 740},
-  {"DRDOS/sec (FAT-16)", 741},
-  {"Syrinx", 742},
-  {"Non-FS data", 743},
-  {"CP/M / CTOS / ...", 744},
-  {"Dell Utility", 745},
-  {"DOS access", 746},
-  {"DOS R/O", 747},
-  {"BeOS fs", 748},
-  {"EFI GPT", 749},
-  {"EFI (FAT-12/16/32)", 750},
-  {"DOS secondary", 751},
-  {"Linux raid autodetect", 752},
-  {"LANstep", 753},
-  {"BBT", 754},
-  {"seek error on %s - cannot seek to %lu\n", 755},
-  {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 756},
-  {"out of memory - giving up\n", 757},
-  {"read error on %s - cannot read sector %lu\n", 758},
-  {"ERROR: sector %lu does not have an msdos signature\n", 759},
-  {"write error on %s - cannot write sector %lu\n", 760},
-  {"cannot open partition sector save file (%s)\n", 761},
-  {"write error on %s\n", 762},
-  {"cannot stat partition restore file (%s)\n", 763},
-  {"partition restore file has wrong size - not restoring\n", 764},
-  {"out of memory?\n", 765},
-  {"cannot open partition restore file (%s)\n", 766},
-  {"error reading %s\n", 767},
-  {"cannot open device %s for writing\n", 768},
-  {"error writing sector %lu on %s\n", 769},
-  {"Disk %s: cannot get size\n", 770},
-  {"Disk %s: cannot get geometry\n", 771},
+\n", 677},
+  {"%*s Flag    Start       End    Blocks   Id  System\n", 678},
+  {"Number of alternate cylinders", 679},
+  {"Number of physical cylinders", 680},
+  {"FAT12", 681},
+  {"XENIX root", 682},
+  {"XENIX usr", 683},
+  {"FAT16 <32M", 684},
+  {"Extended", 685},
+  {"FAT16", 686},
+  {"HPFS/NTFS", 687},
+  {"AIX", 688},
+  {"AIX bootable", 689},
+  {"OS/2 Boot Manager", 690},
+  {"Win95 FAT32", 691},
+  {"Win95 FAT32 (LBA)", 692},
+  {"Win95 FAT16 (LBA)", 693},
+  {"Win95 Ext'd (LBA)", 694},
+  {"OPUS", 695},
+  {"Hidden FAT12", 696},
+  {"Compaq diagnostics", 697},
+  {"Hidden FAT16 <32M", 698},
+  {"Hidden FAT16", 699},
+  {"Hidden HPFS/NTFS", 700},
+  {"AST SmartSleep", 701},
+  {"Hidden Win95 FAT32", 702},
+  {"Hidden Win95 FAT32 (LBA)", 703},
+  {"Hidden Win95 FAT16 (LBA)", 704},
+  {"NEC DOS", 705},
+  {"Plan 9", 706},
+  {"PartitionMagic recovery", 707},
+  {"Venix 80286", 708},
+  {"PPC PReP Boot", 709},
+  {"SFS", 710},
+  {"QNX4.x", 711},
+  {"QNX4.x 2nd part", 712},
+  {"QNX4.x 3rd part", 713},
+  {"OnTrack DM", 714},
+  {"OnTrack DM6 Aux1", 715},
+  {"CP/M", 716},
+  {"OnTrack DM6 Aux3", 717},
+  {"OnTrackDM6", 718},
+  {"EZ-Drive", 719},
+  {"Golden Bow", 720},
+  {"Priam Edisk", 721},
+  {"SpeedStor", 722},
+  {"GNU HURD or SysV", 723},
+  {"Novell Netware 286", 724},
+  {"Novell Netware 386", 725},
+  {"DiskSecure Multi-Boot", 726},
+  {"PC/IX", 727},
+  {"Old Minix", 728},
+  {"Minix / old Linux", 729},
+  {"OS/2 hidden C: drive", 730},
+  {"Linux extended", 731},
+  {"NTFS volume set", 732},
+  {"Amoeba", 733},
+  {"Amoeba BBT", 734},
+  {"BSD/OS", 735},
+  {"IBM Thinkpad hibernation", 736},
+  {"BSD/386", 737},
+  {"OpenBSD", 738},
+  {"NeXTSTEP", 739},
+  {"BSDI fs", 740},
+  {"BSDI swap", 741},
+  {"Boot Wizard hidden", 742},
+  {"DRDOS/sec (FAT-12)", 743},
+  {"DRDOS/sec (FAT-16 < 32M)", 744},
+  {"DRDOS/sec (FAT-16)", 745},
+  {"Syrinx", 746},
+  {"Non-FS data", 747},
+  {"CP/M / CTOS / ...", 748},
+  {"Dell Utility", 749},
+  {"BootIt", 750},
+  {"DOS access", 751},
+  {"DOS R/O", 752},
+  {"BeOS fs", 753},
+  {"EFI GPT", 754},
+  {"EFI (FAT-12/16/32)", 755},
+  {"DOS secondary", 756},
+  {"LANstep", 757},
+  {"BBT", 758},
+  {"seek error on %s - cannot seek to %lu\n", 759},
+  {"seek error: wanted 0x%08x%08x, got 0x%08x%08x\n", 760},
+  {"out of memory - giving up\n", 761},
+  {"read error on %s - cannot read sector %lu\n", 762},
+  {"ERROR: sector %lu does not have an msdos signature\n", 763},
+  {"write error on %s - cannot write sector %lu\n", 764},
+  {"cannot open partition sector save file (%s)\n", 765},
+  {"write error on %s\n", 766},
+  {"cannot stat partition restore file (%s)\n", 767},
+  {"partition restore file has wrong size - not restoring\n", 768},
+  {"out of memory?\n", 769},
+  {"cannot open partition restore file (%s)\n", 770},
+  {"error reading %s\n", 771},
+  {"cannot open device %s for writing\n", 772},
+  {"error writing sector %lu on %s\n", 773},
+  {"Disk %s: cannot get size\n", 774},
+  {"Disk %s: cannot get geometry\n", 775},
   {"\
 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", 772},
-  {"Warning: HDIO_GETGEO says that there are %lu heads\n", 773},
-  {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 774},
-  {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 775},
+[Use the --force option if you really want this]\n", 776},
+  {"Warning: HDIO_GETGEO says that there are %lu heads\n", 777},
+  {"Warning: HDIO_GETGEO says that there are %lu sectors\n", 778},
+  {"Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n", 779},
   {"\
 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", 776},
+This will give problems with all software that uses C/H/S addressing.\n", 780},
   {"\
 \n\
-Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 777},
+Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n", 781},
   {"\
-%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 778},
+%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n", 782},
   {"\
 %s of partition %s has impossible value for sector: %lu (should be in \
-1-%lu)\n", 779},
+1-%lu)\n", 783},
   {"\
 %s of partition %s has impossible value for cylinders: %lu (should be in \
-0-%lu)\n", 780},
+0-%lu)\n", 784},
   {"\
 Id  Name\n\
-\n", 781},
-  {"Re-reading the partition table ...\n", 782},
+\n", 785},
+  {"Re-reading the partition table ...\n", 786},
   {"\
 The command to re-read the partition table failed\n\
-Reboot your system now, before using mkfs\n", 783},
-  {"Error closing %s\n", 784},
-  {"%s: no such partition\n", 785},
-  {"unrecognized format - using sectors\n", 786},
-  {"# partition table of %s\n", 787},
-  {"unimplemented format - using %s\n", 788},
+Reboot your system now, before using mkfs\n", 787},
+  {"Error closing %s\n", 788},
+  {"%s: no such partition\n", 789},
+  {"unrecognized format - using sectors\n", 790},
+  {"# partition table of %s\n", 791},
+  {"unimplemented format - using %s\n", 792},
   {"\
 Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 789},
-  {"   Device Boot Start     End   #cyls   #blocks   Id  System\n", 790},
+\n", 793},
+  {"   Device Boot Start     End   #cyls   #blocks   Id  System\n", 794},
   {"\
 Units = sectors of 512 bytes, counting from %d\n\
-\n", 791},
-  {"   Device Boot    Start       End  #sectors  Id  System\n", 792},
+\n", 795},
+  {"   Device Boot    Start       End  #sectors  Id  System\n", 796},
   {"\
 Units = blocks of 1024 bytes, counting from %d\n\
-\n", 793},
-  {"   Device Boot   Start       End   #blocks   Id  System\n", 794},
+\n", 797},
+  {"   Device Boot   Start       End   #blocks   Id  System\n", 798},
   {"\
 Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n\
-\n", 795},
-  {"   Device Boot Start   End     MB   #blocks   Id  System\n", 796},
-  {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 797},
-  {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 798},
-  {"partition ends on cylinder %ld, beyond the end of the disk\n", 799},
-  {"No partitions found\n", 800},
+\n", 799},
+  {"   Device Boot Start   End     MB   #blocks   Id  System\n", 800},
+  {"\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 801},
+  {"\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 802},
+  {"partition ends on cylinder %ld, beyond the end of the disk\n", 803},
+  {"No partitions found\n", 804},
   {"\
 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", 801},
-  {"no partition table present.\n", 802},
-  {"strange, only %d partitions defined.\n", 803},
-  {"Warning: partition %s has size 0 but is not marked Empty\n", 804},
-  {"Warning: partition %s has size 0 and is bootable\n", 805},
-  {"Warning: partition %s has size 0 and nonzero start\n", 806},
-  {"Warning: partition %s ", 807},
-  {"is not contained in partition %s\n", 808},
-  {"Warning: partitions %s ", 809},
-  {"and %s overlap\n", 810},
-  {"Warning: partition %s contains part of ", 811},
-  {"the partition table (sector %lu),\n", 812},
-  {"and will destroy it when filled\n", 813},
-  {"Warning: partition %s starts at sector 0\n", 814},
-  {"Warning: partition %s extends past end of disk\n", 815},
-  {"Among the primary partitions, at most one can be extended\n", 816},
-  {" (although this is not a problem under Linux)\n", 817},
-  {"Warning: partition %s does not start at a cylinder boundary\n", 818},
-  {"Warning: partition %s does not end at a cylinder boundary\n", 819},
+For this listing I'll assume that geometry.\n", 805},
+  {"no partition table present.\n", 806},
+  {"strange, only %d partitions defined.\n", 807},
+  {"Warning: partition %s has size 0 but is not marked Empty\n", 808},
+  {"Warning: partition %s has size 0 and is bootable\n", 809},
+  {"Warning: partition %s has size 0 and nonzero start\n", 810},
+  {"Warning: partition %s ", 811},
+  {"is not contained in partition %s\n", 812},
+  {"Warning: partitions %s ", 813},
+  {"and %s overlap\n", 814},
+  {"\
+Warning: partition %s contains part of the partition table (sector %lu),\n\
+and will destroy it when filled\n", 815},
+  {"Warning: partition %s starts at sector 0\n", 816},
+  {"Warning: partition %s extends past end of disk\n", 817},
+  {"\
+Among the primary partitions, at most one can be extended\n\
+ (although this is not a problem under Linux)\n", 818},
+  {"Warning: partition %s does not start at a cylinder boundary\n", 819},
+  {"Warning: partition %s does not end at a cylinder boundary\n", 820},
   {"\
 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", 820},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 821},
   {"\
 Warning: usually one can boot from primary partitions only\n\
-LILO disregards the `bootable' flag.\n", 821},
+LILO disregards the `bootable' flag.\n", 822},
   {"\
 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", 822},
-  {"\
-partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 823},
-  {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 824},
-  {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 825},
-  {"Warning: shifted start of the extd partition from %ld to %ld\n", 826},
-  {"(For listing purposes only. Do not change its contents.)\n", 827},
-  {"Warning: extended partition does not start at a cylinder boundary.\n", 828},
-  {"DOS and Linux will interpret the contents differently.\n", 829},
-  {"too many partitions - ignoring those past nr (%d)\n", 830},
-  {"tree of partitions?\n", 831},
-  {"detected Disk Manager - unable to handle that\n", 832},
-  {"DM6 signature found - giving up\n", 833},
-  {"strange..., an extended partition of size 0?\n", 834},
-  {"strange..., a BSD partition of size 0?\n", 835},
-  {" %s: unrecognized partition\n", 836},
-  {"-n flag was given: Nothing changed\n", 837},
-  {"Failed saving the old sectors - aborting\n", 838},
-  {"Failed writing the partition on %s\n", 839},
-  {"long or incomplete input line - quitting\n", 840},
-  {"input error: `=' expected after %s field\n", 841},
-  {"input error: unexpected character %c after %s field\n", 842},
-  {"unrecognized input: %s\n", 843},
-  {"number too big\n", 844},
-  {"trailing junk after number\n", 845},
-  {"no room for partition descriptor\n", 846},
-  {"cannot build surrounding extended partition\n", 847},
-  {"too many input fields\n", 848},
-  {"No room for more\n", 849},
-  {"Illegal type\n", 850},
-  {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 851},
-  {"Warning: empty partition\n", 852},
-  {"Warning: bad partition start (earliest %lu)\n", 853},
-  {"unrecognized bootable flag - choose - or *\n", 854},
-  {"partial c,h,s specification?\n", 855},
-  {"Extended partition not where expected\n", 856},
-  {"bad input\n", 857},
-  {"too many partitions\n", 858},
+This does not matter for LILO, but the DOS MBR will not boot this disk.\n", 823},
+  {"\
+partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 824},
+  {"partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n", 825},
+  {"partition %s ends on cylinder %ld, beyond the end of the disk\n", 826},
+  {"\
+Warning: shifted start of the extd partition from %ld to %ld\n\
+(For listing purposes only. Do not change its contents.)\n", 827},
+  {"\
+Warning: extended partition does not start at a cylinder boundary.\n\
+DOS and Linux will interpret the contents differently.\n", 828},
+  {"too many partitions - ignoring those past nr (%d)\n", 829},
+  {"tree of partitions?\n", 830},
+  {"detected Disk Manager - unable to handle that\n", 831},
+  {"DM6 signature found - giving up\n", 832},
+  {"strange..., an extended partition of size 0?\n", 833},
+  {"strange..., a BSD partition of size 0?\n", 834},
+  {" %s: unrecognized partition\n", 835},
+  {"-n flag was given: Nothing changed\n", 836},
+  {"Failed saving the old sectors - aborting\n", 837},
+  {"Failed writing the partition on %s\n", 838},
+  {"long or incomplete input line - quitting\n", 839},
+  {"input error: `=' expected after %s field\n", 840},
+  {"input error: unexpected character %c after %s field\n", 841},
+  {"unrecognized input: %s\n", 842},
+  {"number too big\n", 843},
+  {"trailing junk after number\n", 844},
+  {"no room for partition descriptor\n", 845},
+  {"cannot build surrounding extended partition\n", 846},
+  {"too many input fields\n", 847},
+  {"No room for more\n", 848},
+  {"Illegal type\n", 849},
+  {"Warning: given size (%lu) exceeds max allowable size (%lu)\n", 850},
+  {"Warning: empty partition\n", 851},
+  {"Warning: bad partition start (earliest %lu)\n", 852},
+  {"unrecognized bootable flag - choose - or *\n", 853},
+  {"partial c,h,s specification?\n", 854},
+  {"Extended partition not where expected\n", 855},
+  {"bad input\n", 856},
+  {"too many partitions\n", 857},
   {"\
 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", 859},
-  {"version", 860},
-  {"Usage: %s [options] device ...\n", 861},
-  {"device: something like /dev/hda or /dev/sda", 862},
-  {"useful options:", 863},
-  {"    -s [or --show-size]: list size of a partition", 864},
-  {"    -c [or --id]:        print or change partition Id", 865},
-  {"    -l [or --list]:      list partitions of each device", 866},
-  {"    -d [or --dump]:      idem, but in a format suitable for later input", 867},
-  {"    -i [or --increment]: number cylinders etc. from 1 instead of from 0", 868},
+Usually you only need to specify <start> and <size> (and perhaps <type>).\n", 858},
+  {"version", 859},
+  {"Usage: %s [options] device ...\n", 860},
+  {"device: something like /dev/hda or /dev/sda", 861},
+  {"useful options:", 862},
+  {"    -s [or --show-size]: list size of a partition", 863},
+  {"    -c [or --id]:        print or change partition Id", 864},
+  {"    -l [or --list]:      list partitions of each device", 865},
+  {"    -d [or --dump]:      idem, but in a format suitable for later input", 866},
+  {"    -i [or --increment]: number cylinders etc. from 1 instead of from 0", 867},
   {"\
     -uS, -uB, -uC, -uM:  accept/report in units of \
-sectors/blocks/cylinders/MB", 869},
-  {"    -T [or --list-types]:list the known partition types", 870},
-  {"    -D [or --DOS]:       for DOS-compatibility: waste a little space", 871},
-  {"    -R [or --re-read]:   make kernel reread partition table", 872},
-  {"    -N# :                change only the partition with number #", 873},
-  {"    -n :                 do not actually write to disk", 874},
-  {"\
-    -O file :            save the sectors that will be overwritten to file", 875},
-  {"    -I file :            restore these sectors again", 876},
-  {"    -v [or --version]:   print version", 877},
-  {"    -? [or --help]:      print this message", 878},
-  {"dangerous options:", 879},
-  {"    -g [or --show-geometry]: print the kernel's idea of the geometry", 880},
+sectors/blocks/cylinders/MB", 868},
+  {"    -T [or --list-types]:list the known partition types", 869},
+  {"    -D [or --DOS]:       for DOS-compatibility: waste a little space", 870},
+  {"    -R [or --re-read]:   make kernel reread partition table", 871},
+  {"    -N# :                change only the partition with number #", 872},
+  {"    -n :                 do not actually write to disk", 873},
+  {"\
+    -O file :            save the sectors that will be overwritten to file", 874},
+  {"    -I file :            restore these sectors again", 875},
+  {"    -v [or --version]:   print version", 876},
+  {"    -? [or --help]:      print this message", 877},
+  {"dangerous options:", 878},
+  {"    -g [or --show-geometry]: print the kernel's idea of the geometry", 879},
   {"\
     -x [or --show-extended]: also list extended partitions on output\n\
-                             or expect descriptors for them on input", 881},
-  {"\
-    -L  [or --Linux]:      do not complain about things irrelevant for Linux", 882},
-  {"    -q  [or --quiet]:      suppress warning messages", 883},
-  {"    You can override the detected geometry using:", 884},
-  {"    -C# [or --cylinders #]:set the number of cylinders to use", 885},
-  {"    -H# [or --heads #]:    set the number of heads to use", 886},
-  {"    -S# [or --sectors #]:  set the number of sectors to use", 887},
-  {"You can disable all consistency checking with:", 888},
-  {"    -f  [or --force]:      do what I say, even if it is stupid", 889},
-  {"Usage:", 890},
-  {"%s device\t\t list active partitions on device\n", 891},
-  {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 892},
-  {"%s -An device\t activate partition n, inactivate the other ones\n", 893},
-  {"no command?\n", 894},
-  {"total: %d blocks\n", 895},
-  {"usage: sfdisk --print-id device partition-number\n", 896},
-  {"usage: sfdisk --change-id device partition-number Id\n", 897},
-  {"usage: sfdisk --id device partition-number [Id]\n", 898},
-  {"can specify only one device (except with -l or -s)\n", 899},
-  {"cannot open %s %s\n", 900},
-  {"read-write", 901},
-  {"for reading", 902},
-  {"%s: OK\n", 903},
-  {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 904},
-  {"BLKGETSIZE ioctl failed for %s\n", 905},
-  {"bad active byte: 0x%x instead of 0x80\n", 906},
+                             or expect descriptors for them on input", 880},
+  {"\
+    -L  [or --Linux]:      do not complain about things irrelevant for Linux", 881},
+  {"    -q  [or --quiet]:      suppress warning messages", 882},
+  {"    You can override the detected geometry using:", 883},
+  {"    -C# [or --cylinders #]:set the number of cylinders to use", 884},
+  {"    -H# [or --heads #]:    set the number of heads to use", 885},
+  {"    -S# [or --sectors #]:  set the number of sectors to use", 886},
+  {"You can disable all consistency checking with:", 887},
+  {"    -f  [or --force]:      do what I say, even if it is stupid", 888},
+  {"Usage:", 889},
+  {"%s device\t\t list active partitions on device\n", 890},
+  {"%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n", 891},
+  {"%s -An device\t activate partition n, inactivate the other ones\n", 892},
+  {"no command?\n", 893},
+  {"total: %d blocks\n", 894},
+  {"usage: sfdisk --print-id device partition-number\n", 895},
+  {"usage: sfdisk --change-id device partition-number Id\n", 896},
+  {"usage: sfdisk --id device partition-number [Id]\n", 897},
+  {"can specify only one device (except with -l or -s)\n", 898},
+  {"cannot open %s %s\n", 899},
+  {"read-write", 900},
+  {"for reading", 901},
+  {"%s: OK\n", 902},
+  {"%s: %ld cylinders, %ld heads, %ld sectors/track\n", 903},
+  {"BLKGETSIZE ioctl failed for %s\n", 904},
+  {"bad active byte: 0x%x instead of 0x80\n", 905},
   {"\
 Done\n\
-\n", 907},
+\n", 906},
   {"\
 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", 908},
-  {"partition %s has id %x and is not hidden\n", 909},
-  {"Bad Id %lx\n", 910},
-  {"This disk is currently in use.\n", 911},
-  {"Fatal error: cannot find %s\n", 912},
-  {"Warning: %s is not a block device\n", 913},
-  {"Checking that no-one is using this disk right now ...\n", 914},
+but the DOS MBR will only boot a disk with 1 active partition.\n", 907},
+  {"partition %s has id %x and is not hidden\n", 908},
+  {"Bad Id %lx\n", 909},
+  {"This disk is currently in use.\n", 910},
+  {"Fatal error: cannot find %s\n", 911},
+  {"Warning: %s is not a block device\n", 912},
+  {"Checking that no-one is using this disk right now ...\n", 913},
   {"\
 \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", 915},
-  {"Use the --force flag to overrule all checks.\n", 916},
-  {"OK\n", 917},
-  {"Old situation:\n", 918},
-  {"Partition %d does not exist, cannot change it\n", 919},
-  {"New situation:\n", 920},
+Use the --no-reread flag to suppress this check.\n", 914},
+  {"Use the --force flag to overrule all checks.\n", 915},
+  {"OK\n", 916},
+  {"Old situation:\n", 917},
+  {"Partition %d does not exist, cannot change it\n", 918},
+  {"New situation:\n", 919},
   {"\
 I don't like these partitions - nothing changed.\n\
-(If you really want this, use the --force option.)\n", 921},
-  {"I don't like this - probably you should answer No\n", 922},
-  {"Are you satisfied with this? [ynq] ", 923},
-  {"Do you want to write this to disk? [ynq] ", 924},
+(If you really want this, use the --force option.)\n", 920},
+  {"I don't like this - probably you should answer No\n", 921},
+  {"Are you satisfied with this? [ynq] ", 922},
+  {"Do you want to write this to disk? [ynq] ", 923},
   {"\
 \n\
-sfdisk: premature end of input\n", 925},
-  {"Quitting - nothing changed\n", 926},
-  {"Please answer one of y,n,q\n", 927},
+sfdisk: premature end of input\n", 924},
+  {"Quitting - nothing changed\n", 925},
+  {"Please answer one of y,n,q\n", 926},
   {"\
 Successfully wrote the new partition table\n\
-\n", 928},
+\n", 927},
   {"\
 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", 929},
-  {"usage: banner [-w width]\n", 930},
-  {"Message: ", 931},
-  {"The character '%c' is not in my character set", 932},
-  {"Message '%s' is OK\n", 933},
-  {"Try `getopt --help' for more information.\n", 934},
-  {"empty long option after -l or --long argument", 935},
-  {"unknown shell after -s or --shell argument", 936},
-  {"Usage: getopt optstring parameters\n", 937},
-  {"       getopt [options] [--] optstring parameters\n", 938},
-  {"       getopt [options] -o|--options optstring [options] [--]\n", 939},
-  {"              parameters\n", 940},
-  {"\
-  -a, --alternative            Allow long options starting with single -\n", 941},
-  {"  -h, --help                   This small usage guide\n", 942},
-  {"  -l, --longoptions=longopts   Long options to be recognized\n", 943},
-  {"\
-  -n, --name=progname          The name under which errors are reported\n", 944},
-  {"  -o, --options=optstring      Short options to be recognized\n", 945},
-  {"  -q, --quiet                  Disable error reporting by getopt(3)\n", 946},
-  {"  -Q, --quiet-output           No normal output\n", 947},
-  {"  -s, --shell=shell            Set shell quoting conventions\n", 948},
-  {"  -T, --test                   Test for getopt(1) version\n", 949},
-  {"  -u, --unqote                 Do not quote the output\n", 950},
-  {"  -V, --version                Output version information\n", 951},
-  {"missing optstring argument", 952},
-  {"getopt (enhanced) 1.1.0\n", 953},
-  {"internal error, contact the author.", 954},
-  {"booted from MILO\n", 955},
-  {"Ruffian BCD clock\n", 956},
-  {"clockport adjusted to 0x%x\n", 957},
-  {"funky TOY!\n", 958},
-  {"%s: atomic %s failed for 1000 iterations!", 959},
-  {"Cannot open /dev/port: %s", 960},
-  {"I failed to get permission because I didn't try.\n", 961},
-  {"%s is unable to get I/O port access:  the iopl(3) call failed.\n", 962},
-  {"Probably you need root privileges.\n", 963},
-  {"Assuming hardware clock is kept in %s time.\n", 964},
-  {"UTC", 965},
-  {"local", 966},
-  {"%s: Warning: unrecognized third line in adjtime file\n", 967},
-  {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 968},
-  {"Last drift adjustment done at %d seconds after 1969\n", 969},
-  {"Last calibration done at %d seconds after 1969\n", 970},
-  {"Hardware clock is on %s time\n", 971},
-  {"unknown", 972},
-  {"Waiting for clock tick...\n", 973},
-  {"...got clock tick\n", 974},
-  {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 975},
-  {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 976},
-  {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 977},
-  {"Setting Hardware Clock to %.2d:%.2d:%.2d = %d seconds since 1969\n", 978},
-  {"Clock not changed - testing only.\n", 979},
+(See fdisk(8).)\n", 928},
+  {"usage: banner [-w width]\n", 929},
+  {"Message: ", 930},
+  {"The character '%c' is not in my character set", 931},
+  {"Message '%s' is OK\n", 932},
+  {"Try `getopt --help' for more information.\n", 933},
+  {"empty long option after -l or --long argument", 934},
+  {"unknown shell after -s or --shell argument", 935},
+  {"Usage: getopt optstring parameters\n", 936},
+  {"       getopt [options] [--] optstring parameters\n", 937},
+  {"       getopt [options] -o|--options optstring [options] [--]\n", 938},
+  {"              parameters\n", 939},
+  {"\
+  -a, --alternative            Allow long options starting with single -\n", 940},
+  {"  -h, --help                   This small usage guide\n", 941},
+  {"  -l, --longoptions=longopts   Long options to be recognized\n", 942},
+  {"\
+  -n, --name=progname          The name under which errors are reported\n", 943},
+  {"  -o, --options=optstring      Short options to be recognized\n", 944},
+  {"  -q, --quiet                  Disable error reporting by getopt(3)\n", 945},
+  {"  -Q, --quiet-output           No normal output\n", 946},
+  {"  -s, --shell=shell            Set shell quoting conventions\n", 947},
+  {"  -T, --test                   Test for getopt(1) version\n", 948},
+  {"  -u, --unqote                 Do not quote the output\n", 949},
+  {"  -V, --version                Output version information\n", 950},
+  {"missing optstring argument", 951},
+  {"getopt (enhanced) 1.1.2\n", 952},
+  {"internal error, contact the author.", 953},
+  {"booted from MILO\n", 954},
+  {"Ruffian BCD clock\n", 955},
+  {"clockport adjusted to 0x%x\n", 956},
+  {"funky TOY!\n", 957},
+  {"%s: atomic %s failed for 1000 iterations!", 958},
+  {"Cannot open /dev/port: %s", 959},
+  {"I failed to get permission because I didn't try.\n", 960},
+  {"%s is unable to get I/O port access:  the iopl(3) call failed.\n", 961},
+  {"Probably you need root privileges.\n", 962},
+  {"Assuming hardware clock is kept in %s time.\n", 963},
+  {"UTC", 964},
+  {"local", 965},
+  {"%s: Warning: unrecognized third line in adjtime file\n", 966},
+  {"(Expected: `UTC' or `LOCAL' or nothing.)\n", 967},
+  {"Last drift adjustment done at %ld seconds after 1969\n", 968},
+  {"Last calibration done at %ld seconds after 1969\n", 969},
+  {"Hardware clock is on %s time\n", 970},
+  {"unknown", 971},
+  {"Waiting for clock tick...\n", 972},
+  {"...got clock tick\n", 973},
+  {"Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n", 974},
+  {"Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n", 975},
+  {"Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n", 976},
+  {"Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n", 977},
+  {"Clock not changed - testing only.\n", 978},
   {"\
 Time elapsed since reference time has been %.6f seconds.\n\
-Delaying further to reach the next full second.\n", 980},
+Delaying further to reach the next full second.\n", 979},
   {"\
 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", 981},
-  {"%s  %.6f seconds\n", 982},
-  {"No --date option specified.\n", 983},
+50th day of month) or beyond the range we can handle (e.g. Year 2095).\n", 980},
+  {"%s  %.6f seconds\n", 981},
+  {"No --date option specified.\n", 982},
   {"\
 The value of the --date option is not a valid date.\n\
-In particular, it contains quotation marks.\n", 984},
-  {"Issuing date command: %s\n", 985},
-  {"Unable to run 'date' program in /bin/sh shell. popen() failed", 986},
-  {"response from date command = %s\n", 987},
+In particular, it contains quotation marks.\n", 983},
+  {"Issuing date command: %s\n", 984},
+  {"Unable to run 'date' program in /bin/sh shell. popen() failed", 985},
+  {"response from date command = %s\n", 986},
   {"\
 The date command issued by %s returned unexpected results.\n\
 The command was:\n\
   %s\n\
 The response was:\n\
-  %s\n", 988},
+  %s\n", 987},
   {"\
 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", 989},
-  {"date string %s equates to %d seconds since 1969.\n", 990},
+ %s\n", 988},
+  {"date string %s equates to %ld seconds since 1969.\n", 989},
   {"\
 The Hardware Clock does not contain a valid time, so we cannot set the \
-System Time from it.\n", 991},
-  {"Calling settimeofday:\n", 992},
-  {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 993},
-  {"\ttz.tz_minuteswest = %d\n", 994},
-  {"Not setting system clock because running in test mode.\n", 995},
-  {"Must be superuser to set system clock.\n", 996},
-  {"settimeofday() failed", 997},
+System Time from it.\n", 990},
+  {"Calling settimeofday:\n", 991},
+  {"\ttv.tv_sec = %ld, tv.tv_usec = %ld\n", 992},
+  {"\ttz.tz_minuteswest = %d\n", 993},
+  {"Not setting system clock because running in test mode.\n", 994},
+  {"Must be superuser to set system clock.\n", 995},
+  {"settimeofday() failed", 996},
   {"\
 Not adjusting drift factor because the Hardware Clock previously contained \
-garbage.\n", 998},
+garbage.\n", 997},
   {"\
 Not adjusting drift factor because it has been less than a day since the \
-last calibration.\n", 999},
+last calibration.\n", 998},
   {"\
 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", 1000},
-  {"Time since last adjustment is %d seconds\n", 1001},
-  {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1002},
-  {"Not updating adjtime file because of testing mode.\n", 1003},
+Adjusting drift factor by %f seconds/day\n", 999},
+  {"Time since last adjustment is %d seconds\n", 1000},
+  {"Need to insert %d seconds and refer time back %.6f seconds ago\n", 1001},
+  {"Not updating adjtime file because of testing mode.\n", 1002},
   {"\
 Would have written the following to %s:\n\
-%s", 1004},
-  {"Drift adjustment parameters not updated.\n", 1005},
+%s", 1003},
+  {"Drift adjustment parameters not updated.\n", 1004},
   {"\
-The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1006},
-  {"Needed adjustment is less than one second, so not setting clock.\n", 1007},
-  {"Using %s.\n", 1008},
-  {"No usable clock interface found.\n", 1009},
-  {"Unable to set system clock.\n", 1010},
+The Hardware Clock does not contain a valid time, so we cannot adjust it.\n", 1005},
+  {"Needed adjustment is less than one second, so not setting clock.\n", 1006},
+  {"Using %s.\n", 1007},
+  {"No usable clock interface found.\n", 1008},
+  {"Unable to set system clock.\n", 1009},
   {"\
 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", 1011},
-  {"Unable to get the epoch value from the kernel.\n", 1012},
-  {"Kernel is assuming an epoch value of %lu\n", 1013},
+(and thus is presumably not running on an Alpha now).  No action taken.\n", 1010},
+  {"Unable to get the epoch value from the kernel.\n", 1011},
+  {"Kernel is assuming an epoch value of %lu\n", 1012},
   {"\
 To set the epoch value, you must use the 'epoch' option to tell to what \
-value to set it.\n", 1014},
-  {"Not setting the epoch to %d - testing only.\n", 1015},
-  {"Unable to set the epoch value in the kernel.\n", 1016},
+value to set it.\n", 1013},
+  {"Not setting the epoch to %d - testing only.\n", 1014},
+  {"Unable to set the epoch value in the kernel.\n", 1015},
   {"\
 hwclock - query and set the hardware clock (RTC)\n\
 \n\
@@ -1380,544 +1387,550 @@ Options: \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", 1017},
+                hardware clock's epoch value\n\
+  --noadjfile   do not access /etc/adjtime. Requires the use of\n\
+                either --utc or --localtime\n", 1016},
   {"\
   --jensen, --arc, --srm, --funky-toy\n\
-                tell hwclock the type of alpha you have (see hwclock(8))\n", 1018},
-  {"%s takes no non-option arguments.  You supplied %d.\n", 1019},
+                tell hwclock the type of alpha you have (see hwclock(8))\n", 1017},
+  {"%s takes no non-option arguments.  You supplied %d.\n", 1018},
   {"\
 You have specified multiple function options.\n\
-You can only perform one function at a time.\n", 1020},
+You can only perform one function at a time.\n", 1019},
   {"\
 %s: The --utc and --localtime options are mutually exclusive.  You specified \
-both.\n", 1021},
-  {"No usable set-to time.  Cannot set clock.\n", 1022},
-  {"Sorry, only the superuser can change the Hardware Clock.\n", 1023},
-  {"Sorry, only the superuser can change the System Clock.\n", 1024},
+both.\n", 1020},
+  {"\
+%s: The --adjust and --noadjfile options are mutually exclusive.  You \
+specified both.\n", 1021},
+  {"%s: With --noadjfile, you must specify either --utc or --localtime\n", 1022},
+  {"No usable set-to time.  Cannot set clock.\n", 1023},
+  {"Sorry, only the superuser can change the Hardware Clock.\n", 1024},
+  {"Sorry, only the superuser can change the System Clock.\n", 1025},
   {"\
 Sorry, only the superuser can change the Hardware Clock epoch in the \
-kernel.\n", 1025},
-  {"Cannot access the Hardware Clock via any known method.\n", 1026},
+kernel.\n", 1026},
+  {"Cannot access the Hardware Clock via any known method.\n", 1027},
   {"\
 Use the --debug option to see the details of our search for an access \
-method.\n", 1027},
-  {"Waiting in loop for time from KDGHWCLK to change\n", 1028},
-  {"KDGHWCLK ioctl to read time failed", 1029},
-  {"Timed out waiting for time change.\n", 1030},
-  {"KDGHWCLK ioctl to read time failed in loop", 1031},
-  {"ioctl() failed to read time from  /dev/tty1", 1032},
-  {"ioctl KDSHWCLK failed", 1033},
-  {"KDGHWCLK ioctl failed", 1034},
-  {"Can't open /dev/tty1", 1035},
-  {"ioctl() to %s to read the time failed.\n", 1036},
-  {"Waiting in loop for time from %s to change\n", 1037},
-  {"open() of %s failed", 1038},
-  {"%s does not have interrupt functions. ", 1039},
-  {"read() to %s to wait for clock tick failed", 1040},
-  {"ioctl() to %s to turn off update interrupts failed", 1041},
-  {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1042},
-  {"Unable to open %s", 1043},
-  {"ioctl() to %s to set the time failed.\n", 1044},
-  {"ioctl(%s) was successful.\n", 1045},
-  {"Open of %s failed", 1046},
+method.\n", 1028},
+  {"Waiting in loop for time from KDGHWCLK to change\n", 1029},
+  {"KDGHWCLK ioctl to read time failed", 1030},
+  {"Timed out waiting for time change.\n", 1031},
+  {"KDGHWCLK ioctl to read time failed in loop", 1032},
+  {"ioctl() failed to read time from %s", 1033},
+  {"ioctl KDSHWCLK failed", 1034},
+  {"Can't open /dev/tty1 or /dev/vc/1", 1035},
+  {"KDGHWCLK ioctl failed", 1036},
+  {"ioctl() to %s to read the time failed.\n", 1037},
+  {"Waiting in loop for time from %s to change\n", 1038},
+  {"open() of %s failed", 1039},
+  {"%s does not have interrupt functions. ", 1040},
+  {"read() to %s to wait for clock tick failed", 1041},
+  {"ioctl() to %s to turn off update interrupts failed", 1042},
+  {"ioctl() to %s to turn on update interrupts failed unexpectedly", 1043},
+  {"Unable to open %s", 1044},
+  {"ioctl() to %s to set the time failed.\n", 1045},
+  {"ioctl(%s) was successful.\n", 1046},
+  {"Open of %s failed", 1047},
   {"\
 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", 1047},
-  {"ioctl(RTC_EPOCH_READ) to %s failed", 1048},
-  {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1049},
-  {"The epoch value may not be less than 1900.  You requested %ld\n", 1050},
-  {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1051},
-  {"\
-The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1052},
-  {"ioctl(RTC_EPOCH_SET) to %s failed", 1053},
-  {"invalid number `%s'\n", 1054},
-  {"number `%s' to `%s' out of range\n", 1055},
-  {"unrecognized option `%s'\n", 1056},
-  {"option `%s' requires an argument\n", 1057},
-  {"option `%s' doesn't allow an argument\n", 1058},
-  {"unrecognized option `-%c'\n", 1059},
-  {"calling open_tty\n", 1060},
-  {"calling termio_init\n", 1061},
-  {"writing init string\n", 1062},
-  {"before autobaud\n", 1063},
-  {"waiting for cr-lf\n", 1064},
-  {"read %c\n", 1065},
-  {"reading login name\n", 1066},
-  {"%s: can't exec %s: %m", 1067},
-  {"can't malloc initstring", 1068},
-  {"bad timeout value: %s", 1069},
-  {"after getopt loop\n", 1070},
-  {"exiting parseargs\n", 1071},
-  {"entered parse_speeds\n", 1072},
-  {"bad speed: %s", 1073},
-  {"too many alternate speeds", 1074},
-  {"exiting parsespeeds\n", 1075},
-  {"/dev: chdir() failed: %m", 1076},
-  {"/dev/%s: not a character device", 1077},
-  {"open(2)\n", 1078},
-  {"/dev/%s: cannot open as standard input: %m", 1079},
-  {"%s: not open for read/write", 1080},
-  {"duping\n", 1081},
-  {"%s: dup problem: %m", 1082},
-  {"term_io 2\n", 1083},
-  {"user", 1084},
-  {"users", 1085},
-  {"%s: read: %m", 1086},
-  {"%s: input overrun", 1087},
+this system.\n", 1048},
+  {"ioctl(RTC_EPOCH_READ) to %s failed", 1049},
+  {"we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n", 1050},
+  {"The epoch value may not be less than 1900.  You requested %ld\n", 1051},
+  {"setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n", 1052},
+  {"\
+The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl.\n", 1053},
+  {"ioctl(RTC_EPOCH_SET) to %s failed", 1054},
+  {"invalid number `%s'\n", 1055},
+  {"number `%s' to `%s' out of range\n", 1056},
+  {"unrecognized option `%s'\n", 1057},
+  {"option `%s' requires an argument\n", 1058},
+  {"option `%s' doesn't allow an argument\n", 1059},
+  {"unrecognized option `-%c'\n", 1060},
+  {"calling open_tty\n", 1061},
+  {"calling termio_init\n", 1062},
+  {"writing init string\n", 1063},
+  {"before autobaud\n", 1064},
+  {"waiting for cr-lf\n", 1065},
+  {"read %c\n", 1066},
+  {"reading login name\n", 1067},
+  {"%s: can't exec %s: %m", 1068},
+  {"can't malloc initstring", 1069},
+  {"bad timeout value: %s", 1070},
+  {"after getopt loop\n", 1071},
+  {"exiting parseargs\n", 1072},
+  {"entered parse_speeds\n", 1073},
+  {"bad speed: %s", 1074},
+  {"too many alternate speeds", 1075},
+  {"exiting parsespeeds\n", 1076},
+  {"/dev: chdir() failed: %m", 1077},
+  {"/dev/%s: not a character device", 1078},
+  {"open(2)\n", 1079},
+  {"/dev/%s: cannot open as standard input: %m", 1080},
+  {"%s: not open for read/write", 1081},
+  {"duping\n", 1082},
+  {"%s: dup problem: %m", 1083},
+  {"term_io 2\n", 1084},
+  {"user", 1085},
+  {"users", 1086},
+  {"%s: read: %m", 1087},
+  {"%s: input overrun", 1088},
   {"\
 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", 1088},
-  {"login: memory low, login may fail\n", 1089},
-  {"can't malloc for ttyclass", 1090},
-  {"can't malloc for grplist", 1091},
-  {"Login on %s from %s denied by default.\n", 1092},
-  {"Login on %s from %s denied.\n", 1093},
-  {"%s: you (user %d) don't exist.\n", 1094},
-  {"%s: user \"%s\" does not exist.\n", 1095},
-  {"%s: can only change local entries; use yp%s instead.\n", 1096},
-  {"Changing finger information for %s.\n", 1097},
-  {"Password error.", 1098},
-  {"Password: ", 1099},
-  {"Incorrect password.", 1100},
-  {"Finger information not changed.\n", 1101},
-  {"Usage: %s [ -f full-name ] [ -o office ] ", 1102},
+line baud_rate,... [termtype]\n", 1089},
+  {"login: memory low, login may fail\n", 1090},
+  {"can't malloc for ttyclass", 1091},
+  {"can't malloc for grplist", 1092},
+  {"Login on %s from %s denied by default.\n", 1093},
+  {"Login on %s from %s denied.\n", 1094},
+  {"%s: you (user %d) don't exist.\n", 1095},
+  {"%s: user \"%s\" does not exist.\n", 1096},
+  {"%s: can only change local entries; use yp%s instead.\n", 1097},
+  {"Changing finger information for %s.\n", 1098},
+  {"Password error.", 1099},
+  {"Password: ", 1100},
+  {"Incorrect password.", 1101},
+  {"Finger information not changed.\n", 1102},
+  {"Usage: %s [ -f full-name ] [ -o office ] ", 1103},
   {"\
 [ -p office-phone ]\n\
-\t[ -h home-phone ] ", 1103},
-  {"[ --help ] [ --version ]\n", 1104},
+\t[ -h home-phone ] ", 1104},
+  {"[ --help ] [ --version ]\n", 1105},
   {"\
 \n\
-Aborted.\n", 1105},
-  {"field is too long.\n", 1106},
-  {"'%c' is not allowed.\n", 1107},
-  {"Control characters are not allowed.\n", 1108},
-  {"Finger information *NOT* changed.  Try again later.\n", 1109},
-  {"Finger information changed.\n", 1110},
-  {"malloc failed", 1111},
-  {"%s: Your shell is not in /etc/shells, shell change denied\n", 1112},
-  {"Changing shell for %s.\n", 1113},
-  {"New shell", 1114},
-  {"Shell not changed.\n", 1115},
-  {"Shell *NOT* changed.  Try again later.\n", 1116},
-  {"Shell changed.\n", 1117},
-  {"Usage: %s [ -s shell ] ", 1118},
-  {"[ --list-shells ] [ --help ] [ --version ]\n", 1119},
-  {"       [ username ]\n", 1120},
-  {"%s: shell must be a full path name.\n", 1121},
-  {"%s: \"%s\" does not exist.\n", 1122},
-  {"%s: \"%s\" is not executable.\n", 1123},
-  {"%s: '%c' is not allowed.\n", 1124},
-  {"%s: Control characters are not allowed.\n", 1125},
-  {"Warning: \"%s\" is not listed in /etc/shells\n", 1126},
-  {"%s: \"%s\" is not listed in /etc/shells.\n", 1127},
-  {"%s: use -l option to see list\n", 1128},
-  {"Warning: \"%s\" is not listed in /etc/shells.\n", 1129},
-  {"Use %s -l to see list.\n", 1130},
-  {"No known shells.\n", 1131},
-  {"couldn't open /dev/urandom", 1132},
-  {"couldn't read random data from /dev/urandom", 1133},
-  {"can't open %s for reading", 1134},
-  {"can't stat(%s)", 1135},
-  {"%s doesn't have the correct filemodes", 1136},
-  {"can't read data from %s", 1137},
-  {"Can't read %s, exiting.", 1138},
-  {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1139},
-  {"  still logged in", 1140},
+Aborted.\n", 1106},
+  {"field is too long.\n", 1107},
+  {"'%c' is not allowed.\n", 1108},
+  {"Control characters are not allowed.\n", 1109},
+  {"Finger information *NOT* changed.  Try again later.\n", 1110},
+  {"Finger information changed.\n", 1111},
+  {"malloc failed", 1112},
+  {"%s: Your shell is not in /etc/shells, shell change denied\n", 1113},
+  {"Changing shell for %s.\n", 1114},
+  {"New shell", 1115},
+  {"Shell not changed.\n", 1116},
+  {"Shell *NOT* changed.  Try again later.\n", 1117},
+  {"Shell changed.\n", 1118},
+  {"\
+Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n\
+       [ username ]\n", 1119},
+  {"%s: shell must be a full path name.\n", 1120},
+  {"%s: \"%s\" does not exist.\n", 1121},
+  {"%s: \"%s\" is not executable.\n", 1122},
+  {"%s: '%c' is not allowed.\n", 1123},
+  {"%s: Control characters are not allowed.\n", 1124},
+  {"Warning: \"%s\" is not listed in /etc/shells\n", 1125},
+  {"%s: \"%s\" is not listed in /etc/shells.\n", 1126},
+  {"%s: use -l option to see list\n", 1127},
+  {"Warning: \"%s\" is not listed in /etc/shells.\n", 1128},
+  {"Use %s -l to see list.\n", 1129},
+  {"No known shells.\n", 1130},
+  {"couldn't open /dev/urandom", 1131},
+  {"couldn't read random data from /dev/urandom", 1132},
+  {"can't open %s for reading", 1133},
+  {"can't stat(%s)", 1134},
+  {"%s doesn't have the correct filemodes", 1135},
+  {"can't read data from %s", 1136},
+  {"Can't read %s, exiting.", 1137},
+  {"usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n", 1138},
+  {"  still logged in", 1139},
   {"\
 \n\
-wtmp begins %s", 1141},
-  {"last: malloc failure.\n", 1142},
-  {"last: gethostname", 1143},
+wtmp begins %s", 1140},
+  {"last: malloc failure.\n", 1141},
+  {"last: gethostname", 1142},
   {"\
 \n\
-interrupted %10.10s %5.5s \n", 1144},
-  {"login: -h for super-user only.\n", 1145},
-  {"usage: login [-fp] [username]\n", 1146},
-  {"login: PAM Failure, aborting: %s\n", 1147},
-  {"Couldn't initialize PAM: %s", 1148},
-  {"login: ", 1149},
-  {"FAILED LOGIN %d FROM %s FOR %s, %s", 1150},
+interrupted %10.10s %5.5s \n", 1143},
+  {"login: -h for super-user only.\n", 1144},
+  {"usage: login [-fp] [username]\n", 1145},
+  {"login: PAM Failure, aborting: %s\n", 1146},
+  {"Couldn't initialize PAM: %s", 1147},
+  {"login: ", 1148},
+  {"FAILED LOGIN %d FROM %s FOR %s, %s", 1149},
   {"\
 Login incorrect\n\
-\n", 1151},
-  {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1152},
-  {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1153},
+\n", 1150},
+  {"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", 1151},
+  {"FAILED LOGIN SESSION FROM %s FOR %s, %s", 1152},
   {"\
 \n\
-Login incorrect\n", 1154},
-  {"Illegal username", 1155},
-  {"%s login refused on this terminal.\n", 1156},
-  {"LOGIN %s REFUSED FROM %s ON TTY %s", 1157},
-  {"LOGIN %s REFUSED ON TTY %s", 1158},
-  {"Login incorrect\n", 1159},
+Login incorrect\n", 1153},
+  {"Illegal username", 1154},
+  {"%s login refused on this terminal.\n", 1155},
+  {"LOGIN %s REFUSED FROM %s ON TTY %s", 1156},
+  {"LOGIN %s REFUSED ON TTY %s", 1157},
+  {"Login incorrect\n", 1158},
   {"\
 Too many users logged on already.\n\
-Try again later.\n", 1160},
-  {"You have too many processes running.\n", 1161},
-  {"DIALUP AT %s BY %s", 1162},
-  {"ROOT LOGIN ON %s FROM %s", 1163},
-  {"ROOT LOGIN ON %s", 1164},
-  {"LOGIN ON %s BY %s FROM %s", 1165},
-  {"LOGIN ON %s BY %s", 1166},
-  {"You have %smail.\n", 1167},
-  {"new ", 1168},
-  {"login: failure forking: %s", 1169},
-  {"setuid() failed", 1170},
-  {"No directory %s!\n", 1171},
-  {"Logging in with home = \"/\".\n", 1172},
-  {"login: no memory for shell script.\n", 1173},
-  {"login: couldn't exec shell script: %s.\n", 1174},
-  {"login: no shell: %s.\n", 1175},
+Try again later.\n", 1159},
+  {"You have too many processes running.\n", 1160},
+  {"DIALUP AT %s BY %s", 1161},
+  {"ROOT LOGIN ON %s FROM %s", 1162},
+  {"ROOT LOGIN ON %s", 1163},
+  {"LOGIN ON %s BY %s FROM %s", 1164},
+  {"LOGIN ON %s BY %s", 1165},
+  {"You have %smail.\n", 1166},
+  {"new ", 1167},
+  {"login: failure forking: %s", 1168},
+  {"setuid() failed", 1169},
+  {"No directory %s!\n", 1170},
+  {"Logging in with home = \"/\".\n", 1171},
+  {"login: no memory for shell script.\n", 1172},
+  {"login: couldn't exec shell script: %s.\n", 1173},
+  {"login: no shell: %s.\n", 1174},
   {"\
 \n\
-%s login: ", 1176},
-  {"login name much too long.\n", 1177},
-  {"NAME too long", 1178},
-  {"login names may not start with '-'.\n", 1179},
-  {"too many bare linefeeds.\n", 1180},
-  {"EXCESSIVE linefeeds", 1181},
-  {"Login timed out after %d seconds\n", 1182},
-  {"Last login: %.*s ", 1183},
-  {"from %.*s\n", 1184},
-  {"on %.*s\n", 1185},
-  {"LOGIN FAILURE FROM %s, %s", 1186},
-  {"LOGIN FAILURE ON %s, %s", 1187},
-  {"%d LOGIN FAILURES FROM %s, %s", 1188},
-  {"%d LOGIN FAILURES ON %s, %s", 1189},
-  {"is y\n", 1190},
-  {"is n\n", 1191},
-  {"usage: mesg [y | n]\n", 1192},
-  {"newgrp: Who are you?", 1193},
-  {"newgrp: setgid", 1194},
-  {"newgrp: No such group.", 1195},
-  {"newgrp: Permission denied", 1196},
-  {"newgrp: setuid", 1197},
-  {"No shell", 1198},
-  {"The password must have at least 6 characters, try again.\n", 1199},
-  {"The password must contain characters out of two of the following\n", 1200},
-  {"classes:  upper and lower case letters, digits and non alphanumeric\n", 1201},
-  {"characters. See passwd(1) for more information.\n", 1202},
-  {"You cannot reuse the old password.\n", 1203},
-  {"Please don't use something like your username as password!\n", 1204},
-  {"Please don't use something like your realname as password!\n", 1205},
-  {"Usage: passwd [username [password]]\n", 1206},
-  {"Only root may use the one and two argument forms.\n", 1207},
-  {"Usage: passwd [-foqsvV] [user [password]]\n", 1208},
-  {"Can't exec %s: %s\n", 1209},
-  {"Cannot find login name", 1210},
-  {"Only root can change the password for others.\n", 1211},
-  {"Too many arguments.\n", 1212},
-  {"Can't find username anywhere. Is `%s' really a user?", 1213},
-  {"Sorry, I can only change local passwords. Use yppasswd instead.", 1214},
-  {"UID and username does not match, imposter!", 1215},
-  {"Changing password for %s\n", 1216},
-  {"Enter old password: ", 1217},
-  {"Illegal password, imposter.", 1218},
-  {"Enter new password: ", 1219},
-  {"Password not changed.", 1220},
-  {"Re-type new password: ", 1221},
-  {"You misspelled it. Password not changed.", 1222},
-  {"password changed, user %s", 1223},
-  {"ROOT PASSWORD CHANGED", 1224},
-  {"password changed by root, user %s", 1225},
-  {"calling setpwnam to set password.\n", 1226},
-  {"Password *NOT* changed.  Try again later.\n", 1227},
-  {"Password changed.\n", 1228},
-  {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1229},
-  {"Shutdown process aborted", 1230},
-  {"%s: Only root can shut a system down.\n", 1231},
-  {"That must be tomorrow, can't you wait till then?\n", 1232},
-  {"for maintenance; bounce, bounce", 1233},
-  {"timeout = %d, quiet = %d, reboot = %d\n", 1234},
-  {"The system is being shut down within 5 minutes", 1235},
-  {"Login is therefore prohibited.", 1236},
-  {"%s by %s: %s", 1237},
-  {"rebooted", 1238},
-  {"halted", 1239},
+%s login: ", 1175},
+  {"login name much too long.\n", 1176},
+  {"NAME too long", 1177},
+  {"login names may not start with '-'.\n", 1178},
+  {"too many bare linefeeds.\n", 1179},
+  {"EXCESSIVE linefeeds", 1180},
+  {"Login timed out after %d seconds\n", 1181},
+  {"Last login: %.*s ", 1182},
+  {"from %.*s\n", 1183},
+  {"on %.*s\n", 1184},
+  {"LOGIN FAILURE FROM %s, %s", 1185},
+  {"LOGIN FAILURE ON %s, %s", 1186},
+  {"%d LOGIN FAILURES FROM %s, %s", 1187},
+  {"%d LOGIN FAILURES ON %s, %s", 1188},
+  {"is y\n", 1189},
+  {"is n\n", 1190},
+  {"usage: mesg [y | n]\n", 1191},
+  {"newgrp: Who are you?", 1192},
+  {"newgrp: setgid", 1193},
+  {"newgrp: No such group.", 1194},
+  {"newgrp: Permission denied", 1195},
+  {"newgrp: setuid", 1196},
+  {"No shell", 1197},
+  {"The password must have at least 6 characters, try again.\n", 1198},
+  {"The password must contain characters out of two of the following\n", 1199},
+  {"classes:  upper and lower case letters, digits and non alphanumeric\n", 1200},
+  {"characters. See passwd(1) for more information.\n", 1201},
+  {"You cannot reuse the old password.\n", 1202},
+  {"Please don't use something like your username as password!\n", 1203},
+  {"Please don't use something like your realname as password!\n", 1204},
+  {"Usage: passwd [username [password]]\n", 1205},
+  {"Only root may use the one and two argument forms.\n", 1206},
+  {"Usage: passwd [-foqsvV] [user [password]]\n", 1207},
+  {"Can't exec %s: %s\n", 1208},
+  {"Cannot find login name", 1209},
+  {"Only root can change the password for others.\n", 1210},
+  {"Too many arguments.\n", 1211},
+  {"Can't find username anywhere. Is `%s' really a user?", 1212},
+  {"Sorry, I can only change local passwords. Use yppasswd instead.", 1213},
+  {"UID and username does not match, imposter!", 1214},
+  {"Changing password for %s\n", 1215},
+  {"Enter old password: ", 1216},
+  {"Illegal password, imposter.", 1217},
+  {"Enter new password: ", 1218},
+  {"Password not changed.", 1219},
+  {"Re-type new password: ", 1220},
+  {"You misspelled it. Password not changed.", 1221},
+  {"password changed, user %s", 1222},
+  {"ROOT PASSWORD CHANGED", 1223},
+  {"password changed by root, user %s", 1224},
+  {"calling setpwnam to set password.\n", 1225},
+  {"Password *NOT* changed.  Try again later.\n", 1226},
+  {"Password changed.\n", 1227},
+  {"Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n", 1228},
+  {"Shutdown process aborted", 1229},
+  {"%s: Only root can shut a system down.\n", 1230},
+  {"That must be tomorrow, can't you wait till then?\n", 1231},
+  {"for maintenance; bounce, bounce", 1232},
+  {"timeout = %d, quiet = %d, reboot = %d\n", 1233},
+  {"The system is being shut down within 5 minutes", 1234},
+  {"Login is therefore prohibited.", 1235},
+  {"%s by %s: %s", 1236},
+  {"rebooted", 1237},
+  {"halted", 1238},
   {"\
 \n\
-Why am I still alive after reboot?", 1240},
+Why am I still alive after reboot?", 1239},
   {"\
 \n\
-Now you can turn off the power...", 1241},
-  {"Calling kernel power-off facility...\n", 1242},
-  {"Error powering off\t%s\n", 1243},
-  {"Executing the program \"%s\" ...\n", 1244},
-  {"Error executing\t%s\n", 1245},
-  {"URGENT: broadcast message from %s:", 1246},
-  {"System going down in %d hours %d minutes", 1247},
-  {"System going down in 1 hour %d minutes", 1248},
-  {"System going down in %d minutes\n", 1249},
-  {"System going down in 1 minute\n", 1250},
-  {"System going down IMMEDIATELY!\n", 1251},
-  {"\t... %s ...\n", 1252},
-  {"Cannot fork for swapoff. Shrug!", 1253},
-  {"Cannot exec swapoff, hoping umount will do the trick.", 1254},
-  {"Cannot fork for umount, trying manually.", 1255},
-  {"Cannot exec %s, trying umount.\n", 1256},
-  {"Cannot exec umount, giving up on umount.", 1257},
-  {"Unmounting any remaining filesystems...", 1258},
-  {"shutdown: Couldn't umount %s: %s\n", 1259},
-  {"Booting to single user mode.\n", 1260},
-  {"exec of single user shell failed\n", 1261},
-  {"fork of single user shell failed\n", 1262},
-  {"error opening fifo\n", 1263},
-  {"error running finalprog\n", 1264},
-  {"error forking finalprog\n", 1265},
+Now you can turn off the power...", 1240},
+  {"Calling kernel power-off facility...\n", 1241},
+  {"Error powering off\t%s\n", 1242},
+  {"Executing the program \"%s\" ...\n", 1243},
+  {"Error executing\t%s\n", 1244},
+  {"URGENT: broadcast message from %s:", 1245},
+  {"System going down in %d hours %d minutes", 1246},
+  {"System going down in 1 hour %d minutes", 1247},
+  {"System going down in %d minutes\n", 1248},
+  {"System going down in 1 minute\n", 1249},
+  {"System going down IMMEDIATELY!\n", 1250},
+  {"\t... %s ...\n", 1251},
+  {"Cannot fork for swapoff. Shrug!", 1252},
+  {"Cannot exec swapoff, hoping umount will do the trick.", 1253},
+  {"Cannot fork for umount, trying manually.", 1254},
+  {"Cannot exec %s, trying umount.\n", 1255},
+  {"Cannot exec umount, giving up on umount.", 1256},
+  {"Unmounting any remaining filesystems...", 1257},
+  {"shutdown: Couldn't umount %s: %s\n", 1258},
+  {"Booting to single user mode.\n", 1259},
+  {"exec of single user shell failed\n", 1260},
+  {"fork of single user shell failed\n", 1261},
+  {"error opening fifo\n", 1262},
+  {"error running finalprog\n", 1263},
+  {"error forking finalprog\n", 1264},
   {"\
 \n\
-Wrong password.\n", 1266},
-  {"lstat of path failed\n", 1267},
-  {"stat of path failed\n", 1268},
-  {"open of directory failed\n", 1269},
-  {"fork failed\n", 1270},
-  {"exec failed\n", 1271},
-  {"cannot open inittab\n", 1272},
-  {"no TERM or cannot stat tty\n", 1273},
-  {"error running programme\n", 1274},
-  {"too many iov's (change code in wall/ttymsg.c)", 1275},
-  {"excessively long line arg", 1276},
-  {"cannot fork", 1277},
-  {"fork: %s", 1278},
-  {"%s: BAD ERROR", 1279},
-  {"%s: the %s file is busy.\n", 1280},
-  {"%s: the %s file is busy (%s present)\n", 1281},
-  {"%s: can't link %s: %s\n", 1282},
-  {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1283},
-  {"%s: Cannot fork\n", 1284},
-  {"%s: %s unchanged\n", 1285},
-  {"%s: no changes made\n", 1286},
-  {"You are using shadow groups on this system.\n", 1287},
-  {"You are using shadow passwords on this system.\n", 1288},
-  {"Would you like to edit %s now [y/n]? ", 1289},
-  {"usage: %s [file]\n", 1290},
-  {"%s: can't open temporary file.\n", 1291},
-  {"Broadcast Message from %s@%s", 1292},
-  {"%s: will not read %s - use stdin.\n", 1293},
-  {"%s: can't read %s.\n", 1294},
-  {"%s: can't stat temporary file.\n", 1295},
-  {"%s: can't read temporary file.\n", 1296},
-  {"illegal month value: use 1-12", 1297},
-  {"illegal year value: use 1-9999", 1298},
-  {"usage: cal [-mjyV] [[month] year]\n", 1299},
-  {"usage: %s [+format] [day month year]\n", 1300},
-  {"St. Tib's Day", 1301},
-  {"%s: unknown signal %s\n", 1302},
-  {"%s: can't find process \"%s\"\n", 1303},
-  {"%s: unknown signal %s; valid signals:\n", 1304},
-  {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1305},
-  {"       %s -l [ signal ]\n", 1306},
-  {"logger: %s: %s.\n", 1307},
-  {"logger: unknown facility name: %s.\n", 1308},
-  {"logger: unknown priority name: %s.\n", 1309},
-  {"\
-usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1310},
-  {"usage: look [-dfa] [-t char] string [file]\n", 1311},
-  {"Could not open %s\n", 1312},
-  {"Got %d bytes from %s\n", 1313},
-  {"namei: unable to get current directory - %s\n", 1314},
-  {"namei: unable to chdir to %s - %s (%d)\n", 1315},
-  {"usage: namei [-mx] pathname [pathname ...]\n", 1316},
-  {"namei: could not chdir to root!\n", 1317},
-  {"namei: could not stat root!\n", 1318},
-  {" ? could not chdir into %s - %s (%d)\n", 1319},
-  {" ? problems reading symlink %s - %s (%d)\n", 1320},
-  {"  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1321},
-  {"namei: unknown file type 0%06o on file %s\n", 1322},
-  {"%s: out of memory\n", 1323},
-  {"%s: renaming %s to %s failed: %s\n", 1324},
-  {"call: %s from to files...\n", 1325},
+Wrong password.\n", 1265},
+  {"lstat of path failed\n", 1266},
+  {"stat of path failed\n", 1267},
+  {"open of directory failed\n", 1268},
+  {"fork failed\n", 1269},
+  {"exec failed\n", 1270},
+  {"cannot open inittab\n", 1271},
+  {"no TERM or cannot stat tty\n", 1272},
+  {"error stopping service: \"%s\"", 1273},
+  {"too many iov's (change code in wall/ttymsg.c)", 1274},
+  {"excessively long line arg", 1275},
+  {"cannot fork", 1276},
+  {"fork: %s", 1277},
+  {"%s: BAD ERROR", 1278},
+  {"%s: the %s file is busy.\n", 1279},
+  {"%s: the %s file is busy (%s present)\n", 1280},
+  {"%s: can't link %s: %s\n", 1281},
+  {"%s: can't unlock %s: %s (your changes are still in %s)\n", 1282},
+  {"%s: Cannot fork\n", 1283},
+  {"%s: %s unchanged\n", 1284},
+  {"%s: no changes made\n", 1285},
+  {"You are using shadow groups on this system.\n", 1286},
+  {"You are using shadow passwords on this system.\n", 1287},
+  {"Would you like to edit %s now [y/n]? ", 1288},
+  {"usage: %s [file]\n", 1289},
+  {"%s: can't open temporary file.\n", 1290},
+  {"Broadcast Message from %s@%s", 1291},
+  {"%s: will not read %s - use stdin.\n", 1292},
+  {"%s: can't read %s.\n", 1293},
+  {"%s: can't stat temporary file.\n", 1294},
+  {"%s: can't read temporary file.\n", 1295},
+  {"illegal month value: use 1-12", 1296},
+  {"illegal year value: use 1-9999", 1297},
+  {"usage: cal [-mjyV] [[month] year]\n", 1298},
+  {"usage: %s [+format] [day month year]\n", 1299},
+  {"St. Tib's Day", 1300},
+  {"%s: unknown signal %s\n", 1301},
+  {"%s: can't find process \"%s\"\n", 1302},
+  {"%s: unknown signal %s; valid signals:\n", 1303},
+  {"usage: %s [ -s signal | -p ] [ -a ] pid ...\n", 1304},
+  {"       %s -l [ signal ]\n", 1305},
+  {"logger: %s: %s.\n", 1306},
+  {"logger: unknown facility name: %s.\n", 1307},
+  {"logger: unknown priority name: %s.\n", 1308},
+  {"\
+usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n", 1309},
+  {"usage: look [-dfa] [-t char] string [file]\n", 1310},
+  {"Could not open %s\n", 1311},
+  {"Got %d bytes from %s\n", 1312},
+  {"namei: unable to get current directory - %s\n", 1313},
+  {"namei: unable to chdir to %s - %s (%d)\n", 1314},
+  {"usage: namei [-mx] pathname [pathname ...]\n", 1315},
+  {"namei: could not chdir to root!\n", 1316},
+  {"namei: could not stat root!\n", 1317},
+  {" ? could not chdir into %s - %s (%d)\n", 1318},
+  {" ? problems reading symlink %s - %s (%d)\n", 1319},
+  {"  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n", 1320},
+  {"namei: unknown file type 0%06o on file %s\n", 1321},
+  {"%s: out of memory\n", 1322},
+  {"%s: renaming %s to %s failed: %s\n", 1323},
+  {"call: %s from to files...\n", 1324},
   {"\
 Warning: `%s' is a symlink.\n\
 Use `%s [options] %s' if you really want to use it.\n\
-Script not started.\n", 1326},
-  {"usage: script [-a] [-f] [-q] [file]\n", 1327},
-  {"Script started, file is %s\n", 1328},
-  {"Script started on %s", 1329},
+Script not started.\n", 1325},
+  {"usage: script [-a] [-f] [-q] [file]\n", 1326},
+  {"Script started, file is %s\n", 1327},
+  {"Script started on %s", 1328},
   {"\
 \n\
-Script done on %s", 1330},
-  {"Script done, file is %s\n", 1331},
-  {"openpty failed\n", 1332},
-  {"Out of pty's\n", 1333},
-  {"%s: Argument error, usage\n", 1334},
-  {"  [ -term terminal_name ]\n", 1335},
-  {"  [ -reset ]\n", 1336},
-  {"  [ -initialize ]\n", 1337},
-  {"  [ -cursor [on|off] ]\n", 1338},
-  {"  [ -snow [on|off] ]\n", 1339},
-  {"  [ -softscroll [on|off] ]\n", 1340},
-  {"  [ -repeat [on|off] ]\n", 1341},
-  {"  [ -appcursorkeys [on|off] ]\n", 1342},
-  {"  [ -linewrap [on|off] ]\n", 1343},
-  {"  [ -default ]\n", 1344},
-  {"  [ -foreground black|blue|green|cyan", 1345},
-  {"|red|magenta|yellow|white|default ]\n", 1346},
-  {"  [ -background black|blue|green|cyan", 1347},
-  {"  [ -ulcolor black|grey|blue|green|cyan", 1348},
-  {"|red|magenta|yellow|white ]\n", 1349},
-  {"  [ -ulcolor bright blue|green|cyan", 1350},
-  {"  [ -hbcolor black|grey|blue|green|cyan", 1351},
-  {"  [ -hbcolor bright blue|green|cyan", 1352},
-  {"  [ -standout [ attr ] ]\n", 1353},
-  {"  [ -inversescreen [on|off] ]\n", 1354},
-  {"  [ -bold [on|off] ]\n", 1355},
-  {"  [ -half-bright [on|off] ]\n", 1356},
-  {"  [ -blink [on|off] ]\n", 1357},
-  {"  [ -reverse [on|off] ]\n", 1358},
-  {"  [ -underline [on|off] ]\n", 1359},
-  {"  [ -store ]\n", 1360},
-  {"  [ -clear [all|rest] ]\n", 1361},
-  {"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n", 1362},
-  {"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n", 1363},
-  {"  [ -regtabs [1-160] ]\n", 1364},
-  {"  [ -blank [0-60] ]\n", 1365},
-  {"  [ -dump   [1-NR_CONSOLES] ]\n", 1366},
-  {"  [ -append [1-NR_CONSOLES] ]\n", 1367},
-  {"  [ -file dumpfilename ]\n", 1368},
-  {"  [ -msg [on|off] ]\n", 1369},
-  {"  [ -msglevel [0-8] ]\n", 1370},
-  {"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1371},
-  {"  [ -powerdown [0-60] ]\n", 1372},
-  {"  [ -blength [0-2000] ]\n", 1373},
-  {"  [ -bfreq freqnumber ]\n", 1374},
-  {"cannot (un)set powersave mode\n", 1375},
-  {"klogctl error: %s\n", 1376},
-  {"Error reading %s\n", 1377},
-  {"Error writing screendump\n", 1378},
-  {"couldn't read %s, and cannot ioctl dump\n", 1379},
-  {"%s: $TERM is not defined.\n", 1380},
-  {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1381},
-  {"write: can't find your tty's name\n", 1382},
-  {"write: you have write permission turned off.\n", 1383},
-  {"write: %s is not logged in on %s.\n", 1384},
-  {"write: %s has messages disabled on %s\n", 1385},
-  {"usage: write user [tty]\n", 1386},
-  {"write: %s is not logged in\n", 1387},
-  {"write: %s has messages disabled\n", 1388},
-  {"write: %s is logged in more than once; writing to %s\n", 1389},
-  {"Message from %s@%s (as %s) on %s at %s ...", 1390},
-  {"Message from %s@%s on %s at %s ...", 1391},
-  {"warning: error reading %s: %s", 1392},
-  {"warning: can't open %s: %s", 1393},
-  {"mount: could not open %s - using %s instead\n", 1394},
-  {"can't create lock file %s: %s (use -n flag to override)", 1395},
-  {"can't link lock file %s: %s (use -n flag to override)", 1396},
-  {"can't open lock file %s: %s (use -n flag to override)", 1397},
-  {"Can't lock lock file %s: %s\n", 1398},
-  {"can't lock lock file %s: %s", 1399},
-  {"timed out", 1400},
+Script done on %s", 1329},
+  {"Script done, file is %s\n", 1330},
+  {"openpty failed\n", 1331},
+  {"Out of pty's\n", 1332},
+  {"%s: Argument error, usage\n", 1333},
+  {"  [ -term terminal_name ]\n", 1334},
+  {"  [ -reset ]\n", 1335},
+  {"  [ -initialize ]\n", 1336},
+  {"  [ -cursor [on|off] ]\n", 1337},
+  {"  [ -snow [on|off] ]\n", 1338},
+  {"  [ -softscroll [on|off] ]\n", 1339},
+  {"  [ -repeat [on|off] ]\n", 1340},
+  {"  [ -appcursorkeys [on|off] ]\n", 1341},
+  {"  [ -linewrap [on|off] ]\n", 1342},
+  {"  [ -default ]\n", 1343},
+  {"  [ -foreground black|blue|green|cyan", 1344},
+  {"|red|magenta|yellow|white|default ]\n", 1345},
+  {"  [ -background black|blue|green|cyan", 1346},
+  {"  [ -ulcolor black|grey|blue|green|cyan", 1347},
+  {"|red|magenta|yellow|white ]\n", 1348},
+  {"  [ -ulcolor bright blue|green|cyan", 1349},
+  {"  [ -hbcolor black|grey|blue|green|cyan", 1350},
+  {"  [ -hbcolor bright blue|green|cyan", 1351},
+  {"  [ -standout [ attr ] ]\n", 1352},
+  {"  [ -inversescreen [on|off] ]\n", 1353},
+  {"  [ -bold [on|off] ]\n", 1354},
+  {"  [ -half-bright [on|off] ]\n", 1355},
+  {"  [ -blink [on|off] ]\n", 1356},
+  {"  [ -reverse [on|off] ]\n", 1357},
+  {"  [ -underline [on|off] ]\n", 1358},
+  {"  [ -store ]\n", 1359},
+  {"  [ -clear [all|rest] ]\n", 1360},
+  {"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n", 1361},
+  {"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n", 1362},
+  {"  [ -regtabs [1-160] ]\n", 1363},
+  {"  [ -blank [0-60] ]\n", 1364},
+  {"  [ -dump   [1-NR_CONSOLES] ]\n", 1365},
+  {"  [ -append [1-NR_CONSOLES] ]\n", 1366},
+  {"  [ -file dumpfilename ]\n", 1367},
+  {"  [ -msg [on|off] ]\n", 1368},
+  {"  [ -msglevel [0-8] ]\n", 1369},
+  {"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n", 1370},
+  {"  [ -powerdown [0-60] ]\n", 1371},
+  {"  [ -blength [0-2000] ]\n", 1372},
+  {"  [ -bfreq freqnumber ]\n", 1373},
+  {"cannot (un)set powersave mode\n", 1374},
+  {"klogctl error: %s\n", 1375},
+  {"Error reading %s\n", 1376},
+  {"Error writing screendump\n", 1377},
+  {"couldn't read %s, and cannot ioctl dump\n", 1378},
+  {"%s: $TERM is not defined.\n", 1379},
+  {"whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n", 1380},
+  {"write: can't find your tty's name\n", 1381},
+  {"write: you have write permission turned off.\n", 1382},
+  {"write: %s is not logged in on %s.\n", 1383},
+  {"write: %s has messages disabled on %s\n", 1384},
+  {"usage: write user [tty]\n", 1385},
+  {"write: %s is not logged in\n", 1386},
+  {"write: %s has messages disabled\n", 1387},
+  {"write: %s is logged in more than once; writing to %s\n", 1388},
+  {"Message from %s@%s (as %s) on %s at %s ...", 1389},
+  {"Message from %s@%s on %s at %s ...", 1390},
+  {"warning: error reading %s: %s", 1391},
+  {"warning: can't open %s: %s", 1392},
+  {"mount: could not open %s - using %s instead\n", 1393},
+  {"can't create lock file %s: %s (use -n flag to override)", 1394},
+  {"can't link lock file %s: %s (use -n flag to override)", 1395},
+  {"can't open lock file %s: %s (use -n flag to override)", 1396},
+  {"Can't lock lock file %s: %s\n", 1397},
+  {"can't lock lock file %s: %s", 1398},
+  {"timed out", 1399},
   {"\
 Cannot create link %s\n\
-Perhaps there is a stale lock file?\n", 1401},
-  {"cannot open %s (%s) - mtab not updated", 1402},
-  {"error writing %s: %s", 1403},
-  {"error changing mode of %s: %s\n", 1404},
-  {"can't rename %s to %s: %s\n", 1405},
-  {"loop: can't open device %s: %s\n", 1406},
-  {"loop: can't get info on device %s: %s\n", 1407},
-  {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1408},
-  {"mount: could not find any device /dev/loop#", 1409},
+Perhaps there is a stale lock file?\n", 1400},
+  {"cannot open %s (%s) - mtab not updated", 1401},
+  {"error writing %s: %s", 1402},
+  {"error changing mode of %s: %s\n", 1403},
+  {"can't rename %s to %s: %s\n", 1404},
+  {"loop: can't open device %s: %s\n", 1405},
+  {"loop: can't get info on device %s: %s\n", 1406},
+  {"%s: [%04x]:%ld (%s) offset %d, %s encryption\n", 1407},
+  {"mount: could not find any device /dev/loop#", 1408},
   {"\
 mount: Could not find any loop device.\n\
-       Maybe /dev/loop# has a wrong major number?", 1410},
+       Maybe /dev/loop# has a wrong major number?", 1409},
   {"\
 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'.)", 1411},
+       (If so, then recompile or `insmod loop.o'.)", 1410},
   {"\
 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?", 1412},
-  {"mount: could not find any free loop device", 1413},
-  {"Unsupported encryption type %s\n", 1414},
-  {"Couldn't lock into memory, exiting.\n", 1415},
-  {"Init (up to 16 hex digits): ", 1416},
-  {"Non-hex digit '%c'.\n", 1417},
-  {"Don't know how to get key for encryption system %d\n", 1418},
-  {"set_loop(%s,%s,%d): success\n", 1419},
-  {"loop: can't delete device %s: %s\n", 1420},
-  {"del_loop(%s): success\n", 1421},
-  {"This mount was compiled without loop support. Please recompile.\n", 1422},
+       maybe /dev/loop# has the wrong major number?", 1411},
+  {"mount: could not find any free loop device", 1412},
+  {"Unsupported encryption type %s\n", 1413},
+  {"Couldn't lock into memory, exiting.\n", 1414},
+  {"Init (up to 16 hex digits): ", 1415},
+  {"Non-hex digit '%c'.\n", 1416},
+  {"Don't know how to get key for encryption system %d\n", 1417},
+  {"set_loop(%s,%s,%d): success\n", 1418},
+  {"loop: can't delete device %s: %s\n", 1419},
+  {"del_loop(%s): success\n", 1420},
+  {"This mount was compiled without loop support. Please recompile.\n", 1421},
   {"\
 usage:\n\
   %s loop_device                                      # give info\n\
   %s -d loop_device                                   # delete\n\
-  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1423},
-  {"not enough memory", 1424},
-  {"No loop support was available at compile time. Please recompile.\n", 1425},
-  {"[mntent]: warning: no final newline at the end of %s\n", 1426},
-  {"[mntent]: line %d in %s is bad%s\n", 1427},
-  {"; rest of file ignored", 1428},
-  {"mount: according to mtab, %s is already mounted on %s", 1429},
-  {"mount: according to mtab, %s is mounted on %s", 1430},
-  {"mount: can't open %s for writing: %s", 1431},
-  {"mount: error writing %s: %s", 1432},
-  {"mount: error changing mode of %s: %s", 1433},
-  {"%s looks like swapspace - not mounted", 1434},
-  {"mount failed", 1435},
-  {"mount: only root can mount %s on %s", 1436},
-  {"mount: loop device specified twice", 1437},
-  {"mount: type specified twice", 1438},
-  {"mount: skipping the setup of a loop device\n", 1439},
-  {"mount: going to use the loop device %s\n", 1440},
-  {"mount: failed setting up loop device\n", 1441},
-  {"mount: setup loop device successfully\n", 1442},
-  {"mount: can't open %s: %s", 1443},
-  {"mount: cannot not open %s for setting speed", 1444},
-  {"mount: cannot set speed: %s", 1445},
-  {"mount: cannot fork: %s", 1446},
-  {"mount: this version was compiled without support for the type `nfs'", 1447},
-  {"mount: failed with nfs mount version 4, trying 3..\n", 1448},
-  {"\
-mount: I could not determine the filesystem type, and none was specified", 1449},
-  {"mount: you must specify the filesystem type", 1450},
-  {"mount: mount failed", 1451},
-  {"mount: mount point %s is not a directory", 1452},
-  {"mount: permission denied", 1453},
-  {"mount: must be superuser to use mount", 1454},
-  {"mount: %s is busy", 1455},
-  {"mount: proc already mounted", 1456},
-  {"mount: %s already mounted or %s busy", 1457},
-  {"mount: mount point %s does not exist", 1458},
-  {"mount: mount point %s is a symbolic link to nowhere", 1459},
-  {"mount: special device %s does not exist", 1460},
+  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n", 1422},
+  {"not enough memory", 1423},
+  {"No loop support was available at compile time. Please recompile.\n", 1424},
+  {"[mntent]: warning: no final newline at the end of %s\n", 1425},
+  {"[mntent]: line %d in %s is bad%s\n", 1426},
+  {"; rest of file ignored", 1427},
+  {"mount: according to mtab, %s is already mounted on %s", 1428},
+  {"mount: according to mtab, %s is mounted on %s", 1429},
+  {"mount: can't open %s for writing: %s", 1430},
+  {"mount: error writing %s: %s", 1431},
+  {"mount: error changing mode of %s: %s", 1432},
+  {"%s looks like swapspace - not mounted", 1433},
+  {"mount failed", 1434},
+  {"mount: only root can mount %s on %s", 1435},
+  {"mount: loop device specified twice", 1436},
+  {"mount: type specified twice", 1437},
+  {"mount: skipping the setup of a loop device\n", 1438},
+  {"mount: going to use the loop device %s\n", 1439},
+  {"mount: failed setting up loop device\n", 1440},
+  {"mount: setup loop device successfully\n", 1441},
+  {"mount: can't open %s: %s", 1442},
+  {"mount: cannot not open %s for setting speed", 1443},
+  {"mount: cannot set speed: %s", 1444},
+  {"mount: cannot fork: %s", 1445},
+  {"mount: this version was compiled without support for the type `nfs'", 1446},
+  {"mount: failed with nfs mount version 4, trying 3..\n", 1447},
+  {"\
+mount: I could not determine the filesystem type, and none was specified", 1448},
+  {"mount: you must specify the filesystem type", 1449},
+  {"mount: mount failed", 1450},
+  {"mount: mount point %s is not a directory", 1451},
+  {"mount: permission denied", 1452},
+  {"mount: must be superuser to use mount", 1453},
+  {"mount: %s is busy", 1454},
+  {"mount: proc already mounted", 1455},
+  {"mount: %s already mounted or %s busy", 1456},
+  {"mount: mount point %s does not exist", 1457},
+  {"mount: mount point %s is a symbolic link to nowhere", 1458},
+  {"mount: special device %s does not exist", 1459},
   {"\
 mount: special device %s does not exist\n\
-       (a path prefix is not a directory)\n", 1461},
-  {"mount: %s not mounted already, or bad option", 1462},
+       (a path prefix is not a directory)\n", 1460},
+  {"mount: %s not mounted already, or bad option", 1461},
   {"\
 mount: wrong fs type, bad option, bad superblock on %s,\n\
-       or too many mounted file systems", 1463},
-  {"mount table full", 1464},
-  {"mount: %s: can't read superblock", 1465},
-  {"mount: %s: unknown device", 1466},
-  {"mount: fs type %s not supported by kernel", 1467},
-  {"mount: probably you meant %s", 1468},
-  {"mount: maybe you meant iso9660 ?", 1469},
-  {"mount: %s has wrong device number or fs type %s not supported", 1470},
-  {"mount: %s is not a block device, and stat fails?", 1471},
+       or too many mounted file systems", 1462},
+  {"mount table full", 1463},
+  {"mount: %s: can't read superblock", 1464},
+  {"mount: %s: unknown device", 1465},
+  {"mount: fs type %s not supported by kernel", 1466},
+  {"mount: probably you meant %s", 1467},
+  {"mount: maybe you meant iso9660 ?", 1468},
+  {"mount: %s has wrong device number or fs type %s not supported", 1469},
+  {"mount: %s is not a block device, and stat fails?", 1470},
   {"\
 mount: the kernel does not recognize %s as a block device\n\
-       (maybe `insmod driver'?)", 1472},
-  {"mount: %s is not a block device (maybe try `-o loop'?)", 1473},
-  {"mount: %s is not a block device", 1474},
-  {"mount: %s is not a valid block device", 1475},
-  {"block device ", 1476},
-  {"mount: cannot mount %s%s read-only", 1477},
-  {"mount: %s%s is write-protected but explicit `-w' flag given", 1478},
-  {"mount: %s%s is write-protected, mounting read-only", 1479},
-  {"mount: going to mount %s by %s\n", 1480},
-  {"UUID", 1481},
-  {"label", 1482},
-  {"mount: no such partition found", 1483},
-  {"mount: no type was given - I'll assume nfs because of the colon\n", 1484},
-  {"mount: backgrounding \"%s\"\n", 1485},
-  {"mount: giving up \"%s\"\n", 1486},
-  {"mount: %s already mounted on %s\n", 1487},
+       (maybe `insmod driver'?)", 1471},
+  {"mount: %s is not a block device (maybe try `-o loop'?)", 1472},
+  {"mount: %s is not a block device", 1473},
+  {"mount: %s is not a valid block device", 1474},
+  {"block device ", 1475},
+  {"mount: cannot mount %s%s read-only", 1476},
+  {"mount: %s%s is write-protected but explicit `-w' flag given", 1477},
+  {"mount: %s%s is write-protected, mounting read-only", 1478},
+  {"mount: going to mount %s by %s\n", 1479},
+  {"UUID", 1480},
+  {"label", 1481},
+  {"mount: no such partition found", 1482},
+  {"mount: no type was given - I'll assume nfs because of the colon\n", 1483},
+  {"mount: backgrounding \"%s\"\n", 1484},
+  {"mount: giving up \"%s\"\n", 1485},
+  {"mount: %s already mounted on %s\n", 1486},
   {"\
 Usage: mount -V                 : print version\n\
        mount -h                 : print this help\n\
@@ -1937,36 +1950,37 @@ One can also mount an already visible directory tree elsewhere:\n\
 A device can be given by name, say /dev/hda1 or /dev/cdrom,\n\
 or by label, using  -L label  or by uuid, using  -U uuid .\n\
 Other options: [-nfFrsvw] [-o options].\n\
-For many more details, say  man 8 mount .\n", 1488},
-  {"mount: only root can do that", 1489},
-  {"mount: no %s found - creating it..\n", 1490},
-  {"mount: mounting %s\n", 1491},
-  {"not mounted anything", 1492},
-  {"mount: cannot find %s in %s", 1493},
-  {"mount: can't find %s in %s or %s", 1494},
-  {"\
-mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1495},
-  {"mount: bad UUID", 1496},
-  {"mount: you didn't specify a filesystem type for %s\n", 1497},
-  {"       I will try all types mentioned in %s or %s\n", 1498},
-  {"       and it looks like this is swapspace\n", 1499},
-  {"       I will try type %s\n", 1500},
-  {"Trying %s\n", 1501},
-  {"mount: excessively long host:dir argument\n", 1502},
-  {"mount: warning: multiple hostnames not supported\n", 1503},
-  {"mount: directory to mount not in host:dir format\n", 1504},
-  {"mount: can't get address for %s\n", 1505},
-  {"mount: got bad hp->h_length\n", 1506},
-  {"mount: excessively long option argument\n", 1507},
-  {"Warning: Unrecognized proto= option.\n", 1508},
-  {"Warning: Option namlen is not supported.\n", 1509},
-  {"unknown nfs mount parameter: %s=%d\n", 1510},
-  {"Warning: option nolock is not supported.\n", 1511},
-  {"unknown nfs mount option: %s%s\n", 1512},
-  {"mount: got bad hp->h_length?\n", 1513},
-  {"NFS over TCP is not supported.\n", 1514},
-  {"nfs socket", 1515},
-  {"nfs bindresvport", 1516},
+For many more details, say  man 8 mount .\n", 1487},
+  {"mount: only root can do that", 1488},
+  {"mount: no %s found - creating it..\n", 1489},
+  {"mount: mounting %s\n", 1490},
+  {"nothing was mounted", 1491},
+  {"mount: cannot find %s in %s", 1492},
+  {"mount: can't find %s in %s or %s", 1493},
+  {"\
+mount: could not open %s, so UUID and LABEL conversion cannot be done.\n", 1494},
+  {"mount: bad UUID", 1495},
+  {"mount: you didn't specify a filesystem type for %s\n", 1496},
+  {"       I will try all types mentioned in %s or %s\n", 1497},
+  {"       and it looks like this is swapspace\n", 1498},
+  {"       I will try type %s\n", 1499},
+  {"Trying %s\n", 1500},
+  {"mount: excessively long host:dir argument\n", 1501},
+  {"mount: warning: multiple hostnames not supported\n", 1502},
+  {"mount: directory to mount not in host:dir format\n", 1503},
+  {"mount: can't get address for %s\n", 1504},
+  {"mount: got bad hp->h_length\n", 1505},
+  {"mount: excessively long option argument\n", 1506},
+  {"Warning: Unrecognized proto= option.\n", 1507},
+  {"Warning: Option namlen is not supported.\n", 1508},
+  {"unknown nfs mount parameter: %s=%d\n", 1509},
+  {"Warning: option nolock is not supported.\n", 1510},
+  {"unknown nfs mount option: %s%s\n", 1511},
+  {"mount: got bad hp->h_length?\n", 1512},
+  {"NFS over TCP is not supported.\n", 1513},
+  {"nfs socket", 1514},
+  {"nfs bindresvport", 1515},
+  {"nfs server reported service unavailable", 1516},
   {"used portmapper to find NFS port\n", 1517},
   {"using port %d for nfs deamon\n", 1518},
   {"nfs connect", 1519},
@@ -1979,7 +1993,7 @@ usage: %s [-hV]\n\
        %s [-s]\n", 1522},
   {"%s on %s\n", 1523},
   {"swapon: cannot stat %s: %s\n", 1524},
-  {"swapon: warning: %s has insecure permissions %04o, 0600 suggested\n", 1525},
+  {"swapon: warning: %s has insecure permissions %04o, %04o suggested\n", 1525},
   {"swapon: Skipping file %s - it appears to have holes.\n", 1526},
   {"%s: cannot open %s: %s\n", 1527},
   {"umount: compiled without support for -f\n", 1528},
@@ -2004,15 +2018,15 @@ usage: %s [-hV]\n\
 Usage: umount [-hV]\n\
        umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n\
        umount [-f] [-r] [-n] [-v] special | node...\n", 1546},
-  {"umount: only root can do that", 1547},
-  {"Trying to umount %s\n", 1548},
-  {"Could not find %s in mtab\n", 1549},
-  {"umount: %s is not mounted (according to mtab)", 1550},
-  {"umount: it seems %s is mounted multiple times", 1551},
-  {"umount: %s is not in the fstab (and you are not root)", 1552},
-  {"umount: %s mount disagrees with the fstab", 1553},
-  {"umount: only root can unmount %s from %s", 1554},
-  {"umount: only %s can unmount %s from %s", 1555},
+  {"Trying to umount %s\n", 1547},
+  {"Could not find %s in mtab\n", 1548},
+  {"umount: %s is not mounted (according to mtab)", 1549},
+  {"umount: it seems %s is mounted multiple times", 1550},
+  {"umount: %s is not in the fstab (and you are not root)", 1551},
+  {"umount: %s mount disagrees with the fstab", 1552},
+  {"umount: only root can unmount %s from %s", 1553},
+  {"umount: only %s can unmount %s from %s", 1554},
+  {"umount: only root can do that", 1555},
   {"You must be root to set the Ctrl-Alt-Del behaviour.\n", 1556},
   {"Usage: ctrlaltdel hard|soft\n", 1557},
   {"\
@@ -2088,7 +2102,7 @@ Output Format:\n\
   {"pages swapped   %ld\n", 1609},
   {"Swap performance: %ld attempts\t %ld successes\n", 1610},
   {"------ Shared Memory Segment Creators/Owners --------\n", 1611},
-  {"%-10s%-10s%-10s%-10s%-10s%-10s\n", 1612},
+  {"%-10s %-10s %-10s %-10s %-10s %-10s\n", 1612},
   {"shmid", 1613},
   {"perms", 1614},
   {"cuid", 1615},
@@ -2096,22 +2110,22 @@ Output Format:\n\
   {"uid", 1617},
   {"gid", 1618},
   {"------ Shared Memory Attach/Detach/Change Times --------\n", 1619},
-  {"%-10s%-10s  %-20s%-20s%-20s\n", 1620},
+  {"%-10s %-10s %-20s %-20s %-20s\n", 1620},
   {"owner", 1621},
   {"attached", 1622},
   {"detached", 1623},
   {"changed", 1624},
   {"------ Shared Memory Creator/Last-op --------\n", 1625},
-  {"%-10s%-10s%-10s%-10s\n", 1626},
+  {"%-10s %-10s %-10s %-10s\n", 1626},
   {"cpid", 1627},
   {"lpid", 1628},
   {"------ Shared Memory Segments --------\n", 1629},
-  {"%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n", 1630},
+  {"%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n", 1630},
   {"key", 1631},
   {"bytes", 1632},
   {"nattch", 1633},
   {"status", 1634},
-  {"Not set\n", 1635},
+  {"Not set", 1635},
   {"dest", 1636},
   {"locked", 1637},
   {"kernel not configured for semaphores\n", 1638},
@@ -2127,80 +2141,80 @@ Output Format:\n\
   {"------ Semaphore Arrays Creators/Owners --------\n", 1648},
   {"semid", 1649},
   {"------ Shared Memory Operation/Change Times --------\n", 1650},
-  {"%-8s%-10s  %-26.24s %-26.24s\n", 1651},
+  {"%-8s %-10s %-26.24s %-26.24s\n", 1651},
   {"last-op", 1652},
   {"last-changed", 1653},
   {"------ Semaphore Arrays --------\n", 1654},
-  {"%-10s%-10s%-10s%-10s%-10s%-12s\n", 1655},
+  {"%-10s %-10s %-10s %-10s %-10s %-12s\n", 1655},
   {"nsems", 1656},
-  {"------ Messages: Limits --------\n", 1657},
-  {"max queues system wide = %d\n", 1658},
-  {"max size of message (bytes) = %d\n", 1659},
-  {"default max size of queue (bytes) = %d\n", 1660},
-  {"------ Messages: Status --------\n", 1661},
-  {"allocated queues = %d\n", 1662},
-  {"used headers = %d\n", 1663},
-  {"used space = %d bytes\n", 1664},
-  {"------ Message Queues: Creators/Owners --------\n", 1665},
-  {"msqid", 1666},
-  {"------ Message Queues Send/Recv/Change Times --------\n", 1667},
-  {"%-8s%-10s  %-20s%-20s%-20s\n", 1668},
-  {"send", 1669},
-  {"recv", 1670},
-  {"change", 1671},
-  {"------ Message Queues PIDs --------\n", 1672},
-  {"lspid", 1673},
-  {"lrpid", 1674},
-  {"------ Message Queues --------\n", 1675},
-  {"%-10s%-10s%-10s%-10s%-12s%-12s\n", 1676},
-  {"used-bytes", 1677},
-  {"messages", 1678},
+  {"kernel not configured for message queues\n", 1657},
+  {"------ Messages: Limits --------\n", 1658},
+  {"max queues system wide = %d\n", 1659},
+  {"max size of message (bytes) = %d\n", 1660},
+  {"default max size of queue (bytes) = %d\n", 1661},
+  {"------ Messages: Status --------\n", 1662},
+  {"allocated queues = %d\n", 1663},
+  {"used headers = %d\n", 1664},
+  {"used space = %d bytes\n", 1665},
+  {"------ Message Queues: Creators/Owners --------\n", 1666},
+  {"msqid", 1667},
+  {"------ Message Queues Send/Recv/Change Times --------\n", 1668},
+  {"%-8s %-10s %-20s %-20s %-20s\n", 1669},
+  {"send", 1670},
+  {"recv", 1671},
+  {"change", 1672},
+  {"------ Message Queues PIDs --------\n", 1673},
+  {"lspid", 1674},
+  {"lrpid", 1675},
+  {"------ Message Queues --------\n", 1676},
+  {"%-10s %-10s %-10s %-10s %-12s %-12s\n", 1677},
+  {"used-bytes", 1678},
+  {"messages", 1679},
   {"\
 \n\
-Shared memory Segment shmid=%d\n", 1679},
-  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1680},
-  {"mode=%#o\taccess_perms=%#o\n", 1681},
-  {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1682},
-  {"att_time=%s", 1683},
-  {"det_time=%s", 1684},
-  {"change_time=%s", 1685},
+Shared memory Segment shmid=%d\n", 1680},
+  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n", 1681},
+  {"mode=%#o\taccess_perms=%#o\n", 1682},
+  {"bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n", 1683},
+  {"att_time=%-26.24s\n", 1684},
+  {"det_time=%-26.24s\n", 1685},
+  {"change_time=%-26.24s\n", 1686},
   {"\
 \n\
-Message Queue msqid=%d\n", 1686},
-  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1687},
-  {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1688},
-  {"send_time=%s", 1689},
-  {"rcv_time=%s", 1690},
+Message Queue msqid=%d\n", 1687},
+  {"uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n", 1688},
+  {"cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n", 1689},
+  {"send_time=%-26.24s\n", 1690},
+  {"rcv_time=%-26.24s\n", 1691},
   {"\
 \n\
-Semaphore Array semid=%d\n", 1691},
-  {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1692},
-  {"mode=%#o, access_perms=%#o\n", 1693},
-  {"nsems = %ld\n", 1694},
-  {"otime = %s", 1695},
-  {"ctime = %s", 1696},
-  {"%-10s%-10s%-10s%-10s%-10s\n", 1697},
-  {"semnum", 1698},
-  {"value", 1699},
-  {"ncount", 1700},
-  {"zcount", 1701},
-  {"pid", 1702},
-  {"usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1703},
-  {"\
-  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device", 1704},
-  {"  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2", 1705},
-  {"  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)", 1706},
-  {"  rdev -s /dev/fd0 /dev/hda2      set the SWAP device", 1707},
+Semaphore Array semid=%d\n", 1692},
+  {"uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n", 1693},
+  {"mode=%#o, access_perms=%#o\n", 1694},
+  {"nsems = %ld\n", 1695},
+  {"otime = %-26.24s\n", 1696},
+  {"ctime = %-26.24s\n", 1697},
+  {"%-10s %-10s %-10s %-10s %-10s\n", 1698},
+  {"semnum", 1699},
+  {"value", 1700},
+  {"ncount", 1701},
+  {"zcount", 1702},
+  {"pid", 1703},
+  {"usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]", 1704},
+  {"\
+  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device", 1705},
+  {"  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2", 1706},
+  {"  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)", 1707},
   {"  rdev -r /dev/fd0 627            set the RAMDISK size", 1708},
   {"  rdev -v /dev/fd0 1              set the bootup VIDEOMODE", 1709},
   {"  rdev -o N ...                   use the byte offset N", 1710},
   {"  rootflags ...                   same as rdev -R", 1711},
-  {"  swapdev ...                     same as rdev -s", 1712},
-  {"  ramsize ...                     same as rdev -r", 1713},
-  {"  vidmode ...                     same as rdev -v", 1714},
+  {"  ramsize ...                     same as rdev -r", 1712},
+  {"  vidmode ...                     same as rdev -v", 1713},
   {"\
-Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1715},
-  {"      use -R 1 to mount root readonly, -R 0 for read/write.", 1716},
+Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1714},
+  {"      use -R 1 to mount root readonly, -R 0 for read/write.", 1715},
+  {"missing comma", 1716},
   {"\
 %s: Usage: \"%s [options]\n\
 \t -m <mapfile>  (default = \"%s\")\n\
@@ -2215,101 +2229,102 @@ Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,...", 1
   {"Sampling_step: %i\n", 1719},
   {"%s: %s(%i): wrong map line\n", 1720},
   {"%s: can't find \"_stext\" in %s\n", 1721},
-  {"total", 1722},
+  {"%s: profile address out of range. Wrong map file?\n", 1722},
+  {"total", 1723},
   {"\
-usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1723},
-  {"renice: %s: unknown user\n", 1724},
-  {"renice: %s: bad value\n", 1725},
-  {"getpriority", 1726},
-  {"setpriority", 1727},
-  {"%d: old priority %d, new priority %d\n", 1728},
-  {"usage: %s program [arg ...]\n", 1729},
+usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n", 1724},
+  {"renice: %s: unknown user\n", 1725},
+  {"renice: %s: bad value\n", 1726},
+  {"getpriority", 1727},
+  {"setpriority", 1728},
+  {"%d: old priority %d, new priority %d\n", 1729},
+  {"usage: %s program [arg ...]\n", 1730},
   {"\
 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", 1730},
-  {"malloc error", 1731},
-  {"%s: bad value\n", 1732},
-  {"%s: %s not an lp device.\n", 1733},
-  {"%s status is %d", 1734},
-  {", busy", 1735},
-  {", ready", 1736},
-  {", out of paper", 1737},
-  {", on-line", 1738},
-  {", error", 1739},
-  {"LPGETIRQ error", 1740},
-  {"%s using IRQ %d\n", 1741},
-  {"%s using polling\n", 1742},
-  {"col: bad -l argument %s.\n", 1743},
-  {"usage: col [-bfpx] [-l nline]\n", 1744},
-  {"col: write error.\n", 1745},
-  {"col: warning: can't back up %s.\n", 1746},
-  {"past first line", 1747},
-  {"-- line already flushed", 1748},
-  {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1749},
-  {"line too long", 1750},
-  {"usage: column [-tx] [-c columns] [file ...]\n", 1751},
-  {"hexdump: bad length value.\n", 1752},
-  {"hexdump: bad skip value.\n", 1753},
-  {"\
-hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1754},
-  {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1755},
+          -T [on|off] ]\n", 1731},
+  {"malloc error", 1732},
+  {"%s: bad value\n", 1733},
+  {"%s: %s not an lp device.\n", 1734},
+  {"%s status is %d", 1735},
+  {", busy", 1736},
+  {", ready", 1737},
+  {", out of paper", 1738},
+  {", on-line", 1739},
+  {", error", 1740},
+  {"LPGETIRQ error", 1741},
+  {"%s using IRQ %d\n", 1742},
+  {"%s using polling\n", 1743},
+  {"col: bad -l argument %s.\n", 1744},
+  {"usage: col [-bfpx] [-l nline]\n", 1745},
+  {"col: write error.\n", 1746},
+  {"col: warning: can't back up %s.\n", 1747},
+  {"past first line", 1748},
+  {"-- line already flushed", 1749},
+  {"usage: %s [ - ] [ -2 ] [ file ... ]\n", 1750},
+  {"line too long", 1751},
+  {"usage: column [-tx] [-c columns] [file ...]\n", 1752},
+  {"hexdump: bad length value.\n", 1753},
+  {"hexdump: bad skip value.\n", 1754},
+  {"\
+hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n", 1755},
+  {"usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n", 1756},
   {"\
 \n\
 *** %s: directory ***\n\
-\n", 1756},
+\n", 1757},
   {"\
 \n\
 ******** %s: Not a text file ********\n\
-\n", 1757},
-  {"[Use q or Q to quit]", 1758},
-  {"--More--", 1759},
-  {"(Next file: %s)", 1760},
-  {"[Press space to continue, 'q' to quit.]", 1761},
-  {"...back %d page", 1762},
-  {"...skipping %d line", 1763},
+\n", 1758},
+  {"[Use q or Q to quit]", 1759},
+  {"--More--", 1760},
+  {"(Next file: %s)", 1761},
+  {"[Press space to continue, 'q' to quit.]", 1762},
+  {"...back %d page", 1763},
+  {"...skipping %d line", 1764},
   {"\
 \n\
 ***Back***\n\
-\n", 1764},
-  {"Can't open help file", 1765},
-  {"[Press 'h' for instructions.]", 1766},
-  {"\"%s\" line %d", 1767},
-  {"[Not a file] line %d", 1768},
-  {"  Overflow\n", 1769},
-  {"...skipping\n", 1770},
-  {"Regular expression botch", 1771},
+\n", 1765},
+  {"Can't open help file", 1766},
+  {"[Press 'h' for instructions.]", 1767},
+  {"\"%s\" line %d", 1768},
+  {"[Not a file] line %d", 1769},
+  {"  Overflow\n", 1770},
+  {"...skipping\n", 1771},
+  {"Regular expression botch", 1772},
   {"\
 \n\
-Pattern not found\n", 1772},
-  {"Pattern not found", 1773},
-  {"can't fork\n", 1774},
+Pattern not found\n", 1773},
+  {"Pattern not found", 1774},
+  {"can't fork\n", 1775},
   {"\
 \n\
-...Skipping ", 1775},
-  {"...Skipping ", 1776},
-  {"to file ", 1777},
-  {"back to file ", 1778},
-  {"Line too long", 1779},
-  {"No previous command to substitute for", 1780},
-  {"od: od(1) has been deprecated for hexdump(1).\n", 1781},
-  {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1782},
-  {"; see strings(1).", 1783},
-  {"hexdump: can't read %s.\n", 1784},
-  {"hexdump: line too long.\n", 1785},
-  {"hexdump: byte count with multiple conversion characters.\n", 1786},
-  {"hexdump: bad byte count for conversion character %s.\n", 1787},
-  {"hexdump: %%s requires a precision or a byte count.\n", 1788},
-  {"hexdump: bad format {%s}\n", 1789},
-  {"hexdump: bad conversion character %%%s.\n", 1790},
-  {"Unable to allocate bufferspace\n", 1791},
-  {"usage: rev [file ...]\n", 1792},
-  {"usage: %s [ -i ] [ -tTerm ] file...\n", 1793},
-  {"trouble reading terminfo", 1794},
-  {"Unknown escape sequence in input: %o, %o\n", 1795},
-  {"Unable to allocate buffer.\n", 1796},
-  {"Input line too long.\n", 1797},
-  {"Out of memory when growing buffer.\n", 1798},
+...Skipping ", 1776},
+  {"...Skipping ", 1777},
+  {"to file ", 1778},
+  {"back to file ", 1779},
+  {"Line too long", 1780},
+  {"No previous command to substitute for", 1781},
+  {"od: od(1) has been deprecated for hexdump(1).\n", 1782},
+  {"od: hexdump(1) compatibility doesn't support the -%c option%s\n", 1783},
+  {"; see strings(1).", 1784},
+  {"hexdump: can't read %s.\n", 1785},
+  {"hexdump: line too long.\n", 1786},
+  {"hexdump: byte count with multiple conversion characters.\n", 1787},
+  {"hexdump: bad byte count for conversion character %s.\n", 1788},
+  {"hexdump: %%s requires a precision or a byte count.\n", 1789},
+  {"hexdump: bad format {%s}\n", 1790},
+  {"hexdump: bad conversion character %%%s.\n", 1791},
+  {"Unable to allocate bufferspace\n", 1792},
+  {"usage: rev [file ...]\n", 1793},
+  {"usage: %s [ -i ] [ -tTerm ] file...\n", 1794},
+  {"trouble reading terminfo", 1795},
+  {"Unknown escape sequence in input: %o, %o\n", 1796},
+  {"Unable to allocate buffer.\n", 1797},
+  {"Input line too long.\n", 1798},
+  {"Out of memory when growing buffer.\n", 1799},
 };
 
-int _msg_tbl_length = 1798;
+int _msg_tbl_length = 1799;
diff --git a/po/cs.po b/po/cs.po
index 98260fd87..c4f47ddf5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,661 +1,17 @@
 # Czech translation of util-linux. 
-# Jiøí Pavlovský <pavlovsk@ff.cuni.cz>, 1999.
+# Jiøí Pavlovský <pavlovsk@ff.cuni.cz>, 1999 - 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-2.10d\n"
-"POT-Creation-Date: 2000-10-16 16:44+0200\n"
-"PO-Revision-Date: 2000-07-13 22:39+0200\n"
+"Project-Id-Version: util-linux-2.11d\n"
+"POT-Creation-Date: 2001-05-30 15:07+0200\n"
+"PO-Revision-Date: 2001-05-30 15:11+0200\n"
 "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:157
-msgid "booted from MILO\n"
-msgstr "spu¹tìn pomocí MILO\n"
-
-#: clock/cmos.c:166
-msgid "Ruffian BCD clock\n"
-msgstr "hodnoty ulo¾eny v BCD tvaru\n"
-
-#: 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:192
-msgid "funky TOY!\n"
-msgstr "pou¾it pøepínaè --funky-toy!\n"
-
-#: 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:570
-#, c-format
-msgid "Cannot open /dev/port: %s"
-msgstr "/dev/port nelze otevøít: %s"
-
-#: clock/cmos.c:577
-msgid "I failed to get permission because I didn't try.\n"
-msgstr "Jeliko¾ jsem se nesna¾il, nepodaøilo se mi získat práva pro pøístup.\n"
-
-#: 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:583
-msgid "Probably you need root privileges.\n"
-msgstr "Pravdìpodobnì je tøeba mít práva superu¾ivatele.\n"
-
-#: 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:220 clock/hwclock.c:309
-msgid "UTC"
-msgstr "greenwichský"
-
-#: clock/hwclock.c:220 clock/hwclock.c:308
-msgid "local"
-msgstr "místní"
-
-#: 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:294
-msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr "(Oèekáváno `UTC', `LOCAL' èi nic.)\n"
-
-#: 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: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: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:309
-msgid "unknown"
-msgstr "neznámý"
-
-#. -----------------------------------------------------------------------------
-#. 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 "èekám na tiknutí hodin...\n"
-
-#: clock/hwclock.c:335
-msgid "...got clock tick\n"
-msgstr "...hodiny tikly\n"
-
-#: clock/hwclock.c:386
-#, c-format
-msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr ""
-"Hodiny reálného èasu obsahují chybné hodnoty: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-
-#: clock/hwclock.c:394
-#, c-format
-msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr ""
-"Hodiny reálného èasu: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund od roku "
-"1969\n"
-
-#: clock/hwclock.c:422
-#, c-format
-msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr "Hodiny reálného èasu ukazují %4d/%.2d/%.2d %02d:%02d:%02d\n"
-
-#: 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:455
-msgid "Clock not changed - testing only.\n"
-msgstr "Testovací re¾im - Èas nezmìnìn.\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 ""
-"Poèet sekund uplynulých od referenèního èasu: %.6f.\n"
-"Èekám, dokud neuplyne dal¹í celá sekunda.\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 ""
-"Registry hodin reálného èasu obsahují hodnoty, které jsou buï chybné (napø.\n"
-"50tý den v mìsíci), èi mimo pøípustný rozsah (napø. rok 2095).\n"
-
-#. 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 sekundy\n"
-
-#: 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: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:584
-#, c-format
-msgid "Issuing date command: %s\n"
-msgstr "Spou¹tím pøíkaz 'date': %s\n"
-
-#: 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:594
-#, c-format
-msgid "response from date command = %s\n"
-msgstr "odpovìï pøíkazu 'date' = %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 ""
-"Od pøíkazu 'date' spu¹tìného programem %s, pøi¹la neèekaná odpovìï.\n"
-"Pøíkaz:\n"
-"  %s\n"
-"Odpovìï:\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 ""
-"Pøíkaz 'date' spu¹tìný programem %s místo pøevedeného èasu vrátil nìco,\n"
-"co není celým èíslem.\n"
-"Pøíkaz:\n"
-"  %s\n"
-"Odpovìï:\n"
-"  %s\n"
-
-#: 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:647
-msgid ""
-"The Hardware Clock does not contain a valid time, so we cannot set the "
-"System Time from it.\n"
-msgstr ""
-"Systémový èas nelze podle hodin reálného èasu nastavit, proto¾e neukazují\n"
-"platný èas.\n"
-
-#: clock/hwclock.c:669
-msgid "Calling settimeofday:\n"
-msgstr "Volám 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 "Testovací re¾im - systémový èas nezmìnìn.\n"
-
-#: 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:685
-msgid "settimeofday() failed"
-msgstr "volání settimeofday() selhalo"
-
-#: clock/hwclock.c:718
-msgid ""
-"Not adjusting drift factor because the Hardware Clock previously contained "
-"garbage.\n"
-msgstr ""
-"Neopravuji míru posunu, proto¾e hodiny reálného èasu poslednì obsahovaly\n"
-"neplatné hodnoty.\n"
-
-#: clock/hwclock.c:722
-msgid ""
-"Not adjusting drift factor because it has been less than a day since the "
-"last calibration.\n"
-msgstr ""
-"Neopravuji míru posunu, proto¾e poslední kalibrace je¹tì neuplynul celý "
-"den.\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 ""
-"Hodiny se za posledních %2$d sekund roze¹ly o %1$d sekund, pøesto¾e míra "
-"posunu\n"
-"je nastavena na %3$f sekund/den.\n"
-"Opravuji míru posunu o %4$f sekund.\n"
-
-#: 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: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:813
-msgid "Not updating adjtime file because of testing mode.\n"
-msgstr "Testovací re¾im - soubor adjtime nezmìnìn.\n"
-
-#: clock/hwclock.c:814
-#, c-format
-msgid ""
-"Would have written the following to %s:\n"
-"%s"
-msgstr ""
-"Do %s by bylo ulo¾eno následující:\n"
-"%s"
-
-#: clock/hwclock.c:838
-msgid "Drift adjustment parameters not updated.\n"
-msgstr "Parametry opravy posunu nezmìnìny.\n"
-
-#: 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: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:929
-#, c-format
-msgid "Using %s.\n"
-msgstr "Pou¾ívám %s.\n"
-
-#: 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:1026
-msgid "Unable to set system clock.\n"
-msgstr "Systémový èas nelze nastavit.\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 ""
-"Jádro obsahuje hodnotu poèátku epochy pro hodiny reálného èasu pouze na "
-"Alpha\n"
-"systémech.\n"
-"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: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: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: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: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: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: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 - nastavuje a zji¹»uje reálný èas (RTC)\n"
-"\n"
-"Pou¾ití: hwclock [funkce] [volby...]\n"
-"\n"
-"Funkce:\n"
-"  --help        vypí¹e tuto nápovìdu\n"
-"  --show        zjistí a vypí¹e aktuální stav hodin reálného èasu\n"
-"  --set         nastaví RTC na hodnotu zadanou pøepínaèem --date\n"
-"  --hctosys     nastaví systémový èas podle hodin reálného èasu\n"
-"  --systohc     nastaví RTC podle aktuálního systémového èasu\n"
-"  --adjust      opraví systematický posun, který nastal od poslední\n"
-"                opravy èi nastavení RTC\n"
-"  --getepoch    vypí¹e poèátek epochy pro hodiny reálného èasu\n"
-"  --setepoch    nastaví poèátek epochy pro hodiny reálného èasu na hodnotu\n"
-"                zadanou pøepínaèem --epoch\n"
-"  --version     vypí¹e oznaèení verze\n"
-"\n"
-"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 %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: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"
-"                nastaví typ alpha systému (viz hwclock(8))\n"
-
-#: 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:1237
-msgid ""
-"You have specified multiple function options.\n"
-"You can only perform one function at a time.\n"
-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: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: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: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: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: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"
-
-#: 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"
-msgstr "Ve smyèce se pokou¹ím zjistit èas pomocí KDGHWCLK.\n"
-
-#: clock/kd.c:44
-msgid "KDGHWCLK ioctl to read time failed"
-msgstr "volání KDGHWCLK ioctl selhalo."
-
-#: 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"
-
-#: clock/kd.c:69
-msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "volání KDGHWCLK ioctl ve smyèce selhalo."
-
-#: clock/kd.c:91
-msgid "ioctl() failed to read time from  /dev/tty1"
-msgstr "èas se pomocí volání ioctl() pro /dev/tty1 nepodaøilo zjistit"
-
-#: clock/kd.c:127
-msgid "ioctl() to open /dev/tty1 failed"
-msgstr "volání ioctl() pro /dev/tty1 selhalo"
-
-#: clock/kd.c:157
-msgid "KDGHWCLK ioctl failed"
-msgstr "volání ioctl KDGHWCLK selhalo"
-
-#: clock/kd.c:163
-msgid "Can't open /dev/tty1"
-msgstr "/dev/tty1 nelze otevøít"
-
-#: 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: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:172 clock/rtc.c:229
-#, c-format
-msgid "open() of %s failed"
-msgstr "%s nelze otevøít - volání open() selhalo"
-
-#: clock/rtc.c:190
-#, c-format
-msgid "%s does not have interrupt functions. "
-msgstr "%s nemá pøeru¹ovací funkce. "
-
-#: 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: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: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:252 clock/rtc.c:331 clock/rtc.c:376
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s nelze otevøít."
-
-#: 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:279
-#, c-format
-msgid "ioctl(%s) was successful.\n"
-msgstr "Volání ioctl(%s) bylo úspì¹né.\n"
-
-#: clock/rtc.c:309
-#, c-format
-msgid "Open of %s failed"
-msgstr "%s nelze otevøít."
-
-#: 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 ""
-"Pro zmìnu hodnoty poèátku epochy v jádøe je nutné mít pøístup ke zvlá¹tnímu\n"
-"souboru %s. Tento soubor neexistuje.\n"
-
-#: 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:344
-#, c-format
-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: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:381
-#, c-format
-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:386
-#, c-format
-msgid ""
-"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: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
-msgid "invalid number `%s'\n"
-msgstr "Chybné èíslo `%s'\n"
-
-#: clock/shhopt.c:258 clock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "Èíslo `%s' na `%s'. Hodnota je mimo meze.\n"
-
-#: clock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "neznámý pøepínaè `%s'\n"
-
-#: clock/shhopt.c:411 clock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "pøepínaè `%s' vy¾aduje argument\n"
-
-#: clock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "pøepínaè `%s' musí být zadán bez argumentu\n"
-
-#: clock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "neznámý pøepínaè `-%c'\n"
-
 #: disk-utils/blockdev.c:47
 msgid "set read-only"
 msgstr "nastaví pouze pro ètení"
@@ -711,6 +67,10 @@ msgstr "%s: neznámý pøíkaz %s\n"
 msgid "%s requires an argument\n"
 msgstr "pøepínaè %s vy¾aduje argument\n"
 
+#: disk-utils/elvtune.c:46
+msgid "usage:\n"
+msgstr "Pou¾ití:\n"
+
 #: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Formátuji ... "
@@ -746,10 +106,11 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Pou¾ití: %s [ -n ] zaøízení\n"
 
-#: 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
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1236
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:452
+#: disk-utils/setfdprm.c:127 misc-utils/cal.c:203 misc-utils/ddate.c:181
+#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:131
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s na %s\n"
@@ -779,7 +140,7 @@ msgstr "1"
 #: 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"
+msgstr "Pou¾ití: %s [ -larvsmf ] název zaøízení\n"
 
 #: disk-utils/fsck.minix.c:296
 #, c-format
@@ -794,27 +155,35 @@ msgstr "Chcete opravdu pokraèovat"
 msgid "check aborted.\n"
 msgstr "prohlídka ukonèena.\n"
 
-#: 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:337
+#, c-format
+msgid "Zone nr < FIRSTZONE in file `%s'."
+msgstr "èíslo Zóny < FIRSTZONE v souboru `%s'."
 
-#: 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:321 disk-utils/fsck.minix.c:339
+#, c-format
+msgid "Zone nr >= ZONES in file `%s'."
+msgstr "èíslo Zóny >= poèet ZÓN v souboru `%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
+#: disk-utils/fsck.minix.c:324 disk-utils/fsck.minix.c:342
 msgid "Remove block"
 msgstr "Odstranit blok"
 
-#: disk-utils/fsck.minix.c:364
+#: disk-utils/fsck.minix.c:360
 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:370
+#: disk-utils/fsck.minix.c:362 disk-utils/fsck.minix.c:368
+#: disk-utils/fsck.minix.c:392 disk-utils/fsck.minix.c:639
+#: disk-utils/fsck.minix.c:690
+msgid "'\n"
+msgstr "'\n"
+
+#: disk-utils/fsck.minix.c:366
 msgid "Read error: bad block in file '"
 msgstr "Chyba pøi ètení: chybný blok v souboru '"
 
-#: disk-utils/fsck.minix.c:386
+#: disk-utils/fsck.minix.c:382
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
@@ -822,284 +191,278 @@ msgstr ""
 "Vnitøní chyba: pokus o zápis chybného bloku.\n"
 "®ádost o zápis ignorována.\n"
 
-#: disk-utils/fsck.minix.c:392 disk-utils/mkfs.minix.c:283
+#: disk-utils/fsck.minix.c:388 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:394
+#: disk-utils/fsck.minix.c:390
 msgid "Write error: bad block in file '"
 msgstr "Chyba pøi zápisu: chybný blok v souboru '"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:509
 msgid "seek failed in write_super_block"
 msgstr "chyba pøi posunu ukazovátka ve write_super_block"
 
-#: disk-utils/fsck.minix.c:515 disk-utils/mkfs.minix.c:270
+#: disk-utils/fsck.minix.c:511 disk-utils/mkfs.minix.c:270
 msgid "unable to write super-block"
 msgstr "superblok nelze zapsat"
 
-#: disk-utils/fsck.minix.c:525
+#: disk-utils/fsck.minix.c:521
 msgid "Unable to write inode map"
 msgstr "mapu i-uzlù nelze zapsat"
 
-#: disk-utils/fsck.minix.c:527
+#: disk-utils/fsck.minix.c:523
 msgid "Unable to write zone map"
 msgstr "mapu zón nelze zapsat"
 
-#: disk-utils/fsck.minix.c:529
+#: disk-utils/fsck.minix.c:525
 msgid "Unable to write inodes"
 msgstr "i-uzly nelze zapsat"
 
-#: disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.minix.c:554
 msgid "seek failed"
 msgstr "chyba pøi posunu ukazovátka"
 
-#: disk-utils/fsck.minix.c:560
+#: disk-utils/fsck.minix.c:556
 msgid "unable to read super block"
 msgstr "superblok nelze èíst"
 
-#: disk-utils/fsck.minix.c:580
+#: disk-utils/fsck.minix.c:576
 msgid "bad magic number in super-block"
 msgstr "superblok obsahuje chybné magické èíslo"
 
-#: disk-utils/fsck.minix.c:582
+#: disk-utils/fsck.minix.c:578
 msgid "Only 1k blocks/zones supported"
 msgstr "podporovány jsou pouze 1kilobajtové bloky/zóny"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:580
 msgid "bad s_imap_blocks field in super-block"
 msgstr "superblok obsahuje chybnou polo¾ku s_imap_blocks"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:582
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "superblok obsahuje chybnou polo¾ku s_zmap_blocks"
 
-#: disk-utils/fsck.minix.c:593
+#: disk-utils/fsck.minix.c:589
 msgid "Unable to allocate buffer for inode map"
 msgstr "buffer pro mapu i-uzlù nelze alokovat"
 
-#: disk-utils/fsck.minix.c:601
+#: disk-utils/fsck.minix.c:597
 msgid "Unable to allocate buffer for inodes"
 msgstr "buffer pro i-uzly nelze alokovat"
 
-#: disk-utils/fsck.minix.c:604
+#: disk-utils/fsck.minix.c:600
 msgid "Unable to allocate buffer for inode count"
 msgstr "buffer pro poèítadlo i-uzlù nelze alokovat"
 
-#: disk-utils/fsck.minix.c:607
+#: disk-utils/fsck.minix.c:603
 msgid "Unable to allocate buffer for zone count"
 msgstr "buffer pro poèítadlo zón nelze alokovat"
 
-#: disk-utils/fsck.minix.c:609
+#: disk-utils/fsck.minix.c:605
 msgid "Unable to read inode map"
 msgstr "mapu i-uzlù nelze èíst"
 
-#: disk-utils/fsck.minix.c:611
+#: disk-utils/fsck.minix.c:607
 msgid "Unable to read zone map"
 msgstr "mapu zón nelze èíst"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:609
 msgid "Unable to read inodes"
 msgstr "i-uzly nelze èíst"
 
-#: disk-utils/fsck.minix.c:615
+#: disk-utils/fsck.minix.c:611
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Varování: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:524
+#: disk-utils/fsck.minix.c:616 disk-utils/mkfs.minix.c:524
 #, c-format
 msgid "%ld inodes\n"
 msgstr "i-uzlù: %ld\n"
 
-#: disk-utils/fsck.minix.c:621 disk-utils/mkfs.minix.c:525
+#: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:525
 #, c-format
 msgid "%ld blocks\n"
 msgstr "blokù: %ld\n"
 
-#: disk-utils/fsck.minix.c:622 disk-utils/mkfs.minix.c:526
+#: disk-utils/fsck.minix.c:618 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
+#: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Velikost zóny=%d\n"
 
-#: disk-utils/fsck.minix.c:624
+#: disk-utils/fsck.minix.c:620
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxvelikost=%ld\n"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:621
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stav systému souborù=%d\n"
 
-#: disk-utils/fsck.minix.c:626
+#: disk-utils/fsck.minix.c:622
 #, c-format
 msgid ""
 "namelen=%d\n"
 "\n"
 msgstr "namelen=%d\n"
 
-#: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
+#: disk-utils/fsck.minix.c:636 disk-utils/fsck.minix.c:687
 #, 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:645 disk-utils/fsck.minix.c:695
+#: disk-utils/fsck.minix.c:641 disk-utils/fsck.minix.c:692
 msgid "Mark in use"
 msgstr "Oznaèen jako pou¾ívaný"
 
-#: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
+#: disk-utils/fsck.minix.c:663 disk-utils/fsck.minix.c:712
 #, c-format
 msgid " has mode %05o\n"
 msgstr " mód je %05o\n"
 
-#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:720
+#: disk-utils/fsck.minix.c:669 disk-utils/fsck.minix.c:717
 msgid "Warning: inode count too big.\n"
 msgstr "Varování: poèet i-uzlù je pøíli¹ veliký.\n"
 
-#: disk-utils/fsck.minix.c:733
+#: disk-utils/fsck.minix.c:730
 msgid "root inode isn't a directory"
 msgstr "root i-uzel není adresáøem"
 
-#: 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:753 disk-utils/fsck.minix.c:783
+#, c-format
+msgid "Block has been used before. Now in file `%s'."
+msgstr "Blok byl pou¾it ji¾ pøedtím. Nyní v souboru `%s'."
 
-#: 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
+#: disk-utils/fsck.minix.c:754 disk-utils/fsck.minix.c:784
+#: disk-utils/fsck.minix.c:1103 disk-utils/fsck.minix.c:1112
+#: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1164
 msgid "Clear"
 msgstr "Smazat"
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
+#: disk-utils/fsck.minix.c:763 disk-utils/fsck.minix.c:793
 #, c-format
-msgid "Block %d in file `"
-msgstr "Blok %d v souboru `"
+msgid "Block %d in file `%s' is marked not in use."
+msgstr "Blok %d v souboru %s' je oznaèen jako nepou¾ívaný."
 
-#: 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:771 disk-utils/fsck.minix.c:805
+#: disk-utils/fsck.minix.c:764 disk-utils/fsck.minix.c:794
 msgid "Correct"
 msgstr "Opravit"
 
-#: 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:939 disk-utils/fsck.minix.c:1002
+#, c-format
+msgid "The directory '%s' contains a bad inode number for file '%.*s'."
+msgstr "Adresáø '%s' obsahuje pro soubor '%.*s' chybné èíslo i-uzlu."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
+#: disk-utils/fsck.minix.c:941 disk-utils/fsck.minix.c:1004
 msgid " Remove"
 msgstr " Odstranit"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1030
+#: disk-utils/fsck.minix.c:955 disk-utils/fsck.minix.c:1018
 msgid ": bad directory: '.' isn't first\n"
 msgstr ": chybný adresáø: '.' není první\n"
 
-#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1038
+#: disk-utils/fsck.minix.c:962 disk-utils/fsck.minix.c:1026
 msgid ": bad directory: '..' isn't second\n"
 msgstr ": chybný adresáø: '..' není druhý\n"
 
-#: disk-utils/fsck.minix.c:1070
+#: disk-utils/fsck.minix.c:1058
 msgid "internal error"
 msgstr "vnitøní chyba"
 
-#: disk-utils/fsck.minix.c:1073
-msgid ": bad directory: size<32"
-msgstr ": chybný adresáø: velikost<32"
-
-#: disk-utils/fsck.minix.c:1091
+#: disk-utils/fsck.minix.c:1061 disk-utils/fsck.minix.c:1079
 msgid ": bad directory: size < 32"
 msgstr ": chybný adresáø: velikost < 32"
 
-#: disk-utils/fsck.minix.c:1104
+#: disk-utils/fsck.minix.c:1092
 msgid "seek failed in bad_zone"
 msgstr "chyba pøi posunu ukazovátka v bad_zone"
 
-#: disk-utils/fsck.minix.c:1114 disk-utils/fsck.minix.c:1166
+#: disk-utils/fsck.minix.c:1102 disk-utils/fsck.minix.c:1154
 #, c-format
 msgid "Inode %d mode not cleared."
 msgstr "Mód I-uzlu %d není smazán."
 
-#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1175
+#: disk-utils/fsck.minix.c:1111 disk-utils/fsck.minix.c:1163
 #, 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:1129 disk-utils/fsck.minix.c:1181
+#: disk-utils/fsck.minix.c:1117 disk-utils/fsck.minix.c:1169
 #, 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:1135 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:1123 disk-utils/fsck.minix.c:1174
 #, 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:1137 disk-utils/fsck.minix.c:1188
+#: disk-utils/fsck.minix.c:1125 disk-utils/fsck.minix.c:1176
 msgid "Set i_nlinks to count"
 msgstr "Nastavit i_nlinks na poèet"
 
-#: disk-utils/fsck.minix.c:1149 disk-utils/fsck.minix.c:1200
+#: disk-utils/fsck.minix.c:1137 disk-utils/fsck.minix.c:1188
 #, 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:1150 disk-utils/fsck.minix.c:1201
+#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1189
 msgid "Unmark"
 msgstr "Odznaèit"
 
-#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1205
+#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1193
 #, 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:1155 disk-utils/fsck.minix.c:1206
+#: disk-utils/fsck.minix.c:1143 disk-utils/fsck.minix.c:1194
 msgid "not "
 msgstr "není "
 
-#: disk-utils/fsck.minix.c:1182
+#: disk-utils/fsck.minix.c:1170
 msgid "Set"
 msgstr "Nastavit"
 
-#: disk-utils/fsck.minix.c:1253 disk-utils/mkfs.minix.c:645
+#: disk-utils/fsck.minix.c:1241 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:1256
+#: disk-utils/fsck.minix.c:1244
 msgid "bad v2 inode size"
 msgstr "chybná velikost v2 i-uzlu"
 
-#: disk-utils/fsck.minix.c:1282
+#: disk-utils/fsck.minix.c:1270
 msgid "need terminal for interactive repairs"
 msgstr "opravy s úèastí u¾ivatele vy¾adují terminál"
 
-#: disk-utils/fsck.minix.c:1286
+#: disk-utils/fsck.minix.c:1274
 #, c-format
 msgid "unable to open '%s'"
 msgstr "'%s' nelze otevøít"
 
-#: disk-utils/fsck.minix.c:1301
+#: disk-utils/fsck.minix.c:1289
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s je 'èisté', ovìøování vynecháno.\n"
 
-#: disk-utils/fsck.minix.c:1305
+#: disk-utils/fsck.minix.c:1293
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Kontrola systému souborù na %s vynucena.\n"
 
-#: disk-utils/fsck.minix.c:1307
+#: disk-utils/fsck.minix.c:1295
 #, 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:1336
+#: disk-utils/fsck.minix.c:1324
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
@@ -1107,12 +470,12 @@ msgstr ""
 "\n"
 "pou¾ívaných i-uzlù: %6ld (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1341
+#: disk-utils/fsck.minix.c:1329
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "pou¾ívaných zón: %6ld (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1343
-#, c-format, ycp-format
+#: disk-utils/fsck.minix.c:1331
+#, c-format
 msgid ""
 "\n"
 "%6d regular files\n"
@@ -1134,7 +497,7 @@ msgstr ""
 "------\n"
 "souborù:              %6d\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1344
 msgid ""
 "----------------------------\n"
 "FILE SYSTEM HAS BEEN CHANGED\n"
@@ -1144,12 +507,162 @@ msgstr ""
 "SYSTÉM SOUBORÙ BYL ZMÌNÌN \n"
 "----------------------------\n"
 
+#: disk-utils/isosize.c:129
+#, c-format
+msgid "%s: failed to open: %s\n"
+msgstr "%s: %s nelze otevøít\n"
+
+#: disk-utils/isosize.c:135
+#, c-format
+msgid "%s: seek error on %s\n"
+msgstr "%s: chyba zápisu na %s\n"
+
+#: disk-utils/isosize.c:141
+#, c-format
+msgid "%s: read error on %s\n"
+msgstr "%s: chyba zápisu na %s\n"
+
+#: disk-utils/isosize.c:150
+#, c-format
+msgid "sector count: %d, sector size: %d\n"
+msgstr "poèet sektorù: %d, velikost sektoru: %d\n"
+
+#: disk-utils/isosize.c:198
+#, c-format
+msgid "%s: option parse error\n"
+msgstr "%s: chyba pøi analýze pøepínaèù\n"
+
+#: disk-utils/isosize.c:206
+#, c-format
+msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
+msgstr "Pou¾ití: %s [-x] [-d <num>] iso9660-obraz\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 ""
+"Pou¾ití: %s [-v] [-N poèet iuzlù] [-V název svazku]\n"
+"       [-F název ss] zaøízení [poèet blokù]\n"
+
+#: disk-utils/mkfs.bfs.c:135
+msgid "volume name too long"
+msgstr "název svazku je pøíli¹ dlouhý"
+
+#: disk-utils/mkfs.bfs.c:142
+msgid "fsname name too long"
+msgstr "název ss je pøíli¹ dlouhý"
+
+#: disk-utils/mkfs.bfs.c:167
+#, c-format
+msgid "cannot stat device %s"
+msgstr "volání stat pro zaøízení %s selhalo"
+
+#: disk-utils/mkfs.bfs.c:171
+#, c-format
+msgid "%s is not a block special device"
+msgstr "%s není blokovým zaøízením"
+
+#: disk-utils/mkfs.bfs.c:176
+#, c-format
+msgid "cannot open %s"
+msgstr "%s nelze otevøít"
+
+#: disk-utils/mkfs.bfs.c:187
+#, c-format
+msgid "cannot get size of %s"
+msgstr "nelze zjistit velikost %s"
+
+#: disk-utils/mkfs.bfs.c:192
+#, c-format
+msgid "blocks argument too large, max is %lu"
+msgstr "zadán pøíli¹ veliký poèet blokù, maximum je %lu"
+
+#: disk-utils/mkfs.bfs.c:207
+msgid "too many inodes - max is 512"
+msgstr "pøíli¹ mnoho iuzlù - maximum je 512"
+
+#: disk-utils/mkfs.bfs.c:216
+#, c-format
+msgid "not enough space, need at least %lu blocks"
+msgstr "nedostatek místa, minimální potøebný poèet blokù: %lu"
+
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:1931
+#, c-format
+msgid "Device: %s\n"
+msgstr "Zaøízení: %s\n"
+
+#: disk-utils/mkfs.bfs.c:229
+#, c-format
+msgid "Volume: <%-6s>\n"
+msgstr "Svazek: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:230
+#, c-format
+msgid "FSname: <%-6s>\n"
+msgstr "NázevSS: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:231
+#, c-format
+msgid "BlockSize: %d\n"
+msgstr "VelikostBloku: %d\n"
+
+#: disk-utils/mkfs.bfs.c:233
+#, c-format
+msgid "Inodes: %d (in 1 block)\n"
+msgstr "Poèet iuzlù: %d (v 1 bloku)\n"
+
+#: disk-utils/mkfs.bfs.c:236
+#, c-format
+msgid "Inodes: %d (in %ld blocks)\n"
+msgstr "Poèet iuzlù: %d (v %ld blocích)\n"
+
+#: disk-utils/mkfs.bfs.c:238
+#, c-format
+msgid "Blocks: %ld\n"
+msgstr "Poèet blokù: %ld\n"
+
+#: disk-utils/mkfs.bfs.c:239
+#, c-format
+msgid "Inode end: %d, Data end: %d\n"
+msgstr "Konec iuzlù: %d, Konec dat: %d\n"
+
+#: disk-utils/mkfs.bfs.c:244
+msgid "error writing superblock"
+msgstr "chyba pøi zápisu superbloku"
+
+#: disk-utils/mkfs.bfs.c:264
+msgid "error writing root inode"
+msgstr "chyba pøi zápisu koøenového iuzlu"
+
+#: disk-utils/mkfs.bfs.c:269
+msgid "error writing inode"
+msgstr "chyba pøi zápisu iuzlu"
+
+#: disk-utils/mkfs.bfs.c:272
+msgid "seek error"
+msgstr "volání seek selhalo"
+
+#: disk-utils/mkfs.bfs.c:278
+msgid "error writing . entry"
+msgstr "chyba pøi zápisu . polo¾ky"
+
+#: disk-utils/mkfs.bfs.c:282
+msgid "error writing .. entry"
+msgstr "chyba pøi zápisu .. polo¾ky"
+
+#: disk-utils/mkfs.bfs.c:286
+#, c-format
+msgid "error closing %s"
+msgstr "Chyba pøi zavírání %s"
+
 #: disk-utils/mkfs.c:76
 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:368 getopt-1.1.0a/getopt.c:89
-#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.1.2/getopt.c:89
+#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:230 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Nedostatek pamìti!\n"
@@ -1162,7 +675,7 @@ msgstr "mkfs verze %s (%s)\n"
 #: 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"
+msgstr "Pou¾ití: %s [ -n ] [-c | -l soubor] [-nXX] [-iXX] /dev/název [bloky]\n"
 
 #: disk-utils/mkfs.minix.c:203
 #, c-format
@@ -1232,7 +745,7 @@ msgstr "chyba pøi posunu ukazovátka v prùbìhu kontroly blokù"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nesprávné hodnoty v do_check: pravdìpodobnì chyby\n"
 
-#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:362
 msgid "seek failed in check_blocks"
 msgstr "chyba pøi posunu ukazovátka v check_blocks"
 
@@ -1277,81 +790,80 @@ msgstr "o %s nelze získat informace"
 msgid "will not try to make filesystem on '%s'"
 msgstr "nebudu se pokou¹et vytvoøit systém souborù na '%s'"
 
-#: disk-utils/mkswap.c:174
+#: disk-utils/mkswap.c:178
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr "Zadadaná velikost stránky (%d) je chybná.\n"
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 "Pou¾ívám zadanou velikost stránky (%d) místo implicitních hodnot (%d/%d).\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:191
 #, 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:312
+#: disk-utils/mkswap.c:316
 #, 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] /dev/název [bloky]\n"
 
-#: disk-utils/mkswap.c:335
+#: disk-utils/mkswap.c:339
 msgid "too many bad pages"
 msgstr "pøíli¹ mnoho chybných stránek"
 
-#: 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
+#: disk-utils/mkswap.c:353 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1930 text-utils/more.c:1941
 msgid "Out of memory"
 msgstr "Nedostatek pamìti"
 
-#: disk-utils/mkswap.c:366
+#: disk-utils/mkswap.c:370
 msgid "one bad page\n"
 msgstr "chybných stránek: 1\n"
 
-#: disk-utils/mkswap.c:368
+#: disk-utils/mkswap.c:372
 #, c-format
 msgid "%d bad pages\n"
 msgstr "chybných stránek: %d\n"
 
-#: disk-utils/mkswap.c:488
+#: disk-utils/mkswap.c:492
 #, 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:506
+#: disk-utils/mkswap.c:510
 #, 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:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: chyba: neznámá verze %d\n"
 
-#: disk-utils/mkswap.c:531
+#: disk-utils/mkswap.c:535
 #, 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:550
+#: disk-utils/mkswap.c:554
 #, 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:562
+#: disk-utils/mkswap.c:566
 #, 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:571 disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:575 disk-utils/mkswap.c:596
 msgid "fatal: first page unreadable"
 msgstr "osudová chyba: první stránka je neèitelná"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:581
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1365,38 +877,38 @@ msgstr ""
 "opravdu\n"
 "chcete vytvoøit odkládací prostor v0, pou¾ijte pøepínaè -f pro vynucení.\n"
 
-#: disk-utils/mkswap.c:601
+#: disk-utils/mkswap.c:605
 msgid "Unable to set up swap-space: unreadable"
 msgstr "Odkládací prostor nelze nastavit: neèitelné"
 
-#: disk-utils/mkswap.c:602
+#: disk-utils/mkswap.c:606
 #, 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:608
+#: disk-utils/mkswap.c:612
 msgid "unable to rewind swap-device"
 msgstr "odkládací prostor nelze pøevinout"
 
-#: disk-utils/mkswap.c:611
+#: disk-utils/mkswap.c:615
 msgid "unable to write signature page"
 msgstr "stránku signatur nelze zapsat"
 
-#: disk-utils/mkswap.c:619
+#: disk-utils/mkswap.c:623
 msgid "fsync failed"
 msgstr "volání fsync selhalo"
 
-#: disk-utils/setfdprm.c:30
+#: disk-utils/setfdprm.c:31
 #, c-format
 msgid "Invalid number: %s\n"
 msgstr "Chybné èíslo: %s\n"
 
-#: disk-utils/setfdprm.c:80
+#: disk-utils/setfdprm.c:81
 #, c-format
 msgid "Syntax error: '%s'\n"
 msgstr "Syntaktická chyba: '%s'\n"
 
-#: disk-utils/setfdprm.c:90
+#: disk-utils/setfdprm.c:91
 #, c-format
 msgid "No such parameter set: '%s'\n"
 msgstr "Chybný argument: '%s'\n"
@@ -1404,7 +916,7 @@ msgstr "Chybný argument: '%s'\n"
 #: disk-utils/setfdprm.c:100
 #, c-format
 msgid "usage: %s [ -p ] dev name\n"
-msgstr "Pou¾ití: %s [ -p ] jméno zaøízení\n"
+msgstr "Pou¾ití: %s [ -p ] název zaøízení\n"
 
 #: disk-utils/setfdprm.c:101
 #, c-format
@@ -1424,46 +936,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:393 fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1900
 msgid "Unusable"
 msgstr "Nepou¾itelné"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1902
 msgid "Free Space"
 msgstr "Volný prostor"
 
-#: fdisk/cfdisk.c:398
+#: fdisk/cfdisk.c:399
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:403
+#: fdisk/cfdisk.c:404
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:405
+#: fdisk/cfdisk.c:406
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:410
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:420
+#: fdisk/cfdisk.c:421
 msgid "Disk has been changed.\n"
 msgstr "Na disku byly provedeny zmìny.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:422
 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:424
+#: fdisk/cfdisk.c:425
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1475,72 +987,72 @@ 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:519
+#: fdisk/cfdisk.c:520
 msgid "FATAL ERROR"
 msgstr "OSUDOVÁ CHYBA"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:521
 msgid "Press any key to exit cfdisk"
 msgstr "Stisknìte jakoukoliv klávesu pro ukonèení programu cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:568 fdisk/cfdisk.c:576
 msgid "Cannot seek on disk drive"
 msgstr "Nelze posunout ukazovátko na disku"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:570
 msgid "Cannot read disk drive"
 msgstr "Z disku nelze èíst"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:578
 msgid "Cannot write disk drive"
 msgstr "Nelze zapisovat na disk"
 
-#: fdisk/cfdisk.c:814
+#: fdisk/cfdisk.c:818
 msgid "Too many partitions"
 msgstr "pøíli¹ mnoho diskových oddílù"
 
-#: fdisk/cfdisk.c:819
+#: fdisk/cfdisk.c:823
 msgid "Partition begins before sector 0"
 msgstr "Diskový oddíl zaèíná pøed sektorem 0"
 
-#: fdisk/cfdisk.c:824
+#: fdisk/cfdisk.c:828
 msgid "Partition ends before sector 0"
 msgstr "Diskový oddíl konèí pøed sektorem 0"
 
-#: fdisk/cfdisk.c:829
+#: fdisk/cfdisk.c:833
 msgid "Partition begins after end-of-disk"
 msgstr "Diskový oddíl zaèíná za koncem disku"
 
-#: fdisk/cfdisk.c:834
+#: fdisk/cfdisk.c:838
 msgid "Partition ends after end-of-disk"
 msgstr "Diskový oddíl konèí za koncem disku"
 
-#: fdisk/cfdisk.c:858
+#: fdisk/cfdisk.c:862
 msgid "logical partitions not in disk order"
 msgstr "logické diskový oddíl jsou chybnì seøazeny"
 
-#: fdisk/cfdisk.c:861
+#: fdisk/cfdisk.c:865
 msgid "logical partitions overlap"
 msgstr "logické diskové oddíly se vzájemnì pøekrývají"
 
-#: fdisk/cfdisk.c:863
+#: fdisk/cfdisk.c:867
 msgid "enlarged logical partitions overlap"
 msgstr "zvìt¹ené logické diskové oddíly se vzájemnì pøekrývají"
 
-#: fdisk/cfdisk.c:893
+#: fdisk/cfdisk.c:897
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
 "!!!! Vnitøní chyba pøi vytváøení logického disku bez roz¹íøených diskových "
 "oddílù !!!!"
 
-#: fdisk/cfdisk.c:904 fdisk/cfdisk.c:916
+#: fdisk/cfdisk.c:908 fdisk/cfdisk.c:920
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
 "Zde nelze vytvoøit logický disk -- vznikly by dva roz¹íøené diskové oddíly"
 
-#: fdisk/cfdisk.c:1066
+#: fdisk/cfdisk.c:1068
 msgid "Menu item too long. Menu may look odd."
 msgstr "Polo¾ka nabídky je pøíli¹ dlouhá. Nabídka mù¾e vypadat podivnì."
 
@@ -1556,8 +1068,8 @@ msgstr "Chybná klávesa"
 msgid "Press a key to continue"
 msgstr "Stisknìte klávesu pro pokraèování"
 
-#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2400
-#: fdisk/cfdisk.c:2402
+#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2401
+#: fdisk/cfdisk.c:2403
 msgid "Primary"
 msgstr "Primární"
 
@@ -1565,8 +1077,8 @@ msgstr "Primární"
 msgid "Create a new primary partition"
 msgstr "Vytvoøit nový primární diskový oddíl"
 
-#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2399
-#: fdisk/cfdisk.c:2402
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2400
+#: fdisk/cfdisk.c:2403
 msgid "Logical"
 msgstr "Logický"
 
@@ -1574,7 +1086,7 @@ msgstr "Logický"
 msgid "Create a new logical partition"
 msgstr "Vytvoøit nový logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2075
 msgid "Cancel"
 msgstr "Zru¹it"
 
@@ -1622,7 +1134,7 @@ msgstr "Zadal jste vìt¹í poèet cylindrù, ne¾ se vejde na disk."
 msgid "Cannot open disk drive"
 msgstr "Disk nelze otevøít"
 
-#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1686
+#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1684
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disk byl otevøen pouze pro ètení - nemáte práva pro zápis"
 
@@ -1630,140 +1142,143 @@ msgstr "Disk byl otevøen pouze pro ètení - nemáte práva pro zápis"
 msgid "Cannot get disk size"
 msgstr "Velikost disku nelze zjistit"
 
-#. avoid snprintf - it does not exist on ancient systems
-#: fdisk/cfdisk.c:1552
+#: fdisk/cfdisk.c:1551
 msgid "Bad primary partition"
 msgstr "Chybný primární diskový oddíl"
 
-#. avoid snprintf
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Bad logical partition"
 msgstr "Chybný logický diskový oddíl"
 
-#: fdisk/cfdisk.c:1698
+#: fdisk/cfdisk.c:1696
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Varování!! Toto mù¾e vést ke znièení dat na Va¹em disku!"
 
-#: fdisk/cfdisk.c:1702
+#: fdisk/cfdisk.c:1700
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
-"Jste si jist, ¾e chcete ulo¾it tabulku rozdìlení disku na disk? (yes èi no):"
+"Jste si jist, ¾e chcete ulo¾it tabulku rozdìlení disku na disk? (ano èi ne):"
 
-#: fdisk/cfdisk.c:1708
+#: fdisk/cfdisk.c:1706
 msgid "no"
 msgstr "ne"
 
-#: fdisk/cfdisk.c:1709
+#: fdisk/cfdisk.c:1707
 msgid "Did not write partition table to disk"
-msgstr "Neukládat tabulku rozdìlení disku na disk"
+msgstr "Tabulka rozdìlení disku nebyla ulo¾ena"
 
-#: fdisk/cfdisk.c:1711
+#: fdisk/cfdisk.c:1709
 msgid "yes"
 msgstr "ano"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Please enter `yes' or `no'"
-msgstr "Zadejte `yes' èi `no'"
+msgstr "Zadejte `ano' èi `ne'"
 
-#: fdisk/cfdisk.c:1718
+#: fdisk/cfdisk.c:1716
 msgid "Writing partition table to disk..."
 msgstr "Ukládám tabulku rozdìlení disku na disk"
 
-#: fdisk/cfdisk.c:1743 fdisk/cfdisk.c:1747
+#: fdisk/cfdisk.c:1741 fdisk/cfdisk.c:1745
 msgid "Wrote partition table to disk"
 msgstr "Tabulka rozdìlení disku byla ulo¾ena na disk"
 
-#: fdisk/cfdisk.c:1745
+#: fdisk/cfdisk.c:1743
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
 "Tabulka byla ulo¾ena, ale nepodaøilo se ji znovu naèíst. Restartujte systém."
 
+#: fdisk/cfdisk.c:1753
+msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"®ádný primární diskový oddíl není startovací. DOS MBR takto nenastartuje."
+
 #: fdisk/cfdisk.c:1755
 msgid ""
-"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
 "Více ne¾ 1 primární diskový oddíl je startovací. DOS MBR takto nenastartuje."
 
-#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1931 fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
 msgid "Enter filename or press RETURN to display on screen: "
-msgstr "Zadejte jméno souboru èi stisknìte RETURN pro zobrazení: "
+msgstr "Zadejte název souboru èi stisknìte RETURN pro zobrazení: "
 
-#: fdisk/cfdisk.c:1821 fdisk/cfdisk.c:1939 fdisk/cfdisk.c:2023
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Soubor '%s' nelze otevøít"
 
-#: fdisk/cfdisk.c:1832
+#: fdisk/cfdisk.c:1833
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Disk: %s\n"
 
-#: fdisk/cfdisk.c:1834
+#: fdisk/cfdisk.c:1835
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1841
+#: fdisk/cfdisk.c:1842
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1862
 msgid "   None   "
 msgstr "  ®ádný  "
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1864
 msgid "   Pri/Log"
 msgstr "  Pri/Log"
 
-#: fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1866
 msgid "   Primary"
 msgstr "  Primární"
 
-#: fdisk/cfdisk.c:1867
+#: fdisk/cfdisk.c:1868
 msgid "   Logical"
 msgstr "  Logický"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1213 fdisk/fdisk.c:1437
-#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1250 fdisk/fdisk.c:1474
+#: fdisk/fdisksgilabel.c:239 fdisk/fdisksunlabel.c:691 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: fdisk/cfdisk.c:1911
+#: fdisk/cfdisk.c:1912
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Startovací (%02X)"
 
-#: fdisk/cfdisk.c:1913 fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2409
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Neznámý (%02X)"
 
-#: fdisk/cfdisk.c:1915
+#: fdisk/cfdisk.c:1916
 #, c-format
 msgid "None (%02X)"
 msgstr "®ádný (%02X)"
 
-#: fdisk/cfdisk.c:1950 fdisk/cfdisk.c:2034
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabulka rozdìlení disku pro %s\n"
 
-#: fdisk/cfdisk.c:1952
+#: fdisk/cfdisk.c:1953
 msgid "            First    Last\n"
 msgstr "            První    Poslední\n"
 
-#: fdisk/cfdisk.c:1953
+#: fdisk/cfdisk.c:1954
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Typ      Sektor   Sektor   Posun   Délka    ID systému souborù     "
 "Pøíznaky\n"
 
-#: fdisk/cfdisk.c:1954
+#: fdisk/cfdisk.c:1955
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1771,455 +1286,455 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#: fdisk/cfdisk.c:2036
+#: fdisk/cfdisk.c:2037
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "        ---Poèátek---       ----Konec----   Poèáteèní\n"
 
-#: fdisk/cfdisk.c:2037
+#: fdisk/cfdisk.c:2038
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
 msgstr " # Pøíz Hlav Sekt Cyl    ID  Hlav Sekt Cyl  sektor    Sektorù\n"
 
-#: fdisk/cfdisk.c:2038
+#: fdisk/cfdisk.c:2039
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2071
+#: fdisk/cfdisk.c:2072
 msgid "Raw"
 msgstr "Pøímý"
 
-#: fdisk/cfdisk.c:2071
+#: fdisk/cfdisk.c:2072
 msgid "Print the table using raw data format"
 msgstr "Vytisknout tabulku v pøímém datovém formátu"
 
-#: fdisk/cfdisk.c:2072 fdisk/cfdisk.c:2174
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
 msgid "Sectors"
 msgstr "Sektory"
 
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2073
 msgid "Print the table ordered by sectors"
 msgstr "Vytisknout tabulku seøazenou dle sektorù"
 
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2074
 msgid "Table"
 msgstr "Tabulka"
 
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2074
 msgid "Just print the partition table"
 msgstr "Vytisknout pouze tabulku rozdìlení disku"
 
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2075
 msgid "Don't print the table"
 msgstr "Netisknout tabulku"
 
-#: fdisk/cfdisk.c:2102
+#: fdisk/cfdisk.c:2103
 msgid "Help Screen for cfdisk"
 msgstr "Nápovìda pro cfdisk"
 
-#: fdisk/cfdisk.c:2104
+#: fdisk/cfdisk.c:2105
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Toto je cfdisk, program pro vytváøení diskových oddílù zalo¾ený"
 
-#: fdisk/cfdisk.c:2105
+#: fdisk/cfdisk.c:2106
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "na knihovnì curses. Umo¾òuje vytváøení, mazání a modifikaci"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2107
 msgid "disk drive."
 msgstr "diskových oddílù na Va¹em pevném disku."
 
-#: fdisk/cfdisk.c:2108
+#: fdisk/cfdisk.c:2109
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2110
+#: fdisk/cfdisk.c:2111
 msgid "Command      Meaning"
 msgstr "Pøíkaz      Význam"
 
-#: fdisk/cfdisk.c:2111
+#: fdisk/cfdisk.c:2112
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2112
+#: fdisk/cfdisk.c:2113
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Pøepne aktuálnímu oddílu pøíznak startovatelnosti"
 
-#: fdisk/cfdisk.c:2113
+#: fdisk/cfdisk.c:2114
 msgid "  d          Delete the current partition"
 msgstr "  d          Sma¾e aktuální oddíl"
 
-#: fdisk/cfdisk.c:2114
+#: fdisk/cfdisk.c:2115
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Zmìní geometrii"
 
-#: fdisk/cfdisk.c:2115
+#: fdisk/cfdisk.c:2116
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             VAROVÁNÍ: Tato volba by mìla být pou¾ívána pouze lidmi,"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2117
 msgid "             know what they are doing."
 msgstr "             kteøí vìdí, co èiní."
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2118
 msgid "  h          Print this screen"
 msgstr "  h          Vypí¹e tuto nápovìdu"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2119
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximálnì zvìt¹í aktuální diskový oddíl "
 
-#: fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:2120
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Poznámka: Toto mù¾e uèinit oddíl nekompatibilní s"
 
-#: fdisk/cfdisk.c:2120
+#: fdisk/cfdisk.c:2121
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2121
+#: fdisk/cfdisk.c:2122
 msgid "  n          Create new partition from free space"
 msgstr "  n          Vytvoøit na volném místì nový oddíl"
 
-#: fdisk/cfdisk.c:2122
+#: fdisk/cfdisk.c:2123
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Vypí¹e tabulku rozdìlení disku na obrazovku èi do souboru"
 
-#: fdisk/cfdisk.c:2123
+#: fdisk/cfdisk.c:2124
 msgid "             There are several different formats for the partition"
 msgstr "             Pøi výpisu tabulky rozdìlení disku si mù¾ete zvolit"
 
-#: fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:2125
 msgid "             that you can choose from:"
 msgstr "             z nìkolika formátù:"
 
-#: fdisk/cfdisk.c:2125
+#: fdisk/cfdisk.c:2126
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Pøímý (pøesnì to, co by bylo zapsáno na disk)"
 
-#: fdisk/cfdisk.c:2126
+#: fdisk/cfdisk.c:2127
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabulka seøazená dle sektorù"
 
-#: fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:2128
 msgid "                t - Table in raw format"
 msgstr "                t - Tabulka v pøímém formátu"
 
-#: fdisk/cfdisk.c:2128
+#: fdisk/cfdisk.c:2129
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Ukonèí program bez ulo¾ení tabulky rozdìlení disku"
 
-#: fdisk/cfdisk.c:2129
+#: fdisk/cfdisk.c:2130
 msgid "  t          Change the filesystem type"
 msgstr "  t          Zmìní typ systému souborù"
 
-#: fdisk/cfdisk.c:2130
+#: fdisk/cfdisk.c:2131
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Zmìní jednotky pro zobrazení velikosti oddílu"
 
-#: fdisk/cfdisk.c:2131
+#: fdisk/cfdisk.c:2132
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Cykluje mezi MB, sektory a cylindry"
 
-#: fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:2133
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Ulo¾í tabulku rozdìlení disku (pouze velké W)"
 
-#: fdisk/cfdisk.c:2133
+#: fdisk/cfdisk.c:2134
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Jeliko¾ to mù¾e znièit na disku, musíte to potvrdit"
 
-#: fdisk/cfdisk.c:2134
+#: fdisk/cfdisk.c:2135
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             nebo odmítnout napsáním `yes' nebo"
 
-#: fdisk/cfdisk.c:2135
+#: fdisk/cfdisk.c:2136
 msgid "             `no'"
 msgstr "             `no'"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2137
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Nahoru       Pøesune kurzor na pøedcházející oddíl."
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2138
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Dolù         Pøesune kurzor na dal¹í oddíl."
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2139
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Pøekreslí obrazovku"
 
-#: fdisk/cfdisk.c:2139
+#: fdisk/cfdisk.c:2140
 msgid "  ?          Print this screen"
 msgstr "  ?          Vypí¹e tuto nápovìdu"
 
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2142
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Poznámka: V¹echny pøíkazy mohou být zadány malými i velkými písmeny"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2143
 msgid "case letters (except for Writes)."
 msgstr "(s vyjímkou zápisu - W)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
-#: fdisk/fdisksunlabel.c:320
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2495 fdisk/fdisksunlabel.c:321
+#: fdisk/fdisksunlabel.c:323
 msgid "Cylinders"
 msgstr "Cylindry"
 
-#: fdisk/cfdisk.c:2172
+#: fdisk/cfdisk.c:2173
 msgid "Change cylinder geometry"
 msgstr "Zmìní geometrii cylindrù"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:318
 msgid "Heads"
 msgstr "Hlavy"
 
-#: fdisk/cfdisk.c:2173
+#: fdisk/cfdisk.c:2174
 msgid "Change head geometry"
 msgstr "Zmìní geometrii hlav"
 
-#: fdisk/cfdisk.c:2174
+#: fdisk/cfdisk.c:2175
 msgid "Change sector geometry"
 msgstr "Zmìní geometrii sektorù"
 
-#: fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2176
 msgid "Done"
 msgstr "Hotovo"
 
-#: fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2176
 msgid "Done with changing geometry"
 msgstr "Geometrie zmìnìna"
 
-#: fdisk/cfdisk.c:2188
+#: fdisk/cfdisk.c:2189
 msgid "Enter the number of cylinders: "
 msgstr "Zadejte poèet cylindrù: "
 
-#: fdisk/cfdisk.c:2200 fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2763
 msgid "Illegal cylinders value"
 msgstr "Chybný poèet cylindrù"
 
-#: fdisk/cfdisk.c:2206
+#: fdisk/cfdisk.c:2207
 msgid "Enter the number of heads: "
 msgstr "Zadejte poèet hlav: "
 
-#: fdisk/cfdisk.c:2213 fdisk/cfdisk.c:2772
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2773
 msgid "Illegal heads value"
 msgstr "Chybný poèet hlav"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2220
 msgid "Enter the number of sectors per track: "
 msgstr "Zadejte poèet sektorù na stopu: "
 
-#: fdisk/cfdisk.c:2226 fdisk/cfdisk.c:2779
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2780
 msgid "Illegal sectors value"
 msgstr "Chybný poèet sektorù"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2330
 msgid "Enter filesystem type: "
 msgstr "Zadejte typ systému souborù: "
 
-#: fdisk/cfdisk.c:2347
+#: fdisk/cfdisk.c:2348
 msgid "Cannot change FS Type to empty"
 msgstr "Nelze nastavit typ SS na prázdný"
 
-#: fdisk/cfdisk.c:2349
+#: fdisk/cfdisk.c:2350
 msgid "Cannot change FS Type to extended"
 msgstr "Nelze nastavit typ SS na roz¹íøený"
 
-#: fdisk/cfdisk.c:2377 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2378 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Startovací"
 
-#: fdisk/cfdisk.c:2379
+#: fdisk/cfdisk.c:2380
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Nez(%02X)"
 
-#: fdisk/cfdisk.c:2382 fdisk/cfdisk.c:2385
+#: fdisk/cfdisk.c:2383 fdisk/cfdisk.c:2386
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2390 fdisk/cfdisk.c:2393
+#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2394
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2401
+#: fdisk/cfdisk.c:2402
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2477
+#: fdisk/cfdisk.c:2478
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disk: %s"
 
-#: fdisk/cfdisk.c:2480
+#: fdisk/cfdisk.c:2481
 #, c-format
 msgid "Size: %lld bytes"
-msgstr "Velikostv bajtech: %lld"
+msgstr "Velikost v bajtech: %lld"
 
-#: fdisk/cfdisk.c:2482
+#: fdisk/cfdisk.c:2483
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Hlav: %d   Sektorù na stopu: %d   Cylindrù: %d"
 
-#: fdisk/cfdisk.c:2486
+#: fdisk/cfdisk.c:2487
 msgid "Name"
-msgstr "Jméno"
+msgstr "Název"
 
-#: fdisk/cfdisk.c:2487
+#: fdisk/cfdisk.c:2488
 msgid "Flags"
 msgstr "Pøíznaky"
 
-#: fdisk/cfdisk.c:2488
+#: fdisk/cfdisk.c:2489
 msgid "Part Type"
 msgstr "Typ oddílu"
 
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2490
 msgid "FS Type"
 msgstr "Typ SS"
 
-#: fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2491
 msgid "[Label]"
-msgstr "[Jméno]"
+msgstr "[Popis]"
 
-#: fdisk/cfdisk.c:2492
+#: fdisk/cfdisk.c:2493
 msgid "  Sectors"
 msgstr " Sektory"
 
-#: fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2497
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2499
 msgid "Size (GB)"
 msgstr "Velikost (GB)"
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2554
 msgid "Bootable"
 msgstr "Start"
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2554
 msgid "Toggle bootable flag of the current partition"
 msgstr "Pøepne pøíznak startovatelnosti aktuálnímu diskovému oddílu"
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2555
 msgid "Delete"
 msgstr "Smazat"
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2555
 msgid "Delete the current partition"
 msgstr "Sma¾e aktuální diskový oddíl"
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2556
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2556
 msgid "Change disk geometry (experts only)"
 msgstr "Zmìní geometrii disku (pouze pro odborníky)"
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2557
 msgid "Help"
 msgstr "Nápovìda"
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2557
 msgid "Print help screen"
 msgstr "Vypí¹e nápovìdu"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2558
 msgid "Maximize"
 msgstr "Zvìt¹ení"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2558
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr ""
 "Zvìt¹í velikost aktuálního diskového oddílu na maximum (pouze pro odborníky)"
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2559
 msgid "New"
 msgstr "Nový"
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2559
 msgid "Create new partition from free space"
 msgstr "Vytvoøí nový diskový oddíl ve volném prostoru"
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2560
 msgid "Print"
 msgstr "Tisk"
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2560
 msgid "Print partition table to the screen or to a file"
 msgstr "Vypí¹e tabulku rozdìlení disku (na obrazovku èi do souboru)"
 
-#: fdisk/cfdisk.c:2560
+#: fdisk/cfdisk.c:2561
 msgid "Quit"
 msgstr "Konec"
 
-#: fdisk/cfdisk.c:2560
+#: fdisk/cfdisk.c:2561
 msgid "Quit program without writing partition table"
 msgstr "Ukonèí program bez ulo¾ení tabulky rozdìlení disku"
 
-#: fdisk/cfdisk.c:2561
+#: fdisk/cfdisk.c:2562
 msgid "Type"
 msgstr "Druh"
 
-#: fdisk/cfdisk.c:2561
+#: fdisk/cfdisk.c:2562
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Zmìní typ systému souborù (DOS, Linux, OS/2 atd.)"
 
-#: fdisk/cfdisk.c:2562
+#: fdisk/cfdisk.c:2563
 msgid "Units"
 msgstr "Jednotky"
 
-#: fdisk/cfdisk.c:2562
+#: fdisk/cfdisk.c:2563
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Zmìní jednotky, ve kterých je udávána velikost diskového oddílu"
 
-#: fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2564
 msgid "Write"
 msgstr "Ulo¾it"
 
-#: fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2564
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Ulo¾í tabulku rozdìlení disku na disk (mù¾e znièit data)"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2610
 msgid "Cannot make this partition bootable"
 msgstr "Tento oddíl nelze nastavit jako startovací."
 
-#: fdisk/cfdisk.c:2619
+#: fdisk/cfdisk.c:2620
 msgid "Cannot delete an empty partition"
 msgstr "Prázdný diskový oddíl nelze smazat."
 
-#: fdisk/cfdisk.c:2639 fdisk/cfdisk.c:2641
+#: fdisk/cfdisk.c:2640 fdisk/cfdisk.c:2642
 msgid "Cannot maximize this partition"
 msgstr "Tento diskový oddíl nelze zvìt¹it."
 
-#: fdisk/cfdisk.c:2649
+#: fdisk/cfdisk.c:2650
 msgid "This partition is unusable"
 msgstr "Tento diskový oddíl je nepou¾itelný."
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2652
 msgid "This partition is already in use"
 msgstr "Tento diskový oddíl je ji¾ pou¾íván."
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2669
 msgid "Cannot change the type of an empty partition"
 msgstr "Typ prázdného diskového oddílu nelze zmìnit."
 
-#: fdisk/cfdisk.c:2695 fdisk/cfdisk.c:2701
+#: fdisk/cfdisk.c:2696 fdisk/cfdisk.c:2702
 msgid "No more partitions"
 msgstr "®ádné dal¹í diskové oddíly"
 
-#: fdisk/cfdisk.c:2708
+#: fdisk/cfdisk.c:2709
 msgid "Illegal command"
 msgstr "Chybný pøíkaz"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2719
 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
+#: fdisk/cfdisk.c:2726
 #, c-format
 msgid ""
 "\n"
@@ -2255,7 +1770,7 @@ msgstr ""
 "                jádro.\n"
 "\n"
 
-#: fdisk/fdisk.c:204
+#: 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"
@@ -2275,7 +1790,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:216
+#: fdisk/fdisk.c:217
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2291,222 +1806,222 @@ msgstr ""
 "  èi: fdisk /dev/rd/c0d0  èi: fdisk /dev/ida/c0d0  (pro RAID zaøízení)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:224
+#: fdisk/fdisk.c:226
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "%s nelze otevøít\n"
 
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "%s nelze èíst\n"
 
-#: fdisk/fdisk.c:230
+#: fdisk/fdisk.c:234
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Ukazovátko nelze posunout na %s.\n"
 
-#: fdisk/fdisk.c:233
+#: fdisk/fdisk.c:238
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "%s nelze ulo¾it\n"
 
-#: fdisk/fdisk.c:236
+#: fdisk/fdisk.c:242
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/fdisk.c:240
+#: fdisk/fdisk.c:246
 msgid "Unable to allocate any more memory\n"
 msgstr "Nelze alokovat více pamìti\n"
 
-#: fdisk/fdisk.c:242
+#: fdisk/fdisk.c:249
 msgid "Fatal error\n"
 msgstr "Fatální chyba\n"
 
-#: 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
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:355 fdisk/fdisk.c:362
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
+#: fdisk/fdiskbsdlabel.c:125
 msgid "Command action"
 msgstr "Pøíkazy"
 
-#: fdisk/fdisk.c:312
+#: fdisk/fdisk.c:319
 msgid "   a   toggle a read only flag"
 msgstr "   a   pøepne pøíznak \"pouze pro ètení\""
 
 #. sun
-#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:364
 msgid "   b   edit bsd disklabel"
 msgstr "   b   úprava bsd popisu disku"
 
-#: fdisk/fdisk.c:314
+#: fdisk/fdisk.c:321
 msgid "   c   toggle the mountable flag"
 msgstr "   c   pøepne pøíznak \"pøipojitelný\""
 
 #. sun
-#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:366
 msgid "   d   delete a partition"
 msgstr "   d   sma¾e diskový oddíl"
 
-#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   l   list known partition types"
 msgstr "   l   vypí¹e známé typy diskových oddílù"
 
 #. sun
-#: 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
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:356 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
+#: fdisk/fdiskbsdlabel.c:130
 msgid "   m   print this menu"
 msgstr "   m   vypí¹e tuto nabídku"
 
-#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369
 msgid "   n   add a new partition"
 msgstr "   n   vytvoøí nový diskový oddíl"
 
-#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:357 fdisk/fdisk.c:370
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   vytvoøí prázdný DOSOVÝ diskový oddíl"
 
-#: 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
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371 fdisk/fdisk.c:394
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 msgid "   p   print the partition table"
 msgstr "   p   vypí¹e tabulku rozdìlení disku"
 
-#: 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
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:358 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdiskbsdlabel.c:133
 msgid "   q   quit without saving changes"
 msgstr "   q   ukonèí program bez ulo¾ení zmìn"
 
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:359 fdisk/fdisk.c:373
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   vytvoøí prázdný Sun popis disku"
 
 #. sun
-#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
 msgid "   t   change a partition's system id"
 msgstr "   t   zmìní id diskového oddílu"
 
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375
 msgid "   u   change display/entry units"
 msgstr "   u   zmìní jednotky v nich¾ jsou vypisovány informace"
 
-#: 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
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:398
+#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
 msgid "   v   verify the partition table"
 msgstr "   v   ovìøí tabulku rozdìlení disku"
 
-#: 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
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:377 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
 msgid "   w   write table to disk and exit"
 msgstr "   w   ulo¾í tabulku rozdìlení disku a ukonèí program"
 
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   roz¹iøující funkce (pouze pro odborníky)"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:338
 msgid "   a   select bootable partition"
 msgstr "   a   nastaví startovací diskový oddíl"
 
 #. sgi flavour
-#: fdisk/fdisk.c:332
+#: fdisk/fdisk.c:339
 msgid "   b   edit bootfile entry"
 msgstr "   b   úprava polo¾ky startovacího souboru"
 
 #. sgi
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:340
 msgid "   c   select sgi swap partition"
 msgstr "   c   nastaví sgi odkládací diskový oddíl"
 
-#: fdisk/fdisk.c:356
+#: fdisk/fdisk.c:363
 msgid "   a   toggle a bootable flag"
 msgstr "   a   pøepne pøíznak \"startovací\""
 
-#: fdisk/fdisk.c:358
+#: fdisk/fdisk.c:365
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   pøepne pøíznak \"DOS kompatibilní\""
 
-#: fdisk/fdisk.c:379
+#: fdisk/fdisk.c:386
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   zmìní mno¾ství alternativních cylindrù"
 
 #. sun
-#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
+#: fdisk/fdisk.c:387 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   c   change number of cylinders"
 msgstr "   c   zmìní mno¾ství cylindrù"
 
-#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:438
 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:382
+#: fdisk/fdisk.c:389
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   zmìní mno¾ství extra sektorù na stopu"
 
 #. sun
-#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   h   change number of heads"
 msgstr "   h   zmìní mno¾ství hlav"
 
-#: fdisk/fdisk.c:384
+#: fdisk/fdisk.c:391
 msgid "   i   change interleave factor"
 msgstr "   i   zmìní prokládací faktor"
 
 #. sun
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:392
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   zmìní rychlost otáèení"
 
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
-#: fdisk/fdiskbsdlabel.c:133
+#: fdisk/fdisk.c:396 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdiskbsdlabel.c:134
 msgid "   r   return to main menu"
 msgstr "   r   návrat do hlavní nabídky"
 
-#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   s   change number of sectors/track"
 msgstr "   s   zmìní poèet sektorù/stopu"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:400
 msgid "   y   change number of physical cylinders"
 msgstr "   y   zmìní poèet fyzických cylindrù"
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   posune poèátek dat v diskovém oddílu"
 
-#: fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
 msgid "   e   list extended partitions"
 msgstr "   e   vypí¹e roz¹íøené diskové oddíly"
 
 #. !sun
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   g   create an IRIX partition table"
 msgstr "   g   vytvoøí IRIX tabulku rozdìlení disku"
 
 #. !sun
-#: fdisk/fdisk.c:433
+#: fdisk/fdisk.c:440
 msgid "   f   fix partition order"
 msgstr "   f   opraví øazení diskových oddílù"
 
-#: fdisk/fdisk.c:532
+#: fdisk/fdisk.c:539
 msgid "You must set"
 msgstr "Musíte nastavit"
 
-#: fdisk/fdisk.c:546
+#: fdisk/fdisk.c:553
 msgid "heads"
 msgstr "hlavy"
 
-#: fdisk/fdisk.c:548 fdisk/fdisk.c:1046 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:555 fdisk/fdisk.c:1078 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sektory"
 
-#: fdisk/fdisk.c:550 fdisk/fdisk.c:1046 fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdisk.c:557 fdisk/fdisk.c:1078 fdisk/fdiskbsdlabel.c:462
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cylindry"
 
-#: fdisk/fdisk.c:554
+#: fdisk/fdisk.c:561
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2515,30 +2030,49 @@ msgstr ""
 "%s%s.\n"
 "Mù¾ete tak uèinit z nabídky roz¹iøujících funkcí.\n"
 
-#: fdisk/fdisk.c:555
+#: fdisk/fdisk.c:562
 msgid " and "
 msgstr " a "
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:579
+#, c-format
+msgid ""
+"\n"
+"The number of cylinders for this disk is set to %d.\n"
+"There is nothing wrong with that, but this is larger than 1024,\n"
+"and could in certain setups cause problems with:\n"
+"1) software that runs at boot time (e.g., old versions of LILO)\n"
+"2) booting and partitioning software from other OSs\n"
+"   (e.g., DOS FDISK, OS/2 FDISK)\n"
+msgstr ""
+"\n"
+"Poèet cylindrù tohoto disku je nastaven na %d.\n"
+"Na tom není nic ¹patného, ale jeliko¾ je to více ne¾ 1024,\n"
+"mù¾e za urèitých okolností dojít k problémùm s:\n"
+"1) s programy sou¹tìnými pøi startu (napø. staré verze LILA)\n"
+"2) s programy pro správu diskových oddílù z jiných OS\n"
+"   (napø. DOS FDISK, OS/2 FDISK)\n"
+
+#: fdisk/fdisk.c:602
 msgid "Bad offset in primary extended partition\n"
 msgstr "Chybný posun v primárním diskovém oddílu\n"
 
-#: fdisk/fdisk.c:609
+#: fdisk/fdisk.c:616
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Varování: ma¾u diskový oddíl za %d\n"
 
-#: fdisk/fdisk.c:625
+#: fdisk/fdisk.c:633
 #, 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:633
+#: fdisk/fdisk.c:641
 #, 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:677
+#: fdisk/fdisk.c:686
 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"
@@ -2551,16 +2085,16 @@ msgstr ""
 "data\n"
 "pochopitelnì dostupná.\n"
 
-#: fdisk/fdisk.c:701
+#: fdisk/fdisk.c:729
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Pozor: velikost sektoru je %d (nikoliv %d)\n"
 
-#: fdisk/fdisk.c:783
+#: fdisk/fdisk.c:812
 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
+#: fdisk/fdisk.c:840
 msgid ""
 "Device contains neither a valid DOS partition table, nor Sun, SGI or OSF "
 "disklabel\n"
@@ -2569,16 +2103,16 @@ msgstr ""
 "popis\n"
 "disku\n"
 
-#: fdisk/fdisk.c:827
+#: fdisk/fdisk.c:856
 msgid "Internal error\n"
 msgstr "Vnitøní chyba\n"
 
-#: fdisk/fdisk.c:849
+#: fdisk/fdisk.c:878
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Nadbyteèný roz¹íøený diskový oddíl %d ignorován.\n"
 
-#: fdisk/fdisk.c:861
+#: fdisk/fdisk.c:890
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
@@ -2587,7 +2121,7 @@ msgstr ""
 "Varování: chybný pøíznak 0x%04x tabulky rozdìlení disku %d bude opraven "
 "zápisem(w)\n"
 
-#: fdisk/fdisk.c:883
+#: fdisk/fdisk.c:912
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
@@ -2595,65 +2129,65 @@ msgstr ""
 "\n"
 "tøikrát jsem nalezl EOF - konèím..\n"
 
-#: fdisk/fdisk.c:921
+#: fdisk/fdisk.c:951
 msgid "Hex code (type L to list codes): "
 msgstr "©estnáctkovì (L vypí¹e kódy):"
 
-#: fdisk/fdisk.c:960
+#: fdisk/fdisk.c:990
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, implicitnì %d): "
 
-#: fdisk/fdisk.c:1014
+#: fdisk/fdisk.c:1046
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Pou¾ívám implicitní hodnotu %d\n"
 
-#: fdisk/fdisk.c:1018
+#: fdisk/fdisk.c:1050
 msgid "Value out of range.\n"
 msgstr "Hodnota je mimo meze.\n"
 
-#: fdisk/fdisk.c:1028
+#: fdisk/fdisk.c:1060
 msgid "Partition number"
 msgstr "Èíslo diskového oddílu"
 
-#: fdisk/fdisk.c:1037
+#: fdisk/fdisk.c:1069
 #, 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:1044
+#: fdisk/fdisk.c:1076
 msgid "cylinder"
 msgstr "cylindr"
 
-#: fdisk/fdisk.c:1044
+#: fdisk/fdisk.c:1076
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1053
+#: fdisk/fdisk.c:1085
 #, 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:1064
+#: fdisk/fdisk.c:1096
 #, 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:1075
+#: fdisk/fdisk.c:1107
 msgid "DOS Compatibility flag is set\n"
 msgstr "Pøíznak DOSOVÉ kompatibility je nastaven.\n"
 
-#: fdisk/fdisk.c:1079
+#: fdisk/fdisk.c:1111
 msgid "DOS Compatibility flag is not set\n"
 msgstr "Pøíznak DOSOVÉ kompatibility není nastaven.\n"
 
-#: fdisk/fdisk.c:1167
+#: fdisk/fdisk.c:1204
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Diskový oddíl %d zatím neexistuje!\n"
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1209
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2664,7 +2198,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:1181
+#: fdisk/fdisk.c:1218
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2672,7 +2206,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:1190
+#: fdisk/fdisk.c:1227
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2682,7 +2216,7 @@ msgstr ""
 "nebo» SunOS/Solaris to oèekává a i Linux tomu dává pøednost.\n"
 "\n"
 
-#: fdisk/fdisk.c:1196
+#: fdisk/fdisk.c:1233
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2693,53 +2227,53 @@ msgstr ""
 "a diskový oddíl 11 jako celý svazek (6), nebo» IRIX to oèekává.\n"
 "\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1247
 #, 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:1261
+#: fdisk/fdisk.c:1298
 #, 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:1263 fdisk/fdisk.c:1271 fdisk/fdisk.c:1280 fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1300 fdisk/fdisk.c:1308 fdisk/fdisk.c:1317 fdisk/fdisk.c:1326
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fyz=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1264 fdisk/fdisk.c:1272
+#: fdisk/fdisk.c:1301 fdisk/fdisk.c:1309
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logický=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1269
+#: fdisk/fdisk.c:1306
 #, 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:1278
+#: fdisk/fdisk.c:1315
 #, 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:1281
+#: fdisk/fdisk.c:1318
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "mìlo by být (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1287
+#: fdisk/fdisk.c:1324
 #, 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:1290
+#: fdisk/fdisk.c:1327
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "mìlo by být (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1297
+#: fdisk/fdisk.c:1334
 #, c-format
 msgid ""
 "\n"
@@ -2751,7 +2285,7 @@ msgstr ""
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "Jednotky = %s po %d * %d bajtech\n"
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1379
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
@@ -2759,16 +2293,16 @@ msgstr ""
 "Diskové oddíly jsou ji¾ seøazeny.\n"
 "\n"
 
-#: fdisk/fdisk.c:1408
+#: fdisk/fdisk.c:1445
 #, 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:1409 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
+#: fdisk/fdisk.c:1446 fdisk/fdisksgilabel.c:222 fdisk/fdisksunlabel.c:676
 msgid "Device"
 msgstr "Zaøízení"
 
-#: fdisk/fdisk.c:1446
+#: fdisk/fdisk.c:1483
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
@@ -2776,7 +2310,7 @@ msgstr ""
 "\n"
 "Diskové oddíly jsou chybnì seøazeny\n"
 
-#: fdisk/fdisk.c:1456
+#: fdisk/fdisk.c:1493
 #, c-format
 msgid ""
 "\n"
@@ -2787,106 +2321,106 @@ msgstr ""
 "Disk %s: hlav: %d, sektorù: %d, cylindrù: %d\n"
 "\n"
 
-#: fdisk/fdisk.c:1458
+#: fdisk/fdisk.c:1495
 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:1502
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Varování: diskový oddíl %d obsahuje sektor 0\n"
 
-#: fdisk/fdisk.c:1505
+#: fdisk/fdisk.c:1542
 #, 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:1508
+#: fdisk/fdisk.c:1545
 #, 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:1511
+#: fdisk/fdisk.c:1548
 #, 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:1515
+#: fdisk/fdisk.c:1552
 #, 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:1547
+#: fdisk/fdisk.c:1584
 #, 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:1555
+#: fdisk/fdisk.c:1592
 #, 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:1575
+#: fdisk/fdisk.c:1612
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Varování: diskový oddíl %d je prázdný.\n"
 
-#: fdisk/fdisk.c:1580
+#: fdisk/fdisk.c:1617
 #, 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:1586
+#: fdisk/fdisk.c:1623
 #, 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:1589
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "nealokovaných sektorù: %d\n"
 
-#: fdisk/fdisk.c:1602 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
+#: fdisk/fdisk.c:1639 fdisk/fdisksgilabel.c:663 fdisk/fdisksunlabel.c:506
 #, 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:1623 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisk.c:1660 fdisk/fdiskbsdlabel.c:277 fdisk/fdisksgilabel.c:685
+#: fdisk/fdisksunlabel.c:521
 #, c-format
 msgid "First %s"
 msgstr "První %s"
 
-#: fdisk/fdisk.c:1638 fdisk/fdisksunlabel.c:542
+#: fdisk/fdisk.c:1675 fdisk/fdisksunlabel.c:562
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je ji¾ alokován\n"
 
-#: fdisk/fdisk.c:1674
+#: fdisk/fdisk.c:1711
 msgid "No free sectors available\n"
 msgstr "Nejsou ¾ádné volné sektory.\n"
 
-#: fdisk/fdisk.c:1682 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
+#: fdisk/fdisk.c:1720 fdisk/fdiskbsdlabel.c:284 fdisk/fdisksunlabel.c:573
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Poslední %s èi +velikost èi +velikostM èi velikostK"
 
-#: fdisk/fdisk.c:1715
+#: fdisk/fdisk.c:1753
 #, 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:1755 fdisk/fdiskbsdlabel.c:611
+#: fdisk/fdisk.c:1793 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:1765
+#: fdisk/fdisk.c:1803
 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:1769
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid ""
 "Command action\n"
@@ -2897,30 +2431,30 @@ msgstr ""
 "   %s\n"
 "   p   primární diskový oddíl (1-4)\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1810
 msgid "l   logical (5 or over)"
 msgstr "l   logický diskový oddíl (5 nebo více)"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1810
 msgid "e   extended"
 msgstr "e   roz¹íøený diskový oddíl"
 
-#: fdisk/fdisk.c:1788
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Chybné èíslo diskového oddílu pro typ `%c'.\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1862
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr "Tabulka rozdìlení disku byla zmìnìna!\n"
 
-#: fdisk/fdisk.c:1832
+#: fdisk/fdisk.c:1871
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Volám ioctl() pro znovunaètení tabulky rozdìlení disku.\n"
 
-#: fdisk/fdisk.c:1848
+#: fdisk/fdisk.c:1887
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2929,7 +2463,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:1854
+#: fdisk/fdisk.c:1893
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2941,70 +2475,65 @@ 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:1861
+#: fdisk/fdisk.c:1900
 msgid "Syncing disks.\n"
 msgstr "Synchronizují se disky.\n"
 
-#: fdisk/fdisk.c:1892
-#, c-format
-msgid "Device: %s\n"
-msgstr "Zaøízení: %s\n"
-
-#: fdisk/fdisk.c:1908
+#: fdisk/fdisk.c:1947
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Diskový oddíl %d neobsahuje datovou oblast.\n"
 
-#: fdisk/fdisk.c:1913
+#: fdisk/fdisk.c:1952
 msgid "New beginning of data"
 msgstr "Nový zaèátek dat"
 
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1968
 msgid "Expert command (m for help): "
 msgstr "Pøíkaz pro odborníky (m pro nápovìdu): "
 
-#: fdisk/fdisk.c:1942
+#: fdisk/fdisk.c:1981
 msgid "Number of cylinders"
 msgstr "Poèet cylindrù"
 
-#: fdisk/fdisk.c:1968
+#: fdisk/fdisk.c:2007
 msgid "Number of heads"
 msgstr "Poèet hlav"
 
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2032
 msgid "Number of sectors"
 msgstr "Poèet sektorù"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:2035
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varování: nastaven posun sektoru kvùli kompatibilitì s DOSEM\n"
 
-#: fdisk/fdisk.c:2058
+#: fdisk/fdisk.c:2100
 #, 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:2072
+#: fdisk/fdisk.c:2114
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/fdisk.c:2089
+#: fdisk/fdisk.c:2130
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s nelze otevøít.\n"
 
-#: fdisk/fdisk.c:2110
+#: fdisk/fdisk.c:2151
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "pøíkaz %c není znám\n"
 
-#: fdisk/fdisk.c:2161
+#: fdisk/fdisk.c:2201
 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:2164
+#: fdisk/fdisk.c:2204
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
@@ -3013,7 +2542,7 @@ msgstr ""
 "jedním\n"
 "          zadaným zaøízením.\n"
 
-#: fdisk/fdisk.c:2227
+#: fdisk/fdisk.c:2269
 #, c-format
 msgid ""
 "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
@@ -3022,11 +2551,11 @@ 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
+#: fdisk/fdisk.c:2278
 msgid "Command (m for help): "
 msgstr "Pøíkaz (m pro nápovìdu): "
 
-#: fdisk/fdisk.c:2252
+#: fdisk/fdisk.c:2294
 #, c-format
 msgid ""
 "\n"
@@ -3035,15 +2564,15 @@ msgstr ""
 "\n"
 "Aktuální startovací soubor: %s\n"
 
-#: fdisk/fdisk.c:2254
+#: fdisk/fdisk.c:2296
 msgid "Please enter the name of the new boot file: "
-msgstr "Zadejte jméno nového startovacího souboru: "
+msgstr "Zadejte název nového startovacího souboru: "
 
-#: fdisk/fdisk.c:2256
+#: fdisk/fdisk.c:2298
 msgid "Boot file unchanged\n"
 msgstr "Startovací soubor nebyl zmìnìn.\n"
 
-#: fdisk/fdisk.c:2320
+#: fdisk/fdisk.c:2362
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
@@ -3080,7 +2609,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:117
+#: fdisk/fdiskbsdlabel.c:118
 #, c-format
 msgid ""
 "\n"
@@ -3089,170 +2618,170 @@ msgstr ""
 "\n"
 "BSD tabulka rozdìlení disku pro zaøízení: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:125
+#: fdisk/fdiskbsdlabel.c:126
 msgid "   d   delete a BSD partition"
 msgstr "   d   smazat BSD diskový oddíl"
 
-#: fdisk/fdiskbsdlabel.c:126
+#: fdisk/fdiskbsdlabel.c:127
 msgid "   e   edit drive data"
 msgstr "   e   upravovat data na disku"
 
-#: fdisk/fdiskbsdlabel.c:127
+#: fdisk/fdiskbsdlabel.c:128
 msgid "   i   install bootstrap"
 msgstr "   i   instalovat zavadìè"
 
-#: fdisk/fdiskbsdlabel.c:128
+#: fdisk/fdiskbsdlabel.c:129
 msgid "   l   list known filesystem types"
 msgstr "   l   vypsat známé typy systémù souborù"
 
-#: fdisk/fdiskbsdlabel.c:130
+#: fdisk/fdiskbsdlabel.c:131
 msgid "   n   add a new BSD partition"
 msgstr "   n   vytvoøit nový BSD diskový oddíl"
 
-#: fdisk/fdiskbsdlabel.c:131
+#: fdisk/fdiskbsdlabel.c:132
 msgid "   p   print BSD partition table"
 msgstr "   p   vytisknout BSD tabulku rozdìlení disku"
 
-#: fdisk/fdiskbsdlabel.c:134
+#: fdisk/fdiskbsdlabel.c:135
 msgid "   s   show complete disklabel"
 msgstr "   s   zobrazí úplný popis disku"
 
-#: fdisk/fdiskbsdlabel.c:135
+#: fdisk/fdiskbsdlabel.c:136
 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:136
+#: fdisk/fdiskbsdlabel.c:137
 msgid "   u   change units (cylinders/sectors)"
 msgstr "   u   zmìní jednotky (cylindry/sektory)"
 
-#: fdisk/fdiskbsdlabel.c:137
+#: fdisk/fdiskbsdlabel.c:138
 msgid "   w   write disklabel to disk"
 msgstr "   w   ulo¾í popis disku na disk"
 
-#: fdisk/fdiskbsdlabel.c:139
+#: fdisk/fdiskbsdlabel.c:140
 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:168
+#: fdisk/fdiskbsdlabel.c:169
 #, c-format
 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:172
+#: fdisk/fdiskbsdlabel.c:173
 #, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
 msgstr "Ètu popis disku %s v sektoru %d.\n"
 
-#: fdisk/fdiskbsdlabel.c:182
+#: fdisk/fdiskbsdlabel.c:183
 #, 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:196
+#: fdisk/fdiskbsdlabel.c:197
 msgid "BSD disklabel command (m for help): "
 msgstr "Pøíkaz pro BSD popis disku (m pro nápovìdu): "
 
-#: fdisk/fdiskbsdlabel.c:310
+#: fdisk/fdiskbsdlabel.c:311
 #, c-format
 msgid "type: %s\n"
 msgstr "typ: %s\n"
 
-#: fdisk/fdiskbsdlabel.c:312
+#: fdisk/fdiskbsdlabel.c:313
 #, c-format
 msgid "type: %d\n"
 msgstr "typ: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:313
+#: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "disk: %.*s\n"
 msgstr "disk: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:314
+#: fdisk/fdiskbsdlabel.c:315
 #, c-format
 msgid "label: %.*s\n"
 msgstr "tabulka: %.*s\n"
 
-#: fdisk/fdiskbsdlabel.c:315
+#: fdisk/fdiskbsdlabel.c:316
 msgid "flags:"
 msgstr "pøíznaky:"
 
-#: fdisk/fdiskbsdlabel.c:317
+#: fdisk/fdiskbsdlabel.c:318
 msgid " removable"
 msgstr " výmìnný"
 
 # ???
-#: fdisk/fdiskbsdlabel.c:319
+#: fdisk/fdiskbsdlabel.c:320
 msgid " ecc"
 msgstr " ecc"
 
-#: fdisk/fdiskbsdlabel.c:321
+#: fdisk/fdiskbsdlabel.c:322
 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:325
+#: fdisk/fdiskbsdlabel.c:326
 #, c-format
 msgid "bytes/sector: %ld\n"
 msgstr "bajtù/sektor: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:326
+#: fdisk/fdiskbsdlabel.c:327
 #, c-format
 msgid "sectors/track: %ld\n"
 msgstr "sektorù/stopu: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:327
+#: fdisk/fdiskbsdlabel.c:328
 #, c-format
 msgid "tracks/cylinder: %ld\n"
 msgstr "stop/cylindr: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:328
+#: fdisk/fdiskbsdlabel.c:329
 #, c-format
 msgid "sectors/cylinder: %ld\n"
 msgstr "sektorù/cylindr: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:329
+#: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "cylinders: %ld\n"
 msgstr "cylindrù: %ld\n"
 
-#: fdisk/fdiskbsdlabel.c:330
+#: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "rpm: %d\n"
 msgstr "otm: %d\n"
 
 # *skew ??? 
 # zde pøeklad spí¹e odhaduji
-#: fdisk/fdiskbsdlabel.c:331
+#: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "interleave: %d\n"
 msgstr "interleave: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:332
+#: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "trackskew: %d\n"
 msgstr "zakøivení stopy: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:333
+#: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "cylinderskew: %d\n"
 msgstr "zakøivení cylindru: %d\n"
 
-#: fdisk/fdiskbsdlabel.c:334
+#: fdisk/fdiskbsdlabel.c:335
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
 msgstr "pøesun hlavy: %ld\t\t# milisekund\n"
 
-#: fdisk/fdiskbsdlabel.c:336
+#: fdisk/fdiskbsdlabel.c:337
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
 msgstr "posun stopa-stopa: %ld\t# milisekund\n"
 
-#: fdisk/fdiskbsdlabel.c:338
+#: fdisk/fdiskbsdlabel.c:339
 msgid "drivedata: "
 msgstr "diskdata: "
 
-#: fdisk/fdiskbsdlabel.c:347
+#: fdisk/fdiskbsdlabel.c:348
 #, c-format
 msgid ""
 "\n"
@@ -3261,69 +2790,69 @@ msgstr ""
 "\n"
 "poèet diskových oddílù - %d:\n"
 
-#: fdisk/fdiskbsdlabel.c:348
+#: fdisk/fdiskbsdlabel.c:349
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
 msgstr "#       velik       konec    velikost sstyp    [fsize bsize   cpg]\n"
 
-#: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
+#: fdisk/fdiskbsdlabel.c:398 fdisk/fdiskbsdlabel.c:401
 #, c-format
 msgid "Writing disklabel to %s.\n"
 msgstr "Ukládám popis disku na %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
+#: fdisk/fdiskbsdlabel.c:413 fdisk/fdiskbsdlabel.c:415
 #, c-format
 msgid "%s contains no disklabel.\n"
 msgstr "Na %s se nenachází ¾ádný popis disku.\n"
 
-#: fdisk/fdiskbsdlabel.c:419
+#: fdisk/fdiskbsdlabel.c:420
 msgid "Do you want to create a disklabel? (y/n) "
 msgstr "Chcete vytvoøit popis disku? (y/n)"
 
-#: fdisk/fdiskbsdlabel.c:458
+#: fdisk/fdiskbsdlabel.c:459
 msgid "bytes/sector"
 msgstr "bajtù/sektor"
 
-#: fdisk/fdiskbsdlabel.c:459
+#: fdisk/fdiskbsdlabel.c:460
 msgid "sectors/track"
 msgstr "sektorù/stopu"
 
-#: fdisk/fdiskbsdlabel.c:460
+#: fdisk/fdiskbsdlabel.c:461
 msgid "tracks/cylinder"
 msgstr "stop/cylindr"
 
-#: fdisk/fdiskbsdlabel.c:468
+#: fdisk/fdiskbsdlabel.c:469
 msgid "sectors/cylinder"
 msgstr "sektorù/cylindr"
 
-#: fdisk/fdiskbsdlabel.c:472
+#: fdisk/fdiskbsdlabel.c:473
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
 msgstr "Musí být <= sektorù/stopu * stop/cylindr (implicitní).\n"
 
-#: fdisk/fdiskbsdlabel.c:474
+#: fdisk/fdiskbsdlabel.c:475
 msgid "rpm"
 msgstr "otm"
 
-#: fdisk/fdiskbsdlabel.c:475
+#: fdisk/fdiskbsdlabel.c:476
 msgid "interleave"
 msgstr "interleave"
 
-#: fdisk/fdiskbsdlabel.c:476
+#: fdisk/fdiskbsdlabel.c:477
 msgid "trackskew"
 msgstr "zakøivení stopy"
 
-#: fdisk/fdiskbsdlabel.c:477
+#: fdisk/fdiskbsdlabel.c:478
 msgid "cylinderskew"
 msgstr "zakøivení cylindru"
 
-#: fdisk/fdiskbsdlabel.c:478
+#: fdisk/fdiskbsdlabel.c:479
 msgid "headswitch"
 msgstr "pøesun hlavy"
 
-#: fdisk/fdiskbsdlabel.c:479
+#: fdisk/fdiskbsdlabel.c:480
 msgid "track-to-track seek"
 msgstr "posun stopa-stopa"
 
-#: fdisk/fdiskbsdlabel.c:520
+#: fdisk/fdiskbsdlabel.c:521
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "Zavadìè: %sstart -> start%s (%s): "
@@ -3404,38 +2933,46 @@ msgid "SGI xfs"
 msgstr "SGI xfs"
 
 #: fdisk/fdisksgilabel.c:90
-msgid "SGI xlvol"
-msgstr "SGI xlvol"
+msgid "SGI xfslog"
+msgstr "SGI xfslog"
 
 #: fdisk/fdisksgilabel.c:91
-msgid "SGI rxlvol"
-msgstr "SGI rxlvol"
+msgid "SGI xlv"
+msgstr "SGI xlv"
+
+#: fdisk/fdisksgilabel.c:92
+msgid "SGI xvm"
+msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativní"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:96
+msgid "Linux RAID"
+msgstr "Linux RAID"
+
+#: fdisk/fdisksgilabel.c:160
 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"
+"Popis nesmí podle MIPS Computer Systems, Inc obsahovat více ne¾ 512 bajtù\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:179
 msgid "Detected sgi disklabel with wrong checksum.\n"
 msgstr "Nalezl jsem sgi popis disku s chybným kontrolním souètem.\n"
 
-#: fdisk/fdisksgilabel.c:200
+#: fdisk/fdisksgilabel.c:202
 #, c-format
 msgid ""
 "\n"
@@ -3454,7 +2991,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:213
+#: fdisk/fdisksgilabel.c:214
 #, c-format
 msgid ""
 "\n"
@@ -3467,32 +3004,32 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:219
+#: fdisk/fdisksgilabel.c:220
 #, c-format
 msgid ""
 "----- partitions -----\n"
-"%*s  Info      Start       End   Sectors  Id  System\n"
+"Pt# %*s  Info     Start       End   Sectors  Id  System\n"
 msgstr ""
 "----- diskové oddíly -----\n"
-"%*s  Info      Zaèátek     Konec Sektory  Id  Systém\n"
+"Od# %*s  Info      Zaèátek     Konec Sektory  Id  Systém\n"
 
-#: fdisk/fdisksgilabel.c:241
+#: fdisk/fdisksgilabel.c:242
 #, c-format
 msgid ""
-"----- bootinfo -----\n"
+"----- Bootinfo -----\n"
 "Bootfile: %s\n"
-"----- directory entries -----\n"
+"----- Directory Entries -----\n"
 msgstr ""
 "----- bootinfo -----\n"
 "Startovací soubor: %s\n"
 "----- adresáøové polo¾ky -----\n"
 
-#: fdisk/fdisksgilabel.c:251
+#: fdisk/fdisksgilabel.c:252
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s sektor%5u velikost%8u\n"
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:306
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3501,26 +3038,26 @@ msgid ""
 msgstr ""
 "\n"
 "Chybný startovací soubor!\n"
-"\tStartovací soubor musí být zadán plným jménem, napø.\n"
+"\tStartovací soubor musí být zadán plným názvem, napø.\n"
 "\t\"/unix\" èi \"/unix.save\".\n"
 
-#: fdisk/fdisksgilabel.c:312
+#: fdisk/fdisksgilabel.c:313
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
 "\n"
-"\tJméno startovacího souboru je pøíli¹ dlouhé: 16 bajtù je maximum.\n"
+"\tNázev startovacího souboru je pøíli¹ dlouhý: 16 bajtù je maximum.\n"
 
-#: fdisk/fdisksgilabel.c:317
+#: fdisk/fdisksgilabel.c:318
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
 "\n"
-"\tStartovací soubor musí být zadán plným jménem.\n"
+"\tStartovací soubor musí být zadán plným názvem.\n"
 
-#: fdisk/fdisksgilabel.c:322
+#: fdisk/fdisksgilabel.c:323
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3530,7 +3067,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:350
+#: fdisk/fdisksgilabel.c:351
 #, c-format
 msgid ""
 "\n"
@@ -3539,19 +3076,19 @@ msgstr ""
 "\n"
 "\tStartovací soubor byl zmìnìn na \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:448
+#: fdisk/fdisksgilabel.c:449
 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:478
+#: fdisk/fdisksgilabel.c:457 fdisk/fdisksunlabel.c:482
 msgid "No partitions defined\n"
 msgstr "Nejsou definovány ¾ádné diskové oddíly\n"
 
-#: fdisk/fdisksgilabel.c:463
+#: fdisk/fdisksgilabel.c:464
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "IRIX preferuje, kdy¾ Diskový oddíl 11 zaujímá celý disk.\n"
 
-#: fdisk/fdisksgilabel.c:465
+#: fdisk/fdisksgilabel.c:466
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3560,7 +3097,7 @@ msgstr ""
 "Diskový oddíl zaujímající celý disk by mìl zaèínat blokem 0,\n"
 "nikoliv blokem %d.\n"
 
-#: fdisk/fdisksgilabel.c:469
+#: fdisk/fdisksgilabel.c:470
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3569,31 +3106,31 @@ msgstr ""
 "Diskový oddíl zaujímající celý disk má velikost  v blocích pouze %d,\n"
 "ale velikost disku v blocích je %d.\n"
 
-#: fdisk/fdisksgilabel.c:476
+#: fdisk/fdisksgilabel.c:477
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Jeden Diskový Oddíl (#11) by mìl zaujímat celý disk.\n"
 
-#: fdisk/fdisksgilabel.c:488
+#: fdisk/fdisksgilabel.c:489
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "Diskový oddíl %d nezaèíná na hranici cylindru.\n"
 
-#: fdisk/fdisksgilabel.c:495
+#: fdisk/fdisksgilabel.c:496
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "Diskový oddíl %d nekonèí na hranici cylindru.\n"
 
-#: fdisk/fdisksgilabel.c:503
+#: fdisk/fdisksgilabel.c:504
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "Diskové oddíly %d a %d se navzájem pøekrývají %d sektory.\n"
 
-#: fdisk/fdisksgilabel.c:512 fdisk/fdisksgilabel.c:532
+#: fdisk/fdisksgilabel.c:513 fdisk/fdisksgilabel.c:533
 #, c-format
 msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
 msgstr "Nevyu¾ívaný prostor o velikosti v sektorech %8d - sektory %8d-%d\n"
 
-#: fdisk/fdisksgilabel.c:545
+#: fdisk/fdisksgilabel.c:546
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
@@ -3601,7 +3138,7 @@ msgstr ""
 "\n"
 "Startovací diskový oddíl neexistuje.\n"
 
-#: fdisk/fdisksgilabel.c:549
+#: fdisk/fdisksgilabel.c:550
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
@@ -3609,7 +3146,7 @@ msgstr ""
 "\n"
 "Diskový oddíl pro odkládací prostor neexistuje.\n"
 
-#: fdisk/fdisksgilabel.c:554
+#: fdisk/fdisksgilabel.c:555
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
@@ -3617,15 +3154,15 @@ msgstr ""
 "\n"
 "Diskový oddíl pro odkládací prostor nemá zadán typ.\n"
 
-#: fdisk/fdisksgilabel.c:558
+#: fdisk/fdisksgilabel.c:559
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr "\tVybral jste si neobvyklé jméno pro startovací soubor.\n"
+msgstr "\tVybral jste si neobvyklý název pro startovací soubor.\n"
 
-#: fdisk/fdisksgilabel.c:569
+#: fdisk/fdisksgilabel.c:570
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr "Lituji, mù¾ete mìnit znaèku neprázdných diskových oddílù.\n"
 
-#: fdisk/fdisksgilabel.c:576
+#: fdisk/fdisksgilabel.c:577
 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"
@@ -3640,23 +3177,23 @@ msgstr ""
 "jinak.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:607
+#: fdisk/fdisksgilabel.c:608
 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:669
+#: fdisk/fdisksgilabel.c:670
 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:676
+#: fdisk/fdisksgilabel.c:677
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "Diskové oddíly ji¾ zabírají celý prostor disky.\n"
 
-#: fdisk/fdisksgilabel.c:681
+#: fdisk/fdisksgilabel.c:682
 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:690 fdisk/fdisksgilabel.c:719
+#: fdisk/fdisksgilabel.c:691 fdisk/fdisksgilabel.c:720
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3664,17 +3201,17 @@ 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:706
+#: fdisk/fdisksgilabel.c:707
 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:711
+#: fdisk/fdisksgilabel.c:712
 #, c-format
 msgid " Last %s"
 msgstr " Poslední %s"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:734
 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"
@@ -3686,12 +3223,12 @@ msgstr ""
 "pochopitelnì dostupná.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:761
+#: fdisk/fdisksgilabel.c:760
 #, 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:763
+#: fdisk/fdisksgilabel.c:762
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tZAÈÁTEK=%d\tDÉLKA=%d\n"
@@ -3728,7 +3265,12 @@ msgstr "SunOS var"
 msgid "SunOS home"
 msgstr "SunOS home"
 
-#: fdisk/fdisksunlabel.c:129
+#. DOS 3.3+ secondary
+#: fdisk/fdisksunlabel.c:55 fdisk/i386_sys_types.c:93
+msgid "Linux raid autodetect"
+msgstr "Linux raid autodetect"
+
+#: fdisk/fdisksunlabel.c:132
 msgid ""
 "Detected sun disklabel with wrong checksum.\n"
 "Probably you'll have to set all the values,\n"
@@ -3740,12 +3282,12 @@ msgstr ""
 "cylindry a diskové oddíly, nebo vytvoøit novou tabulku (pøíkaz s v hlavní\n"
 "nabídce)\n"
 
-#: fdisk/fdisksunlabel.c:228
+#: fdisk/fdisksunlabel.c:231
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
 msgstr "Automatická konfigurace nalezla %s%s%s\n"
 
-#: fdisk/fdisksunlabel.c:255
+#: fdisk/fdisksunlabel.c:258
 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"
@@ -3756,7 +3298,7 @@ msgstr ""
 "dokud se nerozhodnete je ulo¾it na disk. Poté ji¾ nebudou stará data\n"
 "pochopitelnì dostupná.\n"
 
-#: fdisk/fdisksunlabel.c:266
+#: fdisk/fdisksunlabel.c:269
 msgid ""
 "Drive type\n"
 "   ?   auto configure\n"
@@ -3766,71 +3308,71 @@ msgstr ""
 "   ?   automatická konfigurace\n"
 "   0   u¾ivatelská konfigurace (s detekovaným implicitním nastavením)"
 
-#: fdisk/fdisksunlabel.c:276
+#: fdisk/fdisksunlabel.c:279
 msgid "Select type (? for auto, 0 for custom): "
 msgstr "Zadejte typ (? pro auto, 0 pro u¾ivatelský): "
 
-#: fdisk/fdisksunlabel.c:288
+#: fdisk/fdisksunlabel.c:291
 msgid "Autoconfigure failed.\n"
 msgstr "Automatická konfigurace selhala.\n"
 
-#: fdisk/fdisksunlabel.c:316
+#: fdisk/fdisksunlabel.c:319
 msgid "Sectors/track"
 msgstr "Sektorù/stopu"
 
-#: fdisk/fdisksunlabel.c:323
+#: fdisk/fdisksunlabel.c:326
 msgid "Alternate cylinders"
 msgstr "Alternativní cylindry"
 
-#: fdisk/fdisksunlabel.c:326
+#: fdisk/fdisksunlabel.c:329
 msgid "Physical cylinders"
 msgstr "Fyzické cylindry"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
+#: fdisk/fdisksunlabel.c:332 fdisk/fdisksunlabel.c:726
 msgid "Rotation speed (rpm)"
 msgstr "Rychlost otáèení (otm)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:719
 msgid "Interleave factor"
 msgstr "Interleave faktor"
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
+#: fdisk/fdisksunlabel.c:337 fdisk/fdisksunlabel.c:712
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektory na cylindr"
 
-#: fdisk/fdisksunlabel.c:348
+#: fdisk/fdisksunlabel.c:351
 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:354
+#: fdisk/fdisksunlabel.c:358
 msgid "3,5\" floppy"
 msgstr "3,5\" pru¾ný disk"
 
-#: fdisk/fdisksunlabel.c:354
+#: fdisk/fdisksunlabel.c:358
 msgid "Linux custom"
 msgstr "Linux u¾ivatelský"
 
-#: fdisk/fdisksunlabel.c:441
+#: fdisk/fdisksunlabel.c:445
 #, 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:461
+#: fdisk/fdisksunlabel.c:465
 #, 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:483
+#: fdisk/fdisksunlabel.c:487
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Nevyu¾ívaný prostor - sektory 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:489 fdisk/fdisksunlabel.c:493
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nevyu¾ívaný prostor - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:512
+#: fdisk/fdisksunlabel.c:516
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3838,7 +3380,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:570
+#: fdisk/fdisksunlabel.c:592
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3848,7 +3390,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:590
+#: fdisk/fdisksunlabel.c:612
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3858,7 +3400,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:603
+#: fdisk/fdisksunlabel.c:625
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3872,7 +3414,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:634
+#: fdisk/fdisksunlabel.c:656
 #, c-format
 msgid ""
 "\n"
@@ -3891,7 +3433,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:648
+#: fdisk/fdisksunlabel.c:670
 #, c-format
 msgid ""
 "\n"
@@ -3904,16 +3446,16 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:675
 #, 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:678
+#: fdisk/fdisksunlabel.c:700
 msgid "Number of alternate cylinders"
 msgstr "Poèet alternativních cylindrù"
 
-#: fdisk/fdisksunlabel.c:711
+#: fdisk/fdisksunlabel.c:733
 msgid "Number of physical cylinders"
 msgstr "Poèet fyzických cylindrù"
 
@@ -4005,8 +3547,8 @@ msgid "Hidden HPFS/NTFS"
 msgstr "Skrytá HPFS/NTFS"
 
 #: fdisk/i386_sys_types.c:27
-msgid "AST Windows swapfile"
-msgstr "AST Windows odkládací soubor"
+msgid "AST SmartSleep"
+msgstr "AST SmartSleep"
 
 #: fdisk/i386_sys_types.c:28
 msgid "Hidden Win95 FAT32"
@@ -4026,7 +3568,7 @@ msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
 msgid "Plan 9"
-msgstr ""
+msgstr "Plan 9"
 
 #: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
@@ -4091,8 +3633,8 @@ 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
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:85
+#: fdisk/i386_sys_types.c:90 fdisk/i386_sys_types.c:91
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
@@ -4177,66 +3719,84 @@ msgid "BSDI swap"
 msgstr "BSDI swap"
 
 #: fdisk/i386_sys_types.c:72
+msgid "Boot Wizard hidden"
+msgstr "skrytý Boot Wizard"
+
+#: fdisk/i386_sys_types.c:73
 msgid "DRDOS/sec (FAT-12)"
 msgstr "DRDOS/sec (FAT-12)"
 
-#: fdisk/i386_sys_types.c:73
+#: fdisk/i386_sys_types.c:74
 msgid "DRDOS/sec (FAT-16 < 32M)"
 msgstr "DRDOS/sec (FAT-16 < 32M)"
 
-#: fdisk/i386_sys_types.c:74
+#: fdisk/i386_sys_types.c:75
 msgid "DRDOS/sec (FAT-16)"
 msgstr "DRDOS/sec (FAT-16)"
 
-#: fdisk/i386_sys_types.c:75
+#: fdisk/i386_sys_types.c:76
 msgid "Syrinx"
 msgstr "Syrinx"
 
-#: fdisk/i386_sys_types.c:76
+#: fdisk/i386_sys_types.c:77
 msgid "Non-FS data"
-msgstr ""
+msgstr "data mimo SS"
 
-#: fdisk/i386_sys_types.c:77
+#: fdisk/i386_sys_types.c:78
 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
+#: fdisk/i386_sys_types.c:80
+msgid "Dell Utility"
+msgstr "Dell utilita"
+
+#. Dell PowerEdge Server utilities
+#: fdisk/i386_sys_types.c:81
+msgid "BootIt"
+msgstr "BootIt"
+
+#. BootIt EMBRM
+#: fdisk/i386_sys_types.c:82
 msgid "DOS access"
 msgstr "DOS access"
 
 #. DOS access or SpeedStor 12-bit FAT
 #. extended partition
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:84
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
 #. SpeedStor 16-bit FAT extended
 #. partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:87
 msgid "BeOS fs"
 msgstr "BeOS ss"
 
+#: fdisk/i386_sys_types.c:88
+msgid "EFI GPT"
+msgstr "EFI GPT"
+
+#. Intel EFI GUID Partition Table
+#: fdisk/i386_sys_types.c:89
+msgid "EFI (FAT-12/16/32)"
+msgstr "EFI (FAT-12/16/32)"
+
 #. SpeedStor large partition
-#: fdisk/i386_sys_types.c:87
+#: fdisk/i386_sys_types.c:92
 msgid "DOS secondary"
 msgstr "DOS sekundární"
 
-#. DOS 3.3+ secondary
-#: 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:91
+#: fdisk/i386_sys_types.c:96
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:92
+#: fdisk/i386_sys_types.c:97
 msgid "BBT"
 msgstr "BBT"
 
@@ -4260,7 +3820,7 @@ msgstr "nedostatek pamìti - konèím\n"
 msgid "read error on %s - cannot read sector %lu\n"
 msgstr "chyba ètení na %s - sektor %lu nelze èíst\n"
 
-#: fdisk/sfdisk.c:224
+#: fdisk/sfdisk.c:226
 #, c-format
 msgid "ERROR: sector %lu does not have an msdos signature\n"
 msgstr "CHYBA: sektor %lu nemá msdos podpis\n"
@@ -4326,36 +3886,36 @@ 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"
+"Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Varování: zaèátek=%d - to vypadá spí¹e jako diskový oddíl ne¾li\n"
+"Varování: zaèátek=%lu - to vypadá spí¹e jako diskový oddíl ne¾li\n"
 "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: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"
+msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
+msgstr "Varování: dle HDIO_GETGEO je poèet hlav %lu\n"
 
 #: fdisk/sfdisk.c: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"
+msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
+msgstr "Varování: dle HDIO_GETGEO je poèet sektorù %lu\n"
 
 #: fdisk/sfdisk.c:449
 #, c-format
-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"
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
+msgstr "Varování: dle BLKGETSIZE/HDIO_GETGEO je poèet cylindrù %lu\n"
 
 #: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
-"Warning: unlikely number of sectors (%d) - usually at most 63\n"
+"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Varování: podivný poèet sektorù (%d) - obvykle nebývá více ne¾ 63\n"
+"Varování: podivný poèet sektorù (%lu) - obvykle nebývá více ne¾ 63\n"
 "To zpùsobí problémy v¹em programùm, které pou¾ívají CHS adresování.\n"
 
 #: fdisk/sfdisk.c:457
@@ -4370,29 +3930,30 @@ msgstr ""
 #: 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"
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
+msgstr "%s diskového oddílu %s má chybný poèet hlav: %lu (mìlo by být 0-%lu)\n"
 
 #: fdisk/sfdisk.c:544
 #, c-format
 msgid ""
-"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
+"%s of partition %s has impossible value for sector: %lu (should be in "
+"1-%lu)\n"
 msgstr ""
-"%s diskového oddílu %s má chybný poèet sektorù: %d (mìlo by být 1-%d)\n"
+"%s diskového oddílu %s má chybný poèet sektorù: %lu (mìlo by být 1-%lu)\n"
 
 #: fdisk/sfdisk.c:549
 #, c-format
 msgid ""
-"%s of partition %s has impossible value for cylinders: %d (should be in "
-"0-%d)\n"
+"%s of partition %s has impossible value for cylinders: %lu (should be in "
+"0-%lu)\n"
 msgstr ""
-"%s diskového oddílu %s má chybný poèet cylindrù: %d (mìlo by být 0-%d)\n"
+"%s diskového oddílu %s má chybný poèet cylindrù: %lu (mìlo by být 0-%lu)\n"
 
 #: fdisk/sfdisk.c:588
 msgid ""
 "Id  Name\n"
 "\n"
-msgstr "Id  Jméno\n"
+msgstr "Id  Název\n"
 
 #: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
@@ -4560,47 +4121,43 @@ msgstr "a %s se navzájem pøekrývají.\n"
 
 #: 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:1150
-#, c-format
-msgid "the partition table (sector %lu),\n"
-msgstr "tabulky rozdìlení disku (sektor %lu)\n"
-
-#: fdisk/sfdisk.c:1151
-msgid "and will destroy it when filled\n"
-msgstr "a znièí ji, pokud bude obsazen\n"
+msgid ""
+"Warning: partition %s contains part of the partition table (sector %lu),\n"
+"and will destroy it when filled\n"
+msgstr ""
+"Varování: diskový oddíl %s obsahuje èást tabulky rozdìlení disku (sektor "
+"%lu)\n"
+"a v pøípadì zaplnìní ji znièí\n"
 
-#: fdisk/sfdisk.c:1160
+#: fdisk/sfdisk.c:1161
 #, 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:1164
+#: fdisk/sfdisk.c:1165
 #, 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: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: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:1180
+msgid ""
+"Among the primary partitions, at most one can be extended\n"
+" (although this is not a problem under Linux)\n"
+msgstr ""
+"Pouze jeden z primárních diskových oddílù mù¾e být roz¹íøeným.\n"
+" (aèkoliv v Linux to není problém)\n"
 
-#: fdisk/sfdisk.c:1196
+#: fdisk/sfdisk.c:1198
 #, 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:1202
+#: fdisk/sfdisk.c:1204
 #, 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:1220
+#: fdisk/sfdisk.c:1222
 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"
@@ -4608,7 +4165,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:1227
+#: fdisk/sfdisk.c:1229
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -4616,7 +4173,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:1233
+#: fdisk/sfdisk.c:1235
 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"
@@ -4624,7 +4181,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:1250
+#: fdisk/sfdisk.c:1252
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -4632,163 +4189,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:1259
+#: fdisk/sfdisk.c:1261
 #, 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:1262
+#: fdisk/sfdisk.c:1264
 #, 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: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"
+#, c-format
+msgid ""
+"Warning: shifted start of the extd partition from %ld to %ld\n"
+"(For listing purposes only. Do not change its contents.)\n"
+msgstr ""
+"Varování: zaèátek roz¹íøeného diskového oddílu posunut z %ld na %ld.\n"
+"(Pouze pro úèely výpisu. Nemìòte jeho obsah.)\n"
 
-#: fdisk/sfdisk.c: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:1295
+msgid ""
+"Warning: extended partition does not start at a cylinder boundary.\n"
+"DOS and Linux will interpret the contents differently.\n"
+msgstr ""
+"Varování: roz¹íøený diskový oddíl nezaèíná na hranici cylindru.\n"
+"DOS a Linux budou jeho obsah interpretovat rozdílnì.\n"
 
-#: fdisk/sfdisk.c:1309 fdisk/sfdisk.c:1386
+#: fdisk/sfdisk.c:1313 fdisk/sfdisk.c:1390
 #, 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:1324
+#: fdisk/sfdisk.c:1328
 msgid "tree of partitions?\n"
 msgstr "strom diskových oddílù?\n"
 
-#: fdisk/sfdisk.c:1445
+#: fdisk/sfdisk.c:1449
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "nalezen Disk Manager - s tím neumím pracovat\n"
 
-#: fdisk/sfdisk.c:1452
+#: fdisk/sfdisk.c:1456
 msgid "DM6 signature found - giving up\n"
 msgstr "nalezen DM6 podpis - konèím\n"
 
-#: fdisk/sfdisk.c:1472
+#: fdisk/sfdisk.c:1476
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "zvlá¹tní..., roz¹íøený diskový oddíl o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1479 fdisk/sfdisk.c:1490
+#: fdisk/sfdisk.c:1483 fdisk/sfdisk.c:1494
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "zvlá¹tní..., BSD diskový oddíl o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1528
 #, c-format
 msgid " %s: unrecognized partition\n"
 msgstr " diskový oddíl %s není znám\n"
 
-#: fdisk/sfdisk.c:1536
+#: fdisk/sfdisk.c:1540
 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:1549
+#: fdisk/sfdisk.c:1554
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Chyba pøi ukládání starých sektorù - konèím\n"
 
-#: fdisk/sfdisk.c:1554
+#: fdisk/sfdisk.c:1559
 #, 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:1631
+#: fdisk/sfdisk.c:1636
 msgid "long or incomplete input line - quitting\n"
 msgstr "pøíli¹ dlouhý èi neúplný øádek - konèím\n"
 
-#: fdisk/sfdisk.c:1667
+#: fdisk/sfdisk.c:1672
 #, 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:1674
+#: fdisk/sfdisk.c:1679
 #, 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:1680
+#: fdisk/sfdisk.c:1685
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nerozpoznaný vstup: %s\n"
 
-#: fdisk/sfdisk.c:1712
+#: fdisk/sfdisk.c:1727
 msgid "number too big\n"
 msgstr "èíslo je pøíli¹ veliké\n"
 
-#: fdisk/sfdisk.c:1716
+#: fdisk/sfdisk.c:1731
 msgid "trailing junk after number\n"
 msgstr "nesmysly za èíslem\n"
 
-#: fdisk/sfdisk.c:1832
+#: fdisk/sfdisk.c:1852
 msgid "no room for partition descriptor\n"
 msgstr "není místo pro popis diskového oddílu\n"
 
-#: fdisk/sfdisk.c:1865
+#: fdisk/sfdisk.c:1885
 msgid "cannot build surrounding extended partition\n"
 msgstr "okolní roz¹iøující diskový oddíl nelze vytvoøit\n"
 
-#: fdisk/sfdisk.c:1916
+#: fdisk/sfdisk.c:1936
 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:1950
+#: fdisk/sfdisk.c:1970
 msgid "No room for more\n"
 msgstr "Ji¾ nejsou volné bloky\n"
 
-#: fdisk/sfdisk.c:1969
+#: fdisk/sfdisk.c:1989
 msgid "Illegal type\n"
 msgstr "Chybný typ\n"
 
-#: fdisk/sfdisk.c:2001
+#: fdisk/sfdisk.c:2021
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Varování: zadaná velikost(%ld) pøekraèuje maximální povolenou velikost "
 "(%lu)\n"
 
-#: fdisk/sfdisk.c:2007
+#: fdisk/sfdisk.c:2027
 msgid "Warning: empty partition\n"
 msgstr "Varování: prázdný diskový oddíl\n"
 
-#: fdisk/sfdisk.c:2021
+#: fdisk/sfdisk.c:2041
 #, 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:2034
+#: fdisk/sfdisk.c:2054
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nerozpoznaný pøíznak 'startovací' - zvolte - èi *\n"
 
-#: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
+#: fdisk/sfdisk.c:2071 fdisk/sfdisk.c:2084
 msgid "partial c,h,s specification?\n"
 msgstr "neúplná c,h,s specifikace?\n"
 
-#: fdisk/sfdisk.c:2075
+#: fdisk/sfdisk.c:2095
 msgid "Extended partition not where expected\n"
 msgstr "Roz¹íøený diskový oddíl na neoèekávaném místì\n"
 
-#: fdisk/sfdisk.c:2107
+#: fdisk/sfdisk.c:2127
 msgid "bad input\n"
 msgstr "chybný vstup\n"
 
-#: fdisk/sfdisk.c:2129
+#: fdisk/sfdisk.c:2149
 msgid "too many partitions\n"
 msgstr "pøíli¹ mnoho diskových oddílù\n"
 
-#: fdisk/sfdisk.c:2162
+#: fdisk/sfdisk.c:2182
 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"
@@ -4800,100 +4357,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:2182
+#: fdisk/sfdisk.c:2202
 msgid "version"
 msgstr "verze"
 
-#: fdisk/sfdisk.c:2188
+#: fdisk/sfdisk.c:2208
 #, c-format
 msgid "Usage: %s [options] device ...\n"
 msgstr "Pou¾ití: %s [pøepínaèe] zaøízení ...\n"
 
-#: fdisk/sfdisk.c:2189
+#: fdisk/sfdisk.c:2209
 msgid "device: something like /dev/hda or /dev/sda"
 msgstr "zaøízení: nìco jako /dev/hda èi /dev/sda"
 
-#: fdisk/sfdisk.c:2190
+#: fdisk/sfdisk.c:2210
 msgid "useful options:"
 msgstr "u¾iteèné pøepínaèe:"
 
-#: fdisk/sfdisk.c:2191
+#: fdisk/sfdisk.c:2211
 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:2192
+#: fdisk/sfdisk.c:2212
 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:2193
+#: fdisk/sfdisk.c:2213
 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:2194
+#: fdisk/sfdisk.c:2214
 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:2195
+#: fdisk/sfdisk.c:2215
 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:2196
+#: fdisk/sfdisk.c:2216
 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:2197
+#: fdisk/sfdisk.c:2217
 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:2198
+#: fdisk/sfdisk.c:2218
 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:2199
+#: fdisk/sfdisk.c:2219
 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:2200
+#: fdisk/sfdisk.c:2220
 msgid "    -N# :                change only the partition with number #"
 msgstr "    -N# :                zmìní pouze diskový oddíl s èíslem #"
 
-#: fdisk/sfdisk.c:2201
+#: fdisk/sfdisk.c:2221
 msgid "    -n :                 do not actually write to disk"
 msgstr "    -n :                 ¾ádné zmìny nebudou ulo¾eny na disk"
 
-#: fdisk/sfdisk.c:2202
+#: fdisk/sfdisk.c:2222
 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:2203
+#: fdisk/sfdisk.c:2223
 msgid "    -I file :            restore these sectors again"
 msgstr "    -I SOUBOR :            obnoví tyto sektory ze SOUBORU"
 
-#: fdisk/sfdisk.c:2204
+#: fdisk/sfdisk.c:2224
 msgid "    -v [or --version]:   print version"
 msgstr "    -v [èi --version]:   vypí¹e informace o verzi"
 
-#: fdisk/sfdisk.c:2205
+#: fdisk/sfdisk.c:2225
 msgid "    -? [or --help]:      print this message"
 msgstr "    -? [èi --help]:      vypí¹e tuto nápovìdu"
 
-#: fdisk/sfdisk.c:2206
+#: fdisk/sfdisk.c:2226
 msgid "dangerous options:"
 msgstr "nebezpeèné pøepínaèe:"
 
-#: fdisk/sfdisk.c:2207
+#: fdisk/sfdisk.c:2227
 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:2208
+#: fdisk/sfdisk.c:2228
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
@@ -4901,119 +4458,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:2210
+#: fdisk/sfdisk.c:2230
 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:2211
+#: fdisk/sfdisk.c:2231
 msgid "    -q  [or --quiet]:      suppress warning messages"
 msgstr "    -q  [èi --quiet]:      nebude vypisovat varovné hlá¹ky"
 
-#: fdisk/sfdisk.c:2212
+#: fdisk/sfdisk.c:2232
 msgid "    You can override the detected geometry using:"
 msgstr "    Nalezenou geometrii mù¾ete pøepsat pomocí:"
 
-#: fdisk/sfdisk.c:2213
+#: fdisk/sfdisk.c:2233
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
 msgstr "    -C# [èi --cylinders #]:nastaví poèet cylindrù"
 
-#: fdisk/sfdisk.c:2214
+#: fdisk/sfdisk.c:2234
 msgid "    -H# [or --heads #]:    set the number of heads to use"
 msgstr "    -H# [èi --heads #]:    nastaví poèet hlav"
 
-#: fdisk/sfdisk.c:2215
+#: fdisk/sfdisk.c:2235
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
 msgstr "    -S# [èi --sectors #]:  nastaví poèet cylindrù"
 
-#: fdisk/sfdisk.c:2216
+#: fdisk/sfdisk.c:2236
 msgid "You can disable all consistency checking with:"
 msgstr "Ovìøování konzistence mù¾ete vypnout pomocí:"
 
-#: fdisk/sfdisk.c:2217
+#: fdisk/sfdisk.c:2237
 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:2223
+#: fdisk/sfdisk.c:2243
 msgid "Usage:"
 msgstr "Pou¾ití:"
 
-#: fdisk/sfdisk.c:2224
+#: fdisk/sfdisk.c:2244
 #, 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:2225
+#: fdisk/sfdisk.c:2245
 #, 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:2226
+#: fdisk/sfdisk.c:2246
 #, 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:2346
+#: fdisk/sfdisk.c:2375
 msgid "no command?\n"
 msgstr "¾ádný pøíkaz?\n"
 
-#: fdisk/sfdisk.c:2471
+#: fdisk/sfdisk.c:2500
 #, c-format
 msgid "total: %d blocks\n"
 msgstr "celkový poèet blokù: %d\n"
 
-#: fdisk/sfdisk.c:2508
+#: fdisk/sfdisk.c:2537
 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:2510
+#: fdisk/sfdisk.c:2539
 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:2512
+#: fdisk/sfdisk.c:2541
 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:2519
+#: fdisk/sfdisk.c:2548
 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:2544
+#: fdisk/sfdisk.c:2573
 #, c-format
 msgid "cannot open %s %s\n"
 msgstr "%s %s nelze otevøít\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2573
 msgid "read-write"
 msgstr "pro ètení/zápis"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2573
 msgid "for reading"
 msgstr "pro ètení"
 
-#: fdisk/sfdisk.c:2569
+#: fdisk/sfdisk.c:2598
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: fdisk/sfdisk.c:2586
+#: fdisk/sfdisk.c:2615
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindrù, %ld hlav, %ld sektorù/stopu\n"
 
-#: fdisk/sfdisk.c:2603
+#: fdisk/sfdisk.c:2632
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
 msgstr "volání BLKGETSIZE ioctl pro %s selhalo\n"
 
-#: fdisk/sfdisk.c:2680
+#: fdisk/sfdisk.c:2709
 #, 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:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
+#: fdisk/sfdisk.c:2726 fdisk/sfdisk.c:2779 fdisk/sfdisk.c:2810
 msgid ""
 "Done\n"
 "\n"
@@ -5021,7 +4578,7 @@ msgstr ""
 "Hotovo\n"
 "\n"
 
-#: fdisk/sfdisk.c:2706
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5031,35 +4588,35 @@ msgstr ""
 "MBR\n"
 "nastartuje pouze z disku s jedním aktivním diskovým oddílem.\n"
 
-#: fdisk/sfdisk.c:2720
+#: fdisk/sfdisk.c:2749
 #, 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:2777
+#: fdisk/sfdisk.c:2806
 #, c-format
-msgid "Bad Id %x\n"
-msgstr "Id %x je chybné\n"
+msgid "Bad Id %lx\n"
+msgstr "Id %lx je chybné\n"
 
-#: fdisk/sfdisk.c:2792
+#: fdisk/sfdisk.c:2821
 msgid "This disk is currently in use.\n"
 msgstr "Tento disk je právì pou¾íván.\n"
 
-#: fdisk/sfdisk.c:2809
+#: fdisk/sfdisk.c:2838
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatální chyba: %s nelze nalézt\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2841
 #, 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:2818
+#: fdisk/sfdisk.c:2847
 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:2820
+#: fdisk/sfdisk.c:2849
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5072,28 +4629,28 @@ msgstr ""
 "v¹echny odkládací prostory na tomto disku. K potlaèení této kontroly mù¾ete\n"
 "pou¾ít pøepínaè --no-reread.\n"
 
-#: fdisk/sfdisk.c:2824
+#: fdisk/sfdisk.c:2853
 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:2828
+#: fdisk/sfdisk.c:2857
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:2837
+#: fdisk/sfdisk.c:2866
 msgid "Old situation:\n"
 msgstr "Stará situace:\n"
 
-#: fdisk/sfdisk.c:2841
+#: fdisk/sfdisk.c:2870
 #, 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:2849
+#: fdisk/sfdisk.c:2878
 msgid "New situation:\n"
 msgstr "Nová situace:\n"
 
-#: fdisk/sfdisk.c:2854
+#: fdisk/sfdisk.c:2883
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5101,19 +4658,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:2857
+#: fdisk/sfdisk.c:2886
 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:2862
+#: fdisk/sfdisk.c:2891
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Vyhovuje Vám to? [ynq] "
 
-#: fdisk/sfdisk.c:2864
+#: fdisk/sfdisk.c:2893
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Ulo¾it na disk? [ynq] "
 
-#: fdisk/sfdisk.c:2869
+#: fdisk/sfdisk.c:2898
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
@@ -5121,15 +4678,15 @@ msgstr ""
 "\n"
 "sfdisk: pøedèasný konec vstupu\n"
 
-#: fdisk/sfdisk.c:2871
+#: fdisk/sfdisk.c:2900
 msgid "Quitting - nothing changed\n"
 msgstr "Konèím - nebyly uèinìny ¾ádné zmìny\n"
 
-#: fdisk/sfdisk.c:2877
+#: fdisk/sfdisk.c:2906
 msgid "Please answer one of y,n,q\n"
 msgstr "Odpovìzte prosím y,n èi q\n"
 
-#: fdisk/sfdisk.c:2885
+#: fdisk/sfdisk.c:2914
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
@@ -5137,7 +4694,7 @@ msgstr ""
 "Nová tabulka rozdìlení disku byla úspì¹nì ulo¾ena.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2891
+#: fdisk/sfdisk.c:2920
 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"
@@ -5167,97 +4724,737 @@ msgstr "Znak '%c' není souèástí není souèástí mé sady znakù."
 msgid "Message '%s' is OK\n"
 msgstr "Zpráva '%s' je v poøádku\n"
 
-#: getopt-1.1.0a/getopt.c:233
+#: getopt-1.1.2/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.1.0a/getopt.c:299
+#: getopt-1.1.2/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.1.0a/getopt.c:319
+#: getopt-1.1.2/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.1.0a/getopt.c:324
+#: getopt-1.1.2/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Pou¾ití: getopt øetìzec-s-volbami pøepínaèe\n"
 
-#: getopt-1.1.0a/getopt.c:325
+#: getopt-1.1.2/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [volby] [--] øetìzec-s-volbami pøepínaèe\n"
 
-#: getopt-1.1.0a/getopt.c:326
+#: getopt-1.1.2/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [volby] -o|--options øetìzec-s-volbami [volby] [--]\n"
 
-#: getopt-1.1.0a/getopt.c:327
+#: getopt-1.1.2/getopt.c:327
 msgid "              parameters\n"
 msgstr "              argumenty\n"
 
-#: getopt-1.1.0a/getopt.c:328
+#: getopt-1.1.2/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.1.0a/getopt.c:329
+#: getopt-1.1.2/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Vypí¹e tuto nápovìdu\n"
 
-#: getopt-1.1.0a/getopt.c:330
+#: getopt-1.1.2/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=dlouhvol   Rozpoznávané dlouhé volby\n"
 
-#: getopt-1.1.0a/getopt.c:331
+#: getopt-1.1.2/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"
+"  -n, --name=názevprog          Název, pod kterým jsou oznamovány chyby\n"
 
-#: getopt-1.1.0a/getopt.c:332
+#: getopt-1.1.2/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.1.0a/getopt.c:333
+#: getopt-1.1.2/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.1.0a/getopt.c:334
+#: getopt-1.1.2/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           ®ádný normální výstup\n"
 
-#: getopt-1.1.0a/getopt.c:335
+#: getopt-1.1.2/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            Nastaví konvence uzavíraní\n"
 
-#: getopt-1.1.0a/getopt.c:336
+#: getopt-1.1.2/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Testuje verzi getopt(1)\n"
 
-#: getopt-1.1.0a/getopt.c:337
-#, fuzzy
+#: getopt-1.1.2/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
-msgstr "  -Q, --quiet-output           ®ádný normální výstup\n"
+msgstr "  -u, --unqote                 neuzavøe výstuo do uvozovek\n"
 
-#: getopt-1.1.0a/getopt.c:338
+#: getopt-1.1.2/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Vypí¹e informace o verzi\n"
 
-#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
+#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
 msgid "missing optstring argument"
 msgstr "chybí øetìzec-s-volbami"
 
-#: 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.1.2/getopt.c:441
+msgid "getopt (enhanced) 1.1.2\n"
+msgstr "getopt (roz¹íøené) 1.1.2\n"
 
-#: getopt-1.1.0a/getopt.c:447
+#: getopt-1.1.2/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "Vnitøní chyba, oznamte ji autorovi."
 
+#: hwclock/cmos.c:164
+msgid "booted from MILO\n"
+msgstr "spu¹tìn pomocí MILO\n"
+
+#: hwclock/cmos.c:173
+msgid "Ruffian BCD clock\n"
+msgstr "hodnoty ulo¾eny v BCD tvaru\n"
+
+#: hwclock/cmos.c:189
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr "vstupnì/výstupní port pro pøístup k hodinám nastaven na 0x%x\n"
+
+#: hwclock/cmos.c:201
+msgid "funky TOY!\n"
+msgstr "pou¾it pøepínaè --funky-toy!\n"
+
+#: hwclock/cmos.c:255
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr "%s: 1000 neúspì¹ných pokusù o atomické provedení %s!"
+
+#: hwclock/cmos.c:579
+#, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "/dev/port nelze otevøít: %s"
+
+#: hwclock/cmos.c:586
+msgid "I failed to get permission because I didn't try.\n"
+msgstr "Jeliko¾ jsem se nesna¾il, nepodaøilo se mi získat práva pro pøístup.\n"
+
+#: hwclock/cmos.c:589
+#, c-format
+msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
+msgstr "%s: pøístup k portu nelze získat:  volání iopl(3) selhalo.\n"
+
+#: hwclock/cmos.c:592
+msgid "Probably you need root privileges.\n"
+msgstr "Pravdìpodobnì je tøeba mít práva superu¾ivatele.\n"
+
+#: hwclock/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"
+
+#: hwclock/hwclock.c:220 hwclock/hwclock.c:313
+msgid "UTC"
+msgstr "greenwichský"
+
+#: hwclock/hwclock.c:220 hwclock/hwclock.c:312
+msgid "local"
+msgstr "místní"
+
+#: hwclock/hwclock.c:296
+#, c-format
+msgid "%s: Warning: unrecognized third line in adjtime file\n"
+msgstr "%s: Varování: neznámý formát tøetího øádku v souboru adjtime\n"
+
+#: hwclock/hwclock.c:298
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr "(Oèekáváno `UTC', `LOCAL' èi nic.)\n"
+
+#: hwclock/hwclock.c:307
+#, c-format
+msgid "Last drift adjustment done at %ld seconds after 1969\n"
+msgstr "Poslední oprava posunu probìhla %ld sekund od roku 1969.\n"
+
+#: hwclock/hwclock.c:309
+#, c-format
+msgid "Last calibration done at %ld seconds after 1969\n"
+msgstr "Poslední kalibrace probìhla %ld sekund od roku 1969.\n"
+
+#: hwclock/hwclock.c:311
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr "Hodiny reálného èasu jsou nastaveny na %s èas.\n"
+
+#: hwclock/hwclock.c:313
+msgid "unknown"
+msgstr "neznámý"
+
+#. -----------------------------------------------------------------------------
+#. 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.
+#.
+#. -----------------------------------------------------------------------------
+#: hwclock/hwclock.c:335
+msgid "Waiting for clock tick...\n"
+msgstr "èekám na tiknutí hodin...\n"
+
+#: hwclock/hwclock.c:339
+msgid "...got clock tick\n"
+msgstr "...hodiny tikly\n"
+
+#: hwclock/hwclock.c:390
+#, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr ""
+"Hodiny reálného èasu obsahují chybné hodnoty: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+
+#: hwclock/hwclock.c:398
+#, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr ""
+"Hodiny reálného èasu: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld sekund od roku "
+"1969\n"
+
+#: hwclock/hwclock.c:426
+#, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Hodiny reálného èasu ukazují %4d/%.2d/%.2d %02d:%02d:%02d\n"
+
+#: hwclock/hwclock.c:453
+#, c-format
+msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr ""
+"Nastavuji hodiny reálného èasu na %.2d:%.2d:%.2d = %ld sekund od roku 1969\n"
+
+#: hwclock/hwclock.c:459
+msgid "Clock not changed - testing only.\n"
+msgstr "Testovací re¾im - Èas nezmìnìn.\n"
+
+#: hwclock/hwclock.c:507
+#, c-format
+msgid ""
+"Time elapsed since reference time has been %.6f seconds.\n"
+"Delaying further to reach the next full second.\n"
+msgstr ""
+"Poèet sekund uplynulých od referenèního èasu: %.6f.\n"
+"Èekám, dokud neuplyne dal¹í celá sekunda.\n"
+
+#: hwclock/hwclock.c:531
+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 ""
+"Registry hodin reálného èasu obsahují hodnoty, které jsou buï chybné (napø.\n"
+"50tý den v mìsíci), èi mimo pøípustný rozsah (napø. rok 2095).\n"
+
+#: hwclock/hwclock.c:541
+#, c-format
+msgid "%s  %.6f seconds\n"
+msgstr "%s  %.6f sekundy\n"
+
+#: hwclock/hwclock.c:575
+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.
+#.
+#: hwclock/hwclock.c:580
+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"
+
+#: hwclock/hwclock.c:586
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr "Spou¹tím pøíkaz 'date': %s\n"
+
+#: hwclock/hwclock.c:590
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr "Pøíkaz 'date' nelze v shellu /bin/sh spustit. Volání popen() selhalo."
+
+#: hwclock/hwclock.c:596
+#, c-format
+msgid "response from date command = %s\n"
+msgstr "odpovìï pøíkazu 'date' = %s\n"
+
+#: hwclock/hwclock.c:598
+#, 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 ""
+"Od pøíkazu 'date' spu¹tìného programem %s, pøi¹la neèekaná odpovìï.\n"
+"Pøíkaz:\n"
+"  %s\n"
+"Odpovìï:\n"
+"  %s\n"
+
+#: hwclock/hwclock.c:607
+#, 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 ""
+"Pøíkaz 'date' spu¹tìný programem %s místo pøevedeného èasu vrátil nìco,\n"
+"co není celým èíslem.\n"
+"Pøíkaz:\n"
+"  %s\n"
+"Odpovìï:\n"
+"  %s\n"
+
+#: hwclock/hwclock.c:617
+#, c-format
+msgid "date string %s equates to %ld seconds since 1969.\n"
+msgstr "Datum %s odpovídá %ld sekundám od roku 1969.\n"
+
+#: hwclock/hwclock.c:649
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot set the "
+"System Time from it.\n"
+msgstr ""
+"Systémový èas nelze podle hodin reálného èasu nastavit, proto¾e neukazují\n"
+"platný èas.\n"
+
+#: hwclock/hwclock.c:671
+msgid "Calling settimeofday:\n"
+msgstr "Volám settimeofday:\n"
+
+#: hwclock/hwclock.c:672
+#, c-format
+msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+
+#: hwclock/hwclock.c:674
+#, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
+
+#: hwclock/hwclock.c:677
+msgid "Not setting system clock because running in test mode.\n"
+msgstr "Testovací re¾im - systémový èas nezmìnìn.\n"
+
+#: hwclock/hwclock.c:685
+msgid "Must be superuser to set system clock.\n"
+msgstr "Nastavit systémový èas mù¾e pouze superu¾ivatel.\n"
+
+#: hwclock/hwclock.c:687
+msgid "settimeofday() failed"
+msgstr "volání settimeofday() selhalo"
+
+#: hwclock/hwclock.c:720
+msgid ""
+"Not adjusting drift factor because the Hardware Clock previously contained "
+"garbage.\n"
+msgstr ""
+"Neopravuji míru posunu, proto¾e hodiny reálného èasu poslednì obsahovaly\n"
+"neplatné hodnoty.\n"
+
+#: hwclock/hwclock.c:724
+msgid ""
+"Not adjusting drift factor because it has been less than a day since the "
+"last calibration.\n"
+msgstr ""
+"Neopravuji míru posunu, proto¾e poslední kalibrace je¹tì neuplynul celý "
+"den.\n"
+
+#: hwclock/hwclock.c:733
+#, 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 ""
+"Hodiny se za posledních %2$d sekund roze¹ly o %1$d sekund, pøesto¾e míra "
+"posunu\n"
+"je nastavena na %3$f sekund/den.\n"
+"Opravuji míru posunu o %4$f sekund.\n"
+
+#: hwclock/hwclock.c:784
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr "Poèet sekund od poslední opravy: %d\n"
+
+#: hwclock/hwclock.c:786
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr "Potøebná zmìna èasu: sekund vpøed: %d ; sekund zpìt: %.6f\n"
+
+#: hwclock/hwclock.c:815
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr "Testovací re¾im - soubor adjtime nezmìnìn.\n"
+
+#: hwclock/hwclock.c:816
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+"Do %s by bylo ulo¾eno následující:\n"
+"%s"
+
+#: hwclock/hwclock.c:840
+msgid "Drift adjustment parameters not updated.\n"
+msgstr "Parametry opravy posunu nezmìnìny.\n"
+
+#: hwclock/hwclock.c:881
+msgid ""
+"The Hardware Clock does not contain a valid time, so we cannot adjust it.\n"
+msgstr "Hodiny reálného èasu obsahují neplatný èas, tudí¾ jej nelze opravit.\n"
+
+#: hwclock/hwclock.c:905
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr "Potøebná oprava je men¹í ne¾ 1 sekunda, proto hodiny nenastavuji.\n"
+
+#: hwclock/hwclock.c:931
+#, c-format
+msgid "Using %s.\n"
+msgstr "Pou¾ívám %s.\n"
+
+#: hwclock/hwclock.c:933
+msgid "No usable clock interface found.\n"
+msgstr "Nebylo nalezeno ¾ádné pou¾itelné rozhraní k hodinám.\n"
+
+#: hwclock/hwclock.c:1028
+msgid "Unable to set system clock.\n"
+msgstr "Systémový èas nelze nastavit.\n"
+
+#: hwclock/hwclock.c:1057
+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 ""
+"Jádro obsahuje hodnotu poèátku epochy pro hodiny reálného èasu pouze na "
+"Alpha\n"
+"systémech.\n"
+"Tento program nebyl pøelo¾en pro Alpha systém ( a tudí¾ pravdìpodobnì nyní\n"
+"nebì¾í na Alphì). Ignorováno.\n"
+
+#: hwclock/hwclock.c:1066
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr "Poèátek epochy nelze z jádra zjistit.\n"
+
+#: hwclock/hwclock.c:1068
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr "Jádro pokládá za poèátek epochy %lu.\n"
+
+#: hwclock/hwclock.c:1071
+msgid ""
+"To set the epoch value, you must use the 'epoch' option to tell to what "
+"value to set it.\n"
+msgstr "Poèátek epochy nastavíte pomocí pøepínaèù epoch a setepoch.\n"
+
+#: hwclock/hwclock.c:1074
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr "Testovací re¾im - poèátek epochy na %d nemìním.\n"
+
+#: hwclock/hwclock.c:1077
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr "Hodnotu poèátku epochy v jádøe nelze nastavit.\n"
+
+#: hwclock/hwclock.c:1106
+#, 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 - nastavuje a zji¹»uje reálný èas (RTC)\n"
+"\n"
+"Pou¾ití: hwclock [funkce] [volby...]\n"
+"\n"
+"Funkce:\n"
+"  --help        vypí¹e tuto nápovìdu\n"
+"  --show        zjistí a vypí¹e aktuální stav hodin reálného èasu\n"
+"  --set         nastaví RTC na hodnotu zadanou pøepínaèem --date\n"
+"  --hctosys     nastaví systémový èas podle hodin reálného èasu\n"
+"  --systohc     nastaví RTC podle aktuálního systémového èasu\n"
+"  --adjust      opraví systematický posun, který nastal od poslední\n"
+"                opravy èi nastavení RTC\n"
+"  --getepoch    vypí¹e poèátek epochy pro hodiny reálného èasu\n"
+"  --setepoch    nastaví poèátek epochy pro hodiny reálného èasu na hodnotu\n"
+"                zadanou pøepínaèem --epoch\n"
+"  --version     vypí¹e oznaèení verze\n"
+"\n"
+"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 %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"
+
+#: hwclock/hwclock.c:1131
+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"
+"                nastaví typ alpha systému (viz hwclock(8))\n"
+
+#: hwclock/hwclock.c:1231
+#, c-format
+msgid "%s takes no non-option arguments.  You supplied %d.\n"
+msgstr ""
+"%s akceptuje pouze pøepínaèe. Zadáno argumentù, které nejsou pøepínaèi: %d\n"
+
+#: hwclock/hwclock.c:1241
+msgid ""
+"You have specified multiple function options.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+"Zadal jste vícero funkèních pøepínaèù. Program mù¾e provést maximálnì jednu\n"
+"funkci najednou.\n"
+
+#: hwclock/hwclock.c:1247
+#, c-format
+msgid ""
+"%s: The --utc and --localtime options are mutually exclusive.  You specified "
+"both.\n"
+msgstr "%s: Pøepínaèe --utc a --localtime nelze pou¾ít zároveò.\n"
+
+#: hwclock/hwclock.c:1260
+msgid "No usable set-to time.  Cannot set clock.\n"
+msgstr "Nebyl zadán platný èas, který mám nastavit. Hodiny nelze nastavit.\n"
+
+#: hwclock/hwclock.c:1275
+msgid "Sorry, only the superuser can change the Hardware Clock.\n"
+msgstr "Hodiny reálného èasu mù¾e nastavit pouze superu¾ivatel.\n"
+
+#: hwclock/hwclock.c:1279
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "Hodiny reálného èasu mù¾e nastavit pouze superu¾ivatel.\n"
+
+#: hwclock/hwclock.c:1283
+msgid ""
+"Sorry, only the superuser can change the Hardware Clock epoch in the "
+"kernel.\n"
+msgstr "Hodnotu poèátku epochy v jádøe mù¾e nastavit pouze superu¾ivatel.\n"
+
+#: hwclock/hwclock.c:1303
+msgid "Cannot access the Hardware Clock via any known method.\n"
+msgstr ""
+"®ádným ze známých zpùsobù nelze získat pøístup k hodinám reálného èasu.\n"
+
+#: hwclock/hwclock.c:1306
+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"
+
+#: hwclock/kd.c:42
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr "Ve smyèce se pokou¹ím zjistit èas pomocí KDGHWCLK.\n"
+
+#: hwclock/kd.c:45
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr "volání KDGHWCLK ioctl selhalo."
+
+#: hwclock/kd.c:66 hwclock/rtc.c:174
+msgid "Timed out waiting for time change.\n"
+msgstr "V Èasovém limitu se nepodaøilo zjistit èas.\n"
+
+#: hwclock/kd.c:70
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr "volání KDGHWCLK ioctl ve smyèce selhalo."
+
+#: hwclock/kd.c:92
+#, c-format
+msgid "ioctl() failed to read time from %s"
+msgstr "èas se pomocí volání ioctl() pro %s nepodaøilo zjistit"
+
+#: hwclock/kd.c:128
+msgid "ioctl KDSHWCLK failed"
+msgstr "volání ioctl KDSHWCLK selhalo"
+
+#: hwclock/kd.c:165
+msgid "Can't open /dev/tty1 or /dev/vc/1"
+msgstr "/dev/tty1 ani /dev/vc/1 nelze otevøít"
+
+#: hwclock/kd.c:170
+msgid "KDGHWCLK ioctl failed"
+msgstr "volání ioctl KDGHWCLK selhalo"
+
+#: hwclock/rtc.c:136
+#, 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"
+
+#: hwclock/rtc.c:158
+#, c-format
+msgid "Waiting in loop for time from %s to change\n"
+msgstr "Èekám ve smyèce na zmìnu èasu z %s\n"
+
+#: hwclock/rtc.c:195 hwclock/rtc.c:250
+#, c-format
+msgid "open() of %s failed"
+msgstr "%s nelze otevøít - volání open() selhalo"
+
+#: hwclock/rtc.c:213
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s nemá pøeru¹ovací funkce. "
+
+#: hwclock/rtc.c:222
+#, c-format
+msgid "read() to %s to wait for clock tick failed"
+msgstr "tikání hodin nelze z %s èíst - volání read() selhalo"
+
+#: hwclock/rtc.c:231
+#, 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"
+
+#: hwclock/rtc.c:234
+#, 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"
+
+#: hwclock/rtc.c:274 hwclock/rtc.c:358 hwclock/rtc.c:404
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s nelze otevøít"
+
+#: hwclock/rtc.c:300
+#, c-format
+msgid "ioctl() to %s to set the time failed.\n"
+msgstr "Èas nelze nastavit - volání ioctl() pro %s selhalo.\n"
+
+#: hwclock/rtc.c:306
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr "Volání ioctl(%s) bylo úspì¹né.\n"
+
+#: hwclock/rtc.c:335
+#, c-format
+msgid "Open of %s failed"
+msgstr "%s nelze otevøít."
+
+#: hwclock/rtc.c:353 hwclock/rtc.c:399
+#, 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 ""
+"Pro zmìnu hodnoty poèátku epochy v jádøe je nutné pou¾ít 'rtc' ovladaè "
+"pomocí\n"
+"zvlá¹tního souboru %s. Tento soubor na tomto systému souborù neexistuje.\n"
+
+#: hwclock/rtc.c:365
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "volání(RTC_EPOCH_READ) pro %s selhalo"
+
+#: hwclock/rtc.c:371
+#, c-format
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr ""
+"Z %2$s byl pomocí RTC_EPOCH_READ ioctl zji¹tìn poèátek epochy (%1$ld).\n"
+
+#. kernel would not accept this epoch value
+#. Hmm - bad habit, deciding not to do what the user asks
+#. just because one believes that the kernel might not like it.
+#: hwclock/rtc.c:391
+#, 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"
+
+#: hwclock/rtc.c:409
+#, c-format
+msgid "setting epoch to %ld with RTC_EPOCH_SET ioctl to %s.\n"
+msgstr ""
+"Nastavuji pomocí RTC_EPOCH_SET ioctl pro %2$s poèátek epochy na %1$ld.\n"
+
+#: hwclock/rtc.c:414
+#, c-format
+msgid ""
+"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"
+
+#: hwclock/rtc.c:417
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "volání ioctl(RTC_EPOCH_SET) pro %s selhalo"
+
+#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
+#, c-format
+msgid "invalid number `%s'\n"
+msgstr "Chybné èíslo `%s'\n"
+
+#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
+#, c-format
+msgid "number `%s' to `%s' out of range\n"
+msgstr "Èíslo `%s' na `%s'. Hodnota je mimo meze.\n"
+
+#: hwclock/shhopt.c:398
+#, c-format
+msgid "unrecognized option `%s'\n"
+msgstr "neznámý pøepínaè `%s'\n"
+
+#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
+#, c-format
+msgid "option `%s' requires an argument\n"
+msgstr "pøepínaè `%s' vy¾aduje argument\n"
+
+#: hwclock/shhopt.c:417
+#, c-format
+msgid "option `%s' doesn't allow an argument\n"
+msgstr "pøepínaè `%s' musí být zadán bez argumentu\n"
+
+#: hwclock/shhopt.c:439
+#, c-format
+msgid "unrecognized option `-%c'\n"
+msgstr "neznámý pøepínaè `-%c'\n"
+
 #: login-utils/agetty.c:306
 msgid "calling open_tty\n"
 msgstr "volám open_tty\n"
@@ -5308,96 +5505,86 @@ msgstr "chybný èasový limit: %s"
 msgid "after getopt loop\n"
 msgstr "po zpracování argumentù pøíkazové øádky\n"
 
-#: login-utils/agetty.c:492
+#: login-utils/agetty.c:524
 msgid "exiting parseargs\n"
 msgstr "opou¹tím funkci parseargs\n"
 
-#: login-utils/agetty.c:504
+#: login-utils/agetty.c:536
 msgid "entered parse_speeds\n"
 msgstr "vstupuji do funkce parse_speeds\n"
 
-#: login-utils/agetty.c:507
+#: login-utils/agetty.c:539
 #, c-format
 msgid "bad speed: %s"
 msgstr "chybná rychlost %s"
 
-#: login-utils/agetty.c:509
+#: login-utils/agetty.c:541
 msgid "too many alternate speeds"
 msgstr "pøíli¹ mnoho alternativních rychlostí"
 
-#: login-utils/agetty.c:511
+#: login-utils/agetty.c:543
 msgid "exiting parsespeeds\n"
 msgstr "opou¹tím funkci parsespeeds\n"
 
-#: 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:602
-#, c-format
-msgid "%s: no utmp entry"
-msgstr "¾ádná utmp polo¾ka pro %s"
-
-#: login-utils/agetty.c:631
+#: login-utils/agetty.c:636
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "/dev: volání chdir() selhalo: %m"
 
-#: login-utils/agetty.c:635
+#: login-utils/agetty.c:640
 #, 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:642
+#: login-utils/agetty.c:647
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:644
+#: login-utils/agetty.c:649
 #, 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:654
+#: login-utils/agetty.c:659
 #, 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:658
+#: login-utils/agetty.c:663
 msgid "duping\n"
 msgstr "volám dup\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:660
+#: login-utils/agetty.c:665
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: volání dup selhalo: %m"
 
-#: login-utils/agetty.c:730
+#: login-utils/agetty.c:735
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:920
 msgid "user"
 msgstr "u¾ivatel"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:920
 msgid "users"
 msgstr "u¾ivatelé"
 
-#: login-utils/agetty.c:1003
+#: login-utils/agetty.c:1008
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: pøeèteno: %m"
 
-#: login-utils/agetty.c:1049
+#: login-utils/agetty.c:1054
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: pøeteèení vstupu"
 
-#: login-utils/agetty.c:1173
+#: login-utils/agetty.c:1178
 #, c-format
 msgid ""
 "Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
@@ -5410,22 +5597,11 @@ 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:41
-#, c-format
-msgid "badlogin: %s\n"
-msgstr "chybné pøihla¹ovací jméno: %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
+#: login-utils/checktty.c:104 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:104
+#: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
 msgstr "pamì» pro ttyclass nelze alokovat"
 
@@ -5434,7 +5610,7 @@ 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:426
+#: login-utils/checktty.c:422
 #, 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"
@@ -5443,48 +5619,48 @@ 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:437
+#: login-utils/checktty.c:433
 #, 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:121 login-utils/chsh.c:107
+#: login-utils/chfn.c:122 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:128 login-utils/chsh.c:114
+#: login-utils/chfn.c:129 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:133 login-utils/chsh.c:119
+#: login-utils/chfn.c:134 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:145
+#: login-utils/chfn.c:146
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr "Mìním finger informace o %s.\n"
+msgstr "Mìním finger informace o u¾ivateli %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/chfn.c:152 login-utils/chfn.c:156 login-utils/chfn.c:163
+#: login-utils/chfn.c:167 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: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
+#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:735
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:318 mount/lomount.c:248
+#: mount/lomount.c:253
 msgid "Password: "
 msgstr "Heslo: "
 
-#: login-utils/chfn.c:178 login-utils/chsh.c:170
+#: login-utils/chfn.c:179 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "Chybné heslo."
 
-#: login-utils/chfn.c:189
+#: login-utils/chfn.c:190
 msgid "Finger information not changed.\n"
 msgstr "Finger informace nebyly zmìnìny.\n"
 
@@ -5505,7 +5681,7 @@ msgstr ""
 msgid "[ --help ] [ --version ]\n"
 msgstr "[ --help ] [ -- version ]\n"
 
-#: login-utils/chfn.c:365 login-utils/chsh.c:283
+#: login-utils/chfn.c:365 login-utils/chsh.c:278
 msgid ""
 "\n"
 "Aborted.\n"
@@ -5534,7 +5710,7 @@ msgstr "Finger informace *NEBYLY* zmìnìny. Zkuste to opìt pozdìji.\n"
 msgid "Finger information changed.\n"
 msgstr "Finger informace byly zmìnìny.\n"
 
-#: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
+#: login-utils/chfn.c:493 login-utils/chsh.c:393 sys-utils/cytune.c:324
 msgid "malloc failed"
 msgstr "volání malloc selhalo"
 
@@ -5564,70 +5740,66 @@ msgstr "Shell *NEBYL* zmìnìn. Zkuste to opìt pozdìji.\n"
 msgid "Shell changed.\n"
 msgstr "Shell byl zmìnìn.\n"
 
-#: login-utils/chsh.c:263
+#: login-utils/chsh.c:260
 #, c-format
-msgid "Usage: %s [ -s shell ] "
-msgstr "Pou¾ití: %s [ -s shell ] "
-
-#: 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 "       [ u¾ivatelské jméno ]\n"
+msgid ""
+"Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ username ]\n"
+msgstr ""
+"Pou¾ití: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"            [ u¾ivatelské jméno ]\n"
 
-#: login-utils/chsh.c:309
+#: login-utils/chsh.c:303
 #, 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:313
+#: login-utils/chsh.c:307
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
 msgstr "%s: \"%s\" neexistuje.\n"
 
-#: login-utils/chsh.c:317
+#: login-utils/chsh.c:311
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
 msgstr "%s: \"%s\" není spustitelným souborem.\n"
 
-#: login-utils/chsh.c:324
+#: login-utils/chsh.c:318
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
 msgstr "%s: '%c' není povoleno.\n"
 
-#: login-utils/chsh.c:328
+#: login-utils/chsh.c:322
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
 msgstr "%s: Kontrolní znaky nejsou povoleny.\n"
 
-#: login-utils/chsh.c:335
+#: login-utils/chsh.c:329
 #, 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:337
+#: login-utils/chsh.c:331
 #, c-format
 msgid "%s: \"%s\" is not listed in /etc/shells.\n"
 msgstr "%s: \"%s\" není v /etc/shells.\n"
 
-#: login-utils/chsh.c:339
+#: login-utils/chsh.c:333
 #, 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:345
+#: login-utils/chsh.c:339
 #, 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:346
+#: login-utils/chsh.c:340
 #, c-format
 msgid "Use %s -l to see list.\n"
 msgstr "Pou¾ijte %s -l pro vypsání seznamu\n"
 
-#: login-utils/chsh.c:367
+#: login-utils/chsh.c:360
 msgid "No known shells.\n"
 msgstr "Není znám ¾ádný shell.\n"
 
@@ -5659,22 +5831,22 @@ msgstr "%s má chybná pøístupová práva"
 msgid "can't read data from %s"
 msgstr "data z %s nelze èíst"
 
-#: login-utils/islocal.c:37
+#: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "%s nelze èíst, konèím."
 
-#: login-utils/last.c:143
+#: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
-"Pou¾ití: last [-#] [-f soubor] [-t tty] [-h jméno poèítaèe]\n"
+"Pou¾ití: last [-#] [-f soubor] [-t tty] [-h název poèítaèe]\n"
 "                [u¾ivatel ...]\n"
 
-#: login-utils/last.c:283
+#: login-utils/last.c:312
 msgid "  still logged in"
 msgstr "  stále pøihlá¹en"
 
-#: login-utils/last.c:305
+#: login-utils/last.c:340
 #, c-format
 msgid ""
 "\n"
@@ -5683,16 +5855,16 @@ msgstr ""
 "\n"
 "wtmp zaèíná %s"
 
-#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
+#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
 msgid "last: malloc failure.\n"
 msgstr "last: volání malloc selhalo.\n"
 
-#: login-utils/last.c:416
+#: login-utils/last.c:441
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:469
-#, c-format, ycp-format
+#: login-utils/last.c:490
+#, c-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
@@ -5700,20 +5872,20 @@ msgstr ""
 "\n"
 "pøeru¹en %10.10s %5.5s \n"
 
-#: login-utils/login.c:373
+#: login-utils/login.c:399
 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:398
+#: login-utils/login.c:426
 msgid "usage: login [-fp] [username]\n"
 msgstr "Pou¾ití: login [fp] [u¾ivatelské jméno]\n"
 
-#: login-utils/login.c:501
+#: login-utils/login.c:535
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: chyba PAM, konèím: %s\n"
 
-#: login-utils/login.c:503
+#: login-utils/login.c:537
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "PAM nelze inicializovat: %s"
@@ -5724,16 +5896,16 @@ msgstr "PAM nelze inicializovat: %s"
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:519
+#: login-utils/login.c:553
 msgid "login: "
 msgstr "Pøihla¹ovací jméno:"
 
-#: login-utils/login.c:553
+#: login-utils/login.c:593
 #, 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:555
+#: login-utils/login.c:597
 msgid ""
 "Login incorrect\n"
 "\n"
@@ -5741,17 +5913,17 @@ msgstr ""
 "Chybné pøihlá¹ení\n"
 "\n"
 
-#: login-utils/login.c:564
+#: login-utils/login.c:606
 #, 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:568
+#: login-utils/login.c:610
 #, 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:571
+#: login-utils/login.c:614
 msgid ""
 "\n"
 "Login incorrect\n"
@@ -5759,30 +5931,30 @@ msgstr ""
 "\n"
 "Chybné pøihlá¹ení\n"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:670
 msgid "Illegal username"
 msgstr "Chybné u¾ivatelské jméno"
 
-#: login-utils/login.c:663
+#: login-utils/login.c:713
 #, 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:668
+#: login-utils/login.c:718
 #, 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:672
+#: login-utils/login.c:722
 #, 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:725
+#: login-utils/login.c:775
 msgid "Login incorrect\n"
 msgstr "Chybné pøihlá¹ení\n"
 
-#: login-utils/login.c:747
+#: login-utils/login.c:797
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5790,100 +5962,78 @@ msgstr ""
 "Ji¾ je pøihlá¹eno pøíli¹ mnoho u¾ivatelù.\n"
 "Zkuste to opìt pozdìji.\n"
 
-#: login-utils/login.c:751
+#: login-utils/login.c:801
 msgid "You have too many processes running.\n"
 msgstr "Máte spu¹tìno pøíli¹ mnoho procesù.\n"
 
-#: login-utils/login.c:797
-msgid "Warning: no Kerberos tickets issued\n"
-msgstr "Varování: ¾ádné Kerberos lístky\n"
-
-#: 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:815
-#, c-format
-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:823
-msgid "Sorry -- your account has expired.\n"
-msgstr "Lituji -- platnost Va¹eho úètu vypr¹ela.\n"
-
-#: login-utils/login.c:829
-#, c-format
-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:1066
+#: login-utils/login.c:1033
 #, 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:1073
+#: login-utils/login.c:1040
 #, 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:1076
+#: login-utils/login.c:1043
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE ROOT NA TTY %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:1046
 #, 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:1082
+#: login-utils/login.c:1049
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "PØIHLÁ©ENÍ U®IVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1060
 #, c-format
 msgid "You have %smail.\n"
 msgstr "Máte %spo¹tu.\n"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1061
 msgid "new "
 msgstr "novou "
 
 #. error in fork()
-#: login-utils/login.c:1113
+#: login-utils/login.c:1088
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: volání fork selhalo: %s"
 
-#: login-utils/login.c:1128
+#: login-utils/login.c:1108
 msgid "setuid() failed"
 msgstr "volání setuid() selhalo"
 
-#: login-utils/login.c:1134
+#: login-utils/login.c:1114
 #, c-format
 msgid "No directory %s!\n"
 msgstr "Adresáø %s neexistuje!\n"
 
-#: login-utils/login.c:1138
+#: login-utils/login.c:1118
 msgid "Logging in with home = \"/\".\n"
 msgstr "Pøihla¹uji s domácím adresáøem nastaveným na \"/\".\n"
 
-#: login-utils/login.c:1146
+#: login-utils/login.c:1126
 msgid "login: no memory for shell script.\n"
 msgstr "login: nedostatek pamìti pro skript shellu.\n"
 
-#: login-utils/login.c:1174
+#: login-utils/login.c:1153
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: skript shellu %s nelze spustit.\n"
 
-#: login-utils/login.c:1177
+#: login-utils/login.c:1156
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: ¾ádný shell: %s.\n"
 
-#: login-utils/login.c:1191
+#: login-utils/login.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -5892,62 +6042,62 @@ msgstr ""
 "\n"
 "Pøihla¹ovací jméno na %s: "
 
-#: login-utils/login.c:1202
+#: login-utils/login.c:1182
 msgid "login name much too long.\n"
 msgstr "pøihla¹ovací jméno je pøíli¹ dlouhé.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1183
 msgid "NAME too long"
 msgstr "JMÉNO je pøíli¹ dlouhé"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1190
 msgid "login names may not start with '-'.\n"
 msgstr "pøihla¹ovací jméno nesmí zaèínat '-'.\n"
 
-#: login-utils/login.c:1220
+#: login-utils/login.c:1200
 msgid "too many bare linefeeds.\n"
 msgstr "pøíli¹ mnoho znakù LF\n"
 
-#: login-utils/login.c:1221
+#: login-utils/login.c:1201
 msgid "EXCESSIVE linefeeds"
 msgstr "PØÍLI© mnoho znakù LF"
 
-#: login-utils/login.c:1231
+#: login-utils/login.c:1212
 #, 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:1325
+#: login-utils/login.c:1308
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Poslední pøihlá¹ení: %.*s "
 
-#: login-utils/login.c:1329
+#: login-utils/login.c:1312
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1332
+#: login-utils/login.c:1315
 #, c-format
 msgid "on %.*s\n"
 msgstr "%.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1335
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "CHYBNÉ PØIHLÁ©ENÍ U®IVATELE %2$s Z %1$s"
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1338
 #, 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:1362
+#: login-utils/login.c:1342
 #, 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:1365
+#: login-utils/login.c:1345
 #, 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"
@@ -5964,205 +6114,205 @@ msgstr "pøíjem zpráv je vypnut\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Pou¾ití: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:67
+#: login-utils/newgrp.c:68
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Kdo jste?"
 
-#: login-utils/newgrp.c:75 login-utils/newgrp.c:85
+#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:80
+#: login-utils/newgrp.c:81
 msgid "newgrp: No such group."
 msgstr "newgrp: ®ádná taková skupina neexistuje."
 
-#: login-utils/newgrp.c:89
+#: login-utils/newgrp.c:90
 msgid "newgrp: Permission denied"
 msgstr "newgrp: Pøístup odmítnut"
 
-#: login-utils/newgrp.c:96
+#: login-utils/newgrp.c:97
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:102
+#: login-utils/newgrp.c:103
 msgid "No shell"
 msgstr "®ádný shell"
 
-#: login-utils/passwd.c:159
+#: login-utils/passwd.c:161
 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:172
+#: login-utils/passwd.c:174
 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:173
+#: login-utils/passwd.c:175
 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:174
+#: login-utils/passwd.c:176
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "Viz passwd(1) pro více informací.\n"
 
-#: login-utils/passwd.c:179
+#: login-utils/passwd.c:181
 msgid "You cannot reuse the old password.\n"
 msgstr "Nemù¾ete opìt pou¾ít staré heslo.\n"
 
-#: login-utils/passwd.c:184
+#: login-utils/passwd.c:186
 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:195 login-utils/passwd.c:202
+#: login-utils/passwd.c:197 login-utils/passwd.c:204
 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:220
+#: login-utils/passwd.c:222
 msgid "Usage: passwd [username [password]]\n"
 msgstr "Pou¾ití: password [u¾ivatelské jméno [heslo]]\n"
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:223
 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:275
+#: login-utils/passwd.c:277
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "Pou¾ití: passwd [foqsvV] [u¾ivatel [heslo]]\n"
 
-#: login-utils/passwd.c:296
+#: login-utils/passwd.c:298
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "%s nelze spustit: %s\n"
 
-#: login-utils/passwd.c:307
+#: login-utils/passwd.c:309
 msgid "Cannot find login name"
 msgstr "Pøihla¹ovací jméno nelze nalézt"
 
-#: login-utils/passwd.c:314 login-utils/passwd.c:321
+#: login-utils/passwd.c:316 login-utils/passwd.c:323
 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:329
+#: login-utils/passwd.c:331
 msgid "Too many arguments.\n"
 msgstr "Pøíli¹ mnoho argumentù.\n"
 
-#: login-utils/passwd.c:334
+#: login-utils/passwd.c:336
 #, 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:338
+#: login-utils/passwd.c:340
 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:344
+#: login-utils/passwd.c:346
 msgid "UID and username does not match, imposter!"
 msgstr "UID a u¾ivatelské jméno se neshodují!"
 
-#: login-utils/passwd.c:349
+#: login-utils/passwd.c:351
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "Mìním heslo u¾ivatele %s\n"
 
-#: login-utils/passwd.c:353
+#: login-utils/passwd.c:355
 msgid "Enter old password: "
 msgstr "Zadejte staré heslo: "
 
-#: login-utils/passwd.c:355
+#: login-utils/passwd.c:357
 msgid "Illegal password, imposter."
 msgstr "Nepovolené heslo."
 
-#: login-utils/passwd.c:367
+#: login-utils/passwd.c:369
 msgid "Enter new password: "
 msgstr "Zadejte nové heslo: "
 
-#: login-utils/passwd.c:369
+#: login-utils/passwd.c:371
 msgid "Password not changed."
 msgstr "Heslo nebylo zmìnìno."
 
-#: login-utils/passwd.c:379
+#: login-utils/passwd.c:380
 msgid "Re-type new password: "
 msgstr "Potvrïte nové heslo: "
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:383
 msgid "You misspelled it. Password not changed."
 msgstr "Pøepsal jste se. Heslo nebylo zmìnìno."
 
-#: login-utils/passwd.c:397
+#: login-utils/passwd.c:398
 #, c-format
 msgid "password changed, user %s"
 msgstr "heslo bylo zmìnìno, u¾ivatel %s"
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:401
 msgid "ROOT PASSWORD CHANGED"
 msgstr "HESLO U®IVATELE ROOT BYLO ZMÌNÌNO"
 
-#: login-utils/passwd.c:402
+#: login-utils/passwd.c:403
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "heslo zmìnìno u¾ivatelem root, u¾ivatel %s"
 
-#: login-utils/passwd.c:409
+#: login-utils/passwd.c:410
 msgid "calling setpwnam to set password.\n"
 msgstr "Volám setpwnam pro nastavení hesla.\n"
 
-#: login-utils/passwd.c:413
+#: login-utils/passwd.c:414
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "Heslo *NEBYLO* zmìnìno. Zkuste to pozdìji.\n"
 
-#: login-utils/passwd.c:419
+#: login-utils/passwd.c:420
 msgid "Password changed.\n"
 msgstr "Heslo bylo zmìnìno.\n"
 
-#: login-utils/shutdown.c:87
+#: login-utils/shutdown.c:113
 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:105
+#: login-utils/shutdown.c:131
 msgid "Shutdown process aborted"
 msgstr "Proces shutdown ukonèen"
 
-#: login-utils/shutdown.c:131
+#: login-utils/shutdown.c:161
 #, 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:225
+#: login-utils/shutdown.c:255
 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:277
+#: login-utils/shutdown.c:306
 msgid "for maintenance; bounce, bounce"
 msgstr "kvùli údr¾bì"
 
-#: login-utils/shutdown.c:281
+#: login-utils/shutdown.c:310
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "èasový limit = %d, klid = %d, restart = %d\n"
 
-#: login-utils/shutdown.c:306
+#: login-utils/shutdown.c:335
 msgid "The system is being shut down within 5 minutes"
 msgstr "Systém bude za 5 minut vypnut"
 
-#: login-utils/shutdown.c:310
+#: login-utils/shutdown.c:339
 msgid "Login is therefore prohibited."
 msgstr "Pøihla¹ování je tudí¾ zakázáno."
 
-#: login-utils/shutdown.c:331
+#: login-utils/shutdown.c:360
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%s u¾ivatelem %s: %s"
 
-#: login-utils/shutdown.c:332
+#: login-utils/shutdown.c:361
 msgid "rebooted"
 msgstr "restartován"
 
-#: login-utils/shutdown.c:332
+#: login-utils/shutdown.c:361
 msgid "halted"
 msgstr "vypnut"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:387
+#: login-utils/shutdown.c:424
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
@@ -6170,7 +6320,7 @@ msgstr ""
 "\n"
 "Proè jsem po restartu stále na¾ivu?"
 
-#: login-utils/shutdown.c:389
+#: login-utils/shutdown.c:426
 msgid ""
 "\n"
 "Now you can turn off the power..."
@@ -6178,103 +6328,118 @@ msgstr ""
 "\n"
 "Nyní mù¾ete vypnout proud..."
 
-#: login-utils/shutdown.c:404
+#: login-utils/shutdown.c:442
 msgid "Calling kernel power-off facility...\n"
 msgstr "Volám zaøízení jádra pro vypínání proudu...\n"
 
-#: login-utils/shutdown.c:407
+#: login-utils/shutdown.c:445
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "Chyba pøi vypínání proudu\t%s\n"
 
-#: login-utils/shutdown.c:415
+#: login-utils/shutdown.c:453
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "Spou¹tím program \"%s\" ...\n"
 
-#: login-utils/shutdown.c:418
+#: login-utils/shutdown.c:456
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "Chyba pøi spu¹tìní\t%s\n"
 
-#: login-utils/shutdown.c:441
+#. gettext crashes on \a
+#: login-utils/shutdown.c:483
 #, c-format
-msgid "URGENT: broadcast message from %s:"
-msgstr "NALÉHAVÉ: v¹eobecná zpráva od %s:"
-
-#: login-utils/shutdown.c:447
-msgid "System going down IMMEDIATELY!\n"
-msgstr "Systém bude OKAM®ITÌ vypnut!\n"
+msgid "URGENT: broadcast message from %s:"
+msgstr "NALÉHAVÉ: zpráva pro v¹echny od %s:"
 
-#: login-utils/shutdown.c:450
+#: login-utils/shutdown.c:489
 #, c-format
-msgid "System going down in %d hour%s %d minutes"
-msgstr "Systém bude vypnut za %dh%s%dmin"
+msgid "System going down in %d hours %d minutes"
+msgstr "Systém bude vypnut za %dh %dmin"
 
-#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
-msgid "s"
-msgstr " "
+#: login-utils/shutdown.c:492
+#, c-format
+msgid "System going down in 1 hour %d minutes"
+msgstr "Systém bude vypnut za 1h %dmin"
 
-#: login-utils/shutdown.c:453
+#: login-utils/shutdown.c:495
 #, c-format
-msgid "System going down in %d minute%s\n"
-msgstr "Systém bude vypnut za %dmin%s\n"
+msgid "System going down in %d minutes\n"
+msgstr "Systém bude vypnut za %dmin\n"
+
+#: login-utils/shutdown.c:498
+msgid "System going down in 1 minute\n"
+msgstr "Systém bude vypnut za 1min\n"
 
-#: login-utils/shutdown.c:459
+#: login-utils/shutdown.c:500
+msgid "System going down IMMEDIATELY!\n"
+msgstr "Systém bude OKAM®ITÌ vypnut!\n"
+
+#: login-utils/shutdown.c:505
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:516
+#: login-utils/shutdown.c:562
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "Swapoff nelze spustit - volání fork selhalo."
 
-#: login-utils/shutdown.c:524
+#: login-utils/shutdown.c:570
 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:543
+#: login-utils/shutdown.c:589
 msgid "Cannot fork for umount, trying manually."
 msgstr "Umount nelze spustit - volání fork selhalo, zkou¹ím to ruènì."
 
-#: login-utils/shutdown.c:552
+#: login-utils/shutdown.c:598
 #, 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:556
+#: login-utils/shutdown.c:602
 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:561
+#: login-utils/shutdown.c:607
 msgid "Unmounting any remaining filesystems..."
 msgstr "Odpojuji v¹echny zbývající systémy souborù..."
 
-#: login-utils/shutdown.c:595
-#, fuzzy, c-format
+#: login-utils/shutdown.c:643
+#, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr "shutdown: %s nelze odpojit\n"
+msgstr "shutdown: %s nelze odpojit: %s\n"
 
-#: login-utils/simpleinit.c:109
+#: login-utils/simpleinit.c:128
 msgid "Booting to single user mode.\n"
 msgstr "Startuji do re¾imu pro jednoho u¾ivatele.\n"
 
-#: login-utils/simpleinit.c:113
+#: login-utils/simpleinit.c:132
 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:117
+#: login-utils/simpleinit.c:136
 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:166
+#: login-utils/simpleinit.c:202
 msgid "error opening fifo\n"
 msgstr "Chyba pøi otevírání pojmenované roury\n"
 
-#: login-utils/simpleinit.c:271
+#: login-utils/simpleinit.c:240
+msgid "error running finalprog\n"
+msgstr "chyba pøi bìhu závìreèného programu\n"
+
+#. Error
+#: login-utils/simpleinit.c:244
+msgid "error forking finalprog\n"
+msgstr "volání fork pro závìreèný program selhalo\n"
+
+#: login-utils/simpleinit.c:323
 msgid ""
 "\n"
 "Wrong password.\n"
@@ -6282,130 +6447,153 @@ msgstr ""
 "\n"
 "Chybné heslo.\n"
 
-#: login-utils/simpleinit.c:341
+#: login-utils/simpleinit.c:396
+msgid "lstat of path failed\n"
+msgstr "volání lstat pro cestu selhalo\n"
+
+#: login-utils/simpleinit.c:404
 msgid "stat of path failed\n"
 msgstr "volání stat pro cestu selhalo\n"
 
-#: login-utils/simpleinit.c:348
+#: login-utils/simpleinit.c:412
 msgid "open of directory failed\n"
 msgstr "adresáø nelze otevøít\n"
 
-#: login-utils/simpleinit.c:415
+#: login-utils/simpleinit.c:479
 msgid "fork failed\n"
 msgstr "volání fork selhalo\n"
 
-#: login-utils/simpleinit.c:445 text-utils/more.c:1541
+#: login-utils/simpleinit.c:510 text-utils/more.c:1622
 msgid "exec failed\n"
 msgstr "volání exec selhalo\n"
 
-#: login-utils/simpleinit.c:469
+#: login-utils/simpleinit.c:534
 msgid "cannot open inittab\n"
 msgstr "inittab nelze otevøít\n"
 
-#: login-utils/simpleinit.c:529
+#: login-utils/simpleinit.c:601
 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/simpleinit.c:907
+#, c-format
+msgid "error stopping service: \"%s\""
+msgstr "chyba pøi ukonèování slu¾by: \"%s\""
 
-#: login-utils/ttymsg.c:81
+#: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
 msgstr "pøíli¹ mnoho iov (zmìòte kód v wall/ttymsg.c)"
 
-#: login-utils/ttymsg.c:91
+#: login-utils/ttymsg.c:85
 msgid "excessively long line arg"
 msgstr "pøíli¹ dlouhý øádek s argumenty"
 
-#: login-utils/ttymsg.c:145
+#: login-utils/ttymsg.c:139
 msgid "cannot fork"
 msgstr "volání fork selhalo"
 
-#: login-utils/ttymsg.c:149
+#: login-utils/ttymsg.c:143
 #, c-format
 msgid "fork: %s"
 msgstr "fork: %s"
 
-#: login-utils/ttymsg.c:177
+#: login-utils/ttymsg.c:171
 #, c-format
 msgid "%s: BAD ERROR"
 msgstr "%s: ZÁVA®NÁ CHYBA"
 
-#: login-utils/vipw.c:145
+#: login-utils/vipw.c:139
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s: soubor %s je ji¾ pou¾íván.\n"
 
-#: login-utils/vipw.c:161
+#: login-utils/vipw.c:155
 #, 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:167
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: can't link %s: %s\n"
 msgstr "%s: volání link pro %s selhalo: %s\n"
 
-#: login-utils/vipw.c:188
+#: login-utils/vipw.c:192
 #, 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:211
+#: login-utils/vipw.c:215
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: volání fork selhalo\n"
 
-#: login-utils/vipw.c:251
+#: login-utils/vipw.c:255
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s nezmìnìno\n"
 
-#: login-utils/vipw.c:294
+#: login-utils/vipw.c:274
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: ¾ádné zmìny\n"
 
-#: login-utils/wall.c:103
+#: login-utils/vipw.c:323
+msgid "You are using shadow groups on this system.\n"
+msgstr "Tento systém pou¾ívá stínové skupiny.\n"
+
+#: login-utils/vipw.c:324
+msgid "You are using shadow passwords on this system.\n"
+msgstr "Tento systém pou¾ívá stínová hesla.\n"
+
+#: login-utils/vipw.c:325
+#, c-format
+msgid "Would you like to edit %s now [y/n]? "
+msgstr "Chcete teï editovat soubor %s [y/n]?"
+
+#: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
 msgstr "Pou¾ití: %s [soubor]\n"
 
-#: login-utils/wall.c:151
+#: login-utils/wall.c:152
 #, c-format
 msgid "%s: can't open temporary file.\n"
 msgstr "%s: doèasný soubor nelze otevøít.\n"
 
-#: login-utils/wall.c:178
+#: login-utils/wall.c:179
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "V¹eobecná zpráva od %s@%s"
 
-#: login-utils/wall.c:188
+#: login-utils/wall.c:197
+#, c-format
+msgid "%s: will not read %s - use stdin.\n"
+msgstr "%s: nebudu èíst %s - pou¾ijte stdin.\n"
+
+#: login-utils/wall.c:202
 #, c-format
 msgid "%s: can't read %s.\n"
 msgstr "%s: %s nelze èíst.\n"
 
-#: login-utils/wall.c:213
+#: login-utils/wall.c:224
 #, c-format
 msgid "%s: can't stat temporary file.\n"
 msgstr "%s: volání stat pro doèasný soubor selhalo.\n"
 
-#: login-utils/wall.c:222
+#: login-utils/wall.c:234
 #, c-format
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: doèasný soubor nelze èíst.\n"
 
-#: misc-utils/cal.c:186
+#: misc-utils/cal.c:217
 msgid "illegal month value: use 1-12"
 msgstr "chybná hodnota pro mìsíc: pou¾ijte 1-12"
 
-#: misc-utils/cal.c:190
+#: misc-utils/cal.c:221
 msgid "illegal year value: use 1-9999"
 msgstr "chybná hodnota pro rok: pou¾ijte 1-9999"
 
-#: misc-utils/cal.c:486
+#: misc-utils/cal.c:581
 msgid "usage: cal [-mjyV] [[month] year]\n"
 msgstr "Pou¾ití: cal [mjyV] [[mìsíc] rok]\n"
 
@@ -6419,48 +6607,48 @@ msgstr "Pou¾ití: %s [+formát] [den mìsíc rok]\n"
 msgid "St. Tib's Day"
 msgstr "Den svatého Tiba"
 
-#: misc-utils/kill.c:210
+#: misc-utils/kill.c:206
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: neznámý signál %s\n"
 
-#: misc-utils/kill.c:272
+#: misc-utils/kill.c:269
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
 msgstr "%s: proces \"%s\" nelze nalézt\n"
 
-#: misc-utils/kill.c:316
+#: misc-utils/kill.c:313
 #, 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:356
+#: misc-utils/kill.c:353
 #, 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:357
+#: misc-utils/kill.c:354
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "         %s -l [ signál ]\n"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, 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:243
+#: misc-utils/logger.c:247
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
 msgstr "logger: neznámé pøíslu¹enství: %s\n"
 
-#: misc-utils/logger.c:255
+#: misc-utils/logger.c:259
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
-msgstr "logger: neznámé jméno priority: %s\n"
+msgstr "logger: neznámý název priority: %s\n"
 
-#: misc-utils/logger.c:282
+#: misc-utils/logger.c:286
 msgid ""
 "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
 msgstr ""
@@ -6481,63 +6669,88 @@ msgstr "%s nelze nalézt\n"
 msgid "Got %d bytes from %s\n"
 msgstr "%db z %s\n"
 
-#: misc-utils/namei.c:100
+#: misc-utils/namei.c:101
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
 msgstr "namei: aktuální adresáø nelze zjistit - %s\n"
 
-#: misc-utils/namei.c:111
+#: misc-utils/namei.c:112
 #, 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:120
+#: misc-utils/namei.c:121
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "Pou¾ití: namei [mx] jméno cesty [jméno cesty ...]\n"
+msgstr "Pou¾ití: namei [mx] název cesty [název cesty ...]\n"
 
-#: misc-utils/namei.c:145
+#: misc-utils/namei.c:146
 msgid "namei: could not chdir to root!\n"
 msgstr "namei: do adresáøe root nelze pøejít!\n"
 
-#: misc-utils/namei.c:152
+#: misc-utils/namei.c:153
 msgid "namei: could not stat root!\n"
 msgstr "namei: volání stat pro adresáø root selhalo!\n"
 
-#: misc-utils/namei.c:207
+#: misc-utils/namei.c:208
 #, 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:236
+#: misc-utils/namei.c:237
 #, 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:246
+#: misc-utils/namei.c:247
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr "  *** PØEKROÈEN UNIXOVÝ LIMIT PRO SYMBOLICKÉ ODKAZY ***\n"
 
-#: misc-utils/namei.c:283
+#: misc-utils/namei.c:284
 #, 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:118
-#, fuzzy
-msgid "usage: script [-a] [-f] [file]\n"
-msgstr "Pou¾ití: script [-a] [soubor]\n"
+#: misc-utils/rename.c:38
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek pamìti\n"
 
-#: misc-utils/script.c:139
+#: misc-utils/rename.c:56
+#, c-format
+msgid "%s: renaming %s to %s failed: %s\n"
+msgstr "%s: %s nelze pøejmenovat na %s: %s\n"
+
+#: misc-utils/rename.c:86
+#, c-format
+msgid "call: %s from to files...\n"
+msgstr "Pou¾ití: %s z na soubory...\n"
+
+#: misc-utils/script.c:105
+#, c-format
+msgid ""
+"Warning: `%s' is a symlink.\n"
+"Use `%s [options] %s' if you really want to use it.\n"
+"Script not started.\n"
+msgstr ""
+"Varování: `%s' není symbolickým odkazem.\n"
+"Pokud jej opravdu chcete pou¾ít, tak zadejte `%s [pøepínaèe] %s'.\n"
+"Script nebyl spu¹tìn.\n"
+
+#: misc-utils/script.c:151
+msgid "usage: script [-a] [-f] [-q] [file]\n"
+msgstr "Pou¾ití: script [-a] [-f] [-q] [soubor]\n"
+
+#: misc-utils/script.c:174
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script spu¹tìn. Soubor je %s.\n"
 
-#: misc-utils/script.c:205
+#: misc-utils/script.c:248
 #, c-format
 msgid "Script started on %s"
 msgstr "Script spu¹tìn %s"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:312
 #, c-format
 msgid ""
 "\n"
@@ -6546,16 +6759,16 @@ msgstr ""
 "\n"
 "Script ukonèen %s"
 
-#: misc-utils/script.c:277
+#: misc-utils/script.c:320
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script utils. Soubor je %s\n"
 
-#: misc-utils/script.c:288
+#: misc-utils/script.c:331
 msgid "openpty failed\n"
 msgstr "volání openpty selhalo\n"
 
-#: misc-utils/script.c:322
+#: misc-utils/script.c:365
 msgid "Out of pty's\n"
 msgstr "Nejsou ¾ádná dal¹í volná pty\n"
 
@@ -6567,7 +6780,7 @@ msgstr "%s: Chybný pøepínaè, pou¾ití\n"
 
 #: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
-msgstr "  [ -term jméno terminálu]\n"
+msgstr "  [ -term název terminálu]\n"
 
 #: misc-utils/setterm.c:747
 msgid "  [ -reset ]\n"
@@ -6726,22 +6939,6 @@ msgstr "  [ -blength [0-2000] ]\n"
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq frekvence ]\n"
 
-#: misc-utils/setterm.c:862
-msgid "snow.on"
-msgstr "snì¾ení zapnuto"
-
-#: misc-utils/setterm.c:864
-msgid "snow.off"
-msgstr "snì¾ení vypnuto"
-
-#: misc-utils/setterm.c:870
-msgid "softscroll.on"
-msgstr "softwarové rolování zapnuto"
-
-#: misc-utils/setterm.c:872
-msgid "softscroll.off"
-msgstr "softwarové rolování vypnuto"
-
 #: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
 msgstr "¹etøící re¾im nelze vypnout/zapnout\n"
@@ -6765,68 +6962,73 @@ msgstr "Chyba pøi ukládání obrazu obrazovky\n"
 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:1227
+#: misc-utils/setterm.c:1228
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: promìnná TERM není nastavena.\n"
 
-#: misc-utils/whereis.c:155
+#: misc-utils/whereis.c:157
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
-msgstr "whereis [ -sbmu ] [ -SBM adresáø ... -f ] jméno...\n"
+msgstr "whereis [ -sbmu ] [ -SBM adresáø ... -f ] název...\n"
 
-#: misc-utils/write.c:100
+#: misc-utils/write.c:99
 msgid "write: can't find your tty's name\n"
-msgstr "write: jméno Va¹eho tty nelze zjistit\n"
+msgstr "write: název Va¹eho tty nelze zjistit\n"
 
-#: misc-utils/write.c:111
+#: misc-utils/write.c:110
 msgid "write: you have write permission turned off.\n"
 msgstr "write: máte vypnut pøíjem zpráv.\n"
 
-#: misc-utils/write.c:132
+#: misc-utils/write.c:131
 #, 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:140
+#: misc-utils/write.c:139
 #, 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:147
+#: misc-utils/write.c:146
 msgid "usage: write user [tty]\n"
 msgstr "Pou¾ití: write u¾ivatel [tty]\n"
 
-#: misc-utils/write.c:246
+#: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write: u¾ivatel %s není pøihlá¹en\n"
 
-#: misc-utils/write.c:255
+#: misc-utils/write.c:243
 #, 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:259
+#: misc-utils/write.c:247
 #, 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:323
+#: misc-utils/write.c:313
+#, c-format
+msgid "Message from %s@%s (as %s) on %s at %s ..."
+msgstr "Zpráva od %s@%s (jako %s) na %s v %s ..."
+
+#: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Zpráva od %s@%s na %s v %s ..."
 
-#: mount/fstab.c:116
+#: mount/fstab.c:113
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "varování: chyba pøi ètení %s: %s"
 
-#: mount/fstab.c:143 mount/fstab.c:166
+#: mount/fstab.c:141 mount/fstab.c:164
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr "varování: %s nelze otevøít: %s"
 
-#: mount/fstab.c:147
+#: mount/fstab.c:145
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: %s nelze otevøít - pou¾ívám %s\n"
@@ -6835,42 +7037,42 @@ msgstr "mount: %s nelze otevøít - pou¾ívám %s\n"
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:376
+#: mount/fstab.c:374
 #, 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:388
+#: mount/fstab.c:386
 #, 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:400
+#: mount/fstab.c:398
 #, 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:415
+#: mount/fstab.c:413
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
 msgstr "Zamykací soubor %s nelze zamknout: %s\n"
 
-#: mount/fstab.c:428
+#: mount/fstab.c:426
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "Zamykací soubor %s nelze zamknout: %s"
 
-#: mount/fstab.c:430
+#: mount/fstab.c:428
 msgid "timed out"
 msgstr "vypr¹el èas"
 
-#: mount/fstab.c:437
+#: mount/fstab.c:435
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -6879,54 +7081,46 @@ msgstr ""
 "Odkaz %s nelze vytvoøit.\n"
 "Není nìkde zastaralý zamykací soubor?\n"
 
-#: mount/fstab.c:483 mount/fstab.c:491
+#: mount/fstab.c:484 mount/fstab.c:520
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "nelze otevøít %s (%s) - mtab nebyl aktualizován"
 
-#: 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: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:533 mount/fstab.c:539
+#: mount/fstab.c:528
 #, c-format
 msgid "error writing %s: %s"
 msgstr "chyba pøi zápisu %s: %s"
 
-#: mount/fstab.c:546
+#: mount/fstab.c:536
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "chyba pøi zmìnì módu %s: %s\n"
 
-#: mount/fstab.c:553
+#: mount/fstab.c:554
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nelze pøejmenovat na %s: %s\n"
 
-#: mount/lomount.c:78
+#: mount/lomount.c:79
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: zaøízení %s nelze otevøít: %s\n"
 
-#: mount/lomount.c:84
+#: mount/lomount.c:85
 #, c-format
 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/lomount.c:90
 #, 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:148
+#: mount/lomount.c:176
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: ¾ádné zaøízení /dev/loop# nelze nalézt"
 
-#: mount/lomount.c:152
+#: mount/lomount.c:180
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -6934,7 +7128,7 @@ msgstr ""
 "mount: ¾ádné loop zaøízení nelze nalézt.\n"
 "       Nemá /dev/loop# chybné vìt¹í èíslo zaøízení?"
 
-#: mount/lomount.c:156
+#: mount/lomount.c:184
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -6945,7 +7139,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:162
+#: mount/lomount.c:190
 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"
@@ -6957,53 +7151,53 @@ msgstr ""
 "má\n"
 "       chybné vìt¹í èíslo?"
 
-#: mount/lomount.c:166
+#: mount/lomount.c:194
 msgid "mount: could not find any free loop device"
 msgstr "mount: ¾ádné volné loop zaøízení nelze najít"
 
-#: mount/lomount.c:197
+#: mount/lomount.c:224
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Nepodporovaný ¹ifrovací typ %s\n"
 
-#: mount/lomount.c:211
+#: mount/lomount.c:238
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nelze zamknout v pamìti. Konèím.\n"
 
-#: mount/lomount.c:231
+#: mount/lomount.c:257
 msgid "Init (up to 16 hex digits): "
 msgstr "Init (a¾ 16 ¹estnáctkových èíslic): "
 
-#: mount/lomount.c:238
+#: mount/lomount.c:264
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Ne¹estnáctková èíslice '%c'.\n"
 
-#: mount/lomount.c:245
+#: mount/lomount.c:271
 #, 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:261
+#: mount/lomount.c:287
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d): úspìch\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:298
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: zaøízení %s nelze smazat: %s\n"
 
-#: mount/lomount.c:282
+#: mount/lomount.c:308
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): úspìch\n"
 
-#: mount/lomount.c:290
+#: mount/lomount.c:316
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Tento program byl pøelo¾en bez podpory pro loop. Pøelo¾te jej znovu.\n"
 
-#: mount/lomount.c:327
+#: mount/lomount.c:353
 #, c-format
 msgid ""
 "usage:\n"
@@ -7016,11 +7210,11 @@ msgstr ""
 "  %s -d loop zaøízení                                 # sma¾e\n"
 "  %s [ -e ¹ifra ] [ -o posun ] loop zaøízení soubor   # nastaví\n"
 
-#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+#: mount/lomount.c:371 mount/sundries.c:41 mount/sundries.c:56
 msgid "not enough memory"
 msgstr "Nedostatek pamìti"
 
-#: mount/lomount.c:416
+#: mount/lomount.c:442
 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"
 
@@ -7038,159 +7232,159 @@ msgstr "[mntent]: øádek %d v %s je chybný%s\n"
 msgid "; rest of file ignored"
 msgstr "; ignoruji zbytek souboru"
 
-#: mount/mount.c:351
+#: mount/mount.c:379
 #, 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:354
+#: mount/mount.c:383
 #, 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:375
+#: mount/mount.c:404
 #, c-format
 msgid "mount: can't open %s for writing: %s"
 msgstr "mount: %s nelze otevøít pro zápis: %s"
 
-#: mount/mount.c:390 mount/mount.c:593
+#: mount/mount.c:419 mount/mount.c:620
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: chyba pøi zápisu %s: %s"
 
-#: mount/mount.c:397
+#: mount/mount.c:426
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: chyba pøi zmìnì módu %s: %s"
 
-#: mount/mount.c:442
+#: mount/mount.c:471
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s vypadá jako odkládací prostor - nepøipojeno"
 
-#: mount/mount.c:485
+#: mount/mount.c:514
 msgid "mount failed"
 msgstr "pøipojení se nezdaøilo"
 
-#: mount/mount.c:487
+#: mount/mount.c:516
 #, 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:515
+#: mount/mount.c:544
 msgid "mount: loop device specified twice"
 msgstr "mount: zaøízení loop bylo zadáno dvakrát"
 
-#: mount/mount.c:520
+#: mount/mount.c:549
 msgid "mount: type specified twice"
 msgstr "mount: typ byl zadán dvakrát"
 
-#: mount/mount.c:532
+#: mount/mount.c:561
 msgid "mount: skipping the setup of a loop device\n"
 msgstr "mount: pøeskakuji nastavení loop zaøízení\n"
 
-#: mount/mount.c:541
+#: mount/mount.c:570
 #, 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:545
+#: mount/mount.c:574
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: nepodaøilo se nastavit zaøízení loop\n"
 
-#: mount/mount.c:549
+#: mount/mount.c:578
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: zaøízení loop bylo korektnì nastaveno\n"
 
-#: mount/mount.c:588
+#: mount/mount.c:615
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: %s nelze otevøít: %s"
 
-#: mount/mount.c:611
+#: mount/mount.c:638
 #, c-format
 msgid "mount: cannot not open %s for setting speed"
 msgstr "mount: %s nelze pro nastavení rychlosti otevøít"
 
-#: mount/mount.c:614
+#: mount/mount.c:641
 #, c-format
 msgid "mount: cannot set speed: %s"
 msgstr "mount: rychlost nelze nastavit: %s"
 
-#: mount/mount.c:675 mount/mount.c:1202
+#: mount/mount.c:702 mount/mount.c:1231
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: volání fork selhalo: %s"
 
-#: mount/mount.c:749
+#: mount/mount.c:776
 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
+#: mount/mount.c:816
 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:800
+#: mount/mount.c:827
 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:803
+#: mount/mount.c:830
 msgid "mount: you must specify the filesystem type"
 msgstr "mount: musíte zadat typ systému souborù"
 
 #. should not happen
-#: mount/mount.c:806
+#: mount/mount.c:833
 msgid "mount: mount failed"
 msgstr "mount: pøipojení se nezdaøilo"
 
-#: mount/mount.c:812 mount/mount.c:847
+#: mount/mount.c:839 mount/mount.c:874
 #, c-format
 msgid "mount: mount point %s is not a directory"
 msgstr "mount: pøípojný bod %s není adresáøem"
 
-#: mount/mount.c:814
+#: mount/mount.c:841
 msgid "mount: permission denied"
 msgstr "mount: pøístup odmítnut"
 
-#: mount/mount.c:816
+#: mount/mount.c:843
 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:820 mount/mount.c:824
+#: mount/mount.c:847 mount/mount.c:851
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s je ji¾ pøipojeno"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:826
+#: mount/mount.c:853
 msgid "mount: proc already mounted"
 msgstr "mount: proc je ji¾ pøipojeno"
 
-#: mount/mount.c:828
+#: mount/mount.c:855
 #, 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:834
+#: mount/mount.c:861
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: pøípojný bod %s neexistuje"
 
-#: mount/mount.c:836
+#: mount/mount.c:863
 #, 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:839
+#: mount/mount.c:866
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: speciální zaøízení %s neexistuje"
 
-#: mount/mount.c:849
+#: mount/mount.c:876
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -7199,12 +7393,12 @@ msgstr ""
 "mount: speciální zaøízení %s neexistuje\n"
 "              (název cesty nezaèíná adresáøem)\n"
 
-#: mount/mount.c:862
+#: mount/mount.c:889
 #, 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:864
+#: mount/mount.c:891
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -7213,46 +7407,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:898
+#: mount/mount.c:925
 msgid "mount table full"
 msgstr "tabulka pøipojení je plná"
 
-#: mount/mount.c:900
+#: mount/mount.c:927
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: superblok nelze pøeèíst"
 
-#: mount/mount.c:904
-#, fuzzy, c-format
+#: mount/mount.c:931
+#, c-format
 msgid "mount: %s: unknown device"
-msgstr "umount: blokové zaøízení %s je chybné"
+msgstr "umount: blokové zaøízení %s je neznámé"
 
-#: mount/mount.c:909
+#: mount/mount.c:936
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
 msgstr "mount: typ ss %s není podporován jádrem"
 
-#: mount/mount.c:921
+#: mount/mount.c:948
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: pravdìpodobnì jste myslel %s"
 
-#: mount/mount.c:923
+#: mount/mount.c:950
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: mo¾ná jste myslel iso9660 ?"
 
-#: mount/mount.c:926
+#: mount/mount.c:953
 #, 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:932
+#: mount/mount.c:959
 #, 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:934
+#: mount/mount.c:961
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -7260,82 +7454,82 @@ msgid ""
 msgstr ""
 "mount: jádro nerozpoznalo %s jako blokové zaøízení (mo¾ná `insmod ovladaè'?)"
 
-#: mount/mount.c:937
+#: mount/mount.c:964
 #, 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:940
+#: mount/mount.c:967
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s není blokovým zaøízením"
 
-#: mount/mount.c:943
+#: mount/mount.c:970
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s není platným blokovým zaøízením"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:946
+#: mount/mount.c:973
 msgid "block device "
 msgstr "blokové zaøízení"
 
-#: mount/mount.c:948
-#, fuzzy, c-format
+#: mount/mount.c:975
+#, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "umount: %s nelze znovu pøipojit v re¾imu pouze pro ètení\n"
+msgstr "umount: %s%s nelze pøipojit v re¾imu pouze pro ètení"
 
-#: mount/mount.c:952
+#: mount/mount.c:979
 #, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr "mount: %s%s je chránìno proti zápisu, pøipojuji pouze pro ètení"
 
-#: mount/mount.c:968
+#: mount/mount.c:995
 #, 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:1057
-#, fuzzy, c-format
+#: mount/mount.c:1084
+#, c-format
 msgid "mount: going to mount %s by %s\n"
-msgstr "mount: zva¾te pøipojení %s dle %s\n"
+msgstr "mount: chystám se pøipojit %s dle %s\n"
 
-#: mount/mount.c:1058
+#: mount/mount.c:1085
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1058
+#: mount/mount.c:1085
 msgid "label"
-msgstr "jméno"
+msgstr "popis"
 
-#: mount/mount.c:1060 mount/mount.c:1430
+#: mount/mount.c:1087 mount/mount.c:1466
 msgid "mount: no such partition found"
 msgstr "mount: ¾ádný odpovídající diskový oddíl nebyl nalezen"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1095
 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:1084
+#: mount/mount.c:1111
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: pracuji na pozadí \"%s\"\n"
 
-#: mount/mount.c:1095
+#: mount/mount.c:1122
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: konèím \"%s\"\n"
 
-#: mount/mount.c:1153
+#: mount/mount.c:1182
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s je ji¾ pøipojeno na %s\n"
 
-#: mount/mount.c:1270
+#: mount/mount.c:1300
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -7354,152 +7548,177 @@ msgid ""
 "       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
+"Pou¾ití: mount -V               : vypí¹e informace o verzi\n"
+"       mount -h                 : vypí¹e tuto nápovìdu\n"
+"       mount                    : zobrazí seznam pøipojených systémù "
+"souborù\n"
+"       mount -l                 : toté¾ plus popisky svazkù\n"
+"Toto byly pøepínaèe slou¾ící k získání informací. Nyní k pøepínaèùm "
+"slou¾ícím\n"
+"k pøipojování systémù souborù.\n"
+"Syntaxe je`mount [-t sstyp] nìco nìkam'.\n"
+"Údaje obsa¾ené v /etc/fstab mohou být vynechány.\n"
+"       mount -a                 : pøipojí ve¹keré polo¾ky z /etc/fstab\n"
+"       mount zaøízení           : pøipojí zaøízení na známé místo\n"
+"       mount adresáø            : pøipojí známé zaøízení k adresáøi\n"
+"       mount -t typ zaø adr     : bì¾ný pøíkaz pro pøipojení\n"
+"Uvìdomte si, ¾e tím, co se pøipojuje, ve skuteènosti není zaøízení, ale "
+"systém\n"
+"souborù (daného typu), který se na tomto zaøízení nachází.\n"
+"Mù¾ete také pøipojit ji¾ pøístupný adresáøový strom na jiné místo:\n"
+"       mount --bind starý_adresáø nový_adrersáø\n"
+"Zaøízení mù¾e být udáno jménem (napø. /dev/hda1 èi /dev/cdrom), popiskou\n"
+"(pomocí pepínaèe -L popiska) nebo uuid (pomocí pøepínaèe -U uuid).\n"
+"Dal¹í pøepínaèe: [-nfFrsvw] [-o volby].\n"
+"Dal¹í informace viz man(8).\n"
+
+#: mount/mount.c:1450
 msgid "mount: only root can do that"
 msgstr "mount: toto mù¾e provést pouze superu¾ivatel"
 
-#: mount/mount.c:1419
+#: mount/mount.c:1455
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: %s nebylo nalezeno - vytváøím jej..\n"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1468
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: pøipojuji %s\n"
 
-#: mount/mount.c:1441
-msgid "not mounted anything"
-msgstr "nic nebylo pøipojeno"
+#: mount/mount.c:1477
+msgid "nothing was mounted"
+msgstr "nebyl pøipojen ¾ádný diskový oddíl"
 
-#: mount/mount.c:1456
+#: mount/mount.c:1492
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: %s nelze v %s nalézt"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1507
 #, 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:99
+#: mount/mount_by_label.c:109
 #, 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
+#: mount/mount_by_label.c:211
 msgid "mount: bad UUID"
 msgstr "mount: chybné UUID"
 
-#: mount/mount_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:319
 #, 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:260
+#: mount/mount_guess_fstype.c:322
 #, 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:263
+#: mount/mount_guess_fstype.c:325
 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:265
+#: mount/mount_guess_fstype.c:327
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Vyzkou¹ím typ %s\n"
 
-#: mount/mount_guess_fstype.c:329
+#: mount/mount_guess_fstype.c:403
 #, c-format
 msgid "Trying %s\n"
 msgstr "Pou¾ívám %s.\n"
 
-#: mount/nfsmount.c:225
+#: mount/nfsmount.c:233
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: pøíli¹ dlouhý argument pro poèítaè:adresáø\n"
 
-#: mount/nfsmount.c:238
+#: mount/nfsmount.c:246
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr "mount: varování: vícenásobná jména poèítaèù nejsou podporována\n"
+msgstr "mount: varování: vícenásobné názvy poèítaèù nejsou podporovány\n"
 
-#: mount/nfsmount.c:242
+#: mount/nfsmount.c:250
 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:253 mount/nfsmount.c:510
+#: mount/nfsmount.c:261 mount/nfsmount.c:517
 #, c-format
 msgid "mount: can't get address for %s\n"
 msgstr "mount:  adresu %s nelze zjistit\n"
 
-#: mount/nfsmount.c:259
+#: mount/nfsmount.c:267
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: ¹patné hp->h_length\n"
 
-#: mount/nfsmount.c:276
+#: mount/nfsmount.c:284
 msgid "mount: excessively long option argument\n"
 msgstr "mount: pøíli¹ dlouhý argument pro volbu\n"
 
-#: mount/nfsmount.c:368
+#: mount/nfsmount.c:376
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Varování: neznámá volba pro proto=.\n"
 
-#: mount/nfsmount.c:375
+#: mount/nfsmount.c:383
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Varování: volba namlen není podporována.\n"
 
-#: mount/nfsmount.c:379
+#: mount/nfsmount.c:387
 #, 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:414
+#: mount/nfsmount.c:421
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Varování: volba nolock není podporována.\n"
 
-#: mount/nfsmount.c:419
+#: mount/nfsmount.c:426
 #, 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:516
+#: mount/nfsmount.c:523
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: ¹patné hp->h_length?\n"
 
-#: mount/nfsmount.c:692
+#: mount/nfsmount.c:709
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS pøes TCP není podporováno.\n"
 
-#: mount/nfsmount.c:699
+#: mount/nfsmount.c:716
 msgid "nfs socket"
 msgstr "nfs soket"
 
-#: mount/nfsmount.c:703
+#: mount/nfsmount.c:720
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:714
+#: mount/nfsmount.c:734
+msgid "nfs server reported service unavailable"
+msgstr "tato slu¾ba je na tomto nfs serveru nedostupná"
+
+#: mount/nfsmount.c:743
 msgid "used portmapper to find NFS port\n"
 msgstr "pro nalezení NFS portu jsem pou¾il portmapper\n"
 
-#: mount/nfsmount.c:718
+#: mount/nfsmount.c:747
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "pou¾ívám port %d pro nfs server\n"
 
-#: mount/nfsmount.c:729
+#: mount/nfsmount.c:758
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:816
+#: mount/nfsmount.c:845
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "návratová hodnota nfs status %d je neznámá"
@@ -7531,113 +7750,113 @@ msgstr "%s na %s\n"
 msgid "swapon: cannot stat %s: %s\n"
 msgstr "swapon: volání stat pro %s selhalo: %s\n"
 
-#: mount/swapon.c:100
+#: mount/swapon.c:105
 #, c-format
-msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
+msgid "swapon: warning: %s has insecure permissions %04o, %04o suggested\n"
 msgstr ""
 "swapon: varování: pøístupová práva pro %s (%04o) nejsou bezpeèná, pou¾ijte "
-"0600\n"
+"%04o\n"
 
-#: mount/swapon.c:108
+#: mount/swapon.c:115
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
 msgstr "swapon: soubor %s vynechávám - zdá se, ¾e v nìm jsou díry.\n"
 
-#: mount/swapon.c:213
+#: mount/swapon.c:220
 #, c-format
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: %s nelze otevøít: %s\n"
 
-#: mount/umount.c:69
+#: mount/umount.c:73
 msgid "umount: compiled without support for -f\n"
 msgstr "umount byl pøelo¾en bez podpory pro -f\n"
 
-#: mount/umount.c:121
+#: mount/umount.c:139
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "poèítaè: %s, adresáø: %s\n"
 
-#: mount/umount.c:138
+#: mount/umount.c:159
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: adresu %s nelze zjistit\n"
 
-#: mount/umount.c:143
+#: mount/umount.c:164
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: chybná hodnota hostp->h_length\n"
 
-#: mount/umount.c:181
+#: mount/umount.c:202
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: blokové zaøízení %s je chybné"
 
-#: mount/umount.c:183
+#: mount/umount.c:204
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s není pøipojeno"
 
-#: mount/umount.c:185
+#: mount/umount.c:206
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: superblok nelze na %s zapsat"
 
 #. Let us hope fstab has a line "proc /proc ..."
 #. and not "none /proc ..."
-#: mount/umount.c:189
+#: mount/umount.c:210
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: zaøízení %s je ji¾ pou¾íváno"
 
-#: mount/umount.c:191
+#: mount/umount.c:212
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s nelze najít"
 
-#: mount/umount.c:193
+#: mount/umount.c:214
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: musíte být superu¾ivatelem, abyste mohl odpojit %s"
 
-#: mount/umount.c:195
+#: mount/umount.c:216
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: bloková zaøízení nejsou na systému souborù povolena"
 
-#: mount/umount.c:197
+#: mount/umount.c:218
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:241
+#: mount/umount.c:262
 msgid "no umount2, trying umount...\n"
 msgstr "nenalezl jsem umount2, zkou¹ím umount...\n"
 
-#: mount/umount.c:254
+#: mount/umount.c:278
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "%s nelze odpojit - zkou¹ím %s\n"
 
-#: mount/umount.c:272
+#: mount/umount.c:296
 #, 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:282
+#: mount/umount.c:306
 #, 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:290
+#: mount/umount.c:315
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s odpojeno\n"
 
-#: mount/umount.c:374
+#: mount/umount.c:402
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: seznam systémù souborù na odpojení nelze nalézt"
 
-#: mount/umount.c:403
+#: mount/umount.c:431
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7647,55 +7866,55 @@ msgstr ""
 "         umount -a [-f] [-r] [-n] [-v] [-t typy vfs]\n"
 "         umount [-f] [-r] [-n] [-v] speciální soubor | uzel...\n"
 
-#: 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:479
+#: mount/umount.c:447
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Zkou¹ím odpojit %s\n"
 
-#: mount/umount.c:483
+#: mount/umount.c:451
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "%s nelze v mtab najít\n"
 
-#: mount/umount.c:487
+#: mount/umount.c:455
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: podle mtab není %s pøipojeno"
 
-#: mount/umount.c:489
+#: mount/umount.c:457
 #, 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:501
+#: mount/umount.c:469
 #, 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:504
+#: mount/umount.c:472
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: pøipojení %s neodpovídá fstab"
 
-#: mount/umount.c:525
+#: mount/umount.c:493
 #, 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:536
+#: mount/umount.c:504
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
 msgstr "unmount: pouze u¾ivatel %s mù¾e odpojit %s ze %s"
 
-#: sys-utils/ctrlaltdel.c:26
+#: mount/umount.c:573
+msgid "umount: only root can do that"
+msgstr "umount: toto mù¾e provést pouze u¾ivatel root"
+
+#: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
 msgstr "Pouze u¾ivatel root mù¾e nastavit chování Ctrl-Alt-Del.\n"
 
-#: sys-utils/ctrlaltdel.c:41
+#: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "Pou¾ití: ctrlaltdel hard|soft\n"
 
@@ -7933,7 +8152,7 @@ msgstr ""
 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:268 sys-utils/ipcs.c:470
+#: sys-utils/ipcs.c:268
 msgid "kernel not configured for shared memory\n"
 msgstr "jádro nepodporuje sdílenou pamì»\n"
 
@@ -7941,356 +8160,364 @@ msgstr "jádro nepodporuje sdílenou pamì»\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "------ Omezení pro sdílenou pamì» --------\n"
 
-#: sys-utils/ipcs.c:277
+#. 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 = %d\n"
-msgstr "maximální poèet segmentù = %d\n"
+msgid "max number of segments = %ld\n"
+msgstr "maximální poèet segmentù = %ld\n"
 
-#: sys-utils/ipcs.c:278
+#: sys-utils/ipcs.c:281
 #, c-format
-msgid "max seg size (kbytes) = %d\n"
-msgstr "maximální velikost segmentu (v kilobajtech) = %d\n"
+msgid "max seg size (kbytes) = %ld\n"
+msgstr "maximální velikost segmentu (v kilobajtech) = %ld\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:283
 #, c-format
-msgid "max total shared memory (kbytes) = %d\n"
-msgstr "celkové maximum pro sdílenou pamì» (v kilobajtech) = %d\n"
+msgid "max total shared memory (kbytes) = %ld\n"
+msgstr "celkové maximum pro sdílenou pamì» (v kilobajtech) = %ld\n"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:285
 #, c-format
-msgid "min seg size (bytes) = %d\n"
-msgstr "minimální velikost segmentu (v bajtech) = %d\n"
+msgid "min seg size (bytes) = %ld\n"
+msgstr "minimální velikost segmentu (v bajtech) = %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:290
 msgid "------ Shared Memory Status --------\n"
 msgstr "------ Stav sdílené pamìti --------\n"
 
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:291
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "alokované segmenty %d\n"
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:292
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "alokované stránky %ld\n"
 
-#: sys-utils/ipcs.c:287
+#: sys-utils/ipcs.c:293
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "rezidentní stránky %ld\n"
 
-#: sys-utils/ipcs.c:288
+#: sys-utils/ipcs.c:294
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "stránky v odkládacím prostoru %ld\n"
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:295
 #, 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:294
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "------ Tvùrci/vlastníci segmentù sdílené pamìti ------\n"
 
-#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:418 sys-utils/ipcs.c:518
 #, c-format
-msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s\n"
 
-#: 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
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:315
+#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:425
 msgid "shmid"
 msgstr "shmid"
 
-#: 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
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:321 sys-utils/ipcs.c:419
+#: sys-utils/ipcs.c:434 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
 msgid "perms"
 msgstr "práva"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:419 sys-utils/ipcs.c:519
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:519
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
 msgstr "------ Èasy pøipojení/odpojení/zmìny pro sdílenou pamì» --------\n"
 
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:307
 #, c-format
-msgid "%-10s%-10s  %-20s%-20s%-20s\n"
-msgstr "%-10s%-10s  %-20s%-20s%-20s\n"
+msgid "%-10s %-10s %-20s %-20s %-20s\n"
+msgstr "%-10s %-10s %-20s %-20s %-20s\n"
 
-#: 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
+#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:315 sys-utils/ipcs.c:321
+#: sys-utils/ipcs.c:425 sys-utils/ipcs.c:434 sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
 msgid "owner"
 msgstr "vlastník"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:308
 msgid "attached"
 msgstr "pøipojení"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:308
 msgid "detached"
 msgstr "odpojení"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:309
 msgid "changed"
 msgstr "zmìna"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:313
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "------ Tvùrce sdílené pamìti/poslední operace --------\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:314 sys-utils/ipcs.c:530
 #, c-format
-msgid "%-10s%-10s%-10s%-10s\n"
-msgstr "%-10s%-10s%-10s%-10s\n"
+msgid "%-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:315
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:315
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:311
+#: sys-utils/ipcs.c:319
 msgid "------ Shared Memory Segments --------\n"
 msgstr "------ Segmenty sdílené pamìti --------\n"
 
-#: sys-utils/ipcs.c:312
+#: sys-utils/ipcs.c:320
 #, c-format
-msgid "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"
 
-#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:321 sys-utils/ipcs.c:434 sys-utils/ipcs.c:537
 msgid "key"
 msgstr "klíè"
 
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:321
 msgid "bytes"
 msgstr "bajty"
 
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:322
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:322 sys-utils/ipcs.c:435
 msgid "status"
 msgstr "stav"
 
-#: 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
+#: sys-utils/ipcs.c:343 sys-utils/ipcs.c:345 sys-utils/ipcs.c:347
+#: sys-utils/ipcs.c:456 sys-utils/ipcs.c:458 sys-utils/ipcs.c:558
+#: sys-utils/ipcs.c:560 sys-utils/ipcs.c:562 sys-utils/ipcs.c:615
+#: sys-utils/ipcs.c:617 sys-utils/ipcs.c:646 sys-utils/ipcs.c:648
+#: sys-utils/ipcs.c:650 sys-utils/ipcs.c:674
 msgid "Not set"
 msgstr "Nenastaveno"
 
-#: sys-utils/ipcs.c:355
+#: sys-utils/ipcs.c:372
 msgid "dest"
 msgstr "cíl"
 
-#: sys-utils/ipcs.c:356
+#: sys-utils/ipcs.c:373
 msgid "locked"
 msgstr "zamèeno"
 
-#: sys-utils/ipcs.c:376
+#: sys-utils/ipcs.c:393
 msgid "kernel not configured for semaphores\n"
 msgstr "jádro nepodporuje semafory\n"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:399
 msgid "------ Semaphore Limits --------\n"
 msgstr "------Omezení pro semafory --------\n"
 
-#: sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:403
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "maximální poèet polí = %d\n"
 
-#: sys-utils/ipcs.c:387
+#: sys-utils/ipcs.c:404
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "maximální poèet semaforù v poli = %d\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:405
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "celkový maximální poèet semaforù = %d\n"
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:406
 #, 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:390
+#: sys-utils/ipcs.c:407
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "maximální hodnota semaforu = %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:411
 msgid "------ Semaphore Status --------\n"
 msgstr "------ Stav semaforu --------\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:412
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "pou¾itá pole = %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:413
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "alokované semafory = %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:417
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "------ Tvùrci/vlastníci polí semaforù --------\n"
 
-#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:419 sys-utils/ipcs.c:434
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:423
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "------ Èasy operace/zmìny sdílené pamìti --------\n"
 
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:424
 #, c-format
-msgid "%-8s%-10s  %-26.24s %-26.24s\n"
-msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
+msgid "%-8s %-10s %-26.24s %-26.24s\n"
+msgstr "%-8s %-10s %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:408
+#: sys-utils/ipcs.c:425
 msgid "last-op"
 msgstr "poslední operace"
 
-#: sys-utils/ipcs.c:408
+#: sys-utils/ipcs.c:425
 msgid "last-changed"
 msgstr "poslední zmìna"
 
-#: sys-utils/ipcs.c:415
+#: sys-utils/ipcs.c:432
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Pole semaforù --------\n"
 
-#: sys-utils/ipcs.c:416
+#: sys-utils/ipcs.c:433
 #, c-format
-msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s %-12s\n"
+msgstr "%-10s %-10s %-10s %-10s  %-10s %-12s\n"
 
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:435
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:478
+#: sys-utils/ipcs.c:495
+msgid "kernel not configured for message queues\n"
+msgstr "jádro nepodporuje fronty zpráv\n"
+
+#: sys-utils/ipcs.c:503
 msgid "------ Messages: Limits --------\n"
 msgstr "------ Zprávy: Omezení --------\n"
 
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:504
 #, c-format
 msgid "max queues system wide = %d\n"
 msgstr "celkový maximální poèet front = %d\n"
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:505
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "maximální velikost zprávy (v bajtech) = %d\n"
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:506
 #, 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:485
+#: sys-utils/ipcs.c:510
 msgid "------ Messages: Status --------\n"
 msgstr "------ Zprávy: Stav --------\n"
 
-#: sys-utils/ipcs.c:486
+#: sys-utils/ipcs.c:511
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "alokované fronty = %d\n"
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:512
 #, c-format
 msgid "used headers = %d\n"
 msgstr "pou¾ité hlavièky = %d\n"
 
-#: sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:513
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "pou¾itý prostor (v bajtech) = %d\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:517
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr "------ Fronty zpráv: Tvùrci/Vlastníci --------\n"
 
-#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:537
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:523
 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:499
+#: sys-utils/ipcs.c:524
 #, c-format
-msgid "%-8s%-10s  %-20s%-20s%-20s\n"
-msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
+msgid "%-8s %-10s %-20s %-20s %-20s\n"
+msgstr "%-8s %-10s %-20s %-20s %-20s\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:525
 msgid "send"
 msgstr "odeslání"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:525
 msgid "recv"
 msgstr "pøíjem"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:525
 msgid "change"
 msgstr "zmìna"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:529
 msgid "------ Message Queues PIDs --------\n"
 msgstr "------ PID pro fronty zpráv --------\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:531
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:531
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:509
+#: sys-utils/ipcs.c:535
 msgid "------ Message Queues --------\n"
 msgstr "------ Fronty zpráv --------\n"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:536
 #, c-format
-msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
+msgid "%-10s %-10s %-10s %-10s %-12s %-12s\n"
+msgstr "%-10s %-10s %-10s %-10s %-12s %-12s\n"
 
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:538
 msgid "used-bytes"
 msgstr "u¾ité bajty"
 
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:538
 msgid "messages"
 msgstr "zprávy"
 
-#: sys-utils/ipcs.c:570
+#: sys-utils/ipcs.c:606
 #, c-format
 msgid ""
 "\n"
@@ -8299,41 +8526,37 @@ msgstr ""
 "\n"
 "shmid segmentu sdílené pamìti = %d\n"
 
-#: sys-utils/ipcs.c:571
+#: sys-utils/ipcs.c:607
 #, 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:573
+#: sys-utils/ipcs.c:609
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mód=%#o\tpøístupová práva=%#o\n"
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:611
 #, c-format
-msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
-msgstr "bajtù=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
+msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "bajtù=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:577
+#: sys-utils/ipcs.c:614
 #, c-format
-msgid "att_time=%s"
-msgstr "pøipoj_èas=%s"
+msgid "att_time=%-26.24s\n"
+msgstr "pøipoj_èas=%-26.24s\n"
 
-#: 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:579
+#: sys-utils/ipcs.c:616
 #, c-format
-msgid "det_time=%s"
-msgstr "odpoj_èas=%s"
+msgid "det_time=%-26.24s\n"
+msgstr "odpoj_èas=%-26.24s\n"
 
-#: sys-utils/ipcs.c:581
+#: sys-utils/ipcs.c:618 sys-utils/ipcs.c:649
 #, c-format
-msgid "change_time=%s"
-msgstr "èas_zmìny=%s"
+msgid "change_time=%-26.24s\n"
+msgstr "èas_zmìny=%-26.24s\n"
 
-#: sys-utils/ipcs.c:597
+#: sys-utils/ipcs.c:633
 #, c-format
 msgid ""
 "\n"
@@ -8342,26 +8565,27 @@ msgstr ""
 "\n"
 "msgid fronty zpráv=%d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:634
 #, 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:600
+#: sys-utils/ipcs.c:636
 #, 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"
+msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:603
+#: sys-utils/ipcs.c:645
 #, c-format
-msgid "send_time=%srcv_time=%schange_time=%s"
-msgstr "send_time=%srcv_time=%schange_time=%s"
+msgid "send_time=%-26.24s\n"
+msgstr "èas odeslání=%-26.24s\n"
 
-#: 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:647
+#, c-format
+msgid "rcv_time=%-26.24s\n"
+msgstr "èas pøíjmu=%-26.24s\n"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:667
 #, c-format
 msgid ""
 "\n"
@@ -8370,99 +8594,90 @@ msgstr ""
 "\n"
 "semid pole semaforù = %d\n"
 
-#: sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:668
 #, 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:626
+#: sys-utils/ipcs.c:670
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mód=%#o, pøístupová práva=%#o\n"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:672
 #, c-format
-msgid "nsems = %d\n"
-msgstr "nsems = %d\n"
+msgid "nsems = %ld\n"
+msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:673
 #, c-format
-msgid "otime = %s"
-msgstr "èas poslední operace = %s"
+msgid "otime = %-26.24s\n"
+msgstr "èas poslední operace = %-26.24s\n"
 
-#: sys-utils/ipcs.c:630
+#: sys-utils/ipcs.c:675
 #, c-format
-msgid "ctime = %s"
-msgstr "èas zmìny = %s"
+msgid "ctime = %-26.24s\n"
+msgstr "èas zmìny = %-26.24s\n"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:677
 #, c-format
-msgid "%-10s%-10s%-10s%-10s%-10s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s\n"
+msgid "%-10s %-10s %-10s %-10s %-10s\n"
+msgstr "%-10s %-10s %-10s %-10s %-10s\n"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:678
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:678
 msgid "value"
 msgstr "hodnota"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:678
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:678
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:678
 msgid "pid"
 msgstr "pid"
 
-#: 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
+msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
+msgstr "Pou¾ití: rdev [ -rv ] [ -o POSUN ] [ OBRAZ [ HODNOTA [ POSUN ] ] ]"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:70
 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:69
+#: sys-utils/rdev.c:71
 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:70
+#: sys-utils/rdev.c:72
 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: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:72
+#: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
 msgstr "  rdev -r /dev/fd0 627            nastaví velikost RAMDISKU"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr "  rdev -v /dev/fd0 1              nastaví startovací VIDEOMÓD"
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   posun v bajtech"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:76
 msgid "  rootflags ...                   same as rdev -R"
 msgstr "  root pøíznaky ...               stejné jako rdev -R"
 
-#: sys-utils/rdev.c:76
-msgid "  swapdev ...                     same as rdev -s"
-msgstr "  odkládací prostor ...           stejné jako rdev -s"
-
 #: sys-utils/rdev.c:77
 msgid "  ramsize ...                     same as rdev -r"
 msgstr "  velikost ram ...                stejné jako rdev -r"
@@ -8481,12 +8696,17 @@ msgstr ""
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr "          Pomocí -R 1 pøipojíte pouze pro ètení, -R 0 umo¾ní zápis."
 
-#: sys-utils/readprofile.c:52
+#: sys-utils/rdev.c:246
+msgid "missing comma"
+msgstr "chybí èárka"
+
+#: sys-utils/readprofile.c:54
 #, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (default = \"%s\")\n"
 "\t -p <pro-file> (default = \"%s\")\n"
+"\t -M <mult>     set the profiling multiplier to <mult>\n"
 "\t -i            print only info about the sampling step\n"
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
@@ -8496,6 +8716,7 @@ msgstr ""
 "%s: Pou¾ití: \"%s [pøepínaèe]\n"
 "\t -m <mapsoubor>  (implicitní = \"%s\")\n"
 "\t -p <pro-soubor> (implicitní = \"%s\")\n"
+"\t -M <hodnota>  nastaví HODNOTU profilovacího multiplikátoru\n"
 "\t -i            vypí¹e pouze informace o profilovacím kroku\n"
 "\t -v            vypí¹e podrobné informace\n"
 "\t -a            vypí¹e ve¹keré symboly i pokud je hodnota èítaèe 0\n"
@@ -8507,64 +8728,65 @@ msgstr ""
 msgid "%s Version %s\n"
 msgstr "%s Verze %s\n"
 
-#: sys-utils/readprofile.c:128
-msgid "anything\n"
-msgstr "cokoliv\n"
-
-#: sys-utils/readprofile.c:157
+#: sys-utils/readprofile.c:175
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Profilovací_krok: %i\n"
 
-#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
+#: sys-utils/readprofile.c:188 sys-utils/readprofile.c:211
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): chybný map øádek\n"
 
-#: sys-utils/readprofile.c:183
+#: sys-utils/readprofile.c:199
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: \"_stext\" nelze v %s nalézt\n"
 
-#: sys-utils/readprofile.c:226
+#: sys-utils/readprofile.c:222
+#, c-format
+msgid "%s: profile address out of range. Wrong map file?\n"
+msgstr "%s: adresa profilu je mimo rozsah. Chybný mapovací soubor?\n"
+
+#: sys-utils/readprofile.c:248
 msgid "total"
 msgstr "celkem"
 
-#: sys-utils/renice.c:67
+#: sys-utils/renice.c:68
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
 "Pou¾ití: renice priorita [ [ -p ] pid ] [[ -g ] pgrp ] [ [ -u ] u¾ivatel ]\n"
 
-#: sys-utils/renice.c:94
+#: sys-utils/renice.c:95
 #, c-format
 msgid "renice: %s: unknown user\n"
 msgstr "renice: %s: neznámý u¾ivatel\n"
 
-#: sys-utils/renice.c:102
+#: sys-utils/renice.c:103
 #, c-format
 msgid "renice: %s: bad value\n"
 msgstr "renice: %s: chybná hodnota\n"
 
-#: sys-utils/renice.c:121
+#: sys-utils/renice.c:122
 msgid "getpriority"
 msgstr "getpriority"
 
-#: sys-utils/renice.c:126
+#: sys-utils/renice.c:127
 msgid "setpriority"
 msgstr "setpriority"
 
-#: sys-utils/renice.c:129
+#: sys-utils/renice.c:130
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: pùvodní priorita %d, nová priorita %d\n"
 
-#: sys-utils/setsid.c:23
+#: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
 msgstr "Pou¾ití: %s program [arg ...]\n"
 
-#: sys-utils/tunelp.c:74
+#: sys-utils/tunelp.c:75
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8575,86 +8797,86 @@ msgstr ""
 "            -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s |\n"
 "            -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:90
+#: sys-utils/tunelp.c:91
 msgid "malloc error"
 msgstr "chyba malloc"
 
-#: sys-utils/tunelp.c:102
+#: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s: chybná hodnota\n"
 
-#: sys-utils/tunelp.c:241
+#: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s není lp zaøízením\n"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
 msgstr "status %s je %d"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:264
 msgid ", busy"
 msgstr ", zaneprázdnìna"
 
-#: sys-utils/tunelp.c:264
+#: sys-utils/tunelp.c:265
 msgid ", ready"
 msgstr ", pøipravena"
 
-#: sys-utils/tunelp.c:265
+#: sys-utils/tunelp.c:266
 msgid ", out of paper"
 msgstr ", do¹el papír"
 
-#: sys-utils/tunelp.c:266
+#: sys-utils/tunelp.c:267
 msgid ", on-line"
 msgstr ", zapnuta"
 
-#: sys-utils/tunelp.c:267
+#: sys-utils/tunelp.c:268
 msgid ", error"
 msgstr ", chyba"
 
-#: sys-utils/tunelp.c:284
+#: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "chyba LPGETIRQ"
 
-#: sys-utils/tunelp.c:290
+#: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s pou¾ívá IRQ %d\n"
 
-#: sys-utils/tunelp.c:292
+#: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s pou¾ívá poll\n"
 
-#: text-utils/col.c:154
+#: text-utils/col.c:155
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col: chybný argument %s pro pøepínaè -l\n"
 
-#: text-utils/col.c:521
+#: text-utils/col.c:537
 msgid "usage: col [-bfpx] [-l nline]\n"
 msgstr "Pou¾ití: col [-bfpx] [-l poè. øádkù]\n"
 
-#: text-utils/col.c:527
+#: text-utils/col.c:543
 msgid "col: write error.\n"
 msgstr "col: chyba pøi ukládání\n"
 
-#: text-utils/col.c:534
+#: text-utils/col.c:550
 #, c-format
 msgid "col: warning: can't back up %s.\n"
 msgstr "col: varování: %s nelze zazálohovat.\n"
 
-#: text-utils/col.c:535
+#: text-utils/col.c:551
 msgid "past first line"
 msgstr "jsem za prvním øádkem"
 
-#: text-utils/col.c:535
+#: text-utils/col.c:551
 msgid "-- line already flushed"
 msgstr "-- øádek ji¾ není v bufru"
 
-#: text-utils/colcrt.c:98
+#: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "Pou¾ití: %s [ - ] [-2 ] [ soubor ... ]\n"
@@ -8682,12 +8904,12 @@ msgstr ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_soubor] [-n délka] [-s vzdálenost] "
 "[soubor ...]\n"
 
-#: text-utils/more.c:330
+#: text-utils/more.c:263
 #, c-format
-msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
-msgstr "Pou¾ití: %s [-dfln] [+èíslo øádku | +/vzorek] jméno1 jméno2 ...\n"
+msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
+msgstr "Pou¾ití: %s [-dflpcsu] [+èíslo øádku | +/vzorek] název1 název2 ...\n"
 
-#: text-utils/more.c:505
+#: text-utils/more.c:521
 #, c-format
 msgid ""
 "\n"
@@ -8699,7 +8921,7 @@ msgstr ""
 "\n"
 
 #. simple ELF detection
-#: text-utils/more.c:544
+#: text-utils/more.c:560
 #, c-format
 msgid ""
 "\n"
@@ -8710,34 +8932,34 @@ msgstr ""
 "***** %s není textovým souborem *****\n"
 "\n"
 
-#: text-utils/more.c:647
+#: text-utils/more.c:663
 msgid "[Use q or Q to quit]"
 msgstr "[Stisknìte q èi Q pro ukonèení]"
 
-#: text-utils/more.c:826
+#: text-utils/more.c:843
 msgid "--More--"
-msgstr "--Více--"
+msgstr "--Pokraèování--"
 
-#: text-utils/more.c:828
+#: text-utils/more.c:845
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Dal¹í soubor: %s)"
 
-#: text-utils/more.c:834
+#: text-utils/more.c:851
 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:1132
+#: text-utils/more.c:1185
 #, c-format
 msgid "...back %d page"
 msgstr "...pøeskakuji zpìt o poèet stran: %d"
 
-#: text-utils/more.c:1178
+#: text-utils/more.c:1231
 #, c-format
 msgid "...skipping %d line"
 msgstr "...pøeskakuji o poèet øádkù: %d"
 
-#: text-utils/more.c:1219
+#: text-utils/more.c:1272
 msgid ""
 "\n"
 "***Back***\n"
@@ -8746,37 +8968,37 @@ msgstr ""
 "\n"
 "***Zpìt***\n"
 
-#: text-utils/more.c:1257
+#: text-utils/more.c:1329
 msgid "Can't open help file"
 msgstr "Soubor s nápovìdou nelze otevøít."
 
-#: text-utils/more.c:1278 text-utils/more.c:1282
+#: text-utils/more.c:1359 text-utils/more.c:1363
 msgid "[Press 'h' for instructions.]"
 msgstr "[Stisknìte 'h' pro nápovìdu.]"
 
-#: text-utils/more.c:1316
+#: text-utils/more.c:1397
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" øádek %d"
 
-#: text-utils/more.c:1318
+#: text-utils/more.c:1399
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Nejedná se o soubor] øádek %d"
 
-#: text-utils/more.c:1402
+#: text-utils/more.c:1483
 msgid "  Overflow\n"
 msgstr "  Pøeteèení\n"
 
-#: text-utils/more.c:1449
+#: text-utils/more.c:1530
 msgid "...skipping\n"
 msgstr "...vynechávám\n"
 
-#: text-utils/more.c:1479
+#: text-utils/more.c:1560
 msgid "Regular expression botch"
 msgstr "Chyba v regulárním výrazu"
 
-#: text-utils/more.c:1491
+#: text-utils/more.c:1572
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -8784,15 +9006,15 @@ msgstr ""
 "\n"
 "Vzorek nebyl nalezen\n"
 
-#: text-utils/more.c:1494
+#: text-utils/more.c:1575
 msgid "Pattern not found"
 msgstr "Vzorek nebyl nalezen"
 
-#: text-utils/more.c:1555
+#: text-utils/more.c:1636
 msgid "can't fork\n"
 msgstr "volání fork selhalo\n"
 
-#: text-utils/more.c:1594
+#: text-utils/more.c:1675
 msgid ""
 "\n"
 "...Skipping "
@@ -8800,23 +9022,23 @@ msgstr ""
 "\n"
 "...Vynechávám "
 
-#: text-utils/more.c:1598
+#: text-utils/more.c:1679
 msgid "...Skipping "
 msgstr "...Pøecházím "
 
-#: text-utils/more.c:1599
+#: text-utils/more.c:1680
 msgid "to file "
 msgstr "na soubor "
 
-#: text-utils/more.c:1599
+#: text-utils/more.c:1680
 msgid "back to file "
 msgstr "zpìt na soubor "
 
-#: text-utils/more.c:1835
+#: text-utils/more.c:1914
 msgid "Line too long"
 msgstr "Øádek je pøíli¹ dlouhý"
 
-#: text-utils/more.c:1878
+#: text-utils/more.c:1957
 msgid "No previous command to substitute for"
 msgstr "Neexistuje ¾ádný pøíkaz, jen¾ by bylo mo¾no nahradit"
 
@@ -8852,7 +9074,6 @@ 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"
 
@@ -8873,87 +9094,28 @@ msgstr "Místo pro buffer nelze naalokovat.\n"
 msgid "usage: rev [file ...]\n"
 msgstr "Pou¾ití: rev [soubor ...]\n"
 
-#: text-utils/ul.c:141
+#: text-utils/ul.c:143
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
 msgstr "Pou¾ití: %s [ -i ] [-tTerm ] soubor...\n"
 
-#: text-utils/ul.c:152
+#: text-utils/ul.c:154
 msgid "trouble reading terminfo"
 msgstr "chyba pøi ètení terminfo databáze"
 
-#: text-utils/ul.c:241
+#: text-utils/ul.c:244
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
 msgstr "Neznámá posloupnost øídících znakù na vstupu: %o, %o\n"
 
-#: text-utils/ul.c:398
+#: text-utils/ul.c:427
 msgid "Unable to allocate buffer.\n"
 msgstr "Buffer nelze naalokovat.\n"
 
-#: text-utils/ul.c:553
+#: text-utils/ul.c:588
 msgid "Input line too long.\n"
 msgstr "Vstupní øádka je pøíli¹ dlouhá.\n"
 
-#: text-utils/ul.c:566
+#: text-utils/ul.c:601
 msgid "Out of memory when growing buffer.\n"
 msgstr "Nedostatek pamìti pro rostoucí buffer.\n"
-
-#: kbd/kbdrate.c:138 kbd/kbdrate.c:276
-#, c-format
-msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
-msgstr "Rychlost opakování kláves nastavena na %.1f cps (prodleva = %d ms)\n"
-
-#: kbd/kbdrate.c:222
-msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
-msgstr "Pou¾ití: kbdrate [-V] [-s] [-r rychlost] [-d prodleva]\n"
-
-#: kbd/kbdrate.c:252
-msgid "Cannot open /dev/port"
-msgstr "/dev/port nelze otevøít"
-
-#~ msgid "mount: %s has wrong major or minor number"
-#~ msgstr "mount: %s má chybné vìt¹í èi men¹í èíslo zaøízení"
-
-#~ msgid "mount: %s%s is not permitted on its filesystem"
-#~ msgstr "mount: %s%s není na svém systému souborù povoleno"
-
-#~ msgid ""
-#~ "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 ""
-#~ "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 "Writing disklabel to %s%d.\n"
-#~ msgstr "Ukládám popis disku na %s%d.\n"
-
-#~ msgid "%s%d contains no disklabel.\n"
-#~ msgstr "Na %s%d se nenachází ¾ádný popis disku.\n"
-
-#~ msgid "Bootstrap installed on %s%d.\n"
-#~ msgstr "Zavadìè instalován na %s%d.\n"
-
-#~ msgid "%s: unknown geometry\n"
-#~ msgstr "%s: neznámá geometrie\n"
-
-#~ msgid "Cannot get loop info"
-#~ msgstr "Informace o loop nelze získat"
-
-#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
-#~ msgstr "mount: %s:%s selhalo; pøíèina udaná serverem: %s\n"
-
-#~ msgid "exec rc failed\n"
-#~ msgstr "spu¹tìní rc se nezdaøilo - volání exec selhalo\n"
-
-#~ msgid "fork of rc shell failed\n"
-#~ msgstr "spu¹tìní rc se nezdaøilo - volání fork selhalo\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
index 847b3c4f6..2aba3ef6d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.10r\n"
-"POT-Creation-Date: 2001-03-11 13:38+0100\n"
-"PO-Revision-Date: 2001-03-11 14:13GMT\n"
+"Project-Id-Version: util-linux 2.11b\n"
+"POT-Creation-Date: 2001-04-14 13:35+0200\n"
+"PO-Revision-Date: 2001-05-11 14:13GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -303,12 +303,8 @@ msgstr "Filesystem state=%d\n"
 
 #: disk-utils/fsck.minix.c:626
 #, c-format
-msgid ""
-"namelen=%d\n"
-"\n"
-msgstr ""
-"namelen=%d\n"
-"\n"
+msgid "namelen=%d\n\n"
+msgstr "namelen=%d\n\n"
 
 #: disk-utils/fsck.minix.c:640 disk-utils/fsck.minix.c:691
 #, c-format
@@ -467,14 +463,12 @@ 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"
+#, c-format
+msgid "\n%6ld inodes used (%ld%%)\n"
+msgstr "\n%6ld inodes brugt (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1341
+#, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zoner brugt (%ld%%)\n"
 
@@ -592,7 +586,7 @@ msgstr "for mange inodes - øvre grænse er 512"
 msgid "not enough space, need at least %lu blocks"
 msgstr "ikke plads nok, kræver mindst %lu blokke"
 
-#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:1930
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:1931
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhed: %s\n"
@@ -666,7 +660,7 @@ 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:369 getopt-1.1.0a/getopt.c:89
-#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:228 mount/sundries.c:196
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:229 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: Hukommelse opbrugt!\n"
@@ -734,12 +728,8 @@ 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"
+msgid "Maxsize=%ld\n\n"
+msgstr "Maxsize=%ld\n\n"
 
 #: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
@@ -1148,9 +1138,7 @@ msgstr "Advarsel!! Dette ødelægger muligvis data på din disk!"
 
 #: fdisk/cfdisk.c:1700
 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): "
+msgstr "Er du sikker på, at du vil skrive partitionstabellen til disken? (ja eller nej): "
 
 #: fdisk/cfdisk.c:1706
 msgid "no"
@@ -1178,9 +1166,7 @@ msgstr "Skrev partitionstabel til disken"
 
 #: fdisk/cfdisk.c:1743
 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."
+msgstr "Skrev partitionstabel, men genindlæsning mislykkedes. Genstart for at opdatere tabellen."
 
 #: fdisk/cfdisk.c:1753
 msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
@@ -1232,7 +1218,7 @@ msgstr "   Logisk "
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1249 fdisk/fdisk.c:1473
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1250 fdisk/fdisk.c:1474
 #: fdisk/fdisksgilabel.c:240 fdisk/fdisksunlabel.c:672 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Ukendt"
@@ -1266,12 +1252,8 @@ msgid " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Fla
 msgstr " # Type     Sektor   Sektor   Forskyd Længde   Filsystem type (ID)    Flag\n"
 
 #: fdisk/cfdisk.c:1955
-msgid ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
-msgstr ""
-"-- ------- -------- --------- ------ --------- ---------------------- "
-"---------\n"
+msgid "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
+msgstr "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
 
 #: fdisk/cfdisk.c:2037
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
@@ -1755,353 +1737,6 @@ msgstr ""
 "                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:318 fdisk/fdisk.c:337 fdisk/fdisk.c:355 fdisk/fdisk.c:362
-#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
-#: 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:324 fdisk/fdisk.c:343 fdisk/fdisk.c:356 fdisk/fdisk.c:368
-#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
-#: 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:328 fdisk/fdisk.c:347 fdisk/fdisk.c:358 fdisk/fdisk.c:372
-#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
-#: fdisk/fdiskbsdlabel.c:132
-msgid "   q   quit without saving changes"
-msgstr "   q    afslut uden at gemme ændringerne"
-
-#: fdisk/fdisk.c:396 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
-#: 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:1659 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:686
-#: fdisk/fdisksunlabel.c:518
-#, c-format
-msgid "First %s"
-msgstr "Første %s"
-
-#: fdisk/fdisk.c:1719 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:554
-#, 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:557 fdisk/fdisk.c:1077 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:545
-msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Opstarts-igangsætter overlapper med diskmærkatet!\n"
-
-#: fdisk/fdiskbsdlabel.c:566 fdisk/fdiskbsdlabel.c:568
-#, c-format
-msgid "Bootstrap installed on %s.\n"
-msgstr "Opstarts-igangsætter installeret på %s.\n"
-
-#: fdisk/fdiskbsdlabel.c:590
-#, c-format
-msgid "Partition (a-%c): "
-msgstr "Partition (a-%c): "
-
-#: fdisk/fdisk.c:1792 fdisk/fdiskbsdlabel.c:610
-msgid "The maximum number of partitions has been created\n"
-msgstr "Det maksimale antal partitioner er blevet oprettet\n"
-
-#: fdisk/fdiskbsdlabel.c:621
-msgid "This partition already exists.\n"
-msgstr "Denne partition eksisterer allerede.\n"
-
-#: fdisk/fdiskbsdlabel.c:741
-#, 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:788
-msgid ""
-"\n"
-"Syncing disks.\n"
-msgstr ""
-"\n"
-"Synkroniserer diske.\n"
-
 #: fdisk/fdisk.c:205
 msgid ""
 "Usage: fdisk [-b SSZ] [-u] DISK     Change partition table\n"
@@ -2171,6 +1806,12 @@ msgstr "Kunne ikke allokere mere hukommelse\n"
 msgid "Fatal error\n"
 msgstr "Fatal fejl\n"
 
+#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:355 fdisk/fdisk.c:362
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
+#: fdisk/fdiskbsdlabel.c:124
+msgid "Command action"
+msgstr "Kommando beskrivelse"
+
 #: fdisk/fdisk.c:319
 msgid "   a   toggle a read only flag"
 msgstr "   a    skift et skrivebeskyttelses-flag"
@@ -2193,6 +1834,13 @@ msgstr "   d    slet en partition"
 msgid "   l   list known partition types"
 msgstr "   l    vis liste over kendte partitionstyper"
 
+#. sun
+#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:356 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
+#: fdisk/fdiskbsdlabel.c:129
+msgid "   m   print this menu"
+msgstr "   m    vis denne menu"
+
 #: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369
 msgid "   n   add a new partition"
 msgstr "   n    tilføj en ny partition"
@@ -2206,6 +1854,12 @@ msgstr "   o    opret en ny, tom DOS-partitionstabel"
 msgid "   p   print the partition table"
 msgstr "   p    vis partitionstabellen"
 
+#: fdisk/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:358 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
+#: fdisk/fdiskbsdlabel.c:132
+msgid "   q   quit without saving changes"
+msgstr "   q    afslut uden at gemme ændringerne"
+
 #: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:359 fdisk/fdisk.c:373
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s    opret en ny, tom Sun-diskmærkat"
@@ -2286,6 +1940,11 @@ msgstr "   i   ændr interleavefaktor"
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o    ændr rotationshastighed (omdr. per minut)"
 
+#: fdisk/fdisk.c:396 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
+#: fdisk/fdiskbsdlabel.c:133
+msgid "   r   return to main menu"
+msgstr "   r    returnér til hovedmenuen"
+
 #: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   s   change number of sectors/track"
 msgstr "   s    ændr antallet af sektorer/spor"
@@ -2320,10 +1979,15 @@ msgstr "Du skal angive"
 msgid "heads"
 msgstr "hoveder"
 
-#: fdisk/fdisk.c:555 fdisk/fdisk.c:1077 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:555 fdisk/fdisk.c:1078 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "sektorer"
 
+#: fdisk/fdisk.c:557 fdisk/fdisk.c:1078 fdisk/fdiskbsdlabel.c:461
+#: fdisk/sfdisk.c:864
+msgid "cylinders"
+msgstr "cylindre"
+
 #: fdisk/fdisk.c:561
 #, c-format
 msgid ""
@@ -2387,108 +2051,96 @@ msgstr ""
 "indhold naturligvis ikke genskabes\n"
 "\n"
 
-#: fdisk/fdisk.c:728
+#: fdisk/fdisk.c:729
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Bemærk: sektorstørrelsen er %d (ikke %d)\n"
 
-#: fdisk/fdisk.c:811
+#: fdisk/fdisk.c:812
 msgid "You will not be able to write the partition table.\n"
 msgstr "Du vil ikke kunne gemme partitionstabellen.\n"
 
-#: fdisk/fdisk.c:839
-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:840
+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:855
+#: fdisk/fdisk.c:856
 msgid "Internal error\n"
 msgstr "Intern fejl\n"
 
-#: fdisk/fdisk.c:877
+#: fdisk/fdisk.c:878
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorerer ekstra udvidet partition %d\n"
 
-#: fdisk/fdisk.c:889
+#: fdisk/fdisk.c:890
 #, 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"
+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:911
-msgid ""
-"\n"
-"got EOF thrice - exiting..\n"
-msgstr ""
-"\n"
-"fik filslut (EOF) tre gange - afslutter..\n"
+#: fdisk/fdisk.c:912
+msgid "\ngot EOF thrice - exiting..\n"
+msgstr "\nfik filslut (EOF) tre gange - afslutter..\n"
 
-#: fdisk/fdisk.c:950
+#: fdisk/fdisk.c:951
 msgid "Hex code (type L to list codes): "
 msgstr "Hex-kode (tryk L for en liste over koderne): "
 
-#: fdisk/fdisk.c:989
+#: fdisk/fdisk.c:990
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, standard %d): "
 
-#: fdisk/fdisk.c:1045
+#: fdisk/fdisk.c:1046
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Bruger standard-værdi %d\n"
 
-#: fdisk/fdisk.c:1049
+#: fdisk/fdisk.c:1050
 msgid "Value out of range.\n"
 msgstr "Værdi udenfor området.\n"
 
-#: fdisk/fdisk.c:1059
+#: fdisk/fdisk.c:1060
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1068
+#: fdisk/fdisk.c:1069
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Advarsel: partition %d er af typen 'tom'\n"
 
-#: fdisk/fdisk.c:1075
+#: fdisk/fdisk.c:1076
 msgid "cylinder"
 msgstr "cylinder"
 
-#: fdisk/fdisk.c:1075
+#: fdisk/fdisk.c:1076
 msgid "sector"
 msgstr "sektor"
 
-#: fdisk/fdisk.c:1084
+#: fdisk/fdisk.c:1085
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Skifter enheder for visning/indtastning til %s\n"
 
-#: fdisk/fdisk.c:1095
+#: fdisk/fdisk.c:1096
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
 msgstr "ADVARSEL: Partition %d er en udvidet partition\n"
 
-#: fdisk/fdisk.c:1106
+#: fdisk/fdisk.c:1107
 msgid "DOS Compatibility flag is set\n"
 msgstr "DOS-kompatilitetsflag er sat\n"
 
-#: fdisk/fdisk.c:1110
+#: fdisk/fdisk.c:1111
 msgid "DOS Compatibility flag is not set\n"
 msgstr "DOS-kompatilitetsflag er ikke sat\n"
 
-#: fdisk/fdisk.c:1203
+#: fdisk/fdisk.c:1204
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "Partition %d eksisterer ikke endnu!\n"
 
-#: fdisk/fdisk.c:1208
+#: fdisk/fdisk.c:1209
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2500,7 +2152,7 @@ msgstr ""
 "er nok uklogt. Du kan slette en partition med\n"
 "'d'-kommandoen.\n"
 
-#: fdisk/fdisk.c:1217
+#: fdisk/fdisk.c:1218
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2508,7 +2160,7 @@ msgstr ""
 "Du kan ikke ændre en partition mellem at være udvidet eller ikke-udvidet\n"
 "Slet den først.\n"
 
-#: fdisk/fdisk.c:1226
+#: fdisk/fdisk.c:1227
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2518,7 +2170,7 @@ msgstr ""
 "SunOS/Solaris forventer det og selv Linux foretrækker det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1232
+#: fdisk/fdisk.c:1233
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2528,52 +2180,52 @@ msgstr ""
 "og partition 11 som 'entire volume' (6), da IRIX forventer det.\n"
 "\n"
 
-#: fdisk/fdisk.c:1246
+#: fdisk/fdisk.c:1247
 #, 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:1297
+#: fdisk/fdisk.c:1298
 #, 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:1299 fdisk/fdisk.c:1307 fdisk/fdisk.c:1316 fdisk/fdisk.c:1325
+#: fdisk/fdisk.c:1300 fdisk/fdisk.c:1308 fdisk/fdisk.c:1317 fdisk/fdisk.c:1326
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fys=(%d, %d, %d) "
 
-#: fdisk/fdisk.c:1300 fdisk/fdisk.c:1308
+#: fdisk/fdisk.c:1301 fdisk/fdisk.c:1309
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "logisk=(%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1305
+#: fdisk/fdisk.c:1306
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
 msgstr "Partition %d har forskellig fysisk/logisk endelse:\n"
 
-#: fdisk/fdisk.c:1314
+#: fdisk/fdisk.c:1315
 #, 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:1317
+#: fdisk/fdisk.c:1318
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "burde være (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1323
+#: fdisk/fdisk.c:1324
 #, 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:1326
+#: fdisk/fdisk.c:1327
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "burde være (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1333
+#: fdisk/fdisk.c:1334
 #, c-format
 msgid ""
 "\n"
@@ -2586,125 +2238,126 @@ msgstr ""
 "Enheder = %s á %d * %d byte\n"
 "\n"
 
-#: fdisk/fdisk.c:1378
-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:1379
+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:1444
+#: fdisk/fdisk.c:1445
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Opstart Start       Slut   Blokke   Id  System\n"
 
-#: fdisk/fdisk.c:1445 fdisk/fdisksgilabel.c:223 fdisk/fdisksunlabel.c:657
+#: fdisk/fdisk.c:1446 fdisk/fdisksgilabel.c:223 fdisk/fdisksunlabel.c:657
 msgid "Device"
 msgstr "Enhed"
 
-#: fdisk/fdisk.c:1482
-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:1483
+msgid "\nPartition table entries are not in disk order\n"
+msgstr "\nPartitionstabellens indgange er ikke i disk-rækkefølge\n"
 
-#: fdisk/fdisk.c:1492
+#: fdisk/fdisk.c:1493
 #, 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"
+msgid "\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"
+msgstr "\nDisk %s: %d hoveder, %d sektorer, %d cylindre\n\n"
 
-#: fdisk/fdisk.c:1494
+#: fdisk/fdisk.c:1495
 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:1538
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Advarsel: partition %d indeholder sektor 0\n"
 
-#: fdisk/fdisk.c:1541
+#: fdisk/fdisk.c:1542
 #, 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:1544
+#: fdisk/fdisk.c:1545
 #, 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:1547
+#: fdisk/fdisk.c:1548
 #, 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:1551
+#: fdisk/fdisk.c:1552
 #, 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:1583
+#: fdisk/fdisk.c:1584
 #, 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:1591
+#: fdisk/fdisk.c:1592
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
 msgstr "Advarsel: partition %d overlapper med partition %d.\n"
 
-#: fdisk/fdisk.c:1611
+#: fdisk/fdisk.c:1612
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Advarsel: partition %d er tom\n"
 
-#: fdisk/fdisk.c:1616
+#: fdisk/fdisk.c:1617
 #, 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:1622
+#: fdisk/fdisk.c:1623
 #, 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:1625
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d ikke-allokerede sektorer\n"
 
-#: fdisk/fdisk.c:1638 fdisk/fdisksgilabel.c:664 fdisk/fdisksunlabel.c:503
+#: fdisk/fdisk.c:1639 fdisk/fdisksgilabel.c:664 fdisk/fdisksunlabel.c:503
 #, 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:1674 fdisk/fdisksunlabel.c:543
+#: fdisk/fdisk.c:1660 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:686
+#: fdisk/fdisksunlabel.c:518
+#, c-format
+msgid "First %s"
+msgstr "Første %s"
+
+#: fdisk/fdisk.c:1675 fdisk/fdisksunlabel.c:543
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: fdisk/fdisk.c:1710
+#: fdisk/fdisk.c:1711
 msgid "No free sectors available\n"
 msgstr "Ingen tilgængelige frie sektorer\n"
 
-#: fdisk/fdisk.c:1752
+#: fdisk/fdisk.c:1720 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:554
+#, c-format
+msgid "Last %s or +size or +sizeM or +sizeK"
+msgstr "Sidste %s eller +størrelse eller +størrelseM eller +størrelseK"
+
+#: fdisk/fdisk.c:1753
 #, 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:1802
+#: fdisk/fdisk.c:1793 fdisk/fdiskbsdlabel.c:610
+msgid "The maximum number of partitions has been created\n"
+msgstr "Det maksimale antal partitioner er blevet oprettet\n"
+
+#: fdisk/fdisk.c:1803
 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:1807
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid ""
 "Command action\n"
@@ -2715,32 +2368,28 @@ msgstr ""
 "   %s\n"
 "   p    primær partition (1-4)\n"
 
-#: fdisk/fdisk.c:1809
+#: fdisk/fdisk.c:1810
 msgid "l   logical (5 or over)"
 msgstr "l    logisk (5 eller derover)"
 
-#: fdisk/fdisk.c:1809
+#: fdisk/fdisk.c:1810
 msgid "e   extended"
 msgstr "e    udvidet"
 
-#: fdisk/fdisk.c:1826
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
 msgstr "Ugyldigt partitionsnummer for type '%c'\n"
 
-#: fdisk/fdisk.c:1861
-msgid ""
-"The partition table has been altered!\n"
-"\n"
-msgstr ""
-"Partitionstabellen er ændret!\n"
-"\n"
+#: fdisk/fdisk.c:1862
+msgid "The partition table has been altered!\n\n"
+msgstr "Partitionstabellen er ændret!\n\n"
 
-#: fdisk/fdisk.c:1870
+#: fdisk/fdisk.c:1871
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Kalder ioctl() for at genindlæse partitionstabellen.\n"
 
-#: fdisk/fdisk.c:1886
+#: fdisk/fdisk.c:1887
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2749,7 +2398,7 @@ 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:1892
+#: fdisk/fdisk.c:1893
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2761,72 +2410,68 @@ msgstr ""
 "yderligere information, hvis du har oprettet eller\n"
 "ændret DOS 6.x partitioner.\n"
 
-#: fdisk/fdisk.c:1899
+#: fdisk/fdisk.c:1900
 msgid "Syncing disks.\n"
 msgstr "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:1946
+#: fdisk/fdisk.c:1947
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har intet dataområde\n"
 
-#: fdisk/fdisk.c:1951
+#: fdisk/fdisk.c:1952
 msgid "New beginning of data"
 msgstr "Ny begyndelse på data"
 
-#: fdisk/fdisk.c:1967
+#: fdisk/fdisk.c:1968
 msgid "Expert command (m for help): "
 msgstr "Ekspert kommando (m for hjælp): "
 
-#: fdisk/fdisk.c:1980
+#: fdisk/fdisk.c:1981
 msgid "Number of cylinders"
 msgstr "Antal cylindre"
 
-#: fdisk/fdisk.c:2006
+#: fdisk/fdisk.c:2007
 msgid "Number of heads"
 msgstr "Antal hoveder"
 
-#: fdisk/fdisk.c:2031
+#: fdisk/fdisk.c:2032
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2034
+#: fdisk/fdisk.c:2035
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Advarsel: sætter sektorforskydning for DOS-kompatilitet\n"
 
-#: fdisk/fdisk.c:2099
+#: fdisk/fdisk.c:2100
 #, 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:2113
+#: fdisk/fdisk.c:2114
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kunne ikke åbne %s\n"
 
-#: fdisk/fdisk.c:2129
+#: fdisk/fdisk.c:2130
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kunne ikke åbne %s\n"
 
-#: fdisk/fdisk.c:2150
+#: fdisk/fdisk.c:2151
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ukendt kommando\n"
 
-#: fdisk/fdisk.c:2200
+#: fdisk/fdisk.c:2201
 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:2203
-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:2204
+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:2268
+#: fdisk/fdisk.c:2269
 #, c-format
 msgid ""
 "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
@@ -2835,36 +2480,317 @@ 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:2277
+#: fdisk/fdisk.c:2278
 msgid "Command (m for help): "
 msgstr "Kommando (m for hjælp): "
 
-#: fdisk/fdisk.c:2293
+#: fdisk/fdisk.c:2294
 #, c-format
-msgid ""
-"\n"
-"The current boot file is: %s\n"
-msgstr ""
-"\n"
-"Den nuværende opstartfil er: %s\n"
+msgid "\nThe current boot file is: %s\n"
+msgstr "\nDen nuværende opstartfil er: %s\n"
 
-#: fdisk/fdisk.c:2295
+#: fdisk/fdisk.c:2296
 msgid "Please enter the name of the new boot file: "
 msgstr "Angiv venligt navnet på den ny opstartsfil: "
 
-#: fdisk/fdisk.c:2297
+#: fdisk/fdisk.c:2298
 msgid "Boot file unchanged\n"
 msgstr "Opstartsfil uændret\n"
 
-#: fdisk/fdisk.c:2361
+#: fdisk/fdisk.c:2362
+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/fdiskaixlabel.c:28
 msgid ""
 "\n"
-"\tSorry, no experts menu for SGI partition tables available.\n"
-"\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"
-"\tBeklager, der er ingen ekspertmenu for SGI-partitionstabeller.\n"
-"\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 "\nBSD label for device: %s\n"
+msgstr "\nBSD-mærkat for enhed: %s\n"
+
+#: 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"
+
+#: 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/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/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/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:545
+msgid "Bootstrap overlaps with disk label!\n"
+msgstr "Opstarts-igangsætter overlapper med diskmærkatet!\n"
+
+#: fdisk/fdiskbsdlabel.c:566 fdisk/fdiskbsdlabel.c:568
+#, c-format
+msgid "Bootstrap installed on %s.\n"
+msgstr "Opstarts-igangsætter installeret på %s.\n"
+
+#: fdisk/fdiskbsdlabel.c:590
+#, c-format
+msgid "Partition (a-%c): "
+msgstr "Partition (a-%c): "
+
+#: fdisk/fdiskbsdlabel.c:621
+msgid "This partition already exists.\n"
+msgstr "Denne partition eksisterer allerede.\n"
+
+#: fdisk/fdiskbsdlabel.c:741
+#, 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:788
+msgid "\nSyncing disks.\n"
+msgstr "\nSynkroniserer diske.\n"
 
 #: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
@@ -2940,9 +2866,7 @@ msgid "Linux RAID"
 msgstr "Linux RAID"
 
 #: fdisk/fdisksgilabel.c:160
-msgid ""
-"According to MIPS Computer Systems, Inc the Label must not contain more than "
-"512 bytes\n"
+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:179
@@ -3019,20 +2943,12 @@ msgstr ""
 "\tf.eks. \"/unix\" eller \"/unix.save\".\n"
 
 #: fdisk/fdisksgilabel.c:314
-msgid ""
-"\n"
-"\tName of Bootfile too long:  16 bytes maximum.\n"
-msgstr ""
-"\n"
-"\tFor langt navn på opstartsfil: højst 16 byte.\n"
+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:319
-msgid ""
-"\n"
-"\tBootfile must have a fully qualified pathname.\n"
-msgstr ""
-"\n"
-"\tOpstartsfil skal have et komplet stinavn.\n"
+msgid "\n\tBootfile must have a fully qualified pathname.\n"
+msgstr "\n\tOpstartsfil skal have et komplet stinavn.\n"
 
 #: fdisk/fdisksgilabel.c:324
 msgid ""
@@ -3046,12 +2962,8 @@ msgstr ""
 
 #: fdisk/fdisksgilabel.c:352
 #, c-format
-msgid ""
-"\n"
-"\tBootfile is changed to \"%s\".\n"
-msgstr ""
-"\n"
-"\tOpstartsfil er ændret til \"%s\".\n"
+msgid "\n\tBootfile is changed to \"%s\".\n"
+msgstr "\n\tOpstartsfil er ændret til \"%s\".\n"
 
 #: fdisk/fdisksgilabel.c:450
 msgid "More than one entire disk entry present.\n"
@@ -3108,28 +3020,16 @@ msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
 msgstr "Ubenyttet hul på %8d sektorer - sektor %8d-%d\n"
 
 #: fdisk/fdisksgilabel.c:547
-msgid ""
-"\n"
-"The boot partition does not exist.\n"
-msgstr ""
-"\n"
-"Opstartpartitionen eksisterer ikke.\n"
+msgid "\nThe boot partition does not exist.\n"
+msgstr "\nOpstartpartitionen eksisterer ikke.\n"
 
 #: fdisk/fdisksgilabel.c:551
-msgid ""
-"\n"
-"The swap partition does not exist.\n"
-msgstr ""
-"\n"
-"Swappartitionen eksisterer ikke.\n"
+msgid "\nThe swap partition does not exist.\n"
+msgstr "\nSwappartitionen eksisterer ikke.\n"
 
 #: fdisk/fdisksgilabel.c:556
-msgid ""
-"\n"
-"The swap partition has no swap type.\n"
-msgstr ""
-"\n"
-"Swappartitionen har ikke nogen swaptype.\n"
+msgid "\nThe swap partition has no swap type.\n"
+msgstr "\nSwappartitionen har ikke nogen swaptype.\n"
 
 #: fdisk/fdisksgilabel.c:560
 msgid "\tYou have chosen an unusual boot file name.\n"
@@ -3888,12 +3788,8 @@ msgstr ""
 
 #: 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"
+msgid "\nDisk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
+msgstr "\nDisk %s: %lu cylindre, %lu hoveder, %lu sektorer/spor\n"
 
 #: fdisk/sfdisk.c:539
 #, c-format
@@ -3902,27 +3798,17 @@ msgstr "%s for partition %s har umulig hoved-værdi: %lu (burde være mellem 0-%lu
 
 #: fdisk/sfdisk.c:544
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for sector: %lu (should be in "
-"1-%lu)\n"
+msgid "%s of partition %s has impossible value for sector: %lu (should be in 1-%lu)\n"
 msgstr "%s for partition %s har umulig sektor-værdi: %lu (burde være mellem 1-%lu)\n"
 
 #: fdisk/sfdisk.c:549
 #, c-format
-msgid ""
-"%s of partition %s has impossible value for cylinders: %lu (should be in "
-"0-%lu)\n"
-msgstr ""
-"%s for partition %s har umulig cylinder-værdi: %lu (burde være mellem "
-"0-%lu)\n"
+msgid "%s of partition %s has impossible value for cylinders: %lu (should be in 0-%lu)\n"
+msgstr "%s for partition %s har umulig cylinder-værdi: %lu (burde være mellem 0-%lu)\n"
 
 #: fdisk/sfdisk.c:588
-msgid ""
-"Id  Name\n"
-"\n"
-msgstr ""
-"Id  Navn\n"
-"\n"
+msgid "Id  Name\n\n"
+msgstr "Id  Navn\n\n"
 
 #: fdisk/sfdisk.c:741
 msgid "Re-reading the partition table ...\n"
@@ -3962,12 +3848,8 @@ 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"
+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"
@@ -3975,12 +3857,8 @@ 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"
+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"
@@ -3988,12 +3866,8 @@ 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"
+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"
@@ -4001,12 +3875,8 @@ 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"
+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"
@@ -4134,8 +4004,7 @@ msgid ""
 "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"
+"Dette generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne disk.\n"
 
 #: fdisk/sfdisk.c:1227
 msgid ""
@@ -4279,9 +4148,7 @@ 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"
+msgstr "Advarsel: den angiven størrelse(%lu) overstiger den maksimalt tilladte (%lu)\n"
 
 #: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
@@ -4353,21 +4220,15 @@ 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"
+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"
+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"
@@ -4531,12 +4392,8 @@ 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"
+msgid "Done\n\n"
+msgstr "Færdig\n\n"
 
 #: fdisk/sfdisk.c:2706
 #, c-format
@@ -4583,8 +4440,7 @@ msgid ""
 "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"
+"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"
 
@@ -4630,12 +4486,8 @@ 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"
+msgid "\nsfdisk: premature end of input\n"
+msgstr "\nsfdisk: inddata sluttede for tidligt\n"
 
 #: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
@@ -4646,12 +4498,8 @@ 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"
+msgid "Successfully wrote the new partition table\n\n"
+msgstr "Skrivning af ny partitionstabel lykkedes\n\n"
 
 #: fdisk/sfdisk.c:2891
 msgid ""
@@ -4902,12 +4750,8 @@ msgstr ""
 "Udskyder yderligere for at nå til næste hele sekund.\n"
 
 #: hwclock/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"
+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"
 
 #: hwclock/hwclock.c:537
 #, c-format
@@ -4960,15 +4804,13 @@ msgstr ""
 #: hwclock/hwclock.c:603
 #, c-format
 msgid ""
-"The date command issued by %s returned something other than an integer where "
-"the converted time value was expected.\n"
+"The date command issued by %s returned something other than an integer where the converted time value was expected.\n"
 "The command was:\n"
 "  %s\n"
 "The response was:\n"
 " %s\n"
 msgstr ""
-"'date'-kommandoen sendt af %s returnerede noget andet end et heltal, hvor "
-"den konverterede tid forventedes.\n"
+"'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"
@@ -4980,12 +4822,8 @@ msgid "date string %s equates to %d seconds since 1969.\n"
 msgstr "Datoteksten %s svarer til %d sekunder siden 1969.\n"
 
 #: hwclock/hwclock.c:645
-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"
+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"
 
 #: hwclock/hwclock.c:667
 msgid "Calling settimeofday:\n"
@@ -5014,30 +4852,20 @@ msgid "settimeofday() failed"
 msgstr "settimeofday() mislykkedes"
 
 #: hwclock/hwclock.c:716
-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"
+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"
 
 #: hwclock/hwclock.c:720
-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"
+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"
 
 #: hwclock/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"
+"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"
+"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"
 
 #: hwclock/hwclock.c:780
@@ -5090,8 +4918,7 @@ msgstr "Kunne ikke sætte systemuret.\n"
 
 #: hwclock/hwclock.c:1053
 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 ""
@@ -5109,12 +4936,8 @@ msgid "Kernel is assuming an epoch value of %lu\n"
 msgstr "Kernen går ud fra en epokeværdi på %lu\n"
 
 #: hwclock/hwclock.c:1067
-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"
+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"
 
 #: hwclock/hwclock.c:1070
 #, c-format
@@ -5203,9 +5026,7 @@ msgstr ""
 
 #: hwclock/hwclock.c:1243
 #, c-format
-msgid ""
-"%s: The --utc and --localtime options are mutually exclusive.  You specified "
-"both.\n"
+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"
 
 #: hwclock/hwclock.c:1256
@@ -5221,9 +5042,7 @@ msgid "Sorry, only the superuser can change the System Clock.\n"
 msgstr "Beklager, kun superbrugeren kan ændre systemuret.\n"
 
 #: hwclock/hwclock.c:1279
-msgid ""
-"Sorry, only the superuser can change the Hardware Clock epoch in the "
-"kernel.\n"
+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"
 
 #: hwclock/hwclock.c:1299
@@ -5231,12 +5050,8 @@ msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr "Kan ikke tilgå maskinuret med nogen kendt metode.\n"
 
 #: hwclock/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"
+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"
 
 #: hwclock/kd.c:41
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
@@ -5327,14 +5142,8 @@ msgstr "Åbning af %s mislykkedes"
 
 #: hwclock/rtc.c:327 hwclock/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"
+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"
 
 #: hwclock/rtc.c:338
 #, c-format
@@ -5531,15 +5340,11 @@ msgstr "%s: inddataoverløb"
 #: login-utils/agetty.c:1178
 #, 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 ""
-"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"
+"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:104 login-utils/checktty.c:125
 msgid "login: memory low, login may fail\n"
@@ -5626,12 +5431,8 @@ 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"
+msgid "\nAborted.\n"
+msgstr "\nAfbrudt.\n"
 
 #: login-utils/chfn.c:398
 msgid "field is too long.\n"
@@ -5794,12 +5595,8 @@ msgstr "  stadig logget på"
 
 #: login-utils/last.c:340
 #, c-format
-msgid ""
-"\n"
-"wtmp begins %s"
-msgstr ""
-"\n"
-"wtmp starter %s"
+msgid "\nwtmp begins %s"
+msgstr "\nwtmp starter %s"
 
 #: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
 msgid "last: malloc failure.\n"
@@ -5811,12 +5608,8 @@ msgstr "last: gethostname"
 
 #: login-utils/last.c:490
 #, c-format
-msgid ""
-"\n"
-"interrupted %10.10s %5.5s \n"
-msgstr ""
-"\n"
-"afbrudt %10.10s %5.5s \n"
+msgid "\ninterrupted %10.10s %5.5s \n"
+msgstr "\nafbrudt %10.10s %5.5s \n"
 
 #: login-utils/login.c:379
 msgid "login: -h for super-user only.\n"
@@ -5852,12 +5645,8 @@ msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGIN %d FRA %s FOR %s, %s"
 
 #: login-utils/login.c:563
-msgid ""
-"Login incorrect\n"
-"\n"
-msgstr ""
-"Login ugyldigt\n"
-"\n"
+msgid "Login incorrect\n\n"
+msgstr "Login ugyldigt\n\n"
 
 #: login-utils/login.c:572
 #, c-format
@@ -5870,12 +5659,8 @@ msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
 msgstr "MISLYKKET LOGINSESSION FRA %s FOR %s, %s"
 
 #: login-utils/login.c:579
-msgid ""
-"\n"
-"Login incorrect\n"
-msgstr ""
-"\n"
-"Login ugyldigt\n"
+msgid "\nLogin incorrect\n"
+msgstr "\nLogin ugyldigt\n"
 
 #: login-utils/login.c:635
 msgid "Illegal username"
@@ -5981,12 +5766,8 @@ msgstr "login: ingen skal: %s.\n"
 
 #: login-utils/login.c:1138
 #, c-format
-msgid ""
-"\n"
-"%s login: "
-msgstr ""
-"\n"
-"%s login: "
+msgid "\n%s login: "
+msgstr "\n%s login: "
 
 #: login-utils/login.c:1149
 msgid "login name much too long.\n"
@@ -6258,20 +6039,12 @@ 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?"
+msgid "\nWhy am I still alive after reboot?"
+msgstr "\nHvorfor 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..."
+msgid "\nNow you can turn off the power..."
+msgstr "\nDu kan nu slukke for strømmen..."
 
 #: login-utils/shutdown.c:435
 msgid "Calling kernel power-off facility...\n"
@@ -6294,7 +6067,7 @@ msgstr "Fejl ved kørsel af\t%s\n"
 
 #: login-utils/shutdown.c:475
 #, c-format
-msgid "URGENT: broadcast message from %s:"
+msgid "URGENT: broadcast message from %s:"
 msgstr "HASTER: rundsendt besked fra %s"
 
 #: login-utils/shutdown.c:481
@@ -6381,12 +6154,8 @@ msgid "error forking finalprog\n"
 msgstr "fejl ved forsøg på at spalte processen finalprog\n"
 
 #: login-utils/simpleinit.c:303
-msgid ""
-"\n"
-"Wrong password.\n"
-msgstr ""
-"\n"
-"Forkert password.\n"
+msgid "\nWrong password.\n"
+msgstr "\nForkert password.\n"
 
 #: login-utils/simpleinit.c:376
 msgid "lstat of path failed\n"
@@ -6490,37 +6259,37 @@ msgstr "Du bruger skygge-adgangskoder (shadow passwords) på dette system.\n"
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "Vil du redigere %s nu [j/n]? "
 
-#: login-utils/wall.c:103
+#: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
 msgstr "brug: %s [fil]\n"
 
-#: login-utils/wall.c:151
+#: login-utils/wall.c:152
 #, c-format
 msgid "%s: can't open temporary file.\n"
 msgstr "%s: kunne ikke åbne midlertidig fil.\n"
 
-#: login-utils/wall.c:178
+#: login-utils/wall.c:179
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Rundsendt meddelelse fra %s@%s"
 
-#: login-utils/wall.c:196
+#: login-utils/wall.c:197
 #, 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:201
+#: login-utils/wall.c:202
 #, c-format
 msgid "%s: can't read %s.\n"
 msgstr "%s: kunne ikke læse %s.\n"
 
-#: login-utils/wall.c:223
+#: login-utils/wall.c:224
 #, c-format
 msgid "%s: can't stat temporary file.\n"
 msgstr "%s: kunne ikke finde midlertidig fil.\n"
 
-#: login-utils/wall.c:232
+#: login-utils/wall.c:233
 #, c-format
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: kunne ikke læse midlertidig fil.\n"
@@ -6688,12 +6457,8 @@ msgstr "'script' startet %s"
 
 #: misc-utils/script.c:303
 #, c-format
-msgid ""
-"\n"
-"Script done on %s"
-msgstr ""
-"\n"
-"'script' færdig %s"
+msgid "\nScript done on %s"
+msgstr "\n'script' færdig %s"
 
 #: misc-utils/script.c:311
 #, c-format
@@ -7076,8 +6841,7 @@ msgid ""
 "       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"
+"       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:194
@@ -7145,9 +6909,7 @@ msgstr "ikke nok hukommelse"
 
 #: mount/lomount.c:442
 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"
+msgstr "Der var ingen loop-understøttelse tilgængelig ved oversættelsen. Genoversæt venligst.\n"
 
 #: mount/mntent.c:165
 #, c-format
@@ -7163,17 +6925,6 @@ msgstr "[mntent]: linie %d i %s er ugyldig%s\n"
 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:378
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
@@ -7541,26 +7292,35 @@ msgstr "mount: kunne ikke finde %s i %s"
 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
+#: 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_guess_fstype.c:317
 #, 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
+#: mount/mount_guess_fstype.c:320
 #, 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
+#: mount/mount_guess_fstype.c:323
 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
+#: mount/mount_guess_fstype.c:325
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       Jeg vil forsøge type %s\n"
 
-#: mount/mount_guess_fstype.c:398
+#: mount/mount_guess_fstype.c:401
 #, c-format
 msgid "Trying %s\n"
 msgstr "Forsøger %s\n"
@@ -7784,7 +7544,7 @@ msgid ""
 msgstr ""
 "Brug: umount [-hV]\n"
 "      umount -a [-f] [-r] [-n] [-v] [-t vfstyper]\n"
-"      umount [-f] [-r] [-n] [-v] speciel | node...\n"
+"      umount [-f] [-r] [-n] [-v] speciel | knude...\n"
 
 #: mount/umount.c:486
 msgid "umount: only root can do that"
@@ -7850,12 +7610,10 @@ msgstr ""
 #: 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 ""
-"Filen %s, For grænseværdi %lu og tidsoverløbsværdi %lu, Maksimale antal tegn "
-"i fifo var %d,\n"
+"Filen %s, For grænseværdi %lu og tidsoverløbsværdi %lu, Maksimale antal tegn i fifo var %d,\n"
 "og den maksimale overførselshastighed var %f tegn/sekund\n"
 
 #: sys-utils/cytune.c:196
@@ -7885,12 +7643,8 @@ 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"
+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
@@ -8432,12 +8186,8 @@ msgstr "beskeder"
 
 #: sys-utils/ipcs.c:600
 #, c-format
-msgid ""
-"\n"
-"Shared memory Segment shmid=%d\n"
-msgstr ""
-"\n"
-"Delt hukommelsessegment dhsid=%d\n"
+msgid "\nShared memory Segment shmid=%d\n"
+msgstr "\nDelt hukommelsessegment dhsid=%d\n"
 
 #: sys-utils/ipcs.c:601
 #, c-format
@@ -8471,12 +8221,8 @@ msgstr "ændrings_tid=%s"
 
 #: sys-utils/ipcs.c:628
 #, c-format
-msgid ""
-"\n"
-"Message Queue msqid=%d\n"
-msgstr ""
-"\n"
-"Beskedkø bkøid=%d\n"
+msgid "\nMessage Queue msqid=%d\n"
+msgstr "\nBeskedkø bkøid=%d\n"
 
 #: sys-utils/ipcs.c:629
 #, c-format
@@ -8500,12 +8246,8 @@ msgstr "modt_tid= %s"
 
 #: sys-utils/ipcs.c:662
 #, c-format
-msgid ""
-"\n"
-"Semaphore Array semid=%d\n"
-msgstr ""
-"\n"
-"Semafortabel semid=%d\n"
+msgid "\nSemaphore Array semid=%d\n"
+msgstr "\nSemafortabel semid=%d\n"
 
 #: sys-utils/ipcs.c:663
 #, c-format
@@ -8607,9 +8349,7 @@ msgstr "  vidmode ...                     samme som rdev -v"
 
 #: sys-utils/rdev.c:80
 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,..."
+msgstr "Bemærk: skærmtilstande er: -3=Spørg, -2=Udvidet, -1=NormalVGA, 1=nøgle1, 2=nøgle2,..."
 
 #: sys-utils/rdev.c:81
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
@@ -8807,9 +8547,7 @@ 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"
+msgstr "hexdump: [-bcdovx] [-e fmt] [-f fmt_fil] [-n længde] [-s overspring] [fil ...]\n"
 
 #: text-utils/more.c:263
 #, c-format
@@ -8818,26 +8556,14 @@ msgstr "brug: %s [-dflpcsu] [+linieantal | +/mønster] navn1 navn2 ...\n"
 
 #: text-utils/more.c:521
 #, c-format
-msgid ""
-"\n"
-"*** %s: directory ***\n"
-"\n"
-msgstr ""
-"\n"
-"*** %s: katalog ***\n"
-"\n"
+msgid "\n*** %s: directory ***\n\n"
+msgstr "\n*** %s: katalog ***\n\n"
 
 #. simple ELF detection
 #: text-utils/more.c:560
 #, c-format
-msgid ""
-"\n"
-"******** %s: Not a text file ********\n"
-"\n"
-msgstr ""
-"\n"
-"******** %s: Ikke en tekstfil ********\n"
-"\n"
+msgid "\n******** %s: Not a text file ********\n\n"
+msgstr "\n******** %s: Ikke en tekstfil ********\n\n"
 
 #: text-utils/more.c:663
 msgid "[Use q or Q to quit]"
@@ -8867,14 +8593,8 @@ msgid "...skipping %d line"
 msgstr "...overspringer %d linie"
 
 #: text-utils/more.c:1272
-msgid ""
-"\n"
-"***Back***\n"
-"\n"
-msgstr ""
-"\n"
-"***Tilbage***\n"
-"\n"
+msgid "\n***Back***\n\n"
+msgstr "\n***Tilbage***\n\n"
 
 #: text-utils/more.c:1329
 msgid "Can't open help file"
@@ -8907,12 +8627,8 @@ msgid "Regular expression botch"
 msgstr "Forkludret regulært udtryk"
 
 #: text-utils/more.c:1572
-msgid ""
-"\n"
-"Pattern not found\n"
-msgstr ""
-"\n"
-"Mønster ikke fundet\n"
+msgid "\nPattern not found\n"
+msgstr "\nMønster ikke fundet\n"
 
 #: text-utils/more.c:1575
 msgid "Pattern not found"
@@ -8923,12 +8639,8 @@ msgid "can't fork\n"
 msgstr "kunne ikke forgrene (fork)\n"
 
 #: text-utils/more.c:1675
-msgid ""
-"\n"
-"...Skipping "
-msgstr ""
-"\n"
-"...Overspringer "
+msgid "\n...Skipping "
+msgstr "\n...Overspringer "
 
 #: text-utils/more.c:1679
 msgid "...Skipping "
@@ -8982,6 +8694,7 @@ msgid "hexdump: bad byte count for conversion character %s.\n"
 msgstr "hexdump: ugyldig byteantal til konverteringstegn %s.\n"
 
 #: text-utils/parse.c:497
+#, c-format
 msgid "hexdump: %%s requires a precision or a byte count.\n"
 msgstr "hexdump: %%s kræver en præcision eller et byteantal.\n"
 
@@ -8991,6 +8704,7 @@ msgid "hexdump: bad format {%s}\n"
 msgstr "hexdump: ugyldigt format {%s}\n"
 
 #: text-utils/parse.c:509
+#, c-format
 msgid "hexdump: bad conversion character %%%s.\n"
 msgstr "hexdump: ugyldig konverteringstegn %%%s.\n"
 
@@ -9027,4 +8741,3 @@ msgstr "For lang inddatalinie.\n"
 #: text-utils/ul.c:601
 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 17eb8c337..57c281f7d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,115 +1,136 @@
 # util-linux.po
 # German translation
-# Copyright (C) 1999
-# Elrond <Elrond@Wunder-Nett.org>, 1999.
-# $Revision: 1.3 $
+# Copyright (C) Elrond <Elrond@Wunder-Nett.org>, 1999-2001
+# $Revision: 1.42 $
 #
 # Permission is granted to freely copy and distribute
 # this file and modified versions, provided, that this
 # header is not removed and modified versions are marked
 # as such.
 #
+# If you have additions/changes/other requests, please
+# send them to me (Elrond <Elrond@Wunder-Nett.org>)!
+#
 # People who helped or contributed (in historical order):
 #   Martin Schulze <joey@infodrom.north.de>
 #   Thomas Wagner <gertrans@yahoo.com>
 #   Beth Powell <bpowell@turbolinux.com>
+#   Daniel Egger <Daniel.Egger@suse.de>
+#   deliA <deliA@Wunder-Nett.org>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux 2.10\n"
-"POT-Creation-Date: 2000-10-16 16:44+0200\n"
-"PO-Revision-Date: 2000-03-30 11:08+0100\n"
+"Project-Id-Version: util-linux 2.11b\n"
+"POT-Creation-Date: 2001-04-20 12:09+0200\n"
+"PO-Revision-Date: 2001-04-20 13:19+0200\n"
 "Last-Translator: Elrond <Elrond@Wunder-Nett.org>\n"
 "Language-Team: Elrond <Elrond@Wunder-Nett.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock/cmos.c:157
+#: hwclock/cmos.c:164
 msgid "booted from MILO\n"
-msgstr "Gebootet von MILO\n"
+msgstr "von MILO gebootet\n"
 
-#: clock/cmos.c:166
+#: hwclock/cmos.c:173
 msgid "Ruffian BCD clock\n"
-msgstr "Ruffian-BCD-Uhr\n"
+msgstr "Ruffian BCD Uhr\n"
 
-#: clock/cmos.c:182
-#, c-format
+# Egger
+#: hwclock/cmos.c:189
+#, fuzzy, c-format
 msgid "clockport adjusted to 0x%x\n"
-msgstr "Uhranschluss eingestellt auf 0x%x\n"
+msgstr "Uhrport auf 0x%x gestellt\n"
 
-#: clock/cmos.c:192
+# debug
+#: hwclock/cmos.c:201
 msgid "funky TOY!\n"
-msgstr "funky TOY!\n"
+msgstr "»funky TOY«!\n"
 
-#: clock/cmos.c:246
-#, c-format
+# The second %s can be:
+# "clock read"
+# "set time"
+#: hwclock/cmos.c:255
+#, fuzzy, c-format
 msgid "%s: atomic %s failed for 1000 iterations!"
-msgstr "%s: atomisches %s war 1000 Durchläufe lang nicht erfolgreich!"
+msgstr "%s: atomares »%s« schlug 1000 Iterationen fehl!"
 
-#: clock/cmos.c:570
+#: hwclock/cmos.c:579
 #, c-format
 msgid "Cannot open /dev/port: %s"
-msgstr "/dev/port konnte nicht geöffnet werden: %s"
+msgstr "Konnte /dev/port nicht öffnen: %s"
 
 # typo in the english version: didn't
-#: clock/cmos.c:577
+# Egger, not realy nice
+#: hwclock/cmos.c:586
 msgid "I failed to get permission because I didn't try.\n"
-msgstr "Keine Erlaubnis, da sie nicht angefordert wurde.\n"
+msgstr "Ich bekam keine Erlaubnis, weil ich es nicht versucht habe.\n"
 
-#: clock/cmos.c:580
+# Egger
+#: hwclock/cmos.c:589
 #, c-format
 msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
 msgstr ""
-"%s kann keinen Zugriff auf den E/A-Anschluss erhalten: der Aufruf iopl(3) "
-"war nicht erfolgreich.\n"
+"%s kann nicht auf I/O Port zugreifen: der iopl(3) Aufruf schlug fehl.\n"
 
-# Oh well.
-#: clock/cmos.c:583
+# This is not the correct translation, but it
+# explains the situation better.
+#: hwclock/cmos.c:592
 msgid "Probably you need root privileges.\n"
-msgstr "Möglicherweise benötigen Sie root-Rechte.\n"
+msgstr "Sie benötigen root-Rechte.\n"
 
-#: clock/hwclock.c:219
+# debug
+#: hwclock/hwclock.c:219
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
-msgstr "Hardware-Uhr weiterhin in %s.\n"
+msgstr "Die Hardwareuhr läuft vermutlich in %s.\n"
 
-#: clock/hwclock.c:220 clock/hwclock.c:309
+#: hwclock/hwclock.c:220 hwclock/hwclock.c:309
 msgid "UTC"
-msgstr "Universalzeit (UTC)"
+msgstr "UTC"
 
-#: clock/hwclock.c:220 clock/hwclock.c:308
+#: hwclock/hwclock.c:220 hwclock/hwclock.c:308
 msgid "local"
-msgstr "Ortszeit (LOCAL)"
+msgstr "lokaler Zeit"
 
-#: clock/hwclock.c:292
+# merge with next
+#: hwclock/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"
+msgstr "%s: Warnung: Unbekannte dritte Zeile in der adjtime Datei\n"
 
-#: clock/hwclock.c:294
+#: hwclock/hwclock.c:294
 msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr "(Erwartet: 'UTC' oder 'LOCAL' oder nichts.)\n"
+msgstr "(Erwartet: »UTC« oder »LOCAL« oder nichts.)\n"
 
-#: clock/hwclock.c:303
+# XXX
+#: hwclock/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"
+msgstr "Letzte Abweichungskorrektur vorgenommen bei %d Sekunden nach 1969\n"
 
-#: clock/hwclock.c:305
+# XXX
+#: hwclock/hwclock.c:305
 #, c-format
 msgid "Last calibration done at %d seconds after 1969\n"
-msgstr "Letzte Kalibrierung erfolgte %d Sekunden nach 1969.\n"
+msgstr "Letzte Kalibrierung vorgenommen bei %d Sekunden nach 1969\n"
 
-#: clock/hwclock.c:307
-#, c-format
+#: hwclock/hwclock.c:307
+#, fuzzy, c-format
 msgid "Hardware clock is on %s time\n"
-msgstr "Die Hardware-Uhr ist auf %s eingestellt.\n"
+msgstr "Hardwareuhr geht nach %s Zeit\n"
 
-#: clock/hwclock.c:309
+#: hwclock/hwclock.c:309
+#, fuzzy
 msgid "unknown"
-msgstr "unbekannt"
+msgstr "unbekannter"
 
+# debug
+# mmh.... sehr geehrter user... dieses ist keine werbeunterbrechung und
+#   kein sendeausfall... ich wart nur auf das anbrechen der nächsten für mich
+#   relevanten zeiteinheit.
+# Egger
 #. -----------------------------------------------------------------------------
 #. 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
@@ -124,99 +145,98 @@ msgstr "unbekannt"
 #. Return *retcode_p == 0 if it worked, nonzero if it didn't.
 #.
 #. -----------------------------------------------------------------------------
-#: clock/hwclock.c:331
+#: hwclock/hwclock.c:331
 msgid "Waiting for clock tick...\n"
-msgstr "Warte auf Uhrsignal...\n"
+msgstr "Warte auf Uhrtick...\n"
 
-#: clock/hwclock.c:335
+# Egger
+#: hwclock/hwclock.c:335
 msgid "...got clock tick\n"
-msgstr "...Uhrsignal erhalten\n"
+msgstr "... erhielt Uhrtick\n"
 
-#: clock/hwclock.c:386
-#, fuzzy, c-format
+#: hwclock/hwclock.c:386
+#, 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"
+msgstr "Ungültige Werte in Hardwareuhr: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: clock/hwclock.c:394
-#, fuzzy, c-format
+#: hwclock/hwclock.c:394
+#, 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"
+"Zeit der Hardwareuhr: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld Sekunden seit 1969\n"
 
-#: clock/hwclock.c:422
-#, fuzzy, c-format
+# Egger
+#: hwclock/hwclock.c:422
+#, 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"
+msgstr "Zeit gelesen aus Hardwareuhr: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: clock/hwclock.c:449
+#: hwclock/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"
+msgstr "Stelle die Hardwareuhr auf %.2d:%.2d:%.2d = %d Sekunden seit 1969\n"
 
-#: clock/hwclock.c:455
+#: hwclock/hwclock.c:455
 msgid "Clock not changed - testing only.\n"
-msgstr "Uhr nicht geändert, nur geprüft.\n"
+msgstr "Die Uhrzeit der Hardwareuhr wurde nicht verstellt - Testmodus.\n"
 
-#: clock/hwclock.c:503
+#: hwclock/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 ""
-"Verstrichene Zeit seit Bezugszeit: %.6f Sekunden.\n"
-"Es erfolgt eine Verzögerung bis zur nächsten vollen Sekunde.\n"
+"Die vergangene Zeit seit der Referenzzeit waren %.6f Sekunden.\n"
+"Es wird weiter gewartet, um die nächste ganze Sekunde zu erreichen.\n"
 
-#: clock/hwclock.c:527
+# Die Registereinträge der Hardwareuhr enthalten Werte, die ungültig
+#   sind (z.B. der 50. Tag des Monats) oder ausserhalb des unterstützen
+#   Bereiches (z.B. das Jahr 2095) liegen.
+#: hwclock/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 ""
-"Die Register der Hardware-Uhr enthalten ungültige Werte (beispielsweise den "
-"50. Tag eines Monats) oder sind außerhalb des zulässigen Bereichs "
-"(beispielsweise Jahr 2095).\n"
+"Die Hardwareuhr enthält entweder ungültige Werte (z.B. den 50. Tag des\n"
+"Monats), oder die Werte liegen außerhalb des Bereiches, der unterstützt\n"
+"wird (z.B. das Jahr 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
+#: hwclock/hwclock.c:537
 #, c-format
 msgid "%s  %.6f seconds\n"
 msgstr "%s  %.6f Sekunden\n"
 
-#: clock/hwclock.c:573
+#: hwclock/hwclock.c:571
 msgid "No --date option specified.\n"
-msgstr "Die Option --date wurde nicht angegeben.\n"
+msgstr "Es wurde keine »--date«-Option angegeben.\n"
 
+# The english version is already a little misleading.
 #. Quotation marks in date_opt would ruin the date command we construct.
 #.
-#: clock/hwclock.c:578
+#: hwclock/hwclock.c:576
 msgid ""
 "The value of the --date option is not a valid date.\n"
 "In particular, it contains quotation marks.\n"
 msgstr ""
-"Der Wert der Option --date ist kein gültiges Datum.\n"
-"Er enthält Anführungszeichen.\n"
+"Der Wert der »--date«-Option ist kein gültiges Datum.\n"
+"Es darf kein Anführungszeichen enthalten.\n"
 
-#: clock/hwclock.c:584
+#: hwclock/hwclock.c:582
 #, c-format
 msgid "Issuing date command: %s\n"
-msgstr "Der Befehl 'date' wird erteilt: %s\n"
+msgstr "Das »date«-Kommando wird aufgerufen: %s\n"
 
-#: clock/hwclock.c:588
+#: hwclock/hwclock.c:586
 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."
+msgstr "Konnte »date« nicht in der /bin/sh-Shell starten. popen() schlug fehl"
 
-#: clock/hwclock.c:594
+#: hwclock/hwclock.c:592
 #, c-format
 msgid "response from date command = %s\n"
-msgstr "Antwort auf den Befehl 'date' = %s\n"
+msgstr "Ausgabe des »date«-Kommandos: %s\n"
 
-#: clock/hwclock.c:596
+# "Ergebnisse"
+#: hwclock/hwclock.c:594
 #, c-format
 msgid ""
 "The date command issued by %s returned unexpected results.\n"
@@ -225,13 +245,14 @@ msgid ""
 "The response was:\n"
 "  %s\n"
 msgstr ""
-"Der von %s aufgerufene Befehl 'date' hatte ein unwartetes Ergebnis.\n"
-"Der Befehl lautete:\n"
+"Das »date«-Kommando, das von %s aufgerufen wurde, lieferte unerwartete "
+"Werte.\n"
+"Der Befehl war:\n"
 "  %s\n"
-"Die Antwort war:\n"
+"Die Ausgabe war:\n"
 "  %s\n"
 
-#: clock/hwclock.c:605
+#: hwclock/hwclock.c:603
 #, fuzzy, c-format
 msgid ""
 "The date command issued by %s returned something other than an integer where "
@@ -241,182 +262,195 @@ msgid ""
 "The response was:\n"
 " %s\n"
 msgstr ""
-"Der von %s aufgerufene Befehl 'date' gab keine Ganzzahl zurück, obwohl ein "
-"konvertierter Zeitwert erwartet wurde.\n"
-"Der Befehl lautete:\n"
+"Das »date«-Kommando, das von %s aufgerufen wurde, lieferte keine ganze "
+"Zahl,\n"
+"obwohl die umgewandelte Zeit erwartet wurde.\n"
+"Der Befehl war:\n"
+"  %s\n"
+"Die Ausgabe war:\n"
 "  %s\n"
-"Die Antwort war:\n"
-" %s\n"
 
-#: clock/hwclock.c:615
+# Egger, fixed %s->%d
+#: hwclock/hwclock.c:613
 #, c-format
 msgid "date string %s equates to %d seconds since 1969.\n"
-msgstr "Die Datumszeichenfolge %s entspricht %d Sekunden seit 1969.\n"
+msgstr "Die Zeichenkette %s entspricht %d Sekunden seit 1969.\n"
 
-#: clock/hwclock.c:647
+#: hwclock/hwclock.c:645
 msgid ""
 "The Hardware Clock does not contain a valid time, so we cannot set the "
 "System Time from it.\n"
 msgstr ""
-"Die Hardware-Uhr enthält keine gültige Zeit. Die Systemzeit kann daher nicht "
-"von ihr abgeleitet werden.\n"
+"Die Hardwareuhr enthält eine ungültige Zeitangabe;\n"
+"kann Systemzeit deshalb nicht setzen.\n"
 
 # debug
-#: clock/hwclock.c:669
+#: hwclock/hwclock.c:667
 msgid "Calling settimeofday:\n"
 msgstr "settimeofday() wird aufgerufen:\n"
 
 # not much to translate
 # debug
-#: clock/hwclock.c:670
+#: hwclock/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"
 
 # not much to translate
 # debug
-#: clock/hwclock.c:672
-#, fuzzy, c-format
+#: hwclock/hwclock.c:670
+#, c-format
 msgid "\ttz.tz_minuteswest = %d\n"
-msgstr "\ttz.tz_minuteswest = %ld\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
 
-#: clock/hwclock.c:675
+#: hwclock/hwclock.c:673
+#, fuzzy
 msgid "Not setting system clock because running in test mode.\n"
-msgstr "Ausführung im Testmodus, die Systemuhr wird daher nicht gestellt.\n"
+msgstr "Keine Änderung an der Systemuhr vorgenommen - Testmodus \n"
 
-#: clock/hwclock.c:683
+#: hwclock/hwclock.c:681
+#, fuzzy
 msgid "Must be superuser to set system clock.\n"
-msgstr "Die Systemuhr kann nur vom Superuser eingestellt werden.\n"
+msgstr "Sie müssen root sein, um die Systemuhr zu verändern.\n"
 
-#: clock/hwclock.c:685
+#: hwclock/hwclock.c:683
 msgid "settimeofday() failed"
-msgstr "settimeofday() nicht erfolgreich."
+msgstr "settimeofday() schlug fehl"
 
-#: clock/hwclock.c:718
+#: hwclock/hwclock.c:716
 msgid ""
 "Not adjusting drift factor because the Hardware Clock previously contained "
 "garbage.\n"
 msgstr ""
-"Der Abweichungsfaktor wird nicht eingestellt, da die Hardware-Uhr zuvor "
-"ungültige Werte enthielt.\n"
+"Der Driftfaktor wird nicht verändert, da die Hardwareuhr vorher keinen "
+"sinnvollen Wert enthielt.\n"
 
-#: clock/hwclock.c:722
+#: hwclock/hwclock.c:720
 msgid ""
 "Not adjusting drift factor because it has been less than a day since the "
 "last calibration.\n"
 msgstr ""
-"Der Abweichungsfaktor wird nicht eingestellt, da seit der letzten "
-"Kalibrierung weniger als ein Tag verstrichen ist.\n"
+"Der Driftfaktor wird nicht verändert, da weniger als ein Tag seit der "
+"letzten Kalibrierung vergangen ist.\n"
 
-#: clock/hwclock.c:731
+# Egger
+#: hwclock/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 ""
-"Die Abweichung der Uhr betrug %d Sekunden in den letzten %d Sekunden trotz "
-"eines Abweichungsfaktors von %f Sekunden/Tag.\n"
-"Der Abweichungsfaktor wird um %f Sekunden/Tag geändert.\n"
+"Die Uhr wich um %d Sekunden in den vergangenen %d Sekunden, trotz eines "
+"Driftfaktors von %f Sekunden/Tag, ab.\n"
+"Der Faktor wird um %f Sekunden/Tag geändert.\n"
 
-#: clock/hwclock.c:782
+# Egger
+#: hwclock/hwclock.c:780
 #, c-format
 msgid "Time since last adjustment is %d seconds\n"
-msgstr "Zeit seit der letzten Einstellung: %d Sekunden\n"
+msgstr "Es vergingen %d Sekunden seit der letzten Anpassung.\n"
 
-#: clock/hwclock.c:784
+# Egger
+#: hwclock/hwclock.c:782
 #, 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"
+"Es müssen %d Sekunden eingefügt werden und es muß auf die Zeit vor %.6f "
+"Sekunden zugegriffen werden\n"
 
-#: clock/hwclock.c:813
+# merge with next
+#: hwclock/hwclock.c:811
 msgid "Not updating adjtime file because of testing mode.\n"
-msgstr ""
-"'adjtime' wird nicht aktualisiert, da Sie sich im Testmodus befinden.\n"
+msgstr "Die adjtime Datei wird nicht aktualisiert - Testmodus \n"
 
-#: clock/hwclock.c:814
+# "Hätte das folgende in die Datei %s geschrieben:\n"
+# passiv, Konjunktiv in der Umschreibungsform
+#: hwclock/hwclock.c:812
 #, c-format
 msgid ""
 "Would have written the following to %s:\n"
 "%s"
 msgstr ""
-"In die Datei %s wäre der folgende Wert geschrieben worden:\n"
+"Folgendes wäre in die Datei %s geschrieben worden:\n"
 "%s"
 
-#: clock/hwclock.c:838
+# "Abweichungsparameter"
+#: hwclock/hwclock.c:836
 msgid "Drift adjustment parameters not updated.\n"
-msgstr "Die Zeitabweichungsparameter wurden nicht aktualisiert.\n"
+msgstr "Die Abweichungsparameter wurden nicht verändert.\n"
 
-#: clock/hwclock.c:879
+# "anpassen"
+#: hwclock/hwclock.c:877
 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"
+"Die Hardwareuhr enthält keine gültige Zeit, deshalb kann sie nicht angepasst "
+"werden.\n"
 
-#: clock/hwclock.c:903
+# "Justierung"
+#: hwclock/hwclock.c:901
 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"
+"Da die Anpassung weniger als eine Sekunde betragen hätte, wird sie nicht "
+"durchgeführt.\n"
 
-#: clock/hwclock.c:929
+#: hwclock/hwclock.c:927
 #, c-format
 msgid "Using %s.\n"
-msgstr "Es wird %s verwendet.\n"
+msgstr "Benutze %s.\n"
 
-#: clock/hwclock.c:931
+# "Schnittstelle"
+#: hwclock/hwclock.c:929
 msgid "No usable clock interface found.\n"
-msgstr "Es wurde keine verwendbare Uhrschnittstelle gefunden.\n"
+msgstr "Keine brauchbare Uhrschnittstelle gefunden.\n"
 
-#: clock/hwclock.c:1026
+# "stellen"
+#: hwclock/hwclock.c:1024
 msgid "Unable to set system clock.\n"
-msgstr "Die Systemuhr konnte nicht eingestellt werden.\n"
+msgstr "Konnte die Systemuhr nicht stellen.\n"
 
-#: clock/hwclock.c:1055
+#: hwclock/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 ""
-"Der Kernel speichert nur auf Alpha-Rechnern eine Epochenwert für die "
-"Hardware-Uhr.\n"
-"Diese Version von 'hwclock' wurde nicht für einen Alpha-Rechner entwickelt\n"
-"(und wird daher wohl auch nicht auf einem Alpha-Rechner ausgeführt). Es wird "
-"nichts durchgeführt.\n"
 
-#: clock/hwclock.c:1064
+# Egger
+#: hwclock/hwclock.c:1062
 msgid "Unable to get the epoch value from the kernel.\n"
-msgstr "Der Epochenwert kann nicht aus dem Kernel abgerufen werden.\n"
+msgstr "Kann den Epochenwert nicht vom Kernel bekommen.\n"
 
-#: clock/hwclock.c:1066
+# Egger
+# "Epochenwert"
+#: hwclock/hwclock.c:1064
 #, c-format
 msgid "Kernel is assuming an epoch value of %lu\n"
-msgstr "Der Kernel geht vom Epochenwert %lu aus.\n"
+msgstr "Kernel geht von einem Epochenwert von %lu aus.\n"
 
-#: clock/hwclock.c:1069
+#: hwclock/hwclock.c:1067
 msgid ""
 "To set the epoch value, you must use the 'epoch' option to tell to what "
 "value to set it.\n"
 msgstr ""
-"Wenn Sie den Epochenwert festlegen möchten, verwenden Sie die Option "
-"'epoch', um den einzustellenden Wert anzugeben.\n"
+"Um den Epochenwert zu ändern, müssen sie die »epoch«-Option benutzen, um "
+"anzugeben auf welchen Wert er gesetzt werden soll.\n"
 
-#: clock/hwclock.c:1072
+#: hwclock/hwclock.c:1070
 #, 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"
+msgstr "Der Epochenwert wird nicht auf %d gesetzt - Testmodus.\n"
 
-#: clock/hwclock.c:1075
+# Egger
+#: hwclock/hwclock.c:1073
 msgid "Unable to set the epoch value in the kernel.\n"
-msgstr "Der Epochenwert im Kernel kann nicht eingestellt werden.\n"
+msgstr "Kann den Epochenwert im Kernel nicht ändern.\n"
 
-#: clock/hwclock.c:1104
-#, c-format
+# "Universalzeit"
+#: hwclock/hwclock.c:1102
+#, fuzzy, c-format
 msgid ""
 "hwclock - query and set the hardware clock (RTC)\n"
 "\n"
@@ -444,246 +478,258 @@ msgid ""
 "  --epoch=year  specifies the year which is the beginning of the \n"
 "                hardware clock's epoch value\n"
 msgstr ""
-
-#: clock/hwclock.c:1129
+"hwclock - Die Hardwareuhr setzen und abfragen\n"
+"\n"
+"Aufruf: hwclock [Funktion] [Optionen...]\n"
+"\n"
+"Funktionen:\n"
+"  --help        zeigt diese Hilfe\n"
+"  --show        zeigt Zeit der Hardwareuhr an\n"
+"  --set         setzt die Hardwareuhr auf die Zeit die mit der\n"
+"                »--date«-Option angegeben wurde\n"
+"  --hctosys     setzt die Systemzeit von der Hardwareuhr\n"
+"  --systohc     setzt die Hardwareuhr auf die Systemzeit\n"
+"  --adjust      passt die Hardwareuhr um einen berechneten \n"
+"                Driftfaktor an\n"
+"  --getepoch    zeigt den Epochenwert der Hardwareuhr an\n"
+"  --setepoch    stellt den Epochenwert der Hardwareuhr auf den Wert,\n"
+"                der mit der »--epoch«-Option angegeben wurde\n"
+"  --version     zeigt die Version von hwclock an\n"
+"\n"
+"Optionen: \n"
+"  --utc         die Hardwareuhr läuft nach Universalzeit (UTC)\n"
+"  --localtime   die Hardwareuhr läuft nach lokaler Zeit\n"
+"  --directisa   verwendet den ISA Bus direkt anstelle von %s\n"
+"  --badyear     ignoriert die Jahreszahl der Hardwareuhr,\n"
+"                weil sie nicht stimmt (Jahr2000 Problem)\n"
+"  --date        verwendet dieses Datum\n"
+"  --epoch=year  verwendet diesen Wert als Epochenwert\n"
+
+#: hwclock/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:1227
+#: hwclock/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:1237
+#: hwclock/hwclock.c:1237
 msgid ""
 "You have specified multiple function options.\n"
 "You can only perform one function at a time.\n"
 msgstr ""
-"Sie haben mehrere Funktionoptionen angegeben.\n"
-"Es kann immer nur eine Funktion durchgeführt werden.\n"
 
-#: clock/hwclock.c:1243
+#: hwclock/hwclock.c:1243
 #, c-format
 msgid ""
 "%s: The --utc and --localtime options are mutually exclusive.  You specified "
 "both.\n"
 msgstr ""
-"%s: Die Optionen --utc und --localtime schließen sich gegenseitig aus. Sie "
-"haben beide angegeben.\n"
 
-#: clock/hwclock.c:1256
+#: hwclock/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:1271
+#: hwclock/hwclock.c:1271
+#, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock.\n"
-msgstr "Die Hardware-Uhr kann nur vom Superuser geändert werden.\n"
+msgstr "Sie müssen root sein, um die Hardwareuhr zu ändern.\n"
 
-#: clock/hwclock.c:1275
+#: hwclock/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"
+msgstr "Sie müssen root sein, um die Systemuhr zu ändern.\n"
 
-#: clock/hwclock.c:1279
+#: hwclock/hwclock.c:1279
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the "
 "kernel.\n"
-msgstr ""
-"Die Epoche der Hardware-Uhr im Kernel kann nur vom Superuser geändert "
-"werden.\n"
+msgstr "Sie müssen root sein, um den »epoch«-Wert zu ändern.\n"
 
-#: clock/hwclock.c:1299
+#: hwclock/hwclock.c:1299
 msgid "Cannot access the Hardware Clock via any known method.\n"
 msgstr ""
+"Es wurde keine Zugriffsart gefunden, mit der auf die Hardwareuhr zugegriffen "
+"werden konnte.\n"
 
-#: clock/hwclock.c:1302
-#, fuzzy
+#: hwclock/hwclock.c:1302
 msgid ""
 "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"
+"Benutzen Sie die »--debug«-Option um die versuchten Zugriffsarten "
+"anzuzeigen.\n"
 
-#: clock/kd.c:41
+# debug
+#: hwclock/kd.c:41
 msgid "Waiting in loop for time from KDGHWCLK to change\n"
-msgstr "Warteschleife für die Zeitänderung von KDGHWCLK im Gange...\n"
+msgstr ""
 
-#: clock/kd.c:44
+#: hwclock/kd.c:44
 msgid "KDGHWCLK ioctl to read time failed"
-msgstr "KDGHWCLK ioctl konnte die Zeit nicht lesen."
+msgstr ""
+"KDGHWCLK ioctl scheiterte beim Versuch die Zeit aus der Hardwareuhr "
+"auszulesen."
 
-#: clock/kd.c:65 clock/rtc.c:151
+#: hwclock/kd.c:65 hwclock/rtc.c:151
 msgid "Timed out waiting for time change.\n"
-msgstr "Zeitüberschreitung beim Warten auf die Zeitänderung.\n"
+msgstr ""
 
-#: clock/kd.c:69
+#: hwclock/kd.c:69
 msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "KDGHWCLK ioctl konnte Zeit in der Warteschleife nicht lesen."
+msgstr ""
+"KDGHWCLK ioctl scheiterte beim Versuch die Zeit aus der Hardwareuhr "
+"auszulesen."
 
-#: clock/kd.c:91
+#: hwclock/kd.c:91
 msgid "ioctl() failed to read time from  /dev/tty1"
-msgstr "ioctl() konnte Zeit von /dev/tty1 nicht lesen."
+msgstr "ioctl() konnte Zeit nicht von /dev/tty1 lesen."
 
-#: clock/kd.c:127
-msgid "ioctl() to open /dev/tty1 failed"
-msgstr "ioctl() konnte /dev/tty1 nicht öffnen."
+#: hwclock/kd.c:127
+msgid "ioctl KDSHWCLK failed"
+msgstr ""
 
-#: clock/kd.c:157
+#: hwclock/kd.c:157
 msgid "KDGHWCLK ioctl failed"
-msgstr "KDGHWCLK ioctl nicht erfolgreich."
+msgstr ""
 
-#: clock/kd.c:163
+#: hwclock/kd.c:163
+#, fuzzy
 msgid "Can't open /dev/tty1"
-msgstr "/dev/tty1 konnte nicht geöffnet werden."
+msgstr "Konnte /dev/tty1 nicht öffnen"
 
-#: clock/rtc.c:105
+#: hwclock/rtc.c:105
 #, c-format
 msgid "ioctl() to %s to read the time failed.\n"
 msgstr ""
-"Funktionsaufruf ioctl() an %s für das Lesen der Uhr war nicht erfolgreich.\n"
 
-#: clock/rtc.c:136
+#: hwclock/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"
+msgstr ""
 
-#: clock/rtc.c:172 clock/rtc.c:229
+#: hwclock/rtc.c:172 hwclock/rtc.c:229
 #, c-format
 msgid "open() of %s failed"
-msgstr "%s konnte nicht geöffnet werden."
+msgstr "Konnte %s nicht öffnen"
 
-#: clock/rtc.c:190
+#: hwclock/rtc.c:190
 #, c-format
 msgid "%s does not have interrupt functions. "
-msgstr "%s enthält keine Interrupt-Funktionen. "
+msgstr ""
 
-#: clock/rtc.c:198
+#: hwclock/rtc.c:198
 #, c-format
 msgid "read() to %s to wait for clock tick failed"
 msgstr ""
-"Der Funktionsaufruf read() an %s für das Warten auf ein Uhrsignal war nicht "
-"erfolgreich."
 
-#: clock/rtc.c:206
+#: hwclock/rtc.c:206
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr ""
-"Der Funktionsaufruf ioctl() an %s für das Ausschalten des "
-"Aktualisierungs-Interrupts war nicht erfolgreich."
 
-#: clock/rtc.c:209
+#: hwclock/rtc.c:209
 #, c-format
 msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
 msgstr ""
-"Der Funktionsaufruf ioctl() an %s für das Einschalten des "
-"Aktualisierungs-Interrupts war nicht erfolgreich."
 
-#: clock/rtc.c:252 clock/rtc.c:331 clock/rtc.c:376
+#: hwclock/rtc.c:252 hwclock/rtc.c:331 hwclock/rtc.c:376
 #, c-format
 msgid "Unable to open %s"
-msgstr "%s konnte nicht geöffnet werden."
+msgstr "Konnte %s nicht öffnen"
 
-#: clock/rtc.c:275
+#: hwclock/rtc.c:275
 #, c-format
 msgid "ioctl() to %s to set the time failed.\n"
 msgstr ""
-"Der Funktionsaufruf ioctl() an %s für das Einstellen der Zeit war nicht "
-"erfolgreich.\n"
 
-#: clock/rtc.c:279
+# debug
+#: hwclock/rtc.c:279
 #, c-format
 msgid "ioctl(%s) was successful.\n"
-msgstr "ioctl(%s) war erfolgreich.\n"
+msgstr "»ioctl(%s)« war erfolgreich.\n"
 
-#: clock/rtc.c:309
+#: hwclock/rtc.c:309
 #, c-format
 msgid "Open of %s failed"
-msgstr "%s konnte nicht geöffnet werden."
+msgstr "Konnte %s nicht öffnen"
 
-#: clock/rtc.c:327 clock/rtc.c:372
+#: hwclock/rtc.c:327 hwclock/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 ""
-"Um den Epochenwert im Kernel bearbeiten zu können, ist der Zugriff auf den "
-"Linux-Gerätetreiber 'rtc' über die Gerätedatei %s erforderlich. Diese Datei "
-"ist in diesem System nicht vorhanden.\n"
 
-#: clock/rtc.c:338
+#: hwclock/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."
+msgstr ""
 
-#: clock/rtc.c:344
+#: hwclock/rtc.c:344
 #, c-format
 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"
+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:364
+#: hwclock/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:381
+#: hwclock/rtc.c:381
 #, c-format
 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"
+msgstr ""
 
-#: clock/rtc.c:386
+#: hwclock/rtc.c:386
 #, c-format
 msgid ""
 "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 %s nicht enthalten.\n"
 
-#: clock/rtc.c:389
+#: hwclock/rtc.c:389
 #, c-format
 msgid "ioctl(RTC_EPOCH_SET) to %s failed"
-msgstr "Funktionsaufruf ioctl(RTC_EPOCH_SET) an %s war nicht erfolgreich."
+msgstr ""
 
-#: clock/shhopt.c:255 clock/shhopt.c:281
+#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
 #, c-format
 msgid "invalid number `%s'\n"
-msgstr "Ungültiger Wert: '%s'\n"
+msgstr "Ungültige Zahl: »%s«\n"
 
-#: clock/shhopt.c:258 clock/shhopt.c:284
-#, c-format
+#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
+#, fuzzy, c-format
 msgid "number `%s' to `%s' out of range\n"
-msgstr "Wert '%s' für '%s' nicht im gültigen Bereich.\n"
+msgstr "Die Zahl »%s« für die Option »%s« ist außerhalb des Bereiches\n"
 
-#: clock/shhopt.c:398
+#: hwclock/shhopt.c:398
 #, c-format
 msgid "unrecognized option `%s'\n"
-msgstr "Unbekannte Option '%s'\n"
+msgstr "unbekannte Option »%s«\n"
 
-#: clock/shhopt.c:411 clock/shhopt.c:449
+# libc: "Die Option »%s« erfordert ein Argument\n"
+#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
 #, c-format
 msgid "option `%s' requires an argument\n"
-msgstr "Option '%s' erwartet ein Argument.\n"
+msgstr "Option »%s« erwartet ein Argument\n"
 
-#: clock/shhopt.c:417
+# libc: "Die Option »%s« erlaubt kein Argument\n"
+#: hwclock/shhopt.c:417
 #, c-format
 msgid "option `%s' doesn't allow an argument\n"
-msgstr "Option '%s' erwartet kein Argument.\n"
+msgstr "Option »%s« erwartet kein Argument\n"
 
-#: clock/shhopt.c:439
+#: hwclock/shhopt.c:439
 #, c-format
 msgid "unrecognized option `-%c'\n"
-msgstr "Unbekannte Option '-%c'\n"
+msgstr "unbekannte Option »-%c«\n"
 
 #: disk-utils/blockdev.c:47
 msgid "set read-only"
@@ -722,28 +768,33 @@ msgid "reread partition table"
 msgstr ""
 
 #: disk-utils/blockdev.c:79
-#, c-format
+#, fuzzy, c-format
 msgid "Usage: %s [-V] [-v|-q] commands devices\n"
-msgstr ""
+msgstr "Aufruf: %s [-V] [-v|-q] Kommando Gerät\n"
 
-# "Ungültige Taste"
 #: disk-utils/blockdev.c:80
+#, fuzzy
 msgid "Available commands:\n"
-msgstr ""
+msgstr "Verfügbare Kommandos:\n"
 
 #: disk-utils/blockdev.c:180
-#, c-format
+#, fuzzy, c-format
 msgid "%s: Unknown command: %s\n"
-msgstr ""
+msgstr "%s: Unbekanntes Kommando: %s\n"
 
 #: disk-utils/blockdev.c:191
-#, c-format
+#, fuzzy, c-format
 msgid "%s requires an argument\n"
-msgstr ""
+msgstr "%s erwartet ein Argument\n"
+
+#: disk-utils/elvtune.c:46
+#, fuzzy
+msgid "usage:\n"
+msgstr "Aufruf:"
 
 #: disk-utils/fdformat.c:36
 msgid "Formatting ... "
-msgstr "Formatieren im Gange... "
+msgstr "Formatieren ... "
 
 #: disk-utils/fdformat.c:54 disk-utils/fdformat.c:89
 msgid "done\n"
@@ -762,44 +813,47 @@ msgstr "Lesen: "
 #, 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"
+"Problem beim Lesen von Zylinder %d, es wurde %d erwartet, aber %d gelesen\n"
 
+# Oh, well, that doesn't sound pretty good.
 #: disk-utils/fdformat.c:84
 #, c-format
 msgid ""
 "bad data in cyl %d\n"
 "Continuing ... "
 msgstr ""
-"Ungültige Daten in Zylinder %d.\n"
+"Schlechte Daten bei Zylinder %d\n"
 "Operation wird fortgesetzt ... "
 
 #: disk-utils/fdformat.c:99
 #, c-format
 msgid "usage: %s [ -n ] device\n"
-msgstr "Verwendung: %s [ -n ] Gerät\n"
+msgstr "Aufruf: %s [ -n ] Gerät\n"
 
-# The first %s is swapon/swapoff
-#: 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
+# "mkfs aus util-linux-2.10d"
+# "mkfs von util-linux-2.10d"
+#: disk-utils/fdformat.c:120 disk-utils/fsck.minix.c:1248
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:452
+#: disk-utils/setfdprm.c:127 misc-utils/cal.c:203 misc-utils/ddate.c:181
+#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:130
 #, c-format
 msgid "%s from %s\n"
-msgstr ""
+msgstr "%s von %s\n"
 
 #: disk-utils/fdformat.c:134
 #, c-format
 msgid "%s: not a floppy device\n"
-msgstr "%s ist kein Diskettenlaufwerk.\n"
+msgstr "%s ist kein Diskettenlaufwerk\n"
 
 #: disk-utils/fdformat.c:140
 msgid "Could not determine current format type"
-msgstr "Das aktuelle Format konnte nicht ermittelt werden."
+msgstr "Konnte das aktuelle Format nicht feststellen"
 
 #: 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"
+msgstr "%sseitig, %d Spuren, %d Sektoren/Spur, Totale Kapazität: %dkB.\n"
 
 #: disk-utils/fdformat.c:142
 msgid "Double"
@@ -812,28 +866,28 @@ msgstr "Einfach"
 #: disk-utils/fsck.minix.c:197
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
-msgstr "Verwendung: %s [-larvsmf] /dev/name\n"
+msgstr "Aufruf: %s [-larvsmf] /dev/name\n"
 
 #: disk-utils/fsck.minix.c:296
 #, c-format
 msgid "%s is mounted.\t "
-msgstr "%s ist gemounted.\t "
+msgstr "%s ist gemountet. (mount) \t "
 
 #: disk-utils/fsck.minix.c:298
 msgid "Do you really want to continue"
-msgstr "Möchten Sie wirklich fortfahren?"
+msgstr "Fortfahren"
 
 #: disk-utils/fsck.minix.c:302
 msgid "check aborted.\n"
-msgstr "Prüfung abgebrochen.\n"
+msgstr "Überprüfung abgebrochen. \n"
 
 #: disk-utils/fsck.minix.c:319 disk-utils/fsck.minix.c:339
 msgid "Zone nr < FIRSTZONE in file `"
-msgstr "Zonennummer < FIRSTZONE in Datei '"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:341
 msgid "Zone nr >= ZONES in file `"
-msgstr "Zonennummer >= ZONES in Datei '"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:346
 msgid "Remove block"
@@ -841,99 +895,97 @@ msgstr "Block entfernen"
 
 #: 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 '"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:370
 msgid "Read error: bad block in file '"
-msgstr "Lesefehler: Ungültiger Block in Datei '"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:386
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
-"Interner Fehler: Es wurde versucht, einen ungültigen Block zu schreiben.\n"
-"Die Schreibanforderung wird ignoriert.\n"
 
 #: 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"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:394
 msgid "Write error: bad block in file '"
-msgstr "Fehler beim Schreiben: Ungültiger Block in Datei '"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:513
 msgid "seek failed in write_super_block"
-msgstr "Fehler bei der Suche in write_super_block"
+msgstr ""
 
 #: 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."
+msgstr "Konnte den Superblock nicht schreiben"
 
 #: disk-utils/fsck.minix.c:525
 msgid "Unable to write inode map"
-msgstr "Inode-Zuordnung konnte nicht geschrieben werden."
+msgstr "Konnte die »inode map« nicht schreiben"
 
 #: disk-utils/fsck.minix.c:527
 msgid "Unable to write zone map"
-msgstr "Zonenzuordnung konnte nicht geschrieben werden."
+msgstr "Konnte die »zone map« nicht schreiben"
 
 #: disk-utils/fsck.minix.c:529
 msgid "Unable to write inodes"
-msgstr "Inodes konnte nicht geschrieben werden."
+msgstr "Konnte die »inodes map« nicht schreiben"
 
 #: disk-utils/fsck.minix.c:558
 msgid "seek failed"
-msgstr "Suchvorgang nicht erfolgreich"
+msgstr "»seek« gescheitert."
 
 #: disk-utils/fsck.minix.c:560
 msgid "unable to read super block"
-msgstr "Superblock konnte nicht gelesen werden"
+msgstr "Konnte den Superblock nicht lesen"
 
 #: disk-utils/fsck.minix.c:580
 msgid "bad magic number in super-block"
-msgstr "Ungültige 'Magic Number' im Superblock."
+msgstr "Ungültige »magic number« im Superblock"
 
 #: 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."
+msgstr "Es werden nur 1k Blöcke/Zonen unterstützt"
 
 #: disk-utils/fsck.minix.c:584
 msgid "bad s_imap_blocks field in super-block"
-msgstr "Ungültiges Feld 's_imap_blocks' im Superblock."
+msgstr "Ungültiger Wert im Feld »s_imap_block« im Superblock"
 
 #: disk-utils/fsck.minix.c:586
 msgid "bad s_zmap_blocks field in super-block"
-msgstr "Ungültiges Feld 's_zmap_blocks' im Superblock."
+msgstr "Ungültiger Wert im Feld »s_zmap_block« im Superblock"
 
 #: disk-utils/fsck.minix.c:593
 msgid "Unable to allocate buffer for inode map"
-msgstr "Puffer für inode-Zuordnung kann nicht zugewiesen werden."
+msgstr "Kein Speicherplatz für »inode map« verfügbar"
 
 #: disk-utils/fsck.minix.c:601
 msgid "Unable to allocate buffer for inodes"
-msgstr "Puffer für inodes kann nicht zugewiesen werden."
+msgstr "Kein Speicherplatz für »inodes« verfügbar"
 
 #: 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."
+msgstr "Kein Speicherplatz für »inode count« verfügbar"
 
 #: disk-utils/fsck.minix.c:607
 msgid "Unable to allocate buffer for zone count"
-msgstr "Puffer für Zonenzählung kann nicht zugewiesen werden."
+msgstr "Kein Speicherplatz für »zone count« verfügbar"
 
 #: disk-utils/fsck.minix.c:609
 msgid "Unable to read inode map"
-msgstr "Inode-Zuordnung kann nicht gelesen werden."
+msgstr "Kann »inode map« nicht lesen"
 
 #: disk-utils/fsck.minix.c:611
 msgid "Unable to read zone map"
-msgstr "Zonenzuordnung kann nicht gelesen werden."
+msgstr "Kann »zone map« nicht lesen"
 
 #: disk-utils/fsck.minix.c:613
 msgid "Unable to read inodes"
-msgstr "Inodes kann nicht gelesen werden."
+msgstr "Kann »inodes« nicht lesen."
 
 #: disk-utils/fsck.minix.c:615
 msgid "Warning: Firstzone != Norm_firstzone\n"
@@ -952,22 +1004,22 @@ msgstr "%ld Blöcke\n"
 #: 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"
+msgstr "Firstdatazone=%ld (%ld)\n"
 
 #: disk-utils/fsck.minix.c:623 disk-utils/mkfs.minix.c:527
 #, c-format
 msgid "Zonesize=%d\n"
-msgstr "Zonengröße = %d\n"
+msgstr "Zonesize=%d\n"
 
 #: disk-utils/fsck.minix.c:624
 #, c-format
 msgid "Maxsize=%ld\n"
-msgstr "Maximalgröße = %ld\n"
+msgstr "Maxsize=%ld\n"
 
 #: disk-utils/fsck.minix.c:625
 #, c-format
 msgid "Filesystem state=%d\n"
-msgstr "Status des Dateisystems = %d\n"
+msgstr "Filesystem state=%d\n"
 
 #: disk-utils/fsck.minix.c:626
 #, c-format
@@ -975,181 +1027,179 @@ msgid ""
 "namelen=%d\n"
 "\n"
 msgstr ""
-"Namenslänge = %d\n"
+"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 ist als 'nicht verwendet' markiert, wird aber verwendet von Datei '"
+"Inode %d ist als unbenutzt gekennzeichnet, aber die folgende\n"
+"Datei benutzt sie: '"
 
 #: disk-utils/fsck.minix.c:645 disk-utils/fsck.minix.c:695
 msgid "Mark in use"
-msgstr "Markierung in Gebrauch"
+msgstr "Inode als benutzt kennzeichnen"
 
 #: disk-utils/fsck.minix.c:667 disk-utils/fsck.minix.c:715
 #, c-format
 msgid " has mode %05o\n"
-msgstr " hat Modus %05o\n"
+msgstr "hat Mode %05o\n"
 
 #: 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"
+msgstr "Warnung: »inode count« zu gross.\n"
 
 #: disk-utils/fsck.minix.c:733
 msgid "root inode isn't a directory"
-msgstr "'root inode' ist kein Verzeichnis."
+msgstr "»root inode« ist kein Verzeichnis"
 
 #: 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 '"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:802
 #, c-format
 msgid "Block %d in file `"
-msgstr "Block %d in Datei '"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:770 disk-utils/fsck.minix.c:804
 msgid "' is marked not in use."
-msgstr "' ist als 'nicht verwendet' markiert."
+msgstr ""
 
 #: disk-utils/fsck.minix.c:771 disk-utils/fsck.minix.c:805
 msgid "Correct"
-msgstr "Korrekt"
+msgstr ""
 
 #: 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 '"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1016
 msgid " Remove"
-msgstr " Entfernen"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1070
 msgid "internal error"
-msgstr "Interner Fehler"
+msgstr "interner Fehler"
 
 #: disk-utils/fsck.minix.c:1073
 msgid ": bad directory: size<32"
-msgstr ": ungültiges Verzeichnis: Größe<32"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1091
 msgid ": bad directory: size < 32"
-msgstr ": ungültiges Verzeichnis: Größe < 32"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1104
 msgid "seek failed in bad_zone"
-msgstr "Suchvorgang in bad_zone nicht erfolgreich."
+msgstr ""
 
 #: 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."
+msgstr ""
 
 #: 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."
+msgstr ""
 
 #: 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."
+msgstr ""
 
 #: 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."
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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:1150 disk-utils/fsck.minix.c:1201
 msgid "Unmark"
-msgstr "Markierung aufheben"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1155 disk-utils/fsck.minix.c:1206
 msgid "not "
-msgstr "nicht "
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1182
 msgid "Set"
-msgstr "Setzen"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1256
 msgid "bad v2 inode size"
-msgstr "ungültige v2-inode-Größe"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1282
 msgid "need terminal for interactive repairs"
-msgstr "Für interaktive Reparaturen ist ein Terminal erforderlich."
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1286
 #, c-format
 msgid "unable to open '%s'"
-msgstr "%s konnte nicht geöffnet werden."
+msgstr "Konnte %s nicht öffnen"
 
 #: disk-utils/fsck.minix.c:1301
 #, c-format
 msgid "%s is clean, no check.\n"
-msgstr "%s erfordert keine Prüfung.\n"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1305
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
-msgstr "Dateisystemprüfung für %s wird erzwungen.\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1336
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
-"\n"
-"%6ld inodes verwendet (%ld%%)\n"
 
 #: disk-utils/fsck.minix.c:1341
 msgid "%6ld zones used (%ld%%)\n"
-msgstr "%6ld Zonen verwendet (%ld%%)\n"
+msgstr ""
 
 #: disk-utils/fsck.minix.c:1343
-#, c-format, ycp-format
+#, c-format
 msgid ""
 "\n"
 "%6d regular files\n"
@@ -1161,15 +1211,6 @@ msgid ""
 "------\n"
 "%6d files\n"
 msgstr ""
-"\n"
-"%6d reguläre Dateien\n"
-"%6d Verzeichnisse\n"
-"%6d Zeichengerätedateien\n"
-"%6d Blockgerätedateien\n"
-"%6d Verknüpfungen\n"
-"%6d symbolische Verknüpfungen\n"
-"------\n"
-"%6d Dateien\n"
 
 #: disk-utils/fsck.minix.c:1356
 msgid ""
@@ -1177,80 +1218,226 @@ msgid ""
 "FILE SYSTEM HAS BEEN CHANGED\n"
 "----------------------------\n"
 msgstr ""
-"----------------------------\n"
-" DATEISYSTEM WURDE GEÄNDERT \n"
-"----------------------------\n"
+
+#: disk-utils/isosize.c:129
+#, fuzzy, c-format
+msgid "%s: failed to open: %s\n"
+msgstr "Konnte %s nicht öffnen\n"
+
+#: disk-utils/isosize.c:135
+#, c-format
+msgid "%s: seek error on %s\n"
+msgstr ""
+
+#: disk-utils/isosize.c:141
+#, c-format
+msgid "%s: read error on %s\n"
+msgstr ""
+
+#: disk-utils/isosize.c:150
+#, c-format
+msgid "sector count: %d, sector size: %d\n"
+msgstr ""
+
+#: disk-utils/isosize.c:198
+#, c-format
+msgid "%s: option parse error\n"
+msgstr ""
+
+#: disk-utils/isosize.c:206
+#, c-format
+msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
+msgstr ""
+
+#: 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 ""
+
+#: disk-utils/mkfs.bfs.c:135
+msgid "volume name too long"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:142
+msgid "fsname name too long"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:167
+#, c-format
+msgid "cannot stat device %s"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:171
+#, fuzzy, c-format
+msgid "%s is not a block special device"
+msgstr "mount: %s ist kein blockorientiertes Gerät"
+
+#: disk-utils/mkfs.bfs.c:176
+#, fuzzy, c-format
+msgid "cannot open %s"
+msgstr "Konnte %s nicht öffnen\n"
+
+#: disk-utils/mkfs.bfs.c:187
+#, c-format
+msgid "cannot get size of %s"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:192
+#, c-format
+msgid "blocks argument too large, max is %lu"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:207
+msgid "too many inodes - max is 512"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:216
+#, c-format
+msgid "not enough space, need at least %lu blocks"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:1931
+#, c-format
+msgid "Device: %s\n"
+msgstr "Gerät: %s\n"
+
+#: disk-utils/mkfs.bfs.c:229
+#, c-format
+msgid "Volume: <%-6s>\n"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:230
+#, c-format
+msgid "FSname: <%-6s>\n"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:231
+#, c-format
+msgid "BlockSize: %d\n"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:233
+#, c-format
+msgid "Inodes: %d (in 1 block)\n"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:236
+#, c-format
+msgid "Inodes: %d (in %ld blocks)\n"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:238
+#, c-format
+msgid "Blocks: %ld\n"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:239
+#, c-format
+msgid "Inode end: %d, Data end: %d\n"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:244
+#, fuzzy
+msgid "error writing superblock"
+msgstr "Konnte den Superblock nicht schreiben"
+
+#: disk-utils/mkfs.bfs.c:264
+msgid "error writing root inode"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:269
+msgid "error writing inode"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:272
+msgid "seek error"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:278
+msgid "error writing . entry"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:282
+msgid "error writing .. entry"
+msgstr ""
+
+#: disk-utils/mkfs.bfs.c:286
+#, fuzzy, c-format
+msgid "error closing %s"
+msgstr "Fehler beim Schließen von %s\n"
 
 #: disk-utils/mkfs.c:76
 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"
+msgstr "Aufruf: mkfs [-V] [-t FS-Typ] [FS-Optionen] Gerät [Größe]\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:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:229 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
-msgstr "%s: Kein Speicher mehr frei!\n"
+msgstr "%s: Speicher ist alle!\n"
 
 #: disk-utils/mkfs.c:99
 #, c-format
 msgid "mkfs version %s (%s)\n"
-msgstr "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 "Verwendung: %s [-c | -l Dateiname] [-nXX] [-iXX] /dev/name [Blöcke]\n"
+msgstr ""
 
 #: 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!"
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:264
 msgid "seek to boot block failed in write_tables"
-msgstr "Suchvorgang nach Bootblock in write_tables nicht erfolgreich."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:266
 msgid "unable to clear boot sector"
-msgstr "Bootsektor kann nicht gelöscht werden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:268
 msgid "seek failed in write_tables"
-msgstr "Suchvorgang in write_tables nicht erfolgreich."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:272
 msgid "unable to write inode map"
-msgstr "Inode-Zuordnung kann nicht geschrieben werden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:274
 msgid "unable to write zone map"
-msgstr "Zonenzuordnung kann nicht geschrieben werden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:276
 msgid "unable to write inodes"
-msgstr "Inodes kann nicht geschrieben werden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:285
 msgid "write failed in write_block"
-msgstr "Schreiben in write_block nicht erfolgreich."
+msgstr ""
 
 #. 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 "Zu viele beschädigte Blöcke vorhanden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:301
 msgid "not enough good blocks"
-msgstr "Nicht genügend unbeschädigte Blöcke vorhanden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:513
 msgid "unable to allocate buffers for maps"
-msgstr "Puffer für Zuordnungen kann nicht zugewiesen werden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:522
 msgid "unable to allocate buffer for inodes"
-msgstr "Puffer für inodes kann nicht zugewiesen werden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:528
 #, c-format
@@ -1258,141 +1445,135 @@ msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
-"Maxsize=%ld\n"
-"\n"
 
 #: disk-utils/mkfs.minix.c:542
 msgid "seek failed during testing of blocks"
-msgstr "Suchvorgang beim Testen der Blöcke nicht erfolgreich."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:550
 msgid "Weird values in do_check: probably bugs\n"
-msgstr "Ungültige Werte in do_check: Programmfehler.\n"
+msgstr ""
 
-#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:362
 msgid "seek failed in check_blocks"
-msgstr "Suchvorgang in check_blocks nicht erfolgreich."
+msgstr ""
 
 #: 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:596 disk-utils/mkfs.minix.c:616
 #, c-format
 msgid "%d bad blocks\n"
-msgstr "%d ungültige Blöcke.\n"
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:598 disk-utils/mkfs.minix.c:618
 msgid "one bad block\n"
-msgstr "Ein ungültiger Block.\n"
+msgstr ""
 
 #: 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."
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:693
 msgid "strtol error: number of blocks not specified"
-msgstr "Strtol-Fehler: Blockanzahl wurde nicht angegeben."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:725
-#, c-format
+#, fuzzy, c-format
 msgid "unable to open %s"
-msgstr "%s konnte nicht geöffnet werden."
+msgstr "Konnte %s nicht öffnen"
 
 #: disk-utils/mkfs.minix.c:727
 #, c-format
 msgid "unable to stat %s"
-msgstr "'stat' konnte nicht auf %s angewandt werden."
+msgstr ""
 
 #: disk-utils/mkfs.minix.c:731
-#, c-format
+#, fuzzy, c-format
 msgid "will not try to make filesystem on '%s'"
-msgstr "Auf '%s' wird kein Dateisystem erstellt."
+msgstr "Auf »%s« wird kein Dateisystem erzeugt"
 
-#: disk-utils/mkswap.c:174
+#: disk-utils/mkswap.c:178
 #, c-format
 msgid "Bad user-specified page size %d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr ""
 
-#: disk-utils/mkswap.c:187
-#, c-format
+#: disk-utils/mkswap.c:191
+#, fuzzy, c-format
 msgid "Assuming pages of size %d (not %d)\n"
-msgstr "Es wird eine Seitengröße von %d (nicht %d) angenommen.\n"
+msgstr "Es wird eine Seitengröße von %d angenommen.\n"
 
-#: disk-utils/mkswap.c:312
+#: disk-utils/mkswap.c:316
 #, 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 "Aufruf: %s [-c] [-v0|-v1] [-pSEITENGRÖSSE] /dev/Name [Größe in kB]\n"
 
-#: disk-utils/mkswap.c:335
+#: disk-utils/mkswap.c:339
 msgid "too many bad pages"
-msgstr "Zu viele beschädigte Seiten."
+msgstr "Zu viele beschädigte »Seiten«"
 
-#: 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
+#: disk-utils/mkswap.c:353 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1930 text-utils/more.c:1941
 msgid "Out of memory"
-msgstr "Kein Speicher mehr frei."
+msgstr "Speicher ist alle"
 
-#: disk-utils/mkswap.c:366
+#: disk-utils/mkswap.c:370
 msgid "one bad page\n"
-msgstr "Eine beschädigte Seite.\n"
+msgstr "Eine beschädigte »Seite«\n"
 
-#: disk-utils/mkswap.c:368
+#: disk-utils/mkswap.c:372
 #, c-format
 msgid "%d bad pages\n"
-msgstr "%d beschädigte Seiten.\n"
+msgstr "%d beschädigte »Seiten«\n"
 
-#: disk-utils/mkswap.c:488
+#: disk-utils/mkswap.c:492
 #, 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"
+"%s: Es wurde nicht angegeben, wo der Swapbereich angelegt werden soll.\n"
 
-#: disk-utils/mkswap.c:506
+#: disk-utils/mkswap.c:510
 #, 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"
+"%s: Fehler: Die angegebene Größe %ld ist größer als die des Gerätes: %d\n"
 
-#: disk-utils/mkswap.c:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s: Fehler: unbekannte Version %d\n"
 
-#: disk-utils/mkswap.c:531
+#: disk-utils/mkswap.c:535
 #, 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"
+msgstr "%s: Fehler: Der Swapbereich muß mindestens %ldkB groß sein\n"
 
-#: disk-utils/mkswap.c:550
+#: disk-utils/mkswap.c:554
 #, 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"
+msgstr "%s: Warnung: Der Swapbereich wird nur mit der Größe %ldkB angelegt\n"
 
-#: disk-utils/mkswap.c:562
+#: disk-utils/mkswap.c:566
 #, c-format
 msgid "Will not try to make swapdevice on '%s'"
-msgstr "Es wird kein Auslagerungsbereich auf '%s' angelegt."
+msgstr ""
 
-#: disk-utils/mkswap.c:571 disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:575 disk-utils/mkswap.c:596
 msgid "fatal: first page unreadable"
-msgstr "Nicht behebbarer Fehler: die erste Seite kann nicht gelesen werden."
+msgstr ""
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:581
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1400,112 +1581,110 @@ 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: Das Gerät %s enthält eine gültige Sun-Datenträgerkennung.\n"
-"Dies bedeutet, dass das Anlegen eines V0-Auslagerungsbereichs die\n"
+"%s: Das Gerät %s enthält einen gültigen »Sun disklabel«.\n"
+"Das bedeutet wahrscheinlich, daß das Anlegen eines v0-Swapbereiches die\n"
 "Partitionstabelle zerstören wird.\n"
-"Es wird kein Auslagerungsbereich erstellt. Wenn Sie wirklich einen \n"
-"Auslagerungsbereich anlegen möchten, verwenden Sie die Option -f.\n"
+"Es wird kein Swapbereich angelegt. Wenn Sie wirklich einen Swapbereich\n"
+"anlegen wollen, so benutzen Sie die -f Option.\n"
 
-#: disk-utils/mkswap.c:601
+#: disk-utils/mkswap.c:605
 msgid "Unable to set up swap-space: unreadable"
-msgstr "Auslagerungsbereich kann nicht erstellt werden: nicht lesbar."
+msgstr ""
 
-#: disk-utils/mkswap.c:602
+#: disk-utils/mkswap.c:606
 #, 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"
+msgstr "Swapbereich Version %d mit der Größe %ld Bytes wird angelegt\n"
 
-#: disk-utils/mkswap.c:608
+#: disk-utils/mkswap.c:612
 msgid "unable to rewind swap-device"
-msgstr "Auslagerungsgerät kann nicht zurückgespult werden."
+msgstr ""
 
-#: disk-utils/mkswap.c:611
+#: disk-utils/mkswap.c:615
 msgid "unable to write signature page"
-msgstr "Signaturseite kann nicht geschrieben werden."
+msgstr ""
 
-#: disk-utils/mkswap.c:619
+#: disk-utils/mkswap.c:623
 msgid "fsync failed"
-msgstr "fsync war nicht erfolgreich."
+msgstr ""
 
-#: disk-utils/setfdprm.c:30
-#, c-format
+#: disk-utils/setfdprm.c:31
+#, fuzzy, c-format
 msgid "Invalid number: %s\n"
-msgstr "Ungültiger Wert: %s\n"
+msgstr "Ungültige Nummer: %s\n"
 
-#: disk-utils/setfdprm.c:80
-#, c-format
+#: disk-utils/setfdprm.c:81
+#, fuzzy, c-format
 msgid "Syntax error: '%s'\n"
-msgstr "Syntaxfehler: '%s'\n"
+msgstr "Syntaxfehler: »%s«\n"
 
-#: disk-utils/setfdprm.c:90
+#: disk-utils/setfdprm.c:91
 #, c-format
 msgid "No such parameter set: '%s'\n"
-msgstr "Dieser Parameter wurde nicht festgelegt: '%s'\n"
+msgstr ""
 
 #: disk-utils/setfdprm.c:100
 #, c-format
 msgid "usage: %s [ -p ] dev name\n"
-msgstr "Verwendung: %s [ -p ] Gerätename\n"
+msgstr ""
 
 #: 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 ] Gerät Größe Sektoren Köpfe Spuren Strecke Freiraum Rate "
-"Spez1 Format Formatfreiraum\n"
 
 #: disk-utils/setfdprm.c:104
 #, c-format
 msgid "       %s [ -c | -y | -n | -d ] dev\n"
-msgstr "       %s [ -c | -y | -n | -d ] Gerät\n"
+msgstr ""
 
 #: disk-utils/setfdprm.c:106
 #, c-format
 msgid "       %s [ -c | -y | -n ] dev\n"
-msgstr "       %s [ -c | -y | -n ] Gerät\n"
+msgstr ""
 
-#: fdisk/cfdisk.c:393 fdisk/cfdisk.c:1899
+# "Unbrauchbar"
+#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1900
 msgid "Unusable"
-msgstr "Nicht verwendbar"
+msgstr "Unbenutzbar"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1902
 msgid "Free Space"
-msgstr "Freier Platz"
+msgstr "Freier Bereich"
 
-#: fdisk/cfdisk.c:398
+#: fdisk/cfdisk.c:399
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:403
+#: fdisk/cfdisk.c:404
 msgid "OS/2 HPFS"
 msgstr "OS/2 HPFS"
 
-#: fdisk/cfdisk.c:405
+#: fdisk/cfdisk.c:406
 msgid "OS/2 IFS"
 msgstr "OS/2 IFS"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:410
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:420
+#: fdisk/cfdisk.c:421
 msgid "Disk has been changed.\n"
-msgstr "Die Festplatte wurde verändert.\n"
+msgstr "Festplatte wurde verändert.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:422
 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"
+"Rebooten Sie das System, um sicherzustellen, daß die Partitionstabelle neu "
+"gelesen wird.\n"
 
-#: fdisk/cfdisk.c:424
+#: fdisk/cfdisk.c:425
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1513,118 +1692,116 @@ msgid ""
 "page for additional information.\n"
 msgstr ""
 "\n"
-"WARNUNG: Wenn Sie DOS 6.x-Partitionen angelegt oder\n"
-"geändert haben, finden Sie weitere Informationen in\n"
-"der Handbuchseite zu cfdisk (Befehl: 'man cfdisk').\n"
+"WARNUNG: Wenn Sie eine DOS 6.x Partition angelegt\n"
+"oder verändert haben, dann schauen Sie bitte in die\n"
+"cfdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/cfdisk.c:519
+#: fdisk/cfdisk.c:520
 msgid "FATAL ERROR"
-msgstr "NICHT BEHEBBARER FEHLER"
+msgstr "FATALER FEHLER"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:521
 msgid "Press any key to exit cfdisk"
-msgstr "Drücken Sie eine beliebige Taste, um cfdisk zu beenden."
+msgstr "Eine Taste drücken, um cfdisk zu beenden"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:568 fdisk/cfdisk.c:576
 msgid "Cannot seek on disk drive"
-msgstr "Suchvorgang auf der Festplatte nicht möglich."
+msgstr "Konnte »seek()« nicht auf der Festplatte benutzen"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:570
 msgid "Cannot read disk drive"
-msgstr "Lesen von der Festplatte nicht möglich."
+msgstr "Konnte nicht von der Festplatte lesen"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:578
 msgid "Cannot write disk drive"
-msgstr "Schreiben auf die Festplatte nicht möglich."
+msgstr "Konnte nicht auf die Festplatte schreiben"
 
-#: fdisk/cfdisk.c:814
+#: fdisk/cfdisk.c:818
 msgid "Too many partitions"
-msgstr "Zu viele Partitionen."
+msgstr "Zu viele Partitionen"
 
-#: fdisk/cfdisk.c:819
+#: fdisk/cfdisk.c:823
 msgid "Partition begins before sector 0"
-msgstr "Partition fängt vor Sektor 0 an."
+msgstr "Partition fängt vor Sektor 0 an"
 
-#: fdisk/cfdisk.c:824
+#: fdisk/cfdisk.c:828
 msgid "Partition ends before sector 0"
-msgstr "Partition hört vor Sektor 0 auf."
+msgstr "Partition endet vor Sektor 0"
 
-#: fdisk/cfdisk.c:829
+#: fdisk/cfdisk.c:833
 msgid "Partition begins after end-of-disk"
-msgstr "Partition fängt nach dem Ende der Festplatte an."
+msgstr "Partition fängt hinter dem Ende der Festplatte an"
 
-#: fdisk/cfdisk.c:834
+#: fdisk/cfdisk.c:838
 msgid "Partition ends after end-of-disk"
-msgstr "Partition hört nach dem Ende der Festplatte auf."
+msgstr "Partition endet hinter dem Ende der Festplatte"
 
-#: fdisk/cfdisk.c:858
+#: fdisk/cfdisk.c:862
 msgid "logical partitions not in disk order"
 msgstr ""
-"Logische Partitionen befinden sich nicht in der Festplattenreihenfolge."
 
-#: fdisk/cfdisk.c:861
+#: fdisk/cfdisk.c:865
 msgid "logical partitions overlap"
-msgstr "Logische Partitionen überlappen einander."
+msgstr "Logische Partitionen überlappen"
 
-#: fdisk/cfdisk.c:863
+#: fdisk/cfdisk.c:867
 msgid "enlarged logical partitions overlap"
-msgstr "Vergrößerte logische Partitionen überlappen einander."
+msgstr ""
 
-#: fdisk/cfdisk.c:893
+#: fdisk/cfdisk.c:897
 msgid ""
 "!!!! Internal error creating logical drive with no extended partition !!!!"
 msgstr ""
-"!!!! Interner Fehler beim Erstellen eines logischen Laufwerks ohne eine "
-"erweiterte Partition !!!!"
+"!! Interner Fehler beim Erzeugen einer log. Part. ohne eine erw. Part. !!"
 
-#: fdisk/cfdisk.c:904 fdisk/cfdisk.c:916
+#: fdisk/cfdisk.c:908 fdisk/cfdisk.c:920
 msgid ""
 "Cannot create logical drive here -- would create two extended partitions"
 msgstr ""
-"Hier kann kein logisches Laufwerk angelegt werden -- dies würde zu zwei "
-"erweiterten Partitionen führen."
+"Kann hier keine log. Part. anlegen -- eine zweite erw. müßte erzeugt werden."
 
-#: fdisk/cfdisk.c:1066
+#: fdisk/cfdisk.c:1068
 msgid "Menu item too long. Menu may look odd."
-msgstr "Der Menüeintrag ist zu lang. Das Menü könnte ungewöhnlich aussehen."
+msgstr "Menüeintrag ist zu lang. Das Menü könnte ungewöhnlich aussehen"
 
+# "Ausrichtung" "Nehme horizontale Voreinstellung."
 #: fdisk/cfdisk.c:1122
 msgid "Menu without direction. Defaulting horizontal."
-msgstr "Keine Richtungsangabe für Menü. Es wird 'horizontal' verwendet."
+msgstr "Menü ohne Richtung, verwende horizontal."
 
 #: fdisk/cfdisk.c:1252
 msgid "Illegal key"
-msgstr "Diese Taste ist hier nicht verwendbar."
+msgstr "Diese Taste ist hier nicht verwendbar"
 
 #: fdisk/cfdisk.c:1275
 msgid "Press a key to continue"
-msgstr "Eine Taste drücken, um fortzufahren."
+msgstr "Eine Taste drücken, um fortzufahren"
 
-#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2400
-#: fdisk/cfdisk.c:2402
+#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2401
+#: fdisk/cfdisk.c:2403
 msgid "Primary"
-msgstr "Primär"
+msgstr "Primäre"
 
 #: fdisk/cfdisk.c:1322
 msgid "Create a new primary partition"
-msgstr "Eine neue primäre Partition anlegen"
+msgstr "Erzeuge eine neue primäre Partition"
 
-#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2399
-#: fdisk/cfdisk.c:2402
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2400
+#: fdisk/cfdisk.c:2403
 msgid "Logical"
-msgstr "Logisch"
+msgstr "Logische"
 
 #: fdisk/cfdisk.c:1323
 msgid "Create a new logical partition"
-msgstr "Eine neue logische Partition anlegen"
+msgstr "Erzeuge eine neue logische Partition"
 
-#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2075
 msgid "Cancel"
-msgstr "Abbrechen"
+msgstr "Abbruch"
 
 #: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379
 msgid "Don't create a partition"
-msgstr "Keine neue Partition anlegen"
+msgstr "Erzeuge keine neue Partition"
 
 #: fdisk/cfdisk.c:1340
 msgid "!!! Internal error !!!"
@@ -1640,7 +1817,7 @@ msgstr "Anfang"
 
 #: fdisk/cfdisk.c:1377
 msgid "Add partition at beginning of free space"
-msgstr "Partition am Anfang des freien Bereichs hinzufügen"
+msgstr "Erzeuge Partition am Anfang des freien Bereiches"
 
 #: fdisk/cfdisk.c:1378
 msgid "End"
@@ -1648,170 +1825,180 @@ msgstr "Ende"
 
 #: fdisk/cfdisk.c:1378
 msgid "Add partition at end of free space"
-msgstr "Partition am Ende des freien Bereichs hinzufügen"
+msgstr "Erzeuge Partition am Ende des freien Bereiches"
 
 #: fdisk/cfdisk.c:1396
 msgid "No room to create the extended partition"
-msgstr "Kein Platz für die Erstellung der erweiterten Partition"
+msgstr "Kein Platz, um die erweiterte Partition anzulegen"
 
 #: fdisk/cfdisk.c:1435
 msgid "Bad signature on partition table"
-msgstr "Beschädigte Signatur in der Partitionstabelle."
+msgstr "Beschädigte Signatur in der Partitionstabelle"
 
 #: fdisk/cfdisk.c:1473
 msgid "You specified more cylinders than fit on disk"
-msgstr "Sie haben mehr Zylinder angegeben, als auf die Festplatte passen."
+msgstr "Sie haben mehr Zylinder angegeben, als auf die Festplatte passen"
 
+# That's not a direct translation, but I've tried to be
+# more informative.
 #: fdisk/cfdisk.c:1503
 msgid "Cannot open disk drive"
-msgstr "Kein Zugriff auf die Festplatte möglich."
+msgstr "Konnte nicht auf die Festplatte zugreifen"
 
-#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1686
+# "Nur lesender Zugriff möglich - Sie haben keine Schreibberechtigung" (joey)
+#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1684
 msgid "Opened disk read-only - you have no permission to write"
 msgstr ""
-"Festplatte wurde nur zum Lesen geöffnet - Sie haben keine "
-"Schreibberechtigung."
+"Platte wurde nur zum Lesen geöffnet - Sie haben keine Rechte zum Schreiben"
 
 #: fdisk/cfdisk.c:1526
 msgid "Cannot get disk size"
-msgstr "Größe der Festplatte konnte nicht ermittelt werden."
+msgstr "Konnte die Größe der Festplatte nicht feststellen"
 
-#. avoid snprintf - it does not exist on ancient systems
-#: fdisk/cfdisk.c:1552
+# "Ungültige primäre Partition"
+#: fdisk/cfdisk.c:1551
 msgid "Bad primary partition"
 msgstr "Beschädigte primäre Partition"
 
-#. avoid snprintf
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Bad logical partition"
 msgstr "Beschädigte logische Partition"
 
-#: fdisk/cfdisk.c:1698
+#: fdisk/cfdisk.c:1696
 msgid "Warning!!  This may destroy data on your disk!"
-msgstr "Warnung!! Dies kann Daten auf der Festplatte löschen!"
+msgstr "Warnung!!  Dies kann Daten auf der Festplatte zerstören!"
 
-#: fdisk/cfdisk.c:1702
+#: fdisk/cfdisk.c:1700
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr ""
-"Sind Sie sicher, dass Sie die Partitionstabelle auf die Festplatte schreiben "
-"möchten? (ja/nein): "
+"Sind Sie sicher, daß Sie die Partitionstabelle schreiben wollen? (ja/nein): "
 
-#: fdisk/cfdisk.c:1708
+#: fdisk/cfdisk.c:1706
 msgid "no"
-msgstr "Nein"
+msgstr "nein"
 
-#: fdisk/cfdisk.c:1709
+#: fdisk/cfdisk.c:1707
 msgid "Did not write partition table to disk"
-msgstr "Die Partitionstabelle wurde nicht auf die Festplatte geschrieben."
+msgstr "Die Partitionstabelle wurde nicht auf die Festplatte geschrieben"
 
-#: fdisk/cfdisk.c:1711
+#: fdisk/cfdisk.c:1709
 msgid "yes"
-msgstr "Ja"
+msgstr "ja"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Please enter `yes' or `no'"
-msgstr "'Ja' oder 'Nein' eingeben."
+msgstr "Bitte »ja« oder »nein« eingeben"
 
-#: fdisk/cfdisk.c:1718
+#: fdisk/cfdisk.c:1716
 msgid "Writing partition table to disk..."
 msgstr "Die Partitionstabelle wird auf die Festplatte geschrieben..."
 
-#: fdisk/cfdisk.c:1743 fdisk/cfdisk.c:1747
+#: fdisk/cfdisk.c:1741 fdisk/cfdisk.c:1745
 msgid "Wrote partition table to disk"
-msgstr "Die Partitionstabelle wurde auf die Festplatte geschrieben."
+msgstr "Die Partitionstabelle wurde auf die Festplatte geschrieben"
 
-#: fdisk/cfdisk.c:1745
+# That's not a good translation, but I guess, I can't make it longer.
+#: fdisk/cfdisk.c:1743
 msgid ""
 "Wrote partition table, but re-read table failed.  Reboot to update table."
 msgstr ""
-"Partitionstabelle wurde geschrieben, aber das Neueinlesen war nicht "
-"erfolgreich. Starten Sie den Computer neu, um die Tabelle zu aktualisieren."
+"Die Tabelle wurde geschr., aber das Neueinlesen schlug fehl.  Rebooten Sie."
 
+# This one isn't realy correct.
+#: fdisk/cfdisk.c:1753
+#, fuzzy
+msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
+msgstr ""
+"Mehrere Partitionen sind als bootbar markiert, der DOS MBR kann nicht booten."
+
+# This one isn't realy correct.
 #: fdisk/cfdisk.c:1755
+#, fuzzy
 msgid ""
-"Not precisely one primary partition is bootable. DOS MBR cannot boot this."
+"More than one primary partition is marked bootable. DOS MBR cannot boot this."
 msgstr ""
-"Mehrere primäre Partitionen sind als bootfähig markiert. Der DOS-MBR kann "
-"nicht booten."
+"Mehrere Partitionen sind als bootbar markiert, der DOS MBR kann nicht booten."
 
-#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1931 fdisk/cfdisk.c:2015
+# "Geben sie einen Dateinamen ein oder drücken Sie Return, um es auf dem Bildschirm anzuzeigen: "
+# is too long
+#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
 msgid "Enter filename or press RETURN to display on screen: "
-msgstr "Dateiname eingeben oder EINGABETASTE für Bildschirmanzeige drücken: "
+msgstr "Dateiname oder Return um es auf dem Bildschirm anzuzeigen: "
 
-#: fdisk/cfdisk.c:1821 fdisk/cfdisk.c:1939 fdisk/cfdisk.c:2023
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
 #, c-format
 msgid "Cannot open file '%s'"
-msgstr "Datei '%s' konnte nicht geöffnet werden"
+msgstr "Konnte %s nicht öffnen"
 
-#: fdisk/cfdisk.c:1832
+#: fdisk/cfdisk.c:1833
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Festplatte: %s\n"
 
-#: fdisk/cfdisk.c:1834
+#: fdisk/cfdisk.c:1835
 msgid "Sector 0:\n"
 msgstr "Sektor 0:\n"
 
-#: fdisk/cfdisk.c:1841
+#: fdisk/cfdisk.c:1842
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Sektor %d:\n"
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1862
 msgid "   None   "
 msgstr "   Keine  "
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1864
 msgid "   Pri/Log"
 msgstr "   Pri/Log"
 
-#: fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1866
 msgid "   Primary"
 msgstr "   Primäre"
 
-#: fdisk/cfdisk.c:1867
+#: fdisk/cfdisk.c:1868
 msgid "   Logical"
 msgstr "  Logische"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1213 fdisk/fdisk.c:1437
-#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1250 fdisk/fdisk.c:1474
+#: fdisk/fdisksgilabel.c:240 fdisk/fdisksunlabel.c:672 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: fdisk/cfdisk.c:1911
+#: fdisk/cfdisk.c:1912
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Boot (%02X)"
 
-#: fdisk/cfdisk.c:1913 fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2409
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Unbekannt (%02X)"
 
-#: fdisk/cfdisk.c:1915
+#: fdisk/cfdisk.c:1916
 #, c-format
 msgid "None (%02X)"
 msgstr "Keine (%02X)"
 
-#: fdisk/cfdisk.c:1950 fdisk/cfdisk.c:2034
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Partitionstabelle von %s\n"
 
-#: fdisk/cfdisk.c:1952
+#: fdisk/cfdisk.c:1953
 msgid "            First    Last\n"
 msgstr "            Erster   Letzter\n"
 
-#: fdisk/cfdisk.c:1953
+#: fdisk/cfdisk.c:1954
 msgid ""
 " # Type     Sector   Sector   Offset  Length   Filesystem Type (ID)   Flags\n"
 msgstr ""
 " # Typ      Sektor   Sektor   Offset  Länge    Dateisystemtyp (ID)    Flags\n"
 
-#: fdisk/cfdisk.c:1954
+#: fdisk/cfdisk.c:1955
 msgid ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
@@ -1819,475 +2006,481 @@ msgstr ""
 "-- ------- -------- --------- ------ --------- ---------------------- "
 "---------\n"
 
-#: fdisk/cfdisk.c:2036
+#: fdisk/cfdisk.c:2037
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
-msgstr "         ---Anfang----      -----Ende------    Start   Anzahl\n"
+msgstr "         ---Anfangs----      -----End------   Start  Anzahl der\n"
 
-#: fdisk/cfdisk.c:2037
+#: fdisk/cfdisk.c:2038
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
-msgstr "# Flags Köpfe Sekt Zyl.  ID Köpfe Sekt Zyl    Sektor  Sektoren\n"
+msgstr " # Flags Kopf Sekt Zyl.  ID  Kopf Sekt Zyl    Sektor  Sektoren\n"
 
-#: fdisk/cfdisk.c:2038
+#: fdisk/cfdisk.c:2039
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2071
+#: fdisk/cfdisk.c:2072
+#, fuzzy
 msgid "Raw"
-msgstr "'Roh'"
+msgstr "\"Roh\""
 
-#: fdisk/cfdisk.c:2071
+#: fdisk/cfdisk.c:2072
+#, fuzzy
 msgid "Print the table using raw data format"
-msgstr "Die 'rohen' Daten der Tabelle ausgeben"
+msgstr "Die \"rohen\" Daten der Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2072 fdisk/cfdisk.c:2174
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
 msgid "Sectors"
 msgstr "Sektoren"
 
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2073
 msgid "Print the table ordered by sectors"
 msgstr "Die Tabelle nach Sektoren sortiert ausgeben"
 
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2074
 msgid "Table"
 msgstr "Tabelle"
 
-#: fdisk/cfdisk.c:2073
+# "Nur die Partitionstabelle ausgeben" (joey)
+#: fdisk/cfdisk.c:2074
 msgid "Just print the partition table"
-msgstr "Nur die Partitionstabelle ausgeben"
+msgstr "Einfach die Tabelle ausgeben"
 
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2075
 msgid "Don't print the table"
-msgstr "Tabelle nicht ausgeben"
+msgstr "Zeige die Tabelle nicht an"
 
-#: fdisk/cfdisk.c:2102
+#: fdisk/cfdisk.c:2103
 msgid "Help Screen for cfdisk"
-msgstr "Hilfebildschirm für cfdisk"
+msgstr "Hilfe für cfdisk"
 
-#: fdisk/cfdisk.c:2104
+#: fdisk/cfdisk.c:2105
 msgid "This is cfdisk, a curses based disk partitioning program, which"
-msgstr "Dies ist cfdisk, ein auf 'curses' basierendes Programm,"
+msgstr "Dies ist cfdisk, ein Programm das curses benutzt und es ihnen"
 
-#: fdisk/cfdisk.c:2105
+#: fdisk/cfdisk.c:2106
 msgid "allows you to create, delete and modify partitions on your hard"
-msgstr "mit dem Sie Partitionen auf der Festplatte anlegen, löschen"
+msgstr "erlaubt, auf Ihren Festplatten Partitionen anzulegen, zu löschen"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2107
 msgid "disk drive."
-msgstr "und verändern können."
+msgstr "und zu verändern."
 
-#: fdisk/cfdisk.c:2108
+#: fdisk/cfdisk.c:2109
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
 # "Befehl"
-#: fdisk/cfdisk.c:2110
+#: fdisk/cfdisk.c:2111
 msgid "Command      Meaning"
-msgstr "Befehl       Bedeutung"
+msgstr "Kommando     Bedeutung"
 
-#: fdisk/cfdisk.c:2111
+#: fdisk/cfdisk.c:2112
 msgid "-------      -------"
 msgstr "--------     ---------"
 
-#: fdisk/cfdisk.c:2112
+# "  b          Wechselt zwischen bootfähig und nicht bootfähig."
+#: fdisk/cfdisk.c:2113
 msgid "  b          Toggle bootable flag of the current partition"
-msgstr ""
-"  b          Die aktuelle Partition zwischen 'bootfähig'\n"
-"              und 'nicht bootfähig' umschalten"
+msgstr "  b          (De)Aktivieren des bootbar-flags der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2113
+#: fdisk/cfdisk.c:2114
 msgid "  d          Delete the current partition"
 msgstr "  d          Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2114
+#: fdisk/cfdisk.c:2115
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr ""
 "  g          Die Anzahl der Zylinder, Köpfe und Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2115
+#: fdisk/cfdisk.c:2116
 msgid "             WARNING: This option should only be used by people who"
-msgstr "             WARNUNG: Diese Funktion sollte nur von Experten"
+msgstr "             WARNUNG: Diese Funktion sollte nur von Leuten benutzt"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2117
 msgid "             know what they are doing."
-msgstr "             verwendet werden."
+msgstr "             werden, die wissen, was sie tun."
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2118
 msgid "  h          Print this screen"
-msgstr "  h          Diesen Hilfebildschirm anzeigen"
+msgstr "  h          Diese Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2119
 msgid "  m          Maximize disk usage of the current partition"
-msgstr "  m          Die Nutzung der aktuellen Partition maximieren"
+msgstr "  m          Maximieren der Nutzung der aktuellen Partition"
 
-#: fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:2120
 msgid "             Note: This may make the partition incompatible with"
-msgstr "             Hinweis: Anschließend ist die Partition nicht mehr"
+msgstr ""
+"             Beachten Sie, daß dies die Partition nicht mehr kompatibel"
 
-#: fdisk/cfdisk.c:2120
+#: fdisk/cfdisk.c:2121
 msgid "             DOS, OS/2, ..."
-msgstr "             mit DOS, OS/2 usw. kompatibel."
+msgstr "             zu DOS, OS/2, ... machen kann"
 
-#: fdisk/cfdisk.c:2121
+#: fdisk/cfdisk.c:2122
 msgid "  n          Create new partition from free space"
-msgstr ""
-"  n          Eine neue Partition im nicht verwendeten Bereich erstellen"
+msgstr "  n          Aus dem freien Bereich eine neue Partition erzeugen"
 
-#: fdisk/cfdisk.c:2122
+#: fdisk/cfdisk.c:2123
 msgid "  p          Print partition table to the screen or to a file"
 msgstr ""
-"  p          Die Partitionstabelle auf dem Bildschirm oder an\n"
-"             eine Datei ausgeben."
+"  p          Die Partitionstab. auf dem Bildschirm oder in eine Datei "
+"ausgeben"
 
 # "verschiedene"
-#: fdisk/cfdisk.c:2123
+#: fdisk/cfdisk.c:2124
 msgid "             There are several different formats for the partition"
-msgstr "             Für die Partitionstabelle stehen mehrere Formate"
+msgstr "             Es gibt mehrere Formate für die Partitionstabelle, aus"
 
-#: fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:2125
 msgid "             that you can choose from:"
-msgstr "             zur Wahl:"
+msgstr "             denen man wählen kann"
 
-#: fdisk/cfdisk.c:2125
+#: fdisk/cfdisk.c:2126
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr ""
-"                r - 'Reine' Daten (was auf die Festplatte geschrieben wird)"
+"                r - »Rohe« Daten (was auf die Festplatte geschrieben würde)"
 
-#: fdisk/cfdisk.c:2126
+#: fdisk/cfdisk.c:2127
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabelle nach Sektoren sortiert"
 
-#: fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:2128
 msgid "                t - Table in raw format"
 msgstr "                t - Tabelle mit den reinen Daten"
 
-#: fdisk/cfdisk.c:2128
+#: fdisk/cfdisk.c:2129
 msgid "  q          Quit program without writing partition table"
-msgstr "  q          Programm beenden, ohne die Partitionstabelle zu schreiben"
+msgstr ""
+"  q          Das Programm beenden ohne die Partitionstabelle zu schreiben"
 
-#: fdisk/cfdisk.c:2129
+#: fdisk/cfdisk.c:2130
 msgid "  t          Change the filesystem type"
 msgstr "  t          Den Dateisystemtyp ändern"
 
-#: fdisk/cfdisk.c:2130
+#: fdisk/cfdisk.c:2131
 msgid "  u          Change units of the partition size display"
-msgstr "  u          Die Einheiten für die Größenanzeige ändern"
+msgstr "  u          Einheit für die Größenanzeige ändern"
 
-#: fdisk/cfdisk.c:2131
+#: fdisk/cfdisk.c:2132
 msgid "             Rotates through MB, sectors and cylinders"
-msgstr "             Zwischen MB, Sektoren und Zylindern wechseln"
+msgstr "             Wechselt zwischen MB, Sektoren und Zylindern"
 
-#: fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:2133
 msgid "  W          Write partition table to disk (must enter upper case W)"
-msgstr "  W          Partitionstabelle auf die Festplatte schreiben (großes W)"
+msgstr ""
+"  W          Die Partitionstabelle auf die Festplatte schreiben (großes W)"
 
-#: fdisk/cfdisk.c:2133
+# or "Da dieses ..." ?
+#: fdisk/cfdisk.c:2134
 msgid "             Since this might destroy data on the disk, you must"
-msgstr "             Da hierbei Daten auf der Festplatte zerstört werden"
+msgstr "             Da dies Daten auf der Festplatte zerstören kann, müssen"
 
-#: fdisk/cfdisk.c:2134
+#: fdisk/cfdisk.c:2135
 msgid "             either confirm or deny the write by entering `yes' or"
-msgstr "             können, muss der Schreibvorgang mit 'Ja' oder 'Nein'"
+msgstr "             Sie das Schreiben mit »yes« oder »no« bestätigen oder"
 
-#: fdisk/cfdisk.c:2135
+#: fdisk/cfdisk.c:2136
 msgid "             `no'"
-msgstr "             bestätigt oder abgebrochen werden."
+msgstr "             ablehnen"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2137
 msgid "Up Arrow     Move cursor to the previous partition"
-msgstr "Aufwärtspfeil Den Cursor zur vorherigen Partition bewegen"
+msgstr "Pfeil-hoch   Den Cursor zur vorherigen Partition bewegen"
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2138
 msgid "Down Arrow   Move cursor to the next partition"
-msgstr "Abwärtspfeil Den Cursor zur nächsten Partition bewegen"
+msgstr "Pfeil-runter Den Cursor zur nächsten Partition bewegen"
 
 # "Strg" ?
 # "Baut den Bildschirm neu auf"
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2139
 msgid "CTRL-L       Redraws the screen"
-msgstr "Strg-L       Den Bildschirm neu zeichnen"
+msgstr "Ctrl-L       Zeichnet den Bildschirm erneut"
 
-#: fdisk/cfdisk.c:2139
+#: fdisk/cfdisk.c:2140
 msgid "  ?          Print this screen"
-msgstr "  ?          Diese Hilfeinformationen anzeigen"
+msgstr "  ?          Diese Hilfe anzeigen"
 
 # "Hinweis"
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2142
 msgid "Note: All of the commands can be entered with either upper or lower"
-msgstr "Hinweis: Alle Befehle können sowohl als Klein- oder Großbuchstaben"
+msgstr "Alle Kommandos können sowohl als Klein- oder Großbuchstaben"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2143
 msgid "case letters (except for Writes)."
-msgstr "eingegeben werden (außer W für den Schreibvorgang)."
+msgstr "eingegeben werden (außer W zum Schreiben)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2495 fdisk/fdisksunlabel.c:318
 #: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr " Zylinder"
 
-#: fdisk/cfdisk.c:2172
+#: fdisk/cfdisk.c:2173
 msgid "Change cylinder geometry"
 msgstr "Die Anzahl der Zylinder ändern"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Köpfe"
 
-#: fdisk/cfdisk.c:2173
+#: fdisk/cfdisk.c:2174
 msgid "Change head geometry"
 msgstr "Die Anzahl der Köpfe ändern"
 
-#: fdisk/cfdisk.c:2174
+#: fdisk/cfdisk.c:2175
 msgid "Change sector geometry"
 msgstr "Die Anzahl der Sektoren pro Spur ändern"
 
-#: fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2176
 msgid "Done"
 msgstr "Fertig"
 
-#: fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2176
 msgid "Done with changing geometry"
-msgstr "Ändern der Festplattengeometrie beenden"
+msgstr "Ändern der Geometrie beenden"
 
-#: fdisk/cfdisk.c:2188
+#: fdisk/cfdisk.c:2189
 msgid "Enter the number of cylinders: "
 msgstr "Geben Sie die Anzahl der Zylinder ein: "
 
-#: fdisk/cfdisk.c:2200 fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2763
 msgid "Illegal cylinders value"
 msgstr "Ungültiger Wert für die Anzahl der Zylinder"
 
-#: fdisk/cfdisk.c:2206
+#: fdisk/cfdisk.c:2207
 msgid "Enter the number of heads: "
 msgstr "Geben Sie die Anzahl der Köpfe ein: "
 
-#: fdisk/cfdisk.c:2213 fdisk/cfdisk.c:2772
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2773
 msgid "Illegal heads value"
 msgstr "Ungültiger Wert für die Anzahl der Köpfe"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2220
 msgid "Enter the number of sectors per track: "
 msgstr "Geben Sie die Anzahl der Sektoren pro Spur ein: "
 
-#: fdisk/cfdisk.c:2226 fdisk/cfdisk.c:2779
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2780
 msgid "Illegal sectors value"
 msgstr "Ungültiger Wert für die Anzahl der Sektoren"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2330
 msgid "Enter filesystem type: "
 msgstr "Geben Sie den Dateisystemtyp ein: "
 
-#: fdisk/cfdisk.c:2347
+#: fdisk/cfdisk.c:2348
 msgid "Cannot change FS Type to empty"
-msgstr "Der Dateisystemtyp kann nicht leer bleiben."
+msgstr "Der Dateisystemtyp kann nicht auf »leer« gesetzt werden"
 
-#: fdisk/cfdisk.c:2349
+#: fdisk/cfdisk.c:2350
 msgid "Cannot change FS Type to extended"
-msgstr "Der Dateisystemtyp kann nicht auf 'erweitert' gesetzt werden"
+msgstr "Der Dateisystemtyp kann nicht auf »erweitert« gesetzt werden"
 
-#: fdisk/cfdisk.c:2377 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2378 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Boot"
 
-#: fdisk/cfdisk.c:2379
+#: fdisk/cfdisk.c:2380
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Unb(%02X)"
 
-#: fdisk/cfdisk.c:2382 fdisk/cfdisk.c:2385
+#: fdisk/cfdisk.c:2383 fdisk/cfdisk.c:2386
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2390 fdisk/cfdisk.c:2393
+#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2394
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2401
+#: fdisk/cfdisk.c:2402
 msgid "Pri/Log"
 msgstr "Pri/Log"
 
-#: fdisk/cfdisk.c:2477
+#: fdisk/cfdisk.c:2478
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Festplatte: %s"
 
-#: fdisk/cfdisk.c:2480
+#: fdisk/cfdisk.c:2481
 #, c-format
 msgid "Size: %lld bytes"
 msgstr "Größe: %lld Bytes"
 
-#: fdisk/cfdisk.c:2482
+#: fdisk/cfdisk.c:2483
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Köpfe: %d   Sektoren pro Spur: %d   Zylinder: %d"
 
-#: fdisk/cfdisk.c:2486
+#: fdisk/cfdisk.c:2487
 msgid "Name"
 msgstr "Name"
 
 # I currently don't know a better translation
-#: fdisk/cfdisk.c:2487
+#: fdisk/cfdisk.c:2488
 msgid "Flags"
 msgstr "Flags"
 
-#: fdisk/cfdisk.c:2488
+#: fdisk/cfdisk.c:2489
 msgid "Part Type"
-msgstr "Part.-Typ"
+msgstr "Part. Typ"
 
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2490
 msgid "FS Type"
 msgstr "Dateisystemtyp"
 
-#: fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2491
 msgid "[Label]"
 msgstr "[Bezeichner]"
 
-#: fdisk/cfdisk.c:2492
+#: fdisk/cfdisk.c:2493
 msgid "  Sectors"
 msgstr " Sektoren"
 
-#: fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2497
 msgid "Size (MB)"
 msgstr "Größe (MB)"
 
-#: fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2499
 msgid "Size (GB)"
 msgstr "Größe (GB)"
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2554
 msgid "Bootable"
-msgstr "Bootfähig"
+msgstr "Bootbar"
 
-#: fdisk/cfdisk.c:2553
+# "Bootfähigkeit der aktuellen Partition ändern" (joey)
+#: fdisk/cfdisk.c:2554
 msgid "Toggle bootable flag of the current partition"
-msgstr "Bootfähigkeit der aktuellen Partition umschalten"
+msgstr "(De)Aktivieren des bootbar-flags der aktuellen Partition"
 
 # "Löschen"
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2555
 msgid "Delete"
 msgstr "Löschen"
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2555
 msgid "Delete the current partition"
 msgstr "Die aktuelle Partition löschen"
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2556
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2556
 msgid "Change disk geometry (experts only)"
-msgstr "Parameter der Festplattengeometrie ändern (nur für Experten)"
+msgstr "Die Festplattengeometrieparameter ändern (nur für Experten)"
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2557
 msgid "Help"
 msgstr "Hilfe"
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2557
 msgid "Print help screen"
 msgstr "Die Hilfe anzeigen"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2558
 msgid "Maximize"
 msgstr "Maxim."
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2558
 msgid "Maximize disk usage of the current partition (experts only)"
-msgstr "Nutzung der aktuellen Partition maximieren (nur für Experten)"
+msgstr "Maximieren der Nutzung der aktuellen Partition (nur für Experten)"
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2559
 msgid "New"
 msgstr "Neue"
 
 # "Erzeuge aus dem freien Bereich eine neue Partition"
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2559
 msgid "Create new partition from free space"
 msgstr "Neue Partition im freiem Bereich anlegen"
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2560
 msgid "Print"
 msgstr "Ausgabe"
 
 # "Gib die Partitionstabelle auf dem Bildschirm oder in eine Datei aus"
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2560
 msgid "Print partition table to the screen or to a file"
-msgstr "Partitionstabelle auf dem Bildschirm oder an Datei ausgeben"
+msgstr "Partitionstabelle auf dem Bildschirm oder in Datei ausgeben"
 
-#: fdisk/cfdisk.c:2560
+#: fdisk/cfdisk.c:2561
 msgid "Quit"
 msgstr "Ende"
 
 # "Beende das Programm ohne die Partitionstabelle zu schreiben"
-#: fdisk/cfdisk.c:2560
+#: fdisk/cfdisk.c:2561
 msgid "Quit program without writing partition table"
-msgstr "Das Programm beenden, ohne die Partitionstabelle zu schreiben"
+msgstr "Das Programm beenden, ohne die Partitionstabelle zu speichern"
 
-#: fdisk/cfdisk.c:2561
+#: fdisk/cfdisk.c:2562
 msgid "Type"
 msgstr "Typ"
 
-#: fdisk/cfdisk.c:2561
+#: fdisk/cfdisk.c:2562
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
-msgstr "Den Dateisystemtyp ändern (DOS, Linux, OS/2 usw.)"
+msgstr "Den Dateisystemtyp (DOS, Linux, OS/2, etc.)"
 
 # Maybe without the dot.
-#: fdisk/cfdisk.c:2562
+#: fdisk/cfdisk.c:2563
 msgid "Units"
-msgstr "Einheit"
+msgstr "Einheit."
 
 # "Ändert die Einheiten der Größenanzeige ("
-#: fdisk/cfdisk.c:2562
+#: fdisk/cfdisk.c:2563
 msgid "Change units of the partition size display (MB, sect, cyl)"
-msgstr "Zwischen den Einheiten für die Größenanzeige wechseln (MB, Sek., Zyl.)"
+msgstr ""
+"Zwischen den Einheiten für die Größenanzeige wechseln (MB, Sekt., Zyl.)"
 
-#: fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2564
 msgid "Write"
-msgstr "Schreiben"
+msgstr "Schreib."
 
-#: fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2564
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Die Partitionstabelle schreiben (dies kann Daten zerstören)"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2610
 msgid "Cannot make this partition bootable"
-msgstr "Diese Partition kann nicht bootfähig gemacht werden."
+msgstr "Diese Partition kann nicht als bootbar markiert werden"
 
-#: fdisk/cfdisk.c:2619
+#: fdisk/cfdisk.c:2620
 msgid "Cannot delete an empty partition"
-msgstr "Eine leere Partition kann nicht gelöscht werden."
+msgstr "Eine leere Partition kann nicht gelöscht werden"
 
-#: fdisk/cfdisk.c:2639 fdisk/cfdisk.c:2641
+#: fdisk/cfdisk.c:2640 fdisk/cfdisk.c:2642
 msgid "Cannot maximize this partition"
-msgstr "Die Nutzung dieser Partition kann nicht maximiert werden."
+msgstr "Die Nutzung dieser Partition kann nicht maximiert werden"
 
-#: fdisk/cfdisk.c:2649
+#: fdisk/cfdisk.c:2650
 msgid "This partition is unusable"
-msgstr "Diese Partition ist nicht benutzbar."
+msgstr "Diese Partition ist unbenutzbar"
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2652
 msgid "This partition is already in use"
-msgstr "Diese Partition ist bereits in Benutzung."
+msgstr "Diese Partition ist bereits in Benutzung"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2669
 msgid "Cannot change the type of an empty partition"
-msgstr "Der Dateisystemtyp einer leeren Partition kann nicht geändert werden."
+msgstr "Der Dateisystemtyp einer leeren Partition kann nicht geändert werden"
 
-#: fdisk/cfdisk.c:2695 fdisk/cfdisk.c:2701
+#: fdisk/cfdisk.c:2696 fdisk/cfdisk.c:2702
 msgid "No more partitions"
-msgstr "Keine weiteren Partitionen."
+msgstr "Keine weiteren Partitionen"
 
 # "Ungültige Taste"
-#: fdisk/cfdisk.c:2708
+#: fdisk/cfdisk.c:2709
 msgid "Illegal command"
-msgstr "Unzulässiger Befehl."
+msgstr "Unzulässiges Kommando"
 
-#: fdisk/cfdisk.c:2718
-#, fuzzy
+#: fdisk/cfdisk.c:2719
 msgid "Copyright (C) 1994-2000 Kevin E. Martin & aeb\n"
-msgstr "Copyright (C) 1994-1999 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
+#: fdisk/cfdisk.c:2726
 #, c-format
 msgid ""
 "\n"
@@ -2307,7 +2500,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Verwendung:\n"
+"Aufruf:\n"
 "Ausgabe der Version:\n"
 "        %s -v\n"
 "Ausgabe der Partitionstabelle:\n"
@@ -2316,14 +2509,13 @@ msgstr ""
 "        %s [Optionen] GERÄTEDATEI\n"
 "\n"
 "Optionen:\n"
-"-a: Pfeil statt Hervorheben verwenden;\n"
-"-z: Mit leerer Partitionstabelle beginnen, statt die Partitionstabelle\n"
-"                von der Festplatte zu lesen;\n"
-"-c C -h H -s S: Die Daten des Kernels in Bezug auf die Anzahl der Zylinder,\n"
-"                Köpfe und Sektoren pro Spur außer Kraft setzen.\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"
 
-#: fdisk/fdisk.c:204
+#: 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"
@@ -2334,19 +2526,18 @@ msgid ""
 "-u: give Start and End in sector (instead of cylinder) units\n"
 "-b 2048: (for certain MO drives) use 2048-byte sectors\n"
 msgstr ""
-"Verwendung: fdisk [-b SSZ] [-u] Festplatte  Partitionstabelle bearbeiten\n"
-"        fdisk -l [-b SSZ] [-u] Festplatte   Partitionstabelle ausgeben\n"
-"        fdisk -s Partition                  Größe einer Partition in "
-"Blöcken\n"
-"        fdisk -v                            fdisk-Version anzeigen\n"
+"Aufruf: fdisk [-b SSZ] [-u] Festplatte     Partitionstabelle bearbeiten\n"
+"        fdisk -l [-b SSZ] [-u] Festplatte  Partitionstabelle ausgeben\n"
+"        fdisk -s Partition                 Größe einer Partition in Blöcken\n"
+"        fdisk -v                           Version anzeigen\n"
 "\n"
-"Festplatte ist beispielsweise /dev/hda oder /dev/sda\n"
-"Partition ist beispielsweise /dev/hda7\n"
+"Festplatte ist zum Beispiel /dev/hda oder /dev/sda\n"
+"Partition ist zum Beispiel /dev/hda7\n"
 "\n"
 "-u: Anfang und Ende werden in Sektoren statt in Zylindern angegeben\n"
-"-b 2048 (bei bestimmten MO-Geräten): Sektoren mit 2048 Bytes verwenden\n"
+"-b 2048: (bestimmte MO-Geräte) benutze 2048 Byte Sektoren\n"
 
-#: fdisk/fdisk.c:216
+#: fdisk/fdisk.c:217
 msgid ""
 "Usage: fdisk [-l] [-b SSZ] [-u] device\n"
 "E.g.: fdisk /dev/hda  (for the first IDE disk)\n"
@@ -2355,469 +2546,458 @@ msgid ""
 "  or: fdisk /dev/rd/c0d0  or: fdisk /dev/ida/c0d0  (for RAID devices)\n"
 "  ...\n"
 msgstr ""
-"Verwendung: fdisk [-l] [-b SSZ] [-u] Gerät\n"
+"Aufruf: fdisk [-l] [-b SSZ] [-u] Gerät\n"
 "Zum Beispiel: fdisk /dev/hda       (die erste IDE-Festplatte)\n"
 "        oder: fdisk /dev/sdc       (die dritte SCSI-Festplatte)\n"
-"        oder: fdisk /dev/eda       (das erste PS/2 ESDI-Laufwerk)\n"
+"        oder: fdisk /dev/eda       (die erste PS/2 ESDI-Festplatte)\n"
 "        oder: fdisk /dev/rd/c0d0\n"
 "        oder: fdisk /dev/ida/c0d0  (RAID-Festplatten)\n"
 "        ...\n"
 
-#: fdisk/fdisk.c:224
+#: fdisk/fdisk.c:226
 #, c-format
 msgid "Unable to open %s\n"
-msgstr "%s konnte nicht geöffnet werden.\n"
+msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:227
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to read %s\n"
-msgstr "%s konnte nicht gelesen werden.\n"
+msgstr "Konnte %s nicht lesen\n"
 
-#: fdisk/fdisk.c:230
+# "Konnte in %s nicht positionieren"
+#: fdisk/fdisk.c:234
 #, c-format
 msgid "Unable to seek on %s\n"
-msgstr "Suchvorgang in %s nicht erfolgreich.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:233
+#: fdisk/fdisk.c:238
 #, c-format
 msgid "Unable to write %s\n"
-msgstr "Schreibvorgang an %s nicht erfolgreich.\n"
+msgstr "Konnte %s nicht schreiben\n"
 
-#: fdisk/fdisk.c:236
+#: fdisk/fdisk.c:242
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
-msgstr "BLKGETSIZE ioctl: Fehler bei %s\n"
+msgstr ""
 
-#: fdisk/fdisk.c:240
+#: fdisk/fdisk.c:246
 msgid "Unable to allocate any more memory\n"
-msgstr "Es konnte kein weiterer Speicher zugewiesen werden.\n"
+msgstr "Konnte keinen weiteren Speicher reservieren\n"
 
-#: fdisk/fdisk.c:242
+#: fdisk/fdisk.c:249
 msgid "Fatal error\n"
-msgstr "Nicht behebbarer Fehler.\n"
+msgstr "Fataler Fehler\n"
 
-#: 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/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:355 fdisk/fdisk.c:362
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 #: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
-msgstr "Befehl  Bedeutung"
+msgstr "Kommando  Bedeutung"
 
-#: fdisk/fdisk.c:312
+#: fdisk/fdisk.c:319
 msgid "   a   toggle a read only flag"
-msgstr "   a   Das Schreibschutz-Flag umschalten"
+msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:313 fdisk/fdisk.c:357
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:364
 msgid "   b   edit bsd disklabel"
-msgstr "   b   Die bsd-Datenträgerkennung bearbeiten"
+msgstr "   b   »bsd disklabel« bearbeiten"
 
-#: fdisk/fdisk.c:314
+#: fdisk/fdisk.c:321
 msgid "   c   toggle the mountable flag"
-msgstr "   c   Das Mountfähig-Flag umschalten"
+msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:315 fdisk/fdisk.c:334 fdisk/fdisk.c:359
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:366
 msgid "   d   delete a partition"
 msgstr "   d   Eine Partition löschen"
 
-#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   l   list known partition types"
-msgstr "   l   Bekannte Dateisystemtypen anzeigen"
+msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
 #. sun
-#: 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/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:356 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   Dieses Menü anzeigen"
 
-#: fdisk/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:362
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369
 msgid "   n   add a new partition"
 msgstr "   n   Eine neue Partition anlegen"
 
-#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:350 fdisk/fdisk.c:363
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:357 fdisk/fdisk.c:370
 msgid "   o   create a new empty DOS partition table"
-msgstr "   o   Eine neue, leere DOS-Partitionstabelle anlegen"
+msgstr "   o   Eine neue leere DOS Partitionstabelle anlegen"
 
-#: 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
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371 fdisk/fdisk.c:394
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 msgid "   p   print the partition table"
 msgstr "   p   Die Partitionstabelle anzeigen"
 
-#: 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/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:358 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 #: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
-msgstr "   q   Beenden, ohne die Änderungen zu speichern"
+msgstr "   q   Ende ohne Speichern der Änderungen"
 
-#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:352 fdisk/fdisk.c:366
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:359 fdisk/fdisk.c:373
 msgid "   s   create a new empty Sun disklabel"
-msgstr "   s   Eine neue, leere Sun-Datenträgerkennung anlegen"
+msgstr "   s   Einen neuen leeren »Sun disklabel« anlegen"
 
 #. sun
-#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
 msgid "   t   change a partition's system id"
 msgstr "   t   Den Dateisystemtyp einer Partition ändern"
 
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375
 msgid "   u   change display/entry units"
 msgstr "   u   Die Einheit für die Anzeige/Eingabe ändern"
 
-#: 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
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:398
+#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
 msgid "   v   verify the partition table"
 msgstr "   v   Die Partitionstabelle überprüfen"
 
-#: 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
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:377 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
 msgid "   w   write table to disk and exit"
-msgstr "   w   Tabelle auf die Festplatte schreiben und Programm beenden"
+msgstr ""
+"   w   Die Tabelle auf die Festplatte schreiben und das Programm beenden"
 
-#: fdisk/fdisk.c:327 fdisk/fdisk.c:371
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   Zusätzliche Funktionen (nur für Experten)"
 
-#: fdisk/fdisk.c:331
+#: fdisk/fdisk.c:338
 msgid "   a   select bootable partition"
-msgstr "   a   Die bootfähige Partition auswählen"
+msgstr "   a   Wählen der bootbaren Partition"
 
 #. sgi flavour
-#: fdisk/fdisk.c:332
+#: fdisk/fdisk.c:339
 msgid "   b   edit bootfile entry"
-msgstr "   b   Den 'bootfile'-Eintrag bearbeiten"
+msgstr "   b   Bearbeiten des »bootfile«-Eintrags"
 
 #. sgi
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:340
 msgid "   c   select sgi swap partition"
-msgstr "   c   Die sgi-Auslagerungspartition auswählen"
+msgstr "   c   Die sgi swap Partition auswählen"
 
-#: fdisk/fdisk.c:356
+#: fdisk/fdisk.c:363
 msgid "   a   toggle a bootable flag"
-msgstr "   a   Ein 'Bootfähig'-Flag umschalten"
+msgstr "   a   (De)Aktivieren des bootbar-Flags"
 
-#: fdisk/fdisk.c:358
+#: fdisk/fdisk.c:365
 msgid "   c   toggle the dos compatibility flag"
-msgstr "   c   Ein DOS-Kompatibilitätsflag umschalten"
+msgstr "   c   (De)Aktivieren des DOS Kompatibilitätsflags"
 
-#: fdisk/fdisk.c:379
+#: fdisk/fdisk.c:386
 msgid "   a   change number of alternate cylinders"
-msgstr "   a   Die Anzahl alternativer Zylinder ändern"
+msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:380 fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
+#: fdisk/fdisk.c:387 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   c   change number of cylinders"
 msgstr "   c   Die Anzahl der Zylinder ändern"
 
 # XXX
-#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:438
 msgid "   d   print the raw data in the partition table"
-msgstr "   d   Reine Daten in der Partitionstabelle anzeigen"
+msgstr "   d   Zeige die »raw« Daten der Partitionstabelle an"
 
-#: fdisk/fdisk.c:382
+#: fdisk/fdisk.c:389
 msgid "   e   change number of extra sectors per cylinder"
-msgstr "   e   Die Anzahl zusätzlicher Sektoren pro Zylinder ändern"
+msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:383 fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   h   change number of heads"
 msgstr "   h   Die Anzahl der Köpfe ändern"
 
-#: fdisk/fdisk.c:384
+#: fdisk/fdisk.c:391
 msgid "   i   change interleave factor"
-msgstr "   i   Den Interleave-Faktor ändern"
+msgstr ""
 
 #. sun
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:392
 msgid "   o   change rotation speed (rpm)"
-msgstr "   o   Die Drehzahl ändern (U/min)"
+msgstr ""
 
-#: fdisk/fdisk.c:389 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:439
+#: fdisk/fdisk.c:396 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 #: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   Zurück zum Hauptmenü"
 
-#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   s   change number of sectors/track"
-msgstr "   s   Die Anzahl der Sektoren pro Spur ändern"
+msgstr "   s   Die Anzahl der Sektoren/Spur ändern"
 
-#: fdisk/fdisk.c:393
+#: fdisk/fdisk.c:400
 msgid "   y   change number of physical cylinders"
-msgstr "   y   Die Anzahl physischer Zylinder ändern"
+msgstr ""
 
-#: fdisk/fdisk.c:397 fdisk/fdisk.c:413 fdisk/fdisk.c:429
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 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:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
 msgid "   e   list extended partitions"
 msgstr "   e   Erweiterte Partitionen anzeigen"
 
 #. !sun
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:434
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   g   create an IRIX partition table"
 msgstr "   g   Eine IRIX-Partitionstabelle anlegen"
 
 #. !sun
-#: fdisk/fdisk.c:433
-#, fuzzy
+#: fdisk/fdisk.c:440
 msgid "   f   fix partition order"
-msgstr "   p   Die Partitionstabelle anzeigen"
+msgstr ""
 
-#: fdisk/fdisk.c:532
+#: fdisk/fdisk.c:539
 msgid "You must set"
-msgstr "Wählen Sie"
+msgstr ""
 
-#: fdisk/fdisk.c:546
+#: fdisk/fdisk.c:553
 msgid "heads"
 msgstr "Köpfe"
 
-#: fdisk/fdisk.c:548 fdisk/fdisk.c:1046 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:555 fdisk/fdisk.c:1078 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "Sektoren"
 
-#: fdisk/fdisk.c:550 fdisk/fdisk.c:1046 fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdisk.c:557 fdisk/fdisk.c:1078 fdisk/fdiskbsdlabel.c:461
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:554
+#: fdisk/fdisk.c:561
 #, c-format
 msgid ""
 "%s%s.\n"
 "You can do this from the extra functions menu.\n"
 msgstr ""
 "%s%s.\n"
-"Verwenden Sie hierzu das Menü 'zusätzliche Funktionen'.\n"
+"Sie können dies im Zusatzfunktionsmenü tun.\n"
 
-#: fdisk/fdisk.c:555
+#: fdisk/fdisk.c:562
 msgid " and "
 msgstr " und "
 
-#: fdisk/fdisk.c:595
+#: fdisk/fdisk.c:579
+#, c-format
+msgid ""
+"\n"
+"The number of cylinders for this disk is set to %d.\n"
+"There is nothing wrong with that, but this is larger than 1024,\n"
+"and could in certain setups cause problems with:\n"
+"1) software that runs at boot time (e.g., old versions of LILO)\n"
+"2) booting and partitioning software from other OSs\n"
+"   (e.g., DOS FDISK, OS/2 FDISK)\n"
+msgstr ""
+
+#: fdisk/fdisk.c:602
 msgid "Bad offset in primary extended partition\n"
-msgstr "Ungültiger Offset-Wert in der primären erweiterten Partition.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:609
+#: fdisk/fdisk.c:616
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
-msgstr "Warnung: Partitionen werden gelöscht nach %d\n"
+msgstr ""
 
-#: fdisk/fdisk.c:625
+#: fdisk/fdisk.c:633
 #, c-format
 msgid "Warning: extra link pointer in partition table %d\n"
-msgstr "Warnung: Zusätzlicher Verknüpfungszeiger in Partitionstabelle %d\n"
+msgstr ""
 
-#: fdisk/fdisk.c:633
+#: fdisk/fdisk.c:641
 #, 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:677
+#: fdisk/fdisk.c:686
 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 ""
-"Neue DOS-Datenträgerkennung wird erstellt. Änderungen bleiben solange im\n"
-"Speicher, bis Sie sich entscheiden, sie auf die Festplatte zu schreiben.\n"
-"Danach kann der vorherige Inhalt nicht mehr wiederhergestellt werden.\n"
-"\n"
 
-#: fdisk/fdisk.c:701
+#: fdisk/fdisk.c:729
 #, c-format
 msgid "Note: sector size is %d (not %d)\n"
 msgstr "Hinweis: Die Sektorgröße ist %d (nicht %d)\n"
 
 # XXX
-#: fdisk/fdisk.c:783
+#: fdisk/fdisk.c:812
 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
+#: fdisk/fdisk.c:840
 #, fuzzy
 msgid ""
 "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"
+"Das Gerät enthält weder eine gültige DOS-Partitionstabelle,\n"
+"noch einen Sun oder »SGI disklabel«\n"
 
-#: fdisk/fdisk.c:827
+#: fdisk/fdisk.c:856
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: fdisk/fdisk.c:849
+#: fdisk/fdisk.c:878
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
-msgstr "Die zusätzliche erweiterte Partition %d wird ignoriert.\n"
+msgstr "Ignoriere die zusätzliche erweiterte Partition %d\n"
 
-#: fdisk/fdisk.c:861
+#: fdisk/fdisk.c:890
 #, c-format
 msgid ""
 "Warning: invalid flag 0x%04x of partition table %d will be corrected by "
 "w(rite)\n"
 msgstr ""
-"Warnung: Ungültiges Flag 0x%04x der Partitionstabelle %d wird durch w "
-"(schreiben) ersetzt.\n"
 
-#: fdisk/fdisk.c:883
+#: fdisk/fdisk.c:912
 msgid ""
 "\n"
 "got EOF thrice - exiting..\n"
 msgstr ""
-"\n"
-"Dateiende (EOF) dreimal erhalten - Programm wird beendet.\n"
 
-#: fdisk/fdisk.c:921
+#: fdisk/fdisk.c:951
 msgid "Hex code (type L to list codes): "
-msgstr "Hexadezimalcode (L eingeben, um eine Liste anzuzeigen): "
+msgstr "Hex code (L um eine Liste anzuzeigen): "
 
-#: fdisk/fdisk.c:960
+#: fdisk/fdisk.c:990
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d) [Standardwert: %d]: "
 
-#: fdisk/fdisk.c:1014
+#: fdisk/fdisk.c:1046
 #, c-format
 msgid "Using default value %d\n"
-msgstr "Standardwert %d wird verwendet.\n"
+msgstr "Benutze den Standardwert %d\n"
 
-#: fdisk/fdisk.c:1018
+#: fdisk/fdisk.c:1050
 msgid "Value out of range.\n"
-msgstr "Wert außerhalb des gültigen Bereichs.\n"
+msgstr "Wert außerhalb des Bereichs.\n"
 
-#: fdisk/fdisk.c:1028
+#: fdisk/fdisk.c:1060
 msgid "Partition number"
 msgstr "Partitionsnummer"
 
-#: fdisk/fdisk.c:1037
+#: fdisk/fdisk.c:1069
 #, c-format
 msgid "Warning: partition %d has empty type\n"
-msgstr "Warnung: Typ der Partition %d ist leer.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1044
+#: fdisk/fdisk.c:1076
 msgid "cylinder"
 msgstr "Zylinder"
 
-#: fdisk/fdisk.c:1044
+#: fdisk/fdisk.c:1076
 msgid "sector"
 msgstr "Sektor"
 
-#: fdisk/fdisk.c:1053
+#: fdisk/fdisk.c:1085
 #, 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:1064
+#: fdisk/fdisk.c:1096
 #, c-format
 msgid "WARNING: Partition %d is an extended partition\n"
-msgstr "WARNUNG: Partition %d ist eine erweiterte Partition.\n"
+msgstr "WARNUNG: Partition %d ist eine erweiterte Partition\n"
 
-#: fdisk/fdisk.c:1075
+#: fdisk/fdisk.c:1107
 msgid "DOS Compatibility flag is set\n"
-msgstr "Das DOS-Kompatibilitätsflag ist gesetzt.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1079
+#: fdisk/fdisk.c:1111
 msgid "DOS Compatibility flag is not set\n"
-msgstr "Das DOS-Kompatibilitätsflag ist nicht gesetzt.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1167
+#: fdisk/fdisk.c:1204
 #, c-format
 msgid "Partition %d does not exist yet!\n"
-msgstr "Die Partition %d existiert noch nicht!\n"
+msgstr "Partition %d existiert noch nicht!\n"
 
-#: fdisk/fdisk.c:1172
+#: fdisk/fdisk.c:1209
 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 ""
-"Typ 0 bedeutet bei vielen Systemen 'freier Platz'\n"
-"(jedoch nicht bei Linux). Eine Partition des Typs 0 wird\n"
-"daher nicht empfohlen. Sie können die Partition mit dem\n"
-"Befehl 'd' löschen.\n"
 
-#: fdisk/fdisk.c:1181
+#: fdisk/fdisk.c:1218
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
 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:1190
+#: fdisk/fdisk.c:1227
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
 "\n"
 msgstr ""
-"Es empfiehlt sich, für Partition 3 'Ganze Festplatte' (5) zu\n"
-"wählen, da SunOS/Solaris dies erwartet und auch Linux es bevorzugt.\n"
-"\n"
 
-#: fdisk/fdisk.c:1196
+#: fdisk/fdisk.c:1233
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
 "\n"
 msgstr ""
-"Es empfiehlt sich, Partition 9 als Datenträgerkopf (0) zu\n"
-"belassen und Partition 11 als gesamten Datenträger (6) zu partitionieren,\n"
-"wie IRIX dies erwartet.\n"
-"\n"
 
-#: fdisk/fdisk.c:1210
+#: fdisk/fdisk.c:1247
 #, 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:1261
+#: fdisk/fdisk.c:1298
 #, 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:1263 fdisk/fdisk.c:1271 fdisk/fdisk.c:1280 fdisk/fdisk.c:1289
+#: fdisk/fdisk.c:1300 fdisk/fdisk.c:1308 fdisk/fdisk.c:1317 fdisk/fdisk.c:1326
 #, c-format
 msgid "     phys=(%d, %d, %d) "
-msgstr "     physisch=(%d, %d, %d) "
+msgstr ""
 
-#: fdisk/fdisk.c:1264 fdisk/fdisk.c:1272
+#: fdisk/fdisk.c:1301 fdisk/fdisk.c:1309
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
-msgstr "logisch=(%d, %d, %d)\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1269
+#: fdisk/fdisk.c:1306
 #, c-format
 msgid "Partition %d has different physical/logical endings:\n"
-msgstr "Physisches und logisches Ende von Partition %d sind nicht identisch:\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1278
+#: fdisk/fdisk.c:1315
 #, c-format
 msgid "Partition %i does not start on cylinder boundary:\n"
 msgstr "Partition %i beginnt nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1281
+#: fdisk/fdisk.c:1318
 #, c-format
 msgid "should be (%d, %d, 1)\n"
-msgstr "sollte (%d, %d, 1) lauten.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1287
+#: fdisk/fdisk.c:1324
 #, c-format
 msgid "Partition %i does not end on cylinder boundary:\n"
 msgstr "Partition %i endet nicht an einer Zylindergrenze:\n"
 
-#: fdisk/fdisk.c:1290
+#: fdisk/fdisk.c:1327
 #, c-format
 msgid "should be (%d, %d, %d)\n"
-msgstr "sollte (%d, %d, %d) lauten.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1297
+#: fdisk/fdisk.c:1334
 #, c-format
 msgid ""
 "\n"
@@ -2830,30 +3010,28 @@ msgstr ""
 "Einheiten: %s mit %d * %d Bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1342
+#: fdisk/fdisk.c:1379
 msgid ""
 "Nothing to do. Ordering is correct already.\n"
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:1408
+#: fdisk/fdisk.c:1445
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
-msgstr "%*s Booten  Anfang      Ende   Blöcke   ID  Dateisystemtyp\n"
+msgstr "%*s boot.  Anfang      Ende    Blöcke   Id  Dateisystemtyp\n"
 
-#: fdisk/fdisk.c:1409 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
+#: fdisk/fdisk.c:1446 fdisk/fdisksgilabel.c:223 fdisk/fdisksunlabel.c:657
 msgid "Device"
 msgstr "Gerät"
 
-#: fdisk/fdisk.c:1446
-#, fuzzy
+#: fdisk/fdisk.c:1483
 msgid ""
 "\n"
 "Partition table entries are not in disk order\n"
 msgstr ""
-"Logische Partitionen befinden sich nicht in der Festplattenreihenfolge."
 
-#: fdisk/fdisk.c:1456
+#: fdisk/fdisk.c:1493
 #, c-format
 msgid ""
 "\n"
@@ -2864,158 +3042,154 @@ msgstr ""
 "Festplatte %s: %d Köpfe, %d Sektoren, %d Zylinder\n"
 "\n"
 
-#: fdisk/fdisk.c:1458
+# Ist "Kp" eine gute Abkürzung für "Kopf" ?
+#: fdisk/fdisk.c:1495
 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"
+msgstr "Nr AF  Kp Sek  Zyl  Kp Sek  Zyl   Anfang     Größe ID\n"
 
-#: fdisk/fdisk.c:1502
+#: fdisk/fdisk.c:1539
 #, c-format
 msgid "Warning: partition %d contains sector 0\n"
 msgstr "Warnung: Partition %d enthält Sektor 0\n"
 
-#: fdisk/fdisk.c:1505
+#: fdisk/fdisk.c:1542
 #, c-format
 msgid "Partition %d: head %d greater than maximum %d\n"
-msgstr "Partition %d: Kopf %d größer als Höchstwert %d\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1508
+#: fdisk/fdisk.c:1545
 #, c-format
 msgid "Partition %d: sector %d greater than maximum %d\n"
-msgstr "Partition %d: Sektor %d größer als Höchstwert %d\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1511
+#: fdisk/fdisk.c:1548
 #, c-format
 msgid "Partitions %d: cylinder %d greater than maximum %d\n"
-msgstr "Partition %d: Zylinder %d größer als Höchstwert %d\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1515
+#: fdisk/fdisk.c:1552
 #, 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:1547
+#: fdisk/fdisk.c:1584
 #, c-format
 msgid "Warning: bad start-of-data in partition %d\n"
-msgstr "Warnung: Ungültiger Datenanfang in Partition %d\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1555
+#: fdisk/fdisk.c:1592
 #, c-format
 msgid "Warning: partition %d overlaps partition %d.\n"
-msgstr "Warnung: Partition %d überlappt sich mit Partition %d.\n"
+msgstr "Warnung: Partition %d überlappt mit Partition %d.\n"
 
-#: fdisk/fdisk.c:1575
+#: fdisk/fdisk.c:1612
 #, c-format
 msgid "Warning: partition %d is empty\n"
-msgstr "Warnung: Partition %d ist leer.\n"
+msgstr "Warnung: Partition %d ist leer\n"
 
-#: fdisk/fdisk.c:1580
+#: fdisk/fdisk.c:1617
 #, 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"
+"Logische Partition %d ist nicht vollständig in Partition %d enthalten\n"
 
-#: fdisk/fdisk.c:1586
+#: fdisk/fdisk.c:1623
 #, 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"
+msgstr ""
 
-#: fdisk/fdisk.c:1589
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "%d unallocated sectors\n"
-msgstr "%d nicht zugewiesene Sektoren\n"
+msgstr "%d unbenutzte Sektoren\n"
 
-#: fdisk/fdisk.c:1602 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
+#: fdisk/fdisk.c:1639 fdisk/fdisksgilabel.c:664 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
-"Partition %d ist bereits definiert. Löschen Sie sie, bevor Sie sie neu "
-"hinzufügen.\n"
 
 # %s can be "Sektor" or "Zylinder".
-#: fdisk/fdisk.c:1623 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisk.c:1660 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:686
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Erster %s"
 
-#: fdisk/fdisk.c:1638 fdisk/fdisksunlabel.c:542
+#: fdisk/fdisk.c:1675 fdisk/fdisksunlabel.c:543
 #, c-format
 msgid "Sector %d is already allocated\n"
-msgstr "Sektor %d ist bereits zugewiesen.\n"
+msgstr "Sektor %d wird bereits benutzt\n"
 
-#: fdisk/fdisk.c:1674
+#: fdisk/fdisk.c:1711
 msgid "No free sectors available\n"
-msgstr "Es sind keine freien Sektoren verfügbar.\n"
+msgstr "Es sind keine freien Sektoren verfügbar\n"
 
-#: fdisk/fdisk.c:1682 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
+#: fdisk/fdisk.c:1720 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:554
 #, 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:1715
+#: fdisk/fdisk.c:1753
 #, c-format
 msgid "Warning: partition %d has an odd number of sectors.\n"
-msgstr "Warnung: Partition %d hat eine ungerade Anzahl Sektoren.\n"
+msgstr "Warnung: Partition %d hat eine ungerade Anzahl an Sektoren.\n"
 
-#: fdisk/fdisk.c:1755 fdisk/fdiskbsdlabel.c:611
+#: fdisk/fdisk.c:1793 fdisk/fdiskbsdlabel.c:610
 msgid "The maximum number of partitions has been created\n"
-msgstr "Die maximale Anzahl von Partitionen wurde erstellt.\n"
+msgstr "Die maximale Anzahl von Partitionen wurde erzeugt\n"
 
-#: fdisk/fdisk.c:1765
+#: fdisk/fdisk.c:1803
 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:1769
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid ""
 "Command action\n"
 "   %s\n"
 "   p   primary partition (1-4)\n"
 msgstr ""
-"Befehl  Aktion\n"
+"Kommando  Aktion\n"
 "   %s\n"
 "   p      Primäre Partition (1-4)\n"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1810
 msgid "l   logical (5 or over)"
 msgstr "l      Logische Partition (5 oder größer)"
 
-#: fdisk/fdisk.c:1771
+#: fdisk/fdisk.c:1810
 msgid "e   extended"
-msgstr "e      Erweiterte Partition"
+msgstr "e      Erweiterte"
 
-#: fdisk/fdisk.c:1788
+#: fdisk/fdisk.c:1827
 #, c-format
 msgid "Invalid partition number for type `%c'\n"
-msgstr "Ungültige Partitionsnummer für den Typ '%c'\n"
+msgstr "Ungültige Partitionsnummer für den Typ »%c«\n"
 
-#: fdisk/fdisk.c:1823
+#: fdisk/fdisk.c:1862
 msgid ""
 "The partition table has been altered!\n"
 "\n"
 msgstr ""
-"Die Partitionstabelle wurde geändert!\n"
+"Die Partitionstabelle wurde verändert!\n"
 "\n"
 
-#: fdisk/fdisk.c:1832
+#: fdisk/fdisk.c:1871
 msgid "Calling ioctl() to re-read partition table.\n"
-msgstr "ioctl() wird aufgerufen, um die Partitionstabelle erneut zu lesen.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1848
+#: fdisk/fdisk.c:1887
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
 "Reboot your system to ensure the partition table is updated.\n"
 msgstr ""
-"Fehler %d beim erneuten Lesen der Partitionstabelle: %s\n"
-"Starten Sie das System neu, um sicherzustellen, dass die Partitionstabelle "
-"aktualisiert wird.\n"
+"Das Kernel konnte die Partitionstabelle nicht erneut lesen (Fehler %d):\n"
+"%s\n"
+"Rebooten Sie das System, um sicherzustellen, daß die Partitionstabelle neu "
+"gelesen wird.\n"
 
-#: fdisk/fdisk.c:1854
+#: fdisk/fdisk.c:1893
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -3023,119 +3197,106 @@ msgid ""
 "information.\n"
 msgstr ""
 "\n"
-"WARNUNG: Wenn Sie DOS 6.x-Partitionen angelegt oder\n"
-"geändert haben, finden Sie weitere Informationen in\n"
-"der Handbuchseite für fdisk (Befehl: 'man fdisk').\n"
+"WARNUNG: Wenn Sie eine DOS 6.x Partition angelegt\n"
+"oder verändert haben, dann schauen Sie bitte in die\n"
+"fdisk-manual-Seite nach weiteren Informationen\n"
 
-#: fdisk/fdisk.c:1861
+#: fdisk/fdisk.c:1900
 msgid "Syncing disks.\n"
-msgstr "Datenträger werden synchronisiert.\n"
-
-#: fdisk/fdisk.c:1892
-#, c-format
-msgid "Device: %s\n"
-msgstr "Gerät: %s\n"
+msgstr ""
 
-#: fdisk/fdisk.c:1908
+#: fdisk/fdisk.c:1947
 #, c-format
 msgid "Partition %d has no data area\n"
-msgstr "Partition %d hat keinen Datenbereich.\n"
+msgstr "Partition %d hat keinen Datenbereich\n"
 
-#: fdisk/fdisk.c:1913
+#: fdisk/fdisk.c:1952
 msgid "New beginning of data"
-msgstr "Neuer Datenanfang"
+msgstr ""
 
 # That sounds pretty ummm...
-#: fdisk/fdisk.c:1929
+#: fdisk/fdisk.c:1968
 msgid "Expert command (m for help): "
-msgstr "Expertenbefehl (m für Hilfe): "
+msgstr "Expertenkommando (m für Hilfe): "
 
-#: fdisk/fdisk.c:1942
+#: fdisk/fdisk.c:1981
 msgid "Number of cylinders"
 msgstr "Anzahl der Zylinder"
 
-#: fdisk/fdisk.c:1968
+#: fdisk/fdisk.c:2007
 msgid "Number of heads"
 msgstr "Anzahl der Köpfe"
 
-#: fdisk/fdisk.c:1993
+#: fdisk/fdisk.c:2032
 msgid "Number of sectors"
 msgstr "Anzahl der Sektoren"
 
-#: fdisk/fdisk.c:1996
+#: fdisk/fdisk.c:2035
 msgid "Warning: setting sector offset for DOS compatiblity\n"
-msgstr "Warnung: Sektoroffset wird für DOS-Kompatibilität festgelegt.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:2058
+#: fdisk/fdisk.c:2100
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
-msgstr "Festplatte %s enthält keine gültige Partitionstabelle.\n"
+msgstr "Festplatte %s enthält keine gültige Partitionstabelle\n"
 
-#: fdisk/fdisk.c:2072
+#: fdisk/fdisk.c:2114
 #, c-format
 msgid "Cannot open %s\n"
-msgstr "%s konnte nicht geöffnet werden.\n"
+msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2089
+#: fdisk/fdisk.c:2130
 #, c-format
 msgid "cannot open %s\n"
-msgstr "%s konnte nicht geöffnet werden.\n"
+msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2110
-#, fuzzy, c-format
+#: fdisk/fdisk.c:2151
+#, c-format
 msgid "%c: unknown command\n"
-msgstr "Kein Befehl?\n"
+msgstr "%c: Unbekanntes Kommando\n"
 
-#: fdisk/fdisk.c:2161
+#: fdisk/fdisk.c:2201
 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:2164
+#: fdisk/fdisk.c:2204
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
-"Warnung: die Option -b (Sektorgröße festlegen) muss mit einem angegebenen "
-"Gerät verwendet werden.\n"
 
-#: fdisk/fdisk.c:2227
+#: fdisk/fdisk.c:2269
 #, 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
+#: fdisk/fdisk.c:2278
 msgid "Command (m for help): "
-msgstr "Befehl (m für Hilfe): "
+msgstr "Kommando (m für Hilfe): "
 
-#: fdisk/fdisk.c:2252
+#: fdisk/fdisk.c:2294
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
-"\n"
-"Die aktuelle Bootdatei ist: %s\n"
 
-#: fdisk/fdisk.c:2254
+#: fdisk/fdisk.c:2296
 msgid "Please enter the name of the new boot file: "
-msgstr "Geben Sie den Namen der neuen Bootdatei ein: "
+msgstr ""
 
-#: fdisk/fdisk.c:2256
+#: fdisk/fdisk.c:2298
 msgid "Boot file unchanged\n"
-msgstr "Bootdatei wurde nicht geändert.\n"
+msgstr ""
 
-#: fdisk/fdisk.c:2320
+#: fdisk/fdisk.c:2362
 msgid ""
 "\n"
 "\tSorry, no experts menu for SGI partition tables available.\n"
 "\n"
 msgstr ""
-"\n"
-"\tKein Expertenmenü für SGI-Partitionstabellen verfügbar.\n"
-"\n"
 
 #: fdisk/fdiskaixlabel.c:28
 msgid ""
@@ -3152,18 +3313,6 @@ msgid ""
 "\t   to remove the disk logically from your AIX\n"
 "\t   machine.  (Otherwise you become an AIXpert)."
 msgstr ""
-"\n"
-"\tDieser Datenträger enthält eine gültige AIX-Kennung.\n"
-"\tLinux kann diese Datenträger derzeit nicht handhaben.\n"
-"\tBeachten Sie die folgenden Hinweise:\n"
-"\t1. fdisk-Schreibvorgänge löschen den Inhalt des Datenträgers.\n"
-"\t2. Stellen Sie sicher, dass dieser Datenträger kein\n"
-"\t   unverzichtbarer Teil einer Datenträgergruppe ist.\n"
-"\t   (Wenn Datenträger nicht gespiegelt sind, werden die\n"
-"\t   anderen Datenträger möglicherweise ebenfalls gelöscht.)\n"
-"\t3. Entfernen Sie den logischen Datenträger vor dem Löschen\n"
-"\t   des physischen Datenträgers aus dem AIX-Rechner.\n"
-"\t   (Anderenfalls werden Sie zu einem AIXperten.)"
 
 #: fdisk/fdiskbsdlabel.c:117
 #, c-format
@@ -3172,7 +3321,7 @@ msgid ""
 "BSD label for device: %s\n"
 msgstr ""
 "\n"
-"BSD-Datenträgerkennung von %s\n"
+"»BSD label« von %s\n"
 
 #: fdisk/fdiskbsdlabel.c:125
 msgid "   d   delete a BSD partition"
@@ -3180,11 +3329,11 @@ msgstr "   d   Eine BSD-Partition löschen"
 
 #: fdisk/fdiskbsdlabel.c:126
 msgid "   e   edit drive data"
-msgstr "   e   Laufwerksdaten bearbeiten"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:127
 msgid "   i   install bootstrap"
-msgstr "   i   Bootinformationen installieren"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:128
 msgid "   l   list known filesystem types"
@@ -3192,51 +3341,50 @@ msgstr "   l   Die bekannten Dateisystemtypen anzeigen"
 
 #: fdisk/fdiskbsdlabel.c:130
 msgid "   n   add a new BSD partition"
-msgstr "   n   Eine neue BSD-Partition hinzufügen"
+msgstr "   n   Eine neue BSD-Partition anlegen"
 
 #: fdisk/fdiskbsdlabel.c:131
 msgid "   p   print BSD partition table"
-msgstr "   p   Die BSD-Partitionstabelle ausgeben"
+msgstr "   p   Die BSD-Partitionstabelle anzeigen"
 
 #: fdisk/fdiskbsdlabel.c:134
 msgid "   s   show complete disklabel"
-msgstr "   s   Die vollständige Datenträgerkennung anzeigen"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:135
 msgid "   t   change a partition's filesystem id"
-msgstr "   t   Die Dateisystemkennung einer Partition ändern"
+msgstr "   t   Den Dateisystemtyp einer Partition ändern"
 
 #: fdisk/fdiskbsdlabel.c:136
-#, fuzzy
 msgid "   u   change units (cylinders/sectors)"
-msgstr "   c   Die Anzahl der Zylinder ändern"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:137
 msgid "   w   write disklabel to disk"
-msgstr "   w   Die Datenträgerkennung auf die Festplatte schreiben"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr "Warnung: Partition %d fängt bei Sektor 0 an\n"
 
 #: fdisk/fdiskbsdlabel.c:172
-#, fuzzy, c-format
+#, c-format
 msgid "Reading disklabel of %s at sector %d.\n"
-msgstr "Datenträgerkennung von %s%d bei Sektor %d wird gelesen.\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:182
 #, c-format
 msgid "There is no *BSD partition on %s.\n"
-msgstr "%s enthält keine *BSD-Partition.\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:196
 msgid "BSD disklabel command (m for help): "
-msgstr "Befehl 'BSD disklabel' (m für Hilfe): "
+msgstr "»BSD disklabel« Kommando (m für Hilfe): "
 
 #: fdisk/fdiskbsdlabel.c:310
 #, c-format
@@ -3256,7 +3404,7 @@ msgstr "Festplatte: %.*s\n"
 #: fdisk/fdiskbsdlabel.c:314
 #, c-format
 msgid "label: %.*s\n"
-msgstr "Kennung: %.*s\n"
+msgstr ""
 
 # I currently don't know a better translation
 #: fdisk/fdiskbsdlabel.c:315
@@ -3265,15 +3413,15 @@ msgstr "Flags:"
 
 #: fdisk/fdiskbsdlabel.c:317
 msgid " removable"
-msgstr " removable"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:319
 msgid " ecc"
-msgstr " ecc"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:321
 msgid " badsect"
-msgstr " badsect"
+msgstr ""
 
 #. On various machines the fields of *lp are short/int/long
 #. In order to avoid problems, we cast them all to long.
@@ -3305,36 +3453,36 @@ msgstr "Zylinder: %ld\n"
 #: fdisk/fdiskbsdlabel.c:330
 #, c-format
 msgid "rpm: %d\n"
-msgstr "Drehzahl: %d\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:331
 #, c-format
 msgid "interleave: %d\n"
-msgstr "Interleave-Faktor: %d\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:332
 #, c-format
 msgid "trackskew: %d\n"
-msgstr "Trackskew: %d\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:333
 #, c-format
 msgid "cylinderskew: %d\n"
-msgstr "Cylinderskew: %d\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:334
 #, c-format
 msgid "headswitch: %ld\t\t# milliseconds\n"
-msgstr "Kopfwechsel: %ld\t\t ms\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:336
 #, c-format
 msgid "track-to-track seek: %ld\t# milliseconds\n"
-msgstr "Spurensuchzeit: %ld\t ms\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:338
 msgid "drivedata: "
-msgstr "Laufwerksdaten: "
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:347
 #, c-format
@@ -3346,23 +3494,22 @@ msgstr ""
 "%d Partitionen:\n"
 
 #: fdisk/fdiskbsdlabel.c:348
-#, fuzzy
 msgid "#       start       end      size     fstype   [fsize bsize   cpg]\n"
-msgstr "#        Größe  Offset    Dateisys [fsize bsize   cpg]\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:397 fdisk/fdiskbsdlabel.c:400
 #, c-format
 msgid "Writing disklabel to %s.\n"
-msgstr "Datenträgerkennung wird auf %s geschrieben.\n"
+msgstr "Schreibe »disklabel« auf %s.\n"
 
 #: fdisk/fdiskbsdlabel.c:412 fdisk/fdiskbsdlabel.c:414
 #, c-format
 msgid "%s contains no disklabel.\n"
-msgstr "%s enthält keine Datenträgerkennung.\n"
+msgstr "%s enthält keinen »disklabel«.\n"
 
 #: fdisk/fdiskbsdlabel.c:419
 msgid "Do you want to create a disklabel? (y/n) "
-msgstr "Möchten Sie eine Datenträgerkennung anlegen (j/n)? "
+msgstr "Wollen Sie einen »disklabel« anlegen (y/n)? "
 
 #: fdisk/fdiskbsdlabel.c:458
 msgid "bytes/sector"
@@ -3382,67 +3529,65 @@ msgstr "Sektoren/Zylinder"
 
 #: fdisk/fdiskbsdlabel.c:472
 msgid "Must be <= sectors/track * tracks/cylinder (default).\n"
-msgstr "Muss <= Sektoren/Spur * Spuren/Zylinder sein (Standard).\n"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:474
 msgid "rpm"
-msgstr "U/min"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:475
 msgid "interleave"
-msgstr "Interleave-Faktor"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:476
 msgid "trackskew"
-msgstr "Trackskew"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:477
 msgid "cylinderskew"
-msgstr "Cylinderskew"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:478
 msgid "headswitch"
-msgstr "Kopfwechsel"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:479
 msgid "track-to-track seek"
-msgstr "Spurensuchzeit"
+msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:520
 #, c-format
 msgid "Bootstrap: %sboot -> boot%s (%s): "
-msgstr "Bootinformationen: %sboot -> boot%s (%s): "
+msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:546
+#: fdisk/fdiskbsdlabel.c:545
 msgid "Bootstrap overlaps with disk label!\n"
-msgstr "Bootinformationen überlappen sich mit Datenträgerkennung!\n"
+msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
+#: fdisk/fdiskbsdlabel.c:566 fdisk/fdiskbsdlabel.c:568
 #, c-format
 msgid "Bootstrap installed on %s.\n"
-msgstr "Bootinformationen installiert auf %s.\n"
+msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:591
+#: fdisk/fdiskbsdlabel.c:590
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Partition (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:622
+#: fdisk/fdiskbsdlabel.c:621
 msgid "This partition already exists.\n"
 msgstr "Diese Partition existiert bereits.\n"
 
-#: fdisk/fdiskbsdlabel.c:742
+#: fdisk/fdiskbsdlabel.c:741
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
-msgstr "Warnung: zu viele Partitionen (%d, Höchstzahl ist %d).\n"
+msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:789
+#: fdisk/fdiskbsdlabel.c:788
 msgid ""
 "\n"
 "Syncing disks.\n"
 msgstr ""
-"\n"
-"Festplatten werden synchronisiert.\n"
 
 #: fdisk/fdisksgilabel.c:79
 msgid "SGI volhdr"
@@ -3489,40 +3634,46 @@ msgid "SGI xfs"
 msgstr "SGI xfs"
 
 #: fdisk/fdisksgilabel.c:90
-msgid "SGI xlvol"
-msgstr "SGI xlvol"
+msgid "SGI xfslog"
+msgstr "SGI xfslog"
 
 #: fdisk/fdisksgilabel.c:91
-msgid "SGI rxlvol"
-msgstr "SGI rxlvol"
+msgid "SGI xlv"
+msgstr "SGI xlv"
+
+#: fdisk/fdisksgilabel.c:92
+msgid "SGI xvm"
+msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
-msgstr "Linux (Auslagerung)"
+msgstr "Linux Swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
-msgstr "Linux (systemeigen)"
+msgstr "Linux native"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
-#, fuzzy
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
+msgstr "Linux LVM"
+
+#: fdisk/fdisksgilabel.c:96
+#, fuzzy
+msgid "Linux RAID"
 msgstr "Linux"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:160
 msgid ""
 "According to MIPS Computer Systems, Inc the Label must not contain more than "
 "512 bytes\n"
 msgstr ""
-"Gemäß MIPS Computer Systems, Inc. darf die Datenträgerkennung maximal 512 "
-"Byte umfassen.\n"
 
-#: fdisk/fdisksgilabel.c:177
+#: fdisk/fdisksgilabel.c:179
 msgid "Detected sgi disklabel with wrong checksum.\n"
-msgstr "sgi-Datenträgerkennung mit fehlerhafter Prüfsumme vorhanden.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:200
+#: fdisk/fdisksgilabel.c:202
 #, c-format
 msgid ""
 "\n"
@@ -3533,15 +3684,8 @@ msgid ""
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
-"\n"
-"Festplatte %s (SGI-Datenträgerkennung): %d Köpfe, %d Sektoren\n"
-"%d Zylinder, %d physische Zylinder\n"
-"%d extra Sektoren/Zylinder, Interleave-Faktor %d:1\n"
-"%s\n"
-"Einheiten = %s mit %d * 512 Bytes\n"
-"\n"
 
-#: fdisk/fdisksgilabel.c:213
+#: fdisk/fdisksgilabel.c:215
 #, c-format
 msgid ""
 "\n"
@@ -3550,171 +3694,141 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Festplatte %s (SGI-Datenträgerkennung): %d Köpfe, %d Sektoren, %d Zylinder\n"
+"Festplatte %s (»SGI disklabel«): %d Köpfe, %d Sektoren, %d Zylinder\n"
 "Einheiten: %s mit %d * 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:219
+#: fdisk/fdisksgilabel.c:221
 #, c-format
 msgid ""
 "----- partitions -----\n"
 "%*s  Info      Start       End   Sectors  Id  System\n"
 msgstr ""
-"----- Partitionen -----\n"
-"%*s  Info      Start       Ende  Sektoren ID  System\n"
 
-#: fdisk/fdisksgilabel.c:241
+#: fdisk/fdisksgilabel.c:243
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
 "Bootfile: %s\n"
 "----- directory entries -----\n"
 msgstr ""
-"----- Bootinfo -----\n"
-"Boot-Datei: %s\n"
-"---- Verzeichniseinträge ----\n"
 
-#: fdisk/fdisksgilabel.c:251
+#: fdisk/fdisksgilabel.c:253
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
-msgstr "%2d: %-10s Sektor%5u Größe%8u\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:307
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
 "\tThe bootfile must be an absolute non-zero pathname,\n"
 "\te.g. \"/unix\" or \"/unix.save\".\n"
 msgstr ""
-"\n"
-"Ungültige Boot-Datei!\n"
-"\tDie Boot-Datei muss in Form einer absoluten,\n"
-"\tnicht-leeren Pfadbezeichnung angegeben werden,\n"
-"\tz. B. '/unix' oder '/unix.save'.\n"
 
-#: fdisk/fdisksgilabel.c:312
+#: fdisk/fdisksgilabel.c:314
 msgid ""
 "\n"
 "\tName of Bootfile too long:  16 bytes maximum.\n"
 msgstr ""
-"\n"
-"\tDer Name der Boot-Datei ist zu lang (max. 16 Byte zulässig).\n"
 
-#: fdisk/fdisksgilabel.c:317
+#: fdisk/fdisksgilabel.c:319
 msgid ""
 "\n"
 "\tBootfile must have a fully qualified pathname.\n"
 msgstr ""
-"\n"
-"\tDie Boot-Datei muss als vollqualifizierter Pfadname angegeben werden.\n"
 
-#: fdisk/fdisksgilabel.c:322
+#: fdisk/fdisksgilabel.c:324
 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"
-"\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:350
+#: fdisk/fdisksgilabel.c:352
 #, c-format
 msgid ""
 "\n"
 "\tBootfile is changed to \"%s\".\n"
 msgstr ""
-"\n"
-"\tDie Boot-Datei ist jetzt '%s'.\n"
 
-#: fdisk/fdisksgilabel.c:448
+#: fdisk/fdisksgilabel.c:450
 msgid "More than one entire disk entry present.\n"
-msgstr "Es sind mehrere vollständige Festplatteneinträge vorhanden.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:456 fdisk/fdisksunlabel.c:478
+#: fdisk/fdisksgilabel.c:458 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
-msgstr "Es wurden keine Partitionen definiert.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:463
+#: fdisk/fdisksgilabel.c:465
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
-msgstr "IRIX bevorzugt, dass Partition 11 die gesamte Festplatte umfasst.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:465
+#: fdisk/fdisksgilabel.c:467
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
 "not at diskblock %d.\n"
 msgstr ""
-"Die gesamte Festplattenpartition muss bei Block 0,\n"
-"nicht bei Festplattenblock %d beginnen.\n"
 
-#: fdisk/fdisksgilabel.c:469
+#: fdisk/fdisksgilabel.c:471
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
 "but the disk is %d diskblocks long.\n"
 msgstr ""
-"Die gesamte Festplattenpartition umfasst nur %d Blöcke,\n"
-"doch die Festplatte ist %d Blöcke lang.\n"
 
-#: fdisk/fdisksgilabel.c:476
+#: fdisk/fdisksgilabel.c:478
 msgid "One Partition (#11) should cover the entire disk.\n"
-msgstr "Eine Partition (11) muss die gesamte Festplatte umfassen.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:488
+#: fdisk/fdisksgilabel.c:490
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
-msgstr "Partition %d beginnt nicht an einer Zylindergrenze.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:495
+#: fdisk/fdisksgilabel.c:497
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
-msgstr "Partition %d endet nicht an einer Zylindergrenze.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:503
+#: fdisk/fdisksgilabel.c:505
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
-msgstr "Die Partitionen %d und %d überlappen einander (%d Sektoren).\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:512 fdisk/fdisksgilabel.c:532
+#: fdisk/fdisksgilabel.c:514 fdisk/fdisksgilabel.c:534
 #, c-format
 msgid "Unused gap of %8d sectors - sectors %8d-%d\n"
-msgstr "Unbenutzter Bereich mit einer Größe von %8d Sektoren - Sektor %8d-%d\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:545
+#: fdisk/fdisksgilabel.c:547
 msgid ""
 "\n"
 "The boot partition does not exist.\n"
 msgstr ""
-"\n"
-"Keine Boot-Partition vorhanden.\n"
 
-#: fdisk/fdisksgilabel.c:549
+#: fdisk/fdisksgilabel.c:551
 msgid ""
 "\n"
 "The swap partition does not exist.\n"
 msgstr ""
-"\n"
-"Keine Auslagerungspartition vorhanden.\n"
 
-#: fdisk/fdisksgilabel.c:554
+#: fdisk/fdisksgilabel.c:556
 msgid ""
 "\n"
 "The swap partition has no swap type.\n"
 msgstr ""
-"\n"
-"Die Auslagerungspartition hat keinen Auslagerungstyp.\n"
 
-#: fdisk/fdisksgilabel.c:558
+#: fdisk/fdisksgilabel.c:560
 msgid "\tYou have chosen an unusual boot file name.\n"
-msgstr "\tSie haben einen ungewöhnlichen Namen für die Boot-Datei gewählt.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:569
+#: fdisk/fdisksgilabel.c:571
 msgid "Sorry You may change the Tag of non-empty partitions.\n"
 msgstr ""
-"Die Markierung kann nur geändert werden, wenn die Partition nicht leer ist.\n"
 
-#: fdisk/fdisksgilabel.c:576
+#: fdisk/fdisksgilabel.c:578
 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"
@@ -3722,76 +3836,56 @@ msgid ""
 "Only the \"SGI volume\" entire disk section may violate this.\n"
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
-"Es wird empfohlen, für die Partition bei Offset 0 den\n"
-"Typ 'SGI volhdr' zu wählen, da das IRIX-System sie benötigt, um\n"
-"eigenständige Programme wie sash und fx aus seinem Verzeichnis\n"
-"abzurufen. Diese Bedingung wird nur dann verletzt, wenn 'SGI volume'\n"
-"auf den gesamten Datenträger angewandt wird. Geben Sie JA ein, wenn\n"
-"Sie sicher sind, dass Sie diese Partition anders markieren möchten.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:607
+#: fdisk/fdisksgilabel.c:609
 msgid "Do You know, You got a partition overlap on the disk?\n"
-msgstr "Partitionen auf der Festplatte überlappen einander.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:669
+#: fdisk/fdisksgilabel.c:671
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr ""
-"Es wird versucht, den gesamten Festplatteneintrag automatisch zu "
-"generieren.\n"
 
-#: fdisk/fdisksgilabel.c:676
+#: fdisk/fdisksgilabel.c:678
 msgid "The entire disk is already covered with partitions.\n"
-msgstr "Die gesamte Festplatte ist bereits partitioniert.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:681
+#: fdisk/fdisksgilabel.c:683
 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:690 fdisk/fdisksgilabel.c:719
+#: fdisk/fdisksgilabel.c:692 fdisk/fdisksgilabel.c:721
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
 msgstr ""
-"Es wird unbedingt empfohlen, die 11. Partition so zu\n"
-"konfigurieren, dass sie die gesamte Festplatte umfasst\n"
-"und den Typ 'SGI volume' aufweist.\n"
 
-#: fdisk/fdisksgilabel.c:706
+#: fdisk/fdisksgilabel.c:708
 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:711
+#: fdisk/fdisksgilabel.c:713
 #, c-format
 msgid " Last %s"
-msgstr "Letzter %s"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:733
-#, fuzzy
+#: fdisk/fdisksgilabel.c:735
 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 ""
-"Neue SGI-Datenträgerkennung wird erstellt. Die Änderungen befinden\n"
-"sich nur im Speicher, bis Sie sie auf die Festplatte schreiben. Danach\n"
-"ist der vorherige Inhalt unwiderruflich verloren.\n"
-"\n"
 
-#: fdisk/fdisksgilabel.c:761
+#: fdisk/fdisksgilabel.c:763
 #, c-format
 msgid "Trying to keep parameters of partition %d.\n"
-msgstr "Es wird versucht, die Parameter der Partition %d beizubehalten.\n"
+msgstr ""
 
-#: fdisk/fdisksgilabel.c:763
+#: fdisk/fdisksgilabel.c:765
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
-msgstr "ID=%02x\tSTART=%d\tLÄNGE=%d\n"
+msgstr ""
 
 #: fdisk/fdisksunlabel.c:43 fdisk/i386_sys_types.c:6
 msgid "Empty"
@@ -3811,7 +3905,7 @@ msgstr "SunOS usr"
 
 #: fdisk/fdisksunlabel.c:48
 msgid "Whole disk"
-msgstr "Ganze Festplatte"
+msgstr ""
 
 #: fdisk/fdisksunlabel.c:49
 msgid "SunOS stand"
@@ -3832,15 +3926,11 @@ msgid ""
 "e.g. heads, sectors, cylinders and partitions\n"
 "or force a fresh label (s command in main menu)\n"
 msgstr ""
-"Es wurde eine Sun-Datenträgerkennung mit einer in-\n"
-"korrekten Prüfsumme erkannt. Sie müssen alle Werte\n"
-"(Köpfe, Sektoren, Zylinder, Partitionen usw.) angeben\n"
-"oder eine neue Kennung forcieren (Befehl s im Hauptmenü).\n"
 
 #: fdisk/fdisksunlabel.c:228
 #, c-format
 msgid "Autoconfigure found a %s%s%s\n"
-msgstr "Die automatische Konfiguration fand ein %s%s%s\n"
+msgstr ""
 
 #: fdisk/fdisksunlabel.c:255
 msgid ""
@@ -3849,10 +3939,6 @@ msgid ""
 "content won't be recoverable.\n"
 "\n"
 msgstr ""
-"Neue Sun-Datenträgerkennung wird erstellt. Die Änderungen befinden\n"
-"sich nur im Speicher, bis Sie sie auf die Festplatte schreiben. Danach\n"
-"ist der vorherige Inhalt unwiderruflich verloren.\n"
-"\n"
 
 #: fdisk/fdisksunlabel.c:266
 msgid ""
@@ -3860,18 +3946,14 @@ msgid ""
 "   ?   auto configure\n"
 "   0   custom (with hardware detected defaults)"
 msgstr ""
-"Laufwerktyp\n"
-"   ?   automatisch konfigurieren\n"
-"   0   benutzerspezifisch (mit den Standardwerten der Hardware-Erkennung)"
 
 #: 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:288
 msgid "Autoconfigure failed.\n"
-msgstr "Automatische Konfiguration nicht erfolgreich.\n"
+msgstr ""
 
 #: fdisk/fdisksunlabel.c:316
 msgid "Sectors/track"
@@ -3879,86 +3961,78 @@ msgstr "Sektoren/Spur"
 
 #: fdisk/fdisksunlabel.c:323
 msgid "Alternate cylinders"
-msgstr "Alternative Zylinder"
+msgstr ""
 
 #: fdisk/fdisksunlabel.c:326
 msgid "Physical cylinders"
-msgstr "Physische Zylinder"
+msgstr ""
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:707
 msgid "Rotation speed (rpm)"
-msgstr "Drehzahl (U/min)"
+msgstr ""
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:700
 msgid "Interleave factor"
-msgstr "Interleave-Faktor"
+msgstr ""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:693
 msgid "Extra sectors per cylinder"
-msgstr "Zusätzliche Sektoren pro Zylinder"
+msgstr ""
 
 #: 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."
+msgstr ""
 
-#: fdisk/fdisksunlabel.c:354
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
-msgstr "3,5-Zoll-Diskette"
+msgstr ""
 
-#: fdisk/fdisksunlabel.c:354
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
-msgstr "Linux benutzerspezifisch"
+msgstr "Linux custom"
 
-#: fdisk/fdisksunlabel.c:441
+#: fdisk/fdisksunlabel.c:442
 #, c-format
 msgid "Partition %d doesn't end on cylinder boundary\n"
 msgstr "Partition %d endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/fdisksunlabel.c:461
+#: fdisk/fdisksunlabel.c:462
 #, 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"
+msgstr ""
 
-#: fdisk/fdisksunlabel.c:483
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Unbenutzter Bereich - Sektor 0-%d\n"
 
-#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Unbenutzter Bereich - Sektor %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:512
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 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:570
+#: fdisk/fdisksunlabel.c:573
 #, 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 ""
-"Die 3. Partition umfasst nicht die gesamte Festplatte, doch der Wert\n"
-"%d %s greift auf eine andere Partition über. Ihre Eingabe wurde in\n"
-"%d %s geändert.\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:593
 #, 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 ""
-"Um Kompatibilität mit SunOS/Solaris zu wahren, behalten Sie für diese\n"
-"Partition die Einstellung 'Ganze Festplatte' (5) mit dem Anfangswert\n"
-"0 und %u Sektoren bei.\n"
 
-#: fdisk/fdisksunlabel.c:603
+#: fdisk/fdisksunlabel.c:606
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3966,14 +4040,8 @@ msgid ""
 "Type YES if you're very sure you would like that partition\n"
 "tagged with 82 (Linux swap): "
 msgstr ""
-"Es wird unbedingt empfohlen, die Partition bei Offset 0 als\n"
-"UFS- oder EXT2FS-Dateisystem bzw. als SunOS-Auslagerungsbereich\n"
-"zu konfigurieren. Ein Linux-Auslagerungsbereich an dieser Stelle\n"
-"kann die Partitionstabelle und den Bootblock zerstören.\n"
-"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:634
+#: fdisk/fdisksunlabel.c:637
 #, c-format
 msgid ""
 "\n"
@@ -3984,16 +4052,9 @@ msgid ""
 "Units = %s of %d * 512 bytes\n"
 "\n"
 msgstr ""
-"\n"
-"Festplatte %s (Sun-Datenträgerkennung): %d Köpfe, %d Sektoren, %d U/min\n"
-"%d Zylinder, %d alternative Zylinder, %d physische Zylinder\n"
-"%d extra Sektoren/Zylinder, Interleave-Faktor %d:1\n"
-"%s\n"
-"Einheiten = %s mit %d * 512 Byte\n"
-"\n"
 
-#: fdisk/fdisksunlabel.c:648
-#, c-format
+#: fdisk/fdisksunlabel.c:651
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Disk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
@@ -4001,22 +4062,22 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Festplatte %s (Sun-Datenträgerkennung): %d Köpfe, %d Sektoren, %d Zylinder\n"
+"Festplatte %s (»Sun disklabel«): %d Köpfe, %d Sektoren, %d Zylinder\n"
 "Einheiten: %s mit %d * 512 Bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:656
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
-msgstr "%*s Flag    Start       Ende   Blöcke   ID  System\n"
+msgstr ""
 
-#: fdisk/fdisksunlabel.c:678
+#: fdisk/fdisksunlabel.c:681
 msgid "Number of alternate cylinders"
-msgstr "Anzahl alternativer Zylinder"
+msgstr ""
 
-#: fdisk/fdisksunlabel.c:711
+#: fdisk/fdisksunlabel.c:714
 msgid "Number of physical cylinders"
-msgstr "Anzahl physischer Zylinder"
+msgstr ""
 
 #: fdisk/i386_sys_types.c:7
 msgid "FAT12"
@@ -4108,7 +4169,7 @@ msgstr "Verst. HPFS/NTFS"
 
 #: fdisk/i386_sys_types.c:27
 msgid "AST Windows swapfile"
-msgstr "AST Windows-Auslagerungsdatei"
+msgstr "AST Windows swapfile"
 
 #: fdisk/i386_sys_types.c:28
 msgid "Hidden Win95 FAT32"
@@ -4128,11 +4189,11 @@ msgstr "NEC DOS"
 
 #: fdisk/i386_sys_types.c:32
 msgid "Plan 9"
-msgstr ""
+msgstr "Plan 9"
 
 #: fdisk/i386_sys_types.c:33
 msgid "PartitionMagic recovery"
-msgstr "PartitionMagic-Wiederherstellung"
+msgstr "PartitionMagic recovery"
 
 #: fdisk/i386_sys_types.c:34
 msgid "Venix 80286"
@@ -4152,11 +4213,11 @@ msgstr "QNX4.x"
 
 #: fdisk/i386_sys_types.c:38
 msgid "QNX4.x 2nd part"
-msgstr "QNX4.x Teil 2"
+msgstr "QNX4.x 2nd part"
 
 #: fdisk/i386_sys_types.c:39
 msgid "QNX4.x 3rd part"
-msgstr "QNX4.x Teil 3"
+msgstr "QNX4.x 3rd part"
 
 #: fdisk/i386_sys_types.c:40
 msgid "OnTrack DM"
@@ -4193,8 +4254,8 @@ 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
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:83
+#: fdisk/i386_sys_types.c:88 fdisk/i386_sys_types.c:89
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
@@ -4221,16 +4282,16 @@ msgstr "PC/IX"
 
 #: fdisk/i386_sys_types.c:54
 msgid "Old Minix"
-msgstr "Altes Minix"
+msgstr "Old Minix"
 
 #. Minix 1.4a and earlier
 #: fdisk/i386_sys_types.c:55
 msgid "Minix / old Linux"
-msgstr "Minix / altes Linux"
+msgstr "Minix / old Linux"
 
 #: fdisk/i386_sys_types.c:58
 msgid "OS/2 hidden C: drive"
-msgstr "OS/2 verst. Laufwerk C:"
+msgstr "OS/2 verst. C:-Lw."
 
 #: fdisk/i386_sys_types.c:59
 msgid "Linux extended"
@@ -4238,7 +4299,7 @@ msgstr "Linux erweitert"
 
 #: fdisk/i386_sys_types.c:60 fdisk/i386_sys_types.c:61
 msgid "NTFS volume set"
-msgstr "NTFS-Datenträgersatz"
+msgstr "NTFS volume set"
 
 #: fdisk/i386_sys_types.c:63
 msgid "Amoeba"
@@ -4250,14 +4311,13 @@ msgstr "Amoeba BBT"
 
 #. (bad block table)
 #: fdisk/i386_sys_types.c:65
-#, fuzzy
 msgid "BSD/OS"
-msgstr "BSD/386"
+msgstr "BSD/OS"
 
 #. BSDI
 #: fdisk/i386_sys_types.c:66
 msgid "IBM Thinkpad hibernation"
-msgstr "IBM Thinkpad-Schlafmodus"
+msgstr "IBM Thinkpad hibernation"
 
 #: fdisk/i386_sys_types.c:67
 msgid "BSD/386"
@@ -4273,11 +4333,11 @@ msgstr "NeXTSTEP"
 
 #: fdisk/i386_sys_types.c:70
 msgid "BSDI fs"
-msgstr "BSDI-Dateisystem"
+msgstr "BSDI fs"
 
 #: fdisk/i386_sys_types.c:71
 msgid "BSDI swap"
-msgstr "BSDI-Auslagerung"
+msgstr "BSDI swap"
 
 #: fdisk/i386_sys_types.c:72
 msgid "DRDOS/sec (FAT-12)"
@@ -4306,166 +4366,175 @@ msgstr "CP/M / CTOS / ..."
 #. CP/M or Concurrent CP/M or
 #. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:79
+msgid "Dell Utility"
+msgstr ""
+
+#. Dell PowerEdge Server utilities
+#: fdisk/i386_sys_types.c:80
 msgid "DOS access"
-msgstr "DOS-Zugriff"
+msgstr "DOS access"
 
 #. DOS access or SpeedStor 12-bit FAT
 #. extended partition
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:82
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
 #. SpeedStor 16-bit FAT extended
 #. partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:85
 msgid "BeOS fs"
-msgstr "BeOS-Dateisystem"
+msgstr "BeOS fs"
 
-#. SpeedStor large partition
+#: fdisk/i386_sys_types.c:86
+msgid "EFI GPT"
+msgstr ""
+
+#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:87
+msgid "EFI (FAT-12/16/32)"
+msgstr ""
+
+#. SpeedStor large partition
+#: fdisk/i386_sys_types.c:90
 msgid "DOS secondary"
-msgstr "DOS sekundär"
+msgstr "DOS secondary"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:88
+#: fdisk/i386_sys_types.c:91
 msgid "Linux raid autodetect"
-msgstr "Linux-RAID, autom. Erkennung"
+msgstr "Linux raid autodetect"
 
 #. New (2.2.x) raid partition with
 #. autodetect using persistent
 #. superblock
-#: fdisk/i386_sys_types.c:91
+#: fdisk/i386_sys_types.c:94
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:92
+#: fdisk/i386_sys_types.c:95
 msgid "BBT"
 msgstr "BBT"
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:203
 msgid "out of memory - giving up\n"
-msgstr "Kein Speicher mehr frei - Vorgang wird abgebrochen.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:208 fdisk/sfdisk.c:291
-#, c-format
+#, fuzzy, 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"
+msgstr ""
+"Fehler beim Lesen von %s - der Sektor %lu konnte nicht gelesen werden\n"
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:241
-#, c-format
+#, fuzzy, 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"
+"Fehler beim Schreiben auf %s - der Sektor %lu konnte nicht geschrieben "
+"werden\n"
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:297
-#, c-format
+#, fuzzy, c-format
 msgid "write error on %s\n"
 msgstr "Fehler beim Schreiben auf %s\n"
 
 #: fdisk/sfdisk.c:315
 #, c-format
 msgid "cannot stat partition restore file (%s)\n"
-msgstr "'stat' zur Partitionswiederherstellungsdatei (%s) nicht möglich.\n"
+msgstr ""
 
 #: 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:324
+#, fuzzy
 msgid "out of memory?\n"
-msgstr "Kein Speicher mehr frei?\n"
+msgstr "Speicher ist alle\n"
 
 #: fdisk/sfdisk.c:330
 #, c-format
 msgid "cannot open partition restore file (%s)\n"
-msgstr "Partitionswiederherstellungsdatei (%s) kann nicht geöffnet werden.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:336
-#, c-format
+#, fuzzy, c-format
 msgid "error reading %s\n"
 msgstr "Fehler beim Lesen von %s\n"
 
 #: fdisk/sfdisk.c:343
-#, c-format
+#, fuzzy, c-format
 msgid "cannot open device %s for writing\n"
-msgstr "Gerät %s konnte nicht zum Schreiben geöffnet werden.\n"
+msgstr "Konnte das Gerät %s nicht zum Schreiben öffnen\n"
 
 #: fdisk/sfdisk.c:355
-#, c-format
+#, fuzzy, c-format
 msgid "error writing sector %lu on %s\n"
-msgstr "Fehler beim Schreiben von Sektor %lu auf %s\n"
+msgstr "Fehler beim Schreiben des Sektors %lu auf %s\n"
 
 #: fdisk/sfdisk.c:406
-#, fuzzy, c-format
+#, c-format
 msgid "Disk %s: cannot get size\n"
-msgstr "Festplatte %s: Geometrie ist nicht verfügbar.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:411
 #, c-format
 msgid "Disk %s: cannot get geometry\n"
-msgstr "Festplatte %s: Geometrie ist nicht verfügbar.\n"
+msgstr "Festplatte %s: Die Geometrie konnte nicht festgestellt werden\n"
 
 #: fdisk/sfdisk.c:435
 #, c-format
 msgid ""
-"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"
 msgstr ""
-"Warnung: Start=%d - dies ist eine Partition, keine ganze\n"
-"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: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"
+msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
+msgstr ""
 
 #: 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"
+msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
+msgstr ""
 
 #: 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"
+#, c-format
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
-"Warning: unlikely number of sectors (%d) - usually at most 63\n"
+"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Warnung: Unwahrscheinliche Anzahl Sektoren (%d) - normalerweise sind\n"
-"maximal 63 vorhanden. Dies führt zu Problemen bei allen Softwareprogrammen,\n"
-"die Z/K/S-Adressierung verwenden.\n"
 
 #: fdisk/sfdisk.c:457
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
@@ -4477,37 +4546,33 @@ msgstr ""
 #: fdisk/sfdisk.c:539
 #, c-format
 msgid ""
-"%s of partition %s has impossible value for head: %d (should be in 0-%d)\n"
+"%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 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:544
 #, c-format
 msgid ""
-"%s of partition %s has impossible value for sector: %d (should be in 1-%d)\n"
+"%s of partition %s has impossible value for sector: %lu (should be in "
+"1-%lu)\n"
 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:549
 #, c-format
 msgid ""
-"%s of partition %s has impossible value for cylinders: %d (should be in "
-"0-%d)\n"
+"%s of partition %s has impossible value for cylinders: %lu (should be in "
+"0-%lu)\n"
 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:588
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
-"ID  Name\n"
+"Id  Name\n"
 "\n"
 
 #: fdisk/sfdisk.c:741
+#, fuzzy
 msgid "Re-reading the partition table ...\n"
 msgstr "Die Partitionstabelle wird erneut gelesen ...\n"
 
@@ -4516,32 +4581,30 @@ msgid ""
 "The command to re-read the partition table failed\n"
 "Reboot your system now, before using mkfs\n"
 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:752
-#, c-format
+#, fuzzy, c-format
 msgid "Error closing %s\n"
 msgstr "Fehler beim Schließen von %s\n"
 
 #: fdisk/sfdisk.c:790
 #, c-format
 msgid "%s: no such partition\n"
-msgstr "%s: Diese Partition ist nicht vorhanden.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:813
 msgid "unrecognized format - using sectors\n"
-msgstr "Unbekanntes Format - es werden Sektoren verwendet.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:852
-#, c-format
+#, fuzzy, c-format
 msgid "# partition table of %s\n"
 msgstr "# Partitionstabelle von %s\n"
 
 #: fdisk/sfdisk.c:863
 #, c-format
 msgid "unimplemented format - using %s\n"
-msgstr "Nicht verwendbares Format - es wird %s verwendet.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:867
 #, c-format
@@ -4549,12 +4612,10 @@ msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Einheiten = Zylinder mit %lu Bytes, Blöcke mit 1024 Bytes, Zählung ab %d\n"
-"\n"
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:875
 #, c-format
@@ -4562,12 +4623,10 @@ msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Einheiten = Sektoren mit 512 Bytes, Zählung ab %d\n"
-"\n"
 
 #: fdisk/sfdisk.c:877
 msgid "   Device Boot    Start       End  #sectors  Id  System\n"
-msgstr "   Gerät  Boot    Start       Ende Sektoren  ID  System\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:880
 #, c-format
@@ -4575,12 +4634,10 @@ msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Einheiten = Blöcke mit 1024 Bytes, Zählung von %d\n"
-"\n"
 
 #: fdisk/sfdisk.c:882
 msgid "   Device Boot   Start       End   #blocks   Id  System\n"
-msgstr "   Gerät  Boot   Start       Ende  Blöcke    ID  System\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:885
 #, c-format
@@ -4588,31 +4645,30 @@ msgid ""
 "Units = megabytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
-"Einheiten = Megabyte mit 1048576 Bytes, Blöcke mit 1024 Byte, Zählung ab %d\n"
-"\n"
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:1040
+#, fuzzy
 msgid "No partitions found\n"
-msgstr "Keine Partitionen gefunden.\n"
+msgstr "Keine Partitionen gefunden\n"
 
 #: fdisk/sfdisk.c:1047
 #, c-format
@@ -4621,157 +4677,154 @@ msgid ""
 "  for C/H/S=*/%ld/%ld (instead of %ld/%ld/%ld).\n"
 "For this listing I'll assume that geometry.\n"
 msgstr ""
-"Warnung: Die erste Partition wurde für\n"
-"Z/K/S=*/%ld/%ld (statt %ld/%ld/%ld) erstellt.\n"
-"Diese Auflistung basiert auf dieser Geometrie.\n"
 
 #: fdisk/sfdisk.c:1097
 msgid "no partition table present.\n"
-msgstr "Keine Partitionstabelle vorhanden.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1099
 #, c-format
 msgid "strange, only %d partitions defined.\n"
-msgstr "Es sind nur %d Partitionen definiert.\n"
+msgstr ""
 
 #: 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: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"
+msgstr ""
 
 #: 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"
 
+# XXX - Merge with next strings.
 #: fdisk/sfdisk.c:1125
 #, c-format
 msgid "Warning: partition %s "
-msgstr "Warnung: Partition %s "
+msgstr ""
 
 #: fdisk/sfdisk.c:1126
 #, c-format
 msgid "is not contained in partition %s\n"
-msgstr "befindet sich nicht in Partition %s\n"
+msgstr ""
 
+# XXX - Merge with next strings.
 #: fdisk/sfdisk.c:1137
 #, c-format
 msgid "Warning: partitions %s "
-msgstr "Warnung: Partitionen %s "
+msgstr ""
 
 #: fdisk/sfdisk.c:1138
 #, c-format
 msgid "and %s overlap\n"
-msgstr "und %s überlappen einander.\n"
+msgstr ""
 
+# XXX - Merge with next strings.
 #: fdisk/sfdisk.c:1149
 #, c-format
 msgid "Warning: partition %s contains part of "
-msgstr "Warnung: Partition %s enthält einen Teil der"
+msgstr ""
 
 #: fdisk/sfdisk.c:1150
 #, c-format
 msgid "the partition table (sector %lu),\n"
-msgstr "Partitionstabelle (Sektor %lu) und löscht die\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1151
 msgid "and will destroy it when filled\n"
-msgstr "Tabelle, wenn Daten in die Partition geschrieben werden.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1160
-#, c-format
+#, fuzzy, c-format
 msgid "Warning: partition %s starts at sector 0\n"
-msgstr "Warnung: Partition %s beginnt bei Sektor 0.\n"
+msgstr "Warnung: Partition %d fängt bei Sektor 0 an\n"
 
 #: 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"
 
+# XXX - Merge with next strings.
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:1179
 msgid " (although this is not a problem under Linux)\n"
-msgstr "dies ist unter Linux kein Problem.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1196
-#, c-format
+#, fuzzy, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
-msgstr "Warnung: Partition %s beginnt nicht an einer Zylindergrenze.\n"
+msgstr "Warnung: Partition %s beginnt nicht an einer Zylindergrenze\n"
 
 #: fdisk/sfdisk.c:1202
-#, c-format
+#, fuzzy, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
-msgstr "Warnung: Partition %s endet nicht an einer Zylindergrenze.\n"
+msgstr "Warnung: Partition %s endet nicht an einer Zylindergrenze\n"
 
 #: fdisk/sfdisk.c:1220
+#, fuzzy
 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 ""
-"Warnung: Mehrere primäre Partitionen sind als bootfähig (aktiv) markiert.\n"
-"Dies hat keinen Einfluss auf LILO, aber der DOS-MBR kann diese\n"
-"Festplatte nicht booten.\n"
+"Warnung: Mehr als eine primäre Partition wurde als bootbar (aktiv) "
+"markiert.\n"
+"         Dies spielt bei LILO keine Rolle, aber der DOS MBR wird auf\n"
+"         dieser Festplatte nicht booten.\n"
 
 #: fdisk/sfdisk.c:1227
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 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:1233
+#, fuzzy
 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 ""
-"Warnung: Keine primäre Partition ist als bootfähig (aktiv) markiert.\n"
-"Dies hat keinen Einfluss auf LILO, aber der DOS-MBR kann diese\n"
-"Festplatte nicht booten.\n"
+"Warnung: Keine primäre Partition wurde als bootbar (aktiv) markiert.\n"
+"         Dies spielt bei LILO keine Rolle, aber der DOS MBR wird auf\n"
+"         dieser Festplatte nicht booten.\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: (Z,K,S) erwartet (%ld,%ld,%ld) gefunden (%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: Ende: (Z,K,S) erwartet (%ld,%ld,%ld) gefunden (%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 endet bei Zylinder %ld, hinter dem Ende der Festplatte.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1287
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: shifted start of the extd partition from %ld to %ld\n"
-msgstr "Warnung: Ungültiger Datenanfang in Partition %d\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1289
 msgid "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
+# merge with next message!
 #: 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"
+msgstr "Warnung: erweiterte Partition beginnt nicht an einer Zylindergrenze\n"
 
 #: fdisk/sfdisk.c:1293
 msgid "DOS and Linux will interpret the contents differently.\n"
@@ -4780,126 +4833,127 @@ 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:1324
 msgid "tree of partitions?\n"
-msgstr "Partitionsstruktur?\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1445
 msgid "detected Disk Manager - unable to handle that\n"
-msgstr "Disk Manager wurde erkannt - dieser ist nicht verwendbar.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1452
 msgid "DM6 signature found - giving up\n"
-msgstr "DM6-Signatur gefunden - Vorgang wird beendet.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1472
 msgid "strange..., an extended partition of size 0?\n"
-msgstr "Erweiterte Partition der Größe 0?\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:1524
 #, c-format
 msgid " %s: unrecognized partition\n"
-msgstr " %s: unbekannte Partition\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1536
+#, fuzzy
 msgid "-n flag was given: Nothing changed\n"
-msgstr "Das Flag -n wurde angegeben: keine Änderungen vorgenommen.\n"
+msgstr "Die »-n«-Option wurde verwendet: Es wurde nichts verändert\n"
 
 #: 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:1554
 #, c-format
 msgid "Failed writing the partition on %s\n"
-msgstr "Fehler beim Schreiben der Partition auf %s\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1631
 msgid "long or incomplete input line - quitting\n"
-msgstr "Eingabezeile zu lang oder unvollständig - Vorgang wird abgebrochen.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1667
 #, c-format
 msgid "input error: `=' expected after %s field\n"
-msgstr "Eingabefehler: '=' erwartet nach dem %s-Feld.\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:1680
 #, c-format
 msgid "unrecognized input: %s\n"
-msgstr "Unbekannte Eingabe: %s\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1712
 msgid "number too big\n"
-msgstr "Wert zu groß.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1716
 msgid "trailing junk after number\n"
-msgstr "Unbekannte Zeichen nach dem Wert.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1832
 msgid "no room for partition descriptor\n"
-msgstr "Kein Platz für Partitionsbeschreibung.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1865
 msgid "cannot build surrounding extended partition\n"
-msgstr "Die umgebende erweiterte Partition kann nicht erstellt werden.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1916
 msgid "too many input fields\n"
-msgstr "Zu viele Eingabefelder.\n"
+msgstr ""
 
 #. no free blocks left - don't read any further
 #: fdisk/sfdisk.c:1950
 msgid "No room for more\n"
-msgstr "Kein zusätzlicher freier Bereich vorhanden.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:1969
 msgid "Illegal type\n"
-msgstr "Ungültiger Typ\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2001
-#, fuzzy, c-format
+#, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
-msgstr "Warnung: Die Maximalgröße (%lu) wird überschritten.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2007
 msgid "Warning: empty partition\n"
-msgstr "Warnung: leere Partition.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2021
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
-msgstr "Warnung: Ungültiger Partitionsanfang (kleinstmöglicher Wert: %lu).\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2034
 msgid "unrecognized bootable flag - choose - or *\n"
-msgstr "Unbekanntes 'bootfähig'-Flag: Wählen Sie - oder *\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2051 fdisk/sfdisk.c:2064
 msgid "partial c,h,s specification?\n"
-msgstr "Partielle Z/K/S-Spezifikation?\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2075
 msgid "Extended partition not where expected\n"
-msgstr "Erweiterte Partition nicht am erwarteten Ort.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2107
 msgid "bad input\n"
-msgstr "Ungültige Eingabe\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2129
+#, fuzzy
 msgid "too many partitions\n"
 msgstr "Zu viele Partitionen\n"
 
@@ -4909,221 +4963,198 @@ msgid ""
 "<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 ""
-"Eingabe im folgenden Format (für nicht angegebene Felder wird\n"
-"der Standardwert verwendet):\n"
-"<Start> <Größe> <Typ [E,S,L,X,hex]> <bootfähig [-,*]> <Z,K,S> <Z,K,S>\n"
-"Normalerweise brauchen nur <Start> und <Größe> (und möglicherweise\n"
-"<Typ>) angegeben zu werden.\n"
 
 #: fdisk/sfdisk.c:2182
 msgid "version"
-msgstr "Version"
+msgstr ""
 
 #: fdisk/sfdisk.c:2188
 #, c-format
 msgid "Usage: %s [options] device ...\n"
-msgstr "Verwendung: %s [Optionen] Gerät ...\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:2190
 msgid "useful options:"
-msgstr "Nützliche Optionen:"
+msgstr ""
 
 #: fdisk/sfdisk.c:2191
 msgid "    -s [or --show-size]: list size of a partition"
-msgstr "    -s [oder --show-size]: Partitionsgröße anzeigen"
+msgstr ""
 
 #: fdisk/sfdisk.c:2192
 msgid "    -c [or --id]:        print or change partition Id"
-msgstr "    -c [oder --id]:        Partitions-ID ausgeben oder ändern"
+msgstr ""
 
 #: fdisk/sfdisk.c:2193
 msgid "    -l [or --list]:      list partitions of each device"
-msgstr "    -l [oder --list]:      Partitionen jedes Geräts ausgeben"
+msgstr ""
 
 #: 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: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:2196
 msgid ""
 "    -uS, -uB, -uC, -uM:  accept/report in units of "
 "sectors/blocks/cylinders/MB"
 msgstr ""
-"    -uS, -uB, -uC, -uM:  Werte in den Einheiten Sektoren/Blöcke/Zylinder/MB "
-"ein-/ausgeben"
 
 #: fdisk/sfdisk.c:2197
 msgid "    -T [or --list-types]:list the known partition types"
-msgstr "    -T [oder --list-types]:bekannte Partitionstypen auflisten"
+msgstr ""
 
 #: 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:2199
 msgid "    -R [or --re-read]:   make kernel reread partition table"
-msgstr "    -R [oder --re-read]:   Partitionstabelle erneut lesen"
+msgstr ""
 
 #: fdisk/sfdisk.c:2200
 msgid "    -N# :                change only the partition with number #"
-msgstr "    -N# :                  nur die Partition der Nummer # ändern"
+msgstr ""
 
 #: fdisk/sfdisk.c:2201
 msgid "    -n :                 do not actually write to disk"
-msgstr "    -n :                   nicht auf die Festplatte schreiben"
+msgstr ""
 
 #: 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:2203
 msgid "    -I file :            restore these sectors again"
-msgstr "    -I Datei :           diese Sektoren wiederherstellen"
+msgstr ""
 
 #: fdisk/sfdisk.c:2204
 msgid "    -v [or --version]:   print version"
-msgstr "    -v [oder --version]:   Version ausgeben"
+msgstr ""
 
 #: fdisk/sfdisk.c:2205
 msgid "    -? [or --help]:      print this message"
-msgstr "    -? [oder --help]:      diese Informationen anzeigen"
+msgstr ""
 
 #: fdisk/sfdisk.c:2206
 msgid "dangerous options:"
-msgstr "Gefährliche Optionen:"
+msgstr ""
 
 #: 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:2208
 msgid ""
 "    -x [or --show-extended]: also list extended partitions on output\n"
 "                             or expect descriptors for them on input"
 msgstr ""
-"    -x [oder --show-extended]: in der Ausgabe auch erweiterte Partitionen\n"
-"                               ausgeben oder Beschreibungen für sie in der\n"
-"                               Eingabe erwarten"
 
 #: 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:2211
 msgid "    -q  [or --quiet]:      suppress warning messages"
-msgstr "    -q  [oder --quiet]:      Warnmeldungen unterdrücken"
+msgstr ""
 
 #: 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:2213
 msgid "    -C# [or --cylinders #]:set the number of cylinders to use"
-msgstr "    -C# [oder --cylinders #]:Anzahl der zu verwendenden Zylinder"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:2215
 msgid "    -S# [or --sectors #]:  set the number of sectors to use"
-msgstr "    -S# [oder --sectors #]:  Anzahl der zu verwendenden Sektoren"
+msgstr ""
 
 #: fdisk/sfdisk.c:2216
 msgid "You can disable all consistency checking with:"
-msgstr "Konsistenzprüfungen werden mit der folgenden Option deaktiviert:"
+msgstr ""
 
 #: 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:2223
+#, fuzzy
 msgid "Usage:"
-msgstr "Verwendung:"
+msgstr "Aufruf:"
 
 #: 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"
+msgstr ""
 
 #: 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: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"
+msgstr ""
 
 #: fdisk/sfdisk.c:2346
 msgid "no command?\n"
-msgstr "Kein Befehl?\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2471
 #, c-format
 msgid "total: %d blocks\n"
-msgstr "Gesamt: %d Blöcke\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2508
 msgid "usage: sfdisk --print-id device partition-number\n"
-msgstr "Verwendung: sfdisk --print-id Gerät Partitionsnummer\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2510
 msgid "usage: sfdisk --change-id device partition-number Id\n"
-msgstr "Verwendung: sfdisk --change-id Gerät Partitionsnummer ID\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2512
 msgid "usage: sfdisk --id device partition-number [Id]\n"
-msgstr "Verwendung: sfdisk --id Gerät Partitionsnummer [ID]\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:2544
 #, c-format
 msgid "cannot open %s %s\n"
-msgstr "%s %s kann nicht geöffnet werden.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2544
 msgid "read-write"
-msgstr "lesen-schreiben"
+msgstr ""
 
 #: fdisk/sfdisk.c:2544
 msgid "for reading"
-msgstr "zum Lesen"
+msgstr ""
 
 #: fdisk/sfdisk.c:2569
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
+# And again one for show_geometry()...
 #: fdisk/sfdisk.c:2586
 #, fuzzy, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
@@ -5132,19 +5163,20 @@ msgstr "%s: %d Zylinder, %d Köpfe, %d Sektoren/Spur\n"
 #: fdisk/sfdisk.c:2603
 #, c-format
 msgid "BLKGETSIZE ioctl failed for %s\n"
-msgstr "BLKGETSIZE ioctl nicht erfolgreich für %s\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:2697 fdisk/sfdisk.c:2750 fdisk/sfdisk.c:2781
+#, fuzzy
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
-"Beendet\n"
+"Fertig\n"
 "\n"
 
 #: fdisk/sfdisk.c:2706
@@ -5153,117 +5185,104 @@ 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 ""
-"%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: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"
+msgstr ""
 
 #: fdisk/sfdisk.c:2777
 #, c-format
-msgid "Bad Id %x\n"
-msgstr "Die ID %x ist ungültig.\n"
+msgid "Bad Id %lx\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
-msgstr "Dieser Datenträger wird derzeit verwendet.\n"
+msgstr ""
 
+# This is a stat()
 #: fdisk/sfdisk.c:2809
 #, c-format
 msgid "Fatal error: cannot find %s\n"
-msgstr "Nicht behebbarer Fehler: %s wurde nicht gefunden.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2812
 #, c-format
 msgid "Warning: %s is not a block device\n"
-msgstr "Warnung: %s ist kein blockorientiertes Gerät.\n"
+msgstr ""
 
 #: 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:2820
-#, fuzzy
 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"
-"Dieser Datenträger wird derzeit verwendet - es wird nicht empfohlen, ihn neu "
-"zu partitionieren. Unmounten Sie alle Dateisysteme, und deaktivieren Sie "
-"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:2824
 msgid "Use the --force flag to overrule all checks.\n"
-msgstr "Verwenden Sie das Flag '--force', um alle Prüfungen zu übersteuern.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2828
-#, fuzzy
 msgid "OK\n"
-msgstr "OK"
+msgstr "OK\n"
 
 #: fdisk/sfdisk.c:2837
 msgid "Old situation:\n"
-msgstr "Alte Situation:\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:2849
 msgid "New situation:\n"
-msgstr "Neue Situation:\n"
+msgstr ""
 
 #: 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 ""
-"Diese Partitionen werden nicht empfohlen - kein Änderung vorgenommen.\n"
-"(Wenn Sie dies wirklich wünschen, verwenden Sie die Option --force.)\n"
 
 #: 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"
+msgstr ""
 
 #: fdisk/sfdisk.c:2862
 msgid "Are you satisfied with this? [ynq] "
-msgstr "Sind Sie mit diesen Einstellungen zufrieden? [jnq]"
+msgstr ""
 
 #: fdisk/sfdisk.c:2864
 msgid "Do you want to write this to disk? [ynq] "
-msgstr "Möchten Sie dies auf die Festplatte schreiben? [jnq] "
+msgstr ""
 
 #: fdisk/sfdisk.c:2869
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
-"\n"
-"sfdisk: Vorzeitiges Ende der Eingabe.\n"
 
 #: fdisk/sfdisk.c:2871
 msgid "Quitting - nothing changed\n"
-msgstr "Beenden - Es wurden keine Änderungen vorgenommen.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2877
 msgid "Please answer one of y,n,q\n"
-msgstr "Antworten Sie mit j, n oder b.\n"
+msgstr ""
 
 #: fdisk/sfdisk.c:2885
+#, fuzzy
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
-"Die neue Partitionstabelle wurde erfolgreich geschrieben.\n"
+"Die neue Partitionstabelle wurde erfolgreich geschrieben\n"
 "\n"
 
 #: fdisk/sfdisk.c:2891
@@ -5272,14 +5291,10 @@ msgid ""
 "to zero the first 512 bytes:  dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
 "(See fdisk(8).)\n"
 msgstr ""
-"Wenn Sie eine DOS-Partition erstellt oder geändert haben (z. B. /dev/foo7)\n"
-"verwenden Sie anschließend dd(1), um die ersten 512 Bytes auf 0 zu setzen:\n"
-"dd if=/dev/zero of=/dev/foo7 bs=512 count=1\n"
-"(Siehe fdisk(8).)\n"
 
 #: games/banner.c:1045
 msgid "usage: banner [-w width]\n"
-msgstr "Verwendung: banner [-w Breite]\n"
+msgstr "Aufruf: banner [-w Breite]\n"
 
 # "Meldung"
 #: games/banner.c:1065
@@ -5289,94 +5304,94 @@ msgstr "Meldung: "
 #: 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."
+msgstr "Das Zeichen »%c« ist nicht im Zeichensatz vorhanden"
 
 #: games/banner.c:1107
 #, c-format
 msgid "Message '%s' is OK\n"
-msgstr "Meldung '%s' ist in Ordnung.\n"
+msgstr "Meldung »%s« ist in Ordnung\n"
 
 #: getopt-1.1.0a/getopt.c:233
+#, fuzzy
 msgid "Try `getopt --help' for more information.\n"
-msgstr "Mit 'getopt --help' zeigen Sie weitere Informationen an.\n"
+msgstr "»getopt --help« gibt weitere Informationen.\n"
 
 #: 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"
+msgstr ""
 
 #: getopt-1.1.0a/getopt.c:319
+#, fuzzy
 msgid "unknown shell after -s or --shell argument"
 msgstr "Unbekannte Shell als Argument von -s oder --shell"
 
 #: getopt-1.1.0a/getopt.c:324
+#, fuzzy
 msgid "Usage: getopt optstring parameters\n"
-msgstr "Verwendung: getopt Optionszeichenfolge Parameter\n"
+msgstr "Aufruf: getopt Optionszeichenkette Parameter\n"
 
 #: getopt-1.1.0a/getopt.c:325
+#, fuzzy
 msgid "       getopt [options] [--] optstring parameters\n"
-msgstr "       getopt [Optionen] [--] Optionszeichenfolge Parameter\n"
+msgstr "       getopt [Optionen] [--] Optionszeichenkette Parameter\n"
 
 #: 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.1.0a/getopt.c:327
 msgid "              parameters\n"
-msgstr "              Parameter\n"
+msgstr ""
 
 #: 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.1.0a/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
-msgstr "  -h, --help                   Diese Informationen anzeigen\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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.1.0a/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
-msgstr "  -o, --options=optstring      Kurze Optionen werden erkannt\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: getopt-1.1.0a/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
-msgstr "  -Q, --quiet-output           Keine normale Ausgabe\n"
+msgstr ""
 
 #: getopt-1.1.0a/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-msgstr "  -s, --shell=shell            Shell-Schreibweisen festlegen\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: getopt-1.1.0a/getopt.c:338
 msgid "  -V, --version                Output version information\n"
-msgstr "  -V, --version                Versionsinformationen anzeigen\n"
+msgstr ""
 
 #: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
 msgid "missing optstring argument"
-msgstr "Argument für 'optstring' fehlt"
+msgstr ""
 
 #: getopt-1.1.0a/getopt.c:441
 #, fuzzy
@@ -5384,150 +5399,141 @@ msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (enhanced) 1.0.3\n"
 
 #: getopt-1.1.0a/getopt.c:447
+#, fuzzy
 msgid "internal error, contact the author."
-msgstr "Interner Fehler, treten Sie mit dem Autor in Verbindung."
+msgstr "Interner Fehler, kontaktieren Sie den Autor."
 
 #: login-utils/agetty.c:306
 msgid "calling open_tty\n"
-msgstr "open_tty wird aufgerufen.\n"
+msgstr ""
 
 #. Initialize the termio settings (raw mode, eight-bit, blocking i/o).
 #: login-utils/agetty.c:319
 msgid "calling termio_init\n"
-msgstr "termio_init wird aufgerufen.\n"
+msgstr ""
 
 #: login-utils/agetty.c:324
 msgid "writing init string\n"
-msgstr "init string wird geschrieben.\n"
+msgstr ""
 
 #. Optionally detect the baud rate from the modem status message.
 #: login-utils/agetty.c:334
 msgid "before autobaud\n"
-msgstr "vor autobaud\n"
+msgstr ""
 
 #: login-utils/agetty.c:346
 msgid "waiting for cr-lf\n"
-msgstr "Neue-Zeile-Zeichen wird erwartet\n"
+msgstr ""
 
 #: login-utils/agetty.c:350
 #, c-format
 msgid "read %c\n"
-msgstr "%c lesen\n"
+msgstr ""
 
 #. Read the login name.
 #: login-utils/agetty.c:359
 msgid "reading login name\n"
-msgstr "Benutzername wird gelesen\n"
+msgstr ""
 
 #: login-utils/agetty.c:380
 #, c-format
 msgid "%s: can't exec %s: %m"
-msgstr "%s: Fehler bei der Ausführung von %s: %m"
+msgstr "%s: Fehler beim Ausführen von %s: %m"
 
 #: login-utils/agetty.c:400
 msgid "can't malloc initstring"
-msgstr "malloc für 'initstring' nicht erfolgreich."
+msgstr "Konnte keinen Speicher für den »initstring« reservieren"
 
 #: login-utils/agetty.c:465
 #, c-format
 msgid "bad timeout value: %s"
-msgstr "Ungültiger Timeout-Wert: %s"
+msgstr ""
 
 #: login-utils/agetty.c:474
 msgid "after getopt loop\n"
-msgstr "after getopt loop\n"
+msgstr ""
 
-#: login-utils/agetty.c:492
+#: login-utils/agetty.c:524
 msgid "exiting parseargs\n"
-msgstr "exiting parseargs\n"
+msgstr ""
 
-#: login-utils/agetty.c:504
+#: login-utils/agetty.c:536
 msgid "entered parse_speeds\n"
-msgstr "entered parse_speeds\n"
+msgstr ""
 
-#: login-utils/agetty.c:507
+#: login-utils/agetty.c:539
 #, c-format
 msgid "bad speed: %s"
-msgstr "Falsche Geschwindigkeit: %s"
+msgstr "falsche Geschwindigkeit: %s"
 
-#: login-utils/agetty.c:509
+#: login-utils/agetty.c:541
 msgid "too many alternate speeds"
-msgstr "Zu viele alternative Geschwindigkeiten"
+msgstr ""
 
-#: login-utils/agetty.c:511
+#: login-utils/agetty.c:543
 msgid "exiting parsespeeds\n"
-msgstr "parsespeeds beendet\n"
-
-#: login-utils/agetty.c:584
-#, c-format
-msgid "%s: open for update: %m"
-msgstr "%s: Öffnen zur Aktualisierung: %m"
-
-#: login-utils/agetty.c:602
-#, c-format
-msgid "%s: no utmp entry"
-msgstr "%s: kein utmp-Eintrag"
+msgstr ""
 
-#: login-utils/agetty.c:631
+#: login-utils/agetty.c:636
 #, c-format
 msgid "/dev: chdir() failed: %m"
-msgstr "Wechseln in das Verzeichnis /dev nicht möglich: %m"
+msgstr "Konnte nicht in das Verzeichnis /dev wechseln: %m"
 
-#: login-utils/agetty.c:635
+#: login-utils/agetty.c:640
 #, c-format
 msgid "/dev/%s: not a character device"
-msgstr "/dev/%s ist kein zeichenorientiertes Gerät."
+msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
 
 # debug
 #. ignore close(2) errors
-#: login-utils/agetty.c:642
+#: login-utils/agetty.c:647
 msgid "open(2)\n"
-msgstr "open(2)\n"
+msgstr ""
 
-#: login-utils/agetty.c:644
+#: login-utils/agetty.c:649
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
-msgstr "/dev/%s konnte nicht als Standardeingabe geöffnet werden: %m"
+msgstr "Konnte /dev/%s nicht als Standardeingabe öffnen: %m"
 
-#: login-utils/agetty.c:654
+#: login-utils/agetty.c:659
 #, c-format
 msgid "%s: not open for read/write"
-msgstr "%s: nicht zum Lesen/Schreiben geöffnet"
+msgstr ""
 
 #. Set up standard output and standard error file descriptors.
-#: login-utils/agetty.c:658
+#: login-utils/agetty.c:663
 msgid "duping\n"
-msgstr "Duping\n"
+msgstr ""
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:660
+#: login-utils/agetty.c:665
 #, c-format
 msgid "%s: dup problem: %m"
-msgstr "%s: Duping-Problem: %m"
+msgstr ""
 
-#: login-utils/agetty.c:730
+#: login-utils/agetty.c:735
 msgid "term_io 2\n"
-msgstr "term_io 2\n"
+msgstr ""
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:920
 msgid "user"
 msgstr "Benutzer"
 
-#: login-utils/agetty.c:915
+#: login-utils/agetty.c:920
 msgid "users"
 msgstr "Benutzer"
 
-#: login-utils/agetty.c:1003
+#: login-utils/agetty.c:1008
 #, c-format
 msgid "%s: read: %m"
-msgstr "%s: gelesen: %m"
+msgstr ""
 
-#: login-utils/agetty.c:1049
+#: login-utils/agetty.c:1054
 #, c-format
 msgid "%s: input overrun"
-msgstr "%s: Eingabeüberlauf"
+msgstr ""
 
-#: login-utils/agetty.c:1173
+#: login-utils/agetty.c:1178
 #, c-format
 msgid ""
 "Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H "
@@ -5535,175 +5541,164 @@ msgid ""
 "or\t[-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] "
 "line baud_rate,... [termtype]\n"
 msgstr ""
-"Verwendung: %s [-hiLmw] [-l Anmeldeprogramm] [-t Timeout] [-I Initstring] "
-"[-H Anmelde-Host] Baudrate,... line [Terminaltyp]\n"
-"oder\t[-hiLmw] [-l Anmeldeprogramm] [-t Timeout] [-I Initstring] [-H "
-"Anmeldehost] line Baudrate,... [Terminaltyp]\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
+#: login-utils/checktty.c:104 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:104
+#: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
-msgstr "Speicher für 'ttyclass' konnte nicht reserviert werden."
+msgstr ""
 
 # This ends up in the syslog. Translate it?
 #: login-utils/checktty.c:126
 msgid "can't malloc for grplist"
-msgstr "Speicher für den 'grplist' konnte nicht reserviert werden."
+msgstr ""
 
 #. there was a default rule, but user didn't match, reject!
-#: login-utils/checktty.c:426
+#: login-utils/checktty.c:422
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
-msgstr "Anmeldung bei %s von %s ist standardmäßig nicht gestattet.\n"
+msgstr ""
 
 #. if we get here, /etc/usertty exists, there's a line
 #. matching our username, but it doesn't contain the
 #. name of the tty where the user is trying to log in.
 #. So deny access!
-#: login-utils/checktty.c:437
+#: login-utils/checktty.c:433
 #, c-format
 msgid "Login on %s from %s denied.\n"
-msgstr "Anmeldung bei %s von %s verweigert.\n"
+msgstr ""
 
-#: login-utils/chfn.c:121 login-utils/chsh.c:107
+#: login-utils/chfn.c:122 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"
+msgstr ""
 
-#: login-utils/chfn.c:128 login-utils/chsh.c:114
+#: login-utils/chfn.c:129 login-utils/chsh.c:114
 #, c-format
 msgid "%s: user \"%s\" does not exist.\n"
-msgstr "%s: Benutzer '%s' ist nicht vorhanden.\n"
+msgstr ""
 
-#: login-utils/chfn.c:133 login-utils/chsh.c:119
+#: login-utils/chfn.c:134 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"
+msgstr ""
 
-#: login-utils/chfn.c:145
+#: login-utils/chfn.c:146
 #, c-format
 msgid "Changing finger information for %s.\n"
-msgstr "Finger-Informationen für %s werden geändert.\n"
+msgstr ""
 
-#: 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/chfn.c:152 login-utils/chfn.c:156 login-utils/chfn.c:163
+#: login-utils/chfn.c:167 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."
+msgstr ""
 
-#: 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
+#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:700
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:298 mount/lomount.c:248
+#: mount/lomount.c:253
 msgid "Password: "
-msgstr "Kennwort: "
+msgstr "Passwort: "
 
-#: login-utils/chfn.c:178 login-utils/chsh.c:170
+#: login-utils/chfn.c:179 login-utils/chsh.c:170
 msgid "Incorrect password."
-msgstr "Ungültiges Kennwort."
+msgstr ""
 
-#: login-utils/chfn.c:189
+#: login-utils/chfn.c:190
 msgid "Finger information not changed.\n"
-msgstr "Finger-Informationen wurden nicht geändert.\n"
+msgstr ""
 
+# XXX - Merge with next strings.
 #: login-utils/chfn.c:292
 #, c-format
 msgid "Usage: %s [ -f full-name ] [ -o office ] "
-msgstr "Verwendung: %s [ -f vollständiger_Name ] [ -o Arbeitsstelle ] "
+msgstr ""
 
 #: login-utils/chfn.c:293
 msgid ""
 "[ -p office-phone ]\n"
 "\t[ -h home-phone ] "
 msgstr ""
-"[ -p Telefon_Arbeit ]\n"
-"\t[ -h Telefon_Zuhause ] "
 
 #: login-utils/chfn.c:294
 msgid "[ --help ] [ --version ]\n"
-msgstr "[ --help ] [ --version ]\n"
+msgstr ""
 
 #: login-utils/chfn.c:365 login-utils/chsh.c:283
 msgid ""
 "\n"
 "Aborted.\n"
 msgstr ""
-"\n"
-"Abgebrochen.\n"
 
 #: login-utils/chfn.c:398
 msgid "field is too long.\n"
-msgstr "Das Feld ist zu lang.\n"
+msgstr ""
 
 #: login-utils/chfn.c:406
 #, c-format
 msgid "'%c' is not allowed.\n"
-msgstr "'%c' ist nicht zulässig.\n"
+msgstr ""
 
 #: login-utils/chfn.c:411
 msgid "Control characters are not allowed.\n"
-msgstr "Steuerzeichen sind nicht zulässig.\n"
+msgstr ""
 
 #: 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:479
 msgid "Finger information changed.\n"
-msgstr "Finger-Informationen wurden geändert.\n"
+msgstr ""
 
 #: login-utils/chfn.c:493 login-utils/chsh.c:401 sys-utils/cytune.c:324
+#, fuzzy
 msgid "malloc failed"
-msgstr "'malloc' war nicht erfolgreich."
+msgstr "»malloc« schlug fehl"
 
 #: 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:137
 #, c-format
 msgid "Changing shell for %s.\n"
-msgstr "Shell für %s wird geändert.\n"
+msgstr ""
 
 #: login-utils/chsh.c:178
 msgid "New shell"
-msgstr "Neue Shell"
+msgstr ""
 
 #: login-utils/chsh.c:185
 msgid "Shell not changed.\n"
-msgstr "Shell wurde nicht geändert.\n"
+msgstr ""
 
 #: login-utils/chsh.c:192
 msgid "Shell *NOT* changed.  Try again later.\n"
-msgstr "Shell wurde *NICHT* geändert. Später erneut versuchen.\n"
+msgstr ""
 
 #: login-utils/chsh.c:195
 msgid "Shell changed.\n"
-msgstr "Shell wurde geändert.\n"
+msgstr ""
+
+#: login-utils/chsh.c:263
+#, c-format
+msgid ""
+"Usage: %s [ -s shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"       [ username ]\n"
+msgstr ""
+"Aufruf: %s [ -s Shell ] [ --list-shells ] [ --help ] [ --version ]\n"
+"        [ Benutzername ]\n"
 
+# XXX - Merge with next strings.
 #: login-utils/chsh.c:263
 #, c-format
 msgid "Usage: %s [ -s shell ] "
-msgstr "Verwendung: %s [ -s Shell ] "
+msgstr "Aufruf: %s [ -s Shell ] "
 
 #: login-utils/chsh.c:264
 msgid "[ --list-shells ] [ --help ] [ --version ]\n"
@@ -5711,147 +5706,143 @@ msgstr "[ --list-shells ] [ --help ] [ --version ]\n"
 
 #: login-utils/chsh.c:265
 msgid "       [ username ]\n"
-msgstr "       [ Benutzername ]\n"
+msgstr "        [ Benutzername ]\n"
 
 #: 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"
+msgstr ""
 
 #: login-utils/chsh.c:313
 #, c-format
 msgid "%s: \"%s\" does not exist.\n"
-msgstr "%s: '%s' ist nicht vorhanden.\n"
+msgstr ""
 
 #: login-utils/chsh.c:317
 #, c-format
 msgid "%s: \"%s\" is not executable.\n"
-msgstr "%s: '%s' ist nicht ausführbar.\n"
+msgstr ""
 
 #: login-utils/chsh.c:324
 #, c-format
 msgid "%s: '%c' is not allowed.\n"
-msgstr "%s: '%c' ist nicht zulässig.\n"
+msgstr ""
 
 #: login-utils/chsh.c:328
 #, c-format
 msgid "%s: Control characters are not allowed.\n"
-msgstr "%s: Steuerzeichen sind nicht zulässig.\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: login-utils/chsh.c:367
 msgid "No known shells.\n"
-msgstr "Keine bekannten Shells.\n"
+msgstr ""
 
 #: login-utils/cryptocard.c:68
+#, fuzzy
 msgid "couldn't open /dev/urandom"
-msgstr "/dev/urandom konnte nicht geöffnet werden."
+msgstr "Konnte /dev/urandom nicht öffnen"
 
 #: login-utils/cryptocard.c:73
 msgid "couldn't read random data from /dev/urandom"
-msgstr "Zufallsdaten konnten nicht aus /dev/urandom gelesen werden."
+msgstr ""
 
 #: login-utils/cryptocard.c:96
-#, c-format
+#, fuzzy, c-format
 msgid "can't open %s for reading"
 msgstr "Konnte %s nicht zum Lesen öffnen"
 
 #: login-utils/cryptocard.c:100
 #, c-format
 msgid "can't stat(%s)"
-msgstr "stat(%s) nicht möglich."
+msgstr ""
 
 #: login-utils/cryptocard.c:106
 #, c-format
 msgid "%s doesn't have the correct filemodes"
-msgstr "%s weist nicht die korrekten Dateimodi auf."
+msgstr ""
 
 #: login-utils/cryptocard.c:111
 #, c-format
 msgid "can't read data from %s"
-msgstr "Daten von %s können nicht gelesen werden."
+msgstr ""
 
-#: login-utils/islocal.c:37
+#: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
-msgstr "%s kann nicht gelesen werden, Vorgang wird beendet."
+msgstr ""
 
-#: login-utils/last.c:143
+#: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr ""
-"Verwendung: last [-#] [-f Datei] [-t tty] [-h Hostname] [Benutzer ...]\n"
 
-#: login-utils/last.c:283
+#: login-utils/last.c:312
 msgid "  still logged in"
-msgstr "  derzeit angemeldet"
+msgstr ""
 
-#: login-utils/last.c:305
+#: login-utils/last.c:340
 #, c-format
 msgid ""
 "\n"
 "wtmp begins %s"
 msgstr ""
-"\n"
-"wtmp beginnt %s"
 
-#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
+#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
 msgid "last: malloc failure.\n"
-msgstr "last: malloc-Fehler.\n"
+msgstr ""
 
-#: login-utils/last.c:416
+#: login-utils/last.c:441
 msgid "last: gethostname"
-msgstr "last: gethostname"
+msgstr ""
 
-#: login-utils/last.c:469
-#, c-format, ycp-format
+#: login-utils/last.c:490
+#, c-format
 msgid ""
 "\n"
 "interrupted %10.10s %5.5s \n"
 msgstr ""
-"\n"
-"Unbrochen %10.10s %5.5s \n"
 
-#: login-utils/login.c:373
+#: login-utils/login.c:379
 msgid "login: -h for super-user only.\n"
-msgstr "login: -h kann nur vom Super-User verwendet werden.\n"
+msgstr ""
 
-#: login-utils/login.c:398
+#: login-utils/login.c:404
 msgid "usage: login [-fp] [username]\n"
-msgstr "Verwendung: login [-fp] [Benutzername]\n"
+msgstr "Aufruf: login [-fp] [Benutzername]\n"
 
-#: login-utils/login.c:501
+#: login-utils/login.c:509
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
-msgstr "login: PAM-Fehler, Abbruch: %s\n"
+msgstr ""
 
-#: login-utils/login.c:503
+#: login-utils/login.c:511
 #, c-format
 msgid "Couldn't initialize PAM: %s"
-msgstr "PAM konnte nicht initialisiert werden: %s"
+msgstr ""
 
 #.
 #. * Andrew.Taylor@cal.montage.ca: Provide a user prompt to PAM
@@ -5859,166 +5850,138 @@ msgstr "PAM konnte nicht initialisiert werden: %s"
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:519
+#: login-utils/login.c:527
 msgid "login: "
 msgstr "Anmeldung: "
 
-#: login-utils/login.c:553
+#: login-utils/login.c:561
 #, c-format
 msgid "FAILED LOGIN %d FROM %s FOR %s, %s"
-msgstr "ANMELDUNG %d VON %s FÜR %s NICHT ERFOLGREICH, %s"
+msgstr ""
 
-#: login-utils/login.c:555
+#: login-utils/login.c:563
 msgid ""
 "Login incorrect\n"
 "\n"
 msgstr ""
-"Anmeldung nicht korrekt.\n"
-"\n"
 
-#: login-utils/login.c:564
+#: login-utils/login.c:572
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
-msgstr "ZU VIELE ANMELDEVERSUCHE (%d) VON %s  FÜR %s, %s"
+msgstr ""
 
-#: login-utils/login.c:568
+#: login-utils/login.c:576
 #, c-format
 msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-msgstr "ANMELDESITZUNG VON %s FÜR %s NICHT ERFOLGREICH, %s"
+msgstr ""
 
-#: login-utils/login.c:571
+#: login-utils/login.c:579
 msgid ""
 "\n"
 "Login incorrect\n"
 msgstr ""
-"\n"
-"Anmeldung nicht korrekt.\n"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:635
 msgid "Illegal username"
-msgstr "Benutzername unzulässig"
+msgstr ""
 
-#: login-utils/login.c:663
+#: login-utils/login.c:678
 #, c-format
 msgid "%s login refused on this terminal.\n"
-msgstr "%s Anmeldung bei diesem Terminal verweigert.\n"
+msgstr ""
 
-#: login-utils/login.c:668
+#: login-utils/login.c:683
 #, c-format
 msgid "LOGIN %s REFUSED FROM %s ON TTY %s"
-msgstr "ANMELDUNG %s VON %s AUF TTY %s VERWEIGERT."
+msgstr ""
 
-#: login-utils/login.c:672
+#: login-utils/login.c:687
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
-msgstr "ANMELDUNG %s AUF TTY %s VERWEIGERT."
+msgstr ""
 
-#: login-utils/login.c:725
+#: login-utils/login.c:740
 msgid "Login incorrect\n"
-msgstr "Ungültige Anmeldung.\n"
+msgstr ""
 
-#: login-utils/login.c:747
+#: login-utils/login.c:762
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
 msgstr ""
-"Es sind bereits zu viele Benutzer angemeldet.\n"
-"Versuchen Sie es später erneut.\n"
 
-#: login-utils/login.c:751
+#: login-utils/login.c:766
 msgid "You have too many processes running.\n"
-msgstr "Es werden zu viele Prozesse ausgeführt.\n"
-
-#: login-utils/login.c:797
-msgid "Warning: no Kerberos tickets issued\n"
-msgstr "Warnung: Keine Kerberos-Tickets erteilt.\n"
-
-#: 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:815
-#, c-format
-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:823
-msgid "Sorry -- your account has expired.\n"
-msgstr "Das Konto ist nicht mehr gültig.\n"
-
-#: login-utils/login.c:829
-#, c-format
-msgid "Warning: your account expires on %d %s %d.\n"
-msgstr "Warnung: Das Konto wird am %d. %s %d ungültig.\n"
+msgstr ""
 
-#: login-utils/login.c:1066
+#: login-utils/login.c:1001
 #, c-format
 msgid "DIALUP AT %s BY %s"
-msgstr "DFÜ MIT %s DURCH %s"
+msgstr ""
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:1008
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
-msgstr "ROOT-ANMELDUNG BEI %s VON %s"
+msgstr ""
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:1011
 #, c-format
 msgid "ROOT LOGIN ON %s"
-msgstr "ROOT-ANMELDUNG BEI %s"
+msgstr ""
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:1014
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
-msgstr "ANMELDUNG BEI %s DURCH %s VON %s"
+msgstr ""
 
-#: login-utils/login.c:1082
+#: login-utils/login.c:1017
 #, c-format
 msgid "LOGIN ON %s BY %s"
-msgstr "ROOT-ANMELDUNG BEI %s DURCH %s"
+msgstr ""
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1029
 #, c-format
 msgid "You have %smail.\n"
 msgstr "Sie haben %sE-Mail.\n"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1030
 msgid "new "
 msgstr "neue "
 
 #. error in fork()
-#: login-utils/login.c:1113
+#: login-utils/login.c:1055
 #, c-format
 msgid "login: failure forking: %s"
-msgstr "login: Es kann kein neuer Prozess erzeugt werden: %s"
+msgstr "login: Kann keinen neuen Prozeß erzeugen: %s"
 
-#: login-utils/login.c:1128
+#: login-utils/login.c:1075
 msgid "setuid() failed"
-msgstr "setuid() nicht erfolgreich."
+msgstr ""
 
-#: login-utils/login.c:1134
+#: login-utils/login.c:1081
 #, c-format
 msgid "No directory %s!\n"
-msgstr "Verzeichnis %s ist nicht vorhanden!\n"
+msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
 
-#: login-utils/login.c:1138
+#: login-utils/login.c:1085
 msgid "Logging in with home = \"/\".\n"
-msgstr "Anmeldung erfolgt, home-Verzeichnis = '/'.\n"
+msgstr ""
 
-#: login-utils/login.c:1146
+#: login-utils/login.c:1093
 msgid "login: no memory for shell script.\n"
-msgstr "login: Kein Speicher für Shell-Skript verfügbar.\n"
+msgstr ""
 
-#: login-utils/login.c:1174
+#: login-utils/login.c:1120
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
-msgstr "login: Shell-Skript konnte nicht ausgeführt werden: %s.\n"
+msgstr ""
 
-#: login-utils/login.c:1177
+#: login-utils/login.c:1123
 #, c-format
 msgid "login: no shell: %s.\n"
-msgstr "login: Keine Shell: %s.\n"
+msgstr ""
 
-#: login-utils/login.c:1191
+#: login-utils/login.c:1138
 #, c-format
 msgid ""
 "\n"
@@ -6027,697 +5990,751 @@ msgstr ""
 "\n"
 "%s Anmeldung: "
 
-#: login-utils/login.c:1202
+#: login-utils/login.c:1149
 msgid "login name much too long.\n"
-msgstr "Der Benutzername ist viel zu lang.\n"
+msgstr ""
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1150
 msgid "NAME too long"
-msgstr "NAME ist zu lang."
+msgstr ""
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1157
 msgid "login names may not start with '-'.\n"
-msgstr "Benutzernamen dürfen nicht mit einem '-' anfangen.\n"
+msgstr "Benutzernamen dürfen nicht mit einem »-« anfangen.\n"
 
-#: login-utils/login.c:1220
+#: login-utils/login.c:1167
 msgid "too many bare linefeeds.\n"
-msgstr "zu viele leere Zeilenvorschubzeichen.\n"
+msgstr ""
 
-#: login-utils/login.c:1221
+#: login-utils/login.c:1168
 msgid "EXCESSIVE linefeeds"
-msgstr "ZU VIELE Zeilenvorschubzeichen"
+msgstr ""
 
-#: login-utils/login.c:1231
+#: login-utils/login.c:1179
 #, c-format
 msgid "Login timed out after %d seconds\n"
-msgstr "Zeitablauf bei der Anmeldung nach %d Sekunden.\n"
+msgstr ""
 
-#: login-utils/login.c:1325
+#: login-utils/login.c:1275
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Letzte Anmeldung: %.*s "
 
-#: login-utils/login.c:1329
+#: login-utils/login.c:1279
 #, c-format
 msgid "from %.*s\n"
 msgstr "von %.*s\n"
 
-#: login-utils/login.c:1332
+#: login-utils/login.c:1282
 #, c-format
 msgid "on %.*s\n"
 msgstr "auf %.*s\n"
 
 # This ends up in the syslog. Translate it?
-#: login-utils/login.c:1355
+#: login-utils/login.c:1303
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
-msgstr "ANMELDEFEHLER VON %s, %s"
+msgstr ""
 
 # This ends up in the syslog. Translate it?
-#: login-utils/login.c:1358
+#: login-utils/login.c:1306
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
-msgstr "ANMELDEFEHLER AUF %s, %s"
+msgstr ""
 
 # This ends up in the syslog. Translate it?
-#: login-utils/login.c:1362
+#: login-utils/login.c:1310
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
-msgstr "%d ANMELDEFEHLER VON %s, %s"
+msgstr ""
 
 # This ends up in the syslog. Translate it?
-#: login-utils/login.c:1365
+#: login-utils/login.c:1313
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
-msgstr "%d ANMELDEFEHLER AUF %s, %s"
+msgstr ""
 
 #: login-utils/mesg.c:89
 msgid "is y\n"
-msgstr "ist y\n"
+msgstr ""
 
 #: login-utils/mesg.c:92
 msgid "is n\n"
-msgstr "ist n\n"
+msgstr ""
 
 #: login-utils/mesg.c:112
 msgid "usage: mesg [y | n]\n"
-msgstr "Verwendung: mesg [y | n]\n"
+msgstr "Aufruf: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:67
+#: login-utils/newgrp.c:68
 msgid "newgrp: Who are you?"
-msgstr "newgrp: Wer sind Sie?"
+msgstr ""
 
-#: login-utils/newgrp.c:75 login-utils/newgrp.c:85
+#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
 msgid "newgrp: setgid"
-msgstr "newgrp: setgid"
+msgstr ""
 
-#: login-utils/newgrp.c:80
+#: login-utils/newgrp.c:81
 msgid "newgrp: No such group."
-msgstr "newgrp: Diese Gruppe existiert nicht."
+msgstr ""
 
-#: login-utils/newgrp.c:89
+# libc.po: "Keine Berechtigung"
+#: login-utils/newgrp.c:90
+#, fuzzy
 msgid "newgrp: Permission denied"
-msgstr "newgrp: Zugriff verweigert."
+msgstr "newgrp: Zugriff verweigert"
 
-#: login-utils/newgrp.c:96
+#: login-utils/newgrp.c:97
 msgid "newgrp: setuid"
-msgstr "newgrp: setuid"
+msgstr ""
 
-#: login-utils/newgrp.c:102
+#: login-utils/newgrp.c:103
 msgid "No shell"
-msgstr "Keine Shell"
+msgstr ""
 
-#: login-utils/passwd.c:159
+#: login-utils/passwd.c:161
 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:172
+#: login-utils/passwd.c:174
 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:173
+#: login-utils/passwd.c:175
 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:174
+#: login-utils/passwd.c:176
 msgid "characters. See passwd(1) for more information.\n"
-msgstr "Weitere Informationen finden Sie in passwd(1).\n"
+msgstr ""
 
-#: login-utils/passwd.c:179
+#: login-utils/passwd.c:181
 msgid "You cannot reuse the old password.\n"
-msgstr "Das alte Kennwort kann nicht erneut verwendet werden.\n"
+msgstr ""
 
-#: login-utils/passwd.c:184
+#: login-utils/passwd.c:186
 msgid "Please don't use something like your username as password!\n"
-msgstr "Verwenden Sie nicht Ihren Benutzernamen als Kennwort!\n"
+msgstr ""
 
-#: login-utils/passwd.c:195 login-utils/passwd.c:202
+#: login-utils/passwd.c:197 login-utils/passwd.c:204
 msgid "Please don't use something like your realname as password!\n"
-msgstr "Verwenden Sie nicht Ihren Personennamen als Kennwort!\n"
+msgstr ""
 
-#: login-utils/passwd.c:220
+#: login-utils/passwd.c:222
 msgid "Usage: passwd [username [password]]\n"
-msgstr "Verwendung: passwd [Benutzername [Kennwort]]\n"
+msgstr ""
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:223
 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:275
+#: login-utils/passwd.c:277
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
-msgstr "Verwendung: passwd [-foqsvV] [Benutzer [Kennwort]]\n"
+msgstr ""
 
-#: login-utils/passwd.c:296
+#: login-utils/passwd.c:298
 #, c-format
 msgid "Can't exec %s: %s\n"
-msgstr "Ausführung von %s nicht möglich: %s\n"
+msgstr ""
 
-#: login-utils/passwd.c:307
+#: login-utils/passwd.c:309
 msgid "Cannot find login name"
-msgstr "Benutzername wurde nicht gefunden."
+msgstr ""
 
-#: login-utils/passwd.c:314 login-utils/passwd.c:321
+#: login-utils/passwd.c:316 login-utils/passwd.c:323
 msgid "Only root can change the password for others.\n"
-msgstr "Nur 'root' kann das Kennwort von anderen Personen ändern.\n"
+msgstr ""
 
-#: login-utils/passwd.c:329
+#: login-utils/passwd.c:331
 msgid "Too many arguments.\n"
-msgstr "Zu viele Argumente.\n"
+msgstr ""
 
-#: login-utils/passwd.c:334
+#: login-utils/passwd.c:336
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
-msgstr "Benutzername wurde nicht gefunden. Ist '%s' tatsächlich ein Benutzer?"
+msgstr ""
 
-#: login-utils/passwd.c:338
+#: login-utils/passwd.c:340
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
-msgstr "Nur lokale Kennwörter können geändert werden. Verwenden Sie yppasswd."
+msgstr ""
 
-#: login-utils/passwd.c:344
+#: login-utils/passwd.c:346
 msgid "UID and username does not match, imposter!"
-msgstr "UID und Benutzername stimmen nicht überein!"
+msgstr ""
 
-#: login-utils/passwd.c:349
+#: login-utils/passwd.c:351
 #, c-format
 msgid "Changing password for %s\n"
-msgstr "Kennwort für %s wird geändert.\n"
+msgstr ""
 
-#: login-utils/passwd.c:353
+#: login-utils/passwd.c:355
 msgid "Enter old password: "
-msgstr "Geben Sie das alte Kennwort ein: "
+msgstr ""
 
-#: login-utils/passwd.c:355
+#: login-utils/passwd.c:357
 msgid "Illegal password, imposter."
-msgstr "Ungültiges Kennwort!"
+msgstr ""
 
-#: login-utils/passwd.c:367
+#: login-utils/passwd.c:369
 msgid "Enter new password: "
-msgstr "Geben Sie das neue Kennwort ein: "
+msgstr ""
 
-#: login-utils/passwd.c:369
+#: login-utils/passwd.c:371
 msgid "Password not changed."
-msgstr "Kennwort wurde nicht geändert."
+msgstr ""
 
-#: login-utils/passwd.c:379
+#: login-utils/passwd.c:380
 msgid "Re-type new password: "
-msgstr "Geben Sie das neue Kennwort erneut ein: "
+msgstr ""
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:383
 msgid "You misspelled it. Password not changed."
-msgstr "Eingabefehler. Kennwort wurde nicht geändert."
+msgstr ""
 
-#: login-utils/passwd.c:397
+#: login-utils/passwd.c:398
 #, c-format
 msgid "password changed, user %s"
-msgstr "Kennwort geändert, Benutzer %s"
+msgstr ""
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:401
 msgid "ROOT PASSWORD CHANGED"
-msgstr "ROOT-KENNWORT GEÄNDERT"
+msgstr ""
 
-#: login-utils/passwd.c:402
+#: login-utils/passwd.c:403
 #, c-format
 msgid "password changed by root, user %s"
-msgstr "Kennwort von root geändert, Benutzer %s"
+msgstr ""
 
-#: login-utils/passwd.c:409
+#: login-utils/passwd.c:410
 msgid "calling setpwnam to set password.\n"
-msgstr "setpwnam wird aufgerufen, um das Kennwort festzulegen.\n"
+msgstr ""
 
-#: login-utils/passwd.c:413
+#: login-utils/passwd.c:414
 msgid "Password *NOT* changed.  Try again later.\n"
-msgstr "Kennwort *NICHT* geändert. Versuchen Sie es später erneut.\n"
+msgstr ""
 
-#: login-utils/passwd.c:419
+#: login-utils/passwd.c:420
 msgid "Password changed.\n"
-msgstr "Kennwort geändert.\n"
+msgstr ""
 
-#: login-utils/shutdown.c:87
+#: login-utils/shutdown.c:110
 msgid "Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"
-msgstr "Verwendung: shutdown [-h|-r] [-fqs] [now|hh:ss|+Minuten]\n"
+msgstr ""
 
-#: login-utils/shutdown.c:105
+#: login-utils/shutdown.c:128
 msgid "Shutdown process aborted"
-msgstr "Herunterfahren wurde abgebrochen."
+msgstr ""
 
-#: login-utils/shutdown.c:131
+#: login-utils/shutdown.c:154
 #, c-format
 msgid "%s: Only root can shut a system down.\n"
-msgstr "%s: Das System kann nur von 'root' heruntergefahren werden.\n"
+msgstr ""
 
-#: login-utils/shutdown.c:225
+#: login-utils/shutdown.c:248
 msgid "That must be tomorrow, can't you wait till then?\n"
-msgstr "Dies muss morgen erfolgen. Können Sie so lange warten?\n"
+msgstr ""
 
-#: login-utils/shutdown.c:277
+#: login-utils/shutdown.c:299
 msgid "for maintenance; bounce, bounce"
-msgstr "für Wartungsarbeiten; bounce, bounce"
+msgstr ""
 
-#: login-utils/shutdown.c:281
+# debug
+#: login-utils/shutdown.c:303
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#: login-utils/shutdown.c:306
+#: login-utils/shutdown.c:328
 msgid "The system is being shut down within 5 minutes"
-msgstr "Das System wird in den nächsten 5 Minuten heruntergefahren."
+msgstr ""
 
-#: login-utils/shutdown.c:310
+#: login-utils/shutdown.c:332
 msgid "Login is therefore prohibited."
-msgstr "Die Anmeldung ist daher nicht möglich."
+msgstr ""
 
 # This ends up in the syslog. Translate it?
-#: login-utils/shutdown.c:331
+#: login-utils/shutdown.c:353
 #, c-format
 msgid "%s by %s: %s"
-msgstr "%s von %s: %s"
+msgstr ""
 
 # This ends up in the syslog. Translate it?
-#: login-utils/shutdown.c:332
+#: login-utils/shutdown.c:354
 msgid "rebooted"
-msgstr "Neustart"
+msgstr ""
 
 # This ends up in the syslog. Translate it?
-#: login-utils/shutdown.c:332
+#: login-utils/shutdown.c:354
 msgid "halted"
-msgstr "Angehalten"
+msgstr ""
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:387
+#: login-utils/shutdown.c:417
 msgid ""
 "\n"
 "Why am I still alive after reboot?"
 msgstr ""
-"\n"
-"Nach Neustart immer noch aktiv?"
 
-#: login-utils/shutdown.c:389
+#: login-utils/shutdown.c:419
 msgid ""
 "\n"
 "Now you can turn off the power..."
 msgstr ""
-"\n"
-"Sie können den Computer jetzt ausschalten..."
 
-#: login-utils/shutdown.c:404
+#: login-utils/shutdown.c:435
 msgid "Calling kernel power-off facility...\n"
-msgstr "Kernel-Ausschaltfunktion wird aufgerufen...\n"
+msgstr ""
 
-#: login-utils/shutdown.c:407
+#: login-utils/shutdown.c:438
 #, c-format
 msgid "Error powering off\t%s\n"
-msgstr "Fehler beim Ausschalten\t%s\n"
+msgstr ""
 
-#: login-utils/shutdown.c:415
+#: login-utils/shutdown.c:446
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
-msgstr "Programm '%s' wird ausgeführt...\n"
+msgstr ""
 
-#: login-utils/shutdown.c:418
+#: login-utils/shutdown.c:449
 #, c-format
 msgid "Error executing\t%s\n"
-msgstr "Fehler bei der Ausführung von\t%s\n"
+msgstr ""
 
-#: login-utils/shutdown.c:441
+#: login-utils/shutdown.c:475
 #, c-format
 msgid "URGENT: broadcast message from %s:"
-msgstr "DRINGEND: Broadcast-Nachricht von %s:"
-
-#: login-utils/shutdown.c:447
-msgid "System going down IMMEDIATELY!\n"
-msgstr "Das System wird SOFORT heruntergefahren!\n"
+msgstr ""
 
-#: login-utils/shutdown.c:450
+#: login-utils/shutdown.c:481
 #, c-format
-msgid "System going down in %d hour%s %d minutes"
-msgstr "Das System wird in %d Stunde%s, %d Minuten heruntergefahren."
+msgid "System going down in %d hours %d minutes"
+msgstr ""
 
-#: login-utils/shutdown.c:451 login-utils/shutdown.c:454
-msgid "s"
-msgstr "n"
+#: login-utils/shutdown.c:484
+#, c-format
+msgid "System going down in 1 hour %d minutes"
+msgstr ""
 
-#: login-utils/shutdown.c:453
+#: login-utils/shutdown.c:487
 #, c-format
-msgid "System going down in %d minute%s\n"
-msgstr "Das System wird in %d Minute%s heruntergefahren.\n"
+msgid "System going down in %d minutes\n"
+msgstr ""
+
+#: login-utils/shutdown.c:490
+msgid "System going down in 1 minute\n"
+msgstr ""
+
+#: login-utils/shutdown.c:492
+msgid "System going down IMMEDIATELY!\n"
+msgstr ""
 
-#: login-utils/shutdown.c:459
+#: login-utils/shutdown.c:497
 #, c-format
 msgid "\t... %s ...\n"
-msgstr "\t... %s ...\n"
+msgstr ""
 
-#: login-utils/shutdown.c:516
+#: login-utils/shutdown.c:554
 msgid "Cannot fork for swapoff. Shrug!"
-msgstr "Prozess für swapoff kann nicht erzeugt werden."
+msgstr ""
 
-#: login-utils/shutdown.c:524
+#: login-utils/shutdown.c:562
 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:543
+#: login-utils/shutdown.c:581
 msgid "Cannot fork for umount, trying manually."
-msgstr "Prozess für umount kann nicht erzeugt werden, manuell versuchen."
+msgstr ""
 
-#: login-utils/shutdown.c:552
+#: login-utils/shutdown.c:590
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
-msgstr "%s kann nicht ausgeführt werden, statt dessen wird umount versucht.\n"
+msgstr ""
 
-#: login-utils/shutdown.c:556
+#: login-utils/shutdown.c:594
 msgid "Cannot exec umount, giving up on umount."
-msgstr "umount kann nicht ausgeführt werden, Versuch wird aufgegeben."
+msgstr ""
 
-#: login-utils/shutdown.c:561
+#: login-utils/shutdown.c:599
 msgid "Unmounting any remaining filesystems..."
-msgstr "Unmounten aller restlichen Dateisysteme im Gange..."
+msgstr ""
 
-#: login-utils/shutdown.c:595
+#: login-utils/shutdown.c:635
 #, fuzzy, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
-msgstr "shutdown: umount für %d nicht erfolgreich: %s\n"
+msgstr "shutdown: konnte %s nicht umounten: %s\n"
 
-#: login-utils/simpleinit.c:109
+#: login-utils/simpleinit.c:122
 msgid "Booting to single user mode.\n"
-msgstr "Booten für Einzelbenutzermodus.\n"
+msgstr ""
 
-#: login-utils/simpleinit.c:113
+#: login-utils/simpleinit.c:126
 msgid "exec of single user shell failed\n"
-msgstr "Ausführung der Einzelbenutzer-Shell nicht erfolgreich.\n"
+msgstr ""
 
-#: login-utils/simpleinit.c:117
+#: login-utils/simpleinit.c:130
 msgid "fork of single user shell failed\n"
-msgstr "Prozesserzeugung für Einzelbenutzer-Shell nicht erfolgreich.\n"
+msgstr ""
 
-#: login-utils/simpleinit.c:166
-#, fuzzy
+#: login-utils/simpleinit.c:182
 msgid "error opening fifo\n"
-msgstr "Fehler beim Ausschalten\t%s\n"
+msgstr "Fehler beim Öffnen der »fifo«\n"
+
+#: login-utils/simpleinit.c:220
+msgid "error running finalprog\n"
+msgstr ""
+
+#. Error
+#: login-utils/simpleinit.c:224
+msgid "error forking finalprog\n"
+msgstr ""
 
-#: login-utils/simpleinit.c:271
+#: login-utils/simpleinit.c:303
 msgid ""
 "\n"
 "Wrong password.\n"
 msgstr ""
 "\n"
-"Falsches Kennwort.\n"
+"Falsches Passwort.\n"
 
-#: login-utils/simpleinit.c:341
-#, fuzzy
+#: login-utils/simpleinit.c:376
+msgid "lstat of path failed\n"
+msgstr ""
+
+#: login-utils/simpleinit.c:384
 msgid "stat of path failed\n"
-msgstr "settimeofday() nicht erfolgreich."
+msgstr ""
 
-#: login-utils/simpleinit.c:348
-#, fuzzy
+#: login-utils/simpleinit.c:392
 msgid "open of directory failed\n"
-msgstr "Öffnen der rc-Datei nicht erfolgreich.\n"
+msgstr ""
 
-#: login-utils/simpleinit.c:415
+#: login-utils/simpleinit.c:459
 msgid "fork failed\n"
-msgstr "Prozesserzeugung nicht erfolgreich.\n"
+msgstr ""
 
 # 
-#: login-utils/simpleinit.c:445 text-utils/more.c:1541
+#: login-utils/simpleinit.c:490 text-utils/more.c:1622
 msgid "exec failed\n"
-msgstr "Ausführung nicht erfolgreich.\n"
+msgstr "»exec()« schlug fehl\n"
 
-#: login-utils/simpleinit.c:469
+#: login-utils/simpleinit.c:514
+#, fuzzy
 msgid "cannot open inittab\n"
-msgstr "inittab kann nicht geöffnet werden.\n"
+msgstr "Konnte inittab nicht öffnen\n"
 
-#: login-utils/simpleinit.c:529
+#: login-utils/simpleinit.c:581
 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
+#: login-utils/simpleinit.c:888
 msgid "error running programme\n"
 msgstr ""
 
-#: login-utils/ttymsg.c:81
+#: login-utils/ttymsg.c:75
 msgid "too many iov's (change code in wall/ttymsg.c)"
-msgstr "Zu viele IOV-Verweise (Code in wall/ttymsg.c bearbeiten)"
+msgstr ""
 
-#: login-utils/ttymsg.c:91
+#: login-utils/ttymsg.c:85
 msgid "excessively long line arg"
-msgstr "Zeilenargument zu lang"
+msgstr ""
 
 # This is only used, when strerror(errno) is much too long
-#: login-utils/ttymsg.c:145
+#: login-utils/ttymsg.c:139
 msgid "cannot fork"
-msgstr "Prozesserzeugung nicht möglich"
+msgstr "Kann keinen neuen Prozeß erzeugen (fork)"
 
 # This is used normaly
-#: login-utils/ttymsg.c:149
+#: login-utils/ttymsg.c:143
 #, c-format
 msgid "fork: %s"
-msgstr "Prozesserzeugung: %s"
+msgstr "Prozeßerzeugung (fork): %s"
 
-#: login-utils/ttymsg.c:177
+#: login-utils/ttymsg.c:171
 #, c-format
 msgid "%s: BAD ERROR"
-msgstr "%s: FEHLER"
+msgstr ""
 
-#: login-utils/vipw.c:145
+#: login-utils/vipw.c:139
 #, c-format
 msgid "%s: the %s file is busy.\n"
-msgstr "%s: die %s-Datei ist in Gebrauch.\n"
+msgstr ""
 
-#: login-utils/vipw.c:161
+#: login-utils/vipw.c:155
 #, c-format
 msgid "%s: the %s file is busy (%s present)\n"
-msgstr "%s: die %s-Datei ist in Gebrauch (gegenwärtig %s)\n"
+msgstr ""
 
-#: login-utils/vipw.c:167
+#: login-utils/vipw.c:161
 #, c-format
 msgid "%s: can't link %s: %s\n"
-msgstr "%s: keine Verknüpfung möglich für %s: %s\n"
+msgstr ""
 
-#: login-utils/vipw.c:188
+#: login-utils/vipw.c:192
 #, 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:211
+#: login-utils/vipw.c:215
 #, c-format
 msgid "%s: Cannot fork\n"
-msgstr "%s: Prozesserzeugung nicht möglich\n"
+msgstr "%s: Kann keinen neuen Prozeß erzeugen (fork)\n"
 
-#: login-utils/vipw.c:251
-#, c-format
+# "nicht geändert"
+# "wurde nicht geändert"
+#: login-utils/vipw.c:255
+#, fuzzy, c-format
 msgid "%s: %s unchanged\n"
-msgstr "%s: %s wurde nicht geändert\n"
+msgstr "%s: %s unverändert\n"
 
-#: login-utils/vipw.c:294
+#: login-utils/vipw.c:274
 #, c-format
 msgid "%s: no changes made\n"
-msgstr "%s: keine Änderungen vorgenommen\n"
+msgstr ""
 
-#: login-utils/wall.c:103
+#: login-utils/vipw.c:323
+msgid "You are using shadow groups on this system.\n"
+msgstr ""
+
+#: login-utils/vipw.c:324
+msgid "You are using shadow passwords on this system.\n"
+msgstr ""
+
+#: login-utils/vipw.c:325
+#, c-format
+msgid "Would you like to edit %s now [y/n]? "
+msgstr ""
+
+#: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
-msgstr "Verwendung: %s [Datei]\n"
+msgstr "Aufruf: %s [Datei]\n"
 
-#: login-utils/wall.c:151
+#: login-utils/wall.c:152
 #, c-format
 msgid "%s: can't open temporary file.\n"
-msgstr "%s: Eine temporäre Datei konnte nicht geöffnet werden.\n"
+msgstr "%s: Konnte eine temporäre Datei nicht öffnen.\n"
 
-#: login-utils/wall.c:178
+# XXX - Have to look at other OSs translation for Broadcast
+# Message
+#: login-utils/wall.c:179
 #, c-format
 msgid "Broadcast Message from %s@%s"
-msgstr "Broadcast-Nachricht von %s@%s"
+msgstr "Rundsendenachricht von %s@%s"
 
-#: login-utils/wall.c:188
+#: login-utils/wall.c:197
+#, c-format
+msgid "%s: will not read %s - use stdin.\n"
+msgstr ""
+
+#: login-utils/wall.c:202
 #, c-format
 msgid "%s: can't read %s.\n"
-msgstr "%s: %s konnte nicht gelesen werden.\n"
+msgstr "%s: Konnte %s nicht lesen.\n"
 
-#: login-utils/wall.c:213
+#: login-utils/wall.c:224
 #, c-format
 msgid "%s: can't stat temporary file.\n"
-msgstr "%s: 'stat' konnte nicht auf die temporäre Datei angewandt werden.\n"
+msgstr "%s: Konnte »stat« nicht auf eine temporäre Datei anwenden.\n"
 
-#: login-utils/wall.c:222
+#: login-utils/wall.c:233
 #, c-format
 msgid "%s: can't read temporary file.\n"
-msgstr "%s: Temporäre Datei konnte nicht gelesen werden.\n"
+msgstr "%s: Konnte eine temporäre Datei nicht lesen.\n"
 
-#: misc-utils/cal.c:186
+#: misc-utils/cal.c:217
 msgid "illegal month value: use 1-12"
-msgstr "Monatsangabe ungültig. Gültige Werte: 1-12"
+msgstr ""
 
-#: misc-utils/cal.c:190
+#: misc-utils/cal.c:221
 msgid "illegal year value: use 1-9999"
-msgstr "Jahresangabe ungültig. Gültige Werte: 1-9999"
+msgstr ""
 
-#: misc-utils/cal.c:486
+#: misc-utils/cal.c:581
 msgid "usage: cal [-mjyV] [[month] year]\n"
-msgstr "Verwendung: cal [-mjyV] [[Monat] Jahr]\n"
+msgstr "Aufruf: cal [-mjyV] [[Monat] Jahr]\n"
 
 #: misc-utils/ddate.c:205
 #, c-format
 msgid "usage: %s [+format] [day month year]\n"
-msgstr "Verwendung: %s [+Format] [Tag Monat Jahr]\n"
+msgstr "Aufruf: %s [+Format] [Tag Monat Jahr]\n"
 
 #. handle St. Tib's Day
 #: misc-utils/ddate.c:252
 msgid "St. Tib's Day"
-msgstr "St.-Tib-Tag"
+msgstr ""
 
-#: misc-utils/kill.c:210
+#: misc-utils/kill.c:206
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: Unbekanntes Signal %s\n"
 
-#: misc-utils/kill.c:272
+#: misc-utils/kill.c:269
 #, c-format
 msgid "%s: can't find process \"%s\"\n"
-msgstr "%s: Prozess '%s' wurde nicht gefunden.\n"
+msgstr "%s: Konnte den Prozeß »%s« nicht finden.\n"
 
-#: misc-utils/kill.c:316
+#: misc-utils/kill.c:313
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: Unbekanntes Signal %s; gültige Signale:\n"
 
-#: misc-utils/kill.c:356
+#: misc-utils/kill.c:353
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
-msgstr "Verwendung: %s [ -s Signal | -p ] [ -a ] PID ...\n"
+msgstr "Aufruf: %s [ -s Signal | -p ] [ -a ] PID ...\n"
 
-#: misc-utils/kill.c:357
+#: misc-utils/kill.c:354
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "        %s -l [ Signal ]\n"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, c-format
 msgid "logger: %s: %s.\n"
-msgstr "logger: %s: %s.\n"
+msgstr "logger: Konnte %s nicht öffnen: %s.\n"
 
-#: misc-utils/logger.c:243
+#: misc-utils/logger.c:247
 #, c-format
 msgid "logger: unknown facility name: %s.\n"
-msgstr "logger: Unbekannter 'Facility'-Name: %s.\n"
+msgstr "logger: Unbekannter »Facility«-Name: %s.\n"
 
-#: misc-utils/logger.c:255
+#: misc-utils/logger.c:259
 #, c-format
 msgid "logger: unknown priority name: %s.\n"
 msgstr "logger: Unbekannter Prioritätsname: %s.\n"
 
-#: misc-utils/logger.c:282
+#: misc-utils/logger.c:286
 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"
+"Aufruf: logger [-is] [-f Datei] [-p Pri] [-t Tag] [-u Socket] [ Meldung ... "
+"]\n"
 
 #: misc-utils/look.c:348
 msgid "usage: look [-dfa] [-t char] string [file]\n"
-msgstr "Verwendung: look [-dfa] [-t Endzeichen] Zeichenfolge [Datei]\n"
+msgstr "Aufruf: look [-dfa] [-t Endzeichen] Zeichenkette [Datei]\n"
 
 #: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
 #, c-format
 msgid "Could not open %s\n"
-msgstr "%s konnte nicht geöffnet werden.\n"
+msgstr "Konnte %s nicht öffnen\n"
 
 #: misc-utils/mcookie.c:126 misc-utils/mcookie.c:145
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "%d Bytes aus %s gelesen\n"
 
-#: misc-utils/namei.c:100
+#: misc-utils/namei.c:101
 #, c-format
 msgid "namei: unable to get current directory - %s\n"
-msgstr "namei: Das aktuelle Verzeichnis konnte nicht ermittelt werden: %s\n"
+msgstr "namei: Konnte das aktuelle Verzeichnis nicht feststellen: %s\n"
 
-#: misc-utils/namei.c:111
+#: misc-utils/namei.c:112
 #, 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"
+msgstr "namei: Konnte nicht in das Verzeichnis %s wechseln - %s (%d)\n"
 
-#: misc-utils/namei.c:120
+#: misc-utils/namei.c:121
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
-msgstr "Verwendung: namei [-mx] Pfad [Pfad ...]\n"
+msgstr "Aufruf: namei [-mx] Dateiname [Dateiname ...]\n"
 
-#: misc-utils/namei.c:145
+#: misc-utils/namei.c:146
 msgid "namei: could not chdir to root!\n"
-msgstr "namei: Wechseln in das root-Verzeichnis nicht möglich!\n"
+msgstr "namei: Konnte nicht in das root-Verzeichnis wechseln!\n"
 
 # XXX
-#: misc-utils/namei.c:152
+#: misc-utils/namei.c:153
 msgid "namei: could not stat root!\n"
-msgstr "namei: 'stat' konnte nicht auf 'root' angewandt werden!\n"
+msgstr ""
 
-#: misc-utils/namei.c:207
+#: misc-utils/namei.c:208
 #, c-format
 msgid " ? could not chdir into %s - %s (%d)\n"
-msgstr " ? Wechseln in das Verzeichnis %s nicht möglich - %s (%d)\n"
+msgstr " ? Konnte nicht in das Verzeichnis %s wechseln - %s (%d)\n"
 
-#: misc-utils/namei.c:236
+#: misc-utils/namei.c:237
 #, c-format
 msgid " ? problems reading symlink %s - %s (%d)\n"
-msgstr " ? Fehler beim Lesen der symbolischen Verknüpfung %s - %s (%d)\n"
+msgstr " ? Probleme beim Lesen der symbolischen Verknüpfung %s - %s (%d)\n"
 
-#: misc-utils/namei.c:246
+#: misc-utils/namei.c:247
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
-msgstr "  *** HÖCHSTZAHL SYMBOLISCHER VERKNÜPFUNGEN ÜBERSCHRITTEN ***\n"
+msgstr ""
+"  *** Die maximale Zahl der symbolischen Verknüpfungen wurde überschritten "
+"***\n"
 
-#: misc-utils/namei.c:283
+#: misc-utils/namei.c:284
 #, 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:118
-#, fuzzy
-msgid "usage: script [-a] [-f] [file]\n"
-msgstr "Verwendung: script [-a] [Datei]\n"
+#: misc-utils/rename.c:38
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: Speicher ist alle!\n"
+
+#: misc-utils/rename.c:56
+#, c-format
+msgid "%s: renaming %s to %s failed: %s\n"
+msgstr "%s: Konnte %s nicht in %s umbenennen: %s\n"
+
+#: misc-utils/rename.c:86
+#, c-format
+msgid "call: %s from to files...\n"
+msgstr ""
+
+#: misc-utils/script.c:104
+#, c-format
+msgid ""
+"Warning: `%s' is a symlink.\n"
+"Use `%s [options] %s' if you really want to use it.\n"
+"Script not started.\n"
+msgstr ""
+
+#: misc-utils/script.c:150
+msgid "usage: script [-a] [-f] [-q] [file]\n"
+msgstr "Aufruf: script [-a] [-f] [-q] [Datei]\n"
 
 # Not realy nice...
-#: misc-utils/script.c:139
+#: misc-utils/script.c:173
 #, c-format
 msgid "Script started, file is %s\n"
-msgstr "'Script' wurde gestartet, die Datei ist %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:205
+#: misc-utils/script.c:239
 #, c-format
 msgid "Script started on %s"
-msgstr "'Script' wurde gestartet: %s"
+msgstr "»Script« wurde gestartet: %s"
 
-#: misc-utils/script.c:269
+# The %s must be at the end, cause it contains the \n
+#: misc-utils/script.c:303
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 "\n"
-"'Script' beendet: %s"
+"»Script« beendet: %s"
 
-#: misc-utils/script.c:277
+#: misc-utils/script.c:311
 #, c-format
 msgid "Script done, file is %s\n"
-msgstr "'Script' wurde beendet, die Datei ist %s\n"
+msgstr "»Script« wurde beendet, die Datei ist %s\n"
 
-#: misc-utils/script.c:288
+#: misc-utils/script.c:322
 msgid "openpty failed\n"
-msgstr "'openpty' nicht erfolgreich\n"
+msgstr "»openpty« ist fehlgeschlagen\n"
 
-#: misc-utils/script.c:322
+#: misc-utils/script.c:356
 msgid "Out of pty's\n"
-msgstr "Keine PTYs mehr.\n"
+msgstr "Keine ptys mehr.\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: Fehler bei den Argumenten. Verwendung:\n"
+msgstr "%s: Fehler bei den Argumenten; Aufruf:\n"
 
 #: misc-utils/setterm.c:746
 msgid "  [ -term terminal_name ]\n"
@@ -6830,11 +6847,11 @@ 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"
+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"
+msgstr "  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabN = 1-160)\n"
 
 #: misc-utils/setterm.c:783
 msgid "  [ -regtabs [1-160] ]\n"
@@ -6846,15 +6863,15 @@ msgstr "  [ -blank [0-60] ]\n"
 
 #: misc-utils/setterm.c:785
 msgid "  [ -dump   [1-NR_CONSOLES] ]\n"
-msgstr "  [ -dump   [1-Konsolenanzahl] ]\n"
+msgstr "  [ -dump   [1-Anzahl_Konsolen] ]\n"
 
 #: misc-utils/setterm.c:786
 msgid "  [ -append [1-NR_CONSOLES] ]\n"
-msgstr "  [ -append [1-Konsolenanzahl] ]\n"
+msgstr "  [ -append [1-Anzahl_Konsolen] ]\n"
 
 #: misc-utils/setterm.c:787
 msgid "  [ -file dumpfilename ]\n"
-msgstr "  [ -file Ausgabedateiname ]\n"
+msgstr "  [ -file Dumpdateiname ]\n"
 
 #: misc-utils/setterm.c:788
 msgid "  [ -msg [on|off] ]\n"
@@ -6877,33 +6894,18 @@ msgid "  [ -blength [0-2000] ]\n"
 msgstr "  [ -blength [0-2000] ]\n"
 
 #: misc-utils/setterm.c:793
+#, fuzzy
 msgid "  [ -bfreq freqnumber ]\n"
-msgstr "  [ -bfreq Frequenz ]\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"
+msgstr "  [ -bfreq Freqnummer ]\n"
 
 #: misc-utils/setterm.c:1047
 msgid "cannot (un)set powersave mode\n"
-msgstr "Stromsparmodus kann nicht (zurück)gesetzt werden\n"
+msgstr ""
 
 #: misc-utils/setterm.c:1086 misc-utils/setterm.c:1094
 #, c-format
 msgid "klogctl error: %s\n"
-msgstr "klogctl-Fehler: %s\n"
+msgstr "»klogctl« Fehler: %s\n"
 
 #: misc-utils/setterm.c:1133
 #, c-format
@@ -6912,262 +6914,261 @@ msgstr "Fehler beim Lesen von %s\n"
 
 #: misc-utils/setterm.c:1148
 msgid "Error writing screendump\n"
-msgstr "Fehler beim Schreiben der Bildschirmausgabe.\n"
+msgstr "Fehler beim Schreiben des Bildschirmdumps\n"
 
 #: 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"
+msgstr ""
 
-#: misc-utils/setterm.c:1227
+#: misc-utils/setterm.c:1228
 #, c-format
 msgid "%s: $TERM is not defined.\n"
-msgstr "%s: Die Umgebungsvariable $TERM ist nicht definiert.\n"
+msgstr "%s: Die Umgebungsvariable TERM ist nicht gesetzt.\n"
 
-#: misc-utils/whereis.c:155
+#: misc-utils/whereis.c:157
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
-msgstr "whereis [ -sbmu ] [ -SBM-Verzeichnis ... -f ] Name...\n"
+msgstr "whereis [ -sbmu ] [ -SBM Verzeichnis ... -f ] Name...\n"
 
-#: misc-utils/write.c:100
+#: misc-utils/write.c:99
 msgid "write: can't find your tty's name\n"
-msgstr "write: Name des tty-Geräts wurde nicht gefunden.\n"
+msgstr ""
 
-#: misc-utils/write.c:111
+#: misc-utils/write.c:110
 msgid "write: you have write permission turned off.\n"
-msgstr "write: Schreibzugriff ist deaktiviert.\n"
+msgstr ""
 
-#: misc-utils/write.c:132
+#: misc-utils/write.c:131
 #, c-format
 msgid "write: %s is not logged in on %s.\n"
-msgstr "write: %s ist bei %s nicht angemeldet.\n"
+msgstr ""
 
-#: misc-utils/write.c:140
+#: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
-msgstr "write: %s hat Nachrichten deaktiviert auf %s\n"
+msgstr ""
 
-#: misc-utils/write.c:147
+#: misc-utils/write.c:146
 msgid "usage: write user [tty]\n"
-msgstr "Verwendung: write Benutzer [tty]\n"
+msgstr ""
 
-#: misc-utils/write.c:246
+#: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
-msgstr "write: %s ist nicht angemeldet.\n"
+msgstr ""
 
-#: misc-utils/write.c:255
+#: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
-msgstr "write: %s hat Nachrichten deaktiviert\n"
+msgstr ""
 
-#: misc-utils/write.c:259
+#: misc-utils/write.c:247
 #, 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"
+msgstr ""
+
+#: misc-utils/write.c:313
+#, c-format
+msgid "Message from %s@%s (as %s) on %s at %s ..."
+msgstr ""
 
-#: misc-utils/write.c:323
+#: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
-msgstr "Nachricht von %s@%s auf %s bei %s ..."
+msgstr ""
 
-#: mount/fstab.c:116
+#: mount/fstab.c:113
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "Warnung: Fehler beim Lesen von %s: %s"
 
-#: mount/fstab.c:143 mount/fstab.c:166
+#: mount/fstab.c:141 mount/fstab.c:164
 #, c-format
 msgid "warning: can't open %s: %s"
-msgstr "Warnung: %s konnte nicht geöffnet werden: %s"
+msgstr "Warnung: Konnte %s nicht öffnen: %s"
 
-#: mount/fstab.c:147
+#: mount/fstab.c:145
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
-msgstr "mount: %s konnte nicht geöffnet werden - %s wird verwendet.\n"
+msgstr "mount: Konnte %s nicht öffnen - benutze %s stattdessen\n"
 
 #. linktargetfile does not exist (as a file)
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:376
+#: mount/fstab.c:374
 #, 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)."
+"Konnte die Lock-Datei %s nicht anlegen: %s (benutzen Sie die -n Option, um "
+"dies zu umgehen)"
 
-#: mount/fstab.c:388
+#: mount/fstab.c:386
 #, 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)."
+"Konnte keinen Link für die Lock-Datei %s anlegen: %s (benutzen Sie die -n "
+"Option, um dies zu umgehen)"
 
-#: mount/fstab.c:400
+#: mount/fstab.c:398
 #, c-format
 msgid "can't open lock file %s: %s (use -n flag to override)"
 msgstr ""
-"Lock-Datei %s konnte nicht geöffnet werden: %s (verwenden Sie die Option -n, "
-"um dies zu umgehen)."
+"Konnte die Lock-Datei %s nicht öffnen: %s (benutzen Sie die -n Option, um "
+"dies zu umgehen)"
 
 # This one should be merged with the next one by using
 # error() instead of printf()
-#: mount/fstab.c:415
+#: mount/fstab.c:413
 #, c-format
 msgid "Can't lock lock file %s: %s\n"
-msgstr "Lock-Datei %s kann nicht gesperrt werden: %s\n"
+msgstr "Konnte die Lock-Datei %s nicht »locken«: %s\n"
 
 # sperren
-#: mount/fstab.c:428
+#: mount/fstab.c:426
 #, c-format
 msgid "can't lock lock file %s: %s"
-msgstr "Lock-Datei %s kann nicht gesperrt werden: %s"
+msgstr "Konnte die Lock-Datei %s nicht »locken«: %s"
 
-#: mount/fstab.c:430
+#: mount/fstab.c:428
 msgid "timed out"
 msgstr "Zeitüberschreitung"
 
-#: mount/fstab.c:437
+#: mount/fstab.c:435
 #, 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
+#: mount/fstab.c:484 mount/fstab.c:520
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
-msgstr "%s kann nicht geöffnet werden (%s) - mtab nicht aktualisiert."
+msgstr "Konnte %s nicht öffnen (%s) - mtab nicht aktualisiert"
 
-#: 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: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:533 mount/fstab.c:539
+#: mount/fstab.c:528
 #, c-format
 msgid "error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: mount/fstab.c:546
+# "Modus" is the translation, that fileutils.po uses.
+# I don't like it, but I haven't got a better one.
+# Someone suggested "Zugriffsrechte", which I currently like
+# better
+# XXX - search for "Modus" and you'll find a similiar message
+#: mount/fstab.c:536
 #, c-format
 msgid "error changing mode of %s: %s\n"
-msgstr "Fehler beim Ändern des Modus von %s: %s\n"
+msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
-#: mount/fstab.c:553
+#: mount/fstab.c:554
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "%s kann nicht in %s umbenannt werden: %s\n"
+msgstr "Konnte %s nicht in %s umbenennen: %s\n"
 
-#: mount/lomount.c:78
+#: mount/lomount.c:79
 #, c-format
 msgid "loop: can't open device %s: %s\n"
-msgstr "loop: Gerät %s kann nicht geöffnet werden: %s\n"
+msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
 
-#: mount/lomount.c:84
+#: mount/lomount.c:85
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
-msgstr "loop: Keine Informationen über das Gerät %s erhältlich: %s\n"
+msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
 
-#: mount/lomount.c:89
+#: mount/lomount.c:90
 #, c-format
 msgid "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
-msgstr "%s: [%04x]:%ld (%s) offset %d, %s encryption\n"
+msgstr ""
 
 # XXX - pretty dumb
-#: mount/lomount.c:148
+#: mount/lomount.c:176
 msgid "mount: could not find any device /dev/loop#"
-msgstr "mount: Gerät /dev/loop# wurde nicht gefunden."
+msgstr "mount: Konnte kein Gerät /dev/loop# finden"
 
-#: mount/lomount.c:152
+#: mount/lomount.c:180
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
 msgstr ""
-"mount: Es wurde kein 'loop'-Gerät gefunden.\n"
-"       /dev/loop# hat möglicherweise eine falsche Major-Nummer."
+"mount: Konnte kein »loop«-Gerät finden.\n"
+"       Vielleicht hat /dev/loop# eine falsche Major Nummer?"
 
-#: mount/lomount.c:156
+#: mount/lomount.c:184
 #, 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: Es wurde kein 'loop'-Gerät gefunden. Laut %s \n"
-"       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: Konnte kein »loop«-Gerät finden. Laut %s unterstützt\n"
+"       dieses Kernel keine »loop«-Geräte. (Wenn dies der Fall\n"
+"       ist, dann sollten Sie das Kernel neu kompilieren oder\n"
+"       »insmod loop.o« ausführen.)"
 
-#: mount/lomount.c:162
+#: mount/lomount.c:190
 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: Es wurde kein 'loop'-Gerät gefunden. Möglicherweise unterstützt\n"
-"       dieser Kernel keine 'loop'-Geräte. (Kompilieren Sie\n"
-"       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: Konnte kein »loop«-Gerät finden. Vieleicht unterstützt\n"
+"       dieses Kernel keine »loop«-Geräte (wenn dies der Fall\n"
+"       ist, dann sollten Sie das Kernel neu kompilieren oder\n"
+"       »insmod loop.o« ausführen) Oder vieleicht hat /dev/loop#\n"
+"       eine falsche Major Nummer?"
 
-#: mount/lomount.c:166
+#: mount/lomount.c:194
 msgid "mount: could not find any free loop device"
-msgstr "mount: Es wurde kein freies 'loop'-Gerät gefunden."
+msgstr "mount: Konnte kein freies »loop«-Gerät finden"
 
 # Verschlüsselungstyp
-#: mount/lomount.c:197
+#: mount/lomount.c:224
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Die Verschlüsselungsmethode %s wird nicht unterstützt\n"
 
-#: mount/lomount.c:211
+#: mount/lomount.c:238
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:231
+#: mount/lomount.c:257
 msgid "Init (up to 16 hex digits): "
-msgstr "Inititalisierung (bis zu 16 Hexadezimalziffern): "
+msgstr ""
 
 # "Ziffer" ?
-#: mount/lomount.c:238
+#: mount/lomount.c:264
 #, c-format
 msgid "Non-hex digit '%c'.\n"
-msgstr "Das Zeichen '%c' ist keine hexadezimale Ziffer.\n"
+msgstr "Das Zeichen »%c« ist keine hexadezimale Ziffer.\n"
 
-#: mount/lomount.c:245
+#: mount/lomount.c:271
 #, 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"
+msgstr ""
 
-#: mount/lomount.c:261
+#: mount/lomount.c:287
 #, 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:272
+#: mount/lomount.c:298
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
-msgstr "loop: Gerät %s konnte nicht gelöscht werden: %s\n"
+msgstr "loop: Konnte das Gerät %s nicht löschen: %s\n"
 
-#: mount/lomount.c:282
+#: mount/lomount.c:308
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): Erfolg\n"
 
-#: mount/lomount.c:290
+#: mount/lomount.c:316
 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"
 
 # Setup
-#: mount/lomount.c:327
+#: mount/lomount.c:353
 #, c-format
 msgid ""
 "usage:\n"
@@ -7175,30 +7176,27 @@ msgid ""
 "  %s -d loop_device                                   # delete\n"
 "  %s [ -e encryption ] [ -o offset ] loop_device file # setup\n"
 msgstr ""
-"Verwendung:\n"
-"  # Informationen anzeigen:\n"
+"Aufruf:\n"
+"  Informationen anzeigen:\n"
 "    %s loop-Gerät\n"
-"  # Löschen:\n"
+"  Löschen:\n"
 "    %s -d loop-Gerät\n"
-"  # Setup:\n"
+"  Setup:\n"
 "    %s [ -e Verschlüsselungsmethode ] [ -o Offset ] loop-Gerät Datei\n"
 
-#: mount/lomount.c:345 mount/sundries.c:41 mount/sundries.c:56
+#: mount/lomount.c:371 mount/sundries.c:41 mount/sundries.c:56
 msgid "not enough memory"
 msgstr "Nicht genügend Speicher"
 
-#: mount/lomount.c:416
+#: mount/lomount.c:442
 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. "
-"Wiederholen Sie die Kompilierung.\n"
 
 #: mount/mntent.c:165
 #, c-format
 msgid "[mntent]: warning: no final newline at the end of %s\n"
 msgstr ""
-"[mntent]: Warnung: Am Ende der Datei %s fehlt ein abschließendes "
-"Neue-Zeile-Zeichen.\n"
+"[mntent]: Warnung: Am Ende der Datei %s fehlt ein abschließender newline.\n"
 
 #: mount/mntent.c:216
 #, c-format
@@ -7207,332 +7205,330 @@ msgstr "[mntent]: Zeile %d in %s ist fehlerhaft%s\n"
 
 #: mount/mntent.c:219
 msgid "; rest of file ignored"
-msgstr "; der Rest der Datei wurde ignoriert."
+msgstr "; der Rest der Datei wurde ignoriert"
 
-#: mount/mount.c:351
+#: mount/mount.c:378
 #, c-format
 msgid "mount: according to mtab, %s is already mounted on %s"
-msgstr "mount: Laut mtab ist %s bereits auf %s gemountet."
+msgstr "mount: Laut mtab ist %s schon auf %s gemountet"
 
-#: mount/mount.c:354
+#: mount/mount.c:382
 #, c-format
 msgid "mount: according to mtab, %s is mounted on %s"
-msgstr "mount: Laut mtab ist %s auf %s gemountet."
+msgstr "mount: Laut mtab ist %s auf %s gemountet"
 
-#: mount/mount.c:375
+#: mount/mount.c:403
 #, c-format
 msgid "mount: can't open %s for writing: %s"
-msgstr "mount: %s konnte nicht zum Schreiben geöffnet werden: %s"
+msgstr "mount: Konnte %s nicht zum Schreiben öffnen: %s"
 
-#: mount/mount.c:390 mount/mount.c:593
+#: mount/mount.c:418 mount/mount.c:619
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: Fehler beim Schreiben von %s: %s"
 
 # "Modus"
-#: mount/mount.c:397
+#: mount/mount.c:425
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: Fehler beim Ändern der Zugriffsrechte von %s: %s"
 
-#: mount/mount.c:442
+#: mount/mount.c:470
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr ""
 
-#: mount/mount.c:485
+#: mount/mount.c:513
 msgid "mount failed"
-msgstr "Der mount-Befehl war nicht erfolgreich."
+msgstr "mount ist fehlgeschlagen"
 
-#: mount/mount.c:487
+#: mount/mount.c:515
 #, c-format
 msgid "mount: only root can mount %s on %s"
-msgstr "mount: Nur 'root' kann %s auf %s mounten."
+msgstr "mount: Nur »root« kann %s auf %s mounten"
 
-#: mount/mount.c:515
+#: mount/mount.c:543
 msgid "mount: loop device specified twice"
-msgstr "mount: Das loop-Gerät wurde zweimal angegeben."
+msgstr "mount: Das »loop«-Gerät wurde zweimal angegeben"
 
-#: mount/mount.c:520
+#: mount/mount.c:548
 msgid "mount: type specified twice"
-msgstr "mount: Der Typ wurde doppelt angegeben."
+msgstr "mount: Der Typ wurde doppelt angegeben"
 
-#: mount/mount.c:532
+#: mount/mount.c:560
 msgid "mount: skipping the setup of a loop device\n"
-msgstr "mount: Die Einrichtung eines 'loop'-Geräts wird übergangen.\n"
+msgstr ""
 
-#: mount/mount.c:541
+#: mount/mount.c:569
 #, c-format
 msgid "mount: going to use the loop device %s\n"
-msgstr "mount: Das 'loop'-Gerät %s wird verwendet.\n"
+msgstr "mount: werde das »loop«-Gerät %s verwenden\n"
 
-#: mount/mount.c:545
+#: mount/mount.c:573
 msgid "mount: failed setting up loop device\n"
-msgstr "mount: Es konnte kein 'loop'-Gerät eingerichtet werden.\n"
+msgstr ""
 
-#: mount/mount.c:549
+#: mount/mount.c:577
 msgid "mount: setup loop device successfully\n"
-msgstr "mount: 'loop'-Gerät wurde erfolgreich eingerichtet.\n"
+msgstr ""
 
-#: mount/mount.c:588
+#: mount/mount.c:614
 #, c-format
 msgid "mount: can't open %s: %s"
-msgstr "mount: %s konnte nicht geöffnet werden: %s"
+msgstr "mount: Konnte %s nicht öffnen: %s"
 
-#: mount/mount.c:611
-#, fuzzy, c-format
+#: mount/mount.c:637
+#, c-format
 msgid "mount: cannot not open %s for setting speed"
-msgstr "mount: %s konnte nicht zum Schreiben geöffnet werden: %s"
+msgstr "mount: Konnte %s nicht zum Setzen der Geschwindigkeit öffnen"
 
-#: mount/mount.c:614
+#: mount/mount.c:640
 #, fuzzy, c-format
 msgid "mount: cannot set speed: %s"
-msgstr "mount: %s konnte nicht geöffnet werden: %s"
+msgstr "mount: Konnte die Geschwindigkeit nicht setzen: %s"
 
-#: mount/mount.c:675 mount/mount.c:1202
+#: mount/mount.c:701 mount/mount.c:1230
 #, c-format
 msgid "mount: cannot fork: %s"
-msgstr "mount: Es kann kein neuer Prozess erzeugt werden: %s"
+msgstr "mount: Kann keinen neuen Prozeß erzeugen: %s"
 
-#: mount/mount.c:749
+#: mount/mount.c:775
 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: Diese Version wurde ohne Unterstützung für den Typ »nfs« kompiliert"
 
-#: mount/mount.c:789
+#: mount/mount.c:815
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 
-#: mount/mount.c:800
+#: mount/mount.c:826
 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: Der Dateisystemtyp konnte nicht festgestellt werden\n"
+"       und es wurde keiner angegeben"
 
-#: mount/mount.c:803
+#: mount/mount.c:829
 msgid "mount: you must specify the filesystem type"
-msgstr "mount: Der Dateisystemtyp muss angegeben werden."
+msgstr "mount: Sie müssen den Dateisystemtyp angeben"
 
 #. should not happen
-#: mount/mount.c:806
+#: mount/mount.c:832
 msgid "mount: mount failed"
-msgstr "mount: Der mount-Befehl war nicht erfolgreich."
+msgstr "mount: mount ist fehlgeschlagen"
 
-#: mount/mount.c:812 mount/mount.c:847
+#: mount/mount.c:838 mount/mount.c:873
 #, c-format
 msgid "mount: mount point %s is not a directory"
-msgstr "mount: Mountpunkt %s ist kein Verzeichnis."
+msgstr "mount: Mountpunkt %s ist kein Verzeichnis"
 
-# Look in libc.po
-# I guess "Zugriff verweigert"
-#: mount/mount.c:814
+# libc.po: "Keine Berechtigung"
+#: mount/mount.c:840
 msgid "mount: permission denied"
-msgstr "mount: Zugriff verweigert."
+msgstr "mount: Zugriff verweigert"
 
-#: mount/mount.c:816
+#: mount/mount.c:842
 msgid "mount: must be superuser to use mount"
-msgstr "mount: Der Befehl 'mount' kann nur vom Superuser ausgeführt werden."
+msgstr ""
 
 #. heuristic: if /proc/version exists, then probably proc is mounted
 #. proc mounted?
-#: mount/mount.c:820 mount/mount.c:824
+#: mount/mount.c:846 mount/mount.c:850
 #, c-format
 msgid "mount: %s is busy"
-msgstr "mount: %s ist in Gebrauch."
+msgstr "mount: %s wird gerade benutzt"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:826
+#: mount/mount.c:852
 msgid "mount: proc already mounted"
-msgstr "mount: proc ist bereits gemountet."
+msgstr "mount: proc ist bereits gemountet"
 
-#: mount/mount.c:828
+#: mount/mount.c:854
 #, c-format
 msgid "mount: %s already mounted or %s busy"
-msgstr "mount: %s ist bereits gemountet oder %s ist in Gebrauch."
+msgstr "mount: %s ist bereits gemountet oder %s wird gerade benutzt"
 
-#: mount/mount.c:834
+#: mount/mount.c:860
 #, c-format
 msgid "mount: mount point %s does not exist"
-msgstr "mount: Mountpunkt %s existiert nicht."
+msgstr "mount: Mountpunkt %s existiert nicht"
 
-#: mount/mount.c:836
+#: mount/mount.c:862
 #, 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."
+"       deren Ziel nicht existiert"
 
-#: mount/mount.c:839
+#: mount/mount.c:865
 #, c-format
 msgid "mount: special device %s does not exist"
-msgstr "mount: Gerätedatei %s existiert nicht."
+msgstr "mount: Gerätedatei %s existiert nicht"
 
-#: mount/mount.c:849
+#: mount/mount.c:875
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
 "       (a path prefix is not a directory)\n"
 msgstr ""
-"mount: Gerätedatei %s existiert nicht\n"
-"       (ein Pfad-Präfix ist kein Verzeichnis).\n"
 
-#: mount/mount.c:862
+#: mount/mount.c:888
 #, 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: %s ist noch nicht gemountet oder es wurden\n"
+"       ungültige Optionen angegeben"
 
-#: mount/mount.c:864
+#: mount/mount.c:890
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
 "       or too many mounted file systems"
 msgstr ""
-"mount: Falscher Dateisystemtyp oder ungültige Optionen.\n"
-"       Möglicherweise ist auch der 'Superblock' von %s beschädigt,\n"
-"       oder es sind zu viele Dateisysteme gemountet."
+"mount: Falscher Dateisystemtyp, ungültige Optionen, der\n"
+"       »Superblock« von %s ist beschädigt oder es sind\n"
+"       zu viele Dateisysteme gemountet"
 
-#: mount/mount.c:898
+#: mount/mount.c:924
 msgid "mount table full"
-msgstr "Die Mount-Tabelle ist voll."
+msgstr "Mounttabelle ist voll"
 
-#: mount/mount.c:900
+#: mount/mount.c:926
 #, c-format
 msgid "mount: %s: can't read superblock"
-msgstr "mount: %s: Superblock konnte nicht gelesen werden."
+msgstr "mount: %s: Konnte den Superblock nicht lesen"
 
-#: mount/mount.c:904
-#, fuzzy, c-format
+#: mount/mount.c:930
+#, c-format
 msgid "mount: %s: unknown device"
-msgstr "umount: %s ist kein gültiges blockorientiertes Gerät."
+msgstr "umount: %s: unbekanntes Gerät"
 
-#: mount/mount.c:909
+#: mount/mount.c:935
 #, c-format
 msgid "mount: fs type %s not supported by kernel"
-msgstr "mount: Der Dateisystemtyp %s wird vom Kernel nicht unterstützt."
+msgstr "mount: Der Dateisystemtyp »%s« wird nicht vom Kernel unterstützt"
 
-#: mount/mount.c:921
+#: mount/mount.c:947
 #, c-format
 msgid "mount: probably you meant %s"
-msgstr "mount: Wahrscheinlich meinten Sie '%s'"
+msgstr "mount: Vielleicht meinten sie »%s«"
 
-#: mount/mount.c:923
+#: mount/mount.c:949
 msgid "mount: maybe you meant iso9660 ?"
-msgstr "mount: Vielleicht meinten Sie 'iso9660'?"
+msgstr "mount: Vielleicht meinten Sie »iso9660«?"
 
-#: mount/mount.c:926
+#: mount/mount.c:952
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr ""
-"mount: %s hat eine falsche Gerätenummer, oder der Dateisystemtyp %s wird "
-"nicht unterstützt."
+"mount: %s hat eine falsche Geräte-Nummer oder der\n"
+"       Dateisystemtyp %s wird nicht unterstützt"
 
 #. strange ...
-#: mount/mount.c:932
+#: mount/mount.c:958
 #, 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: %s ist kein blockorientiertes Gerät und »stat«\n"
+"       schlug fehl?"
 
-#: mount/mount.c:934
+#: mount/mount.c:960
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
 "       (maybe `insmod driver'?)"
 msgstr ""
-"mount: Der Kernel erkennt %s nicht als blockorientiertes\n"
-"       Gerät. (Möglicherweise hilft der 'insmod-Treiber'.)"
+"mount: Das Kernel erkennt %s nicht als blockorientiertes\n"
+"       Gerät (Vielleicht hilft »insmod Treiber«?)"
 
 # "versuchen"
-#: mount/mount.c:937
+#: mount/mount.c:963
 #, 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: %s ist kein blockorientiertes Gerät\n"
+"       (Vielleicht probieren Sie »-o loop«?)"
 
-#: mount/mount.c:940
+#: mount/mount.c:966
 #, c-format
 msgid "mount: %s is not a block device"
-msgstr "mount: %s ist kein blockorientiertes Gerät."
+msgstr "mount: %s ist kein blockorientiertes Gerät"
 
-#: mount/mount.c:943
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s is not a valid block device"
-msgstr "mount: %s ist kein gültiges blockorientiertes Gerät."
+msgstr "mount: %s ist kein gültiges blockorientiertes Gerät"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:946
+#: mount/mount.c:972
 msgid "block device "
-msgstr "Blockorientiertes Gerät "
+msgstr "blockorientiertes Gerät "
 
-#: mount/mount.c:948
-#, fuzzy, c-format
+#: mount/mount.c:974
+#, c-format
 msgid "mount: cannot mount %s%s read-only"
-msgstr "umount: Erneutes Mounten nicht möglich, %s ist schreibgeschützt.\n"
+msgstr "mount: Konnte %s%s nicht im Nur-Lese-Modus mounten"
 
-# That sounds somehow dumb.
-#: mount/mount.c:952
-#, fuzzy, c-format
+#: mount/mount.c:978
+#, c-format
 msgid "mount: %s%s is write-protected but explicit `-w' flag given"
 msgstr ""
-"mount: %s%s ist schreibgeschützt, es wird im \n"
-"       Nur-Lese-Modus gemountet."
 
 # That sounds somehow dumb.
-#: mount/mount.c:968
+#: mount/mount.c:994
 #, 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: %s%s ist schreibgeschützt, es wird im\n"
+"       Nur-Lese-Modus gemountet"
 
-#: mount/mount.c:1057
+#: mount/mount.c:1083
 #, fuzzy, c-format
 msgid "mount: going to mount %s by %s\n"
-msgstr "mount: Mounten Sie %s mit Hilfe von '%s'\n"
+msgstr "mount: Ziehen Sie in Betracht %s mit Hilfe von »%s« zu mounten\n"
 
-#: mount/mount.c:1058
+# I think, this should not be translated
+#: mount/mount.c:1084
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1058
+# dito
+#: mount/mount.c:1084
 msgid "label"
 msgstr "label"
 
-#: mount/mount.c:1060 mount/mount.c:1430
+#: mount/mount.c:1086 mount/mount.c:1464
 msgid "mount: no such partition found"
-msgstr "mount: Diese Partition wurde nicht gefunden."
+msgstr "mount: Keine passende Partition gefunden"
 
-#: mount/mount.c:1068
+#: mount/mount.c:1094
 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"
-"       Doppelpunktes wird nfs angenommen.\n"
+"mount: Es wurde kein Typ angegeben - Auf Grund des\n"
+"       Doppelpunktes wird nfs angenommen\n"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1084
+#: mount/mount.c:1110
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
-msgstr "mount: '%s' wird im Hintergrund fortgesetzt.\n"
+msgstr "mount: »%s« wird im Hintergrund fortgesetzt\n"
 
-#: mount/mount.c:1095
+# Not realy nice
+#: mount/mount.c:1121
 #, c-format
 msgid "mount: giving up \"%s\"\n"
-msgstr "mount: '%s' nicht erfolgreich.\n"
+msgstr "mount: »%s« schlug fehl\n"
 
-#: mount/mount.c:1153
+#: mount/mount.c:1181
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s ist bereits auf %s gemountet\n"
 
-#: mount/mount.c:1270
+#: mount/mount.c:1299
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -7551,162 +7547,163 @@ msgid ""
 "       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
+#: mount/mount.c:1448
 msgid "mount: only root can do that"
-msgstr "mount: Die Befehlsausführung ist nur 'root' gestattet."
+msgstr "mount: Nur »root« kann dies tun"
 
-#: mount/mount.c:1419
+#: mount/mount.c:1453
 #, c-format
 msgid "mount: no %s found - creating it..\n"
-msgstr "mount: %s nicht gefunden - wird erstellt...\n"
+msgstr "mount: %s nicht gefunden - Erzeuge sie...\n"
 
-#: mount/mount.c:1432
+#: mount/mount.c:1466
 #, c-format
 msgid "mount: mounting %s\n"
-msgstr "mount: %s wird gemountet.\n"
+msgstr "mount: Mounte %s\n"
 
-#: mount/mount.c:1441
+#: mount/mount.c:1475
 msgid "not mounted anything"
-msgstr "Es wurde nichts gemountet."
+msgstr "Es wurde nichts gemountet"
 
-#: mount/mount.c:1456
+#: mount/mount.c:1490
 #, c-format
 msgid "mount: cannot find %s in %s"
-msgstr "mount: %s wurde in %s nicht gefunden."
+msgstr "mount: Konnte %s nicht in %s finden"
 
-#: mount/mount.c:1471
+#: mount/mount.c:1505
 #, c-format
 msgid "mount: can't find %s in %s or %s"
-msgstr "mount: %s wurde in %s oder %s nicht gefunden."
+msgstr "mount: Konnte %s nicht in %s oder %s finden"
 
-#: mount/mount_by_label.c:99
-#, fuzzy, c-format
+#: 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: %s konnte nicht geöffnet werden - %s wird verwendet.\n"
+msgstr ""
 
-#: mount/mount_by_label.c:201
+#: mount/mount_by_label.c:212
 msgid "mount: bad UUID"
-msgstr "mount: ungültige UUID."
+msgstr "mount: ungültige UUID"
 
-#: mount/mount_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:317
 #, 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"
+msgstr "mount: Es wurde kein Dateisystemtyp für %s angegeben\n"
 
-#: mount/mount_guess_fstype.c:260
+# Maybe:
+# "       Es werden alle Dateisystemtypen ausprpbiert, die\n"
+# "       in %s oder %s aufgelistet sind\n"
+#: mount/mount_guess_fstype.c:320
 #, 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"
+"       Werde alle Dateisystemtypen probieren, die in %s oder %s\n"
+"       aufgelistet sind\n"
 
-#: mount/mount_guess_fstype.c:263
+#: mount/mount_guess_fstype.c:323
 msgid "       and it looks like this is swapspace\n"
 msgstr ""
 
-#: mount/mount_guess_fstype.c:265
+# Maybe: "       Es wird der Typ %s ausprobiert\n"
+# or   : ... "versuchen"
+#: mount/mount_guess_fstype.c:325
 #, c-format
 msgid "       I will try type %s\n"
-msgstr "       Typ %s wird versucht.\n"
+msgstr "       Werde den Typ %s probieren\n"
 
-#: mount/mount_guess_fstype.c:329
+#: mount/mount_guess_fstype.c:401
 #, c-format
 msgid "Trying %s\n"
-msgstr "Probiere %s\n"
+msgstr "Versuche %s\n"
 
-#: mount/nfsmount.c:225
+#: mount/nfsmount.c:232
 msgid "mount: excessively long host:dir argument\n"
-msgstr "mount: Host:Verzeichnis-Argument zu lang.\n"
+msgstr ""
 
-#: mount/nfsmount.c:238
+#: mount/nfsmount.c:245
 msgid "mount: warning: multiple hostnames not supported\n"
-msgstr "mount: Warnung: Mehrere Rechnernamen werden nicht unterstützt.\n"
+msgstr "mount: Mehrere Rechnernamen werden nicht unterstützt\n"
 
-#: mount/nfsmount.c:242
+#: mount/nfsmount.c:249
 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:253 mount/nfsmount.c:510
+#: mount/nfsmount.c:260 mount/nfsmount.c:517
 #, c-format
 msgid "mount: can't get address for %s\n"
-msgstr "mount: Adresse von %s konnte nicht ermittelt werden.\n"
+msgstr "mount: Konnte die Adresse von %s nicht herausfinden\n"
 
-#: mount/nfsmount.c:259
+#: mount/nfsmount.c:266
 msgid "mount: got bad hp->h_length\n"
-msgstr "mount: hp->h_length ungültig.\n"
+msgstr ""
 
-#: mount/nfsmount.c:276
+#: mount/nfsmount.c:283
 msgid "mount: excessively long option argument\n"
-msgstr "mount: Optionsargument zu lang.\n"
+msgstr ""
 
-#: mount/nfsmount.c:368
+#: mount/nfsmount.c:375
 msgid "Warning: Unrecognized proto= option.\n"
-msgstr "Warnung: Unbekannte Option 'proto='.\n"
+msgstr "Warnung: unbekannte »proto=« Option.\n"
 
-#: mount/nfsmount.c:375
+#: mount/nfsmount.c:382
 msgid "Warning: Option namlen is not supported.\n"
-msgstr "Warnung: Option 'namlen' wird nicht unterstützt.\n"
+msgstr "Warnung: Die Option »namlen« wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:379
+#: mount/nfsmount.c:386
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "Unbekannter nfs-Mount-Parameter: %s=%d\n"
 
-#: mount/nfsmount.c:414
+#: mount/nfsmount.c:421
 msgid "Warning: option nolock is not supported.\n"
-msgstr "Warnung: Option 'nolock' wird nicht unterstützt.\n"
+msgstr "Warnung: Die Option »nolock« wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:419
+#: mount/nfsmount.c:426
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
-msgstr "Unbekannte nfs-Mount-Option: %s%s\n"
+msgstr "unbekannte nfs-Mount-Option: %s%s\n"
 
-#: mount/nfsmount.c:516
+#: mount/nfsmount.c:523
 msgid "mount: got bad hp->h_length?\n"
-msgstr "mount: hp->h_length ungültig?\n"
+msgstr ""
 
-#: mount/nfsmount.c:692
+#: mount/nfsmount.c:709
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS über TCP wird nicht unterstützt.\n"
 
-#: mount/nfsmount.c:699
+#: mount/nfsmount.c:716
 msgid "nfs socket"
-msgstr "nfs socket"
+msgstr ""
 
-#: mount/nfsmount.c:703
+#: mount/nfsmount.c:720
 msgid "nfs bindresvport"
-msgstr "nfs bindresvport"
+msgstr ""
 
-#: mount/nfsmount.c:714
+#: mount/nfsmount.c:731
 msgid "used portmapper to find NFS port\n"
-msgstr "NFS-Post mit Portmapper gefunden.\n"
+msgstr ""
 
-#: mount/nfsmount.c:718
+#: mount/nfsmount.c:735
 #, c-format
 msgid "using port %d for nfs deamon\n"
-msgstr "Port %d wird für nfs-Dämon verwendet.\n"
+msgstr ""
 
-#: mount/nfsmount.c:729
+#: mount/nfsmount.c:746
 msgid "nfs connect"
-msgstr "nfs connect"
+msgstr ""
 
-#: mount/nfsmount.c:816
+#: mount/nfsmount.c:833
 #, c-format
 msgid "unknown nfs status return value: %d"
-msgstr "Unbekannter Rückgabewert für nfs-Status: %d"
+msgstr ""
 
 #: mount/sundries.c:66
 msgid "bug in xstrndup call"
-msgstr "Fehler beim Aufruf von xstrndup"
+msgstr "Fehler im Aufruf von xstrndup (s==NULL)"
 
 #: mount/swapon.c:51
 #, c-format
@@ -7716,7 +7713,7 @@ msgid ""
 "       %s [-v] [-p priority] special ...\n"
 "       %s [-s]\n"
 msgstr ""
-"Verwendung: %s [-hV]\n"
+"Aufruf: %s [-hV]\n"
 "        %s -a [-v]\n"
 "        %s [-v] [-p Priorität] Spezialdatei ...\n"
 "        %s [-s]\n"
@@ -7731,180 +7728,183 @@ msgstr "%s für %s\n"
 #: mount/swapon.c:93
 #, c-format
 msgid "swapon: cannot stat %s: %s\n"
-msgstr "swapon: 'stat' konnte nicht auf %s angewandt werden: %s\n"
+msgstr "swapon: Konnte »stat« nicht auf %s anwenden: %s\n"
 
 # "Modus"
 #: mount/swapon.c:100
 #, c-format
 msgid "swapon: warning: %s has insecure permissions %04o, 0600 suggested\n"
 msgstr ""
-"swapon: Warnung: %s hat unsichere Zugriffsrechte (%04o),\n"
-"        0600 wird empfohlen.\n"
+"swapon: Warnung: Die Zugriffsrechte (%2$04o) von %1$s sind unsicher,\n"
+"        0600 wird empfohlen\n"
 
 # holes
 #: mount/swapon.c:108
 #, c-format
 msgid "swapon: Skipping file %s - it appears to have holes.\n"
-msgstr ""
-"swapon: Datei %s wird übersprungen - sie enthält unzusammenhängende "
-"Bereiche.\n"
+msgstr "swapon: Überspringe die Datei %s - sie scheint »holes« zu enthalten.\n"
 
 #: mount/swapon.c:213
 #, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr "%s: %s konnte nicht geöffnet werden: %s\n"
+msgstr "%s: Konnte %s nicht öffnen: %s\n"
 
 # XXX - "einkompiliert"
-#: mount/umount.c:69
+#: mount/umount.c:72
 msgid "umount: compiled without support for -f\n"
-msgstr "umount: Die Unterstützung für -f wurde nicht einkompiliert.\n"
+msgstr "umount: Die Unterstützung für -f wurde nicht einkompiliert\n"
 
-#: mount/umount.c:121
+#: mount/umount.c:128
 #, c-format
 msgid "host: %s, directory: %s\n"
-msgstr "Host: %s, Verzeichnis: %s\n"
+msgstr "Rechner: %s, Verzeichnis: %s\n"
 
-#: mount/umount.c:138
+#: mount/umount.c:148
 #, c-format
 msgid "umount: can't get address for %s\n"
-msgstr "umount: Adresse von %s konnte nicht ermittelt werden.\n"
+msgstr "umount: Konnte die Adresse von %s nicht herausfinden\n"
 
-#: mount/umount.c:143
+#: mount/umount.c:153
 msgid "umount: got bad hostp->h_length\n"
-msgstr "umount: hostp->h_length ungültig.\n"
+msgstr ""
 
-#: mount/umount.c:181
+#: mount/umount.c:191
 #, c-format
 msgid "umount: %s: invalid block device"
-msgstr "umount: %s ist kein gültiges blockorientiertes Gerät."
+msgstr "umount: %s: kein gültiges blockorientiertes Gerät"
 
-#: mount/umount.c:183
+#: mount/umount.c:193
 #, c-format
 msgid "umount: %s: not mounted"
-msgstr "umount: %s ist nicht gemountet."
+msgstr "umount: %s ist nicht gemountet"
 
-#: mount/umount.c:185
+#: mount/umount.c:195
 #, c-format
 msgid "umount: %s: can't write superblock"
-msgstr "umount: %s: Schreiben des 'Superblocks' nicht möglich."
+msgstr "umount: %s: Konnte den »Superblock« nicht schreiben"
 
+# XXX - I did have a better one for busy
+# libc.po:
+# "Device or resource busy"
+# "Das Gerät oder die Ressource ist belegt"
 #. Let us hope fstab has a line "proc /proc ..."
 #. and not "none /proc ..."
-#: mount/umount.c:189
+#: mount/umount.c:199
 #, c-format
 msgid "umount: %s: device is busy"
-msgstr "umount: %s: Das Gerät ist in Gebrauch."
+msgstr "umount: %s: Das Gerät wird momenten noch benutzt"
 
-#: mount/umount.c:191
+#: mount/umount.c:201
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: Nicht gefunden"
 
-#: mount/umount.c:193
+#: mount/umount.c:203
 #, c-format
 msgid "umount: %s: must be superuser to umount"
-msgstr "umount: %s: Der Befehl 'umount' kann nur vom Superuser ausgeführt werden."
+msgstr ""
 
-#: mount/umount.c:195
+#: mount/umount.c:205
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr ""
-"umount: %s: blockorientierte Geräte sind im Dateisystem nicht zulässig."
 
-#: mount/umount.c:197
+#: mount/umount.c:207
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:241
+#: mount/umount.c:252
+#, fuzzy
 msgid "no umount2, trying umount...\n"
-msgstr "umount2 nicht vorhanden, umount wird versucht.\n"
+msgstr "kein umount2, versuche umount...\n"
 
-#: mount/umount.c:254
-#, c-format
+#: mount/umount.c:268
+#, fuzzy, c-format
 msgid "could not umount %s - trying %s instead\n"
-msgstr "umount %s war nicht möglich - stattdessen wird %s versucht.\n"
+msgstr "konnte %s nicht umounten - versuche %s stattdessen\n"
 
-#: mount/umount.c:272
-#, c-format
+# XXX
+#: mount/umount.c:286
+#, fuzzy, c-format
 msgid "umount: %s busy - remounted read-only\n"
-msgstr "umount: %s ist in Gebrauch - mit Schreibschutz erneut gemountet.\n"
+msgstr "umount: %s wird momentan noch benutzt - remounted read-only\n"
 
-#: mount/umount.c:282
+#: mount/umount.c:296
 #, c-format
 msgid "umount: could not remount %s read-only\n"
-msgstr "umount: Erneutes Mounten nicht möglich, %s ist schreibgeschützt.\n"
+msgstr ""
 
-#: mount/umount.c:290
+#: mount/umount.c:305
 #, c-format
 msgid "%s umounted\n"
-msgstr "%s nicht gemountet\n"
+msgstr ""
 
-#: mount/umount.c:374
+#: mount/umount.c:392
 msgid "umount: cannot find list of filesystems to unmount"
-msgstr "umount: Dateisystemliste für Unmount-Vorgang wurde nicht gefunden."
+msgstr "umount: Kann die Liste der Dateisysteme zum unmounten nicht finden"
 
-#: mount/umount.c:403
+#: mount/umount.c:421
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
 "       umount [-f] [-r] [-n] [-v] special | node...\n"
 msgstr ""
-"Verwendung: umount [-hV]\n"
+"Aufruf: umount [-hV]\n"
 "        umoumt -a [-f] [-r] [-n] [-v] [-t VFS-Typen]\n"
 "        umount [-f] [-r] [-n] [-v] Spezialdatei | Verzeichnis ...\n"
 
-#: mount/umount.c:464
+#: mount/umount.c:486
 msgid "umount: only root can do that"
-msgstr "umount: Kann nur von 'root' ausgeführt werden"
+msgstr "umount: Nur »root« kann dies tun"
 
-#: mount/umount.c:479
+#: mount/umount.c:501
 #, c-format
 msgid "Trying to umount %s\n"
-msgstr "Es wird versucht, %s zu unmounten.\n"
+msgstr "Versuche %s zu umounten\n"
 
-#: mount/umount.c:483
+#: mount/umount.c:505
 #, c-format
 msgid "Could not find %s in mtab\n"
-msgstr "%s wurde nicht in mtab gefunden.\n"
+msgstr "Konnte %s nicht in »mtab« finden\n"
 
-#: mount/umount.c:487
+#: mount/umount.c:509
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
-msgstr "umount: %s ist laut 'mtab' nicht gemountet."
+msgstr "umount: %s ist laut »mtab« nicht gemountet"
 
-#: mount/umount.c:489
+#: mount/umount.c:511
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
-msgstr "umount: %s ist mehrfach gemountet."
+msgstr "umount: %s scheint mehrfach gemountet zu sein"
 
-#: mount/umount.c:501
+#: mount/umount.c:523
 #, 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')"
+msgstr "umount: fstab enthält %s nicht (Nur root kann es unmounten)"
 
-#: mount/umount.c:504
+#: mount/umount.c:526
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
-msgstr "umount: %s mount stimmt nicht mit fstab überein."
+msgstr ""
 
-#: mount/umount.c:525
+#: mount/umount.c:547
 #, c-format
 msgid "umount: only root can unmount %s from %s"
-msgstr "umount: Nur 'root' kann %s von %s unmounten."
+msgstr "umount: Nur »root« kann %s von %s unmounten"
 
-#: mount/umount.c:536
+#: mount/umount.c:558
 #, c-format
 msgid "umount: only %s can unmount %s from %s"
-msgstr "umount: Nur %s kann %s von %s unmounten."
+msgstr "umount: Nur %s kann %s von %s unmounten"
 
-#: sys-utils/ctrlaltdel.c:26
+#: sys-utils/ctrlaltdel.c:27
 msgid "You must be root to set the Ctrl-Alt-Del behaviour.\n"
-msgstr "Nur 'root' kann das Verhalten von Strg-Alt-Entf ändern.\n"
+msgstr "Nur root kann das Verhalten bei Strg-Alt-Entf ändern.\n"
 
-#: sys-utils/ctrlaltdel.c:41
+#: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
-msgstr "Verwendung: ctrlaltdel hard|soft\n"
+msgstr "Aufruf: ctrlaltdel hard|soft\n"
 
 #: sys-utils/cytune.c:120
 #, c-format
@@ -7912,8 +7912,6 @@ msgid ""
 "File %s, For threshold value %lu, Maximum characters in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Datei %s: Für 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:131
 #, c-format
@@ -7922,34 +7920,31 @@ msgid ""
 "in fifo were %d,\n"
 "and the maximum transfer rate in characters/second was %f\n"
 msgstr ""
-"Datei %s: Für den Schwellenwert %lu und den Timeout-Wert %lu betrug die "
-"Höchstzahl im FIFO %d Zeichen,\n"
-"und die maximale Übertragungsrate betrug %f Zeichen/s.\n"
 
 #: sys-utils/cytune.c:196
 #, c-format
 msgid "Invalid interval value: %s\n"
-msgstr "Ungültiger Intervallwert: %s\n"
+msgstr ""
 
 #: sys-utils/cytune.c:204
 #, c-format
 msgid "Invalid set value: %s\n"
-msgstr "Ungültiger Sollwert: %s\n"
+msgstr ""
 
 #: sys-utils/cytune.c:212
 #, c-format
 msgid "Invalid default value: %s\n"
-msgstr "Ungültiger Standardwert: %s\n"
+msgstr ""
 
 #: sys-utils/cytune.c:220
 #, c-format
 msgid "Invalid set time value: %s\n"
-msgstr "Ungültiger Timer-Sollwert: %s\n"
+msgstr ""
 
 #: sys-utils/cytune.c:228
 #, c-format
 msgid "Invalid default time value: %s\n"
-msgstr "Ungültiger Timer-Standardwert: %s\n"
+msgstr ""
 
 #: sys-utils/cytune.c:245
 #, c-format
@@ -7957,148 +7952,143 @@ msgid ""
 "Usage: %s [-q [-i interval]] ([-s value]|[-S value]) ([-t value]|[-T value]) "
 "[-g|-G] file [file...]\n"
 msgstr ""
-"Verwendung: %s [-q [-i Interval]] ([-s Wert]|[-S Wert]) ([-t Wert]|[-T "
-"Wert]) [-g|-G] Datei [Datei...]\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 "%s kann nicht geöffnet werden: %s\n"
+msgstr "Konnte %s nicht öffnen: %s\n"
 
 #: sys-utils/cytune.c:264
 #, c-format
 msgid "Can't set %s to threshold %d: %s\n"
-msgstr "%s kann nicht auf den Schwellenwert %d gesetzt werden: %s\n"
+msgstr ""
 
 #: sys-utils/cytune.c:282
 #, c-format
 msgid "Can't set %s to time threshold %d: %s\n"
-msgstr "%s kann nicht auf den Timer-Schwellenwert %d gesetzt werden: %s\n"
+msgstr ""
 
 #: 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 "Schwellenwert für %s kann nicht ermittelt werden: %s\n"
+msgstr ""
 
 #: 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 "Timeout-Wert für %s kann nicht ermittelt werden: %s\n"
+msgstr ""
 
 #: sys-utils/cytune.c:309
 #, c-format
 msgid "%s: %ld %s threshold and %ld %s timeout\n"
-msgstr "%s: %ld %s Schwellenwert und %ld %s Timeout-Wert\n"
+msgstr ""
 
 #: sys-utils/cytune.c:311 sys-utils/cytune.c:313
 msgid "current"
-msgstr "aktueller"
+msgstr ""
 
 #: sys-utils/cytune.c:311 sys-utils/cytune.c:313
 msgid "default"
-msgstr "standarmäßiger"
+msgstr ""
 
 #: sys-utils/cytune.c:330
 msgid "Can't set signal handler"
-msgstr "Signal-Handler kann nicht festgelegt werden."
+msgstr ""
 
 #: sys-utils/cytune.c:334 sys-utils/cytune.c:369
 msgid "gettimeofday failed"
-msgstr "gettimeofday nicht erfolgreich."
+msgstr ""
 
 #: sys-utils/cytune.c:347 sys-utils/cytune.c:379
 #, c-format
 msgid "Can't issue CYGETMON on %s: %s\n"
-msgstr "CYGETMON ist bei %s nicht möglich: %s\n"
+msgstr ""
 
 #: sys-utils/cytune.c:421
 #, c-format
 msgid "%s: %lu ints, %lu/%lu chars; "
-msgstr "%s: %lu Ganzzahlen, %lu/%lu Zeichen; "
+msgstr ""
 
 #: sys-utils/cytune.c:422
 #, c-format
 msgid "fifo: %lu thresh, %lu tmout, "
-msgstr "fifo: %lu Schwellenwert, %lu Timeout, "
+msgstr ""
 
 #: sys-utils/cytune.c:423
 #, c-format
 msgid "%lu max, %lu now\n"
-msgstr "%lu Maximalwert, %lu Istwert\n"
+msgstr ""
 
 #: sys-utils/cytune.c:428
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
-msgstr "   %f Int/s; %f Empfang, %f Übertragen (Zeichen/s)\n"
+msgstr ""
 
 #: 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 Zeichen; FIFO: %lu Schwellenwert, %lu Timeout, %lu "
-"Maximalwert, %lu Istwert\n"
 
 #: sys-utils/cytune.c:438
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
-msgstr "   %f Int/s; %f Empfang (Zeichen/s)\n"
+msgstr ""
 
 # "Level"
 #: 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"
+msgstr "Aufruf: %s [-c] [-n Level] [-s Puffergröße]\n"
 
 #: sys-utils/ipcrm.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "invalid id: %s\n"
-msgstr "Ungültiger Wert: %s\n"
+msgstr ""
 
 #: sys-utils/ipcrm.c:77
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove id %s (%s)\n"
-msgstr "%s %s kann nicht geöffnet werden.\n"
+msgstr ""
 
 #: sys-utils/ipcrm.c:91
 #, fuzzy, c-format
 msgid "usage: %s {shm | msg | sem} id ...\n"
-msgstr "Verwendung: %s [shm | msg | sem] id\n"
+msgstr "Aufruf: %s {shm | msg | sem} Id ...\n"
 
 #: sys-utils/ipcrm.c:124
-#, fuzzy, c-format
+#, c-format
 msgid "unknown resource type: %s\n"
-msgstr "Unbekannter nfs-Mount-Parameter: %s=%d\n"
+msgstr ""
 
 #: sys-utils/ipcrm.c:128
-#, fuzzy
 msgid "resource(s) deleted\n"
-msgstr "Ressource gelöscht\n"
+msgstr ""
 
 #: sys-utils/ipcs.c:122
 #, c-format
 msgid "usage : %s -asmq -tclup \n"
-msgstr "Verwendung: %s -asmq -tclup \n"
+msgstr "Aufruf: %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"
+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 für Hilfe.\n"
+msgstr "\t%s -h für weitere Informationen.\n"
 
 #: sys-utils/ipcs.c:130
 #, c-format
 msgid "%s provides information on ipc facilities for"
-msgstr "%s zeigt Informationen über IPC-Einrichtungen an,"
+msgstr ""
 
 #: sys-utils/ipcs.c:131
 msgid " which you have read access.\n"
-msgstr "für die Sie Lesezugriff haben.\n"
+msgstr ""
 
 #: sys-utils/ipcs.c:132
 msgid ""
@@ -8106,17 +8096,12 @@ msgid ""
 "\t-m : shared_mem\n"
 "\t-q : messages\n"
 msgstr ""
-"Ressourcenspezifikation:\n"
-"\t-m : gem. Speicher\n"
-"\t-q : Nachrichten\n"
 
 #: sys-utils/ipcs.c:133
 msgid ""
 "\t-s : semaphores\n"
 "\t-a : all (default)\n"
 msgstr ""
-"\t-s : Semaphores\n"
-"\t-a : alle (Standardwert)\n"
 
 #: sys-utils/ipcs.c:134
 msgid ""
@@ -8125,756 +8110,735 @@ msgid ""
 "\t-p : pid\n"
 "\t-c : creator\n"
 msgstr ""
-"Ausgabeformat:\n"
-"\t-t : Zeit\n"
-"\t-p : PID\n"
-"\t-c : Ersteller\n"
 
 #: sys-utils/ipcs.c:135
 msgid ""
 "\t-l : limits\n"
 "\t-u : summary\n"
 msgstr ""
-"\t-l : Limit\n"
-"\t-u : Übersicht\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] : Details der Ressource werden durch 'id' identifiziert\n"
 
-#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:470
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:491
 msgid "kernel not configured for shared memory\n"
 msgstr ""
-"Der Kernel ist nicht für gemeinsam verwendeten Speicher konfiguriert.\n"
 
 #: sys-utils/ipcs.c:274
 msgid "------ Shared Memory Limits --------\n"
-msgstr "Grenzwerte für gemeinsamen Speicher \n"
+msgstr ""
 
-#: sys-utils/ipcs.c:277
+#. 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 = %d\n"
-msgstr "Max. Anzahl Segmente = %d\n"
+msgid "max number of segments = %ld\n"
+msgstr "Maximale Anzahl der Segmente = %ld\n"
 
-#: sys-utils/ipcs.c:278
+#: sys-utils/ipcs.c:281
 #, c-format
-msgid "max seg size (kbytes) = %d\n"
-msgstr "Max. Segmentgröße (KB) = %d\n"
+msgid "max seg size (kbytes) = %ld\n"
+msgstr "Maximale Segmentgröße (kB) = %ld\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:283
 #, c-format
-msgid "max total shared memory (kbytes) = %d\n"
-msgstr "Max. Größe für gemeinsamen Speicher (KB) = %d\n"
+msgid "max total shared memory (kbytes) = %ld\n"
+msgstr ""
 
-#: 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:285
+#, fuzzy, c-format
+msgid "min seg size (bytes) = %ld\n"
+msgstr "Minimale Segmentgröße (Bytes) = %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:290
 msgid "------ Shared Memory Status --------\n"
-msgstr "- Status des gemeinsamen Speichers -\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:291
 #, c-format
 msgid "segments allocated %d\n"
-msgstr "Zugeordnete Segmente %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:292
 #, c-format
 msgid "pages allocated %ld\n"
-msgstr "Zugeordnete Seiten %ld\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:287
+#: sys-utils/ipcs.c:293
 #, c-format
 msgid "pages resident  %ld\n"
-msgstr "Speicherresidente Seiten %ld\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:288
+#: sys-utils/ipcs.c:294
 #, c-format
 msgid "pages swapped   %ld\n"
-msgstr "Ausgelagerte Seiten %ld\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:295
 #, c-format
 msgid "Swap performance: %ld attempts\t %ld successes\n"
-msgstr "Auslagerungsleistung: %ld Versuche\t %ld Erfolge\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
-msgstr "- Gemeinsame Speichersegmente: Ersteller/Eigentümer -\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:415 sys-utils/ipcs.c:514
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: 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
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:318 sys-utils/ipcs.c:422
 msgid "shmid"
-msgstr "shmid"
+msgstr ""
 
-#: 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
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:319 sys-utils/ipcs.c:416
+#: sys-utils/ipcs.c:431 sys-utils/ipcs.c:515 sys-utils/ipcs.c:532
+#, fuzzy
 msgid "perms"
-msgstr "perms"
+msgstr "Rechte"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:416 sys-utils/ipcs.c:515
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:416 sys-utils/ipcs.c:515
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:416 sys-utils/ipcs.c:515
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:515
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:306
 msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
-msgstr "- Gemeinsamer Speicher: Anfüge-/Trenn-/Änderungszeiten -\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:301
+#: 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: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
+#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:313 sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:422 sys-utils/ipcs.c:431 sys-utils/ipcs.c:521
+#: sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
+#, fuzzy
 msgid "owner"
-msgstr "Eigentümer"
+msgstr "Besitzer"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:308
 msgid "attached"
-msgstr "Angefügt"
+msgstr ""
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:308
 msgid "detached"
-msgstr "Getrennt"
+msgstr ""
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:308
 msgid "changed"
-msgstr "Geändert"
+msgstr ""
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:312
 msgid "------ Shared Memory Creator/Last-op --------\n"
-msgstr "Gemeinsamer Speicher: Ersteller/Letzte Oper. \n"
+msgstr ""
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:526
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:313
 msgid "cpid"
-msgstr "cpid"
+msgstr ""
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:313
 msgid "lpid"
-msgstr "lpid"
+msgstr ""
 
-#: sys-utils/ipcs.c:311
+#: sys-utils/ipcs.c:317
 msgid "------ Shared Memory Segments --------\n"
-msgstr "---- Gemeinsame Speichersegmente -----\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:312
+#: 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:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:318 sys-utils/ipcs.c:431 sys-utils/ipcs.c:531
 msgid "key"
-msgstr "Schlüssel"
+msgstr ""
 
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:319
 msgid "bytes"
-msgstr "Byte"
+msgstr "Bytes"
 
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:319
 msgid "nattch"
-msgstr "nattach"
+msgstr ""
 
-#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:319 sys-utils/ipcs.c:431
 msgid "status"
 msgstr "Status"
 
-#: 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:340 sys-utils/ipcs.c:342 sys-utils/ipcs.c:344
+#: sys-utils/ipcs.c:452 sys-utils/ipcs.c:454 sys-utils/ipcs.c:552
+#: sys-utils/ipcs.c:554 sys-utils/ipcs.c:556 sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:611 sys-utils/ipcs.c:641 sys-utils/ipcs.c:643
+#: sys-utils/ipcs.c:645 sys-utils/ipcs.c:669
+#, fuzzy
+msgid "Not set\n"
+msgstr "Nicht gesetzt\n"
 
-#: sys-utils/ipcs.c:355
+#: sys-utils/ipcs.c:369
 msgid "dest"
-msgstr "Ziel"
+msgstr ""
 
-#: sys-utils/ipcs.c:356
+#: sys-utils/ipcs.c:370
 msgid "locked"
-msgstr "Gesperrt"
+msgstr ""
 
-#: sys-utils/ipcs.c:376
+#: sys-utils/ipcs.c:390
 msgid "kernel not configured for semaphores\n"
-msgstr "Kernel ist nicht für Semaphores konfiguriert.\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:396
 msgid "------ Semaphore Limits --------\n"
-msgstr "----- Semaphore-Grenzwerte -----\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:400
 #, c-format
 msgid "max number of arrays = %d\n"
-msgstr "Höchstzahl Datenfelder = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:387
+#: sys-utils/ipcs.c:401
 #, c-format
 msgid "max semaphores per array = %d\n"
-msgstr "Höchstzahl Semaphores pro Datenfeld = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:402
 #, c-format
 msgid "max semaphores system wide = %d\n"
-msgstr "Höchstzahl Semaphores im System = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:403
 #, c-format
 msgid "max ops per semop call = %d\n"
-msgstr "Höchstzahl Operationen pro Semaphore-Aufruf = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:404
 #, c-format
 msgid "semaphore max value = %d\n"
-msgstr "Semaphore-Höchstwert = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:408
 msgid "------ Semaphore Status --------\n"
-msgstr "------ Semaphore-Status --------\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:409
 #, c-format
 msgid "used arrays = %d\n"
-msgstr "Verwendete Datenfelder = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "allocated semaphores = %d\n"
-msgstr "Zugewiesene Semaphores = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:414
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
-msgstr "- Semaphore-Datenfelder: Ersteller/Eigentümer --\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416 sys-utils/ipcs.c:431
 msgid "semid"
-msgstr "semid"
+msgstr ""
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:420
 msgid "------ Shared Memory Operation/Change Times --------\n"
-msgstr "- Gemeinsamer Speicher: Operations-/Änderungszeit --\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:408
+#: sys-utils/ipcs.c:422
 msgid "last-op"
-msgstr "last-op"
+msgstr ""
 
-#: sys-utils/ipcs.c:408
+#: sys-utils/ipcs.c:422
 msgid "last-changed"
-msgstr "last-changed"
+msgstr ""
 
-#: sys-utils/ipcs.c:415
+#: sys-utils/ipcs.c:429
 msgid "------ Semaphore Arrays --------\n"
-msgstr "---- Semaphore-Datenfelder -----\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:416
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:431
 msgid "nsems"
-msgstr "nsems"
+msgstr ""
 
-#: sys-utils/ipcs.c:478
+#: sys-utils/ipcs.c:499
 msgid "------ Messages: Limits --------\n"
-msgstr "---- Nachrichten: Grenzwerte ---\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:500
 #, c-format
 msgid "max queues system wide = %d\n"
-msgstr "Höchstzahl Warteschlangen im = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:480
+#: sys-utils/ipcs.c:501
 #, c-format
 msgid "max size of message (bytes) = %d\n"
-msgstr "Höchstzahl Nachrichten (Byte) = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:502
 #, c-format
 msgid "default max size of queue (bytes) = %d\n"
-msgstr "Standard-Maximalgröße der Warteschlange (Byte) = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:485
+#: sys-utils/ipcs.c:506
 msgid "------ Messages: Status --------\n"
-msgstr "----- Nachrichten: Status ------\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:486
+#: sys-utils/ipcs.c:507
 #, c-format
 msgid "allocated queues = %d\n"
-msgstr "Zugewiesene Warteschlangen = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:508
 #, c-format
 msgid "used headers = %d\n"
-msgstr "Verwendete Kopfzeilen = %d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:509
 #, c-format
 msgid "used space = %d bytes\n"
-msgstr "Verwendeter Speicherplatz = %d Byte\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:513
 msgid "------ Message Queues: Creators/Owners --------\n"
-msgstr "- Nachr.-Warteschlangen: Ersteller/Eigentümer -\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:515 sys-utils/ipcs.c:521 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:531
 msgid "msqid"
-msgstr "msqid"
+msgstr ""
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:519
 msgid "------ Message Queues Send/Recv/Change Times --------\n"
-msgstr "Nachr.-Warteschlangen: Sende-/Empfangs-/Änderungszeit\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:521
 msgid "send"
-msgstr "Senden"
+msgstr ""
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:521
 msgid "recv"
-msgstr "Empfangen"
+msgstr ""
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:521
 msgid "change"
-msgstr "Ändern"
+msgstr ""
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:525
 msgid "------ Message Queues PIDs --------\n"
-msgstr "- Nachrichtenwarteschlangen-PIDs --\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:526
 msgid "lspid"
-msgstr "lspid"
+msgstr ""
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:526
 msgid "lrpid"
-msgstr "lrpid"
+msgstr ""
 
-#: sys-utils/ipcs.c:509
+#: sys-utils/ipcs.c:530
 msgid "------ Message Queues --------\n"
-msgstr "-- Nachrichtenwarteschlagen --\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:531
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
-msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:532
 msgid "used-bytes"
-msgstr "used-bytes"
+msgstr ""
 
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:532
 msgid "messages"
-msgstr "Nachrichten"
+msgstr ""
 
-#: sys-utils/ipcs.c:570
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid ""
 "\n"
 "Shared memory Segment shmid=%d\n"
 msgstr ""
-"\n"
-"Gemeinsames Speichersegment shmid=%d\n"
 
-#: sys-utils/ipcs.c:571
+# similiar message below.
+#: sys-utils/ipcs.c:601
 #, c-format
 msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
-msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:573
+# similiar message below.
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
-msgstr "Modus=%#o\taccess_perms=%#o\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:605
 #, c-format
-msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
-msgstr "Byte=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
+msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:577
+#: sys-utils/ipcs.c:608
 #, c-format
 msgid "att_time=%s"
-msgstr "att_time=%s"
-
-#: sys-utils/ipcs.c:578 sys-utils/ipcs.c:580 sys-utils/ipcs.c:629
-msgid "Not set\n"
-msgstr "Nicht festgelegt\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:579
+#: sys-utils/ipcs.c:610
 #, c-format
 msgid "det_time=%s"
-msgstr "det_time=%s"
+msgstr ""
 
-#: sys-utils/ipcs.c:581
-#, c-format
+#: sys-utils/ipcs.c:612 sys-utils/ipcs.c:644
+#, fuzzy, c-format
 msgid "change_time=%s"
-msgstr "change_time=%s"
+msgstr "Änderungszeit = %s"
 
-#: sys-utils/ipcs.c:597
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid ""
 "\n"
 "Message Queue msqid=%d\n"
 msgstr ""
-"\n"
-"Nachrichtenwarteschlange msqid=%d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:629
 #, 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"
+msgstr ""
 
-#: sys-utils/ipcs.c:600
+#: sys-utils/ipcs.c:631
 #, 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"
+msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+msgstr ""
 
-#: 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:640
+#, fuzzy, c-format
+msgid "send_time=%s"
+msgstr "Änderungszeit = %s"
 
-#: 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:642
+#, fuzzy, c-format
+msgid "rcv_time=%s"
+msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:662
 #, c-format
 msgid ""
 "\n"
 "Semaphore Array semid=%d\n"
 msgstr ""
-"\n"
-"Semaphore-Datenfeld semid=%d\n"
 
-#: sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:663
 #, 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:626
+#: sys-utils/ipcs.c:665
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
-msgstr "Modus=%#o, Zugriffsrechte=%#o\n"
+msgstr ""
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:667
 #, c-format
-msgid "nsems = %d\n"
-msgstr "nsems = %d\n"
+msgid "nsems = %ld\n"
+msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:668
 #, c-format
 msgid "otime = %s"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:630
+#: sys-utils/ipcs.c:670
 #, c-format
 msgid "ctime = %s"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:672
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:673
 msgid "semnum"
-msgstr "semnum"
+msgstr ""
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:673
+#, fuzzy
 msgid "value"
 msgstr "Wert"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:673
 msgid "ncount"
-msgstr "ncount"
+msgstr ""
 
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:673
 msgid "zcount"
-msgstr "zcount"
+msgstr ""
 
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:673
 msgid "pid"
-msgstr "pid"
+msgstr "Pid"
 
-#: sys-utils/rdev.c:67
+#: sys-utils/rdev.c:68
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
-msgstr "Verwendung: rdev [ -rsv ] [ -o OFFSET ] [ BILD [ WERT [ OFFSET ] ] ]"
+msgstr ""
 
-#: sys-utils/rdev.c:68
+# Oh well, "ROOT-Gerät" sounds sooo stupid
+#: sys-utils/rdev.c:69
+#, fuzzy
 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"
+"  rdev /dev/fd0  (oder rdev /linux, etc.) zeigt das aktuelle ROOT-Gerät an"
 
-#: sys-utils/rdev.c:69
+#: sys-utils/rdev.c:70
 msgid "  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"
-msgstr "  rdev /dev/fd0 /dev/hda2         setzt ROOT auf /dev/hda2"
+msgstr ""
 
-#: sys-utils/rdev.c:70
+#: sys-utils/rdev.c:71
 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:71
+#: sys-utils/rdev.c:72
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
-msgstr "  rdev -s /dev/fd0 /dev/hda2      legt SWAP-Gerät fest"
+msgstr ""
 
-#: sys-utils/rdev.c:72
+#: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
-msgstr "  rdev -r /dev/fd0 627            legt Größe der RAMDISK fest"
+msgstr ""
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
-msgstr "  rdev -v /dev/fd0 1              legt VIDEOMODUS für Bootvorgang fest"
+msgstr ""
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
-msgstr "  rdev -o N ...                   verwendet Byteoffset N"
+msgstr ""
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:76
+#, fuzzy
 msgid "  rootflags ...                   same as rdev -R"
-msgstr "  rootflags ...                   identisch mit rdev -R"
+msgstr "  rootflags ...                   Das gleiche wie rdev -R"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:77
+#, fuzzy
 msgid "  swapdev ...                     same as rdev -s"
-msgstr "  swapdev ...                     identisch mit rdev -s"
+msgstr "  swapdev ...                     Das gleiche wie rdev -s"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:78
+#, fuzzy
 msgid "  ramsize ...                     same as rdev -r"
-msgstr "  ramsize ...                     identisch mit rdev -r"
+msgstr "  ramsize ...                     Das gleiche wie rdev -r"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:79
+#, fuzzy
 msgid "  vidmode ...                     same as rdev -v"
-msgstr "  vidmode ...                     identisch mit rdev -v"
+msgstr "  vidmode ...                     Das gleiche wie rdev -v"
 
-#: sys-utils/rdev.c:79
+#: sys-utils/rdev.c:80
 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:80
+#: sys-utils/rdev.c:81
 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 "
-"'root' Lese- und Schreibzugriff."
 
-#: sys-utils/readprofile.c:52
+#: sys-utils/readprofile.c:54
 #, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (default = \"%s\")\n"
 "\t -p <pro-file> (default = \"%s\")\n"
+"\t -M <mult>     set the profiling multiplier to <mult>\n"
 "\t -i            print only info about the sampling step\n"
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
 "\t -r            reset all the counters (root only)\n"
 "\t -V            print version and exit\n"
 msgstr ""
-"%s: Verwendung: \"%s [Optionen]\n"
-"\t -m <Zuordnungsdatei> (Standard = \"%s\")\n"
-"\t -p <Dateiname>       (Standard = \"%s\")\n"
-"\t -i                   nur Informationen über Sampling-Schritt anzeigen\n"
-"\t -v                   ausführliche Daten anzeigen\n"
-"\t -a                   alle Zeichen anzeigen, auch wenn Anzahl 0 ist\n"
-"\t -r                   alle Zähler zurücksetzen (nur root)\n"
-"\t -V                   Version anzeigen und beenden\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 "beliebig\n"
+msgstr "%s Version %s\n"
 
-#: sys-utils/readprofile.c:157
+#: sys-utils/readprofile.c:175
 #, c-format
 msgid "Sampling_step: %i\n"
-msgstr "Sampling_step: %i\n"
+msgstr ""
 
-#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
+#: sys-utils/readprofile.c:188 sys-utils/readprofile.c:211
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
-msgstr "%s: %s(%i): falsche Zuordnungszeile\n"
+msgstr ""
 
-#: sys-utils/readprofile.c:183
+#: sys-utils/readprofile.c:199
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
-msgstr "%s: Suchtext wurde in %s nicht gefunden.\n"
+msgstr "%s: Konnte \"_stext\" nicht in %s finden\n"
 
-#: sys-utils/readprofile.c:226
+#: sys-utils/readprofile.c:242
 msgid "total"
-msgstr "Gesamt"
+msgstr ""
 
-#: sys-utils/renice.c:67
+#: sys-utils/renice.c:68
 msgid ""
 "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
 msgstr ""
-"Verwendung: renice Priorität [[-p] PIDs ] [[-g] PGRPs ] [[-u] Benutzernamen "
-"]\n"
+"Aufruf: renice Priorität [[-p] PIDs ] [[-g] PGRPs ] [[-u] Benutzernamen ]\n"
 
-#: sys-utils/renice.c:94
+#: sys-utils/renice.c:95
 #, c-format
 msgid "renice: %s: unknown user\n"
 msgstr "renice: Unbekannter Benutzer: %s\n"
 
-#: sys-utils/renice.c:102
+#: sys-utils/renice.c:103
 #, c-format
 msgid "renice: %s: bad value\n"
 msgstr "renice: Ungültiger Wert: %s\n"
 
-#: sys-utils/renice.c:121
+#: sys-utils/renice.c:122
 msgid "getpriority"
 msgstr "getpriority"
 
-#: sys-utils/renice.c:126
+#: sys-utils/renice.c:127
 msgid "setpriority"
 msgstr "setpriority"
 
-#: sys-utils/renice.c:129
+#: sys-utils/renice.c:130
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: Alte Priorität: %d, neue Priorität: %d\n"
 
-#: sys-utils/setsid.c:23
+#: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
-msgstr "Verwendung: %s Programm [Argument ...]\n"
+msgstr "Aufruf: %s Programm [Argument ...]\n"
 
-#: sys-utils/tunelp.c:74
+#: sys-utils/tunelp.c:75
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 msgstr ""
-"Verwendung: %s <Gerät> [ -i <IRQ> | -t <ZEIT> | -c <ZEICHEN> | -w <WARTEN> | "
-"\n"
-"          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
-"          -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:90
+#: sys-utils/tunelp.c:91
 msgid "malloc error"
-msgstr "malloc-Fehler"
+msgstr ""
 
-#: sys-utils/tunelp.c:102
+#: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s: Ungültiger Wert\n"
 
-#: sys-utils/tunelp.c:241
+#: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s ist kein lp-Gerät.\n"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
-msgstr "Der Status von %s ist %d"
+msgstr "Der Status von %s ist 0x%x"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:264
 msgid ", busy"
-msgstr ", Drucken im Gange"
+msgstr ", belegt"
 
-#: sys-utils/tunelp.c:264
+#: sys-utils/tunelp.c:265
 msgid ", ready"
 msgstr ", bereit"
 
-#: sys-utils/tunelp.c:265
+#: sys-utils/tunelp.c:266
 msgid ", out of paper"
-msgstr ", kein Papier vorhanden"
+msgstr ", kein Papier"
 
-#: sys-utils/tunelp.c:266
+# tl: "betriebsbereit"
+#: sys-utils/tunelp.c:267
 msgid ", on-line"
-msgstr ", betriebsbereit"
+msgstr ", on-line"
 
-#: sys-utils/tunelp.c:267
+#: sys-utils/tunelp.c:268
 msgid ", error"
 msgstr ", Fehler"
 
-#: sys-utils/tunelp.c:284
+#: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
-msgstr "LPGETIRQ-Fehler"
+msgstr "»LPGETIRQ« Fehler"
 
-#: sys-utils/tunelp.c:290
+#: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
-msgstr "%s bei Verwendung von IRQ %d\n"
+msgstr "%s benutzt IRQ %d\n"
 
-#: sys-utils/tunelp.c:292
+#: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
-msgstr "%s bei Verwendung von Abfragen\n"
+msgstr ""
 
-#: text-utils/col.c:154
-#, c-format
+#: text-utils/col.c:155
+#, fuzzy, c-format
 msgid "col: bad -l argument %s.\n"
-msgstr "col: Ungültiges Argument '-l' %s.\n"
+msgstr "col: Ungültiges Argument für »-l«-Option: %s.\n"
 
-#: text-utils/col.c:521
-#, fuzzy
+#: text-utils/col.c:537
 msgid "usage: col [-bfpx] [-l nline]\n"
-msgstr "Verwendung: col [-bfx] [-l nZeile]\n"
+msgstr "Aufruf: col [-bfpx] [-l AnzahlZeilen]\n"
 
-#: text-utils/col.c:527
+#: text-utils/col.c:543
 msgid "col: write error.\n"
 msgstr "col: Fehler beim Schreiben.\n"
 
-#: text-utils/col.c:534
+# %s can be one of the two following texts.
+#: text-utils/col.c:550
 #, c-format
 msgid "col: warning: can't back up %s.\n"
-msgstr "col: Warnung: %s kann nicht gesichert werden.\n"
+msgstr ""
 
-#: text-utils/col.c:535
+#: text-utils/col.c:551
 msgid "past first line"
-msgstr "über die erste Zeile hinaus"
+msgstr ""
 
-#: text-utils/col.c:535
+#: text-utils/col.c:551
 msgid "-- line already flushed"
-msgstr "-- Zeile bereits geleert"
+msgstr ""
 
-#: text-utils/colcrt.c:98
+#: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
-msgstr "Verwendung: %s [ - ] [ -2 ] [ Datei ... ]\n"
+msgstr "Aufruf: %s [ - ] [ -2 ] [ Datei ... ]\n"
 
 #: text-utils/column.c:300
 msgid "line too long"
@@ -8882,30 +8846,28 @@ msgstr "Zeile ist zu lang"
 
 #: text-utils/column.c:377
 msgid "usage: column [-tx] [-c columns] [file ...]\n"
-msgstr "Verwendung: column [-tx] [-c Spalten] [Datei ...]\n"
+msgstr "Aufruf: column [-tx] [-c Spalten] [Datei ...]\n"
 
 #: text-utils/hexsyntax.c:80
 msgid "hexdump: bad length value.\n"
-msgstr "hexdump: Ungültiger Wert für 'Länge'.\n"
+msgstr ""
 
 #: text-utils/hexsyntax.c:91
 msgid "hexdump: bad skip value.\n"
-msgstr "hexdump: Ungültiger Wert für 'überspringen'.\n"
+msgstr ""
 
 #: text-utils/hexsyntax.c:129
 msgid ""
 "hexdump: [-bcdovx] [-e fmt] [-f fmt_file] [-n length] [-s skip] [file ...]\n"
 msgstr ""
-"hexdump: [-bcdovx] [-e Format] [-f Formatdatei] [-n Länge] [-s überspringen] "
-"[Datei ...]\n"
 
-#: text-utils/more.c:330
+#: text-utils/more.c:263
 #, c-format
-msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
+msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr ""
-"Verwendung: %s [-dfln] [+Zeilennummer | +/Muster] Dateiname1 Dateiname2 ...\n"
+"Aufruf: %s [-dflpcsu] [+Zeilennummer | +/Muster] Dateiname1 Dateiname2 ...\n"
 
-#: text-utils/more.c:505
+#: text-utils/more.c:521
 #, c-format
 msgid ""
 "\n"
@@ -8917,7 +8879,7 @@ msgstr ""
 "\n"
 
 #. simple ELF detection
-#: text-utils/more.c:544
+#: text-utils/more.c:560
 #, c-format
 msgid ""
 "\n"
@@ -8928,34 +8890,34 @@ msgstr ""
 "******** %s: Keine Textdatei ********\n"
 "\n"
 
-#: text-utils/more.c:647
+#: text-utils/more.c:663
 msgid "[Use q or Q to quit]"
-msgstr "[Drücken Sie q oder Q, um den Vorgang zu beenden]"
+msgstr "[Benutzen Sie q oder Q zum Beenden]"
 
-#: text-utils/more.c:826
+#: text-utils/more.c:843
 msgid "--More--"
-msgstr "--Weiter--"
+msgstr "--Mehr--"
 
-#: text-utils/more.c:828
+#: text-utils/more.c:845
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Nächste Datei: %s)"
 
-#: text-utils/more.c:834
+#: text-utils/more.c:851
 msgid "[Press space to continue, 'q' to quit.]"
-msgstr "[Leertaste = Fortfahren, 'q' = Beenden.]"
+msgstr "[Leertaste zum Fortfahren, »q« zum Beenden.]"
 
-#: text-utils/more.c:1132
+#: text-utils/more.c:1185
 #, c-format
 msgid "...back %d page"
 msgstr "... %d Seiten zurück"
 
-#: text-utils/more.c:1178
+#: text-utils/more.c:1231
 #, c-format
 msgid "...skipping %d line"
-msgstr "... %d Zeilen werden übersprungen."
+msgstr "...überspringe %d Zeilen"
 
-#: text-utils/more.c:1219
+#: text-utils/more.c:1272
 msgid ""
 "\n"
 "***Back***\n"
@@ -8965,37 +8927,37 @@ msgstr ""
 "***Zurück***\n"
 "\n"
 
-#: text-utils/more.c:1257
+#: text-utils/more.c:1329
 msgid "Can't open help file"
-msgstr "Die Hilfedatei konnte nicht geöffnet werden."
+msgstr "Konnte die Hilfedatei nicht öffnen"
 
-#: text-utils/more.c:1278 text-utils/more.c:1282
+#: text-utils/more.c:1359 text-utils/more.c:1363
 msgid "[Press 'h' for instructions.]"
-msgstr "[Drücken Sie 'h' für Hilfe.]"
+msgstr "[Drücken Sie »h« für Hilfe.]"
 
-#: text-utils/more.c:1316
+#: text-utils/more.c:1397
 #, c-format
 msgid "\"%s\" line %d"
-msgstr "'%s' Zeile %d"
+msgstr "\"%s\" Zeile %d"
 
-#: text-utils/more.c:1318
+#: text-utils/more.c:1399
 #, c-format
 msgid "[Not a file] line %d"
-msgstr "[Keine Datei] Zeile %d"
+msgstr "[Keine normale Datei] Zeile %d"
 
-#: text-utils/more.c:1402
+#: text-utils/more.c:1483
 msgid "  Overflow\n"
 msgstr "  Überlauf\n"
 
-#: text-utils/more.c:1449
+#: text-utils/more.c:1530
 msgid "...skipping\n"
-msgstr "...Überspringen\n"
+msgstr "...Überspringe\n"
 
-#: text-utils/more.c:1479
+#: text-utils/more.c:1560
 msgid "Regular expression botch"
-msgstr "Fehler beim Ausführen von 're_exec()'"
+msgstr "Fehler beim Ausführen von »re_exec()«"
 
-#: text-utils/more.c:1491
+#: text-utils/more.c:1572
 msgid ""
 "\n"
 "Pattern not found\n"
@@ -9003,166 +8965,171 @@ msgstr ""
 "\n"
 "Muster wurde nicht gefunden\n"
 
-#: text-utils/more.c:1494
+#: text-utils/more.c:1575
 msgid "Pattern not found"
 msgstr "Muster wurde nicht gefunden"
 
-#: text-utils/more.c:1555
+#: text-utils/more.c:1636
 msgid "can't fork\n"
-msgstr "kann keinen neuen Prozess erzeugen\n"
+msgstr "Kann keinen neuen Prozeß erzeugen\n"
 
-#: text-utils/more.c:1594
+#: text-utils/more.c:1675
 msgid ""
 "\n"
 "...Skipping "
 msgstr ""
 "\n"
-"...Sprung "
+"...Springe "
 
-#: text-utils/more.c:1598
+#: text-utils/more.c:1679
 msgid "...Skipping "
-msgstr "...Sprung "
+msgstr "...Springe "
 
-#: text-utils/more.c:1599
+#: text-utils/more.c:1680
 msgid "to file "
 msgstr "zur Datei "
 
-#: text-utils/more.c:1599
+#: text-utils/more.c:1680
 msgid "back to file "
 msgstr "zurück zur Datei "
 
-#: text-utils/more.c:1835
+#: text-utils/more.c:1914
 msgid "Line too long"
 msgstr "Zeile ist zu lang"
 
-#: text-utils/more.c:1878
+#: text-utils/more.c:1957
 msgid "No previous command to substitute for"
-msgstr "Kein vorheriger Befehl, der ersetzt werden kann"
+msgstr "Kein vorheriges Kommando, das eingefügt werden könnte"
 
 #: text-utils/odsyntax.c:133
 msgid "od: od(1) has been deprecated for hexdump(1).\n"
-msgstr "od: od(1) wurde durch hexdump(1) ersetzt.\n"
+msgstr ""
 
 #: text-utils/odsyntax.c:136
 #, c-format
 msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n"
 msgstr ""
-"od: Aus Kompatibilitätsgründen mit hexdump(1) wird die Option -%c nicht "
-"unterstützt %s\n"
 
 #: text-utils/odsyntax.c:137
 msgid "; see strings(1)."
-msgstr "; siehe strings(1)."
+msgstr ""
 
 #: text-utils/parse.c:63
 #, c-format
 msgid "hexdump: can't read %s.\n"
-msgstr "hexdump: %s konnte nicht gelesen werden.\n"
+msgstr "hexdump: Konnte %s nicht lesen.\n"
 
 #: text-utils/parse.c:68
+#, fuzzy
 msgid "hexdump: line too long.\n"
 msgstr "hexdump: Zeile ist zu lang.\n"
 
 #: text-utils/parse.c:406
 msgid "hexdump: byte count with multiple conversion characters.\n"
-msgstr "hexdump: Byteanzahl mit mehreren Umwandlungszeichen.\n"
+msgstr ""
 
 #: text-utils/parse.c:490
 #, c-format
 msgid "hexdump: bad byte count for conversion character %s.\n"
-msgstr "hexdump: Ungültige Byteanzahl für Umwandlungszeichen %s.\n"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: text-utils/parse.c:503
-#, c-format
+#, fuzzy, c-format
 msgid "hexdump: bad format {%s}\n"
 msgstr "hexdump: Ungültiges Format (%s)\n"
 
 #: text-utils/parse.c:509
 msgid "hexdump: bad conversion character %%%s.\n"
-msgstr "hexdump: Ungültiges Umwandlungszeichen %%%s.\n"
+msgstr ""
 
 #: text-utils/rev.c:113
 msgid "Unable to allocate bufferspace\n"
-msgstr "Es konnte kein Speicher für den Puffer reserviert werden.\n"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
 
 #: text-utils/rev.c:156
 msgid "usage: rev [file ...]\n"
-msgstr "Verwendung: rev [Datei ...]\n"
+msgstr "Aufruf: rev [Datei ...]\n"
 
-#: text-utils/ul.c:141
+#: text-utils/ul.c:143
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
-msgstr "Verwendung: %s [ -i ] [ -tTerminalname ] Datei ...\n"
+msgstr "Aufruf: %s [ -i ] [ -t Terminalname ] Datei ...\n"
 
-#: text-utils/ul.c:152
+#: text-utils/ul.c:154
 msgid "trouble reading terminfo"
-msgstr "Fehler beim Lesen der terminfo-Datenbank."
+msgstr "Probleme beim Lesen der terminfo-Datenbank"
 
-#: text-utils/ul.c:241
+#: text-utils/ul.c:244
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
-msgstr "Unbekannte Escape-Folge in der Eingabe: %o, %o\n"
+msgstr "Unbekannte Escape-Sequenz in der Eingabe: %o, %o\n"
 
-#: text-utils/ul.c:398
+#: text-utils/ul.c:427
 msgid "Unable to allocate buffer.\n"
-msgstr "Es konnte kein Speicher für den Puffer reserviert werden.\n"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
 
-#: text-utils/ul.c:553
+#: text-utils/ul.c:588
 msgid "Input line too long.\n"
-msgstr "Die Eingabezeile ist zu lang.\n"
+msgstr "Eingabezeile ist zu lang.\n"
 
-#: text-utils/ul.c:566
+#: text-utils/ul.c:601
 msgid "Out of memory when growing buffer.\n"
-msgstr "Kein Speicher mehr frei beim Vergrößern eines Puffers.\n"
+msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 
-#: kbd/kbdrate.c:138 kbd/kbdrate.c:276
-#, c-format
-msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
-msgstr ""
-"Die Tastaturwiederholrate wurde auf %.1f Zeichen/Sekunde gesetzt\n"
-"(Verzögerung: %d ms).\n"
+#~ msgid "Invalid values in hardware clock: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+#~ msgstr "Ungültige Werte in Hardwareuhr: %2d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: kbd/kbdrate.c:222
-msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
-msgstr ""
+#~ msgid ""
+#~ "Hw clock time : %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d seconds since 1969\n"
+#~ msgstr ""
+#~ "Zeit der Hardwareuhr: %2d/%.2d/%.2d %.2d:%.2d:%.2d = %d Sekunden seit 1969\n"
 
-#: kbd/kbdrate.c:252
-msgid "Cannot open /dev/port"
-msgstr "/dev/port konnte nicht geöffnet werden."
+# Egger
+#~ msgid "Time read from Hardware Clock: %02d:%02d:%02d\n"
+#~ msgstr "Zeit gelesen aus Hardwareuhr: %02d:%02d:%02d\n"
 
-#~ msgid "Writing disklabel to %s%d.\n"
-#~ msgstr "Datenträgerkennung wird auf %s%d geschrieben.\n"
+#~ msgid "ioctl() to open /dev/tty1 failed"
+#~ msgstr "ioctl() konnte /dev/tty1 nicht öffnen."
 
-#~ msgid "%s%d contains no disklabel.\n"
-#~ msgstr "%s%d enthält keine Datenträgerkennung.\n"
+#~ msgid "Usage: %s [-c] [-v0|-v1] /dev/name [blocks]\n"
+#~ msgstr "Aufruf: %s [-c] [-v0|-v1] /dev/Name [Größe in kB]\n"
 
-#~ msgid "Bootstrap installed on %s%d.\n"
-#~ msgstr "Bootinformationen installiert auf %s%d.\n"
+#~ msgid "SGI rxlvol"
+#~ msgstr "SGI rxlvol"
 
-#~ msgid "%s: unknown geometry\n"
-#~ msgstr "%s: Unbekannte Geometrie\n"
+#~ msgid "%s: open for update: %m"
+#~ msgstr "Konnte %s nicht zum Aktualisieren öffnen: %m"
 
-#~ msgid "exec rc failed\n"
-#~ msgstr "Ausführung der rc-Datei nicht erfolgreich.\n"
+#~ msgid "usage: script [-a] [file]\n"
+#~ msgstr "Aufruf: script [-a] [Datei]\n"
 
-#~ msgid "fork of rc shell failed\n"
-#~ msgstr "Prozesserzeugung für rc-Shell nicht erfolgreich.\n"
+#~ msgid "usage: tsort [ inputfile ]\n"
+#~ msgstr "Aufruf: tsort [ Eingabedatei ]\n"
 
-#~ msgid "Cannot get loop info"
-#~ msgstr "Keine Informationen über das 'loop'-Gerät verfügbar."
+#, fuzzy
+#~ msgid "tsort: odd data count.\n"
+#~ msgstr "tsort: Ungerade Anzahl Daten.\n"
 
-#~ msgid "mount: %s has wrong major or minor number"
-#~ msgstr "mount: %s hat eine falsche Major- oder Minor-Gerätenummer."
+#~ msgid "tsort: cycle in data.\n"
+#~ msgstr "tsort: Zyklus in den Daten.\n"
 
-#~ msgid "mount: block device %s is not permitted on its filesystem"
+#~ msgid "tsort: internal error -- could not find cycle.\n"
+#~ msgstr "tsort: Interner Fehler -- konnte den Zyklus nicht finden.\n"
+
+#~ msgid "mount: warning: cannot change mounted device with a remount\n"
+#~ msgstr ""
+#~ "mount: Warnung: Das Gerät kann nicht mit einem »remount« geändert werden\n"
+
+#~ msgid "mount: warning: cannot change filesystem type with a remount\n"
 #~ msgstr ""
-#~ "mount: Das blockorientierte Gerät %s ist in seinem\n"
-#~ "       Dateisystem nicht zulässig."
+#~ "mount: Der Dateisystemtyp kann nicht mit einem »remount« geändert werden\n"
+
+#~ msgid "Cannot get loop info"
+#~ msgstr "Konnte keine Informationen über das »loop«-Gerät erhalten"
 
 #~ msgid ""
 #~ "Usage: mount [-hV]\n"
@@ -9171,41 +9138,68 @@ msgstr "/dev/port konnte nicht geöffnet werden."
 #~ "       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"
+#~ "Aufruf: 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"
+#~ "        mount [-nfrsvw] [-o Optionen] Spezialdatei | Verzeichnis\n"
+#~ "        mount [-nfrsvw] [-t VFS-Typ] [-o Optionen] Gerät Verzeichnis\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"
+# This one is for Debian
+#~ msgid "not mounting anything"
+#~ msgstr "Es wird nichts gemountet"
+
+#~ msgid "Not set"
+#~ msgstr "Nicht gesetzt"
+
+#, fuzzy
+#~ msgid "send_time=%srcv_time=%schange_time=%s"
+#~ msgstr "Sendezeit = %sEmpfangszeit = %sÄnderungszeit = %s"
+
+#, fuzzy
+#~ msgid "Not Set\n"
+#~ msgstr "Nicht gesetzt\n"
+
+#~ msgid "usage: %s [-dfln] [+linenum | +/pattern] name1 name2 ...\n"
 #~ msgstr ""
-#~ "mount: %s:%s nicht erfolgreich. Der Server meldet folgende Ursache: %s\n"
+#~ "Aufruf: %s [-dfln] [+Zeilennummer | +/Muster] Dateiname1 Dateiname2 ...\n"
 
-#~ msgid "usage: %s [-shm | -msg | -sem] id\n"
-#~ msgstr "Verwendung: %s [-shm | -msg | -sem] id\n"
+#~ msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
+#~ msgstr ""
+#~ "Die Tastaturwiederholrate wurde auf %.1f cps gesetzt\n"
+#~ "Die Verzögerungszeit wurde auf %dms gesetzt\n"
 
-# This one is for Debian
-#~ msgid "not mounting anything"
-#~ msgstr "Es wird nichts gemountet."
+#~ msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
+#~ msgstr "Aufruf: kbdrate [-V] [-s] [-r Rate] [-d Verzögerungszeit]\n"
+
+#~ msgid "Cannot open /dev/port"
+#~ msgstr "Konnte /dev/port nicht öffnen"
+
+#~ msgid "Unable to open /dev/rtc"
+#~ msgstr "Konnte /dev/rtc nicht öffnen"
+
+#~ msgid "%s%d contains no disklabel.\n"
+#~ msgstr "%s%d enthält keinen »disklabel«.\n"
 
-#~ msgid "sscanf error"
-#~ msgstr "sscanf-Fehler"
+#~ msgid "mount: %s has wrong major or minor number"
+#~ msgstr "mount: %s hat eine falsche Major oder Minor Geräte-Nummer"
+
+#~ msgid "mount: %s:%s failed, reason given by server: %s\n"
+#~ msgstr ""
+#~ "mount: %s:%s schlug fehl, Der folgende Grund wurde vom Server angegeben:\n"
+#~ "       %s\n"
 
 #~ msgid "Cannot read disk drive geometry"
-#~ msgstr "Festplattengeometrie konnte nicht gelesen werden."
+#~ msgstr "Konnte die Festplattengeometrie nicht lesen"
 
 #~ msgid "Cannot derive a geometry from an empty partition table"
 #~ msgstr ""
-#~ "Geometrie kann nicht aus einer leeren Partitionstabelle abgeleitet werden."
+#~ "Konnte die Geometrie nicht aus einer leeren Partitionstabelle ableiten"
 
 #~ msgid "Cannot derive a geometry from the partition table"
-#~ msgstr "Geometrie konnte nicht aus der Partitionstabelle abgeleitet werden."
+#~ msgstr "Konnte die Geometrie nicht aus der Partitionstabelle ableiten"
 
 #~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: unbekannte Option '--%s'\n"
+#~ msgstr "%s: unbekannte Option »--%s«\n"
 
 #~ msgid "'/' in \"%s\""
-#~ msgstr "'%s' enthält einen '/'"
-
-#~ msgid "wall: cannot read %s.\n"
-#~ msgstr "wall: %s konnte nicht gelesen werden.\n"
+#~ msgstr "»%s« enthält einen »/«"
diff --git a/po/es.po b/po/es.po
index d49ba4f9e..81b5b573d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1185,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:368 getopt-1.1.0a/getopt.c:89
-#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.2/getopt.c:89
+#: getopt-1.1.2/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"
@@ -5279,97 +5279,97 @@ msgstr "El carácter '%c' no pertenece al juego de caracteres del sistema"
 msgid "Message '%s' is OK\n"
 msgstr "El mensaje '%s' es correcto\n"
 
-#: getopt-1.1.0a/getopt.c:233
+#: getopt-1.1.2/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Escriba `getopt --help' para obtener más información.\n"
 
-#: getopt-1.1.0a/getopt.c:299
+#: getopt-1.1.2/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.1.0a/getopt.c:319
+#: getopt-1.1.2/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "Intérprete de comandos desconocido tras argumento -s o --shell"
 
-#: getopt-1.1.0a/getopt.c:324
+#: getopt-1.1.2/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Uso: getopt cadenaopciones parámetros\n"
 
-#: getopt-1.1.0a/getopt.c:325
+#: getopt-1.1.2/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [opciones] [--] cadenaopciones parámetros\n"
 
-#: getopt-1.1.0a/getopt.c:326
+#: getopt-1.1.2/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [opciones] -o|--options cadenaopciones [opciones] [--]\n"
 
-#: getopt-1.1.0a/getopt.c:327
+#: getopt-1.1.2/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parámetros\n"
 
-#: getopt-1.1.0a/getopt.c:328
+#: getopt-1.1.2/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.1.0a/getopt.c:329
+#: getopt-1.1.2/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Esta pequeña guía de uso\n"
 
-#: getopt-1.1.0a/getopt.c:330
+#: getopt-1.1.2/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=opclargas  Opciones largas para reconocer\n"
 
-#: getopt-1.1.0a/getopt.c:331
+#: getopt-1.1.2/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.1.0a/getopt.c:332
+#: getopt-1.1.2/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=cadenaopciones Opciones cortas para reconocer\n"
 
-#: getopt-1.1.0a/getopt.c:333
+#: getopt-1.1.2/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.1.0a/getopt.c:334
+#: getopt-1.1.2/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           No hay salida normal\n"
 
-#: getopt-1.1.0a/getopt.c:335
+#: getopt-1.1.2/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.1.0a/getopt.c:336
+#: getopt-1.1.2/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Probar para versión getopt(1)\n"
 
-#: getopt-1.1.0a/getopt.c:337
+#: getopt-1.1.2/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
+#: getopt-1.1.2/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Mostrar información de versión\n"
 
-#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
+#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
 msgid "missing optstring argument"
 msgstr "Falta el argumento cadenaopciones"
 
-#: getopt-1.1.0a/getopt.c:441
+#: getopt-1.1.2/getopt.c:441
 #, fuzzy
 msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (mejorado) 1.0.3\n"
 
-#: getopt-1.1.0a/getopt.c:447
+#: getopt-1.1.2/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "Error interno; contacte con el desarrollador."
 
diff --git a/po/fr.po b/po/fr.po
index daaee7eb8..61c15d083 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1163,8 +1163,8 @@ msgstr ""
 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:368 getopt-1.1.0a/getopt.c:89
-#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.2/getopt.c:89
+#: getopt-1.1.2/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"
@@ -5261,95 +5261,95 @@ msgstr "Le caractère '%c' ne fait pas partie de mon jeu de caractères."
 msgid "Message '%s' is OK\n"
 msgstr "Le message '%s' est OK\n"
 
-#: getopt-1.1.0a/getopt.c:233
+#: getopt-1.1.2/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Essayez `getopt --help' pour plus d'informations.\n"
 
-#: getopt-1.1.0a/getopt.c:299
+#: getopt-1.1.2/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "Longue option vide après -l ou argument --long"
 
-#: getopt-1.1.0a/getopt.c:319
+#: getopt-1.1.2/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "Shell inconnu après -s ou argument --shell"
 
-#: getopt-1.1.0a/getopt.c:324
+#: getopt-1.1.2/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Usage : getopt paramètres optstring\n"
 
-#: getopt-1.1.0a/getopt.c:325
+#: getopt-1.1.2/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [options] [--] paramètres optstring\n"
 
-#: getopt-1.1.0a/getopt.c:326
+#: getopt-1.1.2/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "       getopt [options] -o|--options optstring [options] [--]\n"
 
-#: getopt-1.1.0a/getopt.c:327
+#: getopt-1.1.2/getopt.c:327
 msgid "              parameters\n"
 msgstr "              paramètres\n"
 
-#: getopt-1.1.0a/getopt.c:328
+#: getopt-1.1.2/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.1.0a/getopt.c:329
+#: getopt-1.1.2/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Ce petit guide d'utilisation\n"
 
-#: getopt-1.1.0a/getopt.c:330
+#: getopt-1.1.2/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   Options longues à reconnaître\n"
 
-#: getopt-1.1.0a/getopt.c:331
+#: getopt-1.1.2/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.1.0a/getopt.c:332
+#: getopt-1.1.2/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      Options courtes à reconnaître\n"
 
-#: getopt-1.1.0a/getopt.c:333
+#: getopt-1.1.2/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.1.0a/getopt.c:334
+#: getopt-1.1.2/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Aucune sortie normale\n"
 
-#: getopt-1.1.0a/getopt.c:335
+#: getopt-1.1.2/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.1.0a/getopt.c:336
+#: getopt-1.1.2/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Teste la version getopt(1)\n"
 
-#: getopt-1.1.0a/getopt.c:337
+#: getopt-1.1.2/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
+#: getopt-1.1.2/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                Affiche les informations de version\n"
 
-#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
+#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
 msgid "missing optstring argument"
 msgstr "Argument optstring manquant"
 
-#: getopt-1.1.0a/getopt.c:441
+#: getopt-1.1.2/getopt.c:441
 msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (avancé) 1.1.0\n"
 
-#: getopt-1.1.0a/getopt.c:447
+#: getopt-1.1.2/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "Erreur interne, contactez l'auteur."
 
diff --git a/po/it.po b/po/it.po
index 4d0d47194..1db14ef09 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1184,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:368 getopt-1.1.0a/getopt.c:89
-#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.2/getopt.c:89
+#: getopt-1.1.2/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"
@@ -5277,96 +5277,96 @@ msgstr "Il carattere '%c' non è compreso nel mio set di caratteri"
 msgid "Message '%s' is OK\n"
 msgstr "Il messaggio '%s' è OK\n"
 
-#: getopt-1.1.0a/getopt.c:233
+#: getopt-1.1.2/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "Provare con `getopt --help' per ulteriori informazioni.\n"
 
-#: getopt-1.1.0a/getopt.c:299
+#: getopt-1.1.2/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "opzione lunga vuota dopo parametro -l o --long"
 
-#: getopt-1.1.0a/getopt.c:319
+#: getopt-1.1.2/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "shell sconosciuta dopo parametro -s o --shell"
 
-#: getopt-1.1.0a/getopt.c:324
+#: getopt-1.1.2/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "Utilizzo: getopt optstring parametri\n"
 
-#: getopt-1.1.0a/getopt.c:325
+#: getopt-1.1.2/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "      getopt [opzioni] [--] optstring parametri\n"
 
-#: getopt-1.1.0a/getopt.c:326
+#: getopt-1.1.2/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr "      getopt [opzioni] -o|--options optstring [opzioni] [--]\n"
 
-#: getopt-1.1.0a/getopt.c:327
+#: getopt-1.1.2/getopt.c:327
 msgid "              parameters\n"
 msgstr "             parametri\n"
 
-#: getopt-1.1.0a/getopt.c:328
+#: getopt-1.1.2/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.1.0a/getopt.c:329
+#: getopt-1.1.2/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   Questa piccola guida all'utilizzo\n"
 
-#: getopt-1.1.0a/getopt.c:330
+#: getopt-1.1.2/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   Opzioni lunghe da riconoscere\n"
 
-#: getopt-1.1.0a/getopt.c:331
+#: getopt-1.1.2/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.1.0a/getopt.c:332
+#: getopt-1.1.2/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      Opzioni brevi da riconoscere\n"
 
-#: getopt-1.1.0a/getopt.c:333
+#: getopt-1.1.2/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.1.0a/getopt.c:334
+#: getopt-1.1.2/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Nessun output normale\n"
 
-#: getopt-1.1.0a/getopt.c:335
+#: getopt-1.1.2/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            Imposta la shell \n"
 
-#: getopt-1.1.0a/getopt.c:336
+#: getopt-1.1.2/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   Prova della versione getopt(1)\n"
 
-#: getopt-1.1.0a/getopt.c:337
+#: getopt-1.1.2/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
+#: getopt-1.1.2/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                informazioni sulla versione di output\n"
 
-#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
+#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
 msgid "missing optstring argument"
 msgstr "argomento optstring mancante"
 
-#: getopt-1.1.0a/getopt.c:441
+#: getopt-1.1.2/getopt.c:441
 #, fuzzy
 msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (avanzato) 1.0.3\n"
 
-#: getopt-1.1.0a/getopt.c:447
+#: getopt-1.1.2/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "errore interno, contattare l'autore."
 
diff --git a/po/ja.po b/po/ja.po
index 629ee3f49..8fa27a27a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1153,8 +1153,8 @@ msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 "»È¤¤Êý: mkfs [-V] [-t ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à·¿] [fs ¥ª¥×¥·¥ç¥ó] ¥Ç¥Ð¥¤¥¹ [¥µ¥¤¥º]\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:218 mount/sundries.c:196
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.2/getopt.c:89
+#: getopt-1.1.2/getopt.c:99 login-utils/wall.c:218 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: ¥á¥â¥ê¤¬Â­¤ê¤Þ¤»¤ó¡ª\n"
@@ -5146,91 +5146,91 @@ msgstr "ʸ»ú '%c' ¤Ï¥­¥ã¥é¥¯¥¿¥»¥Ã¥ÈÆâ¤Ë¤¢¤ê¤Þ¤»¤ó"
 msgid "Message '%s' is OK\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ '%s' ¤Ï OK ¤Ç¤¹\n"
 
-#: getopt-1.1.0a/getopt.c:233
+#: getopt-1.1.2/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr "`getopt --help' ¤Ç¾ÜºÙ¾ðÊó¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: getopt-1.1.0a/getopt.c:299
+#: getopt-1.1.2/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr "-l ¤ä --long °ú¿ô¤Î¸å¤Î¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤¬¶õ¤Ç¤¹"
 
-#: getopt-1.1.0a/getopt.c:319
+#: getopt-1.1.2/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr "-s ¤« --shell °ú¿ô¤Î¸å¤Î¥·¥§¥ë¤òÃΤê¤Þ¤»¤ó"
 
-#: getopt-1.1.0a/getopt.c:324
+#: getopt-1.1.2/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr "»È¤¤Êý: getopt ¥ª¥×¥·¥ç¥óʸ»úÎó ÃÍ\n"
 
-#: getopt-1.1.0a/getopt.c:325
+#: getopt-1.1.2/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr "       getopt [¥ª¥×¥·¥ç¥ó] [--] ¥ª¥×¥·¥ç¥óʸ»úÎó ÃÍ\n"
 
-#: getopt-1.1.0a/getopt.c:326
+#: getopt-1.1.2/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 "       getopt [¥ª¥×¥·¥ç¥ó] -o|--options ¥ª¥×¥·¥ç¥óʸ»úÎó [¥ª¥×¥·¥ç¥ó] [--]\n"
 
-#: getopt-1.1.0a/getopt.c:327
+#: getopt-1.1.2/getopt.c:327
 msgid "              parameters\n"
 msgstr "              ÃÍ\n"
 
-#: getopt-1.1.0a/getopt.c:328
+#: getopt-1.1.2/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 "  -a, --alternative            ¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤¬ - °ì¤Ä¤Ç»Ï¤Þ¤ë¤Î¤òµö¤¹\n"
 
-#: getopt-1.1.0a/getopt.c:329
+#: getopt-1.1.2/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr "  -h, --help                   ¤³¤Î¤Á¤ç¤Ã¤È¤·¤¿»È¤¤Êý¤òɽ¼¨¤¹¤ë\n"
 
-#: getopt-1.1.0a/getopt.c:330
+#: getopt-1.1.2/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr "  -l, --longoptions=longopts   ¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤òÍý²ò¤µ¤»¤ë\n"
 
-#: getopt-1.1.0a/getopt.c:331
+#: getopt-1.1.2/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr "  -n, --name=progname          ¥¨¥é¡¼Êó¹ð¤ÎºÝ¤Î̾Á°\n"
 
-#: getopt-1.1.0a/getopt.c:332
+#: getopt-1.1.2/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr "  -o, --options=optstring      ¥·¥ç¡¼¤È¥ª¥×¥·¥ç¥ó¤òÍý²ò¤µ¤»¤ë\n"
 
-#: getopt-1.1.0a/getopt.c:333
+#: getopt-1.1.2/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr "  -q, --quiet                  getopt(3) ¤Î¥¨¥é¡¼Êó¹ð¤ò¹Ô¤ï¤Ê¤¤\n"
 
-#: getopt-1.1.0a/getopt.c:334
+#: getopt-1.1.2/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr "  -Q, --quiet-output           Ä̾ï¤Î½ÐÎϤò¹Ô¤ï¤Ê¤¤\n"
 
-#: getopt-1.1.0a/getopt.c:335
+#: getopt-1.1.2/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr "  -s, --shell=shell            ¥·¥§¥ë¤Î°úÍѼè¤ê·è¤á¤òÀßÄꤹ¤ë\n"
 
-#: getopt-1.1.0a/getopt.c:336
+#: getopt-1.1.2/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr "  -T, --test                   getopt(1) ¥Ð¡¼¥¸¥ç¥ó¤ò¥Æ¥¹¥È¤¹¤ë\n"
 
-#: getopt-1.1.0a/getopt.c:337
+#: getopt-1.1.2/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr "  -u, --unqote                 ½ÐÎϤò°úÍѤ·¤Ê¤¤\n"
 
-#: getopt-1.1.0a/getopt.c:338
+#: getopt-1.1.2/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr "  -V, --version                ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ¹¤ë\n"
 
-#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
+#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
 msgid "missing optstring argument"
 msgstr "¥ª¥×¥·¥ç¥óʸ»úÎó°ú¿ô¤¬Â­¤ê¤Þ¤»¤ó"
 
-#: getopt-1.1.0a/getopt.c:441
+#: getopt-1.1.2/getopt.c:441
 msgid "getopt (enhanced) 1.1.0\n"
 msgstr "getopt (enhanced) 1.1.0\n"
 
-#: getopt-1.1.0a/getopt.c:447
+#: getopt-1.1.2/getopt.c:447
 msgid "internal error, contact the author."
 msgstr "ÆâÉô¥¨¥é¡¼¡¢ºî¼Ô¤ËÏ¢Íí¤ò¡£"
 
diff --git a/po/nl.po b/po/nl.po
index fa128320b..8e759c07a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgstr ""
 "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-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: clock/cmos.c:157
@@ -1086,8 +1086,8 @@ msgstr ""
 msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n"
 msgstr ""
 
-#: 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
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:368 getopt-1.1.2/getopt.c:89
+#: getopt-1.1.2/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"
@@ -4899,89 +4899,89 @@ msgstr ""
 msgid "Message '%s' is OK\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:233
+#: getopt-1.1.2/getopt.c:233
 msgid "Try `getopt --help' for more information.\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:299
+#: getopt-1.1.2/getopt.c:299
 msgid "empty long option after -l or --long argument"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:319
+#: getopt-1.1.2/getopt.c:319
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:324
+#: getopt-1.1.2/getopt.c:324
 msgid "Usage: getopt optstring parameters\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:325
+#: getopt-1.1.2/getopt.c:325
 msgid "       getopt [options] [--] optstring parameters\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:326
+#: getopt-1.1.2/getopt.c:326
 msgid "       getopt [options] -o|--options optstring [options] [--]\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:327
+#: getopt-1.1.2/getopt.c:327
 msgid "              parameters\n"
 msgstr "              parameters\n"
 
-#: getopt-1.1.0a/getopt.c:328
+#: getopt-1.1.2/getopt.c:328
 msgid ""
 "  -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:329
+#: getopt-1.1.2/getopt.c:329
 msgid "  -h, --help                   This small usage guide\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:330
+#: getopt-1.1.2/getopt.c:330
 msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:331
+#: getopt-1.1.2/getopt.c:331
 msgid ""
 "  -n, --name=progname          The name under which errors are reported\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:332
+#: getopt-1.1.2/getopt.c:332
 msgid "  -o, --options=optstring      Short options to be recognized\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:333
+#: getopt-1.1.2/getopt.c:333
 msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:334
+#: getopt-1.1.2/getopt.c:334
 msgid "  -Q, --quiet-output           No normal output\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:335
+#: getopt-1.1.2/getopt.c:335
 msgid "  -s, --shell=shell            Set shell quoting conventions\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:336
+#: getopt-1.1.2/getopt.c:336
 msgid "  -T, --test                   Test for getopt(1) version\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:337
+#: getopt-1.1.2/getopt.c:337
 msgid "  -u, --unqote                 Do not quote the output\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:338
+#: getopt-1.1.2/getopt.c:338
 msgid "  -V, --version                Output version information\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:392 getopt-1.1.0a/getopt.c:453
+#: getopt-1.1.2/getopt.c:392 getopt-1.1.2/getopt.c:453
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:441
+#: getopt-1.1.2/getopt.c:441
 msgid "getopt (enhanced) 1.1.0\n"
 msgstr ""
 
-#: getopt-1.1.0a/getopt.c:447
+#: getopt-1.1.2/getopt.c:447
 msgid "internal error, contact the author."
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5f8c56d36..9c9004fdd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,620 +6,21 @@
 # Paulo Henrique R Pinheiro <nulo@sul.com.br>
 # <support@turbolinux.com>, 2000.
 # Alvaro Antunes <alvaro@netpar.com.br>, 2000
-# Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2000
+# Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2001
 #
 # 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"
+"Project-Id-Version: util-linux 2.11b\n"
+"POT-Creation-Date: 2001-05-09 13:10-0400\n"
+"PO-Revision-Date: 2001-05-24 16:03-03:00\n"
 "Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: clock/cmos.c:157
-msgid "booted from MILO\n"
-msgstr "boot executado do MILO\n"
-
-#: clock/cmos.c:166
-msgid "Ruffian BCD clock\n"
-msgstr "Relógio BCD Ruffian\n"
-
-#: 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:192
-msgid "funky TOY!\n"
-msgstr "funky TOY!\n"
-
-#: 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:570
-#, c-format
-msgid "Cannot open /dev/port: %s"
-msgstr "Não é possível abrir /dev/port: %s"
-
-#: clock/cmos.c:577
-msgid "I failed to get permission because I didn't try.\n"
-msgstr "Não consegui obter permissão porque não tentei.\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 é incapaz de obter acesso à porta de E/S: a chamada iopl(3) falhou.\n"
-
-#: 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: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:220 clock/hwclock.c:309
-msgid "UTC"
-msgstr "UTC"
-
-#: clock/hwclock.c:220 clock/hwclock.c:308
-msgid "local"
-msgstr "local"
-
-#: 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:294
-msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
-msgstr "(Esperado: `UTC', `LOCAL'  ou nada.)\n"
-
-#: 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: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: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:309
-msgid "unknown"
-msgstr "desconhecida"
-
-#. -----------------------------------------------------------------------------
-#. 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 "Aguardando tique do relógio...\n"
-
-#: clock/hwclock.c:335
-msgid "...got clock tick\n"
-msgstr "... tique do relógio obtido\n"
-
-#: clock/hwclock.c:386
-#, c-format
-msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-msgstr "Valores inválidos no relógio de hardware: %4d/%.4d/%.2d %.2d:%.2d:%.2d\n"
-
-#: clock/hwclock.c:394
-#, c-format
-msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
-msgstr "Hora do relógio de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos desde 1969\n"
-
-#: clock/hwclock.c:422
-#, c-format
-msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-msgstr "Hora lida do relógio de Hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
-
-#: 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"
-
-#: clock/hwclock.c:455
-msgid "Clock not changed - testing only.\n"
-msgstr "Relógio não alterado - apenas testando.\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 ""
-"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: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
-#. 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 segundos\n"
-
-#: 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:578
-msgid ""
-"The value of the --date option is not a valid date.\n"
-"In particular, it contains quotation marks.\n"
-msgstr ""
-"O valor da opção --date não é uma data válida.\n"
-"Especificamente, ele contém aspas.\n"
-
-#: clock/hwclock.c:584
-#, c-format
-msgid "Issuing date command: %s\n"
-msgstr "Emitindo comando date: %s\n"
-
-#: 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"
-
-#: clock/hwclock.c:594
-#, c-format
-msgid "response from date command = %s\n"
-msgstr "resposta do comando date = %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 ""
-"O comando date emitido por %s retornou resultados inesperados.\n"
-"O comando foi:\n"
-"  %s\n"
-"A resposta foi:\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 ""
-"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: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: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:669
-msgid "Calling settimeofday:\n"
-msgstr "Chamando 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 "O relógio do sistema não está sendo ajustado: executando em modo de teste.\n"
-
-#: 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:685
-msgid "settimeofday() failed"
-msgstr "settimeofday() falhou"
-
-#: 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: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: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 ""
-"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: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: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"
-
-#: 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:814
-#, c-format
-msgid ""
-"Would have written the following to %s:\n"
-"%s"
-msgstr ""
-"Teria gravado o seguinte em %s:\n"
-"%s"
-
-#: 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: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: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"
-
-#: clock/hwclock.c:929
-#, c-format
-msgid "Using %s.\n"
-msgstr "Usando %s.\n"
-
-#: 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:1026
-msgid "Unable to set system clock.\n"
-msgstr "Não é possível ajustar o relógio do sistema.\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 ""
-"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: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: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: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: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: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: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 - consulta e ajusta o relógio de hardware (RTC).\n"
-"\n"
-"Uso: hwclock [função] [opções...]\n"
-"\n"
-"Funções:\n"
-"  --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"
-"                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"
-"                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"
-"  --localtime   O relógio de hardware é mantido em hora local.\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"
-"  --epoch=ano  Especifica o ano inicial do valor \n"
-"                de epoch do relógio de hardware.\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"
-"                informa a hwclock o tipo de Alpha que você tem (consulte hwclock(8))\n"
-
-#: 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:1237
-msgid ""
-"You have specified multiple function options.\n"
-"You can only perform one function at a time.\n"
-msgstr ""
-"Você especificou múltiplas opções de função.\n"
-"Você só pode executar uma função por vez.\n"
-
-#: 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"
-
-#: 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"
-
-#: 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:1275
-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"
-msgstr "Aguardando em laço até que a hora de KDGHWCLK mude.\n"
-
-#: clock/kd.c:44
-msgid "KDGHWCLK ioctl to read time failed"
-msgstr "ioctl KDGHWCLK para ler a hora falhou"
-
-#: 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"
-
-#: clock/kd.c:69
-msgid "KDGHWCLK ioctl to read time failed in loop"
-msgstr "ioctl KDGHWCLK para ler a hora falhou no laço"
-
-#: clock/kd.c:91
-msgid "ioctl() failed to read time from  /dev/tty1"
-msgstr "ioctl() não conseguiu ler a hora de /dev/tty1"
-
-#: clock/kd.c:127
-msgid "ioctl() to open /dev/tty1 failed"
-msgstr "ioctl() para abrir /dev/tty1 falhou"
-
-#: clock/kd.c:157
-msgid "KDGHWCLK ioctl failed"
-msgstr "ioctl KDGHWCLK falhou"
-
-#: clock/kd.c:163
-msgid "Can't open /dev/tty1"
-msgstr "Não foi possível abrir /dev/tty1"
-
-#: 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: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:172 clock/rtc.c:229
-#, c-format
-msgid "open() of %s failed"
-msgstr "open() de %s falhou"
-
-#: 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: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: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: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: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: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:279
-#, c-format
-msgid "ioctl(%s) was successful.\n"
-msgstr "ioctl(%s) teve êxito.\n"
-
-#: clock/rtc.c:309
-#, c-format
-msgid "Open of %s failed"
-msgstr "A abertura de %s falhou"
-
-#: 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:338
-#, c-format
-msgid "ioctl(RTC_EPOCH_READ) to %s failed"
-msgstr "ioctl(RTC_EPOCH_READ) para %s falhou"
-
-#: clock/rtc.c:344
-#, c-format
-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: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:381
-#, c-format
-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: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: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
-msgid "invalid number `%s'\n"
-msgstr "número `%s' inválido\n"
-
-#: clock/shhopt.c:258 clock/shhopt.c:284
-#, c-format
-msgid "number `%s' to `%s' out of range\n"
-msgstr "número `%s' a `%s' fora do intervalo\n"
-
-#: clock/shhopt.c:398
-#, c-format
-msgid "unrecognized option `%s'\n"
-msgstr "opção `%s' não reconhecida\n"
-
-#: clock/shhopt.c:411 clock/shhopt.c:449
-#, c-format
-msgid "option `%s' requires an argument\n"
-msgstr "a opção `%s' exige um argumento\n"
-
-#: clock/shhopt.c:417
-#, c-format
-msgid "option `%s' doesn't allow an argument\n"
-msgstr "a opção `%s' não permite um argumento\n"
-
-#: clock/shhopt.c:439
-#, c-format
-msgid "unrecognized option `-%c'\n"
-msgstr "opção `-%c' não reconhecida\n"
+"X-Generator: KBabel 0.8\n"
 
 #: disk-utils/blockdev.c:47
 msgid "set read-only"
@@ -676,6 +77,10 @@ msgstr "%s: comando desconhecido: %s\n"
 msgid "%s requires an argument\n"
 msgstr "%s exige um argumento\n"
 
+#: disk-utils/elvtune.c:46
+msgid "usage:\n"
+msgstr "Uso:\n"
+
 #: disk-utils/fdformat.c:36
 msgid "Formatting ... "
 msgstr "Formatando..."
@@ -711,10 +116,11 @@ msgstr ""
 msgid "usage: %s [ -n ] device\n"
 msgstr "Uso: %s [ -n ] dispositivo\n"
 
-#: 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/fdformat.c:120 disk-utils/fsck.minix.c:1248
+#: disk-utils/isosize.c:179 disk-utils/mkfs.bfs.c:119 disk-utils/mkfs.c:55
+#: disk-utils/mkfs.minix.c:640 disk-utils/mkswap.c:452
 #: disk-utils/setfdprm.c:127 misc-utils/cal.c:203 misc-utils/ddate.c:181
-#: misc-utils/kill.c:192
+#: misc-utils/kill.c:188 misc-utils/rename.c:79 misc-utils/script.c:130
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s de %s\n"
@@ -1103,12 +509,162 @@ msgstr ""
 "O SISTEMA DE ARQUIVOS FOI ALTERADO\n"
 "----------------------------------\n"
 
+#: disk-utils/isosize.c:129
+#, c-format
+msgid "%s: failed to open: %s\n"
+msgstr "%s: não foi possível abrir %s\n"
+
+#: disk-utils/isosize.c:135
+#, c-format
+msgid "%s: seek error on %s\n"
+msgstr "%s: erro de procura em %s\n"
+
+#: disk-utils/isosize.c:141
+#, c-format
+msgid "%s: read error on %s\n"
+msgstr "%s: erro de leitura em %s\n"
+
+#: disk-utils/isosize.c:150
+#, c-format
+msgid "sector count: %d, sector size: %d\n"
+msgstr "contagem de setor: %d, tamanho de setor: %d\n"
+
+#: disk-utils/isosize.c:198
+#, c-format
+msgid "%s: option parse error\n"
+msgstr "%s: opção erro de parser\n"
+
+#: disk-utils/isosize.c:206
+#, c-format
+msgid "Usage: %s [-x] [-d <num>] iso9660-image\n"
+msgstr "Uso: %s [-x] [-d <num>] iso9660-image\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 ""
+"Uso: %s [-v] [-N nr-de-inodes] [-V nome-volume]\n"
+"       [-F nome de sist arquivos] dispositivo [contagem-de-blocos]\n"
+
+#: disk-utils/mkfs.bfs.c:135
+msgid "volume name too long"
+msgstr "nome de volume muito longo"
+
+#: disk-utils/mkfs.bfs.c:142
+msgid "fsname name too long"
+msgstr "fsname nome muito longo"
+
+#: disk-utils/mkfs.bfs.c:167
+#, c-format
+msgid "cannot stat device %s"
+msgstr "não foi possível verificar status de dispositivo %s"
+
+#: disk-utils/mkfs.bfs.c:171
+#, c-format
+msgid "%s is not a block special device"
+msgstr "%s não é um dispositivo de blocos especial"
+
+#: disk-utils/mkfs.bfs.c:176
+#, c-format
+msgid "cannot open %s"
+msgstr "não foi possível abrir %s"
+
+#: disk-utils/mkfs.bfs.c:187
+#, c-format
+msgid "cannot get size of %s"
+msgstr "Não foi possível obter o tamanho de %s"
+
+#: disk-utils/mkfs.bfs.c:192
+#, c-format
+msgid "blocks argument too large, max is %lu"
+msgstr "parâmetros de bloco muito grandes, máximo é %lu"
+
+#: disk-utils/mkfs.bfs.c:207
+msgid "too many inodes - max is 512"
+msgstr "muitos inodes - máximo é 512"
+
+#: disk-utils/mkfs.bfs.c:216
+#, c-format
+msgid "not enough space, need at least %lu blocks"
+msgstr "pouco espaço, é necessário pelo menos %lu blocos"
+
+#: disk-utils/mkfs.bfs.c:228 fdisk/fdisk.c:1931
+#, c-format
+msgid "Device: %s\n"
+msgstr "Dispositivo: %s\n"
+
+#: disk-utils/mkfs.bfs.c:229
+#, c-format
+msgid "Volume: <%-6s>\n"
+msgstr "Volume: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:230
+#, c-format
+msgid "FSname: <%-6s>\n"
+msgstr "FSname: <%-6s>\n"
+
+#: disk-utils/mkfs.bfs.c:231
+#, c-format
+msgid "BlockSize: %d\n"
+msgstr "TamBloco: %d\n"
+
+#: disk-utils/mkfs.bfs.c:233
+#, c-format
+msgid "Inodes: %d (in 1 block)\n"
+msgstr "Inodes: %d (em 1 bloco)\n"
+
+#: disk-utils/mkfs.bfs.c:236
+#, c-format
+msgid "Inodes: %d (in %ld blocks)\n"
+msgstr "Inodes: %d (em %ld blocos)\n"
+
+#: disk-utils/mkfs.bfs.c:238
+#, c-format
+msgid "Blocks: %ld\n"
+msgstr "Blocos: %ld\n"
+
+#: disk-utils/mkfs.bfs.c:239
+#, c-format
+msgid "Inode end: %d, Data end: %d\n"
+msgstr "Inode fim: %d, Dados fim: %d\n"
+
+#: disk-utils/mkfs.bfs.c:244
+msgid "error writing superblock"
+msgstr "erro gravando superbloco"
+
+#: disk-utils/mkfs.bfs.c:264
+msgid "error writing root inode"
+msgstr "erro gravando inode root"
+
+#: disk-utils/mkfs.bfs.c:269
+msgid "error writing inode"
+msgstr "erro gravando inodes"
+
+#: disk-utils/mkfs.bfs.c:272
+msgid "seek error"
+msgstr "erro de busca"
+
+#: disk-utils/mkfs.bfs.c:278
+msgid "error writing . entry"
+msgstr "erro gravando . entrada"
+
+#: disk-utils/mkfs.bfs.c:282
+msgid "error writing .. entry"
+msgstr "erro gravando .. entrada"
+
+#: disk-utils/mkfs.bfs.c:286
+#, c-format
+msgid "error closing %s"
+msgstr "erro fechando %s"
+
 #: 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"
 
-#: 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
+#: disk-utils/mkfs.c:90 fdisk/cfdisk.c:369 getopt-1.1.0a/getopt.c:89
+#: getopt-1.1.0a/getopt.c:99 login-utils/wall.c:229 mount/sundries.c:196
 #, c-format
 msgid "%s: Out of memory!\n"
 msgstr "%s: memória insuficiente!\n"
@@ -1187,7 +743,7 @@ msgstr "busca falhou durante teste de blocos"
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores estranhos em do_check: provavelmente erros\n"
 
-#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:358
+#: disk-utils/mkfs.minix.c:581 disk-utils/mkswap.c:362
 msgid "seek failed in check_blocks"
 msgstr "busca falhou em check_blocks"
 
@@ -1232,79 +788,79 @@ msgstr "não foi possível stat %s"
 msgid "will not try to make filesystem on '%s'"
 msgstr "não será tentado criar sistema de arquivos em '%s'"
 
-#: disk-utils/mkswap.c:174
+#: disk-utils/mkswap.c:178
 #, 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:183
+#: disk-utils/mkswap.c:187
 #, c-format
 msgid "Using user-specified page size %d, instead of the system values %d/%d\n"
 msgstr "Usando tamanho de página especificado pelo usuário %d, em vez dos valores do sistema %d/%d\n"
 
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:191
 #, 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:312
+#: disk-utils/mkswap.c:316
 #, 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:335
+#: disk-utils/mkswap.c:339
 msgid "too many bad pages"
 msgstr "número excessivo de páginas inválidas"
 
-#: 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
+#: disk-utils/mkswap.c:353 misc-utils/look.c:182 misc-utils/setterm.c:1129
+#: text-utils/more.c:1930 text-utils/more.c:1941
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: disk-utils/mkswap.c:366
+#: disk-utils/mkswap.c:370
 msgid "one bad page\n"
 msgstr "uma página inválida\n"
 
-#: disk-utils/mkswap.c:368
+#: disk-utils/mkswap.c:372
 #, c-format
 msgid "%d bad pages\n"
 msgstr "%d páginas inválidas\n"
 
-#: disk-utils/mkswap.c:488
+#: disk-utils/mkswap.c:492
 #, 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:506
+#: disk-utils/mkswap.c:510
 #, 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:525
+#: disk-utils/mkswap.c:529
 #, c-format
 msgid "%s: error: unknown version %d\n"
 msgstr "%s - erro: versão %d desconhecida\n"
 
-#: disk-utils/mkswap.c:531
+#: disk-utils/mkswap.c:535
 #, 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:550
+#: disk-utils/mkswap.c:554
 #, 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:562
+#: disk-utils/mkswap.c:566
 #, 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:571 disk-utils/mkswap.c:592
+#: disk-utils/mkswap.c:575 disk-utils/mkswap.c:596
 msgid "fatal: first page unreadable"
 msgstr "fatal: primeira página ilegível"
 
-#: disk-utils/mkswap.c:577
+#: disk-utils/mkswap.c:581
 #, c-format
 msgid ""
 "%s: Device '%s' contains a valid Sun disklabel.\n"
@@ -1317,24 +873,24 @@ msgstr ""
 " 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:601
+#: disk-utils/mkswap.c:605
 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:602
+#: disk-utils/mkswap.c:606
 #, 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:608
+#: disk-utils/mkswap.c:612
 msgid "unable to rewind swap-device"
 msgstr "Não foi possível rebobinar o dispositivo de permuta (swap)"
 
-#: disk-utils/mkswap.c:611
+#: disk-utils/mkswap.c:615
 msgid "unable to write signature page"
 msgstr "Não foi possível gravar a página de assinatura"
 
-#: disk-utils/mkswap.c:619
+#: disk-utils/mkswap.c:623
 msgid "fsync failed"
 msgstr "fsync falhou"
 
@@ -1373,44 +929,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:393 fdisk/cfdisk.c:1899
+#: fdisk/cfdisk.c:394 fdisk/cfdisk.c:1900
 msgid "Unusable"
 msgstr "Inutilizável"
 
-#: fdisk/cfdisk.c:395 fdisk/cfdisk.c:1901
+#: fdisk/cfdisk.c:396 fdisk/cfdisk.c:1902
 msgid "Free Space"
 msgstr "Espaço livre"
 
-#: fdisk/cfdisk.c:398
+#: fdisk/cfdisk.c:399
 msgid "Linux ext2"
 msgstr "Linux ext2"
 
 #. also Solaris
-#: fdisk/cfdisk.c:400 fdisk/i386_sys_types.c:57
+#: fdisk/cfdisk.c:401 fdisk/i386_sys_types.c:57
 msgid "Linux"
 msgstr "Linux"
 
-#: fdisk/cfdisk.c:403
+#: fdisk/cfdisk.c:404
 msgid "OS/2 HPFS"
 msgstr "HPFS do OS/2"
 
-#: fdisk/cfdisk.c:405
+#: fdisk/cfdisk.c:406
 msgid "OS/2 IFS"
 msgstr "IFS do OS/2"
 
-#: fdisk/cfdisk.c:409
+#: fdisk/cfdisk.c:410
 msgid "NTFS"
 msgstr "NTFS"
 
-#: fdisk/cfdisk.c:420
+#: fdisk/cfdisk.c:421
 msgid "Disk has been changed.\n"
 msgstr "O disco foi alterado.\n"
 
-#: fdisk/cfdisk.c:421
+#: fdisk/cfdisk.c:422
 msgid "Reboot the system to ensure the partition table is correctly updated.\n"
 msgstr "Reinicialize o sistema para assegurar que a tabela de partições seja atualizada corretamente.\n"
 
-#: fdisk/cfdisk.c:424
+#: fdisk/cfdisk.c:425
 msgid ""
 "\n"
 "WARNING: If you have created or modified any\n"
@@ -1422,67 +978,67 @@ msgstr ""
 "partição DOS 6.x, consulte a página de manual\n"
 "do cfdisk para obter informações adicionais.\n"
 
-#: fdisk/cfdisk.c:519
+#: fdisk/cfdisk.c:520
 msgid "FATAL ERROR"
 msgstr "ERRO FATAL"
 
-#: fdisk/cfdisk.c:528
+#: fdisk/cfdisk.c:521
 msgid "Press any key to exit cfdisk"
 msgstr "Pressione qualquer tecla para sair do cfdisk"
 
-#: fdisk/cfdisk.c:564 fdisk/cfdisk.c:572
+#: fdisk/cfdisk.c:568 fdisk/cfdisk.c:576
 msgid "Cannot seek on disk drive"
 msgstr "Não foi possível realizar busca na unidade de disco"
 
-#: fdisk/cfdisk.c:566
+#: fdisk/cfdisk.c:570
 msgid "Cannot read disk drive"
 msgstr "Não foi possível ler a unidade de disco"
 
-#: fdisk/cfdisk.c:574
+#: fdisk/cfdisk.c:578
 msgid "Cannot write disk drive"
 msgstr "Não foi possível gravar na unidade de disco"
 
-#: fdisk/cfdisk.c:814
+#: fdisk/cfdisk.c:818
 msgid "Too many partitions"
 msgstr "Número excessivo de partições"
 
-#: fdisk/cfdisk.c:819
+#: fdisk/cfdisk.c:823
 msgid "Partition begins before sector 0"
 msgstr "A partição começa antes do setor 0"
 
-#: fdisk/cfdisk.c:824
+#: fdisk/cfdisk.c:828
 msgid "Partition ends before sector 0"
 msgstr "A partição termina antes do setor 0"
 
-#: fdisk/cfdisk.c:829
+#: fdisk/cfdisk.c:833
 msgid "Partition begins after end-of-disk"
 msgstr "A partição começa depois do fim do disco"
 
-#: fdisk/cfdisk.c:834
+#: fdisk/cfdisk.c:838
 msgid "Partition ends after end-of-disk"
 msgstr "A partição se estende até depois do fim do disco"
 
-#: fdisk/cfdisk.c:858
+#: fdisk/cfdisk.c:862
 msgid "logical partitions not in disk order"
 msgstr "partições lógicas fora da ordem do disco"
 
-#: fdisk/cfdisk.c:861
+#: fdisk/cfdisk.c:865
 msgid "logical partitions overlap"
 msgstr "partições lógicas sobrepostas"
 
-#: fdisk/cfdisk.c:863
+#: fdisk/cfdisk.c:867
 msgid "enlarged logical partitions overlap"
 msgstr "partições lógicas aumentadas sobrepostas"
 
-#: fdisk/cfdisk.c:893
+#: fdisk/cfdisk.c:897
 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
+#: fdisk/cfdisk.c:908 fdisk/cfdisk.c:920
 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
+#: fdisk/cfdisk.c:1068
 msgid "Menu item too long. Menu may look odd."
 msgstr "Item de menu longo demais. O menu pode ficar com aspecto estranho."
 
@@ -1498,8 +1054,8 @@ msgstr "Tecla ilegal"
 msgid "Press a key to continue"
 msgstr "Pressione uma tecla para continuar"
 
-#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2400
-#: fdisk/cfdisk.c:2402
+#: fdisk/cfdisk.c:1322 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2401
+#: fdisk/cfdisk.c:2403
 msgid "Primary"
 msgstr "Primária"
 
@@ -1507,8 +1063,8 @@ msgstr "Primária"
 msgid "Create a new primary partition"
 msgstr "Cria uma nova partição primária"
 
-#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1870 fdisk/cfdisk.c:2399
-#: fdisk/cfdisk.c:2402
+#: fdisk/cfdisk.c:1323 fdisk/cfdisk.c:1871 fdisk/cfdisk.c:2400
+#: fdisk/cfdisk.c:2403
 msgid "Logical"
 msgstr "Lógica"
 
@@ -1516,7 +1072,7 @@ msgstr "Lógica"
 msgid "Create a new logical partition"
 msgstr "Cria uma nova partição lógica"
 
-#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:1324 fdisk/cfdisk.c:1379 fdisk/cfdisk.c:2075
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1564,7 +1120,7 @@ msgstr "Foram especificados mais cilindros do que a quantidade que cabe no disco
 msgid "Cannot open disk drive"
 msgstr "Não foi possível abrir a unidade de disco"
 
-#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1686
+#: fdisk/cfdisk.c:1505 fdisk/cfdisk.c:1684
 msgid "Opened disk read-only - you have no permission to write"
 msgstr "Disco aberto somente para leitura - você não tem permissão para gravar"
 
@@ -1572,583 +1128,585 @@ msgstr "Disco aberto somente para leitura - você não tem permissão para gravar"
 msgid "Cannot get disk size"
 msgstr "Não foi possível obter o tamanho do disco"
 
-#. avoid snprintf - it does not exist on ancient systems
-#: fdisk/cfdisk.c:1552
+#: fdisk/cfdisk.c:1551
 msgid "Bad primary partition"
 msgstr "Partição primária inválida"
 
-#. avoid snprintf
-#: fdisk/cfdisk.c:1583
+#: fdisk/cfdisk.c:1581
 msgid "Bad logical partition"
 msgstr "Partição lógica inválida"
 
-#: fdisk/cfdisk.c:1698
+#: fdisk/cfdisk.c:1696
 msgid "Warning!!  This may destroy data on your disk!"
 msgstr "Aviso!! Isto pode destruir dados existentes no disco!"
 
-#: fdisk/cfdisk.c:1702
+#: fdisk/cfdisk.c:1700
 msgid "Are you sure you want write the partition table to disk? (yes or no): "
 msgstr "Tem certeza de que deseja gravar a tabela de partições no disco? (sim ou nao):"
 
-#: fdisk/cfdisk.c:1708
+#: fdisk/cfdisk.c:1706
 msgid "no"
 msgstr "nao"
 
-#: fdisk/cfdisk.c:1709
+#: fdisk/cfdisk.c:1707
 msgid "Did not write partition table to disk"
 msgstr "A tabela de partições NÃO foi gravada no disco"
 
-#: fdisk/cfdisk.c:1711
+#: fdisk/cfdisk.c:1709
 msgid "yes"
 msgstr "sim"
 
-#: fdisk/cfdisk.c:1714
+#: fdisk/cfdisk.c:1712
 msgid "Please enter `yes' or `no'"
 msgstr "Responda `sim' ou `nao'"
 
-#: fdisk/cfdisk.c:1718
+#: fdisk/cfdisk.c:1716
 msgid "Writing partition table to disk..."
 msgstr "Gravando tabela de partições no disco..."
 
-#: fdisk/cfdisk.c:1743 fdisk/cfdisk.c:1747
+#: fdisk/cfdisk.c:1741 fdisk/cfdisk.c:1745
 msgid "Wrote partition table to disk"
 msgstr "A tabela de partições foi gravada no disco"
 
-#: fdisk/cfdisk.c:1745
+#: fdisk/cfdisk.c:1743
 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:1753
+msgid "No primary partitions are marked bootable. DOS MBR cannot boot this."
+msgstr "Não existem partições primárias marcadas como inicializáveis. MBR DOS não pode inicializar isso."
+
 #: fdisk/cfdisk.c: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 "More than one primary partition is marked bootable. DOS MBR cannot boot this."
+msgstr "Mais de uma partição primária está marcada como inicializável. MBR DOS não pode inicializar isso."
 
-#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1931 fdisk/cfdisk.c:2015
+#: fdisk/cfdisk.c:1813 fdisk/cfdisk.c:1932 fdisk/cfdisk.c:2016
 msgid "Enter filename or press RETURN to display on screen: "
 msgstr "Digite um nome de arquivo ou pressione ENTER para exibir na tela: "
 
-#: fdisk/cfdisk.c:1821 fdisk/cfdisk.c:1939 fdisk/cfdisk.c:2023
+#: fdisk/cfdisk.c:1822 fdisk/cfdisk.c:1940 fdisk/cfdisk.c:2024
 #, c-format
 msgid "Cannot open file '%s'"
 msgstr "Não foi possível abrir o arquivo '%s'"
 
-#: fdisk/cfdisk.c:1832
+#: fdisk/cfdisk.c:1833
 #, c-format
 msgid "Disk Drive: %s\n"
 msgstr "Unidade de disco: %s\n"
 
-#: fdisk/cfdisk.c:1834
+#: fdisk/cfdisk.c:1835
 msgid "Sector 0:\n"
 msgstr "Setor 0:\n"
 
-#: fdisk/cfdisk.c:1841
+#: fdisk/cfdisk.c:1842
 #, c-format
 msgid "Sector %d:\n"
 msgstr "Setor %d:\n"
 
-#: fdisk/cfdisk.c:1861
+#: fdisk/cfdisk.c:1862
 msgid "   None   "
 msgstr "  Nenhum  "
 
-#: fdisk/cfdisk.c:1863
+#: fdisk/cfdisk.c:1864
 msgid "   Pri/Log"
 msgstr "   Pri/lóg"
 
-#: fdisk/cfdisk.c:1865
+#: fdisk/cfdisk.c:1866
 msgid "   Primary"
 msgstr "   Primária"
 
-#: fdisk/cfdisk.c:1867
+#: fdisk/cfdisk.c:1868
 msgid "   Logical"
 msgstr "   Lógica"
 
 #. odd flag on end
 #. type id
 #. type name
-#: fdisk/cfdisk.c:1905 fdisk/fdisk.c:1235 fdisk/fdisk.c:1459
-#: fdisk/fdisksgilabel.c:238 fdisk/fdisksunlabel.c:669 fdisk/sfdisk.c:581
+#: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1250 fdisk/fdisk.c:1474
+#: fdisk/fdisksgilabel.c:240 fdisk/fdisksunlabel.c:672 fdisk/sfdisk.c:581
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: fdisk/cfdisk.c:1911
+#: fdisk/cfdisk.c:1912
 #, c-format
 msgid "Boot (%02X)"
 msgstr "Boot (%02X)"
 
-#: fdisk/cfdisk.c:1913 fdisk/cfdisk.c:2408
+#: fdisk/cfdisk.c:1914 fdisk/cfdisk.c:2409
 #, c-format
 msgid "Unknown (%02X)"
 msgstr "Desconhecido (%02X)"
 
-#: fdisk/cfdisk.c:1915
+#: fdisk/cfdisk.c:1916
 #, c-format
 msgid "None (%02X)"
 msgstr "Nenhum (%02X)"
 
-#: fdisk/cfdisk.c:1950 fdisk/cfdisk.c:2034
+#: fdisk/cfdisk.c:1951 fdisk/cfdisk.c:2035
 #, c-format
 msgid "Partition Table for %s\n"
 msgstr "Tabela de partições de %s\n"
 
-#: fdisk/cfdisk.c:1952
+#: fdisk/cfdisk.c:1953
 msgid "            First    Last\n"
 msgstr "            Prim.    Últ.\n"
 
-#: fdisk/cfdisk.c:1953
+#: fdisk/cfdisk.c:1954
 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
+#: fdisk/cfdisk.c:1955
 msgid "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
 msgstr "-- ------- -------- --------- ------ --------- ---------------------- ---------\n"
 
-#: fdisk/cfdisk.c:2036
+#: fdisk/cfdisk.c:2037
 msgid "         ---Starting---      ----Ending----    Start Number of\n"
 msgstr "         --- Início ---       ---- Fim ----       Núm. inicial de\n"
 
-#: fdisk/cfdisk.c:2037
+#: fdisk/cfdisk.c:2038
 msgid " # Flags Head Sect Cyl   ID  Head Sect Cyl    Sector  Sectors\n"
 msgstr " # Ops.  Cab. Set. Cil.  ID  Cab. Set. Cil.   Setor   Setores\n"
 
-#: fdisk/cfdisk.c:2038
+#: fdisk/cfdisk.c:2039
 msgid "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 msgstr "-- ----- ---- ---- ---- ---- ---- ---- ---- -------- ---------\n"
 
-#: fdisk/cfdisk.c:2071
+#: fdisk/cfdisk.c:2072
 msgid "Raw"
 msgstr "Brutos"
 
-#: fdisk/cfdisk.c:2071
+#: fdisk/cfdisk.c:2072
 msgid "Print the table using raw data format"
 msgstr "Mostrar a tabela usando formato de dados brutos"
 
-#: fdisk/cfdisk.c:2072 fdisk/cfdisk.c:2174
+#: fdisk/cfdisk.c:2073 fdisk/cfdisk.c:2175
 msgid "Sectors"
 msgstr "Setores"
 
-#: fdisk/cfdisk.c:2072
+#: fdisk/cfdisk.c:2073
 msgid "Print the table ordered by sectors"
 msgstr "Mostrar a tabela ordenada por setores"
 
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2074
 msgid "Table"
 msgstr "Tabela"
 
-#: fdisk/cfdisk.c:2073
+#: fdisk/cfdisk.c:2074
 msgid "Just print the partition table"
 msgstr "Mostrar somente a tabela de partições"
 
-#: fdisk/cfdisk.c:2074
+#: fdisk/cfdisk.c:2075
 msgid "Don't print the table"
 msgstr "Não mostrar a tabela"
 
-#: fdisk/cfdisk.c:2102
+#: fdisk/cfdisk.c:2103
 msgid "Help Screen for cfdisk"
 msgstr "Tela de ajuda do cfdisk"
 
-#: fdisk/cfdisk.c:2104
+#: fdisk/cfdisk.c:2105
 msgid "This is cfdisk, a curses based disk partitioning program, which"
 msgstr "Este é o cfdisk, um programa de particionamento de disco baseado em funções "
 
-#: fdisk/cfdisk.c:2105
+#: fdisk/cfdisk.c:2106
 msgid "allows you to create, delete and modify partitions on your hard"
 msgstr "curses, que permite criar, excluir e alterar partições na unidade"
 
-#: fdisk/cfdisk.c:2106
+#: fdisk/cfdisk.c:2107
 msgid "disk drive."
 msgstr "de disco rígido."
 
-#: fdisk/cfdisk.c:2108
+#: fdisk/cfdisk.c:2109
 msgid "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 msgstr "Copyright (C) 1994-1999 Kevin E. Martin & aeb"
 
-#: fdisk/cfdisk.c:2110
+#: fdisk/cfdisk.c:2111
 msgid "Command      Meaning"
 msgstr "Comando      Significado"
 
-#: fdisk/cfdisk.c:2111
+#: fdisk/cfdisk.c:2112
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: fdisk/cfdisk.c:2112
+#: fdisk/cfdisk.c:2113
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          Alterna a opção da partição atual como inicializável."
 
-#: fdisk/cfdisk.c:2113
+#: fdisk/cfdisk.c:2114
 msgid "  d          Delete the current partition"
 msgstr "  d          Exclui a partição atual."
 
-#: fdisk/cfdisk.c:2114
+#: fdisk/cfdisk.c:2115
 msgid "  g          Change cylinders, heads, sectors-per-track parameters"
 msgstr "  g          Altera parâmetros de cilindros, cabeças, setores por trilha"
 
-#: fdisk/cfdisk.c:2115
+#: fdisk/cfdisk.c:2116
 msgid "             WARNING: This option should only be used by people who"
 msgstr "             AVISO: Esta opção só deve ser usada por pessoas que"
 
-#: fdisk/cfdisk.c:2116
+#: fdisk/cfdisk.c:2117
 msgid "             know what they are doing."
 msgstr "             saibam exatamente o que estão fazendo."
 
-#: fdisk/cfdisk.c:2117
+#: fdisk/cfdisk.c:2118
 msgid "  h          Print this screen"
 msgstr "  h          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2118
+#: fdisk/cfdisk.c:2119
 msgid "  m          Maximize disk usage of the current partition"
 msgstr "  m          Maximiza o uso de disco da partição atual."
 
-#: fdisk/cfdisk.c:2119
+#: fdisk/cfdisk.c:2120
 msgid "             Note: This may make the partition incompatible with"
 msgstr "             Nota: Isto pode tornar a partição incompatível com"
 
-#: fdisk/cfdisk.c:2120
+#: fdisk/cfdisk.c:2121
 msgid "             DOS, OS/2, ..."
 msgstr "             DOS, OS/2 ..."
 
-#: fdisk/cfdisk.c:2121
+#: fdisk/cfdisk.c:2122
 msgid "  n          Create new partition from free space"
 msgstr "  n          Cria uma nova partição a partir do espaço livre."
 
-#: fdisk/cfdisk.c:2122
+#: fdisk/cfdisk.c:2123
 msgid "  p          Print partition table to the screen or to a file"
 msgstr "  p          Mostra a tabela de partições na tela ou em um arquivo."
 
-#: fdisk/cfdisk.c:2123
+#: fdisk/cfdisk.c:2124
 msgid "             There are several different formats for the partition"
 msgstr "             Pode-se selecionar diversos formatos diferentes para"
 
-#: fdisk/cfdisk.c:2124
+#: fdisk/cfdisk.c:2125
 msgid "             that you can choose from:"
 msgstr "             uma partição:"
 
-#: fdisk/cfdisk.c:2125
+#: fdisk/cfdisk.c:2126
 msgid "                r - Raw data (exactly what would be written to disk)"
 msgstr "                r - Dados brutos (exatamente o que seria gravado no disco)."
 
-#: fdisk/cfdisk.c:2126
+#: fdisk/cfdisk.c:2127
 msgid "                s - Table ordered by sectors"
 msgstr "                s - Tabela ordenada por setores."
 
-#: fdisk/cfdisk.c:2127
+#: fdisk/cfdisk.c:2128
 msgid "                t - Table in raw format"
 msgstr "                t - Tabela em formato bruto."
 
-#: fdisk/cfdisk.c:2128
+#: fdisk/cfdisk.c:2129
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          Sai do programa sem gravar a tabela de partições."
 
-#: fdisk/cfdisk.c:2129
+#: fdisk/cfdisk.c:2130
 msgid "  t          Change the filesystem type"
 msgstr "  t          Altera o tipo de sistema de arquivos."
 
-#: fdisk/cfdisk.c:2130
+#: fdisk/cfdisk.c:2131
 msgid "  u          Change units of the partition size display"
 msgstr "  u          Altera unidades de exibição do tamanho das partições."
 
-#: fdisk/cfdisk.c:2131
+#: fdisk/cfdisk.c:2132
 msgid "             Rotates through MB, sectors and cylinders"
 msgstr "             Alterna entre MB, setores e cilindros."
 
-#: fdisk/cfdisk.c:2132
+#: fdisk/cfdisk.c:2133
 msgid "  W          Write partition table to disk (must enter upper case W)"
 msgstr "  W          Grava tabela de partições no disco (é necessário usar W maiúsculo)."
 
-#: fdisk/cfdisk.c:2133
+#: fdisk/cfdisk.c:2134
 msgid "             Since this might destroy data on the disk, you must"
 msgstr "             Como esta opção pode destruir dados no disco, você deve"
 
-#: fdisk/cfdisk.c:2134
+#: fdisk/cfdisk.c:2135
 msgid "             either confirm or deny the write by entering `yes' or"
 msgstr "             confirmar ou cancelar a gravação indicando `sim' ou"
 
-#: fdisk/cfdisk.c:2135
+#: fdisk/cfdisk.c:2136
 msgid "             `no'"
 msgstr "             `não'"
 
-#: fdisk/cfdisk.c:2136
+#: fdisk/cfdisk.c:2137
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "Seta p/ cima  Move o cursor para a partição anterior."
 
-#: fdisk/cfdisk.c:2137
+#: fdisk/cfdisk.c:2138
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "Seta p/ baixo    Move o cursor para a próxima partição."
 
-#: fdisk/cfdisk.c:2138
+#: fdisk/cfdisk.c:2139
 msgid "CTRL-L       Redraws the screen"
 msgstr "CTRL-L       Redesenha a tela."
 
-#: fdisk/cfdisk.c:2139
+#: fdisk/cfdisk.c:2140
 msgid "  ?          Print this screen"
 msgstr "  ?          Mostra esta tela."
 
-#: fdisk/cfdisk.c:2141
+#: fdisk/cfdisk.c:2142
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "Nota: Todos os comandos podem ser digitados em letras maiúsculas ou"
 
-#: fdisk/cfdisk.c:2142
+#: fdisk/cfdisk.c:2143
 msgid "case letters (except for Writes)."
 msgstr "minúsculas (exceto W)."
 
-#: fdisk/cfdisk.c:2172 fdisk/cfdisk.c:2494 fdisk/fdisksunlabel.c:318
+#: fdisk/cfdisk.c:2173 fdisk/cfdisk.c:2495 fdisk/fdisksunlabel.c:318
 #: fdisk/fdisksunlabel.c:320
 msgid "Cylinders"
 msgstr "Cilindros"
 
-#: fdisk/cfdisk.c:2172
+#: fdisk/cfdisk.c:2173
 msgid "Change cylinder geometry"
 msgstr "Alterar geometria dos cilindros"
 
-#: fdisk/cfdisk.c:2173 fdisk/fdisksunlabel.c:315
+#: fdisk/cfdisk.c:2174 fdisk/fdisksunlabel.c:315
 msgid "Heads"
 msgstr "Cabeças"
 
-#: fdisk/cfdisk.c:2173
+#: fdisk/cfdisk.c:2174
 msgid "Change head geometry"
 msgstr "Alterar geometria das cabeças"
 
-#: fdisk/cfdisk.c:2174
+#: fdisk/cfdisk.c:2175
 msgid "Change sector geometry"
 msgstr "Alterar geometria dos setores"
 
-#: fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2176
 msgid "Done"
 msgstr "Concluído"
 
-#: fdisk/cfdisk.c:2175
+#: fdisk/cfdisk.c:2176
 msgid "Done with changing geometry"
 msgstr "A alteração da geometria foi concluída"
 
-#: fdisk/cfdisk.c:2188
+#: fdisk/cfdisk.c:2189
 msgid "Enter the number of cylinders: "
 msgstr "Digite o número de cilindros: "
 
-#: fdisk/cfdisk.c:2200 fdisk/cfdisk.c:2762
+#: fdisk/cfdisk.c:2201 fdisk/cfdisk.c:2763
 msgid "Illegal cylinders value"
 msgstr "Valor de cilindros inválido"
 
-#: fdisk/cfdisk.c:2206
+#: fdisk/cfdisk.c:2207
 msgid "Enter the number of heads: "
 msgstr "Digite o número de cabeças: "
 
-#: fdisk/cfdisk.c:2213 fdisk/cfdisk.c:2772
+#: fdisk/cfdisk.c:2214 fdisk/cfdisk.c:2773
 msgid "Illegal heads value"
 msgstr "Valor de cabeças inválido"
 
-#: fdisk/cfdisk.c:2219
+#: fdisk/cfdisk.c:2220
 msgid "Enter the number of sectors per track: "
 msgstr "Digite o número de setores por trilha: "
 
-#: fdisk/cfdisk.c:2226 fdisk/cfdisk.c:2779
+#: fdisk/cfdisk.c:2227 fdisk/cfdisk.c:2780
 msgid "Illegal sectors value"
 msgstr "Valor de setores inválido"
 
-#: fdisk/cfdisk.c:2329
+#: fdisk/cfdisk.c:2330
 msgid "Enter filesystem type: "
 msgstr "Digite o tipo do sistema de arquivos: "
 
-#: fdisk/cfdisk.c:2347
+#: fdisk/cfdisk.c:2348
 msgid "Cannot change FS Type to empty"
 msgstr "Não foi possível alterar o tipo de sistema de arquivos para vazio"
 
-#: fdisk/cfdisk.c:2349
+#: fdisk/cfdisk.c:2350
 msgid "Cannot change FS Type to extended"
 msgstr "Não foi possível alterar o tipo de sistema de arquivos para estendido"
 
-#: fdisk/cfdisk.c:2377 fdisk/fdisksunlabel.c:44
+#: fdisk/cfdisk.c:2378 fdisk/fdisksunlabel.c:44
 msgid "Boot"
 msgstr "Inicializar"
 
-#: fdisk/cfdisk.c:2379
+#: fdisk/cfdisk.c:2380
 #, c-format
 msgid "Unk(%02X)"
 msgstr "Desc (%02X)"
 
-#: fdisk/cfdisk.c:2382 fdisk/cfdisk.c:2385
+#: fdisk/cfdisk.c:2383 fdisk/cfdisk.c:2386
 msgid ", NC"
 msgstr ", NC"
 
-#: fdisk/cfdisk.c:2390 fdisk/cfdisk.c:2393
+#: fdisk/cfdisk.c:2391 fdisk/cfdisk.c:2394
 msgid "NC"
 msgstr "NC"
 
-#: fdisk/cfdisk.c:2401
+#: fdisk/cfdisk.c:2402
 msgid "Pri/Log"
 msgstr "Pri/lóg"
 
-#: fdisk/cfdisk.c:2477
+#: fdisk/cfdisk.c:2478
 #, c-format
 msgid "Disk Drive: %s"
 msgstr "Disco: %s"
 
-#: fdisk/cfdisk.c:2480
+#: fdisk/cfdisk.c:2481
 #, c-format
 msgid "Size: %lld bytes"
 msgstr "Tamanho: %lld bytes"
 
-#: fdisk/cfdisk.c:2482
+#: fdisk/cfdisk.c:2483
 #, c-format
 msgid "Heads: %d   Sectors per Track: %d   Cylinders: %d"
 msgstr "Cabeças: %d  Setores por Trilha: %d  Cilindros: %d"
 
-#: fdisk/cfdisk.c:2486
+#: fdisk/cfdisk.c:2487
 msgid "Name"
 msgstr "Nome"
 
-#: fdisk/cfdisk.c:2487
+#: fdisk/cfdisk.c:2488
 msgid "Flags"
 msgstr "Opções"
 
-#: fdisk/cfdisk.c:2488
+#: fdisk/cfdisk.c:2489
 msgid "Part Type"
 msgstr "Tipo Part."
 
-#: fdisk/cfdisk.c:2489
+#: fdisk/cfdisk.c:2490
 msgid "FS Type"
 msgstr "Tipo SA"
 
-#: fdisk/cfdisk.c:2490
+#: fdisk/cfdisk.c:2491
 msgid "[Label]"
 msgstr "[Rótulo]"
 
-#: fdisk/cfdisk.c:2492
+#: fdisk/cfdisk.c:2493
 msgid "  Sectors"
 msgstr "  Setores"
 
-#: fdisk/cfdisk.c:2496
+#: fdisk/cfdisk.c:2497
 msgid "Size (MB)"
 msgstr "Tam. (Mb)"
 
-#: fdisk/cfdisk.c:2498
+#: fdisk/cfdisk.c:2499
 msgid "Size (GB)"
 msgstr "Tam. (Gb)"
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2554
 msgid "Bootable"
 msgstr "Iniciali."
 
-#: fdisk/cfdisk.c:2553
+#: fdisk/cfdisk.c:2554
 msgid "Toggle bootable flag of the current partition"
 msgstr "Alterna a opção da partição atual como inicializável"
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2555
 msgid "Delete"
 msgstr "Excluir"
 
-#: fdisk/cfdisk.c:2554
+#: fdisk/cfdisk.c:2555
 msgid "Delete the current partition"
 msgstr "Excluir a partição atual"
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2556
 msgid "Geometry"
 msgstr "Geometria"
 
-#: fdisk/cfdisk.c:2555
+#: fdisk/cfdisk.c:2556
 msgid "Change disk geometry (experts only)"
 msgstr "Alterar a geometria do disco (somente para usuários avançados)"
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2557
 msgid "Help"
 msgstr "Ajuda"
 
-#: fdisk/cfdisk.c:2556
+#: fdisk/cfdisk.c:2557
 msgid "Print help screen"
 msgstr "Mostrar tela de ajuda"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2558
 msgid "Maximize"
 msgstr "Maximize"
 
-#: fdisk/cfdisk.c:2557
+#: fdisk/cfdisk.c:2558
 msgid "Maximize disk usage of the current partition (experts only)"
 msgstr "Maximizar o uso de disco para a partição atual (somente para usuários avançados)"
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2559
 msgid "New"
 msgstr "Nova"
 
-#: fdisk/cfdisk.c:2558
+#: fdisk/cfdisk.c:2559
 msgid "Create new partition from free space"
 msgstr "Criar nova partição a partir do espaço livre"
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2560
 msgid "Print"
 msgstr "Mostre"
 
-#: fdisk/cfdisk.c:2559
+#: fdisk/cfdisk.c:2560
 msgid "Print partition table to the screen or to a file"
 msgstr "Mostrar tabela de partições na tela ou imprimir em um arquivo"
 
-#: fdisk/cfdisk.c:2560
+#: fdisk/cfdisk.c:2561
 msgid "Quit"
 msgstr "Sair"
 
-#: fdisk/cfdisk.c:2560
+#: fdisk/cfdisk.c:2561
 msgid "Quit program without writing partition table"
 msgstr "Sair do programa sem gravar a tabela de partições"
 
-#: fdisk/cfdisk.c:2561
+#: fdisk/cfdisk.c:2562
 msgid "Type"
 msgstr "Tipo"
 
-#: fdisk/cfdisk.c:2561
+#: fdisk/cfdisk.c:2562
 msgid "Change the filesystem type (DOS, Linux, OS/2 and so on)"
 msgstr "Alterar o tipo do sistema de arquivos (DOS, Linux, OS/2 e outros)"
 
-#: fdisk/cfdisk.c:2562
+#: fdisk/cfdisk.c:2563
 msgid "Units"
 msgstr "Unidades"
 
-#: fdisk/cfdisk.c:2562
+#: fdisk/cfdisk.c:2563
 msgid "Change units of the partition size display (MB, sect, cyl)"
 msgstr "Mudar unidades mostradas para o tamanho das partições (MB, setores, cilindros)"
 
-#: fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2564
 msgid "Write"
 msgstr "Gravar"
 
-#: fdisk/cfdisk.c:2563
+#: fdisk/cfdisk.c:2564
 msgid "Write partition table to disk (this might destroy data)"
 msgstr "Gravar tabela de partições no disco (isto poderá destruir dados)"
 
-#: fdisk/cfdisk.c:2609
+#: fdisk/cfdisk.c:2610
 msgid "Cannot make this partition bootable"
 msgstr "Não foi possível tornar esta partição inicializável."
 
-#: fdisk/cfdisk.c:2619
+#: fdisk/cfdisk.c:2620
 msgid "Cannot delete an empty partition"
 msgstr "Não foi possível excluir uma partição vazia"
 
-#: fdisk/cfdisk.c:2639 fdisk/cfdisk.c:2641
+#: fdisk/cfdisk.c:2640 fdisk/cfdisk.c:2642
 msgid "Cannot maximize this partition"
 msgstr "Não foi possível maximizar esta partição"
 
-#: fdisk/cfdisk.c:2649
+#: fdisk/cfdisk.c:2650
 msgid "This partition is unusable"
 msgstr "Esta partição é inutilizável"
 
-#: fdisk/cfdisk.c:2651
+#: fdisk/cfdisk.c:2652
 msgid "This partition is already in use"
 msgstr "Esta partição já está sendo usada"
 
-#: fdisk/cfdisk.c:2668
+#: fdisk/cfdisk.c:2669
 msgid "Cannot change the type of an empty partition"
 msgstr "Não foi possível alterar o tipo de uma partição vazia"
 
-#: fdisk/cfdisk.c:2695 fdisk/cfdisk.c:2701
+#: fdisk/cfdisk.c:2696 fdisk/cfdisk.c:2702
 msgid "No more partitions"
 msgstr "Sem mais partições"
 
-#: fdisk/cfdisk.c:2708
+#: fdisk/cfdisk.c:2709
 msgid "Illegal command"
 msgstr "Comando inválido"
 
-#: fdisk/cfdisk.c:2718
+#: fdisk/cfdisk.c:2719
 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
+#: fdisk/cfdisk.c:2726
 #, c-format
 msgid ""
 "\n"
@@ -2219,222 +1777,222 @@ msgstr ""
 " ou : fdisk /dev/rd/c0d0  ou : fdisk /dev/ida/c0d0  (para dispositivos RAID)\n"
 "  ...\n"
 
-#: fdisk/fdisk.c:225
+#: fdisk/fdisk.c:226
 #, c-format
 msgid "Unable to open %s\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:228
+#: fdisk/fdisk.c:230
 #, c-format
 msgid "Unable to read %s\n"
 msgstr "Não foi possível ler %s\n"
 
-#: fdisk/fdisk.c:231
+#: fdisk/fdisk.c:234
 #, c-format
 msgid "Unable to seek on %s\n"
 msgstr "Não foi possível realizar busca em %s\n"
 
-#: fdisk/fdisk.c:234
+#: fdisk/fdisk.c:238
 #, c-format
 msgid "Unable to write %s\n"
 msgstr "Não foi possível gravar em %s\n"
 
-#: fdisk/fdisk.c:237
+#: fdisk/fdisk.c:242
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s\n"
 msgstr "ioctl BLKGETSIZE  falhou em %s\n"
 
-#: fdisk/fdisk.c:241
+#: fdisk/fdisk.c:246
 msgid "Unable to allocate any more memory\n"
 msgstr "Não foi possível alocar mais qualquer memória\n"
 
-#: fdisk/fdisk.c:243
+#: fdisk/fdisk.c:249
 msgid "Fatal error\n"
 msgstr "Erro fatal\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/fdisk.c:318 fdisk/fdisk.c:337 fdisk/fdisk.c:355 fdisk/fdisk.c:362
+#: fdisk/fdisk.c:385 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:435
 #: fdisk/fdiskbsdlabel.c:124
 msgid "Command action"
 msgstr "Comando - ação"
 
-#: fdisk/fdisk.c:313
+#: fdisk/fdisk.c:319
 msgid "   a   toggle a read only flag"
 msgstr "   a   alterna uma opção de somente leitura"
 
 #. sun
-#: fdisk/fdisk.c:314 fdisk/fdisk.c:358
+#: fdisk/fdisk.c:320 fdisk/fdisk.c:364
 msgid "   b   edit bsd disklabel"
 msgstr "   b   edita rótulo BSD no disco"
 
-#: fdisk/fdisk.c:315
+#: fdisk/fdisk.c:321
 msgid "   c   toggle the mountable flag"
 msgstr "   c   alterna a opção \"montável\""
 
 #. sun
-#: fdisk/fdisk.c:316 fdisk/fdisk.c:335 fdisk/fdisk.c:360
+#: fdisk/fdisk.c:322 fdisk/fdisk.c:341 fdisk/fdisk.c:366
 msgid "   d   delete a partition"
 msgstr "   d   exclui uma partição"
 
-#: fdisk/fdisk.c:317 fdisk/fdisk.c:336 fdisk/fdisk.c:361
+#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:367
 msgid "   l   list known partition types"
 msgstr "   l   lista os tipos de partição conhecidos"
 
 #. 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/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:356 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:393 fdisk/fdisk.c:410 fdisk/fdisk.c:426 fdisk/fdisk.c:443
 #: fdisk/fdiskbsdlabel.c:129
 msgid "   m   print this menu"
 msgstr "   m   mostra este menu"
 
-#: fdisk/fdisk.c:319 fdisk/fdisk.c:338 fdisk/fdisk.c:363
+#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369
 msgid "   n   add a new partition"
 msgstr "   n   cria uma nova partição"
 
-#: fdisk/fdisk.c:320 fdisk/fdisk.c:339 fdisk/fdisk.c:351 fdisk/fdisk.c:364
+#: fdisk/fdisk.c:326 fdisk/fdisk.c:345 fdisk/fdisk.c:357 fdisk/fdisk.c:370
 msgid "   o   create a new empty DOS partition table"
 msgstr "   o   cria uma nova tabela de partições DOS vazia"
 
-#: 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
+#: fdisk/fdisk.c:327 fdisk/fdisk.c:346 fdisk/fdisk.c:371 fdisk/fdisk.c:394
+#: fdisk/fdisk.c:411 fdisk/fdisk.c:427 fdisk/fdisk.c:444
 msgid "   p   print the partition table"
 msgstr "   p   mostra a tabela de partições"
 
-#: 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/fdisk.c:328 fdisk/fdisk.c:347 fdisk/fdisk.c:358 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:395 fdisk/fdisk.c:412 fdisk/fdisk.c:428 fdisk/fdisk.c:445
 #: fdisk/fdiskbsdlabel.c:132
 msgid "   q   quit without saving changes"
 msgstr "   q   sai sem salvar as alterações"
 
-#: fdisk/fdisk.c:323 fdisk/fdisk.c:342 fdisk/fdisk.c:353 fdisk/fdisk.c:367
+#: fdisk/fdisk.c:329 fdisk/fdisk.c:348 fdisk/fdisk.c:359 fdisk/fdisk.c:373
 msgid "   s   create a new empty Sun disklabel"
 msgstr "   s   cria um novo rótulo de disco Sun vazio"
 
 #. sun
-#: fdisk/fdisk.c:324 fdisk/fdisk.c:343 fdisk/fdisk.c:368
+#: fdisk/fdisk.c:330 fdisk/fdisk.c:349 fdisk/fdisk.c:374
 msgid "   t   change a partition's system id"
 msgstr "   t   altera a identificação da partição para o sistema"
 
-#: fdisk/fdisk.c:325 fdisk/fdisk.c:344 fdisk/fdisk.c:369
+#: fdisk/fdisk.c:331 fdisk/fdisk.c:350 fdisk/fdisk.c:375
 msgid "   u   change display/entry units"
 msgstr "   u   altera as unidades das entradas mostradas"
 
-#: 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
+#: fdisk/fdisk.c:332 fdisk/fdisk.c:351 fdisk/fdisk.c:376 fdisk/fdisk.c:398
+#: fdisk/fdisk.c:415 fdisk/fdisk.c:431 fdisk/fdisk.c:448
 msgid "   v   verify the partition table"
 msgstr "   v   verifica a tabela de partições"
 
-#: 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
+#: fdisk/fdisk.c:333 fdisk/fdisk.c:352 fdisk/fdisk.c:377 fdisk/fdisk.c:399
+#: fdisk/fdisk.c:416 fdisk/fdisk.c:432 fdisk/fdisk.c:449
 msgid "   w   write table to disk and exit"
 msgstr "   w   grava a tabela no disco e sai"
 
-#: fdisk/fdisk.c:328 fdisk/fdisk.c:372
+#: fdisk/fdisk.c:334 fdisk/fdisk.c:378
 msgid "   x   extra functionality (experts only)"
 msgstr "   x   funcionalidade adicional (somente para usuários avançados)"
 
-#: fdisk/fdisk.c:332
+#: fdisk/fdisk.c:338
 msgid "   a   select bootable partition"
 msgstr "   a   torna a partição inicializável"
 
 #. sgi flavour
-#: fdisk/fdisk.c:333
+#: fdisk/fdisk.c:339
 msgid "   b   edit bootfile entry"
 msgstr "   b   edita uma entrada de arquivo de inicialização"
 
 #. sgi
-#: fdisk/fdisk.c:334
+#: fdisk/fdisk.c:340
 msgid "   c   select sgi swap partition"
 msgstr "   c   seleciona uma partição de permuta (swap) sgi"
 
-#: fdisk/fdisk.c:357
+#: fdisk/fdisk.c:363
 msgid "   a   toggle a bootable flag"
 msgstr "   a   alterna a opção \"inicializável\""
 
-#: fdisk/fdisk.c:359
+#: fdisk/fdisk.c:365
 msgid "   c   toggle the dos compatibility flag"
 msgstr "   c   alterna a opção \"compatibilidade\""
 
-#: fdisk/fdisk.c:380
+#: fdisk/fdisk.c:386
 msgid "   a   change number of alternate cylinders"
 msgstr "   a   alterar número de cilindros alternativos"
 
 #. sun
-#: fdisk/fdisk.c:381 fdisk/fdisk.c:399 fdisk/fdisk.c:415 fdisk/fdisk.c:431
+#: fdisk/fdisk.c:387 fdisk/fdisk.c:405 fdisk/fdisk.c:421 fdisk/fdisk.c:437
 msgid "   c   change number of cylinders"
 msgstr "   c   alterar número de cilindros"
 
-#: fdisk/fdisk.c:382 fdisk/fdisk.c:400 fdisk/fdisk.c:416 fdisk/fdisk.c:432
+#: fdisk/fdisk.c:388 fdisk/fdisk.c:406 fdisk/fdisk.c:422 fdisk/fdisk.c:438
 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:383
+#: fdisk/fdisk.c:389
 msgid "   e   change number of extra sectors per cylinder"
 msgstr "   e   alterar número de setores extras por cilindro"
 
 #. sun
-#: fdisk/fdisk.c:384 fdisk/fdisk.c:403 fdisk/fdisk.c:419 fdisk/fdisk.c:436
+#: fdisk/fdisk.c:390 fdisk/fdisk.c:409 fdisk/fdisk.c:425 fdisk/fdisk.c:442
 msgid "   h   change number of heads"
 msgstr "   h   alterar número de cabeças"
 
-#: fdisk/fdisk.c:385
+#: fdisk/fdisk.c:391
 msgid "   i   change interleave factor"
 msgstr "   i   alterar fator de \"interleave\""
 
 #. sun
-#: fdisk/fdisk.c:386
+#: fdisk/fdisk.c:392
 msgid "   o   change rotation speed (rpm)"
 msgstr "   o   alterar velocidade de rotação (RPM)"
 
-#: fdisk/fdisk.c:390 fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:440
+#: fdisk/fdisk.c:396 fdisk/fdisk.c:413 fdisk/fdisk.c:429 fdisk/fdisk.c:446
 #: fdisk/fdiskbsdlabel.c:133
 msgid "   r   return to main menu"
 msgstr "   r   voltar ao menu principal"
 
-#: fdisk/fdisk.c:391 fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
+#: fdisk/fdisk.c:397 fdisk/fdisk.c:414 fdisk/fdisk.c:430 fdisk/fdisk.c:447
 msgid "   s   change number of sectors/track"
 msgstr "   s   alterar número de setores/trilha"
 
-#: fdisk/fdisk.c:394
+#: fdisk/fdisk.c:400
 msgid "   y   change number of physical cylinders"
 msgstr "   y   alterar número de cilindros físicos"
 
-#: fdisk/fdisk.c:398 fdisk/fdisk.c:414 fdisk/fdisk.c:430
+#: fdisk/fdisk.c:404 fdisk/fdisk.c:420 fdisk/fdisk.c:436
 msgid "   b   move beginning of data in a partition"
 msgstr "   b   mover início dos dados em uma partição"
 
-#: fdisk/fdisk.c:401 fdisk/fdisk.c:417 fdisk/fdisk.c:433
+#: fdisk/fdisk.c:407 fdisk/fdisk.c:423 fdisk/fdisk.c:439
 msgid "   e   list extended partitions"
 msgstr "   e   listar partições estendidas"
 
 #. !sun
-#: fdisk/fdisk.c:402 fdisk/fdisk.c:418 fdisk/fdisk.c:435
+#: fdisk/fdisk.c:408 fdisk/fdisk.c:424 fdisk/fdisk.c:441
 msgid "   g   create an IRIX partition table"
 msgstr "   g   criar uma tabela de partições IRIX"
 
 #. !sun
-#: fdisk/fdisk.c:434
+#: fdisk/fdisk.c:440
 msgid "   f   fix partition order"
 msgstr "   f   corrige ordem de partição"
 
-#: fdisk/fdisk.c:533
+#: fdisk/fdisk.c:539
 msgid "You must set"
 msgstr "Você precisa configurar"
 
-#: fdisk/fdisk.c:547
+#: fdisk/fdisk.c:553
 msgid "heads"
 msgstr "cabeças"
 
-#: fdisk/fdisk.c:549 fdisk/fdisk.c:1068 fdisk/sfdisk.c:864
+#: fdisk/fdisk.c:555 fdisk/fdisk.c:1078 fdisk/sfdisk.c:864
 msgid "sectors"
 msgstr "setores"
 
-#: fdisk/fdisk.c:551 fdisk/fdisk.c:1068 fdisk/fdiskbsdlabel.c:461
+#: fdisk/fdisk.c:557 fdisk/fdisk.c:1078 fdisk/fdiskbsdlabel.c:461
 #: fdisk/sfdisk.c:864
 msgid "cylinders"
 msgstr "cilindros"
 
-#: fdisk/fdisk.c:555
+#: fdisk/fdisk.c:561
 #, c-format
 msgid ""
 "%s%s.\n"
@@ -2443,30 +2001,49 @@ msgstr ""
 "%s%s.\n"
 "Você pode fazer isto a partir do menu de funções extras.\n"
 
-#: fdisk/fdisk.c:556
+#: fdisk/fdisk.c:562
 msgid " and "
 msgstr " e "
 
-#: fdisk/fdisk.c:596
+#: fdisk/fdisk.c:579
+#, c-format
+msgid ""
+"\n"
+"The number of cylinders for this disk is set to %d.\n"
+"There is nothing wrong with that, but this is larger than 1024,\n"
+"and could in certain setups cause problems with:\n"
+"1) software that runs at boot time (e.g., old versions of LILO)\n"
+"2) booting and partitioning software from other OSs\n"
+"   (e.g., DOS FDISK, OS/2 FDISK)\n"
+msgstr ""
+"\n"
+"O númeor de cilindros para este disco está configurado para %d.\n"
+"Não existe nada de errado, mas isto é maior que 1024,\n"
+"e pode em certas configurações causar problemas com:\n"
+"1) programas que executam em tempo de inicialização (versões velhas do LILO)\n"
+"2) inicialização e programas de particionamento de outros OSs\n"
+"   (p.ex., DOS FDISK, OS/2 FDISK)\n"
+
+#: fdisk/fdisk.c:602
 msgid "Bad offset in primary extended partition\n"
 msgstr "Deslocamento inválido em uma partição primária estendida\n"
 
-#: fdisk/fdisk.c:610
+#: fdisk/fdisk.c:616
 #, c-format
 msgid "Warning: deleting partitions after %d\n"
 msgstr "Aviso: excluindo partições após %d\n"
 
-#: fdisk/fdisk.c:626
+#: fdisk/fdisk.c:633
 #, 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:634
+#: fdisk/fdisk.c:641
 #, 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:678
+#: fdisk/fdisk.c:686
 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"
@@ -2478,96 +2055,96 @@ msgstr ""
 "o conteúdo anterior não poderá mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisk.c:722
+#: fdisk/fdisk.c:729
 #, 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:805
+#: fdisk/fdisk.c:812
 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
+#: fdisk/fdisk.c:840
 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:849
+#: fdisk/fdisk.c:856
 msgid "Internal error\n"
 msgstr "Erro interno\n"
 
-#: fdisk/fdisk.c:871
+#: fdisk/fdisk.c:878
 #, c-format
 msgid "Ignoring extra extended partition %d\n"
 msgstr "Ignorando partição estendida extra %d\n"
 
-#: fdisk/fdisk.c:883
+#: fdisk/fdisk.c:890
 #, 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"
 
-#: fdisk/fdisk.c:905
+#: fdisk/fdisk.c:912
 msgid "\ngot EOF thrice - exiting..\n"
 msgstr "\nEOF (fim de arquivo) recebido três vezes - saindo...\n"
 
-#: fdisk/fdisk.c:943
+#: fdisk/fdisk.c:951
 msgid "Hex code (type L to list codes): "
 msgstr "Código hexadecimal (digite L para listar os códigos): "
 
-#: fdisk/fdisk.c:982
+#: fdisk/fdisk.c:990
 #, c-format
 msgid "%s (%d-%d, default %d): "
 msgstr "%s (%d-%d, padrão %d):"
 
-#: fdisk/fdisk.c:1036
+#: fdisk/fdisk.c:1046
 #, c-format
 msgid "Using default value %d\n"
 msgstr "Usando valor padrão %d\n"
 
-#: fdisk/fdisk.c:1040
+#: fdisk/fdisk.c:1050
 msgid "Value out of range.\n"
 msgstr "Valor fora do intervalo.\n"
 
-#: fdisk/fdisk.c:1050
+#: fdisk/fdisk.c:1060
 msgid "Partition number"
 msgstr "Número da partição"
 
-#: fdisk/fdisk.c:1059
+#: fdisk/fdisk.c:1069
 #, c-format
 msgid "Warning: partition %d has empty type\n"
 msgstr "Aviso: a partição %d possui tipo vazio\n"
 
-#: fdisk/fdisk.c:1066
+#: fdisk/fdisk.c:1076
 msgid "cylinder"
 msgstr "cilindro"
 
-#: fdisk/fdisk.c:1066
+#: fdisk/fdisk.c:1076
 msgid "sector"
 msgstr "setor"
 
-#: fdisk/fdisk.c:1075
+#: fdisk/fdisk.c:1085
 #, c-format
 msgid "Changing display/entry units to %s\n"
 msgstr "Mudando as unidades das entradas mostradas para %s\n"
 
-#: fdisk/fdisk.c:1086
+#: fdisk/fdisk.c:1096
 #, 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:1097
+#: fdisk/fdisk.c:1107
 msgid "DOS Compatibility flag is set\n"
 msgstr "A opção de compatibilidade DOS está ativada\n"
 
-#: fdisk/fdisk.c:1101
+#: fdisk/fdisk.c:1111
 msgid "DOS Compatibility flag is not set\n"
 msgstr "A opção de compatibilidade DOS não está ativada\n"
 
-#: fdisk/fdisk.c:1189
+#: fdisk/fdisk.c:1204
 #, c-format
 msgid "Partition %d does not exist yet!\n"
 msgstr "A partição %d ainda não existe!\n"
 
-#: fdisk/fdisk.c:1194
+#: fdisk/fdisk.c:1209
 msgid ""
 "Type 0 means free space to many systems\n"
 "(but not to Linux). Having partitions of\n"
@@ -2579,7 +2156,7 @@ msgstr ""
 "tipo 0 não é recomendável. Você pode excluir\n"
 "uma partição usando o comando `d'.\n"
 
-#: fdisk/fdisk.c:1203
+#: fdisk/fdisk.c:1218
 msgid ""
 "You cannot change a partition into an extended one or vice versa\n"
 "Delete it first.\n"
@@ -2587,7 +2164,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:1212
+#: fdisk/fdisk.c:1227
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -2597,7 +2174,7 @@ msgstr ""
 "uma vez que o SunOS/Solaris espera isto e até mesmo o Linux gosta disto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1218
+#: fdisk/fdisk.c:1233
 msgid ""
 "Consider leaving partition 9 as volume header (0),\n"
 "and partition 11 as entire volume (6)as IRIX expects it.\n"
@@ -2607,52 +2184,52 @@ msgstr ""
 "e a partição 11 como um volume inteiro (6), uma vez que o IRIX espera isto.\n"
 "\n"
 
-#: fdisk/fdisk.c:1232
+#: fdisk/fdisk.c:1247
 #, 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:1283
+#: fdisk/fdisk.c:1298
 #, 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:1285 fdisk/fdisk.c:1293 fdisk/fdisk.c:1302 fdisk/fdisk.c:1311
+#: fdisk/fdisk.c:1300 fdisk/fdisk.c:1308 fdisk/fdisk.c:1317 fdisk/fdisk.c:1326
 #, c-format
 msgid "     phys=(%d, %d, %d) "
 msgstr "     fís. = (%d, %d, %d) "
 
-#: fdisk/fdisk.c:1286 fdisk/fdisk.c:1294
+#: fdisk/fdisk.c:1301 fdisk/fdisk.c:1309
 #, c-format
 msgid "logical=(%d, %d, %d)\n"
 msgstr "lógico = (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1291
+#: fdisk/fdisk.c:1306
 #, 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:1300
+#: fdisk/fdisk.c:1315
 #, 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:1303
+#: fdisk/fdisk.c:1318
 #, c-format
 msgid "should be (%d, %d, 1)\n"
 msgstr "deveria ser (%d, %d, 1)\n"
 
-#: fdisk/fdisk.c:1309
+#: fdisk/fdisk.c:1324
 #, 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:1312
+#: fdisk/fdisk.c:1327
 #, c-format
 msgid "should be (%d, %d, %d)\n"
 msgstr "deveria ser (%d, %d, %d)\n"
 
-#: fdisk/fdisk.c:1319
+#: fdisk/fdisk.c:1334
 #, c-format
 msgid ""
 "\n"
@@ -2665,126 +2242,126 @@ msgstr ""
 "Unidades = %s de %d * %d bytes\n"
 "\n"
 
-#: fdisk/fdisk.c:1364
+#: fdisk/fdisk.c:1379
 msgid "Nothing to do. Ordering is correct already.\n\n"
 msgstr "Nada a fazer. Ordem já está correta\n\n"
 
-#: fdisk/fdisk.c:1430
+#: fdisk/fdisk.c:1445
 #, c-format
 msgid "%*s Boot    Start       End    Blocks   Id  System\n"
 msgstr "%*s Boot    Início      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisk.c:1431 fdisk/fdisksgilabel.c:221 fdisk/fdisksunlabel.c:654
+#: fdisk/fdisk.c:1446 fdisk/fdisksgilabel.c:223 fdisk/fdisksunlabel.c:657
 msgid "Device"
 msgstr "Dispositivo"
 
-#: fdisk/fdisk.c:1468
+#: fdisk/fdisk.c:1483
 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
+#: fdisk/fdisk.c:1493
 #, c-format
 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:1480
+#: fdisk/fdisk.c:1495
 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:1524
+#: fdisk/fdisk.c:1539
 #, 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:1527
+#: fdisk/fdisk.c:1542
 #, 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:1530
+#: fdisk/fdisk.c:1545
 #, 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:1533
+#: fdisk/fdisk.c:1548
 #, 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:1537
+#: fdisk/fdisk.c:1552
 #, c-format
 msgid "Partition %d: previous sectors %d disagrees with total %d\n"
 msgstr "Partição %d: os setores anteriores %d não estão de acordo com o total: %d\n"
 
-#: fdisk/fdisk.c:1569
+#: fdisk/fdisk.c:1584
 #, 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:1577
+#: fdisk/fdisk.c:1592
 #, 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:1597
+#: fdisk/fdisk.c:1612
 #, c-format
 msgid "Warning: partition %d is empty\n"
 msgstr "Aviso: a partição %d está vazia\n"
 
-#: fdisk/fdisk.c:1602
+#: fdisk/fdisk.c:1617
 #, 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:1608
+#: fdisk/fdisk.c:1623
 #, 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:1611
+#: fdisk/fdisk.c:1626
 #, c-format
 msgid "%d unallocated sectors\n"
 msgstr "%d setores não alocados\n"
 
-#: fdisk/fdisk.c:1624 fdisk/fdisksgilabel.c:662 fdisk/fdisksunlabel.c:502
+#: fdisk/fdisk.c:1639 fdisk/fdisksgilabel.c:664 fdisk/fdisksunlabel.c:503
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "A partição %d já está definida. Exclua essa partição antes de adicioná-la novamente.\n"
 
-#: fdisk/fdisk.c:1645 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:684
-#: fdisk/fdisksunlabel.c:517
+#: fdisk/fdisk.c:1660 fdisk/fdiskbsdlabel.c:276 fdisk/fdisksgilabel.c:686
+#: fdisk/fdisksunlabel.c:518
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdisk.c:1660 fdisk/fdisksunlabel.c:542
+#: fdisk/fdisk.c:1675 fdisk/fdisksunlabel.c:543
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "O setor %d já está alocado\n"
 
-#: fdisk/fdisk.c:1696
+#: fdisk/fdisk.c:1711
 msgid "No free sectors available\n"
 msgstr "Não há setores livres disponíveis\n"
 
-#: fdisk/fdisk.c:1704 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:552
+#: fdisk/fdisk.c:1720 fdisk/fdiskbsdlabel.c:283 fdisk/fdisksunlabel.c:554
 #, 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:1737
+#: fdisk/fdisk.c:1753
 #, 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:1777 fdisk/fdiskbsdlabel.c:611
+#: fdisk/fdisk.c:1793 fdisk/fdiskbsdlabel.c:610
 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:1787
+#: fdisk/fdisk.c:1803
 msgid "You must delete some partition and add an extended partition first\n"
 msgstr "Você precisa excluir alguma partição e adicionar uma partição estendida antes\n"
 
-#: fdisk/fdisk.c:1791
+#: fdisk/fdisk.c:1808
 #, c-format
 msgid ""
 "Command action\n"
@@ -2795,28 +2372,28 @@ msgstr ""
 "   %s\n"
 "   p   partição primária (1-4)\n"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1810
 msgid "l   logical (5 or over)"
 msgstr "l   lógica (5 ou superior)"
 
-#: fdisk/fdisk.c:1793
+#: fdisk/fdisk.c:1810
 msgid "e   extended"
 msgstr "e   estendida"
 
-#: fdisk/fdisk.c:1810
+#: fdisk/fdisk.c:1827
 #, 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:1845
+#: fdisk/fdisk.c:1862
 msgid "The partition table has been altered!\n\n"
 msgstr "A tabela de partições foi alterada!\n\n"
 
-#: fdisk/fdisk.c:1854
+#: fdisk/fdisk.c:1871
 msgid "Calling ioctl() to re-read partition table.\n"
 msgstr "Chamando ioctl() para reler tabela de partições.\n"
 
-#: fdisk/fdisk.c:1870
+#: fdisk/fdisk.c:1887
 #, c-format
 msgid ""
 "Re-read table failed with error %d: %s.\n"
@@ -2825,7 +2402,7 @@ 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"
 
-#: fdisk/fdisk.c:1876
+#: fdisk/fdisk.c:1893
 msgid ""
 "\n"
 "WARNING: If you have created or modified any DOS 6.x\n"
@@ -2837,73 +2414,68 @@ msgstr ""
 "partição DOS 6.x, consulte a página de manual\n"
 "do fdisk para obter informações adicionais.\n"
 
-#: fdisk/fdisk.c:1883
+#: fdisk/fdisk.c:1900
 msgid "Syncing disks.\n"
 msgstr "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:1914
-#, c-format
-msgid "Device: %s\n"
-msgstr "Dispositivo: %s\n"
-
-#: fdisk/fdisk.c:1930
+#: fdisk/fdisk.c:1947
 #, 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:1935
+#: fdisk/fdisk.c:1952
 msgid "New beginning of data"
 msgstr "Novo início dos dados"
 
-#: fdisk/fdisk.c:1951
+#: fdisk/fdisk.c:1968
 msgid "Expert command (m for help): "
 msgstr "Comando avançado (m para ajuda): "
 
-#: fdisk/fdisk.c:1964
+#: fdisk/fdisk.c:1981
 msgid "Number of cylinders"
 msgstr "Número de cilindros"
 
-#: fdisk/fdisk.c:1990
+#: fdisk/fdisk.c:2007
 msgid "Number of heads"
 msgstr "Número de cabeças"
 
-#: fdisk/fdisk.c:2015
+#: fdisk/fdisk.c:2032
 msgid "Number of sectors"
 msgstr "Número de setores"
 
-#: fdisk/fdisk.c:2018
+#: fdisk/fdisk.c:2035
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
 
-#: fdisk/fdisk.c:2080
+#: fdisk/fdisk.c:2100
 #, 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:2094
+#: fdisk/fdisk.c:2114
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:2111
+#: fdisk/fdisk.c:2130
 #, c-format
 msgid "cannot open %s\n"
 msgstr "não foi possível abrir %s\n"
 
-#: fdisk/fdisk.c:2132
+#: fdisk/fdisk.c:2151
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando desconhecido:\n"
 
-#: fdisk/fdisk.c:2182
+#: fdisk/fdisk.c:2201
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Este kernel localiza o tamanho de setor por conta própria - opção -b ignorada\n"
 
-#: fdisk/fdisk.c:2185
+#: fdisk/fdisk.c:2204
 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
+#: fdisk/fdisk.c:2269
 #, c-format
 msgid ""
 "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
@@ -2912,24 +2484,24 @@ msgstr ""
 "Detectado um rótulo OSF/1 em %s, entrando em modo de rótulo.\n"
 "Para retornar ao modo de tabela de partições do DOS, use o comando 'r'.\n"
 
-#: fdisk/fdisk.c:2257
+#: fdisk/fdisk.c:2278
 msgid "Command (m for help): "
 msgstr "Comando (m para ajuda): "
 
-#: fdisk/fdisk.c:2273
+#: fdisk/fdisk.c:2294
 #, c-format
 msgid "\nThe current boot file is: %s\n"
 msgstr "\nO arquivo de boot atual é: %s\n"
 
-#: fdisk/fdisk.c:2275
+#: fdisk/fdisk.c:2296
 msgid "Please enter the name of the new boot file: "
 msgstr "Informe o nome do novo arquivo de boot: "
 
-#: fdisk/fdisk.c:2277
+#: fdisk/fdisk.c:2298
 msgid "Boot file unchanged\n"
 msgstr "Arquivo de boot inalterado\n"
 
-#: fdisk/fdisk.c:2341
+#: fdisk/fdisk.c:2362
 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"
 
@@ -3198,30 +2770,30 @@ msgstr "busca trilha a trilha"
 msgid "Bootstrap: %sboot -> boot%s (%s): "
 msgstr "Bootstrap (código de inicialização): %sboot -> boot%s (%s): "
 
-#: fdisk/fdiskbsdlabel.c:546
+#: fdisk/fdiskbsdlabel.c:545
 msgid "Bootstrap overlaps with disk label!\n"
 msgstr "Bootstrap (código de inicialização) sobreposto ao rótulo do disco!\n"
 
-#: fdisk/fdiskbsdlabel.c:567 fdisk/fdiskbsdlabel.c:569
+#: fdisk/fdiskbsdlabel.c:566 fdisk/fdiskbsdlabel.c:568
 #, c-format
 msgid "Bootstrap installed on %s.\n"
 msgstr "Bootstrap (código de inicialização) instalado em %s.\n"
 
-#: fdisk/fdiskbsdlabel.c:591
+#: fdisk/fdiskbsdlabel.c:590
 #, c-format
 msgid "Partition (a-%c): "
 msgstr "Partição (a-%c): "
 
-#: fdisk/fdiskbsdlabel.c:622
+#: fdisk/fdiskbsdlabel.c:621
 msgid "This partition already exists.\n"
 msgstr "Esta partição já existe.\n"
 
-#: fdisk/fdiskbsdlabel.c:742
+#: fdisk/fdiskbsdlabel.c:741
 #, 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:789
+#: fdisk/fdiskbsdlabel.c:788
 msgid "\nSyncing disks.\n"
 msgstr "\nSincronizando discos.\n"
 
@@ -3270,35 +2842,43 @@ msgid "SGI xfs"
 msgstr "xfs SGI"
 
 #: fdisk/fdisksgilabel.c:90
-msgid "SGI xlvol"
-msgstr "xlvol SGI"
+msgid "SGI xfslog"
+msgstr "SGI xfslog"
 
 #: fdisk/fdisksgilabel.c:91
-msgid "SGI rxlvol"
-msgstr "rxlvol SGI"
+msgid "SGI xlv"
+msgstr "SGI xlv"
+
+#: fdisk/fdisksgilabel.c:92
+msgid "SGI xvm"
+msgstr "SGI xvm"
 
 #. Minix 1.4b and later
-#: fdisk/fdisksgilabel.c:92 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
+#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:52 fdisk/i386_sys_types.c:56
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: fdisk/fdisksgilabel.c:93 fdisk/fdisksunlabel.c:53
+#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:53
 msgid "Linux native"
 msgstr "Linux nativa"
 
-#: fdisk/fdisksgilabel.c:94 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
+#: fdisk/fdisksgilabel.c:95 fdisk/fdisksunlabel.c:54 fdisk/i386_sys_types.c:62
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: fdisk/fdisksgilabel.c:158
+#: fdisk/fdisksgilabel.c:96
+msgid "Linux RAID"
+msgstr "Linux RAID"
+
+#: fdisk/fdisksgilabel.c:160
 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:177
+#: fdisk/fdisksgilabel.c:179
 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:200
+#: fdisk/fdisksgilabel.c:202
 #, c-format
 msgid ""
 "\n"
@@ -3317,7 +2897,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:213
+#: fdisk/fdisksgilabel.c:215
 #, c-format
 msgid ""
 "\n"
@@ -3330,7 +2910,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:219
+#: fdisk/fdisksgilabel.c:221
 #, c-format
 msgid ""
 "----- partitions -----\n"
@@ -3339,7 +2919,7 @@ msgstr ""
 "----- partições -----\n"
 "%*s  Info      Início      Fim   Setores  Id  Sistema\n"
 
-#: fdisk/fdisksgilabel.c:241
+#: fdisk/fdisksgilabel.c:243
 #, c-format
 msgid ""
 "----- bootinfo -----\n"
@@ -3350,12 +2930,12 @@ msgstr ""
 "Arquivo de inicialização: %s\n"
 "----- entradas de diretório -----\n"
 
-#: fdisk/fdisksgilabel.c:251
+#: fdisk/fdisksgilabel.c:253
 #, c-format
 msgid "%2d: %-10s sector%5u size%8u\n"
 msgstr "%2d: %-10s setor %5u tamanho %8u\n"
 
-#: fdisk/fdisksgilabel.c:305
+#: fdisk/fdisksgilabel.c:307
 msgid ""
 "\n"
 "Invalid Bootfile!\n"
@@ -3367,15 +2947,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:312
+#: fdisk/fdisksgilabel.c:314
 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:317
+#: fdisk/fdisksgilabel.c:319
 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:322
+#: fdisk/fdisksgilabel.c:324
 msgid ""
 "\n"
 "\tBe aware, that the bootfile is not checked for existence.\n"
@@ -3385,24 +2965,24 @@ msgstr ""
 "\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"
 
-#: fdisk/fdisksgilabel.c:350
+#: fdisk/fdisksgilabel.c:352
 #, c-format
 msgid "\n\tBootfile is changed to \"%s\".\n"
 msgstr "\n\tArquivo de inicialização alterado para \"%s\".\n"
 
-#: fdisk/fdisksgilabel.c:448
+#: fdisk/fdisksgilabel.c:450
 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:478
+#: fdisk/fdisksgilabel.c:458 fdisk/fdisksunlabel.c:479
 msgid "No partitions defined\n"
 msgstr "Nenhuma partição definida\n"
 
-#: fdisk/fdisksgilabel.c:463
+#: fdisk/fdisksgilabel.c:465
 msgid "IRIX likes when Partition 11 covers the entire disk.\n"
 msgstr "O IRIX gosta quando a partição 11 abrange todo o disco.\n"
 
-#: fdisk/fdisksgilabel.c:465
+#: fdisk/fdisksgilabel.c:467
 #, c-format
 msgid ""
 "The entire disk partition should start at block 0,\n"
@@ -3411,7 +2991,7 @@ msgstr ""
 "A partição de disco inteiro deve iniciar no bloco 0,\n"
 "não no bloco de disco %d.\n"
 
-#: fdisk/fdisksgilabel.c:469
+#: fdisk/fdisksgilabel.c:471
 #, c-format
 msgid ""
 "The entire disk partition is only %d diskblock large,\n"
@@ -3420,51 +3000,51 @@ msgstr ""
 "A partição de disco inteiro tem um tamanho de apenas %d blocos de disco,\n"
 "mas o disco tem %d blocos de tamanho.\n"
 
-#: fdisk/fdisksgilabel.c:476
+#: fdisk/fdisksgilabel.c:478
 msgid "One Partition (#11) should cover the entire disk.\n"
 msgstr "Uma partição (nº 11) deve abranger todo o disco.\n"
 
-#: fdisk/fdisksgilabel.c:488
+#: fdisk/fdisksgilabel.c:490
 #, c-format
 msgid "Partition %d does not start on cylinder boundary.\n"
 msgstr "A partição %d não inicia em um limite de cilindro.\n"
 
-#: fdisk/fdisksgilabel.c:495
+#: fdisk/fdisksgilabel.c:497
 #, c-format
 msgid "Partition %d does not end on cylinder boundary.\n"
 msgstr "A partição %d não termina em um limite de cilindro.\n"
 
-#: fdisk/fdisksgilabel.c:503
+#: fdisk/fdisksgilabel.c:505
 #, c-format
 msgid "The Partition %d and %d overlap by %d sectors.\n"
 msgstr "As partições %d e %d se sobrepõem por %d setores.\n"
 
-#: fdisk/fdisksgilabel.c:512 fdisk/fdisksgilabel.c:532
+#: fdisk/fdisksgilabel.c:514 fdisk/fdisksgilabel.c:534
 #, c-format
 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
+#: fdisk/fdisksgilabel.c:547
 msgid "\nThe boot partition does not exist.\n"
 msgstr "\nA partição de inicialização não existe.\n"
 
-#: fdisk/fdisksgilabel.c:549
+#: fdisk/fdisksgilabel.c:551
 msgid "\nThe swap partition does not exist.\n"
 msgstr "\nA partição de permuta não existe.\n"
 
-#: fdisk/fdisksgilabel.c:554
+#: fdisk/fdisksgilabel.c:556
 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
+#: fdisk/fdisksgilabel.c:560
 msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVocê escolheu um nome de arquivo de inicialização incomum.\n"
 
-#: fdisk/fdisksgilabel.c:569
+#: fdisk/fdisksgilabel.c:571
 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"
 
-#: fdisk/fdisksgilabel.c:576
+#: fdisk/fdisksgilabel.c:578
 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"
@@ -3479,23 +3059,23 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja etiquetar esta partição de modo diferente.\n"
 
 #. rebuild freelist
-#: fdisk/fdisksgilabel.c:607
+#: fdisk/fdisksgilabel.c:609
 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:669
+#: fdisk/fdisksgilabel.c:671
 msgid "Attempting to generate entire disk entry automatically.\n"
 msgstr "Tentando gerar entrada de disco inteiro automaticamente.\n"
 
-#: fdisk/fdisksgilabel.c:676
+#: fdisk/fdisksgilabel.c:678
 msgid "The entire disk is already covered with partitions.\n"
 msgstr "O disco inteiro já está coberto com partições.\n"
 
-#: fdisk/fdisksgilabel.c:681
+#: fdisk/fdisksgilabel.c:683
 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:690 fdisk/fdisksgilabel.c:719
+#: fdisk/fdisksgilabel.c:692 fdisk/fdisksgilabel.c:721
 msgid ""
 "It is highly recommended that eleventh partition\n"
 "covers the entire disk and is of type `SGI volume'\n"
@@ -3503,16 +3083,16 @@ msgstr ""
 "Recomenda-se fortemente que a partição 11\n"
 "cubra todo o disco e seja do tipo `volume SGI'\n"
 
-#: fdisk/fdisksgilabel.c:706
+#: fdisk/fdisksgilabel.c:708
 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:711
+#: fdisk/fdisksgilabel.c:713
 #, c-format
 msgid " Last %s"
 msgstr " Último %s"
 
-#: fdisk/fdisksgilabel.c:733
+#: fdisk/fdisksgilabel.c:735
 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"
@@ -3524,12 +3104,12 @@ msgstr ""
 "o conteúdo anterior não poderá mais ser recuperado.\n"
 "\n"
 
-#: fdisk/fdisksgilabel.c:761
+#: fdisk/fdisksgilabel.c:763
 #, 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:763
+#: fdisk/fdisksgilabel.c:765
 #, c-format
 msgid "ID=%02x\tSTART=%d\tLENGTH=%d\n"
 msgstr "ID=%02x\tINÍCIO=%d\tCOMPRIMENTO=%d\n"
@@ -3624,15 +3204,15 @@ msgstr "Cilindros Alternativos"
 msgid "Physical cylinders"
 msgstr "Cilindros físicos"
 
-#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:704
+#: fdisk/fdisksunlabel.c:329 fdisk/fdisksunlabel.c:707
 msgid "Rotation speed (rpm)"
 msgstr "Velocidade de rotação (RPM)"
 
-#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:697
+#: fdisk/fdisksunlabel.c:331 fdisk/fdisksunlabel.c:700
 msgid "Interleave factor"
 msgstr "Fator de \"Interleave\""
 
-#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:690
+#: fdisk/fdisksunlabel.c:334 fdisk/fdisksunlabel.c:693
 msgid "Extra sectors per cylinder"
 msgstr "Setores extras por cilindro: "
 
@@ -3640,35 +3220,35 @@ msgstr "Setores extras por cilindro: "
 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:354
+#: fdisk/fdisksunlabel.c:355
 msgid "3,5\" floppy"
 msgstr "Disquete de 3,5 pol."
 
-#: fdisk/fdisksunlabel.c:354
+#: fdisk/fdisksunlabel.c:355
 msgid "Linux custom"
 msgstr "Linux personalizado"
 
-#: fdisk/fdisksunlabel.c:441
+#: fdisk/fdisksunlabel.c:442
 #, 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:461
+#: fdisk/fdisksunlabel.c:462
 #, 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:483
+#: fdisk/fdisksunlabel.c:484
 #, c-format
 msgid "Unused gap - sectors 0-%d\n"
 msgstr "Intervalo não utilizado - setores 0 - %d\n"
 
-#: fdisk/fdisksunlabel.c:485 fdisk/fdisksunlabel.c:489
+#: fdisk/fdisksunlabel.c:486 fdisk/fdisksunlabel.c:490
 #, c-format
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervalo não utilizado - setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:512
+#: fdisk/fdisksunlabel.c:513
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
@@ -3676,7 +3256,7 @@ msgstr ""
 "Outras partições já cobrem o disco inteiro.\n"
 "Exclua ou reduza algumas antes de tentar novamente.\n"
 
-#: fdisk/fdisksunlabel.c:570
+#: fdisk/fdisksunlabel.c:573
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -3687,7 +3267,7 @@ msgstr ""
 "%d %s cobre alguma outra partição. Sua entrada foi alterada\n"
 "para %d %s\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:593
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -3696,7 +3276,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:603
+#: fdisk/fdisksunlabel.c:606
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -3710,7 +3290,7 @@ msgstr ""
 "travar a inicialização.\n"
 "Digite SIM se tiver certeza de que deseja rotular esta partição como 82 (permuta do Linux): "
 
-#: fdisk/fdisksunlabel.c:634
+#: fdisk/fdisksunlabel.c:637
 #, c-format
 msgid ""
 "\n"
@@ -3729,7 +3309,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:648
+#: fdisk/fdisksunlabel.c:651
 #, c-format
 msgid ""
 "\n"
@@ -3742,16 +3322,16 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:653
+#: fdisk/fdisksunlabel.c:656
 #, 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:678
+#: fdisk/fdisksunlabel.c:681
 msgid "Number of alternate cylinders"
 msgstr "Número de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:711
+#: fdisk/fdisksunlabel.c:714
 msgid "Number of physical cylinders"
 msgstr "Número de cilindros físicos"
 
@@ -3929,8 +3509,8 @@ msgid "Priam Edisk"
 msgstr "Edisk Priam"
 
 #. 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
+#: fdisk/i386_sys_types.c:48 fdisk/i386_sys_types.c:83
+#: fdisk/i386_sys_types.c:88 fdisk/i386_sys_types.c:89
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
@@ -4041,40 +3621,54 @@ msgstr "CP/M / CTOS / ..."
 #. CP/M or Concurrent CP/M or
 #. Concurrent DOS or CTOS
 #: fdisk/i386_sys_types.c:79
+msgid "Dell Utility"
+msgstr "Utilitário Dell"
+
+#. Dell PowerEdge Server utilities
+#: fdisk/i386_sys_types.c:80
 msgid "DOS access"
 msgstr "Acesso DOS"
 
 #. DOS access or SpeedStor 12-bit FAT
 #. extended partition
-#: fdisk/i386_sys_types.c:81
+#: fdisk/i386_sys_types.c:82
 msgid "DOS R/O"
 msgstr "DOS R/O"
 
 #. SpeedStor 16-bit FAT extended
 #. partition < 1024 cyl.
-#: fdisk/i386_sys_types.c:84
+#: fdisk/i386_sys_types.c:85
 msgid "BeOS fs"
 msgstr "sist. arq. BeOS"
 
-#. SpeedStor large partition
+#: fdisk/i386_sys_types.c:86
+msgid "EFI GPT"
+msgstr "EFI GPT"
+
+#. Intel EFI GUID Partition Table
 #: fdisk/i386_sys_types.c:87
+msgid "EFI (FAT-12/16/32)"
+msgstr "EFI (FAT-12/16/32)"
+
+#. SpeedStor large partition
+#: fdisk/i386_sys_types.c:90
 msgid "DOS secondary"
 msgstr "DOS secundário"
 
 #. DOS 3.3+ secondary
-#: fdisk/i386_sys_types.c:88
+#: fdisk/i386_sys_types.c:91
 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:91
+#: fdisk/i386_sys_types.c:94
 msgid "LANstep"
 msgstr "LANstep"
 
 #. SpeedStor >1024 cyl. or LANstep
-#: fdisk/i386_sys_types.c:92
+#: fdisk/i386_sys_types.c:95
 msgid "BBT"
 msgstr "BBT"
 
@@ -4163,36 +3757,36 @@ 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"
+"Warning: start=%lu - this looks like a partition rather than\n"
 "the entire disk. Using fdisk on it is probably meaningless.\n"
 "[Use the --force option if you really want this]\n"
 msgstr ""
-"Aviso: início =  %d - Isto parece ser uma partição e não o disco\n"
+"Aviso: início =  %lu - Isto parece ser uma partição e não o disco\n"
 "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: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"
+msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
+msgstr "Aviso: HDIO_GETGEO informa que há %lu cabeças\n"
 
 #: fdisk/sfdisk.c:445
 #, c-format
-msgid "Warning: HDIO_GETGEO says that there are %d sectors\n"
-msgstr "Aviso: HDIO_GETGEO informa que há %d setores\n"
+msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
+msgstr "Aviso: HDIO_GETGEO informa que há %lu setores\n"
 
 #: fdisk/sfdisk.c:449
 #, c-format
-msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %d cylinders\n"
-msgstr "Aviso: BLKGETSIZE/HDIO_GETGEO informa que há %d cilindros\n"
+msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
+msgstr "Aviso: BLKGETSIZE/HDIO_GETGEO informa que há %lu cilindros\n"
 
 #: fdisk/sfdisk.c:453
 #, c-format
 msgid ""
-"Warning: unlikely number of sectors (%d) - usually at most 63\n"
+"Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
-"Aviso: número de setores improvável (%d) - normalmente no máximo 63.\n"
+"Aviso: número de setores improvável (%lu) - normalmente no máximo 63.\n"
 "Isto causará problemas a todo software que usar endereçamento Cil/Cab/Setor.\n"
 
 #: fdisk/sfdisk.c:457
@@ -4202,18 +3796,18 @@ msgstr "\nDisco %s: %lu cilindros, %lu cabeças, %lu setores/trilha\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 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: %lu (should be in 0-%lu)\n"
+msgstr "%s da partição %s possui valor impossível para cabeça: %lu (deveria estar entre 0 e %lu)\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 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: %lu (should be in 1-%lu)\n"
+msgstr "%s da partição %s possui valor impossível para setor: %lu (deveria estar entre 1 e %lu)\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 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: %lu (should be in 0-%lu)\n"
+msgstr "%s da partição %s possui valor impossível para o cilindro: %lu (deveria estar entre 0 e %lu)\n"
 
 #: fdisk/sfdisk.c:588
 msgid "Id  Name\n\n"
@@ -4822,8 +4416,8 @@ msgstr "a partição %s possui ID %x e não está escondida\n"
 
 #: fdisk/sfdisk.c:2777
 #, c-format
-msgid "Bad Id %x\n"
-msgstr "ID inválida: %x\n"
+msgid "Bad Id %lx\n"
+msgstr "ID inválida: %lx\n"
 
 #: fdisk/sfdisk.c:2792
 msgid "This disk is currently in use.\n"
@@ -5020,6 +4614,600 @@ msgstr "getopt (melhorado) 1.1.0)\n"
 msgid "internal error, contact the author."
 msgstr "erro interno, entre em contato com o autor."
 
+#: hwclock/cmos.c:164
+msgid "booted from MILO\n"
+msgstr "boot executado do MILO\n"
+
+#: hwclock/cmos.c:173
+msgid "Ruffian BCD clock\n"
+msgstr "Relógio BCD Ruffian\n"
+
+#: hwclock/cmos.c:189
+#, c-format
+msgid "clockport adjusted to 0x%x\n"
+msgstr "porta do relógio ajustada para 0x%x\n"
+
+#: hwclock/cmos.c:201
+msgid "funky TOY!\n"
+msgstr "funky TOY!\n"
+
+#: hwclock/cmos.c:255
+#, c-format
+msgid "%s: atomic %s failed for 1000 iterations!"
+msgstr "%s: %s atômico falhou por 1000 iterações!"
+
+#: hwclock/cmos.c:579
+#, c-format
+msgid "Cannot open /dev/port: %s"
+msgstr "Não é possível abrir /dev/port: %s"
+
+#: hwclock/cmos.c:586
+msgid "I failed to get permission because I didn't try.\n"
+msgstr "Não consegui obter permissão porque não tentei.\n"
+
+#: hwclock/cmos.c:589
+#, c-format
+msgid "%s is unable to get I/O port access:  the iopl(3) call failed.\n"
+msgstr "%s é incapaz de obter acesso à porta de E/S: a chamada iopl(3) falhou.\n"
+
+#: hwclock/cmos.c:592
+msgid "Probably you need root privileges.\n"
+msgstr "Provavelmente são necessários privilégios de root.\n"
+
+#: hwclock/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"
+
+#: hwclock/hwclock.c:220 hwclock/hwclock.c:309
+msgid "UTC"
+msgstr "UTC"
+
+#: hwclock/hwclock.c:220 hwclock/hwclock.c:308
+msgid "local"
+msgstr "local"
+
+#: hwclock/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"
+
+#: hwclock/hwclock.c:294
+msgid "(Expected: `UTC' or `LOCAL' or nothing.)\n"
+msgstr "(Esperado: `UTC', `LOCAL'  ou nada.)\n"
+
+#: hwclock/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"
+
+#: hwclock/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"
+
+#: hwclock/hwclock.c:307
+#, c-format
+msgid "Hardware clock is on %s time\n"
+msgstr "O relógio de hardware está na hora %s\n"
+
+#: hwclock/hwclock.c:309
+msgid "unknown"
+msgstr "desconhecida"
+
+#. -----------------------------------------------------------------------------
+#. 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.
+#.
+#. -----------------------------------------------------------------------------
+#: hwclock/hwclock.c:331
+msgid "Waiting for clock tick...\n"
+msgstr "Aguardando tique do relógio...\n"
+
+#: hwclock/hwclock.c:335
+msgid "...got clock tick\n"
+msgstr "... tique do relógio obtido\n"
+
+#: hwclock/hwclock.c:386
+#, c-format
+msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
+msgstr "Valores inválidos no relógio de hardware: %4d/%.4d/%.2d %.2d:%.2d:%.2d\n"
+
+#: hwclock/hwclock.c:394
+#, c-format
+msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+msgstr "Hora do relógio de hardware: %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld segundos desde 1969\n"
+
+#: hwclock/hwclock.c:422
+#, c-format
+msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+msgstr "Hora lida do relógio de Hardware: %4d/%.2d/%.2d %02d:%02d:%02d\n"
+
+#: hwclock/hwclock.c: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"
+
+#: hwclock/hwclock.c:455
+msgid "Clock not changed - testing only.\n"
+msgstr "Relógio não alterado - apenas testando.\n"
+
+#: hwclock/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 ""
+"O tempo decorrido desde o horário de referência foi de %.6f segundos.\n"
+" Atrasando mais para chegar ao próximo segundo cheio.\n"
+
+#: hwclock/hwclock.c: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"
+
+#: hwclock/hwclock.c:537
+#, c-format
+msgid "%s  %.6f seconds\n"
+msgstr "%s  %.6f segundos\n"
+
+#: hwclock/hwclock.c:571
+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.
+#.
+#: hwclock/hwclock.c:576
+msgid ""
+"The value of the --date option is not a valid date.\n"
+"In particular, it contains quotation marks.\n"
+msgstr ""
+"O valor da opção --date não é uma data válida.\n"
+"Especificamente, ele contém aspas.\n"
+
+#: hwclock/hwclock.c:582
+#, c-format
+msgid "Issuing date command: %s\n"
+msgstr "Emitindo comando date: %s\n"
+
+#: hwclock/hwclock.c:586
+msgid "Unable to run 'date' program in /bin/sh shell. popen() failed"
+msgstr "Não foi possível executar o programa 'date' no shell /bin/sh: popen() falhou"
+
+#: hwclock/hwclock.c:592
+#, c-format
+msgid "response from date command = %s\n"
+msgstr "resposta do comando date = %s\n"
+
+#: hwclock/hwclock.c:594
+#, 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 ""
+"O comando date emitido por %s retornou resultados inesperados.\n"
+"O comando foi:\n"
+"  %s\n"
+"A resposta foi:\n"
+"  %s\n"
+
+#: hwclock/hwclock.c:603
+#, 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 ""
+"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"
+
+#: hwclock/hwclock.c:613
+#, 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"
+
+#: hwclock/hwclock.c:645
+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"
+
+#: hwclock/hwclock.c:667
+msgid "Calling settimeofday:\n"
+msgstr "Chamando settimeofday:\n"
+
+#: hwclock/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"
+
+#: hwclock/hwclock.c:670
+#, c-format
+msgid "\ttz.tz_minuteswest = %d\n"
+msgstr "\ttz.tz_minuteswest = %d\n"
+
+#: hwclock/hwclock.c:673
+msgid "Not setting system clock because running in test mode.\n"
+msgstr "O relógio do sistema não está sendo ajustado: executando em modo de teste.\n"
+
+#: hwclock/hwclock.c:681
+msgid "Must be superuser to set system clock.\n"
+msgstr "É necessário ser superusuário para ajustar o relógio do sistema.\n"
+
+#: hwclock/hwclock.c:683
+msgid "settimeofday() failed"
+msgstr "settimeofday() falhou"
+
+#: hwclock/hwclock.c:716
+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"
+
+#: hwclock/hwclock.c:720
+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"
+
+#: hwclock/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 ""
+"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"
+
+#: hwclock/hwclock.c:780
+#, c-format
+msgid "Time since last adjustment is %d seconds\n"
+msgstr "O tempo desde o último ajuste é de %d segundos\n"
+
+#: hwclock/hwclock.c:782
+#, c-format
+msgid "Need to insert %d seconds and refer time back %.6f seconds ago\n"
+msgstr "É necessário inserir %d segundos e referenciar a hora de %.6f segundos atrás\n"
+
+#: hwclock/hwclock.c:811
+msgid "Not updating adjtime file because of testing mode.\n"
+msgstr "O arquivo adjtime não está sendo atualizado: modo de teste.\n"
+
+#: hwclock/hwclock.c:812
+#, c-format
+msgid ""
+"Would have written the following to %s:\n"
+"%s"
+msgstr ""
+"Teria gravado o seguinte em %s:\n"
+"%s"
+
+#: hwclock/hwclock.c:836
+msgid "Drift adjustment parameters not updated.\n"
+msgstr "Parâmetros de ajuste de variação não atualizados.\n"
+
+#: hwclock/hwclock.c:877
+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"
+
+#: hwclock/hwclock.c:901
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr "O ajuste necessário é menor do que um segundo, portanto o relógio não será ajustado.\n"
+
+#: hwclock/hwclock.c:927
+#, c-format
+msgid "Using %s.\n"
+msgstr "Usando %s.\n"
+
+#: hwclock/hwclock.c:929
+msgid "No usable clock interface found.\n"
+msgstr "Não foi encontrada uma interface de relógio utilizável.\n"
+
+#: hwclock/hwclock.c:1024
+msgid "Unable to set system clock.\n"
+msgstr "Não é possível ajustar o relógio do sistema.\n"
+
+#: hwclock/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 ""
+"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"
+
+#: hwclock/hwclock.c:1062
+msgid "Unable to get the epoch value from the kernel.\n"
+msgstr "Não foi possível obter o valor de epoch do kernel.\n"
+
+#: hwclock/hwclock.c:1064
+#, c-format
+msgid "Kernel is assuming an epoch value of %lu\n"
+msgstr "O kernel está pressupondo um valor de epoch de %lu\n"
+
+#: hwclock/hwclock.c:1067
+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"
+
+#: hwclock/hwclock.c:1070
+#, c-format
+msgid "Not setting the epoch to %d - testing only.\n"
+msgstr "Epoch não configurado para %d; apenas testando.\n"
+
+#: hwclock/hwclock.c:1073
+msgid "Unable to set the epoch value in the kernel.\n"
+msgstr "Não é possível configurar o valor de epoch no kernel.\n"
+
+#: hwclock/hwclock.c: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 - consulta e ajusta o relógio de hardware (RTC).\n"
+"\n"
+"Uso: hwclock [função] [opções...]\n"
+"\n"
+"Funções:\n"
+"  --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"
+"                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"
+"                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"
+"  --localtime   O relógio de hardware é mantido em hora local.\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"
+"  --epoch=ano  Especifica o ano inicial do valor \n"
+"                de epoch do relógio de hardware.\n"
+
+#: hwclock/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"
+"                informa a hwclock o tipo de Alpha que você tem (consulte hwclock(8))\n"
+
+#: hwclock/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"
+
+#: hwclock/hwclock.c:1237
+msgid ""
+"You have specified multiple function options.\n"
+"You can only perform one function at a time.\n"
+msgstr ""
+"Você especificou múltiplas opções de função.\n"
+"Você só pode executar uma função por vez.\n"
+
+#: hwclock/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"
+
+#: hwclock/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"
+
+#: hwclock/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"
+
+#: hwclock/hwclock.c:1275
+msgid "Sorry, only the superuser can change the System Clock.\n"
+msgstr "Somente o superusuário pode alterar o relógio de hardware.\n"
+
+#: hwclock/hwclock.c: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"
+
+#: hwclock/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"
+
+#: hwclock/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"
+
+#: hwclock/kd.c:41
+msgid "Waiting in loop for time from KDGHWCLK to change\n"
+msgstr "Aguardando em laço até que a hora de KDGHWCLK mude.\n"
+
+#: hwclock/kd.c:44
+msgid "KDGHWCLK ioctl to read time failed"
+msgstr "ioctl KDGHWCLK para ler a hora falhou"
+
+#: hwclock/kd.c:65 hwclock/rtc.c:151
+msgid "Timed out waiting for time change.\n"
+msgstr "Tempo esgotado enquanto aguardava a hora mudar.\n"
+
+#: hwclock/kd.c:69
+msgid "KDGHWCLK ioctl to read time failed in loop"
+msgstr "ioctl KDGHWCLK para ler a hora falhou no laço"
+
+#: hwclock/kd.c:91
+msgid "ioctl() failed to read time from  /dev/tty1"
+msgstr "ioctl() não conseguiu ler a hora de /dev/tty1"
+
+#: hwclock/kd.c:127
+msgid "ioctl KDSHWCLK failed"
+msgstr "ioctl KDSHWCLK falhou"
+
+#: hwclock/kd.c:157
+msgid "KDGHWCLK ioctl failed"
+msgstr "ioctl KDGHWCLK falhou"
+
+#: hwclock/kd.c:163
+msgid "Can't open /dev/tty1"
+msgstr "Não foi possível abrir /dev/tty1"
+
+#: hwclock/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"
+
+#: hwclock/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"
+
+#: hwclock/rtc.c:172 hwclock/rtc.c:229
+#, c-format
+msgid "open() of %s failed"
+msgstr "open() de %s falhou"
+
+#: hwclock/rtc.c:190
+#, c-format
+msgid "%s does not have interrupt functions. "
+msgstr "%s não possui funções de interrupção. "
+
+#: hwclock/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"
+
+#: hwclock/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"
+
+#: hwclock/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"
+
+#: hwclock/rtc.c:252 hwclock/rtc.c:331 hwclock/rtc.c:376
+#, c-format
+msgid "Unable to open %s"
+msgstr "Não foi possível abrir %s"
+
+#: hwclock/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"
+
+#: hwclock/rtc.c:279
+#, c-format
+msgid "ioctl(%s) was successful.\n"
+msgstr "ioctl(%s) teve êxito.\n"
+
+#: hwclock/rtc.c:309
+#, c-format
+msgid "Open of %s failed"
+msgstr "A abertura de %s falhou"
+
+#: hwclock/rtc.c:327 hwclock/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"
+
+#: hwclock/rtc.c:338
+#, c-format
+msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgstr "ioctl(RTC_EPOCH_READ) para %s falhou"
+
+#: hwclock/rtc.c:344
+#, c-format
+msgid "we have read epoch %ld from %s with RTC_EPOCH_READ ioctl.\n"
+msgstr "lemos epoch %ld de %s com ioctl RTC_EPOCH_READ.\n"
+
+#. kernel would not accept this epoch value
+#. Hmm - bad habit, deciding not to do what the user asks
+#. just because one believes that the kernel might not like it.
+#: hwclock/rtc.c: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"
+
+#: hwclock/rtc.c:381
+#, c-format
+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"
+
+#: hwclock/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"
+
+#: hwclock/rtc.c:389
+#, c-format
+msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgstr "ioctl(RTC_EPOCH_SET) para %s falhou"
+
+#: hwclock/shhopt.c:255 hwclock/shhopt.c:281
+#, c-format
+msgid "invalid number `%s'\n"
+msgstr "número `%s' inválido\n"
+
+#: hwclock/shhopt.c:258 hwclock/shhopt.c:284
+#, c-format
+msgid "number `%s' to `%s' out of range\n"
+msgstr "número `%s' a `%s' fora do intervalo\n"
+
+#: hwclock/shhopt.c:398
+#, c-format
+msgid "unrecognized option `%s'\n"
+msgstr "opção `%s' não reconhecida\n"
+
+#: hwclock/shhopt.c:411 hwclock/shhopt.c:449
+#, c-format
+msgid "option `%s' requires an argument\n"
+msgstr "a opção `%s' exige um argumento\n"
+
+#: hwclock/shhopt.c:417
+#, c-format
+msgid "option `%s' doesn't allow an argument\n"
+msgstr "a opção `%s' não permite um argumento\n"
+
+#: hwclock/shhopt.c:439
+#, c-format
+msgid "unrecognized option `-%c'\n"
+msgstr "opção `-%c' não reconhecida\n"
+
 #: login-utils/agetty.c:306
 msgid "calling open_tty\n"
 msgstr "calling open_tty\n"
@@ -5091,75 +5279,65 @@ msgstr "número excessivo de velocidades alternativas"
 msgid "exiting parsespeeds\n"
 msgstr "exiting parsespeeds\n"
 
-#: login-utils/agetty.c:616
-#, c-format
-msgid "%s: open for update: %m"
-msgstr "%s: aberto para atualização: %m"
-
-#: login-utils/agetty.c:634
-#, c-format
-msgid "%s: no utmp entry"
-msgstr "%s: entrada utmp inexistente"
-
-#: login-utils/agetty.c:663
+#: login-utils/agetty.c:636
 #, c-format
 msgid "/dev: chdir() failed: %m"
 msgstr "/dev: chdir() falhou: %m"
 
-#: login-utils/agetty.c:667
+#: login-utils/agetty.c:640
 #, 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:674
+#: login-utils/agetty.c:647
 msgid "open(2)\n"
 msgstr "open(2)\n"
 
-#: login-utils/agetty.c:676
+#: login-utils/agetty.c:649
 #, 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:686
+#: login-utils/agetty.c:659
 #, 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:690
+#: login-utils/agetty.c:663
 msgid "duping\n"
 msgstr "duping\n"
 
 #. set up stdout and stderr
-#: login-utils/agetty.c:692
+#: login-utils/agetty.c:665
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problema de dup: %m"
 
-#: login-utils/agetty.c:762
+#: login-utils/agetty.c:735
 msgid "term_io 2\n"
 msgstr "term_io 2\n"
 
-#: login-utils/agetty.c:947
+#: login-utils/agetty.c:920
 msgid "user"
 msgstr "usuário"
 
-#: login-utils/agetty.c:947
+#: login-utils/agetty.c:920
 msgid "users"
 msgstr "usuários"
 
-#: login-utils/agetty.c:1035
+#: login-utils/agetty.c:1008
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: leitura: %m"
 
-#: login-utils/agetty.c:1081
+#: login-utils/agetty.c:1054
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: entrada excedida"
 
-#: login-utils/agetty.c:1205
+#: login-utils/agetty.c:1178
 #, c-format
 msgid ""
 "Usage: %s [-hiLmw] [-l login_program] [-t timeout] [-I initstring] [-H login_host] baud_rate,... line [termtype]\n"
@@ -5168,21 +5346,11 @@ 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"
 
-#: login-utils/checktty.c:41
-#, c-format
-msgid "badlogin: %s\n"
-msgstr "login inválido: %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
+#: login-utils/checktty.c:104 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:104
+#: login-utils/checktty.c:105
 msgid "can't malloc for ttyclass"
 msgstr "não foi possível malloc para ttyclass"
 
@@ -5191,7 +5359,7 @@ 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:426
+#: login-utils/checktty.c:422
 #, c-format
 msgid "Login on %s from %s denied by default.\n"
 msgstr "Login em %s de %s negado como padrão.\n"
@@ -5200,48 +5368,48 @@ 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:437
+#: login-utils/checktty.c:433
 #, c-format
 msgid "Login on %s from %s denied.\n"
 msgstr "Login em %s de %s negado.\n"
 
-#: login-utils/chfn.c:121 login-utils/chsh.c:107
+#: login-utils/chfn.c:122 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:128 login-utils/chsh.c:114
+#: login-utils/chfn.c:129 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:133 login-utils/chsh.c:119
+#: login-utils/chfn.c:134 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:145
+#: login-utils/chfn.c:146
 #, c-format
 msgid "Changing finger information for %s.\n"
 msgstr "Alterando informações de finger de %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/chfn.c:152 login-utils/chfn.c:156 login-utils/chfn.c:163
+#: login-utils/chfn.c:167 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: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
+#: login-utils/chfn.c:176 login-utils/chsh.c:167 login-utils/login.c:700
+#: login-utils/newgrp.c:48 login-utils/simpleinit.c:298 mount/lomount.c:248
+#: mount/lomount.c:253
 msgid "Password: "
 msgstr "Senha:"
 
-#: login-utils/chfn.c:178 login-utils/chsh.c:170
+#: login-utils/chfn.c:179 login-utils/chsh.c:170
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
-#: login-utils/chfn.c:189
+#: login-utils/chfn.c:190
 msgid "Finger information not changed.\n"
 msgstr "Informações de finger não alteradas.\n"
 
@@ -5412,51 +5580,51 @@ msgstr "%s não possui os modos de arquivo corretos"
 msgid "can't read data from %s"
 msgstr "não foi possível ler dados de %s"
 
-#: login-utils/islocal.c:37
+#: login-utils/islocal.c:38
 #, c-format
 msgid "Can't read %s, exiting."
 msgstr "Não foi possível ler %s; saindo."
 
-#: login-utils/last.c:143
+#: login-utils/last.c:148
 msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
 msgstr "Uso: last [-#] [-f arquivo] [-t tty] [-h nome_host] [usuário ...]\n"
 
-#: login-utils/last.c:283
+#: login-utils/last.c:312
 msgid "  still logged in"
 msgstr "  ainda conectado"
 
-#: login-utils/last.c:305
+#: login-utils/last.c:340
 #, c-format
 msgid "\nwtmp begins %s"
 msgstr "\nwtmp inicia %s"
 
-#: login-utils/last.c:367 login-utils/last.c:387 login-utils/last.c:442
+#: login-utils/last.c:396 login-utils/last.c:414 login-utils/last.c:465
 msgid "last: malloc failure.\n"
 msgstr "last: falha de malloc.\n"
 
-#: login-utils/last.c:416
+#: login-utils/last.c:441
 msgid "last: gethostname"
 msgstr "last: gethostname"
 
-#: login-utils/last.c:469
+#: login-utils/last.c:490
 #, c-format
 msgid "\ninterrupted %10.10s %5.5s \n"
 msgstr "\ninterrompido %10.10s %5.5s \n"
 
-#: login-utils/login.c:373
+#: login-utils/login.c:379
 msgid "login: -h for super-user only.\n"
 msgstr "login: -h somente pode ser especificado pelo superusuário.\n"
 
-#: login-utils/login.c:398
+#: login-utils/login.c:404
 msgid "usage: login [-fp] [username]\n"
 msgstr "Uso: login [-fp] [nome_usuário]\n"
 
-#: login-utils/login.c:501
+#: login-utils/login.c:509
 #, c-format
 msgid "login: PAM Failure, aborting: %s\n"
 msgstr "login: falha de PAM; abortando: %s\n"
 
-#: login-utils/login.c:503
+#: login-utils/login.c:511
 #, c-format
 msgid "Couldn't initialize PAM: %s"
 msgstr "Não foi possível inicializar o PAM: %s"
@@ -5467,57 +5635,57 @@ msgstr "Não foi possível inicializar o PAM: %s"
 #. * PAM doesn't have an interface to specify the "Password: " string
 #. * (yet).
 #.
-#: login-utils/login.c:519
+#: login-utils/login.c:527
 msgid "login: "
 msgstr "login: "
 
-#: login-utils/login.c:553
+#: login-utils/login.c:561
 #, 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:555
+#: login-utils/login.c:563
 msgid "Login incorrect\n\n"
 msgstr "Login incorreto\n\n"
 
-#: login-utils/login.c:564
+#: login-utils/login.c:572
 #, c-format
 msgid "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s"
 msgstr "NÚMERO EXCESSIVO DE TENTATIVAS DE LOGIN (%d) A PARTIR DE %s PARA %s, %s"
 
-#: login-utils/login.c:568
+#: login-utils/login.c:576
 #, 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:571
+#: login-utils/login.c:579
 msgid "\nLogin incorrect\n"
 msgstr "\nLogin incorreto\n"
 
-#: login-utils/login.c:620
+#: login-utils/login.c:635
 msgid "Illegal username"
 msgstr "Nome de usuário inválido"
 
-#: login-utils/login.c:663
+#: login-utils/login.c:678
 #, c-format
 msgid "%s login refused on this terminal.\n"
 msgstr "%s: login recusado neste terminal.\n"
 
-#: login-utils/login.c:668
+#: login-utils/login.c:683
 #, 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:672
+#: login-utils/login.c:687
 #, c-format
 msgid "LOGIN %s REFUSED ON TTY %s"
 msgstr "%s: LOGIN RECUSADO NO TTY %s"
 
-#: login-utils/login.c:725
+#: login-utils/login.c:740
 msgid "Login incorrect\n"
 msgstr "Login incorreto\n"
 
-#: login-utils/login.c:747
+#: login-utils/login.c:762
 msgid ""
 "Too many users logged on already.\n"
 "Try again later.\n"
@@ -5525,160 +5693,138 @@ msgstr ""
 "Número máximo de usuários já conectados.\n"
 "Tente novamente mais tarde.\n"
 
-#: login-utils/login.c:751
+#: login-utils/login.c:766
 msgid "You have too many processes running.\n"
 msgstr "Número excessivo de processos em execução.\n"
 
-#: login-utils/login.c:797
-msgid "Warning: no Kerberos tickets issued\n"
-msgstr "Aviso: nenhum bilhete Kerberos emitido\n"
-
-#: login-utils/login.c:809
-msgid "Sorry -- your password has expired.\n"
-msgstr "Sua senha expirou.\n"
-
-#: login-utils/login.c:815
-#, c-format
-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:823
-msgid "Sorry -- your account has expired.\n"
-msgstr "Sua conta expirou.\n"
-
-#: login-utils/login.c:829
-#, c-format
-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:1066
+#: login-utils/login.c:1001
 #, c-format
 msgid "DIALUP AT %s BY %s"
 msgstr "DISCAGEM EM %s POR %s"
 
-#: login-utils/login.c:1073
+#: login-utils/login.c:1008
 #, c-format
 msgid "ROOT LOGIN ON %s FROM %s"
 msgstr "LOGIN COMO ROOT EM %s A PARTIR DE %s"
 
-#: login-utils/login.c:1076
+#: login-utils/login.c:1011
 #, c-format
 msgid "ROOT LOGIN ON %s"
 msgstr "LOGIN COMO ROOT EM %s"
 
-#: login-utils/login.c:1079
+#: login-utils/login.c:1014
 #, c-format
 msgid "LOGIN ON %s BY %s FROM %s"
 msgstr "LOGIN EM %s POR %s A PARTIR DE %s"
 
-#: login-utils/login.c:1082
+#: login-utils/login.c:1017
 #, c-format
 msgid "LOGIN ON %s BY %s"
 msgstr "LOGIN EM %s POR %s"
 
-#: login-utils/login.c:1094
+#: login-utils/login.c:1029
 #, c-format
 msgid "You have %smail.\n"
 msgstr "Você tem mensagens %s na caixa de correio.\n"
 
-#: login-utils/login.c:1095
+#: login-utils/login.c:1030
 msgid "new "
 msgstr "novas "
 
 #. error in fork()
-#: login-utils/login.c:1113
+#: login-utils/login.c:1055
 #, c-format
 msgid "login: failure forking: %s"
 msgstr "login: falha em fork: %s"
 
-#: login-utils/login.c:1128
+#: login-utils/login.c:1075
 msgid "setuid() failed"
 msgstr "setuid() falhou"
 
-#: login-utils/login.c:1134
+#: login-utils/login.c:1081
 #, c-format
 msgid "No directory %s!\n"
 msgstr "O diretório %s não existe!\n"
 
-#: login-utils/login.c:1138
+#: login-utils/login.c:1085
 msgid "Logging in with home = \"/\".\n"
 msgstr "Fazendo login com home = \"/\".\n"
 
-#: login-utils/login.c:1146
+#: login-utils/login.c:1093
 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:1174
+#: login-utils/login.c:1120
 #, c-format
 msgid "login: couldn't exec shell script: %s.\n"
 msgstr "login: não foi possível executar o script do interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1177
+#: login-utils/login.c:1123
 #, c-format
 msgid "login: no shell: %s.\n"
 msgstr "login: não existe interpretador de comandos: %s.\n"
 
-#: login-utils/login.c:1191
+#: login-utils/login.c:1138
 #, c-format
 msgid "\n%s login: "
 msgstr "\n%s usuário: "
 
-#: login-utils/login.c:1202
+#: login-utils/login.c:1149
 msgid "login name much too long.\n"
 msgstr "nome de login longo demais.\n"
 
-#: login-utils/login.c:1203
+#: login-utils/login.c:1150
 msgid "NAME too long"
 msgstr "NOME longo demais"
 
-#: login-utils/login.c:1210
+#: login-utils/login.c:1157
 msgid "login names may not start with '-'.\n"
 msgstr "nomes de login não podem iniciar com '-'.\n"
 
-#: login-utils/login.c:1220
+#: login-utils/login.c:1167
 msgid "too many bare linefeeds.\n"
 msgstr "Número excessivo de saltos de linha.\n"
 
-#: login-utils/login.c:1221
+#: login-utils/login.c:1168
 msgid "EXCESSIVE linefeeds"
 msgstr "Saltos de linha EXCESSIVOS"
 
-#: login-utils/login.c:1231
+#: login-utils/login.c:1179
 #, c-format
 msgid "Login timed out after %d seconds\n"
 msgstr "Tempo de login esgotado após %d segundos\n"
 
-#: login-utils/login.c:1325
+#: login-utils/login.c:1275
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Último login: %.*s "
 
-#: login-utils/login.c:1329
+#: login-utils/login.c:1279
 #, c-format
 msgid "from %.*s\n"
 msgstr "a partir de %.*s\n"
 
-#: login-utils/login.c:1332
+#: login-utils/login.c:1282
 #, c-format
 msgid "on %.*s\n"
 msgstr "em: %.*s\n"
 
-#: login-utils/login.c:1355
+#: login-utils/login.c:1303
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "FALHA DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1358
+#: login-utils/login.c:1306
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "FALHA DE LOGIN EM %s, %s"
 
-#: login-utils/login.c:1362
+#: login-utils/login.c:1310
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALHAS DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1365
+#: login-utils/login.c:1313
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALHAS DE LOGIN EM %s, %s"
@@ -5695,420 +5841,455 @@ msgstr "é n\n"
 msgid "usage: mesg [y | n]\n"
 msgstr "Uso: mesg [y | n]\n"
 
-#: login-utils/newgrp.c:67
+#: login-utils/newgrp.c:68
 msgid "newgrp: Who are you?"
 msgstr "newgrp: Quem é você?"
 
-#: login-utils/newgrp.c:75 login-utils/newgrp.c:85
+#: login-utils/newgrp.c:76 login-utils/newgrp.c:86
 msgid "newgrp: setgid"
 msgstr "newgrp: setgid"
 
-#: login-utils/newgrp.c:80
+#: login-utils/newgrp.c:81
 msgid "newgrp: No such group."
 msgstr "newgrp: grupo inexistente."
 
-#: login-utils/newgrp.c:89
+#: login-utils/newgrp.c:90
 msgid "newgrp: Permission denied"
 msgstr "newgrp: permissão negada"
 
-#: login-utils/newgrp.c:96
+#: login-utils/newgrp.c:97
 msgid "newgrp: setuid"
 msgstr "newgrp: setuid"
 
-#: login-utils/newgrp.c:102
+#: login-utils/newgrp.c:103
 msgid "No shell"
 msgstr "Interpretador de comandos inexistente"
 
-#: login-utils/passwd.c:159
+#: login-utils/passwd.c:161
 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:172
+#: login-utils/passwd.c:174
 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:173
+#: login-utils/passwd.c:175
 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"
 
-#: login-utils/passwd.c:174
+#: login-utils/passwd.c:176
 msgid "characters. See passwd(1) for more information.\n"
 msgstr "Consulte passwd(1) para maiores informações.\n"
 
-#: login-utils/passwd.c:179
+#: login-utils/passwd.c:181
 msgid "You cannot reuse the old password.\n"
 msgstr "Você não pode reutilizar a senha antiga.\n"
 
-#: login-utils/passwd.c:184
+#: login-utils/passwd.c:186
 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:195 login-utils/passwd.c:202
+#: login-utils/passwd.c:197 login-utils/passwd.c:204
 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:220
+#: login-utils/passwd.c:222
 msgid "Usage: passwd [username [password]]\n"
 msgstr "Uso: passwd [nome_usuário [senha]]\n"
 
-#: login-utils/passwd.c:221
+#: login-utils/passwd.c:223
 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:275
+#: login-utils/passwd.c:277
 msgid "Usage: passwd [-foqsvV] [user [password]]\n"
 msgstr "Uso: passwd [-foqsvV] [nome_usuário [senha]]\n"
 
-#: login-utils/passwd.c:296
+#: login-utils/passwd.c:298
 #, c-format
 msgid "Can't exec %s: %s\n"
 msgstr "Não foi possível exec %s: %s\n"
 
-#: login-utils/passwd.c:307
+#: login-utils/passwd.c:309
 msgid "Cannot find login name"
 msgstr "Não foi possível localizar o nome de login"
 
-#: login-utils/passwd.c:314 login-utils/passwd.c:321
+#: login-utils/passwd.c:316 login-utils/passwd.c:323
 msgid "Only root can change the password for others.\n"
 msgstr "Somente root pode alterar senhas de terceiros.\n"
 
-#: login-utils/passwd.c:329
+#: login-utils/passwd.c:331
 msgid "Too many arguments.\n"
 msgstr "Número excessivo de argumentos.\n"
 
-#: login-utils/passwd.c:334
+#: login-utils/passwd.c:336
 #, c-format
 msgid "Can't find username anywhere. Is `%s' really a user?"
 msgstr "Não foi possível encontrar o nome de usuário em nenhum lugar. `%s' realmente é um nome de usuário?"
 
-#: login-utils/passwd.c:338
+#: login-utils/passwd.c:340
 msgid "Sorry, I can only change local passwords. Use yppasswd instead."
 msgstr "Eu só posso alterar senhas locais. Use yppasswd."
 
-#: login-utils/passwd.c:344
+#: login-utils/passwd.c:346
 msgid "UID and username does not match, imposter!"
 msgstr "Nome de usuário e UID não correspondem, impostor!"
 
-#: login-utils/passwd.c:349
+#: login-utils/passwd.c:351
 #, c-format
 msgid "Changing password for %s\n"
 msgstr "Alterando a senha para o usuário %s\n"
 
-#: login-utils/passwd.c:353
+#: login-utils/passwd.c:355
 msgid "Enter old password: "
 msgstr "Informe a senha anterior: "
 
-#: login-utils/passwd.c:355
+#: login-utils/passwd.c:357
 msgid "Illegal password, imposter."
 msgstr "Senha incorreta, impostor."
 
-#: login-utils/passwd.c:367
+#: login-utils/passwd.c:369
 msgid "Enter new password: "
 msgstr "Informe a nova senha: "
 
-#: login-utils/passwd.c:369
+#: login-utils/passwd.c:371
 msgid "Password not changed."
 msgstr "A senha NÃO foi alterada."
 
-#: login-utils/passwd.c:379
+#: login-utils/passwd.c:380
 msgid "Re-type new password: "
 msgstr "Redigite a nova senha: "
 
-#: login-utils/passwd.c:382
+#: login-utils/passwd.c:383
 msgid "You misspelled it. Password not changed."
 msgstr "Você não a informou corretamente. A senha não foi alterada."
 
-#: login-utils/passwd.c:397
+#: login-utils/passwd.c:398
 #, c-format
 msgid "password changed, user %s"
 msgstr "senha alterada, usuário %s"
 
-#: login-utils/passwd.c:400
+#: login-utils/passwd.c:401
 msgid "ROOT PASSWORD CHANGED"
 msgstr "A SENHA DO ROOT FOI ALTERADA"
 
-#: login-utils/passwd.c:402
+#: login-utils/passwd.c:403
 #, c-format
 msgid "password changed by root, user %s"
 msgstr "senha alterada pelo root, usuário %s"
 
-#: login-utils/passwd.c:409
+#: login-utils/passwd.c:410
 msgid "calling setpwnam to set password.\n"
 msgstr "chamando setpwnam para definir a senha.\n"
 
-#: login-utils/passwd.c:413
+#: login-utils/passwd.c:414
 msgid "Password *NOT* changed.  Try again later.\n"
 msgstr "A senha *NÃO* foi alterada. Tente novamente mais tarde.\n"
 
-#: login-utils/passwd.c:419
+#: login-utils/passwd.c:420
 msgid "Password changed.\n"
 msgstr "Senha alterada.\n"
 
-#: login-utils/shutdown.c:87
+#: login-utils/shutdown.c:110
 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:105
+#: login-utils/shutdown.c:128
 msgid "Shutdown process aborted"
 msgstr "Processo de desligamento abortado"
 
-#: login-utils/shutdown.c:131
+#: login-utils/shutdown.c:154
 #, 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:225
+#: login-utils/shutdown.c:248
 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:277
+#: login-utils/shutdown.c:299
 msgid "for maintenance; bounce, bounce"
 msgstr "para manutenção; bounce, bounce"
 
-#: login-utils/shutdown.c:281
+#: login-utils/shutdown.c:303
 #, c-format
 msgid "timeout = %d, quiet = %d, reboot = %d\n"
 msgstr "timeout = %d, quiet = %d, reboot = %d\n"
 
-#: login-utils/shutdown.c:306
+#: login-utils/shutdown.c:328
 msgid "The system is being shut down within 5 minutes"
 msgstr "O sistema será desligado dentro de 5 minutos"
 
-#: login-utils/shutdown.c:310
+#: login-utils/shutdown.c:332
 msgid "Login is therefore prohibited."
 msgstr "Assim, logins estão proibidos."
 
-#: login-utils/shutdown.c:331
+#: login-utils/shutdown.c:353
 #, c-format
 msgid "%s by %s: %s"
 msgstr "%s por %s: %s"
 
-#: login-utils/shutdown.c:332
+#: login-utils/shutdown.c:354
 msgid "rebooted"
 msgstr "reinicializado"
 
-#: login-utils/shutdown.c:332
+#: login-utils/shutdown.c:354
 msgid "halted"
 msgstr "parado"
 
 #. RB_AUTOBOOT
-#: login-utils/shutdown.c:387
+#: login-utils/shutdown.c:417
 msgid "\nWhy am I still alive after reboot?"
 msgstr "\nPor que eu ainda estou vivo após a reinicialização?"
 
-#: login-utils/shutdown.c:389
+#: login-utils/shutdown.c:419
 msgid "\nNow you can turn off the power..."
 msgstr "\nAgora você pode desligar a energia..."
 
-#: login-utils/shutdown.c:404
+#: login-utils/shutdown.c:435
 msgid "Calling kernel power-off facility...\n"
 msgstr "Chamando recurso de desligamento do kernel...\n"
 
-#: login-utils/shutdown.c:407
+#: login-utils/shutdown.c:438
 #, c-format
 msgid "Error powering off\t%s\n"
 msgstr "Erro ao desligar\t%s\n"
 
-#: login-utils/shutdown.c:415
+#: login-utils/shutdown.c:446
 #, c-format
 msgid "Executing the program \"%s\" ...\n"
 msgstr "Executando o programa \"%s\" ...\n"
 
-#: login-utils/shutdown.c:418
+#: login-utils/shutdown.c:449
 #, c-format
 msgid "Error executing\t%s\n"
 msgstr "Erro ao executar\t%s\n"
 
-#: login-utils/shutdown.c:441
+#: login-utils/shutdown.c:475
 #, c-format
-msgid "URGENT: broadcast message from %s:"
-msgstr "URGENT: broadcast message from %s:"
+msgid "URGENT: broadcast message from %s:"
+msgstr "URGENT: broadcast message from %s:"
 
-#: login-utils/shutdown.c:441 login-utils/shutdown.c:447
+#: login-utils/shutdown.c:481
 #, c-format
-msgid "System going down IMMEDIATELY!\n"
-msgstr "O sistema será desligado IMEDIATAMENTE!\n"
+msgid "System going down in %d hours %d minutes"
+msgstr "O sistema será desligado em %d horas e %d minuto(s)"
 
-#: login-utils/shutdown.c:450
+#: login-utils/shutdown.c:484
 #, 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:451 login-utils/shutdown.c:454
-msgid "s"
-msgstr "s"
+msgid "System going down in 1 hour %d minutes"
+msgstr "O sistema será desligado em 1 hora e %d minuto(s)"
 
-#: login-utils/shutdown.c:453
+#: login-utils/shutdown.c:487
 #, c-format
-msgid "System going down in %d minute%s\n"
-msgstr "O sistema será desligado em %d minuto%s\n"
+msgid "System going down in %d minutes\n"
+msgstr "O sistema será desligado em %d minutos\n"
+
+#: login-utils/shutdown.c:490
+msgid "System going down in 1 minute\n"
+msgstr "O sistema será desligado em 1 minuto\n"
+
+#: login-utils/shutdown.c:492
+msgid "System going down IMMEDIATELY!\n"
+msgstr "O sistema será desligado IMEDIATAMENTE!\n"
 
-#: login-utils/shutdown.c:459
+#: login-utils/shutdown.c:497
 #, c-format
 msgid "\t... %s ...\n"
 msgstr "\t... %s ...\n"
 
-#: login-utils/shutdown.c:516
+#: login-utils/shutdown.c:554
 msgid "Cannot fork for swapoff. Shrug!"
 msgstr "Não é possível fazer fork para swapoff. Droga!"
 
-#: login-utils/shutdown.c:524
+#: login-utils/shutdown.c:562
 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:543
+#: login-utils/shutdown.c:581
 msgid "Cannot fork for umount, trying manually."
 msgstr "Não é possível fazer fork para umount; tentando manualmente."
 
-#: login-utils/shutdown.c:552
+#: login-utils/shutdown.c:590
 #, c-format
 msgid "Cannot exec %s, trying umount.\n"
 msgstr "Não é possível exec %s; tentando umount.\n"
 
-#: login-utils/shutdown.c:556
+#: login-utils/shutdown.c:594
 msgid "Cannot exec umount, giving up on umount."
 msgstr "Não é possível exec umount; desistindo de umount."
 
-#: login-utils/shutdown.c:561
+#: login-utils/shutdown.c:599
 msgid "Unmounting any remaining filesystems..."
 msgstr "Desmontando quaisquer sistemas de arquivos remanescentes..."
 
-#: login-utils/shutdown.c:595
+#: login-utils/shutdown.c:635
 #, c-format
 msgid "shutdown: Couldn't umount %s: %s\n"
 msgstr "shutdown: não foi possível desmontar %s: %s\n"
 
-#: login-utils/simpleinit.c:109
+#: login-utils/simpleinit.c:122
 msgid "Booting to single user mode.\n"
 msgstr "Inicializando em modo monousuário.\n"
 
-#: login-utils/simpleinit.c:113
+#: login-utils/simpleinit.c:126
 msgid "exec of single user shell failed\n"
 msgstr "exec de interpretador de comandos monousuário falhou\n"
 
-#: login-utils/simpleinit.c:117
+#: login-utils/simpleinit.c:130
 msgid "fork of single user shell failed\n"
 msgstr "fork de interpretador de comandos monousuário falhou\n"
 
-#: login-utils/simpleinit.c:166
+#: login-utils/simpleinit.c:182
 msgid "error opening fifo\n"
 msgstr "erro abrindo fifo\n"
 
-#: login-utils/simpleinit.c:271
+#: login-utils/simpleinit.c:220
+msgid "error running finalprog\n"
+msgstr "erro executando fnalprog\n"
+
+#. Error
+#: login-utils/simpleinit.c:224
+msgid "error forking finalprog\n"
+msgstr "erro fazendo fork finalprog\n"
+
+#: login-utils/simpleinit.c:303
 msgid "\nWrong password.\n"
 msgstr "\nSenha incorreta.\n"
 
-#: login-utils/simpleinit.c:341
+#: login-utils/simpleinit.c:376
+msgid "lstat of path failed\n"
+msgstr "lstat da rota falhou\n"
+
+#: login-utils/simpleinit.c:384
 msgid "stat of path failed\n"
 msgstr "estado da rota falhou\n"
 
-#: login-utils/simpleinit.c:348
+#: login-utils/simpleinit.c:392
 msgid "open of directory failed\n"
 msgstr "abertura do diretório falhou\n"
 
-#: login-utils/simpleinit.c:415
+#: login-utils/simpleinit.c:459
 msgid "fork failed\n"
 msgstr "o fork falhou\n"
 
-#: login-utils/simpleinit.c:445 text-utils/more.c:1554
+#: login-utils/simpleinit.c:490 text-utils/more.c:1622
 msgid "exec failed\n"
 msgstr "exec falhou\n"
 
-#: login-utils/simpleinit.c:469
+#: login-utils/simpleinit.c:514
 msgid "cannot open inittab\n"
 msgstr "não foi possível abrir inittab\n"
 
-#: login-utils/simpleinit.c:529
+#: login-utils/simpleinit.c:581
 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
+#: login-utils/simpleinit.c:888
 msgid "error running programme\n"
 msgstr "erro executando programa\n"
 
-#: login-utils/ttymsg.c:81
+#: login-utils/ttymsg.c:75
 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)"
 
-#: login-utils/ttymsg.c:91
+#: login-utils/ttymsg.c:85
 msgid "excessively long line arg"
 msgstr "linha de argumentos longa demais"
 
-#: login-utils/ttymsg.c:145
+#: login-utils/ttymsg.c:139
 msgid "cannot fork"
 msgstr "não foi possível realizar fork"
 
-#: login-utils/ttymsg.c:149
+#: login-utils/ttymsg.c:143
 #, c-format
 msgid "fork: %s"
 msgstr "fork: %s"
 
-#: login-utils/ttymsg.c:177
+#: login-utils/ttymsg.c:171
 #, c-format
 msgid "%s: BAD ERROR"
 msgstr "%s: ERRO GRAVE"
 
-#: login-utils/vipw.c:145
+#: login-utils/vipw.c:139
 #, c-format
 msgid "%s: the %s file is busy.\n"
 msgstr "%s: o arquivo %s está ocupado.\n"
 
-#: login-utils/vipw.c:161
+#: login-utils/vipw.c:155
 #, 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:167
+#: login-utils/vipw.c:161
 #, 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:188
+#: login-utils/vipw.c:192
 #, 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"
 
-#: login-utils/vipw.c:211
+#: login-utils/vipw.c:215
 #, c-format
 msgid "%s: Cannot fork\n"
 msgstr "%s: não foi possível realizar fork\n"
 
-#: login-utils/vipw.c:251
+#: login-utils/vipw.c:255
 #, c-format
 msgid "%s: %s unchanged\n"
 msgstr "%s: %s inalterado\n"
 
-#: login-utils/vipw.c:294
+#: login-utils/vipw.c:274
 #, c-format
 msgid "%s: no changes made\n"
 msgstr "%s: nenhuma alteração realizada\n"
 
-#: login-utils/wall.c:103
+#: login-utils/vipw.c:323
+msgid "You are using shadow groups on this system.\n"
+msgstr "Você está usando grupos sombra (shadow) neste sistema\n"
+
+#: login-utils/vipw.c:324
+msgid "You are using shadow passwords on this system.\n"
+msgstr "Você está usando senhas sombra (shadow) neste sistema\n"
+
+#: login-utils/vipw.c:325
+#, c-format
+msgid "Would you like to edit %s now [y/n]? "
+msgstr "Você gostaria de editar %s agora [s/n]"
+
+#: login-utils/wall.c:104
 #, c-format
 msgid "usage: %s [file]\n"
 msgstr "Uso: %s [arquivo]\n"
 
-#: login-utils/wall.c:151
+#: login-utils/wall.c:152
 #, c-format
 msgid "%s: can't open temporary file.\n"
 msgstr "%s: não foi possível abrir arquivo temporário.\n"
 
-#: login-utils/wall.c:178
+#: login-utils/wall.c:179
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Mensagem de broadcast de %s@%s"
 
-#: login-utils/wall.c:188
+#: login-utils/wall.c:197
+#, c-format
+msgid "%s: will not read %s - use stdin.\n"
+msgstr "%s: não será lido %s - use a entrada padrão.\n"
+
+#: login-utils/wall.c:202
 #, c-format
 msgid "%s: can't read %s.\n"
 msgstr "%s: não foi possível ler %s.\n"
 
-#: login-utils/wall.c:213
+#: login-utils/wall.c:224
 #, c-format
 msgid "%s: can't stat temporary file.\n"
 msgstr "%s: não foi possível stat arquivo temporário.\n"
 
-#: login-utils/wall.c:222
+#: login-utils/wall.c:233
 #, c-format
 msgid "%s: can't read temporary file.\n"
 msgstr "%s: não foi possível ler arquivo temporário.\n"
@@ -6135,27 +6316,27 @@ msgstr "Uso: %s [+formato] [dia mês ano]\n"
 msgid "St. Tib's Day"
 msgstr "Dia de São Tib"
 
-#: misc-utils/kill.c:210
+#: misc-utils/kill.c:206
 #, c-format
 msgid "%s: unknown signal %s\n"
 msgstr "%s: sinal desconhecido %s\n"
 
-#: misc-utils/kill.c:272
+#: misc-utils/kill.c:269
 #, 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:316
+#: misc-utils/kill.c:313
 #, c-format
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: sinal desconhecido %s; sinais válidos:\n"
 
-#: misc-utils/kill.c:356
+#: misc-utils/kill.c:353
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Uso: %s [ -s sinal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:357
+#: misc-utils/kill.c:354
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ sinal ]\n"
@@ -6193,76 +6374,102 @@ 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:100
+#: misc-utils/namei.c:101
 #, 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:111
+#: misc-utils/namei.c:112
 #, 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:120
+#: misc-utils/namei.c:121
 msgid "usage: namei [-mx] pathname [pathname ...]\n"
 msgstr "Uso: namei [-mx] nome_caminho [nome_caminho ...]\n"
 
-#: misc-utils/namei.c:145
+#: misc-utils/namei.c:146
 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:152
+#: misc-utils/namei.c:153
 msgid "namei: could not stat root!\n"
 msgstr "namei: não foi possível stat raiz!\n"
 
-#: misc-utils/namei.c:207
+#: misc-utils/namei.c:208
 #, 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:236
+#: misc-utils/namei.c:237
 #, 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:246
+#: misc-utils/namei.c:247
 msgid "  *** EXCEEDED UNIX LIMIT OF SYMLINKS ***\n"
 msgstr "  *** LIMITE DE LINKS SIMBÓLICOS DO UNIX EXCEDIDO ***\n"
 
-#: misc-utils/namei.c:283
+#: misc-utils/namei.c:284
 #, 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:118
-msgid "usage: script [-a] [-f] [file]\n"
-msgstr "Uso: script [-a] [-f] [arquivo]\n"
+#: misc-utils/rename.c:38
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: memória insuficiente!\n"
+
+#: misc-utils/rename.c:56
+#, c-format
+msgid "%s: renaming %s to %s failed: %s\n"
+msgstr "%s: não foi possível renomear %s para %s. falha: %s\n"
+
+#: misc-utils/rename.c:86
+#, c-format
+msgid "call: %s from to files...\n"
+msgstr "chamada: %s de para arquivos...\n"
 
-#: misc-utils/script.c:139
+#: misc-utils/script.c:104
+#, c-format
+msgid ""
+"Warning: `%s' is a symlink.\n"
+"Use `%s [options] %s' if you really want to use it.\n"
+"Script not started.\n"
+msgstr ""
+"Aviso: `%s' é um link simbólico\n"
+"Use `%s [opções] %s' se você realmente quer usar isto.\n"
+"Script não iniciado.\n"
+
+#: misc-utils/script.c:150
+msgid "usage: script [-a] [-f] [-q] [file]\n"
+msgstr "Uso: script [-a] [-f] [-q] [arquivo]\n"
+
+#: misc-utils/script.c:173
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado, o arquivo é %s\n"
 
-#: misc-utils/script.c:205
+#: misc-utils/script.c:239
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado em %s"
 
-#: misc-utils/script.c:269
+#: misc-utils/script.c:303
 #, c-format
 msgid "\nScript done on %s"
 msgstr "\nScript concluído em %s"
 
-#: misc-utils/script.c:277
+#: misc-utils/script.c:311
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script concluído, o arquivo é %s\n"
 
-#: misc-utils/script.c:288
+#: misc-utils/script.c:322
 msgid "openpty failed\n"
 msgstr "openpty falhou\n"
 
-#: misc-utils/script.c:322
+#: misc-utils/script.c:356
 msgid "Out of pty's\n"
 msgstr "ptys esgotados\n"
 
@@ -6433,22 +6640,6 @@ msgstr "  [ -blength [0-2000] ]\n"
 msgid "  [ -bfreq freqnumber ]\n"
 msgstr "  [ -bfreq num_freq ]\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 "não é possível alterar o estado do modo de conservação de energia\n"
@@ -6472,68 +6663,73 @@ msgstr "Erro ao gravar descarga de tela\n"
 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:1227
+#: misc-utils/setterm.c:1228
 #, c-format
 msgid "%s: $TERM is not defined.\n"
 msgstr "%s: $TERM indefinido.\n"
 
-#: misc-utils/whereis.c:155
+#: misc-utils/whereis.c:157
 msgid "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n"
 msgstr "whereis [ -sbmu ] [ -SBM dir ... -f ] nome...\n"
 
-#: misc-utils/write.c:100
+#: misc-utils/write.c:99
 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:111
+#: misc-utils/write.c:110
 msgid "write: you have write permission turned off.\n"
 msgstr "write: sua permissão de gravação está desativada.\n"
 
-#: misc-utils/write.c:132
+#: misc-utils/write.c:131
 #, 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:140
+#: misc-utils/write.c:139
 #, c-format
 msgid "write: %s has messages disabled on %s\n"
 msgstr "write: %s - mensagens desativadas em %s\n"
 
-#: misc-utils/write.c:147
+#: misc-utils/write.c:146
 msgid "usage: write user [tty]\n"
 msgstr "Uso: write usuário [tty]\n"
 
-#: misc-utils/write.c:246
+#: misc-utils/write.c:234
 #, c-format
 msgid "write: %s is not logged in\n"
 msgstr "write: %s não está conectado.\n"
 
-#: misc-utils/write.c:255
+#: misc-utils/write.c:243
 #, c-format
 msgid "write: %s has messages disabled\n"
 msgstr "write: %s - mensagens desativadas\n"
 
-#: misc-utils/write.c:259
+#: misc-utils/write.c:247
 #, 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:323
+#: misc-utils/write.c:313
+#, c-format
+msgid "Message from %s@%s (as %s) on %s at %s ..."
+msgstr "Mensagem de %s@%s (como %s) em %s em %s ..."
+
+#: misc-utils/write.c:316
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Mensagem de %s@%s em %s em %s ..."
 
-#: mount/fstab.c:116
+#: mount/fstab.c:113
 #, c-format
 msgid "warning: error reading %s: %s"
 msgstr "Aviso: erro ao ler %s: %s"
 
-#: mount/fstab.c:143 mount/fstab.c:166
+#: mount/fstab.c:141 mount/fstab.c:164
 #, c-format
 msgid "warning: can't open %s: %s"
 msgstr "Aviso: não foi possível abrir %s: %s"
 
-#: mount/fstab.c:147
+#: mount/fstab.c:145
 #, c-format
 msgid "mount: could not open %s - using %s instead\n"
 msgstr "mount: não foi possível abrir %s - usando %s\n"
@@ -6542,36 +6738,36 @@ msgstr "mount: não foi possível abrir %s - usando %s\n"
 #. and we cannot create it. Read-only filesystem?
 #. Too many files open in the system?
 #. Filesystem full?
-#: mount/fstab.c:376
+#: mount/fstab.c:374
 #, 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)"
 
-#: mount/fstab.c:388
+#: mount/fstab.c:386
 #, 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)"
 
-#: mount/fstab.c:400
+#: mount/fstab.c:398
 #, 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)"
 
-#: mount/fstab.c:415
+#: mount/fstab.c:413
 #, 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:428
+#: mount/fstab.c:426
 #, c-format
 msgid "can't lock lock file %s: %s"
 msgstr "não foi possível bloquear o arquivo de bloqueio %s: %s"
 
-#: mount/fstab.c:430
+#: mount/fstab.c:428
 msgid "timed out"
 msgstr "tempo esgotado"
 
-#: mount/fstab.c:437
+#: mount/fstab.c:435
 #, c-format
 msgid ""
 "Cannot create link %s\n"
@@ -6580,54 +6776,46 @@ msgstr ""
 "Não foi possível criar o vínculo %s\n"
 "Talvez haja um arquivo de bloqueio vencido?\n"
 
-#: mount/fstab.c:483 mount/fstab.c:491
+#: mount/fstab.c:484 mount/fstab.c:520
 #, 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: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"
-
-#: 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"
-
-#: mount/fstab.c:533 mount/fstab.c:539
+#: mount/fstab.c:528
 #, c-format
 msgid "error writing %s: %s"
 msgstr "erro ao gravar %s: %s"
 
-#: mount/fstab.c:546
+#: mount/fstab.c:536
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: mount/fstab.c:553
+#: mount/fstab.c:554
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "não foi possível renomear %s para %s: %s\n"
 
-#: mount/lomount.c:78
+#: mount/lomount.c:79
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: não foi possível abrir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:84
+#: mount/lomount.c:85
 #, c-format
 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/lomount.c:90
 #, 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:148
+#: mount/lomount.c:176
 msgid "mount: could not find any device /dev/loop#"
 msgstr "mount: não foi possível localizar qualquer dispositivo /dev/loop#"
 
-#: mount/lomount.c:152
+#: mount/lomount.c:180
 msgid ""
 "mount: Could not find any loop device.\n"
 "       Maybe /dev/loop# has a wrong major number?"
@@ -6635,7 +6823,7 @@ 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:156
+#: mount/lomount.c:184
 #, c-format
 msgid ""
 "mount: Could not find any loop device, and, according to %s,\n"
@@ -6646,7 +6834,7 @@ msgstr ""
 "       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:162
+#: mount/lomount.c:190
 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"
@@ -6656,53 +6844,53 @@ msgstr ""
 "       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:166
+#: mount/lomount.c:194
 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:197
+#: mount/lomount.c:224
 #, c-format
 msgid "Unsupported encryption type %s\n"
 msgstr "Tipo de criptografia não suportado: %s\n"
 
-#: mount/lomount.c:211
+#: mount/lomount.c:238
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Não é possível bloquear (lock) na memória, saindo\n"
 
-#: mount/lomount.c:231
+#: mount/lomount.c:257
 msgid "Init (up to 16 hex digits): "
 msgstr "Inicialização (até 16 dígitos hexadecimais):"
 
-#: mount/lomount.c:238
+#: mount/lomount.c:264
 #, c-format
 msgid "Non-hex digit '%c'.\n"
 msgstr "Digito não hexadecimal '%c'.\n"
 
-#: mount/lomount.c:245
+#: mount/lomount.c:271
 #, 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"
 
-#: mount/lomount.c:261
+#: mount/lomount.c:287
 #, c-format
 msgid "set_loop(%s,%s,%d): success\n"
 msgstr "set_loop(%s,%s,%d): sucesso\n"
 
-#: mount/lomount.c:272
+#: mount/lomount.c:298
 #, 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:282
+#: mount/lomount.c:308
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): sucesso\n"
 
-#: mount/lomount.c:290
+#: mount/lomount.c:316
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Este mount foi compilado sem suporte a laços. Recompile-o.\n"
 
-#: mount/lomount.c:327
+#: mount/lomount.c:353
 #, c-format
 msgid ""
 "usage:\n"
@@ -6715,11 +6903,11 @@ msgstr ""
 "  %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
+#: mount/lomount.c:371 mount/sundries.c:41 mount/sundries.c:56
 msgid "not enough memory"
 msgstr "não há memória suficiente"
 
-#: mount/lomount.c:416
+#: mount/lomount.c:442
 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"
 
@@ -6737,160 +6925,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:351
+#: mount/mount.c:378
 #, 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:355
+#: mount/mount.c:382
 #, 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:376
+#: mount/mount.c:403
 #, 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:391 mount/mount.c:594
+#: mount/mount.c:418 mount/mount.c:619
 #, c-format
 msgid "mount: error writing %s: %s"
 msgstr "mount: erro ao gravar %s: %s"
 
-#: mount/mount.c:398
+#: mount/mount.c:425
 #, c-format
 msgid "mount: error changing mode of %s: %s"
 msgstr "mount: erro ao alterar modo de %s: %s"
 
-#: mount/mount.c:443
+#: mount/mount.c:470
 #, c-format
 msgid "%s looks like swapspace - not mounted"
 msgstr "%s parece espaço de permuta - não montado"
 
-#: mount/mount.c:486
+#: mount/mount.c:513
 msgid "mount failed"
 msgstr "mount falhou"
 
-#: mount/mount.c:488
+#: mount/mount.c:515
 #, c-format
 msgid "mount: only root can mount %s on %s"
 msgstr "mount: somente o root pode montar %s em %s"
 
-#: mount/mount.c:516
+#: mount/mount.c:543
 msgid "mount: loop device specified twice"
 msgstr "mount: dispositivo de laço especificado duas vezes"
 
-#: mount/mount.c:521
+#: mount/mount.c:548
 msgid "mount: type specified twice"
 msgstr "mount: tipo especificado duas vezes"
 
-#: mount/mount.c:533
+#: mount/mount.c:560
 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:542
+#: mount/mount.c:569
 #, 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:546
+#: mount/mount.c:573
 msgid "mount: failed setting up loop device\n"
 msgstr "mount: falha ao configurar dispositivo de laço\n"
 
-#: mount/mount.c:550
+#: mount/mount.c:577
 msgid "mount: setup loop device successfully\n"
 msgstr "mount: configuração de dispositivo de laço realizada com sucesso\n"
 
-#: mount/mount.c:589
+#: mount/mount.c:614
 #, c-format
 msgid "mount: can't open %s: %s"
 msgstr "mount: não foi possível abrir %s: %s"
 
-#: mount/mount.c:612
+#: mount/mount.c:637
 #, 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
+#: mount/mount.c:640
 #, 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
+#: mount/mount.c:701 mount/mount.c:1230
 #, c-format
 msgid "mount: cannot fork: %s"
 msgstr "mount: não foi possível realizar fork: %s"
 
-#: mount/mount.c:750
+#: mount/mount.c:775
 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:790
+#: mount/mount.c:815
 msgid "mount: failed with nfs mount version 4, trying 3..\n"
 msgstr ""
 "mount: falhou com o mount do nfs versão 4, tentando com o 3..\n"
 " \n"
 
-#: mount/mount.c:801
+#: mount/mount.c:826
 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:804
+#: mount/mount.c:829
 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:807
+#: mount/mount.c:832
 msgid "mount: mount failed"
 msgstr "mount: a montagem falhou"
 
-#: mount/mount.c:813 mount/mount.c:848
+#: mount/mount.c:838 mount/mount.c:873
 #, 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:815
+#: mount/mount.c:840
 msgid "mount: permission denied"
 msgstr "mount: permissão negada"
 
-#: mount/mount.c:817
+#: mount/mount.c:842
 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:821 mount/mount.c:825
+#: mount/mount.c:846 mount/mount.c:850
 #, c-format
 msgid "mount: %s is busy"
 msgstr "mount: %s está ocupado"
 
 #. no
 #. yes, don't mention it
-#: mount/mount.c:827
+#: mount/mount.c:852
 msgid "mount: proc already mounted"
 msgstr "mount: proc já montado"
 
-#: mount/mount.c:829
+#: mount/mount.c:854
 #, c-format
 msgid "mount: %s already mounted or %s busy"
 msgstr "mount: %s já montado ou %s ocupado"
 
-#: mount/mount.c:835
+#: mount/mount.c:860
 #, c-format
 msgid "mount: mount point %s does not exist"
 msgstr "mount: o ponto de montagem %s não existe"
 
-#: mount/mount.c:837
+#: mount/mount.c:862
 #, 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:840
+#: mount/mount.c:865
 #, c-format
 msgid "mount: special device %s does not exist"
 msgstr "mount: o dispositivo especial %s não existe"
 
-#: mount/mount.c:850
+#: mount/mount.c:875
 #, c-format
 msgid ""
 "mount: special device %s does not exist\n"
@@ -6899,12 +7087,12 @@ msgstr ""
 "mount: o dispositivo especial %s não existe\n"
 "       (um prefixo de caminho não é um diretório)\n"
 
-#: mount/mount.c:863
+#: mount/mount.c:888
 #, 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:865
+#: mount/mount.c:890
 #, c-format
 msgid ""
 "mount: wrong fs type, bad option, bad superblock on %s,\n"
@@ -6913,46 +7101,46 @@ msgstr ""
 "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:899
+#: mount/mount.c:924
 msgid "mount table full"
 msgstr "tabela de montagem cheia"
 
-#: mount/mount.c:901
+#: mount/mount.c:926
 #, c-format
 msgid "mount: %s: can't read superblock"
 msgstr "mount: %s: não foi possível ler o superbloco"
 
-#: mount/mount.c:905
+#: mount/mount.c:930
 #, c-format
 msgid "mount: %s: unknown device"
 msgstr "mount: %s: dispositivo de blocos desconhecido"
 
-#: mount/mount.c:910
+#: mount/mount.c:935
 #, 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:922
+#: mount/mount.c:947
 #, c-format
 msgid "mount: probably you meant %s"
 msgstr "mount: provavelmente você queria dizer %s"
 
-#: mount/mount.c:924
+#: mount/mount.c:949
 msgid "mount: maybe you meant iso9660 ?"
 msgstr "mount: talvez você quisesse dizer iso9660?"
 
-#: mount/mount.c:927
+#: mount/mount.c:952
 #, c-format
 msgid "mount: %s has wrong device number or fs type %s not supported"
 msgstr "mount: %s possui número de dispositivo incorreto ou o tipo de sistema de arquivos %s não é suportado"
 
 #. strange ...
-#: mount/mount.c:933
+#: mount/mount.c:958
 #, 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:935
+#: mount/mount.c:960
 #, c-format
 msgid ""
 "mount: the kernel does not recognize %s as a block device\n"
@@ -6961,82 +7149,82 @@ msgstr ""
 "mount: o kernel não reconhece %s como dispositivo de blocos\n"
 "       (talvez `insmod driver'?)"
 
-#: mount/mount.c:938
+#: mount/mount.c:963
 #, 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:941
+#: mount/mount.c:966
 #, c-format
 msgid "mount: %s is not a block device"
 msgstr "mount: %s não é um dispositivo de blocos"
 
-#: mount/mount.c:944
+#: mount/mount.c:969
 #, c-format
 msgid "mount: %s is not a valid block device"
 msgstr "mount: %s não é um dispositivo de blocos válido"
 
 #. pre-linux 1.1.38, 1.1.41 and later
 #. linux 1.1.38 and later
-#: mount/mount.c:947
+#: mount/mount.c:972
 msgid "block device "
 msgstr "dispositivo de blocos "
 
-#: mount/mount.c:949
+#: mount/mount.c:974
 #, c-format
 msgid "mount: cannot mount %s%s read-only"
 msgstr "mount: não foi possível montar %s%s somente para leitura"
 
-#: mount/mount.c:953
+#: mount/mount.c:978
 #, 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:969
+#: mount/mount.c:994
 #, 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:1058
+#: mount/mount.c:1083
 #, c-format
 msgid "mount: going to mount %s by %s\n"
 msgstr "mount: montando %s por %s\n"
 
-#: mount/mount.c:1059
+#: mount/mount.c:1084
 msgid "UUID"
 msgstr "UUID"
 
-#: mount/mount.c:1059
+#: mount/mount.c:1084
 msgid "label"
 msgstr "rótulo"
 
-#: mount/mount.c:1061 mount/mount.c:1431
+#: mount/mount.c:1086 mount/mount.c:1464
 msgid "mount: no such partition found"
 msgstr "mount: tal partição não foi encontrada"
 
-#: mount/mount.c:1069
+#: mount/mount.c:1094
 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"
 
 #.
 #. * Retry in the background.
 #.
-#: mount/mount.c:1085
+#: mount/mount.c:1110
 #, c-format
 msgid "mount: backgrounding \"%s\"\n"
 msgstr "mount: tentando montar em segundo plano \"%s\"\n"
 
-#: mount/mount.c:1096
+#: mount/mount.c:1121
 #, c-format
 msgid "mount: giving up \"%s\"\n"
 msgstr "mount: desistindo de \"%s\"\n"
 
-#: mount/mount.c:1154
+#: mount/mount.c:1181
 #, c-format
 msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s já montado em %s\n"
 
-#: mount/mount.c:1271
+#: mount/mount.c:1299
 msgid ""
 "Usage: mount -V                 : print version\n"
 "       mount -h                 : print this help\n"
@@ -7055,8 +7243,6 @@ msgid ""
 "       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 ""
@@ -7078,149 +7264,147 @@ msgstr ""
 "       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
+#: mount/mount.c:1448
 msgid "mount: only root can do that"
 msgstr "mount: operação exclusiva de root"
 
-#: mount/mount.c:1420
+#: mount/mount.c:1453
 #, c-format
 msgid "mount: no %s found - creating it..\n"
 msgstr "mount: nenhum %s encontrado - criando-o...\n"
 
-#: mount/mount.c:1433
+#: mount/mount.c:1466
 #, c-format
 msgid "mount: mounting %s\n"
 msgstr "mount: montando %s\n"
 
-#: mount/mount.c:1442
+#: mount/mount.c:1475
 msgid "not mounted anything"
 msgstr "nada foi montado"
 
-#: mount/mount.c:1457
+#: mount/mount.c:1490
 #, c-format
 msgid "mount: cannot find %s in %s"
 msgstr "mount: não foi possível localizar %s em %s"
 
-#: mount/mount.c:1472
+#: mount/mount.c:1505
 #, 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:99
+#: 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: 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
+#: mount/mount_by_label.c:212
 msgid "mount: bad UUID"
 msgstr "mount: UUID inválida"
 
-#: mount/mount_guess_fstype.c:257
+#: mount/mount_guess_fstype.c:317
 #, 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:260
+#: mount/mount_guess_fstype.c:320
 #, 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:263
+#: mount/mount_guess_fstype.c:323
 msgid "       and it looks like this is swapspace\n"
 msgstr "       e parece ser um espaço de permuta\n"
 
-#: mount/mount_guess_fstype.c:265
+#: mount/mount_guess_fstype.c:325
 #, c-format
 msgid "       I will try type %s\n"
 msgstr "       experimentarei o tipo %s\n"
 
-#: mount/mount_guess_fstype.c:329
+#: mount/mount_guess_fstype.c:401
 #, c-format
 msgid "Trying %s\n"
 msgstr "Experimentando %s\n"
 
-#: mount/nfsmount.c:225
+#: mount/nfsmount.c:232
 msgid "mount: excessively long host:dir argument\n"
 msgstr "mount: argumento host:dir excessivamente longo\n"
 
-#: mount/nfsmount.c:238
+#: mount/nfsmount.c:245
 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:242
+#: mount/nfsmount.c:249
 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:253 mount/nfsmount.c:510
+#: mount/nfsmount.c:260 mount/nfsmount.c:517
 #, 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:259
+#: mount/nfsmount.c:266
 msgid "mount: got bad hp->h_length\n"
 msgstr "mount: obtido hp->h_length inválido\n"
 
-#: mount/nfsmount.c:276
+#: mount/nfsmount.c:283
 msgid "mount: excessively long option argument\n"
 msgstr "mount: argumento de opção excessivamente longo\n"
 
-#: mount/nfsmount.c:368
+#: mount/nfsmount.c:375
 msgid "Warning: Unrecognized proto= option.\n"
 msgstr "Aviso: opção proto= não reconhecida.\n"
 
-#: mount/nfsmount.c:375
+#: mount/nfsmount.c:382
 msgid "Warning: Option namlen is not supported.\n"
 msgstr "Aviso: a opção namlen não é suportada.\n"
 
-#: mount/nfsmount.c:379
+#: mount/nfsmount.c:386
 #, c-format
 msgid "unknown nfs mount parameter: %s=%d\n"
 msgstr "parâmetro de montagem de nfs desconhecido: %s=%d\n"
 
-#: mount/nfsmount.c:414
+#: mount/nfsmount.c:421
 msgid "Warning: option nolock is not supported.\n"
 msgstr "Aviso: a opção nolock não é suportada.\n"
 
-#: mount/nfsmount.c:419
+#: mount/nfsmount.c:426
 #, c-format
 msgid "unknown nfs mount option: %s%s\n"
 msgstr "opção de montagem de nfs desconhecida: %s%s\n"
 
-#: mount/nfsmount.c:516
+#: mount/nfsmount.c:523
 msgid "mount: got bad hp->h_length?\n"
 msgstr "mount: obtido hp->h_length inválido?\n"
 
-#: mount/nfsmount.c:692
+#: mount/nfsmount.c:709
 msgid "NFS over TCP is not supported.\n"
 msgstr "NFS sobre TCP não é suportado.\n"
 
-#: mount/nfsmount.c:699
+#: mount/nfsmount.c:716
 msgid "nfs socket"
 msgstr "nfs socket"
 
-#: mount/nfsmount.c:703
+#: mount/nfsmount.c:720
 msgid "nfs bindresvport"
 msgstr "nfs bindresvport"
 
-#: mount/nfsmount.c:714
+#: mount/nfsmount.c:731
 msgid "used portmapper to find NFS port\n"
 msgstr "usado portmapper para localizar porta NFS\n"
 
-#: mount/nfsmount.c:718
+#: mount/nfsmount.c:735
 #, c-format
 msgid "using port %d for nfs deamon\n"
 msgstr "usando porta %d para o daemon do nfs\n"
 
-#: mount/nfsmount.c:729
+#: mount/nfsmount.c:746
 msgid "nfs connect"
 msgstr "nfs connect"
 
-#: mount/nfsmount.c:816
+#: mount/nfsmount.c:833
 #, c-format
 msgid "unknown nfs status return value: %d"
 msgstr "valor de retorno de status de nfs desconhecido: %d"
@@ -7267,95 +7451,95 @@ msgstr "swapon: ignorando arquivo %s - ele parece ter buracos.\n"
 msgid "%s: cannot open %s: %s\n"
 msgstr "%s: não foi possível abrir %s: %s\n"
 
-#: mount/umount.c:69
+#: mount/umount.c:72
 msgid "umount: compiled without support for -f\n"
 msgstr "umount: compilado sem suporte a -f\n"
 
-#: mount/umount.c:121
+#: mount/umount.c:128
 #, c-format
 msgid "host: %s, directory: %s\n"
 msgstr "host: %s, diretório: %s\n"
 
-#: mount/umount.c:138
+#: mount/umount.c:148
 #, c-format
 msgid "umount: can't get address for %s\n"
 msgstr "umount: não foi possível obter endereço de %s\n"
 
-#: mount/umount.c:143
+#: mount/umount.c:153
 msgid "umount: got bad hostp->h_length\n"
 msgstr "umount: obtido hostp->h_length inválido\n"
 
-#: mount/umount.c:181
+#: mount/umount.c:191
 #, c-format
 msgid "umount: %s: invalid block device"
 msgstr "umount: %s: dispositivo de blocos inválido"
 
-#: mount/umount.c:183
+#: mount/umount.c:193
 #, c-format
 msgid "umount: %s: not mounted"
 msgstr "umount: %s: não montado"
 
-#: mount/umount.c:185
+#: mount/umount.c:195
 #, c-format
 msgid "umount: %s: can't write superblock"
 msgstr "umount: %s: não foi possível gravar superbloco"
 
 #. Let us hope fstab has a line "proc /proc ..."
 #. and not "none /proc ..."
-#: mount/umount.c:189
+#: mount/umount.c:199
 #, c-format
 msgid "umount: %s: device is busy"
 msgstr "umount: %s: o dispositivo está ocupado"
 
-#: mount/umount.c:191
+#: mount/umount.c:201
 #, c-format
 msgid "umount: %s: not found"
 msgstr "umount: %s: não encontrado"
 
-#: mount/umount.c:193
+#: mount/umount.c:203
 #, c-format
 msgid "umount: %s: must be superuser to umount"
 msgstr "umount: %s: precisa ser superusuário para desmontar"
 
-#: mount/umount.c:195
+#: mount/umount.c:205
 #, c-format
 msgid "umount: %s: block devices not permitted on fs"
 msgstr "umount: %s: dispositivos de blocos não permitidos no sistema de arquivos"
 
-#: mount/umount.c:197
+#: mount/umount.c:207
 #, c-format
 msgid "umount: %s: %s"
 msgstr "umount: %s: %s"
 
-#: mount/umount.c:241
+#: mount/umount.c:252
 msgid "no umount2, trying umount...\n"
 msgstr "não existe umount2, tentando umount...\n"
 
-#: mount/umount.c:254
+#: mount/umount.c:268
 #, c-format
 msgid "could not umount %s - trying %s instead\n"
 msgstr "não foi possível efetuar umount em %s - tentando %s em vez dele\n"
 
-#: mount/umount.c:272
+#: mount/umount.c:286
 #, c-format
 msgid "umount: %s busy - remounted read-only\n"
 msgstr "umount: %s está ocupado - remontado somente para leitura\n"
 
-#: mount/umount.c:282
+#: mount/umount.c:296
 #, 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:290
+#: mount/umount.c:305
 #, c-format
 msgid "%s umounted\n"
 msgstr "%s desmontado\n"
 
-#: mount/umount.c:374
+#: mount/umount.c:392
 msgid "umount: cannot find list of filesystems to unmount"
 msgstr "umount: não foi possível localizar a lista de sistemas de arquivos a desmontar"
 
-#: mount/umount.c:403
+#: mount/umount.c:421
 msgid ""
 "Usage: umount [-hV]\n"
 "       umount -a [-f] [-r] [-n] [-v] [-t vfstypes]\n"
@@ -7365,55 +7549,55 @@ msgstr ""
 "       umount -a [-f] [-r] [-n] [-v] [-t tipos_sist_arq_virt]\n"
 "       umount [-f] [-r] [-n] [-v] especial | nó...\n"
 
-#: mount/umount.c:464
+#: mount/umount.c:486
 msgid "umount: only root can do that"
 msgstr "umount: operação exclusiva de root"
 
-#: mount/umount.c:479
+#: mount/umount.c:501
 #, c-format
 msgid "Trying to umount %s\n"
 msgstr "Tentando desmontar %s\n"
 
-#: mount/umount.c:483
+#: mount/umount.c:505
 #, c-format
 msgid "Could not find %s in mtab\n"
 msgstr "Não foi possível localizar %s em mtab\n"
 
-#: mount/umount.c:487
+#: mount/umount.c:509
 #, c-format
 msgid "umount: %s is not mounted (according to mtab)"
 msgstr "umount: %s não está montado (de acordo com mtab)"
 
-#: mount/umount.c:489
+#: mount/umount.c:511
 #, c-format
 msgid "umount: it seems %s is mounted multiple times"
 msgstr "umount: parece que %s está montado múltiplas vezes"
 
-#: mount/umount.c:501
+#: mount/umount.c:523
 #, c-format
 msgid "umount: %s is not in the fstab (and you are not root)"
 msgstr "umount: %s não está na fstab (e você não é root)"
 
-#: mount/umount.c:504
+#: mount/umount.c:526
 #, c-format
 msgid "umount: %s mount disagrees with the fstab"
 msgstr "umount: a montagem de %s não está de acordo com a fstab"
 
-#: mount/umount.c:525
+#: mount/umount.c:547
 #, c-format
 msgid "umount: only root can unmount %s from %s"
 msgstr "umount: somente root pode desmontar %s de %s"
 
-#: mount/umount.c:536
+#: mount/umount.c:558
 #, 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
+#: sys-utils/ctrlaltdel.c:27
 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"
 
-#: sys-utils/ctrlaltdel.c:41
+#: sys-utils/ctrlaltdel.c:42
 msgid "Usage: ctrlaltdel hard|soft\n"
 msgstr "Uso: ctrlaltdel hard|soft\n"
 
@@ -7642,7 +7826,7 @@ msgstr ""
 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:268 sys-utils/ipcs.c:470
+#: sys-utils/ipcs.c:268 sys-utils/ipcs.c:491
 msgid "kernel not configured for shared memory\n"
 msgstr "o kernel não está configurado para memória compartilhada\n"
 
@@ -7650,535 +7834,537 @@ msgstr "o kernel não está configurado para memória compartilhada\n"
 msgid "------ Shared Memory Limits --------\n"
 msgstr "- Limites da memória compartilhada -\n"
 
-#: sys-utils/ipcs.c:277
+#. 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 = %d\n"
-msgstr "número máximo de segmentos: %d\n"
+msgid "max number of segments = %ld\n"
+msgstr "número máximo de segmentos: %ld\n"
 
-#: sys-utils/ipcs.c:278
+#: sys-utils/ipcs.c:281
 #, c-format
-msgid "max seg size (kbytes) = %d\n"
-msgstr "tamanho máximo do segmento (Kb): %d\n"
+msgid "max seg size (kbytes) = %ld\n"
+msgstr "tamanho máximo do segmento (Kb): %ld\n"
 
-#: sys-utils/ipcs.c:279
+#: sys-utils/ipcs.c:283
 #, c-format
-msgid "max total shared memory (kbytes) = %d\n"
-msgstr "memória compartilhada total máxima (Kb): %d\n"
+msgid "max total shared memory (kbytes) = %ld\n"
+msgstr "memória compartilhada total máxima (Kb): %ld\n"
 
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:285
 #, c-format
-msgid "min seg size (bytes) = %d\n"
-msgstr "tamanho mínimo do segmento (bytes): %d\n"
+msgid "min seg size (bytes) = %ld\n"
+msgstr "tamanho mínimo do segmento (bytes): %ld\n"
 
-#: sys-utils/ipcs.c:284
+#: sys-utils/ipcs.c:290
 msgid "------ Shared Memory Status --------\n"
 msgstr "- Status da memória compartilhada -\n"
 
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:291
 #, c-format
 msgid "segments allocated %d\n"
 msgstr "segmentos alocados: %d\n"
 
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:292
 #, c-format
 msgid "pages allocated %ld\n"
 msgstr "páginas alocadas %ld\n"
 
-#: sys-utils/ipcs.c:287
+#: sys-utils/ipcs.c:293
 #, c-format
 msgid "pages resident  %ld\n"
 msgstr "páginas residentes: %ld\n"
 
-#: sys-utils/ipcs.c:288
+#: sys-utils/ipcs.c:294
 #, c-format
 msgid "pages swapped   %ld\n"
 msgstr "páginas permutadas: %ld\n"
 
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:295
 #, 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:294
+#: sys-utils/ipcs.c:300
 msgid "------ Shared Memory Segment Creators/Owners --------\n"
 msgstr "Criadores/donos de segmentos de memória compartilhada\n"
 
-#: sys-utils/ipcs.c:295 sys-utils/ipcs.c:401 sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:415 sys-utils/ipcs.c:514
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-10s\n"
 
-#: 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
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:308 sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:318 sys-utils/ipcs.c:422
 msgid "shmid"
 msgstr "shmid"
 
-#: 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
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:319 sys-utils/ipcs.c:416
+#: sys-utils/ipcs.c:431 sys-utils/ipcs.c:515 sys-utils/ipcs.c:532
 msgid "perms"
 msgstr "perms"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:416 sys-utils/ipcs.c:515
 msgid "cuid"
 msgstr "cuid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:416 sys-utils/ipcs.c:515
 msgid "cgid"
 msgstr "cgid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:402 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:416 sys-utils/ipcs.c:515
 msgid "uid"
 msgstr "uid"
 
-#: sys-utils/ipcs.c:296 sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:515
 msgid "gid"
 msgstr "gid"
 
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:306
 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:301
+#: 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: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
+#: sys-utils/ipcs.c:308 sys-utils/ipcs.c:313 sys-utils/ipcs.c:319
+#: sys-utils/ipcs.c:422 sys-utils/ipcs.c:431 sys-utils/ipcs.c:521
+#: sys-utils/ipcs.c:526 sys-utils/ipcs.c:532
 msgid "owner"
 msgstr "proprietário"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:308
 msgid "attached"
 msgstr "anexado"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:308
 msgid "detached"
 msgstr "destacado"
 
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:308
 msgid "changed"
 msgstr "alterado"
 
-#: sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:312
 msgid "------ Shared Memory Creator/Last-op --------\n"
 msgstr "Criador/última op da memória compartilhada\n"
 
-#: sys-utils/ipcs.c:307 sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:526
 #, c-format
 msgid "%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:313
 msgid "cpid"
 msgstr "cpid"
 
-#: sys-utils/ipcs.c:307
+#: sys-utils/ipcs.c:313
 msgid "lpid"
 msgstr "lpid"
 
-#: sys-utils/ipcs.c:311
+#: sys-utils/ipcs.c:317
 msgid "------ Shared Memory Segments --------\n"
 msgstr "- Segmentos da memória compartilhada -\n"
 
-#: sys-utils/ipcs.c:312
+#: 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:312 sys-utils/ipcs.c:417 sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:318 sys-utils/ipcs.c:431 sys-utils/ipcs.c:531
 msgid "key"
 msgstr "chave"
 
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:319
 msgid "bytes"
 msgstr "bytes"
 
-#: sys-utils/ipcs.c:313
+#: sys-utils/ipcs.c:319
 msgid "nattch"
 msgstr "nattch"
 
-#: sys-utils/ipcs.c:313 sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:319 sys-utils/ipcs.c:431
 msgid "status"
 msgstr "status"
 
-#: 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:340 sys-utils/ipcs.c:342 sys-utils/ipcs.c:344
+#: sys-utils/ipcs.c:452 sys-utils/ipcs.c:454 sys-utils/ipcs.c:552
+#: sys-utils/ipcs.c:554 sys-utils/ipcs.c:556 sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:611 sys-utils/ipcs.c:641 sys-utils/ipcs.c:643
+#: sys-utils/ipcs.c:645 sys-utils/ipcs.c:669
+msgid "Not set\n"
+msgstr "Não definido\n"
 
-#: sys-utils/ipcs.c:355
+#: sys-utils/ipcs.c:369
 msgid "dest"
 msgstr "dest"
 
-#: sys-utils/ipcs.c:356
+#: sys-utils/ipcs.c:370
 msgid "locked"
 msgstr "bloqueado"
 
-#: sys-utils/ipcs.c:376
+#: sys-utils/ipcs.c:390
 msgid "kernel not configured for semaphores\n"
 msgstr "o kernel não está configurado para semáforos\n"
 
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:396
 msgid "------ Semaphore Limits --------\n"
 msgstr "------ Limites de semáforo ------\n"
 
-#: sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:400
 #, c-format
 msgid "max number of arrays = %d\n"
 msgstr "número máximo de arrays: %d\n"
 
-#: sys-utils/ipcs.c:387
+#: sys-utils/ipcs.c:401
 #, c-format
 msgid "max semaphores per array = %d\n"
 msgstr "máximo de semáforos por array: %d\n"
 
-#: sys-utils/ipcs.c:388
+#: sys-utils/ipcs.c:402
 #, c-format
 msgid "max semaphores system wide = %d\n"
 msgstr "máximo geral de semáforos do sistema: %d\n"
 
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:403
 #, c-format
 msgid "max ops per semop call = %d\n"
 msgstr "máximo de ops por chamada semop: %d\n"
 
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:404
 #, c-format
 msgid "semaphore max value = %d\n"
 msgstr "valor máximo de semáforo: %d\n"
 
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:408
 msgid "------ Semaphore Status --------\n"
 msgstr "----- Status de semáforo -------\n"
 
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:409
 #, c-format
 msgid "used arrays = %d\n"
 msgstr "arrays usados: %d\n"
 
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:410
 #, c-format
 msgid "allocated semaphores = %d\n"
 msgstr "semáforos alocados: %d\n"
 
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:414
 msgid "------ Semaphore Arrays Creators/Owners --------\n"
 msgstr "----- Criadores/donos de arrays de semáforos -----\n"
 
-#: sys-utils/ipcs.c:402 sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:416 sys-utils/ipcs.c:431
 msgid "semid"
 msgstr "semid"
 
-#: sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:420
 msgid "------ Shared Memory Operation/Change Times --------\n"
 msgstr "Horários de operação/alteração de memória compartilhada\n"
 
-#: sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:421
 #, c-format
 msgid "%-8s%-10s  %-26.24s %-26.24s\n"
 msgstr "%-8s%-10s  %-26.24s %-26.24s\n"
 
-#: sys-utils/ipcs.c:408
+#: sys-utils/ipcs.c:422
 msgid "last-op"
 msgstr "última-op"
 
-#: sys-utils/ipcs.c:408
+#: sys-utils/ipcs.c:422
 msgid "last-changed"
 msgstr "útima-alteração"
 
-#: sys-utils/ipcs.c:415
+#: sys-utils/ipcs.c:429
 msgid "------ Semaphore Arrays --------\n"
 msgstr "------ Arrays de semáforos ------\n"
 
-#: sys-utils/ipcs.c:416
+#: sys-utils/ipcs.c:430
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s%-12s\n"
 
-#: sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:431
 msgid "nsems"
 msgstr "nsems"
 
-#: sys-utils/ipcs.c:478
+#: sys-utils/ipcs.c:499
 msgid "------ Messages: Limits --------\n"
 msgstr "----- Mensagens: limites -------\n"
 
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:500
 #, 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:480
+#: sys-utils/ipcs.c:501
 #, c-format
 msgid "max size of message (bytes) = %d\n"
 msgstr "tamanho máximo da mensagem (bytes): %d\n"
 
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:502
 #, 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:485
+#: sys-utils/ipcs.c:506
 msgid "------ Messages: Status --------\n"
 msgstr "----- Mensagens: status -------\n"
 
-#: sys-utils/ipcs.c:486
+#: sys-utils/ipcs.c:507
 #, c-format
 msgid "allocated queues = %d\n"
 msgstr "filas alocadas: %d\n"
 
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:508
 #, c-format
 msgid "used headers = %d\n"
 msgstr "cabeçalhos usados: %d\n"
 
-#: sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:509
 #, c-format
 msgid "used space = %d bytes\n"
 msgstr "espaço usado: %d bytes\n"
 
-#: sys-utils/ipcs.c:492
+#: sys-utils/ipcs.c:513
 msgid "------ Message Queues: Creators/Owners --------\n"
 msgstr "---- Filas de mensagens: criadores/donos ----\n"
 
-#: sys-utils/ipcs.c:494 sys-utils/ipcs.c:500 sys-utils/ipcs.c:505
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:515 sys-utils/ipcs.c:521 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:531
 msgid "msqid"
 msgstr "msqid"
 
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:519
 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:499
+#: sys-utils/ipcs.c:520
 #, c-format
 msgid "%-8s%-10s  %-20s%-20s%-20s\n"
 msgstr "%-8s%-10s  %-20s%-20s%-20s\n"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:521
 msgid "send"
 msgstr "envio"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:521
 msgid "recv"
 msgstr "recebimento"
 
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:521
 msgid "change"
 msgstr "alteração"
 
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:525
 msgid "------ Message Queues PIDs --------\n"
 msgstr "--- PIDs de filas de mensagens ---\n"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:526
 msgid "lspid"
 msgstr "lspid"
 
-#: sys-utils/ipcs.c:505
+#: sys-utils/ipcs.c:526
 msgid "lrpid"
 msgstr "lrpid"
 
-#: sys-utils/ipcs.c:509
+#: sys-utils/ipcs.c:530
 msgid "------ Message Queues --------\n"
 msgstr "----- Filas de mensagens ------\n"
 
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:531
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 msgstr "%-10s%-10s%-10s%-10s%-12s%-12s\n"
 
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:532
 msgid "used-bytes"
 msgstr "bytes usados"
 
-#: sys-utils/ipcs.c:511
+#: sys-utils/ipcs.c:532
 msgid "messages"
 msgstr "mensagens"
 
-#: sys-utils/ipcs.c:570
+#: sys-utils/ipcs.c:600
 #, c-format
 msgid "\nShared memory Segment shmid=%d\n"
 msgstr "\nMemória compartilhada: shmid de segmento = %d\n"
 
-#: sys-utils/ipcs.c:571
+#: sys-utils/ipcs.c:601
 #, 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:573
+#: sys-utils/ipcs.c:603
 #, c-format
 msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
-#: sys-utils/ipcs.c:574
+#: sys-utils/ipcs.c:605
 #, c-format
-msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
-msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%d\n"
+msgid "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
-#: sys-utils/ipcs.c:577
+#: sys-utils/ipcs.c:608
 #, c-format
 msgid "att_time=%s"
 msgstr "att_time=%s"
 
-#: 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:579
+#: sys-utils/ipcs.c:610
 #, c-format
 msgid "det_time=%s"
 msgstr "det_time=%s"
 
-#: sys-utils/ipcs.c:581
+#: sys-utils/ipcs.c:612 sys-utils/ipcs.c:644
 #, c-format
 msgid "change_time=%s"
 msgstr "change_time=%s"
 
-#: sys-utils/ipcs.c:597
+#: sys-utils/ipcs.c:628
 #, c-format
 msgid "\nMessage Queue msqid=%d\n"
 msgstr "\nmsqid da fila de mensagens: %d\n"
 
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:629
 #, 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:600
+#: sys-utils/ipcs.c:631
 #, 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"
+msgid "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
+msgstr "cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"
 
-#: sys-utils/ipcs.c:603
+#: sys-utils/ipcs.c:640
 #, c-format
-msgid "send_time=%srcv_time=%schange_time=%s"
-msgstr "send_time=%srcv_time=%schange_time=%s"
+msgid "send_time=%s"
+msgstr "send_time=%s"
 
-#: 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:642
+#, c-format
+msgid "rcv_time=%s"
+msgstr "rcv_time=%s"
 
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:662
 #, c-format
 msgid "\nSemaphore Array semid=%d\n"
 msgstr "\nsemid de array de semáforos: %d\n"
 
-#: sys-utils/ipcs.c:624
+#: sys-utils/ipcs.c:663
 #, 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:626
+#: sys-utils/ipcs.c:665
 #, c-format
 msgid "mode=%#o, access_perms=%#o\n"
 msgstr "mode=%#o, access_perms=%#o\n"
 
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:667
 #, c-format
-msgid "nsems = %d\n"
-msgstr "nsems = %d\n"
+msgid "nsems = %ld\n"
+msgstr "nsems = %ld\n"
 
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:668
 #, c-format
 msgid "otime = %s"
 msgstr "otime = %s"
 
-#: sys-utils/ipcs.c:630
+#: sys-utils/ipcs.c:670
 #, c-format
 msgid "ctime = %s"
 msgstr "ctime = %s"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:672
 #, c-format
 msgid "%-10s%-10s%-10s%-10s%-10s\n"
 msgstr "%-10s%-10s%-10s%-10s%-10s\n"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:673
 msgid "semnum"
 msgstr "semnum"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:673
 msgid "value"
 msgstr "valor"
 
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:673
 msgid "ncount"
 msgstr "ncount"
 
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:673
 msgid "zcount"
 msgstr "zcount"
 
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:673
 msgid "pid"
 msgstr "pid"
 
-#: sys-utils/rdev.c:67
+#: sys-utils/rdev.c:68
 msgid "usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
 msgstr "Uso: rdev [ -rsv ] [ -o DESLOCAMENTO ] [ IMAGEM [ VALOR [ DESLOCAMENTO] ] ]"
 
-#: sys-utils/rdev.c:68
+#: sys-utils/rdev.c:69
 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:69
+#: sys-utils/rdev.c:70
 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:70
+#: sys-utils/rdev.c:71
 msgid "  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"
 msgstr "  rdev -R /dev/fd0 1              define ROOTFLAGS (status de somente leitura)"
 
-#: sys-utils/rdev.c:71
+#: sys-utils/rdev.c:72
 msgid "  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"
 msgstr "  rdev -s /dev/fd0 /dev/hda2      define o dispositivo de SWAP (permuta)"
 
-#: sys-utils/rdev.c:72
+#: sys-utils/rdev.c:73
 msgid "  rdev -r /dev/fd0 627            set the RAMDISK size"
 msgstr "  rdev -r /dev/fd0 627            define o tamanho do RAMDISK (disco de RAM)"
 
-#: sys-utils/rdev.c:73
+#: sys-utils/rdev.c:74
 msgid "  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"
 msgstr "  rdev -v /dev/fd0 1              define o VIDEOMODE (modo de vídeo) de inicialização"
 
-#: sys-utils/rdev.c:74
+#: sys-utils/rdev.c:75
 msgid "  rdev -o N ...                   use the byte offset N"
 msgstr "  rdev -o N ...                   usa o deslocamento de bytes N"
 
-#: sys-utils/rdev.c:75
+#: sys-utils/rdev.c:76
 msgid "  rootflags ...                   same as rdev -R"
 msgstr "  rootflags ...                   o mesmo que rdev -R"
 
-#: sys-utils/rdev.c:76
+#: sys-utils/rdev.c:77
 msgid "  swapdev ...                     same as rdev -s"
 msgstr "  swapdev ...                     o mesmo que rdev -s"
 
-#: sys-utils/rdev.c:77
+#: sys-utils/rdev.c:78
 msgid "  ramsize ...                     same as rdev -r"
 msgstr "  ramsize ...                     o mesmo que rdev -r"
 
-#: sys-utils/rdev.c:78
+#: sys-utils/rdev.c:79
 msgid "  vidmode ...                     same as rdev -v"
 msgstr "  vidmode ...                     o mesmo que rdev -v"
 
-#: sys-utils/rdev.c:79
+#: 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:80
+#: sys-utils/rdev.c:81
 msgid "      use -R 1 to mount root readonly, -R 0 for read/write."
 msgstr "      use -R 1 para montar a raiz somente para leitura, -R 0 for leitura/gravação."
 
-#: sys-utils/readprofile.c:52
+#: sys-utils/readprofile.c:54
 #, c-format
 msgid ""
 "%s: Usage: \"%s [options]\n"
 "\t -m <mapfile>  (default = \"%s\")\n"
 "\t -p <pro-file> (default = \"%s\")\n"
+"\t -M <mult>     set the profiling multiplier to <mult>\n"
 "\t -i            print only info about the sampling step\n"
 "\t -v            print verbose data\n"
 "\t -a            print all symbols, even if count is 0\n"
@@ -8188,6 +8374,7 @@ msgstr ""
 "%s: Uso: \"%s [opções]\n"
 "\t -m <arq_mapa>  (padrão = \"%s\")\n"
 "\t -p <arq_pro> (padrão = \"%s\")\n"
+"\t -M <mult>     configura o perfil de multiplicação para <mult>\n"
 "\t -i            mostra somente informações sobre o passo de amostragem.\n"
 "\t -v            mostra dados detalhados.\n"
 "\t -a            mostra todos os símbolos, mesmo se a contagem for 0.\n"
@@ -8199,62 +8386,58 @@ msgstr ""
 msgid "%s Version %s\n"
 msgstr "%s versão %s\n"
 
-#: sys-utils/readprofile.c:128
-msgid "anything\n"
-msgstr "qualquer coisa\n"
-
-#: sys-utils/readprofile.c:157
+#: sys-utils/readprofile.c:175
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Passo de amostragem: %i\n"
 
-#: sys-utils/readprofile.c:170 sys-utils/readprofile.c:196
+#: sys-utils/readprofile.c:188 sys-utils/readprofile.c:211
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): linha de mapa incorreta\n"
 
-#: sys-utils/readprofile.c:183
+#: sys-utils/readprofile.c:199
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: não foi possível localizar \"_stext\" em %s\n"
 
-#: sys-utils/readprofile.c:226
+#: sys-utils/readprofile.c:242
 msgid "total"
 msgstr "total"
 
-#: sys-utils/renice.c:67
+#: sys-utils/renice.c:68
 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
+#: sys-utils/renice.c:95
 #, c-format
 msgid "renice: %s: unknown user\n"
 msgstr "renice: %s: usuário desconhecido\n"
 
-#: sys-utils/renice.c:102
+#: sys-utils/renice.c:103
 #, c-format
 msgid "renice: %s: bad value\n"
 msgstr "renice: %s: valor inválido\n"
 
-#: sys-utils/renice.c:121
+#: sys-utils/renice.c:122
 msgid "getpriority"
 msgstr "getpriority"
 
-#: sys-utils/renice.c:126
+#: sys-utils/renice.c:127
 msgid "setpriority"
 msgstr "setpriority"
 
-#: sys-utils/renice.c:129
+#: sys-utils/renice.c:130
 #, c-format
 msgid "%d: old priority %d, new priority %d\n"
 msgstr "%d: prioridade antiga = %d; prioridade nova = %d\n"
 
-#: sys-utils/setsid.c:23
+#: sys-utils/setsid.c:26
 #, c-format
 msgid "usage: %s program [arg ...]\n"
 msgstr "Uso: %s programa [arg ...]\n"
 
-#: sys-utils/tunelp.c:74
+#: sys-utils/tunelp.c:75
 #, c-format
 msgid ""
 "Usage: %s <device> [ -i <IRQ> | -t <TIME> | -c <CHARS> | -w <WAIT> | \n"
@@ -8265,86 +8448,86 @@ msgstr ""
 "          -a [on|off] | -o [on|off] | -C [on|off] | -q [on|off] | -s | \n"
 "          -T [on|off] ]\n"
 
-#: sys-utils/tunelp.c:90
+#: sys-utils/tunelp.c:91
 msgid "malloc error"
 msgstr "erro de malloc"
 
-#: sys-utils/tunelp.c:102
+#: sys-utils/tunelp.c:103
 #, c-format
 msgid "%s: bad value\n"
 msgstr "%s: valor inválido\n"
 
-#: sys-utils/tunelp.c:241
+#: sys-utils/tunelp.c:242
 #, c-format
 msgid "%s: %s not an lp device.\n"
 msgstr "%s: %s não é um dispositivo lp.\n"
 
-#: sys-utils/tunelp.c:262
+#: sys-utils/tunelp.c:263
 #, c-format
 msgid "%s status is %d"
 msgstr "o status de %s é %d"
 
-#: sys-utils/tunelp.c:263
+#: sys-utils/tunelp.c:264
 msgid ", busy"
 msgstr ", ocupado"
 
-#: sys-utils/tunelp.c:264
+#: sys-utils/tunelp.c:265
 msgid ", ready"
 msgstr ", pronto"
 
-#: sys-utils/tunelp.c:265
+#: sys-utils/tunelp.c:266
 msgid ", out of paper"
 msgstr ", sem papel"
 
-#: sys-utils/tunelp.c:266
+#: sys-utils/tunelp.c:267
 msgid ", on-line"
 msgstr ", on-line"
 
-#: sys-utils/tunelp.c:267
+#: sys-utils/tunelp.c:268
 msgid ", error"
 msgstr ", erro"
 
-#: sys-utils/tunelp.c:284
+#: sys-utils/tunelp.c:285
 msgid "LPGETIRQ error"
 msgstr "erro LPGETIRQ"
 
-#: sys-utils/tunelp.c:290
+#: sys-utils/tunelp.c:291
 #, c-format
 msgid "%s using IRQ %d\n"
 msgstr "%s usando IRQ %d\n"
 
-#: sys-utils/tunelp.c:292
+#: sys-utils/tunelp.c:293
 #, c-format
 msgid "%s using polling\n"
 msgstr "%s usando consulta (polling)\n"
 
-#: text-utils/col.c:154
+#: text-utils/col.c:155
 #, c-format
 msgid "col: bad -l argument %s.\n"
 msgstr "col: argumento inválido para -l %s.\n"
 
-#: text-utils/col.c:521
+#: text-utils/col.c:537
 msgid "usage: col [-bfpx] [-l nline]\n"
 msgstr "Uso: col [-bfpx] [-l nlinha]\n"
 
-#: text-utils/col.c:527
+#: text-utils/col.c:543
 msgid "col: write error.\n"
 msgstr "col: erro de gravação.\n"
 
-#: text-utils/col.c:534
+#: text-utils/col.c:550
 #, 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:535
+#: text-utils/col.c:551
 msgid "past first line"
 msgstr "além da primeira linha"
 
-#: text-utils/col.c:535
+#: text-utils/col.c:551
 msgid "-- line already flushed"
 msgstr "-- linha já descarregada"
 
-#: text-utils/colcrt.c:98
+#: text-utils/colcrt.c:97
 #, c-format
 msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
 msgstr "Uso: %s [ - ] [ -2 ] [ arquivo ... ]\n"
@@ -8369,116 +8552,116 @@ msgstr "hexdump: valor para pular incorreto.\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:262
+#: text-utils/more.c:263
 #, c-format
 msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n"
 msgstr "Uso: %s [-dflpcsu] [+número_da_linha | +/padrão] nome1 nome2 ...\n"
 
-#: text-utils/more.c:518
+#: text-utils/more.c:521
 #, c-format
 msgid "\n*** %s: directory ***\n\n"
 msgstr "\n*** %s: diretório ***\n\n"
 
 #. simple ELF detection
-#: text-utils/more.c:557
+#: text-utils/more.c:560
 #, c-format
 msgid "\n******** %s: Not a text file ********\n\n"
 msgstr "\n******** %s: não é um arquivo de texto ********\n\n"
 
-#: text-utils/more.c:660
+#: text-utils/more.c:663
 msgid "[Use q or Q to quit]"
 msgstr "[Use q ou Q para sair]"
 
-#: text-utils/more.c:839
+#: text-utils/more.c:843
 msgid "--More--"
 msgstr "--Mais--"
 
-#: text-utils/more.c:841
+#: text-utils/more.c:845
 #, c-format
 msgid "(Next file: %s)"
 msgstr "(Próximo arquivo: %s)"
 
-#: text-utils/more.c:847
+#: text-utils/more.c:851
 msgid "[Press space to continue, 'q' to quit.]"
 msgstr "[Pressione espaço para continuar, 'q' para sair.]"
 
-#: text-utils/more.c:1145
+#: text-utils/more.c:1185
 #, c-format
 msgid "...back %d page"
 msgstr "...voltar %d página(s)"
 
-#: text-utils/more.c:1191
+#: text-utils/more.c:1231
 #, c-format
 msgid "...skipping %d line"
 msgstr "... pulando %d linha(s)"
 
-#: text-utils/more.c:1232
+#: text-utils/more.c:1272
 msgid "\n***Back***\n\n"
 msgstr "\n***Voltar***\n\n"
 
-#: text-utils/more.c:1270
+#: text-utils/more.c:1329
 msgid "Can't open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
-#: text-utils/more.c:1291 text-utils/more.c:1295
+#: text-utils/more.c:1359 text-utils/more.c:1363
 msgid "[Press 'h' for instructions.]"
 msgstr "[Pressione 'h' para obter instruções.]"
 
-#: text-utils/more.c:1329
+#: text-utils/more.c:1397
 #, c-format
 msgid "\"%s\" line %d"
 msgstr "\"%s\" linha %d"
 
-#: text-utils/more.c:1331
+#: text-utils/more.c:1399
 #, c-format
 msgid "[Not a file] line %d"
 msgstr "[Não é um arquivo] linha %d"
 
-#: text-utils/more.c:1415
+#: text-utils/more.c:1483
 msgid "  Overflow\n"
 msgstr "  Estouro\n"
 
-#: text-utils/more.c:1462
+#: text-utils/more.c:1530
 msgid "...skipping\n"
 msgstr "...pulando\n"
 
-#: text-utils/more.c:1492
+#: text-utils/more.c:1560
 msgid "Regular expression botch"
 msgstr "Expressão regular malformada"
 
-#: text-utils/more.c:1504
+#: text-utils/more.c:1572
 msgid "\nPattern not found\n"
 msgstr "\nPadrão não encontrado\n"
 
-#: text-utils/more.c:1507
+#: text-utils/more.c:1575
 msgid "Pattern not found"
 msgstr "Padrão não encontrado"
 
-#: text-utils/more.c:1568
+#: text-utils/more.c:1636
 msgid "can't fork\n"
 msgstr "não foi possível realizar fork\n"
 
-#: text-utils/more.c:1607
+#: text-utils/more.c:1675
 msgid "\n...Skipping "
 msgstr "\n...Pulando "
 
-#: text-utils/more.c:1611
+#: text-utils/more.c:1679
 msgid "...Skipping "
 msgstr "...Pulando "
 
-#: text-utils/more.c:1612
+#: text-utils/more.c:1680
 msgid "to file "
 msgstr "para o arquivo"
 
-#: text-utils/more.c:1612
+#: text-utils/more.c:1680
 msgid "back to file "
 msgstr "de volta ao arquivo"
 
-#: text-utils/more.c:1848
+#: text-utils/more.c:1914
 msgid "Line too long"
 msgstr "Linha longa demais"
 
-#: text-utils/more.c:1891
+#: text-utils/more.c:1957
 msgid "No previous command to substitute for"
 msgstr "Não há comando anterior para ser substituído"
 
@@ -8534,96 +8717,28 @@ msgstr "Não foi possível alocar espaço em buffer\n"
 msgid "usage: rev [file ...]\n"
 msgstr "Uso: rev [arquivo ...]\n"
 
-#: text-utils/ul.c:141
+#: text-utils/ul.c:143
 #, c-format
 msgid "usage: %s [ -i ] [ -tTerm ] file...\n"
 msgstr "Uso: %s [ -i ] [ -tTerm ] arquivo...\n"
 
-#: text-utils/ul.c:152
+#: text-utils/ul.c:154
 msgid "trouble reading terminfo"
 msgstr "problemas na leitura de terminfo"
 
-#: text-utils/ul.c:241
+#: text-utils/ul.c:244
 #, c-format
 msgid "Unknown escape sequence in input: %o, %o\n"
 msgstr "Seqüência de escape desconhecida na entrada: %o, %o\n"
 
-#: text-utils/ul.c:398
+#: text-utils/ul.c:427
 msgid "Unable to allocate buffer.\n"
 msgstr "Não foi possível alocar buffer.\n"
 
-#: text-utils/ul.c:553
+#: text-utils/ul.c:588
 msgid "Input line too long.\n"
 msgstr "Linha de entrada longa demais.\n"
 
-#: text-utils/ul.c:566
+#: text-utils/ul.c:601
 msgid "Out of memory when growing buffer.\n"
 msgstr "Falta memória quando o buffer cresce.\n"
-
-#: kbd/kbdrate.c:138 kbd/kbdrate.c:276
-#, c-format
-msgid "Typematic Rate set to %.1f cps (delay = %d ms)\n"
-msgstr "Velocidade do teclado definida como %.1f cps (intervalo = %d ms)\n"
-
-#: kbd/kbdrate.c:222
-msgid "Usage: kbdrate [-V] [-s] [-r rate] [-d delay]\n"
-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/rescuept/README b/rescuept/README
index f7ce866db..9009bff59 100644
--- a/rescuept/README
+++ b/rescuept/README
@@ -47,8 +47,6 @@ will restore the partition table.
 In the absence of such good information, try each of the above
 utilities to get an idea of where your partitions were.
 Since gpart is the most elaborate one, it may be your best bet.
-If it misses some of your ext2 partitions, and you have gpart-0.1c,
-apply the above patch and try again.
 
 Note that if you in the course of history have deleted some partition
 and created something else on the same spot, then there will often
diff --git a/sys-utils/Makefile b/sys-utils/Makefile
index 66f913a62..b11517428 100644
--- a/sys-utils/Makefile
+++ b/sys-utils/Makefile
@@ -38,7 +38,7 @@ endif
 endif
 
 ifeq "$(ARCH)" "intel"
-MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 swapdev.8 vidmode.8
+MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 vidmode.8
 USRSBIN:=$(USRSBIN) rdev
 endif
 
@@ -84,7 +84,6 @@ install: all
 	$(INSTALLBIN) $(USRBIN) $(USRBINDIR)
 	$(INSTALLBIN) $(USRSBIN) $(USRSBINDIR)
 ifeq "$(ARCH)" "intel"
-	(cd $(USRSBINDIR); ln -sf rdev swapdev)
 	(cd $(USRSBINDIR); ln -sf rdev ramsize)
 	(cd $(USRSBINDIR); ln -sf rdev vidmode)
 	(cd $(USRSBINDIR); ln -sf rdev rootflags)
diff --git a/sys-utils/dmesg.8 b/sys-utils/dmesg.8
index f453d7145..8064b1d0e 100644
--- a/sys-utils/dmesg.8
+++ b/sys-utils/dmesg.8
@@ -20,16 +20,19 @@ file to whoever can debug their problem.
 .SH OPTIONS
 .TP
 .B \-c
-clear the ring buffer contents after printing.
+Clear the ring buffer contents after printing.
 .TP
 .BI \-s bufsize
-use a buffer of bufsize to query the kernel ring buffer.  This is
-8196 by default (this matches the default kernel syslog buffer size in
-2.0.33 and 2.1.103).  If you have set the kernel buffer to larger than
-the default then this option can be used to view the entire buffer.
+Use a buffer of size
+.I bufsize
+to query the kernel ring buffer.  This is 16392 by default.
+(The default kernel syslog buffer size was 4096
+at first, 8192 since 1.3.54, 16384 since 2.1.113.)
+If you have set the kernel buffer to be larger than the default
+then this option can be used to view the entire buffer.
 .TP
 .BI \-n level
-set the
+Set the
 .I level
 at which logging of messages is done to the console.  For example,
 .B \-n 1
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index f9d1e282e..a172fc1f4 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -40,7 +40,7 @@ usage(void) {
 int
 main( int argc, char *argv[] ) {
    char *buf;
-   int	bufsize=16392;
+   int	bufsize = 16392;
    int  i;
    int  n;
    int  c;
diff --git a/sys-utils/ipc.texi b/sys-utils/ipc.texi
index cd9127167..53c4e4e57 100644
--- a/sys-utils/ipc.texi
+++ b/sys-utils/ipc.texi
@@ -30,7 +30,10 @@ Permission is granted to use this material and the accompanying
 programs within the terms of the GNU GPL.
 @end titlepage
 
-
+@dircategory Miscellaneous
+@direntry
+* ipc: (ipc).           System V style inter process communication
+@end direntry
 
 @node top, Overview, Notes, (dir)
 @chapter System V IPC.
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index eec8bce9c..60dcb319d 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -232,25 +232,25 @@ print_perms (int id, struct ipc_perm *ipcp) {
 	struct passwd *pw;
 	struct group *gr;
 
-	printf ("%-10d%-10o", id, ipcp->mode & 0777);
+	printf ("%-10d %-10o", id, ipcp->mode & 0777);
 
 	if ((pw = getpwuid(ipcp->cuid)))
-		printf("%-10s", pw->pw_name);
+		printf(" %-10s", pw->pw_name);
 	else
-		printf("%-10d", ipcp->cuid);
+		printf(" %-10d", ipcp->cuid);
 	if ((gr = getgrgid(ipcp->cgid)))
-		printf("%-10s", gr->gr_name);
+		printf(" %-10s", gr->gr_name);
 	else
-		printf("%-10d", ipcp->cgid);
+		printf(" %-10d", ipcp->cgid);
 
 	if ((pw = getpwuid(ipcp->uid)))
-		printf("%-10s", pw->pw_name);
+		printf(" %-10s", pw->pw_name);
 	else
-		printf("%-10d", ipcp->uid);
+		printf(" %-10d", ipcp->uid);
 	if ((gr = getgrgid(ipcp->gid)))
-		printf("%-10s\n", gr->gr_name);
+		printf(" %-10s\n", gr->gr_name);
 	else
-		printf("%-10d\n", ipcp->gid);
+		printf(" %-10d\n", ipcp->gid);
 }
 
 
@@ -298,31 +298,34 @@ void do_shm (char format)
 
 	case CREATOR:
 		printf (_("------ Shared Memory Segment Creators/Owners --------\n"));
-		printf (_("%-10s%-10s%-10s%-10s%-10s%-10s\n"),
+		printf (_("%-10s %-10s %-10s %-10s %-10s %-10s\n"),
 		 _("shmid"),_("perms"),_("cuid"),_("cgid"),_("uid"),_("gid"));
 		break;
 
 	case TIME:
 		printf (_("------ Shared Memory Attach/Detach/Change Times --------\n"));
-		printf (_("%-10s%-10s  %-20s%-20s%-20s\n"),
-			_("shmid"),_("owner"),_("attached"),_("detached"),_("changed"));
+		printf (_("%-10s %-10s %-20s %-20s %-20s\n"),
+			_("shmid"),_("owner"),_("attached"),_("detached"),
+			_("changed"));
 		break;
 
 	case PID:
 		printf (_("------ Shared Memory Creator/Last-op --------\n"));
-		printf (_("%-10s%-10s%-10s%-10s\n"),_("shmid"),_("owner"),_("cpid"),_("lpid"));
+		printf (_("%-10s %-10s %-10s %-10s\n"),
+			_("shmid"),_("owner"),_("cpid"),_("lpid"));
 		break;
 
 	default:
 		printf (_("------ Shared Memory Segments --------\n"));
-		printf (_("%-10s%-10s%-10s%-10s%-10s%-10s%-12s\n"), _("key"),_("shmid"),
-			_("owner"),_("perms"),_("bytes"),_("nattch"),_("status"));
+		printf (_("%-10s %-10s %-10s %-10s %-10s %-10s %-12s\n"),
+			_("key"),_("shmid"),_("owner"),_("perms"),_("bytes"),
+			_("nattch"),_("status"));
 		break;
 	}
 
 	for (id = 0; id <= maxid; id++) {
 		shmid = shmctl (id, SHM_STAT, &shmseg);
-		if (shmid  < 0) 
+		if (shmid < 0) 
 			continue;
 		if (format == CREATOR)  {
 			print_perms (shmid, ipcp);
@@ -332,33 +335,33 @@ void do_shm (char format)
 		switch (format) {
 		case TIME: 
 			if (pw)
-				printf ("%-10d%-10.10s", shmid, pw->pw_name);
+				printf ("%-10d %-10.10s", shmid, pw->pw_name);
 			else
-				printf ("%-10d%-10d", shmid, ipcp->uid);
+				printf ("%-10d %-10d", shmid, ipcp->uid);
 			/* ctime uses static buffer: use separate calls */
 			printf("  %-20.16s", shmseg.shm_atime
-			       ? ctime(&shmseg.shm_atime) + 4 : _("Not set\n"));
-			printf("%-20.16s", shmseg.shm_dtime
-			       ? ctime(&shmseg.shm_dtime) + 4 : _("Not set\n"));
-			printf("%-20.16s\n", shmseg.shm_ctime
-			       ? ctime(&shmseg.shm_ctime) + 4 : _("Not set\n"));
+			       ? ctime(&shmseg.shm_atime) + 4 : _("Not set"));
+			printf(" %-20.16s", shmseg.shm_dtime
+			       ? ctime(&shmseg.shm_dtime) + 4 : _("Not set"));
+			printf(" %-20.16s\n", shmseg.shm_ctime
+			       ? ctime(&shmseg.shm_ctime) + 4 : _("Not set"));
 			break;
 		case PID:
 			if (pw)
-				printf ("%-10d%-10.10s", shmid, pw->pw_name);
+				printf ("%-10d %-10.10s", shmid, pw->pw_name);
 			else
-				printf ("%-10d%-10d", shmid, ipcp->uid);
-			printf ("%-10d%-10d\n",
+				printf ("%-10d %-10d", shmid, ipcp->uid);
+			printf (" %-10d %-10d\n",
 				shmseg.shm_cpid, shmseg.shm_lpid);
 			break;
 			
 		default:
-		        printf( "0x%08x ",ipcp->KEY );
+		        printf("0x%08x ",ipcp->KEY );
 			if (pw)
-				printf ("%-10d%-10.10s", shmid, pw->pw_name);
+				printf ("%-10d %-10.10s", shmid, pw->pw_name);
 			else
-				printf ("%-10d%-10d", shmid, ipcp->uid);
-			printf ("%-10o%-10d%-10ld%-6s%-6s\n", 
+				printf ("%-10d %-10d", shmid, ipcp->uid);
+			printf ("%-10o %-10d %-10ld %-6s %-6s\n", 
 				ipcp->mode & 0777,
 				shmseg.shm_segsz,
 				/*
@@ -412,13 +415,13 @@ void do_sem (char format)
 
 	case CREATOR:
 		printf (_("------ Semaphore Arrays Creators/Owners --------\n"));
-		printf (_("%-10s%-10s%-10s%-10s%-10s%-10s\n"),
+		printf (_("%-10s %-10s %-10s %-10s %-10s %-10s\n"),
 		 _("semid"),_("perms"),_("cuid"),_("cgid"),_("uid"),("gid"));
 		break;
 
 	case TIME:
 		printf (_("------ Shared Memory Operation/Change Times --------\n"));
-		printf (_("%-8s%-10s  %-26.24s %-26.24s\n"),
+		printf (_("%-8s %-10s %-26.24s %-26.24s\n"),
 			_("shmid"),_("owner"),_("last-op"),_("last-changed"));
 		break;
 
@@ -427,15 +430,16 @@ void do_sem (char format)
 
 	default:
 		printf (_("------ Semaphore Arrays --------\n"));
-		printf (_("%-10s%-10s%-10s%-10s%-10s%-12s\n"), 
-			_("key"),_("semid"),_("owner"),_("perms"),_("nsems"),_("status"));
+		printf (_("%-10s %-10s %-10s %-10s %-10s %-12s\n"), 
+			_("key"),_("semid"),_("owner"),_("perms"),
+			_("nsems"),_("status"));
 		break;
 	}
 
 	for (id = 0; id <= maxid; id++) {
 		arg.buf = (struct semid_ds *) &semary;
 		semid = semctl (id, 0, SEM_STAT, arg);
-		if (semid < 0) 
+		if (semid < 0)
 			continue;
 		if (format == CREATOR)  {
 			print_perms (semid, ipcp);
@@ -445,13 +449,13 @@ void do_sem (char format)
 		switch (format) {
 		case TIME: 
 			if (pw)
-				printf ("%-8d%-10.10s", semid, pw->pw_name);
+				printf ("%-8d %-10.10s", semid, pw->pw_name);
 			else
-				printf ("%-8d%-10d", semid, ipcp->uid);
+				printf ("%-8d %-10d", semid, ipcp->uid);
 			printf ("  %-26.24s", semary.sem_otime
-				? ctime(&semary.sem_otime) : _("Not set\n"));
+				? ctime(&semary.sem_otime) : _("Not set"));
 			printf (" %-26.24s\n", semary.sem_ctime
-				? ctime(&semary.sem_ctime) : _("Not set\n"));
+				? ctime(&semary.sem_ctime) : _("Not set"));
 			break;
 		case PID:
 			break;
@@ -459,10 +463,10 @@ void do_sem (char format)
 		default:
 		        printf( "0x%08x ",ipcp->KEY );
 			if (pw)
-				printf ("%-10d%-10.9s", semid, pw->pw_name);
+				printf ("%-10d %-10.9s", semid, pw->pw_name);
 			else
-				printf ("%-10d%-9d", semid, ipcp->uid);
-			printf ("%-10o%-10ld\n",
+				printf ("%-10d %-9d", semid, ipcp->uid);
+			printf ("%-10o %-10ld\n",
 				ipcp->mode & 0777,
 				/*
 				 * glibc-2.1.3 and earlier has unsigned short;
@@ -488,7 +492,7 @@ void do_msg (char format)
 
 	maxid = msgctl (0, MSG_INFO, (struct msqid_ds *) &msginfo);
 	if (maxid < 0) {
-		printf (_("kernel not configured for shared memory\n"));
+		printf (_("kernel not configured for message queues\n"));
 		return;
 	}
 	
@@ -511,31 +515,33 @@ void do_msg (char format)
 
 	case CREATOR:
 		printf (_("------ Message Queues: Creators/Owners --------\n"));
-		printf (_("%-10s%-10s%-10s%-10s%-10s%-10s\n"),
+		printf (_("%-10s %-10s %-10s %-10s %-10s %-10s\n"),
 		 _("msqid"),_("perms"),_("cuid"),_("cgid"),_("uid"),_("gid"));
 		break;
 
 	case TIME:
 		printf (_("------ Message Queues Send/Recv/Change Times --------\n"));
-		printf (_("%-8s%-10s  %-20s%-20s%-20s\n"),
+		printf (_("%-8s %-10s %-20s %-20s %-20s\n"),
 			_("msqid"),_("owner"),_("send"),_("recv"),_("change"));
 		break;
 
 	case PID:
  		printf (_("------ Message Queues PIDs --------\n"));
- 		printf (_("%-10s%-10s%-10s%-10s\n"),_("msqid"),_("owner"),_("lspid"),_("lrpid"));
+ 		printf (_("%-10s %-10s %-10s %-10s\n"),
+			_("msqid"),_("owner"),_("lspid"),_("lrpid"));
 		break;
 
 	default:
 		printf (_("------ Message Queues --------\n"));
-		printf (_("%-10s%-10s%-10s%-10s%-12s%-12s\n"), _("key"),_("msqid"),
-			_("owner"), _("perms"), _("used-bytes"), _("messages"));
+		printf (_("%-10s %-10s %-10s %-10s %-12s %-12s\n"),
+			_("key"), _("msqid"), _("owner"), _("perms"),
+			_("used-bytes"), _("messages"));
 		break;
 	}
 
 	for (id = 0; id <= maxid; id++) {
 		msqid = msgctl (id, MSG_STAT, &msgque);
-		if (msqid  < 0) 
+		if (msqid < 0)
 			continue;
 		if (format == CREATOR)  {
 			print_perms (msqid, ipcp);
@@ -543,34 +549,34 @@ void do_msg (char format)
 		}
 		pw = getpwuid(ipcp->uid);
 		switch (format) {
-		case TIME: 
+		case TIME:
 			if (pw)
-				printf ("%-8d%-10.10s", msqid, pw->pw_name);
+				printf ("%-8d %-10.10s", msqid, pw->pw_name);
 			else
-				printf ("%-8d%-10d", msqid, ipcp->uid);
-			printf ("  %-20.16s", msgque.msg_stime
-				? ctime(&msgque.msg_stime) + 4 : _("Not set\n"));
-			printf ("%-20.16s", msgque.msg_rtime
-				? ctime(&msgque.msg_rtime) + 4 : _("Not set\n"));
-			printf ("%-20.16s\n", msgque.msg_ctime
-				? ctime(&msgque.msg_ctime) + 4 : _("Not set\n"));
+				printf ("%-8d %-10d", msqid, ipcp->uid);
+			printf (" %-20.16s", msgque.msg_stime
+				? ctime(&msgque.msg_stime) + 4 : _("Not set"));
+			printf (" %-20.16s", msgque.msg_rtime
+				? ctime(&msgque.msg_rtime) + 4 : _("Not set"));
+			printf (" %-20.16s\n", msgque.msg_ctime
+				? ctime(&msgque.msg_ctime) + 4 : _("Not set"));
 			break;
 		case PID:
  			if (pw)
- 				printf ("%-8d%-10.10s", msqid, pw->pw_name);
+ 				printf ("%-8d %-10.10s", msqid, pw->pw_name);
  			else
- 				printf ("%-8d%-10d", msqid, ipcp->uid);
+ 				printf ("%-8d %-10d", msqid, ipcp->uid);
  			printf ("  %5d     %5d\n",
- 			msgque.msg_lspid, msgque.msg_lrpid);
+				msgque.msg_lspid, msgque.msg_lrpid);
   			break;
 
 		default:
 		        printf( "0x%08x ",ipcp->KEY );
 			if (pw)
-				printf ("%-10d%-10.10s", msqid, pw->pw_name);
+				printf ("%-10d %-10.10s", msqid, pw->pw_name);
 			else
-				printf ("%-10d%-10d", msqid, ipcp->uid);
-			printf ("%-10o%-12ld%-12ld\n",
+				printf ("%-10d %-10d", msqid, ipcp->uid);
+			printf (" %-10o %-12ld %-12ld\n",
 				ipcp->mode & 0777,
 				/*
 				 * glibc-2.1.3 and earlier has unsigned short;
@@ -602,19 +608,18 @@ void print_shm (int shmid)
 		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=%ld\n"), 
-		shmds.shm_segsz, shmds.shm_lpid, shmds.shm_cpid, 
+	printf (_("bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"),
+		shmds.shm_segsz, shmds.shm_lpid, shmds.shm_cpid,
 		(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) : 
-		_("Not set\n"));
-	printf (_("change_time=%s"), ctime (&shmds.shm_ctime));
+	printf (_("att_time=%-26.24s\n"),
+		shmds.shm_atime ? ctime (&shmds.shm_atime) : _("Not set"));
+	printf (_("det_time=%-26.24s\n"),
+		shmds.shm_dtime ? ctime (&shmds.shm_dtime) : _("Not set"));
+	printf (_("change_time=%-26.24s\n"), ctime (&shmds.shm_ctime));
 	printf ("\n");
 	return;
 }
 
- 
 
 void print_msg (int msqid)
 {
@@ -637,12 +642,12 @@ void print_msg (int msqid)
 		 */
 		(long) buf.msg_cbytes, (long) buf.msg_qbytes,
 		(long) buf.msg_qnum, buf.msg_lspid, buf.msg_lrpid);
-	printf (_("send_time=%s"),
-		buf.msg_stime? ctime (&buf.msg_stime) : _("Not set\n"));
-	printf (_("rcv_time=%s"),
-		buf.msg_rtime? ctime (&buf.msg_rtime) : _("Not set\n"));
-	printf (_("change_time=%s"),
-		buf.msg_ctime? ctime (&buf.msg_ctime) : _("Not set\n"));
+	printf (_("send_time=%-26.24s\n"),
+		buf.msg_stime ? ctime (&buf.msg_stime) : _("Not set"));
+	printf (_("rcv_time=%-26.24s\n"),
+		buf.msg_rtime ? ctime (&buf.msg_rtime) : _("Not set"));
+	printf (_("change_time=%-26.24s\n"),
+		buf.msg_ctime ? ctime (&buf.msg_ctime) : _("Not set"));
 	printf ("\n");
 	return;
 }
@@ -665,11 +670,11 @@ void print_sem (int semid)
 	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 (_("otime = %-26.24s\n"),
+		semds.sem_otime ? ctime (&semds.sem_otime) : _("Not set"));
+	printf (_("ctime = %-26.24s\n"), ctime (&semds.sem_ctime));	
 
-	printf (_("%-10s%-10s%-10s%-10s%-10s\n"),
+	printf (_("%-10s %-10s %-10s %-10s %-10s\n"),
 		_("semnum"),_("value"),_("ncount"),_("zcount"),_("pid"));
 	arg.val = 0;
 	for (i=0; i< semds.sem_nsems; i++) {
@@ -682,9 +687,9 @@ void print_sem (int semid)
 			perror ("semctl ");
 			exit (1);
 		}
-		printf ("%-10d%-10d%-10d%-10d%-10d\n", i, val, ncnt, zcnt, pid);
+		printf ("%-10d %-10d %-10d %-10d %-10d\n",
+			i, val, ncnt, zcnt, pid);
 	}
 	printf ("\n");
 	return;
 }
-
diff --git a/sys-utils/rdev.8 b/sys-utils/rdev.8
index 0cf83d365..98dce2b7f 100644
--- a/sys-utils/rdev.8
+++ b/sys-utils/rdev.8
@@ -3,31 +3,29 @@
 .\" Changes from sct@dcs.ed.ac.uk added Sat Oct  9 09:54:00 1993.
 .TH RDEV 8 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual"
 .SH NAME
-rdev \- query/set image root device, swap device, RAM disk size, or video mode
+rdev \- query/set image root device, RAM disk size, or video mode
 .SH SYNOPSIS
 .nf
-.BR "rdev [ \-rsvh ] [ \-o " offset " ] [ " image " [ " value " [ " offset " ] ] ]"
+.BR "rdev [ \-rvh ] [ \-o " offset " ] [ " image " [ " value " [ " offset " ] ] ]"
 .BR "rdev [ \-o " offset " ] [ " image " [ " root_device " [ " offset " ] ] ]"
-.BR "swapdev [ \-o " offset " ] [ " image " [ " swap_device " [ " offset " ] ] ]"
 .BR "ramsize [ \-o " offset " ] [ " image " [ " size " [ " offset " ] ] ]"
 .BR "vidmode [ \-o " offset " ] [ " image " [ " mode " [ " offset " ] ] ]"
 .BR "rootflags [ \-o " offset " ] [ " image " [ " flags " [ " offset " ] ] ]"
 .fi
 .SH DESCRIPTION
-.\" " for emacs hilit19
 With no arguments,
 .B rdev
 outputs an
 .I /etc/mtab
 line for the current root file system.
 With no arguments,
-.BR swapdev ", " ramsize ", " vidmode ", and " rootflags
+.BR ramsize ", " vidmode ", and " rootflags
 print usage information.
 
-In a bootable image for the Linux kernel, there are several pairs of bytes
-which specify the root device, the video mode, the size of the RAM disk,
-and the swap device.  These pairs of bytes, by default, begin at offset 504
-(decimal) in the kernel image:
+In a bootable image for the Linux kernel on i386, there are several pairs
+of bytes which specify the root device, the video mode, and the size of
+the RAM disk.  These pairs of bytes, by default, begin
+at offset 504 (decimal) in the kernel image:
 
 .nf
 .RS
@@ -58,9 +56,9 @@ parameter, which is a bootable Linux kernel image, might be:
 .fi
 
 When using the
-.BR rdev ", or " swapdev
-commands, the
-.IR root_device " or " swap_device
+.B rdev
+command, the
+.I root_device
 parameter might be something like:
 
 .nf
@@ -73,6 +71,10 @@ parameter might be something like:
 .RE
 .fi
 
+One may also specify the device by a comma-separated pair
+of decimal integers
+.IR major , minor .
+
 For the
 .B ramsize
 command, the
@@ -114,12 +116,6 @@ is not specified, the
 will be examined to determine the current settings.
 .SH OPTIONS
 .TP
-.B \-s
-Causes
-.B rdev
-to act like
-.BR swapdev .
-.TP
 .B \-r
 Causes
 .B rdev
@@ -141,23 +137,20 @@ to act like
 .B \-h
 Provides help.
 .SH BUGS
-For historical reasons, there are two methods for specifying alternative
-values for the offset.
-.sp
-The user interface is cumbersome, non-intuitive, and should probably be
-re-written from scratch, allowing multiple kernel image parameters to be
-changed or examined with a single command.
-.sp
-If LILO is used,
-.B rdev
-is no longer needed for setting the root device and the VGA mode, since
-these parameters that
-.B rdev
-modifies can be set from the LILO prompt during a boot.  However,
+The
 .B rdev
-is still needed at this time for setting the RAM disk size.  Users are
-encouraged to find the LILO documentation for more information, and to use
-LILO when booting their systems.
+utility, when used other than to find a name for the current root device,
+is an ancient hack that works by patching a kernel image at a magic offset
+with magic numbers. It does not work on architectures other than i386.
+Its use is strongly discouraged. Use a boot loader like SysLinux or LILO
+instead.
+.SH HISTORY
+At offset 502 there used to be the device number of the swap device
+(in Linux 0.12), and "rdev -s" or "swapdev" would set this.
+However, since Linux 0.95 this constant is not used any longer,
+and the swap device is specified using the
+.IR swapon ()
+system call.
 .SH AUTHORS
 .nf
 Originally by Werner Almesberger (almesber@nessie.cs.id.ethz.ch)
diff --git a/sys-utils/rdev.c b/sys-utils/rdev.c
index 54ccd99f4..e2b23aee0 100644
--- a/sys-utils/rdev.c
+++ b/sys-utils/rdev.c
@@ -58,6 +58,7 @@ Wed Jun 22 21:12:29 1994: Applied patches from Dave
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "nls.h"
 
 /* rdev.c  -  query/set root device. */
@@ -65,16 +66,14 @@ Wed Jun 22 21:12:29 1994: Applied patches from Dave
 static void
 usage(void) {
 
-    puts(_("usage: rdev [ -rsv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"));
+    puts(_("usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"));
     puts(_("  rdev /dev/fd0  (or rdev /linux, etc.) displays the current ROOT device"));
     puts(_("  rdev /dev/fd0 /dev/hda2         sets ROOT to /dev/hda2"));
     puts(_("  rdev -R /dev/fd0 1              set the ROOTFLAGS (readonly status)"));
-    puts(_("  rdev -s /dev/fd0 /dev/hda2      set the SWAP device"));
     puts(_("  rdev -r /dev/fd0 627            set the RAMDISK size"));
     puts(_("  rdev -v /dev/fd0 1              set the bootup VIDEOMODE"));
     puts(_("  rdev -o N ...                   use the byte offset N"));
     puts(_("  rootflags ...                   same as rdev -R"));
-    puts(_("  swapdev ...                     same as rdev -s"));
     puts(_("  ramsize ...                     same as rdev -r"));
     puts(_("  vidmode ...                     same as rdev -v"));
     puts(_("Note: video modes are: -3=Ask, -2=Extended, -1=NormalVga, 1=key1, 2=key2,..."));
@@ -103,19 +102,16 @@ die(char *msg) {
 }
 
 /* Earlier rdev fails on /dev/ida/c0d0p1 so we allow for
-   (limited) recursion in /dev. -- Paul Clements */
-
-#define MAX_DEPTH	1
+   recursion in /dev. -- Paul Clements */
+/* In fact devfs needs deep recursion. */
 
 static int
-find_dev_recursive(char *dirnamebuf, int number, int depth) {
+find_dev_recursive(char *dirnamebuf, int number) {
 	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);
@@ -131,7 +127,7 @@ find_dev_recursive(char *dirnamebuf, int number, int depth) {
 		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))
+		    find_dev_recursive(dirnamebuf, number))
 			return 1;
 	}
 	dirnamebuf[dirnamelen] = 0;
@@ -145,44 +141,45 @@ find_dev(int number) {
 	if (!number)
 		return "Boot device";
 	strcpy(name, "/dev");
-	if (find_dev_recursive(name, number, MAX_DEPTH))
+	if (find_dev_recursive(name, number))
 		return name;
 	sprintf(name, "0x%04x", number);
 	return name;
 }
 
-/* enum { RDEV, SDEV, RAMSIZE, VIDMODE }; */
-enum { RDEV, VIDMODE, RAMSIZE, SDEV, __syssize__, ROOTFLAGS };
-char *cmdnames[6] = { "rdev", "vidmode",  "ramsize", "swapdev", 
+/* The enum values are significant, things are stored in this order,
+   see bootsect.S */
+enum { RDEV, VIDMODE, RAMSIZE, __swapdev__, __syssize__, ROOTFLAGS };
+char *cmdnames[6] = { "rdev", "vidmode",  "ramsize", "", 
 		      "", "rootflags"};
-char *desc[6] = { "Root device", "Video mode",  "Ramsize",  "Swap device",
+char *desc[6] = { "Root device", "Video mode",  "Ramsize",  "",
 		  "", "Root flags"};
 #define shift(n) argv+=n,argc-=n
 
 int
 main(int argc, char **argv) {
 	int image, offset, dev_nr, i, newoffset=-1;
-	char *device, *ptr;
+	char *ptr;
+	unsigned short val, have_val;
 	struct stat s;
-	int cmd = 0;
+	int cmd;
 
 	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
 		ptr = argv[0];
-	for (i=0; i<=5; i++)
+	for (i=0; i<=5; i++) {
 		if (!strcmp(ptr,cmdnames[i])) {
 			cmd = i;
 			break;
 		}
+	}
 
 	while (argc > 1) { 
 		if (argv[1][0] != '-')
@@ -200,17 +197,13 @@ main(int argc, char **argv) {
 			cmd = VIDMODE;
 			shift(1);
 			break;
-		case 's':
-			cmd = SDEV;
-			shift(1);
-			break;
 		case 'o':
 			if (argv[1][2]) {
-				newoffset=atoi(argv[1]+2);
+				newoffset = atoi(argv[1]+2);
 				shift(1);
 				break;
 			} else if (argc > 2) {
-				newoffset=atoi(argv[2]);
+				newoffset = atoi(argv[2]);
 				shift(2);
 				break;
 			}
@@ -220,44 +213,56 @@ main(int argc, char **argv) {
 		}
 	}
 
-	offset = DEFAULT_OFFSET-cmd*2;
-	if (newoffset >= 0)
-		offset = newoffset;
+	/* Here the only sensible way of using rdev */
+	if (argc == 1) {
+		if (cmd == RDEV) {
+			if (stat("/",&s) < 0) die("/");
+			printf("%s /\n", find_dev(s.st_dev));
+			exit(0);
+		}
+		usage();
+	}
 
-	if  ((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))
+	if (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];
+	/* Ancient garbage.. */
+	offset = DEFAULT_OFFSET-cmd*2;
+	if (newoffset >= 0)
+		offset = newoffset;
+	if (argc == 4)
+		offset = atoi(argv[3]);
+
+	have_val = 0;
+
+	if (argc >= 3) {
+		if (cmd == RDEV) {
+			if (isdigit(*argv[2])) {
+				/* earlier: specify offset */
+				/* now: specify major,minor */
+				char *p;
+				unsigned int ma,mi;
+				if ((p = strchr(argv[2], ',')) == NULL)
+					die(_("missing comma"));
+				ma = atoi(argv[2]);
+				mi = atoi(p+1);
+				val = ((ma<<8) | mi);
+			} else {
+				char *device = argv[2];
+				if (stat(device,&s) < 0)
+					die(device);
+				val = s.st_rdev;
 			}
+		} else {
+			val = atoi(argv[2]);
 		}
-	} else {
-		if (argc>=3)
-			device = argv[2];
-		if (argc==4)
-			offset = atoi(argv[3]);
+		have_val = 1;
 	}
-	if (device) {
-		if ((cmd == SDEV) || (cmd == RDEV)) {
-			if (stat(device,&s) < 0)
-				die(device);
-		} else
-			s.st_rdev=atoi(device);
+
+	if (have_val) {
 		if ((image = open(argv[1],O_WRONLY)) < 0) die(argv[1]);
 		if (lseek(image,offset,0) < 0) die("lseek");
-		if (write(image,(char *)&s.st_rdev,2) != 2) die(argv[1]);
+		if (write(image,(char *)&val,2) != 2) die(argv[1]);
 		if (close(image) < 0) die("close");
 	} else {
 		if ((image = open(argv[1],O_RDONLY)) < 0) die(argv[1]);
@@ -266,7 +271,7 @@ main(int argc, char **argv) {
 		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))
+		if (cmd == RDEV)
 			printf(" %s\n", find_dev(dev_nr));
 		else
 			printf(" %d\n", dev_nr);
diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index 189322623..eee8634fe 100644
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -218,6 +218,12 @@ main (int argc, char **argv) {
 		if (*mode == 'A' && total == 0) continue;
 		if (*mode!='T' && *mode!='t') break;/* only text is profiled */
 
+		if (indx >= len / sizeof(*buf)) {
+			fprintf(stderr, _("%s: profile address out of range. "
+					  "Wrong map file?\n"), prgname);
+			exit(1);
+		}
+
 		while (indx < (next_add-add0)/step)
 			this += buf[indx++];
 		total += this;
diff --git a/sys-utils/swapdev.8 b/sys-utils/swapdev.8
deleted file mode 100644
index 901bd7591..000000000
--- a/sys-utils/swapdev.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/rdev.8
diff --git a/text-utils/Makefile b/text-utils/Makefile
index 5018f6a6c..a1c4dc87a 100644
--- a/text-utils/Makefile
+++ b/text-utils/Makefile
@@ -28,8 +28,8 @@ endif
 # Where to put datebase files?
 
 MOREHELP=	more.help
-MOREHELPFILE=$(MOREHELPDIR)/$(MOREHELP)
-# MOREHELPDIR set in ../MCONFIG
+MOREHELPFILE=$(MOREHELP_DIR)/$(MOREHELP)
+# MOREHELP_DIR and MOREHELPDIR set in ../MCONFIG
 CFLAGS:=$(CFLAGS) -DMOREHELPFILE=\"$(MOREHELPFILE)\"
 
 all: $(BIN) $(USRBIN)
diff --git a/text-utils/more.c b/text-utils/more.c
index ac62d070c..0411b17fe 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -529,7 +529,7 @@ checkf (fs, clearfirst)
 	if (magic(f, fs))
 		return((FILE *)NULL);
 	c = Getc(f);
-	*clearfirst = c == '\f';
+	*clearfirst = (c == '\f');
 	Ungetc (c, f);
 	if ((file_size = stbuf.st_size) == 0)
 		file_size = LONG_MAX;
@@ -548,6 +548,10 @@ magic(f, fs)
 {
 	char twobytes[2];
 
+	/* don't try to look ahead if the input is unseekable */
+	if (fseek(f, 0L, SEEK_SET))
+		return(0);
+
 	if (fread(twobytes, 2, 1, f) == 1) {
 		switch(twobytes[0] + (twobytes[1]<<8)) {
 		case OMAGIC:	/* 0407 */